Skip to content

Commit 9cfc9ca

Browse files
andersbryrupandersbryrup
committed
Merge branch 'hotfix-1.0.2-beta1'
2 parents 7af2836 + fe22b83 commit 9cfc9ca

File tree

7 files changed

+135
-42
lines changed

7 files changed

+135
-42
lines changed

‎css/os2web_cp_service.css‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
.view-os2web-cp-service-cp-case-search .views-table caption{
1414
text-align: left;
1515
}
16+
.view-os2web-cp-service-cp-case-search .view-counter {
17+
18+
}
19+
.view-os2web-cp-service-cp-case-search .view-counter span {
20+
font-weight: bold;
21+
}
1622
#edit-search-text,
1723
#edit-field-os2web-cp-service-date-from-value-datepicker-popup-0,
1824
#edit-field-os2web-cp-service-date-to-value-datepicker-popup-0,
@@ -46,3 +52,11 @@
4652
th.views-field-field-os2web-cp-service-date {
4753
white-space: nowrap;
4854
}
55+
.os2web_cp_service-ajax-loader {
56+
background: url(../images/loading.gif) no-repeat;
57+
width: 20px;
58+
height: 20px;
59+
display: none;
60+
vertical-align: bottom;
61+
margin: 5px;
62+
}

‎images/loading.gif‎

4.36 KB
Loading

‎js/os2web_cp_service.js‎

Lines changed: 64 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,73 @@
44
*/
55

66
(function ($) {
7-
$(document).ready(function() {
8-
// Convert all nonalphanumeric chars to /.
9-
$('#views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1').submit(function() {
10-
// IE fix. Value and placeolder is the same on IE.
11-
if($('#edit-case-id').attr('placeholder') !== $('#edit-case-id').val()) {
12-
var value = $('#edit-case-id').val();
13-
$('#edit-case-id').val(value.replace(/\W/g, '/'));
14-
}
7+
$(document).ready(function() {
8+
// Convert all nonalphanumeric chars to /.
9+
$('#views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1').live('submit',function(e) {
10+
// Prevent double submissions.
11+
var $form = $(this);
1512

16-
// Reset dates if case id is entered.
17-
if($('#edit-case-id').val() || /^\d{2}\/\d/.test($('#edit-search-text').val())) {
18-
$('#edit-field-os2web-cp-service-date-from-value-datepicker-popup-0').val('');
19-
$('#edit-field-os2web-cp-service-date-to-value-datepicker-popup-0').val('');
20-
}
21-
});
13+
if ($form.data('submitted') === true) {
14+
// Previously submitted - don't submit again
15+
e.preventDefault();
16+
} else {
17+
// Mark it so that the next submit can be ignored
18+
$form.data('submitted', true);
19+
$form.find('button[type=submit], input[type=submit]').attr('disabled',true);
20+
}
2221

23-
$( "a.qtip-this[title]" ).qtip({
24-
style: {
25-
padding: 1,
26-
background: "#FFF",
27-
color: "black",
28-
textAlign: "center",
29-
border: {
30-
width: 1,
31-
radius: 2,
32-
color: "#DDD"
33-
},
34-
tip: "leftMiddle"
35-
},
36-
position: {
37-
corner: {
38-
target: "rightMiddle",
39-
tooltip: "leftMiddle"
40-
},
41-
adjust: {
42-
x : 10
22+
// IE fix. Value and placeolder is the same on IE.
23+
if($('#edit-case-id').attr('placeholder') !== $('#edit-case-id').val()) {
24+
var value = $('#edit-case-id').val();
25+
$('#edit-case-id').val(value.replace(/\W/g, '/'));
4326
}
27+
28+
// Reset dates if case id is entered.
29+
if($('#edit-case-id').val() || /^\d{2}\/\d/.test($('#edit-search-text').val())) {
30+
$('#edit-field-os2web-cp-service-date-from-value-datepicker-popup-0').val('');
31+
$('#edit-field-os2web-cp-service-date-to-value-datepicker-popup-0').val('');
32+
}
33+
});
34+
35+
$('#views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1 .form-submit').click(function(e){
36+
var $ajaxLoader = $('.os2web_cp_service-ajax-loader').css('display', 'inline-block');
37+
setTimeout(function() {
38+
$ajaxLoader.hide();
39+
}, 5000);
40+
});
41+
42+
$('.views-field-field-os2web-cp-service-file-id a').click(function(e){
43+
// Find the ajax loader in next td in table.
44+
var $ajaxLoader = $(this).parent().parent().find('.os2web_cp_service-ajax-loader').css('display', 'inline-block');
45+
setTimeout(function() {
46+
$ajaxLoader.hide();
47+
}, 5000);
48+
});
49+
50+
if(typeof $( "a.qtip-this[title]" ).qtip === 'function') {
51+
$("a.qtip-this[title]").qtip({
52+
style: {
53+
padding: 1,
54+
background: "#FFF",
55+
color: "black",
56+
textAlign: "center",
57+
border: {
58+
width: 1,
59+
radius: 2,
60+
color: "#DDD"
61+
},
62+
tip: "leftMiddle"
63+
},
64+
position: {
65+
corner: {
66+
target: "rightMiddle",
67+
tooltip: "leftMiddle"
68+
},
69+
adjust: {
70+
x : 10
71+
}
72+
}
73+
});
4474
}
4575
});
46-
});
4776
})(jQuery);

‎os2web_cp_service.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dependencies[] = menu
1717
dependencies[] = node
1818
dependencies[] = number
1919
dependencies[] = options
20-
dependencies[] = os2web_acadre_esdh
2120
dependencies[] = page_manager
2221
dependencies[] = panels
2322
dependencies[] = pathauto
@@ -87,6 +86,7 @@ features[views_view][] = os2web_cp_service_cp_case_view
8786
features[views_view][] = os2web_cp_service_cp_document_view
8887
features_exclude[field][node-os2web_cp_service_cp_case-field_os2web_cp_service_case_num] = node-os2web_cp_service_cp_case-field_os2web_cp_service_case_num
8988
features_exclude[field][node-os2web_cp_service_cp_document-field_os2web_cp_service_doc_num] = node-os2web_cp_service_cp_document-field_os2web_cp_service_doc_num
89+
features_exclude[field][node-os2web_cp_service_cp_case-field_os2web_cp_service_searchmt] = node-os2web_cp_service_cp_case-field_os2web_cp_service_searchmt
9090
features_exclude[dependencies][os2web_cp_service] = os2web_cp_service
9191
features_exclude[dependencies][taxonomies_and_taxonomy_importers] = taxonomies_and_taxonomy_importers
9292
timestamp = 1364292909

‎os2web_cp_service.module‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,14 @@ function os2web_cp_service_create_case(array $data) {
318318
try {
319319
node_submit($node);
320320
node_save($node);
321+
322+
// Trigger a cache reload by calling the URL for the node.
323+
$cache_trigger = curl_init(url('sag/' . $node->field_os2web_cp_service_case_id[LANGUAGE_NONE][0]['value'], array('absolute' => TRUE)));
324+
// Stop the call after 1 sec. Dont care about the response.
325+
curl_setopt($cache_trigger, CURLOPT_TIMEOUT, 1);
326+
curl_exec($cache_trigger);
327+
curl_close($cache_trigger);
328+
321329
return TRUE;
322330
}
323331
catch (Exception $e) {
@@ -522,6 +530,13 @@ function os2web_cp_service_create_document(array $data) {
522530
try {
523531
node_submit($node);
524532
node_save($node);
533+
534+
// Trigger a cache reload by calling the URL for the node.
535+
$cache_trigger = curl_init(url('dok/' . $node->field_os2web_cp_service_doc_id[LANGUAGE_NONE][0]['value'], array('absolute' => TRUE)));
536+
// Stop the call after 1 sec. Dont care about the response.
537+
curl_setopt($cache_trigger, CURLOPT_TIMEOUT, 1);
538+
curl_exec($cache_trigger);
539+
curl_close($cache_trigger);
525540
}
526541
catch (Exception $e) {
527542
error_log('Error on save: ' . print_r($e->getMessage(), 1));
@@ -777,7 +792,7 @@ function os2web_cp_service_preprocess_views_exposed_form(&$variables) {
777792
break;
778793

779794
case 'filter-field_os2web_cp_service_date_value_2':
780-
$widget->suffix = '<input type="submit" name="" value="Søg" class="form-submit"></div>';
795+
$widget->suffix = '<input type="submit" name="" value="Søg" class="form-submit"><div class="os2web_cp_service-ajax-loader ajax-loader"></div></div>';
781796
break;
782797

783798
case 'filter-field_os2web_cp_service_case_id_value':

‎os2web_cp_service.pages_default.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function os2web_cp_service_default_page_manager_handlers() {
6767
$pane->configuration = array(
6868
'admin_title' => 'Gå tilbage',
6969
'title' => '',
70-
'body' => '<a href="javascript:history.go(-1)">Gå tilbage til søgning</a>',
70+
'body' => '<p><a class="button go-back-button os2web_cp_service_button" href="javascript:history.go(-1)">Gå tilbage til søgning</a></p>',
7171
'format' => 'full_html',
7272
'substitute' => 1,
7373
);
@@ -263,7 +263,7 @@ function os2web_cp_service_default_page_manager_pages() {
263263
),
264264
);
265265
$display->cache = array();
266-
$display->title = '';
266+
$display->title = 'Åben Indsigt';
267267
$display->content = array();
268268
$display->panels = array();
269269
$pane = new stdClass();

‎os2web_cp_service.views_default.inc‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function os2web_cp_service_views_default_views() {
3131
$handler->display->display_options['query']['options']['distinct'] = TRUE;
3232
$handler->display->display_options['exposed_form']['type'] = 'basic';
3333
$handler->display->display_options['exposed_form']['options']['submit_button'] = 'Filtrer';
34-
$handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Gendan';
34+
$handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Nulstil';
3535
$handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sortér efter';
3636
$handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Stigende';
3737
$handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Faldende';
@@ -117,6 +117,22 @@ function os2web_cp_service_views_default_views() {
117117
'empty_column' => 0,
118118
),
119119
);
120+
/* Sidefod: Global: PHP */
121+
$handler->display->display_options['footer']['php']['id'] = 'php';
122+
$handler->display->display_options['footer']['php']['table'] = 'views';
123+
$handler->display->display_options['footer']['php']['field'] = 'php';
124+
$handler->display->display_options['footer']['php']['label'] = 'Total number of results.';
125+
$handler->display->display_options['footer']['php']['php_output'] = '<?php
126+
$view = views_get_current_view();
127+
print \'<div class="view-counter">I alt blev der fundet <span>\' . $view->total_rows . \'</span> sager.</div>\';
128+
?>
129+
';
130+
/* Sidefod: Global: PHP */
131+
$handler->display->display_options['footer']['php_1']['id'] = 'php_1';
132+
$handler->display->display_options['footer']['php_1']['table'] = 'views';
133+
$handler->display->display_options['footer']['php_1']['field'] = 'php';
134+
$handler->display->display_options['footer']['php_1']['label'] = 'Reset button';
135+
$handler->display->display_options['footer']['php_1']['php_output'] = '<div><a href="<?php echo url(\'aaben-indsigt\'); ?>" class="button"><?php echo t(\'Nulstil søgning\'); ?></a></div>';
120136
/* Opførsel ved ingen resultater: Global: PHP */
121137
$handler->display->display_options['empty']['php']['id'] = 'php';
122138
$handler->display->display_options['empty']['php']['table'] = 'views';
@@ -375,7 +391,7 @@ return TRUE; // If no exposed inputs, remove all results
375391
t('Master'),
376392
t('mere'),
377393
t('Filtrer'),
378-
t('Gendan'),
394+
t('Nulstil'),
379395
t('Sortér efter'),
380396
t('Stigende'),
381397
t('Faldende'),
@@ -386,6 +402,8 @@ return TRUE; // If no exposed inputs, remove all results
386402
t('‹ Forrige'),
387403
t('Næste ›'),
388404
t('Sidste »'),
405+
t('Total number of results.'),
406+
t('Reset button'),
389407
t('Ingen Resultater'),
390408
t('Indhold entity refereret fra field_os2web_cp_service_doc_ref'),
391409
t('Sagstitel'),
@@ -569,7 +587,8 @@ return TRUE; // If no exposed inputs, remove all results
569587
$handler = $view->new_display('attachment', 'Documents', 'attachment_1');
570588
$handler->display->display_options['display_description'] = 'Attachent to display all documents for a case';
571589
$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
572-
$handler->display->display_options['pager']['type'] = 'some';
590+
$handler->display->display_options['pager']['type'] = 'none';
591+
$handler->display->display_options['pager']['options']['offset'] = '0';
573592
$handler->display->display_options['defaults']['header'] = FALSE;
574593
/* Overskrift: Global: Tekstområde */
575594
$handler->display->display_options['header']['area']['id'] = 'area';
@@ -657,6 +676,21 @@ return TRUE; // If no exposed inputs, remove all results
657676
'multiple_from' => '',
658677
'multiple_to' => '',
659678
);
679+
/* Felt: Ajax Loader */
680+
$handler->display->display_options['fields']['nothing']['id'] = 'nothing';
681+
$handler->display->display_options['fields']['nothing']['table'] = 'views';
682+
$handler->display->display_options['fields']['nothing']['field'] = 'nothing';
683+
$handler->display->display_options['fields']['nothing']['ui_name'] = 'Ajax Loader';
684+
$handler->display->display_options['fields']['nothing']['label'] = '';
685+
$handler->display->display_options['fields']['nothing']['alter']['text'] = '<div class="os2web_cp_service-ajax-loader ajax-loader" style="display:none;"></div>';
686+
$handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
687+
$handler->display->display_options['defaults']['sorts'] = FALSE;
688+
/* Sorteringskriterie: Indhold: Dokumentdato (field_os2web_cp_service_date) */
689+
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['id'] = 'field_os2web_cp_service_date_value';
690+
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['table'] = 'field_data_field_os2web_cp_service_date';
691+
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['field'] = 'field_os2web_cp_service_date_value';
692+
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['relationship'] = 'field_os2web_cp_service_doc_ref_target_id';
693+
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['order'] = 'DESC';
660694
$handler->display->display_options['defaults']['arguments'] = FALSE;
661695
/* Kontekstuelt filter: Indhold: Nid */
662696
$handler->display->display_options['arguments']['nid']['id'] = 'nid';
@@ -837,6 +871,7 @@ Se alle sager på denne addresse
837871
t('[title]'),
838872
t('Dokumentnummer'),
839873
t('Dato'),
874+
t('<div class="os2web_cp_service-ajax-loader ajax-loader" style="display:none;"></div>'),
840875
t('Page'),
841876
t('<h2>Sags Nr.: [field_os2web_cp_service_case_id]</h2>'),
842877
t('[title] <br>[nothing]'),

0 commit comments

Comments
 (0)