Skip to content

Commit 7d4e52f

Browse files
committed
update datepicker format, remove syddjurs specific stuff
1 parent 338bd76 commit 7d4e52f

File tree

2 files changed

+230
-274
lines changed

2 files changed

+230
-274
lines changed

os2web_meetings.module

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ include_once 'os2web_meetings.features.inc';
1313
function os2web_meetings_init(){
1414
drupal_add_css(drupal_get_path('module', 'os2web_meetings') . '/css/os2web_meetings.css', array('group' => CSS_THEME, 'every_page' => FALSE));
1515
drupal_add_js(drupal_get_path('module', 'os2web_meetings') . '/js/os2web_meetings.js');
16+
drupal_add_library('system', 'ui.datepicker');
1617
}
1718

1819
/**
1920
* Implements hook_FORM_alter().
2021
*/
2122
function os2web_meetings_form_views_exposed_form_alter(&$form, &$form_state) {
2223
if ($form['#id'] === 'views-exposed-form-os2web-meetings-view-search-page') {
23-
$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';
24-
$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';
2524
// Set up a validate function to forward user.
2625
$form['#validate'] = array('os2web_meetings_views_exposed_form_os2web_meetings_view_search_page_validate');
2726

@@ -30,21 +29,27 @@ function os2web_meetings_form_views_exposed_form_alter(&$form, &$form_state) {
3029

3130
// Add a little js to make the calendar icons clickable.
3231
$cal_icon = url(drupal_get_path('theme', variable_get('theme_default', NULL)) . "/images/cal.png");
33-
$datepicker = 'jQuery(document).ready(function($) {
34-
$("#edit-from-date-value-datepicker-popup-0").datepicker({
35-
showOn: "both",
36-
buttonImage: "' . $cal_icon . '",
37-
buttonImageOnly: true,
38-
dateFormat: "dd-mm-yy"
39-
});
40-
$("#edit-to-date-value-datepicker-popup-0").datepicker({
41-
showOn: "both",
42-
buttonImage: "' . $cal_icon . '",
43-
buttonImageOnly: true,
44-
dateFormat: "dd-mm-yy"
45-
});
46-
47-
});';
32+
$datepicker = '
33+
34+
35+
(function ($) {
36+
Drupal.behaviors.os2web_meetings = {
37+
attach: function(context, settings) {
38+
$("#edit-from-date-value-date").datepicker({
39+
showOn: "both",
40+
//buttonImage: "' . $cal_icon . '",
41+
buttonImageOnly: true,
42+
dateFormat: "dd-mm-yy"
43+
});
44+
$("#edit-to-date-value-date").datepicker({
45+
showOn: "both",
46+
//buttonImage: "' . $cal_icon . '",
47+
buttonImageOnly: true,
48+
dateFormat: "dd-mm-yy"
49+
});
50+
}
51+
}
52+
}(jQuery));';
4853

4954
drupal_add_js($datepicker, array(
5055
'type' => 'inline',

0 commit comments

Comments
 (0)