Merge branch 'develop'

Author: andersbryrup

os2web_meetings.features.field.inc

@@ -2323,7 +2323,7 @@ function os2web_meetings_field_default_fields() {
       'bundle' => 'os2web_meetings_tax_committee',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Hvis den taksonomi der bruges findes i en drop down list kan der angives en ekstern url som åbnes i stedet. ',
+      'description' => 'Hvis den taksonomi der bruges findes i en drop down list kan der angives en ekstern url som åbnes i stedet.',
       'display' => array(
         'default' => array(
           'label' => 'above',
@@ -2440,7 +2440,7 @@ function os2web_meetings_field_default_fields() {
   t('File');
   t('Full doc');
   t('HEXColor');
-  t('Hvis den taksonomi der bruges findes i en drop down list kan der angives en ekstern url som åbnes i stedet. ');
+  t('Hvis den taksonomi der bruges findes i en drop down list kan der angives en ekstern url som åbnes i stedet.');
   t('ID');
   t('Lokation');
   t('Meeting ID');

os2web_meetings.features.menu_links.inc

@@ -10,9 +10,9 @@
 function os2web_meetings_menu_default_menu_links() {
   $menu_links = array();
 
-  // Exported menu link: menu-indholdsmenu:dagsorden-og-referat
-  $menu_links['menu-indholdsmenu:dagsorden-og-referat'] = array(
-    'menu_name' => 'menu-indholdsmenu',
+  // Exported menu link: menu-contentmenu:dagsorden-og-referat
+  $menu_links['os2web-menu-contentmenu:dagsorden-og-referat'] = array(
+    'menu_name' => 'os2web-menu-contentmenu',
     'link_path' => 'dagsorden-og-referat',
     'router_path' => 'dagsorden-og-referat',
     'link_title' => 'Dagsordner og referater',

os2web_meetings.module

@@ -7,15 +7,45 @@
 
 include_once 'os2web_meetings.features.inc';
 
+/**
+ * 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';
     // Set up a validate function to forward user.
     $form['#validate'] = array('os2web_meetings_views_exposed_form_os2web_meetings_view_search_page_validate');
+
+    // 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"
+              });
+
+    });';
+
+    drupal_add_js($datepicker, array(
+      'type' => 'inline',
+      'scope' => 'footer',
+      'weight' => 5)
+    );
   }
 }
 
+/**
+ * Custom validate callback funtion.
+ */
 function os2web_meetings_views_exposed_form_os2web_meetings_view_search_page_validate(&$form, &$form_state) {
   $searchtext = rawurlencode($form_state['values']['search_params']);
   if (is_numeric($form_state['values']['os2web_meetings_tax_committee']) || $form_state['values']['os2web_meetings_tax_committee'] === 'All') {
@@ -31,13 +61,19 @@ function os2web_meetings_views_exposed_form_os2web_meetings_view_search_page_val
   views_exposed_form_validate($form, $form_state);
 }
 
+/**
+ * Implements hook_block_info().
+ */
 function os2web_meetings_block_info() {
   $blocks['meeting-search-block'] = array(
     'info' => 'Dagsordens søgning',
   );
   return $blocks;
 }
 
+/**
+ * Implements hook_block_view().
+ */
 function os2web_meetings_block_view($delta = '') {
   $block = array();
   switch ($delta) {