Merge branch 'release-1.0'

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

@@ -22,7 +22,7 @@ projects[os2web_print_send_to_friend][download][url] = "https://github.com/OS2we
 libraries[dompdf][download][type] = "git"
 libraries[dompdf][download][url] = "https://github.com/dompdf/dompdf.git"
 libraries[dompdf][download][revision] = "master"
-libraries[dompdf][destination] = "libraries"
+libraries[dompdf][destination] = "modules/contrib/print"
 
 ; Contrib modules
 
@@ -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"
@@ -65,6 +65,7 @@ projects[ds][version] = "2.2"
 
 projects[expire][subdir] = "contrib"
 projects[expire][version] = "1.0-beta1"
+projects[expire][patch][] = "http://drupal.org/files/1668584-fix-undefined-index-language.patch"
 
 projects[lightbox2][subdir] = "contrib"
 projects[lightbox2][version] = "1.0-beta1"

os2web_meetings.module

@@ -7,33 +7,49 @@
 
 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');
+  drupal_add_library('system', 'ui.datepicker');
+}
+
 /**
  * Implements hook_FORM_alter().
  */
 function os2web_meetings_form_views_exposed_form_alter(&$form, &$form_state) {
-  if ($form['#id'] === 'views-exposed-form-os2web_meetings_meetings-search-page') {
-    $form['os2web_meetings_tax_committee']['#options']['http://norddjurs.dk/%C3%85bne-dagsordener.4803.aspx?doshow4803=1&filtercontrol48031=5488&filtercontrol48032=5462&filtercontrol48033=&filtercontrol48034=0&searchword4803='] = 'Djurs Mad I/S';
-    $form['os2web_meetings_tax_committee']['#options']['http://www.norddjurs.dk/%C3%85bne-dagsordener.4803.aspx?doshow4803=1&filtercontrol48031=5473&filtercontrol48032=0&filtercontrol48033=&filtercontrol48034=0&searchword4803='] = 'Beredskabskommisionen';
+  if ($form['#id'] === 'views-exposed-form-os2web-meetings-view-search-page') {
     // Set up a validate function to forward user.
     $form['#validate'] = array('os2web_meetings_views_exposed_form_os2web_meetings_view_search_page_validate');
 
+    $form['from_date']['value']['#date_format'] = 'd-m-Y';
+    $form['to_date']['value']['#date_format'] = 'd-m-Y';
+
     // Add a little js to make the calendar icons clickable.
-    $cal_icon = drupal_get_path('theme', variable_get('theme_default', NULL)) . "/images/cal.png";
-    $datepicker = 'jQuery(document).ready(function($) {
-              $( "#edit-from-date-value-datepicker-popup-0" ).datepicker({
-                            showOn: "both",
-                            buttonImage: "' . $cal_icon . '",
-                            buttonImageOnly: true,
-                            dateFormat: "dd-mm-yy"
-              });
-              $( "#edit-to-date-value-datepicker-popup-0" ).datepicker({
-                            showOn: "both",
-                            buttonImage: "' . $cal_icon . '",
-                            buttonImageOnly: true,
-                            dateFormat: "dd-mm-yy"
-              });
-
-    });';
+    $cal_icon = url(drupal_get_path('theme', variable_get('theme_default', NULL)) . "/images/cal.png");
+    $datepicker = '
+      
+      
+      (function ($) {
+        Drupal.behaviors.os2web_meetings = {
+          attach: function(context, settings) {
+                      $("#edit-from-date-value-date").datepicker({
+                                    showOn: "both",
+                                    //buttonImage: "' . $cal_icon . '",
+                                    buttonImageOnly: true,
+                                    dateFormat: "dd-mm-yy"
+                      });
+                      $("#edit-to-date-value-date").datepicker({
+                                    showOn: "both",
+                                    //buttonImage: "' . $cal_icon . '",
+                                    buttonImageOnly: true,
+                                    dateFormat: "dd-mm-yy"
+                      });
+            }
+          }
+        }(jQuery));';
 
     drupal_add_js($datepicker, array(
       'type' => 'inline',