Merge branch 'develop' of github.com:OS2web/os2web_meetings into develop

Author: andersbryrup

css/os2web_meetings.css

@@ -0,0 +1,14 @@
+.agenda-item .item-list li{
+  list-style: none;
+  margin: 0;
+}
+
+.view-os2web-meetings-meeting-details .agenda-bullet-list {
+  height: auto;
+  min-height: 25px;
+  font-size: 15px;
+  margin-right: 0;
+  padding-right: 43px;
+}
+
+

js/os2web_meetings.js

@@ -0,0 +1,18 @@
+(function ($) {
+
+Drupal.behaviors.os2web_meetings = {
+  attach: function(context, settings) {
+    var is_visible = false;
+    $('.agenda-item').hide();
+    $('a.agenda-bullet-list').click(function(e) {
+      e.preventDefault();
+      $(this).nextAll('.agenda-item').toggle();
+      $(this).toggleClass('open');
+      $('a.agenda-bullet-list').not(this).nextAll('.agenda-item').hide();
+      $('a.agenda-bullet-list').not(this).removeClass('open');
+      var top = $(this).nextAll('.agenda-item').offset().top;
+      window.scrollTo(0, top -50);
+    });
+  }
+};
+}(jQuery));

os2web_meetings.make

@@ -39,8 +39,8 @@ projects[panels][version] = "3.3"
 
 
 ; Basic
-projects[ctools][subdir] = "contrib"
-projects[ctools][version] = "1.3"
+# projects[ctools][subdir] = "contrib"
+# projects[ctools][version] = "1.3"
 
 projects[views][subdir] = "contrib"
 projects[views][version] = "3.7"

os2web_meetings.module

@@ -7,6 +7,14 @@
 
 include_once 'os2web_meetings.features.inc';
 
+/**
+ * Implements hook_init().
+ */
+function os2web_meetings_init(){
+  drupal_add_css(drupal_get_path('module', 'os2web_meetings') . '/css/os2web_meetings.css', array('group' => CSS_THEME, 'every_page' => FALSE));
+  drupal_add_js(drupal_get_path('module', 'os2web_meetings') . '/js/os2web_meetings.js');
+}
+
 /**
  * Implements hook_FORM_alter().
  */