From c71b65fbdd7c1463855964c9ec65f9bbdc85908d Mon Sep 17 00:00:00 2001 From: zuuperman Date: Thu, 21 Jan 2016 16:57:02 +0100 Subject: [PATCH 01/82] Revert "UIV-1630 fix TypeError: 'undefined' is not an object (evaluating 'Drupal.ajax.prototype')" This reverts commit 638168bb7df9138cfc1ced06e3f3d81b7fb722f4. --- js/culturefeed-bootstrap.js | 128 +++++++++++++++++------------------- 1 file changed, 62 insertions(+), 66 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 9c85416..4c5e8ac 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -163,74 +163,57 @@ if (Drupal.ajax) { - if (typeof Drupal.ajax.prototype != "undefined") { - - /** - * Handler for the form redirection error. - * Custom override: Don't show an error when people are navigation away of the site. - */ - Drupal.ajax.prototype.error = function (response, uri) { - - if (!response.status) { - return; - } - - alert(Drupal.ajaxError(response, uri)); - // Remove the progress element. - if (this.progress.element) { - $(this.progress.element).remove(); - } - if (this.progress.object) { - this.progress.object.stopMonitoring(); - } - // Undo hide. - $(this.wrapper).show(); - // Re-enable the element. - $(this.element).removeClass('progress-disabled').removeAttr('disabled'); - // Reattach behaviors, if they were detached in beforeSerialize(). - if (this.form) { - var settings = response.settings || this.settings || Drupal.settings; - Drupal.attachBehaviors(this.form, settings); - } - }; - - /** - * Command to provide a bootstrap modal with drupal ajax support. - */ - Drupal.ajax.prototype.commands.bootstrapModal = function (ajax, response, status) { - - // Support for jquery datepicker. See http://stackoverflow.com/questions/21059598/implementing-jquery-datepicker-in-bootstrap-modal - var enforceModalFocusFn = $.fn.modal.Constructor.prototype.enforceFocus; - $.fn.modal.Constructor.prototype.enforceFocus = function() {}; - $('#bootstrap-modal-container').on('hidden', function() { - $.fn.modal.Constructor.prototype.enforceFocus = enforceModalFocusFn; - }); - - var wrapper = $('#bootstrap-modal-container').find('.modal-content'); - var settings = response.settings || ajax.settings || Drupal.settings; - Drupal.detachBehaviors(wrapper, settings); - - var new_content = $('
').html(response.data); - $('#bootstrap-modal-container').find('.modal-content').html(new_content); - $('#bootstrap-modal-container').modal({show : true}); - Drupal.attachBehaviors(new_content, settings); - - }; - - /** - * Command to reload current page. - */ - Drupal.ajax.prototype.commands.culturefeedGoto = function (ajax, response, status) { - - if (ajax.progress.element) { - $(ajax.element).addClass('progress-disabled').attr('disabled', 'disabled'); - $(ajax.element).append(ajax.progress.element); - } - - window.location.href = response.url; + /** + * Handler for the form redirection error. + * Custom override: Don't show an error when people are navigation away of the site. + */ + Drupal.ajax.prototype.error = function (response, uri) { + + if (!response.status) { + return; } - } + alert(Drupal.ajaxError(response, uri)); + // Remove the progress element. + if (this.progress.element) { + $(this.progress.element).remove(); + } + if (this.progress.object) { + this.progress.object.stopMonitoring(); + } + // Undo hide. + $(this.wrapper).show(); + // Re-enable the element. + $(this.element).removeClass('progress-disabled').removeAttr('disabled'); + // Reattach behaviors, if they were detached in beforeSerialize(). + if (this.form) { + var settings = response.settings || this.settings || Drupal.settings; + Drupal.attachBehaviors(this.form, settings); + } + }; + + /** + * Command to provide a bootstrap modal with drupal ajax support. + */ + Drupal.ajax.prototype.commands.bootstrapModal = function (ajax, response, status) { + + // Support for jquery datepicker. See http://stackoverflow.com/questions/21059598/implementing-jquery-datepicker-in-bootstrap-modal + var enforceModalFocusFn = $.fn.modal.Constructor.prototype.enforceFocus; + $.fn.modal.Constructor.prototype.enforceFocus = function() {}; + $('#bootstrap-modal-container').on('hidden', function() { + $.fn.modal.Constructor.prototype.enforceFocus = enforceModalFocusFn; + }); + + var wrapper = $('#bootstrap-modal-container').find('.modal-content'); + var settings = response.settings || ajax.settings || Drupal.settings; + Drupal.detachBehaviors(wrapper, settings); + + var new_content = $('
').html(response.data); + $('#bootstrap-modal-container').find('.modal-content').html(new_content); + $('#bootstrap-modal-container').modal({show : true}); + Drupal.attachBehaviors(new_content, settings); + + }; } @@ -357,4 +340,17 @@ }).length == 0; }; + /** + * Command to reload current page. + */ + Drupal.ajax.prototype.commands.culturefeedGoto = function (ajax, response, status) { + + if (ajax.progress.element) { + $(ajax.element).addClass('progress-disabled').attr('disabled', 'disabled'); + $(ajax.element).append(ajax.progress.element); + } + + window.location.href = response.url; + } + })(jQuery); From 8e06359cecb9333066671ddfbdf993615a193c6d Mon Sep 17 00:00:00 2001 From: zuuperman Date: Thu, 21 Jan 2016 16:59:55 +0100 Subject: [PATCH 02/82] UIV-1630 fix TypeError: 'undefined' is not an object (evaluating 'Drupal.ajax.prototype') --- js/culturefeed-bootstrap.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 4c5e8ac..c98f9bd 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -215,6 +215,19 @@ }; + /** + * Command to reload current page. + */ + Drupal.ajax.prototype.commands.culturefeedGoto = function (ajax, response, status) { + + if (ajax.progress.element) { + $(ajax.element).addClass('progress-disabled').attr('disabled', 'disabled'); + $(ajax.element).append(ajax.progress.element); + } + + window.location.href = response.url; + } + } if (Drupal.ACDB) { @@ -340,17 +353,4 @@ }).length == 0; }; - /** - * Command to reload current page. - */ - Drupal.ajax.prototype.commands.culturefeedGoto = function (ajax, response, status) { - - if (ajax.progress.element) { - $(ajax.element).addClass('progress-disabled').attr('disabled', 'disabled'); - $(ajax.element).append(ajax.progress.element); - } - - window.location.href = response.url; - } - })(jQuery); From bf42948d1c817af40158b86d3aa059f679f5c981 Mon Sep 17 00:00:00 2001 From: zuuperman Date: Fri, 22 Jan 2016 17:27:27 +0100 Subject: [PATCH 03/82] UIV-1618: The login button is now a variable that only contains an url --- templates/culturefeed-calendar-page.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/culturefeed-calendar-page.tpl.php b/templates/culturefeed-calendar-page.tpl.php index a5c21fd..cecc802 100644 --- a/templates/culturefeed-calendar-page.tpl.php +++ b/templates/culturefeed-calendar-page.tpl.php @@ -16,9 +16,9 @@ - +
- +
    From 7b1262ccae3ff4b7982b082ba98030d25d54adc0 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Mon, 25 Jan 2016 17:24:39 +0100 Subject: [PATCH 04/82] UIV-1602 theme culturefeed calendar --- ...turefeed-calendar-activities-going.tpl.php | 25 +++- ...turefeed-calendar-activities-liked.tpl.php | 2 +- ...culturefeed-calendar-activity-mini.tpl.php | 25 ++-- ...turefeed-calendar-activity-summary.tpl.php | 132 ++++++++---------- .../culturefeed-calendar-button-hover.tpl.php | 2 +- templates/culturefeed-calendar-page.tpl.php | 117 +++++++++------- .../culturefeed-calendar-share-page.tpl.php | 53 +++---- 7 files changed, 186 insertions(+), 170 deletions(-) diff --git a/templates/culturefeed-calendar-activities-going.tpl.php b/templates/culturefeed-calendar-activities-going.tpl.php index 7d41650..2edc9ea 100644 --- a/templates/culturefeed-calendar-activities-going.tpl.php +++ b/templates/culturefeed-calendar-activities-going.tpl.php @@ -6,21 +6,38 @@ ?>
    + + + + $activities): ?> -

    - + + $activity): ?> $activity, 'my_calendar' => $my_calendar)) ?> + +
    + + +
    + + +
    -

    +

    +
    + array('date_range' => $months_helpers[$m]['first_day'] . " - " . $months_helpers[$m]['last_day'] ))); ?> +

    +
    + -
    \ No newline at end of file + diff --git a/templates/culturefeed-calendar-activities-liked.tpl.php b/templates/culturefeed-calendar-activities-liked.tpl.php index 6ef6a73..77f7253 100644 --- a/templates/culturefeed-calendar-activities-liked.tpl.php +++ b/templates/culturefeed-calendar-activities-liked.tpl.php @@ -7,7 +7,7 @@
    -

    +

    diff --git a/templates/culturefeed-calendar-activity-mini.tpl.php b/templates/culturefeed-calendar-activity-mini.tpl.php index 170bc09..a90ce58 100644 --- a/templates/culturefeed-calendar-activity-mini.tpl.php +++ b/templates/culturefeed-calendar-activity-mini.tpl.php @@ -5,16 +5,15 @@ */ ?> - - - - - +
    +

    + +
    +     +

    + + + + +

    +
    diff --git a/templates/culturefeed-calendar-activity-summary.tpl.php b/templates/culturefeed-calendar-activity-summary.tpl.php index ed82daa..3bb52c6 100644 --- a/templates/culturefeed-calendar-activity-summary.tpl.php +++ b/templates/culturefeed-calendar-activity-summary.tpl.php @@ -4,83 +4,63 @@ * Template for the calendar summary of an activity. */ ?> -
    -
      -
    • -
      -
      - - - - - - -
      - - - - - - -
      +
      +
      + +
      + + +
      + + +
      + + +
      - +

      -

      + +

      +
      -
      • - -
    • -
      -
      - -
      -
      - -
      - -
      - - -
      - - - - - - - -
      -
      -
      • - - -
    • -
      -
      - -
      -
      - -
      - - -
      - - -
      - - - :
      - -
      -
      -
      • - -
    • - - - -
      • -
    + +
    +
      + +
    • + +
      + +
      + + +
      + + + + + + + +
      • + +
    + +
    + + + + + + + + + + + + +
    + + diff --git a/templates/culturefeed-calendar-button-hover.tpl.php b/templates/culturefeed-calendar-button-hover.tpl.php index 05ef736..86a980d 100644 --- a/templates/culturefeed-calendar-button-hover.tpl.php +++ b/templates/culturefeed-calendar-button-hover.tpl.php @@ -1,5 +1,5 @@ diff --git a/templates/culturefeed-calendar-page.tpl.php b/templates/culturefeed-calendar-page.tpl.php index cecc802..3a8a442 100644 --- a/templates/culturefeed-calendar-page.tpl.php +++ b/templates/culturefeed-calendar-page.tpl.php @@ -5,70 +5,87 @@ */ ?> - -
    -

    - - - - - - -

    -
    - -
    - +
    +
    +
    +

    + + + + + +

    - -
    +
    + +
    +
    + +
    +
    - - - +
    +
    +
    -

    +

    - +
    - +
    - -
    - - +
    +
    + -

    +

    + +

    +

    - + +
    diff --git a/templates/culturefeed-calendar-share-page.tpl.php b/templates/culturefeed-calendar-share-page.tpl.php index 28f91bd..2f3b323 100644 --- a/templates/culturefeed-calendar-share-page.tpl.php +++ b/templates/culturefeed-calendar-share-page.tpl.php @@ -6,44 +6,47 @@ ?> - - -

    -

    -

    -

    - - - Google+ - -

    -

    - - - Twitter - + + - + - Mail + + .

    -

    +

    - - - - - From ed46daf5d26751126a4f3062953f745645c143da Mon Sep 17 00:00:00 2001 From: Lieven Goudeseune Date: Tue, 2 Feb 2016 14:40:54 +0100 Subject: [PATCH 05/82] WKS-250: Don't add calendar buttons if event is already started. --- templates/culturefeed-calendar-button.tpl.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/culturefeed-calendar-button.tpl.php b/templates/culturefeed-calendar-button.tpl.php index d220ab6..f8916cd 100644 --- a/templates/culturefeed-calendar-button.tpl.php +++ b/templates/culturefeed-calendar-button.tpl.php @@ -8,7 +8,9 @@
    - + + + From b4c15a8d93a2cb2f7c833ad62d94a06bcb770970 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 2 Feb 2016 15:28:55 +0100 Subject: [PATCH 06/82] UPS-1832 fix wrong UiTPAS number --- template.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/template.php b/template.php index 2d73459..72ba199 100644 --- a/template.php +++ b/template.php @@ -2689,19 +2689,20 @@ function culturefeed_bootstrap_preprocess_culturefeed_uitpas_profile_details(&$v 'type' => 'ul', 'attributes' => array(), 'title' => '', - ); + ); + foreach ($passholder->cardSystemSpecific as $card_system_specific) { - if ($card_system_specific->currentCard) { - - $output = isset($card_system_specific->currentCard->uitpasNumber)?:'' . ' (' . $card_system_specific->cardSystem->name . ')'; - if ($card_system_specific->kansenStatuut && time() < $card_system_specific->kansenStatuutEndDate) { - $status_end_date = t('valid till !date', array('!date' => date('j/m/Y', $card_system_specific->kansenStatuutEndDate))); - $output .= '
    ' . $status_end_date; - } - $uitpas_numbers['items'][] = $output; - + $cardsystemnumber = isset($card_system_specific->currentCard->uitpasNumber) ? $card_system_specific->currentCard->uitpasNumber : ''; + $output = $cardsystemnumber . ' (' . $card_system_specific->cardSystem->name . ')'; + if ($card_system_specific->kansenStatuut && time() < $card_system_specific->kansenStatuutEndDate) { + $status_end_date = t('valid till !date', array('!date' => date('j/m/Y', $card_system_specific->kansenStatuutEndDate))); + $output .= '
    ' . $status_end_date; } + $uitpas_numbers['items'][] = array( + 'class' => array(drupal_html_class($card_system_specific->cardSystem->name)), + 'data' => $output, + ); } $uitpas_numbers_output = '

    ' . $vars['uitpas_numbers_title'] . ':

    '; $uitpas_numbers_output .= theme('item_list', $uitpas_numbers); From b768a4b86819e714a3f04844d4b0b40d7d2bb816 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 2 Feb 2016 15:30:15 +0100 Subject: [PATCH 07/82] UPS-1832 use when_md date format in event-summary --- templates/culturefeed-event-summary.tpl.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/templates/culturefeed-event-summary.tpl.php b/templates/culturefeed-event-summary.tpl.php index b9b91d1..03421ae 100644 --- a/templates/culturefeed-event-summary.tpl.php +++ b/templates/culturefeed-event-summary.tpl.php @@ -74,27 +74,17 @@
    - +
    - - - - - +

    -

    - - - -

    - From 341c1854255d9764bbd71a820d6f5e26463f1286 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 2 Feb 2016 15:30:54 +0100 Subject: [PATCH 08/82] UPS-1832 add all promotions link to promotion detail --- templates/culturefeed-uitpas-advantage.tpl.php | 5 +++++ templates/culturefeed-uitpas-promotion.tpl.php | 3 +++ 2 files changed, 8 insertions(+) diff --git a/templates/culturefeed-uitpas-advantage.tpl.php b/templates/culturefeed-uitpas-advantage.tpl.php index f451726..f3f7e61 100644 --- a/templates/culturefeed-uitpas-advantage.tpl.php +++ b/templates/culturefeed-uitpas-advantage.tpl.php @@ -108,3 +108,8 @@
    + +
    + + + \ No newline at end of file diff --git a/templates/culturefeed-uitpas-promotion.tpl.php b/templates/culturefeed-uitpas-promotion.tpl.php index 8cc3400..390a4aa 100644 --- a/templates/culturefeed-uitpas-promotion.tpl.php +++ b/templates/culturefeed-uitpas-promotion.tpl.php @@ -119,3 +119,6 @@ +
    + + \ No newline at end of file From 95770acd301cfba0228cb5672037a416e86492b2 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Wed, 3 Feb 2016 10:35:10 +0100 Subject: [PATCH 09/82] UPS-1832 theme connected channels list --- .../culturefeed-ui-service-consumer-summary.tpl.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/templates/culturefeed-ui-service-consumer-summary.tpl.php b/templates/culturefeed-ui-service-consumer-summary.tpl.php index 9b4c9c5..ca6fd9f 100644 --- a/templates/culturefeed-ui-service-consumer-summary.tpl.php +++ b/templates/culturefeed-ui-service-consumer-summary.tpl.php @@ -1,7 +1,4 @@ -
    -
    -
    -
    -
    -
    -
    +

    +

    +
    +

    \ No newline at end of file From d2b7621a5b1f6544aabc9f9fae7eaf33f956987b Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Wed, 3 Feb 2016 10:36:39 +0100 Subject: [PATCH 10/82] UPS-1832 theme result title for promotions table --- .../culturefeed-uitpas-profile-advantages.tpl.php | 13 +++++++------ .../culturefeed-uitpas-profile-promotions.tpl.php | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/templates/culturefeed-uitpas-profile-advantages.tpl.php b/templates/culturefeed-uitpas-profile-advantages.tpl.php index 9c0f7c6..a1e3d46 100644 --- a/templates/culturefeed-uitpas-profile-advantages.tpl.php +++ b/templates/culturefeed-uitpas-profile-advantages.tpl.php @@ -2,17 +2,18 @@ /** * @file - * Default theme implementation to display culturefeed uitpas profile + * Default theme implementation to display culturefeed uitpas advantages * advantages. * * Available variables: - * - $advantages_table: The list of advantages. + * - $page_elements: feedback position of the pager. + * - $profile_advantages_table: The list of advantages. + * - $info: Info text. */ ?> - -
    -
    +
    +

    -
    +
    diff --git a/templates/culturefeed-uitpas-profile-promotions.tpl.php b/templates/culturefeed-uitpas-profile-promotions.tpl.php index 3638646..ea4f0f6 100644 --- a/templates/culturefeed-uitpas-profile-promotions.tpl.php +++ b/templates/culturefeed-uitpas-profile-promotions.tpl.php @@ -12,8 +12,8 @@ */ ?>
    -
    +

    -
    +
    From 28ea65ef9a5e99c8674b61b2ea6d81c0f5382b11 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Wed, 3 Feb 2016 11:28:50 +0100 Subject: [PATCH 11/82] UIV-1581 If advantages aren't shown above promotions, fall back to tabs to toggle between both --- template.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/template.php b/template.php index 72ba199..fca9887 100644 --- a/template.php +++ b/template.php @@ -2180,6 +2180,34 @@ function culturefeed_bootstrap_js_alter(&$javascript) { } +function culturefeed_bootstrap_form_culturefeed_uitpas_advantages_filter_sort_alter(&$form, &$form_state) { + + // Advantages. + $form['advantages_link']['#attributes']['class'][] = 'nav nav-tabs'; + $promotions = $form['advantages_link']['#links']['promotions']; + $form['advantages_link']['#links']['promotions lead'] = $promotions; + unset($form['advantages_link']['#links']['promotions']); + $advantages = $form['advantages_link']['#links']['advantages']; + $form['advantages_link']['#links']['advantages lead'] = $advantages; + unset($form['advantages_link']['#links']['advantages']); + + return $form; +} + +function culturefeed_bootstrap_form_culturefeed_uitpas_promotions_filter_sort_alter(&$form, &$form_state) { + + // Promotions. + $form['promotions_link']['#attributes']['class'][] = 'nav nav-tabs'; + $promotions = $form['promotions_link']['#links']['promotions']; + $form['promotions_link']['#links']['promotions lead'] = $promotions; + unset($form['promotions_link']['#links']['promotions']); + $advantages = $form['promotions_link']['#links']['advantages']; + $form['promotions_link']['#links']['advantages lead'] = $advantages; + unset($form['promotions_link']['#links']['advantages']); + + return $form; +} + function culturefeed_bootstrap_form_culturefeed_uitpas_profile_advantages_filter_sort_alter(&$form, &$form_state) { // Profile advantages. From 3b01c50e645e8d5514c93e8e0c0102ef47131de0 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Wed, 3 Feb 2016 13:50:09 +0100 Subject: [PATCH 12/82] UPS-1832 theme promotion + advantage detail --- .../culturefeed-uitpas-advantage.tpl.php | 23 ++++++++--------- .../culturefeed-uitpas-promotion.tpl.php | 25 ++++++++----------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/templates/culturefeed-uitpas-advantage.tpl.php b/templates/culturefeed-uitpas-advantage.tpl.php index f3f7e61..7df13be 100644 --- a/templates/culturefeed-uitpas-advantage.tpl.php +++ b/templates/culturefeed-uitpas-advantage.tpl.php @@ -15,23 +15,26 @@ ?>
    - -
    -

    -
    - +

    + + + + +

    - +

    + +

    -

    Info

    +
    -

    - -     		- - - - -
    @@ -42,9 +45,6 @@ - - - - - -
    @@ -53,9 +53,6 @@
    diff --git a/templates/culturefeed-uitpas-promotion.tpl.php b/templates/culturefeed-uitpas-promotion.tpl.php index 390a4aa..dec8c62 100644 --- a/templates/culturefeed-uitpas-promotion.tpl.php +++ b/templates/culturefeed-uitpas-promotion.tpl.php @@ -17,26 +17,29 @@ ?>
    -
    +

    + + + -

    -

    -
    + + -
    -
    +

    - +

    + +

    -

    Info

    +
    @@ -47,9 +50,6 @@ - - - - - - From e61a69705ca2d2ea7f2460e9933a341b8ca0df79 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 28 Jul 2017 13:40:56 +0200 Subject: [PATCH 57/82] CF-448 format contact phone data with mobile detect in javascript --- js/culturefeed-bootstrap.js | 42 ++++++++++++++++++------ templates/culturefeed-event.tpl.php | 4 ++- templates/culturefeed-production.tpl.php | 5 ++- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 7051279..c52fbcf 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -401,17 +401,39 @@ // Format phones for mobile. // Contact phone - if (Drupal.settings.culturefeed_agenda.contact.phones) { - var phones = Drupal.settings.culturefeed_agenda.contact.phones; - - if (md.mobile()) { - var linkPhones = Array(); + if (Drupal.settings.culturefeed_agenda) { + if (Drupal.settings.culturefeed_agenda.contact) { + if (Drupal.settings.culturefeed_agenda.contact.phones) { + var phones = Drupal.settings.culturefeed_agenda.contact.phones; + + if (md.mobile()) { + var linkPhones = Array(); + + $.each(phones, function (key, phone) { + linkPhones[key] = '' + phone + ''; + }); + phones = linkPhones.join(', '); + $('.phone-placeholder').html(phones); + } + } + } - $.each(phones, function (key, phone) { - linkPhones[key] = '' + phone + ''; - }); - phones = linkPhones.join(', '); - $('.phone-placeholder').html(phones); + // Reservation phone + if (Drupal.settings.culturefeed_agenda.reservation) { + if (Drupal.settings.culturefeed_agenda.reservation.phones) { + var resPhones = Drupal.settings.culturefeed_agenda.reservation.phones; + + if (md.mobile()) { + var linkResPhones = Array(); + resPhones = resPhones.split(', '); + + $.each(resPhones, function (key, phone) { + linkResPhones[key] = '' + phone + ''; + }); + resPhones = linkResPhones.join(', '); + $('.reservation-phone-placeholder').html(resPhones); + } + } } } } diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index c4c1f4b..295ab4e 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -121,7 +121,9 @@
    -
    + + +
    diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index 5ae4e02..ca4cf67 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -97,7 +97,10 @@ -
    + + + +
    From 07993c339c7236623c8e2b5bb5103c14479da541 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 28 Jul 2017 13:41:41 +0200 Subject: [PATCH 58/82] CF-448 formatted contact phone data also for events and productions --- templates/culturefeed-event.tpl.php | 4 +++- templates/culturefeed-production.tpl.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index 295ab4e..9f35703 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -138,7 +138,9 @@
    -
    + + +
    diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index ca4cf67..5566a1d 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -112,7 +112,9 @@
    -
    + + +
    From 5e171608a031a936248e47bdda1d0fbf508537ca Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 28 Jul 2017 13:43:59 +0200 Subject: [PATCH 59/82] CF-448 split phones string to array --- js/culturefeed-bootstrap.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index c52fbcf..4f98993 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -408,6 +408,7 @@ if (md.mobile()) { var linkPhones = Array(); + phones = phones.split(', '); $.each(phones, function (key, phone) { linkPhones[key] = '' + phone + ''; From 8e30adfe19eacba7d26d8cb6881e51fd644415ab Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Tue, 1 Aug 2017 10:26:54 +0200 Subject: [PATCH 60/82] CF-448 remove unnecessary jquery class --- js/culturefeed-bootstrap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 4f98993..31279f1 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -411,7 +411,7 @@ phones = phones.split(', '); $.each(phones, function (key, phone) { - linkPhones[key] = '' + phone + ''; + linkPhones[key] = '' + phone + ''; }); phones = linkPhones.join(', '); $('.phone-placeholder').html(phones); @@ -429,7 +429,7 @@ resPhones = resPhones.split(', '); $.each(resPhones, function (key, phone) { - linkResPhones[key] = '' + phone + ''; + linkResPhones[key] = '' + phone + ''; }); resPhones = linkResPhones.join(', '); $('.reservation-phone-placeholder').html(resPhones); From 6f0c955d63421111f8f5a9b604fb03d75f7015e1 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Thu, 24 Aug 2017 12:59:47 +0200 Subject: [PATCH 61/82] CF-481 override default my uitpas profile box item template --- .../culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php diff --git a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php new file mode 100644 index 0000000..d98272d --- /dev/null +++ b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 26b10f14d6df965a79123146a3bc4173a21c6698 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 25 Aug 2017 14:10:10 +0200 Subject: [PATCH 62/82] CF-481 fix issue --- .../culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php index d98272d..1a8e546 100644 --- a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php +++ b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php @@ -1,4 +1,4 @@ - + - + ptn \ No newline at end of file From cf85b47ff47911ef8d19009039ef0501419f8e6e Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Fri, 25 Aug 2017 15:45:04 +0200 Subject: [PATCH 63/82] CF-481 pull the points label to the right --- templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php index 1a8e546..97d5123 100644 --- a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php +++ b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php @@ -1,4 +1,4 @@ - ptn + ptn \ No newline at end of file From a9786d9d27f45353db461c72f1137c44ad5c16e1 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Thu, 31 Aug 2017 15:30:14 +0200 Subject: [PATCH 64/82] WKS-257 theme already subscribed message --- ...feed-mailing-content-block-already-subscribed.tpl.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php b/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php index 0d26b3e..7c4f220 100644 --- a/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php +++ b/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php @@ -5,5 +5,10 @@ */ ?> -
    -
    +
    +
    + +
    + +
    +
    From 425d5495177663138d0594b6c2d7b7260697258e Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 1 Sep 2017 15:08:19 +0200 Subject: [PATCH 65/82] CF-481 use new url parameter instead of path --- templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php index 97d5123..e361e82 100644 --- a/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php +++ b/templates/culturefeed-uitpas-my-uitpas-profile-box-item.tpl.php @@ -1,4 +1,4 @@ - + ptn \ No newline at end of file From 59d74a283829b1fcaa62949b266b04bc3999cc21 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Fri, 1 Sep 2017 16:49:09 +0200 Subject: [PATCH 66/82] CEP-1276 make deduplication of short and long description work for single paragraph descriptions --- templates/culturefeed-actor.tpl.php | 20 +++++++++++++++----- templates/culturefeed-event.tpl.php | 16 ++++++++++++---- templates/culturefeed-production.tpl.php | 16 ++++++++++++---- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/templates/culturefeed-actor.tpl.php b/templates/culturefeed-actor.tpl.php index 6cab229..866cc9b 100644 --- a/templates/culturefeed-actor.tpl.php +++ b/templates/culturefeed-actor.tpl.php @@ -9,11 +9,21 @@
    - -

    - -

    - +

    + +

    + +
    + +
    +
    + +
    + + + + +

    @@ -64,9 +64,6 @@
    From 1745803f7d96cd5891c4196d6c9ca21e932e6d47 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Mon, 8 Feb 2016 15:24:41 +0100 Subject: [PATCH 13/82] UPS-1832 use when_md date format in event-mini-summary --- templates/culturefeed-event-mini-summary.tpl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/culturefeed-event-mini-summary.tpl.php b/templates/culturefeed-event-mini-summary.tpl.php index 823890d..6b290f8 100644 --- a/templates/culturefeed-event-mini-summary.tpl.php +++ b/templates/culturefeed-event-mini-summary.tpl.php @@ -35,10 +35,10 @@
    - + - - + +

    From 25ba855d7315c52f6b9b06cc8d68b98f8a2c094c Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Mon, 8 Feb 2016 15:24:57 +0100 Subject: [PATCH 14/82] UPS-1832 theme profile section block for non uitpas holders --- template.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/template.php b/template.php index fca9887..0922753 100644 --- a/template.php +++ b/template.php @@ -2763,3 +2763,21 @@ function culturefeed_bootstrap_preprocess_culturefeed_uitpas_profile_details(&$v } + +/** + * Implements hook_preprocess_culturefeed_uitpas_profile_section_register(). + */ +function culturefeed_bootstrap_preprocess_culturefeed_uitpas_profile_section_register(&$vars) { + + if(culturefeed_uitpas_not_yet_registered()) { + $vars['intro_title'] = t('You did not register your UiTPAS yet.'); + $vars['intro_text'] = t('Register here, so you can follow your UiTPAS advantages and points balance online.'); + $vars['cta_link'] = l(t('Register your UiTPAS'), 'register_uitpas', array('attributes' => array('class' => array('btn', 'btn-primary', 'btn-block')))); + } + + else { + $vars['intro_title'] = t('No UiTPAS yet?'); + $vars['intro_text'] = t('Holders of an UiTPAS can earn points by participating in leisure activities and exchange them for') . ' ' . l(t('nice benefits'), 'promotions') . '.'; + $vars['cta_link'] = l(t('Get an UiTPAS'), 'register_where', array('attributes' => array('class' => array('btn', 'btn-primary', 'btn-block')))); + } +} From 30a29b3927a46f3ae5dcf43f134843c7d600e6e6 Mon Sep 17 00:00:00 2001 From: zuuperman Date: Mon, 8 Feb 2016 16:46:35 +0100 Subject: [PATCH 15/82] WKS-250: Change check on finished and started --- templates/culturefeed-calendar-button.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/culturefeed-calendar-button.tpl.php b/templates/culturefeed-calendar-button.tpl.php index f8916cd..e0f0404 100644 --- a/templates/culturefeed-calendar-button.tpl.php +++ b/templates/culturefeed-calendar-button.tpl.php @@ -8,7 +8,7 @@
    - + From b502e9c31af33fd9abefb71c03ab5fba090274a2 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 16 Feb 2016 14:08:37 +0100 Subject: [PATCH 16/82] UPS-1832 theme promotions and advantages table --- less/culturefeed/user-overviews.less | 45 +++++++++++++++++++ ...ulturefeed-uitpas-advantages-table.tpl.php | 8 ++-- ...turefeed-uitpas-profile-advantages.tpl.php | 2 +- ...turefeed-uitpas-profile-promotions.tpl.php | 2 +- ...ulturefeed-uitpas-promotions-table.tpl.php | 8 ++-- 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/less/culturefeed/user-overviews.less b/less/culturefeed/user-overviews.less index 7c7d865..216a4c2 100644 --- a/less/culturefeed/user-overviews.less +++ b/less/culturefeed/user-overviews.less @@ -1,9 +1,54 @@ /* overview shared styles */ .overview { + margin-bottom: 30px; figure img { max-width: 100%; height: auto; } + article { + border-bottom: 1px solid darken(@gray-lighter, 5%); + color: @gray; + padding: 15px; + position: relative; + .transition(background .2s ease-in-out); + &:first-child { + border-top: 1px solid @gray-lighter; + margin-top: 5px; + } + } + .content { + @media screen and (min-width: @screen-xs) { + padding-left: 15px; + overflow: hidden; + } + } + aside { + border-top: 1px dashed @white; + padding-top: 10px; + margin-top: 10px; + .label { + float: left; + margin-bottom: 5px; + + .small { + clear: both; + display: inline-block; + } + } + @media screen and (min-width: @screen-md) { + border-top: none; + margin-top: 0; + padding-top: 0; + text-align: right; + .label { + float: none; + } + } + } + h2 { + font-size: ceil(@font-size-base * 1.5); /* like h3 */ + font-weight: normal; + margin: 10px 0 0; + } /* Enhance with flex for browsers that understand */ article { diff --git a/templates/culturefeed-uitpas-advantages-table.tpl.php b/templates/culturefeed-uitpas-advantages-table.tpl.php index 5b554c3..c8d0649 100644 --- a/templates/culturefeed-uitpas-advantages-table.tpl.php +++ b/templates/culturefeed-uitpas-advantages-table.tpl.php @@ -1,6 +1,6 @@
    -
    +
    @@ -9,14 +9,16 @@
    -

    +

    - + + +
    diff --git a/templates/culturefeed-uitpas-profile-advantages.tpl.php b/templates/culturefeed-uitpas-profile-advantages.tpl.php index a1e3d46..7d36a02 100644 --- a/templates/culturefeed-uitpas-profile-advantages.tpl.php +++ b/templates/culturefeed-uitpas-profile-advantages.tpl.php @@ -12,7 +12,7 @@ */ ?>
    -

    +

    diff --git a/templates/culturefeed-uitpas-profile-promotions.tpl.php b/templates/culturefeed-uitpas-profile-promotions.tpl.php index ea4f0f6..7b15ccf 100644 --- a/templates/culturefeed-uitpas-profile-promotions.tpl.php +++ b/templates/culturefeed-uitpas-profile-promotions.tpl.php @@ -12,7 +12,7 @@ */ ?>
    -

    +

    diff --git a/templates/culturefeed-uitpas-promotions-table.tpl.php b/templates/culturefeed-uitpas-promotions-table.tpl.php index cf69e14..cadd3b5 100644 --- a/templates/culturefeed-uitpas-promotions-table.tpl.php +++ b/templates/culturefeed-uitpas-promotions-table.tpl.php @@ -1,6 +1,6 @@
    -
    +
    @@ -9,14 +9,16 @@
    -

    +

    - + + +
    From 865757f8ff713f0e70938cfa64dc56e85c462d27 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 16 Feb 2016 15:13:04 +0100 Subject: [PATCH 17/82] UPS-1832 theme promotions and advantages table --- less/culturefeed/uitpas.less | 62 ++++++++++++++++++- less/culturefeed/user-overviews.less | 45 -------------- ...ulturefeed-uitpas-advantages-table.tpl.php | 2 +- ...turefeed-uitpas-profile-advantages.tpl.php | 2 +- ...turefeed-uitpas-profile-promotions.tpl.php | 2 +- ...ulturefeed-uitpas-promotions-table.tpl.php | 2 +- 6 files changed, 65 insertions(+), 50 deletions(-) diff --git a/less/culturefeed/uitpas.less b/less/culturefeed/uitpas.less index fd658f5..62110e5 100644 --- a/less/culturefeed/uitpas.less +++ b/less/culturefeed/uitpas.less @@ -24,4 +24,64 @@ width: 25%; margin-right: 10px; } -} \ No newline at end of file +} + +/* promotion and advantages filters */ + +.filters-regions { + .results-title { + margin-top: 15px; + margin-bottom: 5px; + font-size: ceil(@font-size-base * 1.25); + } +} + +/* promotion and advantages table styles */ + +.overview { + margin-bottom: 30px; + article { + border-bottom: 1px solid darken(@gray-lighter, 5%); + color: @gray; + padding: 15px; + position: relative; + .transition(background .2s ease-in-out); + &:first-child { + border-top: 1px solid @gray-lighter; + margin-top: 5px; + } + } + .content { + @media screen and (min-width: @screen-xs) { + padding-left: 15px; + overflow: hidden; + } + } + aside { + border-top: 1px dashed @white; + padding-top: 10px; + margin-top: 10px; + .label { + float: left; + margin-bottom: 5px; + + .small { + clear: both; + display: inline-block; + } + } + @media screen and (min-width: @screen-md) { + border-top: none; + margin-top: 0; + padding-top: 0; + text-align: right; + .label { + float: none; + } + } + } + h2 { + font-size: ceil(@font-size-base * 1.5); /* like h3 */ + font-weight: normal; + margin: 10px 0 0; + } +} diff --git a/less/culturefeed/user-overviews.less b/less/culturefeed/user-overviews.less index 216a4c2..7c7d865 100644 --- a/less/culturefeed/user-overviews.less +++ b/less/culturefeed/user-overviews.less @@ -1,54 +1,9 @@ /* overview shared styles */ .overview { - margin-bottom: 30px; figure img { max-width: 100%; height: auto; } - article { - border-bottom: 1px solid darken(@gray-lighter, 5%); - color: @gray; - padding: 15px; - position: relative; - .transition(background .2s ease-in-out); - &:first-child { - border-top: 1px solid @gray-lighter; - margin-top: 5px; - } - } - .content { - @media screen and (min-width: @screen-xs) { - padding-left: 15px; - overflow: hidden; - } - } - aside { - border-top: 1px dashed @white; - padding-top: 10px; - margin-top: 10px; - .label { - float: left; - margin-bottom: 5px; - + .small { - clear: both; - display: inline-block; - } - } - @media screen and (min-width: @screen-md) { - border-top: none; - margin-top: 0; - padding-top: 0; - text-align: right; - .label { - float: none; - } - } - } - h2 { - font-size: ceil(@font-size-base * 1.5); /* like h3 */ - font-weight: normal; - margin: 10px 0 0; - } /* Enhance with flex for browsers that understand */ article { diff --git a/templates/culturefeed-uitpas-advantages-table.tpl.php b/templates/culturefeed-uitpas-advantages-table.tpl.php index c8d0649..c19a72e 100644 --- a/templates/culturefeed-uitpas-advantages-table.tpl.php +++ b/templates/culturefeed-uitpas-advantages-table.tpl.php @@ -17,7 +17,7 @@ - +
    diff --git a/templates/culturefeed-uitpas-profile-advantages.tpl.php b/templates/culturefeed-uitpas-profile-advantages.tpl.php index 7d36a02..9333eb4 100644 --- a/templates/culturefeed-uitpas-profile-advantages.tpl.php +++ b/templates/culturefeed-uitpas-profile-advantages.tpl.php @@ -11,7 +11,7 @@ * - $info: Info text. */ ?> -
    +

    diff --git a/templates/culturefeed-uitpas-profile-promotions.tpl.php b/templates/culturefeed-uitpas-profile-promotions.tpl.php index 7b15ccf..79d1379 100644 --- a/templates/culturefeed-uitpas-profile-promotions.tpl.php +++ b/templates/culturefeed-uitpas-profile-promotions.tpl.php @@ -11,7 +11,7 @@ * - $info: Info text. */ ?> -
    +

    diff --git a/templates/culturefeed-uitpas-promotions-table.tpl.php b/templates/culturefeed-uitpas-promotions-table.tpl.php index cadd3b5..eb4c319 100644 --- a/templates/culturefeed-uitpas-promotions-table.tpl.php +++ b/templates/culturefeed-uitpas-promotions-table.tpl.php @@ -17,7 +17,7 @@ - +
    From 1cfbb3faaeb431f48cdf0b5b787b344310c4a3d7 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 16 Feb 2016 15:47:37 +0100 Subject: [PATCH 18/82] UPS-1832 theme register where form --- less/culturefeed/uitpas.less | 50 +++++++++++++++++++++++++++----- less/culturefeed/user-forms.less | 48 ------------------------------ 2 files changed, 43 insertions(+), 55 deletions(-) diff --git a/less/culturefeed/uitpas.less b/less/culturefeed/uitpas.less index 62110e5..47e3099 100644 --- a/less/culturefeed/uitpas.less +++ b/less/culturefeed/uitpas.less @@ -16,13 +16,49 @@ #culturefeed-uitpas-register-where-filter-form { .well(); - label, - select#edit-location, - .form-type-select, - button { - display: inline; - width: 25%; - margin-right: 10px; + .form-type-select { + display: block; + margin: 0 0 10px; + width: 100%; + label { + display: block; + margin-bottom: 5px; + width: 100%; + } + } + @media screen and (min-width: @screen-xs) { + .form-type-checkbox { + float: left; + margin: 0; + padding: 7px 20px; + width: 50%; + } + .form-submit { + margin: 0; + width: 50%; + } + } + @media screen and (min-width: @screen-md) { + .form-type-select { + float: left; + padding-right: 15px; + width: 50%; + label { + float: left; + padding: 7px 15px 7px 0; + margin: 0; + width: 32%; + } + .form-control { + width: 68%; + } + } + .form-type-checkbox { + width: 30%; + } + .form-submit { + width: 20%; + } } } diff --git a/less/culturefeed/user-forms.less b/less/culturefeed/user-forms.less index 67cd010..c4a4ddb 100644 --- a/less/culturefeed/user-forms.less +++ b/less/culturefeed/user-forms.less @@ -14,51 +14,3 @@ width: 100%; } } - -// register where -#culturefeed-uitpas-register-where-filter-form { - .form-type-select { - display: block; - margin: 0 0 10px; - width: 100%; - label { - display: block; - margin-bottom: 5px; - width: 100%; - } - } - @media screen and (min-width: @screen-xs) { - .form-type-checkbox { - float: left; - margin: 0; - padding: 7px 20px; - width: 50%; - } - .form-submit { - margin: 0; - width: 50%; - } - } - @media screen and (min-width: @screen-md) { - .form-type-select { - float: left; - padding-right: 15px; - width: 50%; - label { - float: left; - padding: 7px 15px 7px 0; - margin: 0; - width: 30%; - } - .form-control { - width: 70%; - } - } - .form-type-checkbox { - width: 30%; - } - .form-submit { - width: 20%; - } - } -} From 005a4e757a83e1df16a903a6d8b3b4eb21735b82 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 16 Feb 2016 17:51:51 +0100 Subject: [PATCH 19/82] UPS-1832 theme openinghours and date formats --- templates/culturefeed-actor.tpl.php | 2 +- templates/culturefeed-event.tpl.php | 2 +- templates/culturefeed-production.tpl.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/culturefeed-actor.tpl.php b/templates/culturefeed-actor.tpl.php index f53c594..e435c0c 100644 --- a/templates/culturefeed-actor.tpl.php +++ b/templates/culturefeed-actor.tpl.php @@ -15,7 +15,7 @@

    - +
    diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index 5725b64..4b752fb 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -31,7 +31,7 @@

    -
    +
    diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index 7008afd..318f7a2 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -30,7 +30,7 @@

    -
    +
    From fdce0d0dea652c142fd00924c8f6a41686d7ed88 Mon Sep 17 00:00:00 2001 From: Lieven Goudeseune Date: Wed, 24 Feb 2016 16:01:29 +0100 Subject: [PATCH 20/82] WKS-257: Add message if user already subscribed. --- ...feed-mailing-content-block-already-subscribed.tpl.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 templates/culturefeed-mailing-content-block-already-subscribed.tpl.php diff --git a/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php b/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php new file mode 100644 index 0000000..0d26b3e --- /dev/null +++ b/templates/culturefeed-mailing-content-block-already-subscribed.tpl.php @@ -0,0 +1,9 @@ + + +
    +
    From 1698085ba29418e0c14f0b4b71205dd4ce143cae Mon Sep 17 00:00:00 2001 From: Reinout Bossuyt Date: Fri, 26 Feb 2016 16:41:06 +0100 Subject: [PATCH 21/82] UIV-1651 theming uitpas promotions highlight --- less/culturefeed/uitpas.less | 50 +++++++++++++++++-- ...refeed-uitpas-promotions-highlight.tpl.php | 26 ++++++++++ 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 templates/culturefeed-uitpas-promotions-highlight.tpl.php diff --git a/less/culturefeed/uitpas.less b/less/culturefeed/uitpas.less index 47e3099..1f53f57 100644 --- a/less/culturefeed/uitpas.less +++ b/less/culturefeed/uitpas.less @@ -29,7 +29,7 @@ @media screen and (min-width: @screen-xs) { .form-type-checkbox { float: left; - margin: 0; + margin: 0; padding: 7px 20px; width: 50%; } @@ -66,8 +66,8 @@ .filters-regions { .results-title { - margin-top: 15px; - margin-bottom: 5px; + margin-top: 15px; + margin-bottom: 5px; font-size: ceil(@font-size-base * 1.25); } } @@ -121,3 +121,47 @@ margin: 10px 0 0; } } + + +.promotions-highlight-list-item { + position: relative; + padding-top: 75%; + margin-bottom: 30px; + background-color: #777; + overflow: hidden; + + img { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: auto; + } + + .promotions-highlight-title { + font-size: @font-size-base; + margin-top: 0; + margin-bottom: 6px; + } + + .promotions-highlight-details { + background-color: #FFF; + position: absolute; + bottom: 0; + left: 0; + right: 0; + padding: 9px; + } + + .promotions-highlight-points{ + background-color: @uitpas-brand-primary; + } + + &:hover { + .promotions-highlight-details { + background-color: #ccc; + } + } + + +} diff --git a/templates/culturefeed-uitpas-promotions-highlight.tpl.php b/templates/culturefeed-uitpas-promotions-highlight.tpl.php new file mode 100644 index 0000000..9c15920 --- /dev/null +++ b/templates/culturefeed-uitpas-promotions-highlight.tpl.php @@ -0,0 +1,26 @@ +
    + +
    + + +
    +
    + + +
    +

    +

    +
    +
    +
    + + +
    + +
    +
    +

    +
    +
    + +
    From e83717c1b9be77e79ab603b603c05e5b0c36bbfb Mon Sep 17 00:00:00 2001 From: Reinout Bossuyt Date: Wed, 2 Mar 2016 16:24:56 +0100 Subject: [PATCH 22/82] UIV-1712 include week-weekscheme in calendar-modal --- less/culturefeed/calendar.less | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/less/culturefeed/calendar.less b/less/culturefeed/calendar.less index f0fa86a..f609318 100644 --- a/less/culturefeed/calendar.less +++ b/less/culturefeed/calendar.less @@ -26,6 +26,31 @@ form[id^=culturefeed-calendar-form] { padding: 0; } + .cf-period, + .cf-openinghours { + .sr-only() + } + + .form-type-date-popup li { + font-size: @font-size-small; + color: @gray-light; + display: inline; + } + + .form-type-date-popup ul { + font-size: @font-size-small; + color: @gray-light; + margin: 6px 0 0 0; + + &:before + { + content: "\f017"; + font-family: "FontAwesome"; + color: @gray-light; + display: inline-block; + } + } + .form-item-date-date label { .sr-only(); } From 9ab12316361e40e0a016b5262770f24a5b426e0a Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Mon, 4 Apr 2016 11:27:43 +0200 Subject: [PATCH 23/82] UPS-1832 transform 'Show all advantages' into translatable string --- templates/culturefeed-uitpas-advantage.tpl.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/culturefeed-uitpas-advantage.tpl.php b/templates/culturefeed-uitpas-advantage.tpl.php index 7df13be..f8e5898 100644 --- a/templates/culturefeed-uitpas-advantage.tpl.php +++ b/templates/culturefeed-uitpas-advantage.tpl.php @@ -108,5 +108,4 @@
    - - \ No newline at end of file + From 93552a993283c72677909b633fe4c299f810584e Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Mon, 4 Apr 2016 15:36:25 +0200 Subject: [PATCH 24/82] UPS-1832 make 'Show aal promotions' translatable --- templates/culturefeed-uitpas-promotion.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/culturefeed-uitpas-promotion.tpl.php b/templates/culturefeed-uitpas-promotion.tpl.php index dec8c62..f72adc8 100644 --- a/templates/culturefeed-uitpas-promotion.tpl.php +++ b/templates/culturefeed-uitpas-promotion.tpl.php @@ -118,4 +118,4 @@
    - \ No newline at end of file + \ No newline at end of file From 3410f10ae52f2b992b3b77158def02caa646f948 Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Tue, 12 Apr 2016 15:26:17 +0200 Subject: [PATCH 25/82] MSS-256 Fix skiplink --- js/culturefeed-bootstrap.js | 5 +++ less/overrides.less | 24 ++++++++++++++ templates/html.tpl.php | 63 +++++++++++++++++++++++++++++++++++++ templates/page.tpl.php | 3 +- 4 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 templates/html.tpl.php diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index c98f9bd..9fcc455 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -9,6 +9,11 @@ e.preventDefault() }) + // skip-link focus + $("a[href^='#']").click(function() { + $("#"+$(this).attr("href").slice(1)+"").focus(); + }); + // popover - authentication required if (!Drupal.settings.culturefeed || !Drupal.settings.culturefeed.isCultureFeedUser) { diff --git a/less/overrides.less b/less/overrides.less index bb8c278..4ac14c4 100644 --- a/less/overrides.less +++ b/less/overrides.less @@ -91,6 +91,30 @@ body { width: 1px; } +// Skip link. +#skip-link { + a:focus { + background-color: @brand-primary; + border-radius: 5px; + color: @white; + display: inline-block; + margin-bottom: 30px; + outline: thin dotted; + padding: 5px 10px; + text-decoration: none; + width: auto; + } + a:active { + background-color: darken(@brand-primary, 10%); + } +} +#main-content { + &:focus { + outline: inherit; + } +} + + // Branding. .navbar .logo { margin-right: -15px; diff --git a/templates/html.tpl.php b/templates/html.tpl.php new file mode 100644 index 0000000..bdcd8e6 --- /dev/null +++ b/templates/html.tpl.php @@ -0,0 +1,63 @@ +language contains its textual representation. + * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'. + * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document. + * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data. + * - $head_title: A modified version of the page title, for use in the TITLE + * tag. + * - $head_title_array: (array) An associative array containing the string parts + * that were used to generate the $head_title variable, already prepared to be + * output as TITLE tag. The key/value pairs may contain one or more of the + * following, depending on conditions: + * - title: The title of the current page, if any. + * - name: The name of the site. + * - slogan: The slogan of the site, if any, and if there is no title. + * - $head: Markup for the HEAD section (including meta tags, keyword tags, and + * so on). + * - $styles: Style tags necessary to import all CSS files for the page. + * - $scripts: Script tags necessary to load the JavaScript files and settings + * for the page. + * - $page_top: Initial markup from any modules that have altered the + * page. This variable should always be output first, before all other dynamic + * content. + * - $page: The rendered page content. + * - $page_bottom: Final closing markup from any modules that have altered the + * page. This variable should always be output last, after all other dynamic + * content. + * - $classes String of classes that can be used to style contextually through + * CSS. + * + * @see template_preprocess() + * @see template_preprocess_html() + * @see template_process() + * + * @ingroup themeable + */ +?> +> + + + + <?php print $head_title; ?> + + + +> + + + + + + diff --git a/templates/page.tpl.php b/templates/page.tpl.php index f12957b..a1a0f54 100644 --- a/templates/page.tpl.php +++ b/templates/page.tpl.php @@ -134,11 +134,10 @@ - > + id="main-content" tabindex="-1">
    -

    From 8a08cc12eafed0efe310d215398187ef7e7c24bc Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Wed, 13 Apr 2016 11:29:02 +0200 Subject: [PATCH 26/82] MSS-270 Breadcrumbs: added invisible element: You are here --- templates/page.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/page.tpl.php b/templates/page.tpl.php index a1a0f54..ed88e1b 100644 --- a/templates/page.tpl.php +++ b/templates/page.tpl.php @@ -124,7 +124,7 @@
    - + ' . t('You are here') . ':' . $breadcrumb; endif;?>
    From c0f5c4f47f09ff85dae87acdf4989d6c4b619e1c Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Wed, 13 Apr 2016 14:38:07 +0200 Subject: [PATCH 27/82] MSS-266 Overview filters structuur: make actual headers instead of p for block titles --- templates/block.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/block.tpl.php b/templates/block.tpl.php index 78cea88..a19aa90 100644 --- a/templates/block.tpl.php +++ b/templates/block.tpl.php @@ -2,7 +2,7 @@ - >

    + > From dc69253780f99a8d658ddd141b911f0c2919dd6e Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Wed, 13 Apr 2016 16:46:43 +0200 Subject: [PATCH 28/82] MSS-267 Structuur wedstrijdreglement: styling for competition rules nested ol's with class comp-rules added to first level ol --- less/content.less | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/less/content.less b/less/content.less index f83569b..7eadfb7 100644 --- a/less/content.less +++ b/less/content.less @@ -1 +1,38 @@ // Insert your styling here. + +// Styling lists competition rules +.comp-rules, +.comp-rules ol { + counter-reset: counter; + list-style-type: none; + margin: 0 0 1.5em; + padding: 0; + li { + position: relative; + margin-bottom: 1.5em; + padding-left: 1.2em; + } + li li { + margin-bottom: .5em; + padding-left: 2.2em; + } + li:before { + counter-increment: counter; + content: counters(counter,".") ". "; + font-weight: bold; + line-height: 1.1; + position: absolute; + top: 0; + left: 0; + } + li li:before { + line-height: 1.428571429; + } +} + +.comp-rules h2 { + font-size: 1em; + font-weight: bold; + margin-bottom: .5em; + margin-top: 0; +} From e9fa79721c8d038a2c8bd736053735672a9d49d7 Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Thu, 14 Apr 2016 16:43:47 +0200 Subject: [PATCH 29/82] MSS-269 Overview promoties remove role main & asides --- templates/culturefeed-uitpas-advantages-table.tpl.php | 8 ++++---- templates/culturefeed-uitpas-promotions-table.tpl.php | 8 ++++---- templates/page.tpl.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/culturefeed-uitpas-advantages-table.tpl.php b/templates/culturefeed-uitpas-advantages-table.tpl.php index c19a72e..47d67c3 100644 --- a/templates/culturefeed-uitpas-advantages-table.tpl.php +++ b/templates/culturefeed-uitpas-advantages-table.tpl.php @@ -1,9 +1,9 @@
    -
    +
    -
    +
    @@ -22,12 +22,12 @@
    - +
    diff --git a/templates/culturefeed-uitpas-promotions-table.tpl.php b/templates/culturefeed-uitpas-promotions-table.tpl.php index eb4c319..67a3165 100644 --- a/templates/culturefeed-uitpas-promotions-table.tpl.php +++ b/templates/culturefeed-uitpas-promotions-table.tpl.php @@ -1,9 +1,9 @@
    -
    +
    -
    +
    @@ -22,12 +22,12 @@
    - +
    diff --git a/templates/page.tpl.php b/templates/page.tpl.php index ed88e1b..bdcf538 100644 --- a/templates/page.tpl.php +++ b/templates/page.tpl.php @@ -122,7 +122,7 @@ -
    +
    ' . t('You are here') . ':' . $breadcrumb; endif;?> From 0132f9c2661982dbad0fe1073bb5f20622859304 Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Mon, 18 Apr 2016 09:34:46 +0200 Subject: [PATCH 30/82] MSS-263 Broncode check: html doctype html5 & lang redeclaration --- templates/html.tpl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/html.tpl.php b/templates/html.tpl.php index bdcd8e6..db9efee 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -42,9 +42,9 @@ * * @ingroup themeable */ -?> -> +?> + +> From 45478067341f7b02052be01a2325d61cb4dc524d Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Mon, 18 Apr 2016 11:19:36 +0200 Subject: [PATCH 31/82] MSS-259 Datepicker: focus to first field on open and back to trigger on cancel --- js/daterangepicker-bind.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/js/daterangepicker-bind.js b/js/daterangepicker-bind.js index 2f2230d..d4ad892 100644 --- a/js/daterangepicker-bind.js +++ b/js/daterangepicker-bind.js @@ -137,8 +137,15 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {}; scrollTop: offset.top - 120, scrollLeft: offset.left - 120 }); + // move focus to first field for anysurfer + $('.daterangepicker input[name="daterangepicker_start"]').focus(); e.preventDefault(); }); + + pickerlink.on('cancel.daterangepicker', function (ev, picker) { + // move focus back to triggerlink after cancel for anysurfer + pickerlink.focus(); + }); }; })(jQuery); From dbf339aaac915834afb3d913d23f2d2e73e1a37b Mon Sep 17 00:00:00 2001 From: Julie Vanopdenbosch Date: Mon, 18 Apr 2016 16:07:36 +0200 Subject: [PATCH 32/82] MSS-276 Structuur forms: dropdown to buttons, ara-expanded --- js/culturefeed-bootstrap.js | 10 ++++++++++ less/culturefeed/search-ui.less | 1 + template.php | 4 ++-- .../culturefeed-pages-block-admin-options.tpl.php | 2 +- templates/culturefeed-search-page.tpl.php | 2 +- templates/culturefeed-ui-my-uitid.tpl.php | 2 +- templates/culturefeed-ui-profile-box.tpl.php | 4 ++-- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 9fcc455..5cd294a 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -14,6 +14,16 @@ $("#"+$(this).attr("href").slice(1)+"").focus(); }); + // Temp adding aria-expanded to dropdown untill base bootstrap is updated + $('.dropdown-toggle').click(function(){ + var status = $(this).attr('aria-expanded'); + if(status == 'false'){ + $(this).attr('aria-expanded', 'true'); + } else { + $(this).attr('aria-expanded', 'false'); + } + }); + // popover - authentication required if (!Drupal.settings.culturefeed || !Drupal.settings.culturefeed.isCultureFeedUser) { diff --git a/less/culturefeed/search-ui.less b/less/culturefeed/search-ui.less index 2d182a3..9c184c8 100644 --- a/less/culturefeed/search-ui.less +++ b/less/culturefeed/search-ui.less @@ -125,6 +125,7 @@ .cf-sort-label { display: inline-block; + font-weight: normal; padding: 4px 10px; } diff --git a/template.php b/template.php index 0922753..451a0d5 100644 --- a/template.php +++ b/template.php @@ -2109,13 +2109,13 @@ function culturefeed_bootstrap_culturefeed_search_sort_links(&$variables) { } $output = '
    '; - $output .= ''; + $output .= ''; $output .= '
      '; foreach ($variables['links'] as $link) { $output .= '
    • ' . theme('link', $link) . '
      • '; diff --git a/templates/culturefeed-pages-block-admin-options.tpl.php b/templates/culturefeed-pages-block-admin-options.tpl.php index ece2151..c95b5ab 100644 --- a/templates/culturefeed-pages-block-admin-options.tpl.php +++ b/templates/culturefeed-pages-block-admin-options.tpl.php @@ -18,7 +18,7 @@
      - +
      diff --git a/templates/culturefeed-search-page.tpl.php b/templates/culturefeed-search-page.tpl.php index ae5a1b1..0b9484f 100644 --- a/templates/culturefeed-search-page.tpl.php +++ b/templates/culturefeed-search-page.tpl.php @@ -16,7 +16,7 @@

    diff --git a/templates/culturefeed-ui-my-uitid.tpl.php b/templates/culturefeed-ui-my-uitid.tpl.php index 11e4fd6..e8ca69f 100644 --- a/templates/culturefeed-ui-my-uitid.tpl.php +++ b/templates/culturefeed-ui-my-uitid.tpl.php @@ -1,5 +1,5 @@
    -
    diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index c4f67df..971d1e6 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -144,9 +144,6 @@
    - - - diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index 318f7a2..aa627ae 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -119,9 +119,6 @@
    - - - From 608ed6a814474bc00afd43c1b2723f398e1e901d Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 7 Apr 2017 11:01:17 +0200 Subject: [PATCH 46/82] CF-448 custom script for adding mobile-detect helper classes to body tag --- js/culturefeed-bootstrap.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 5cd294a..23c927b 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -368,4 +368,37 @@ }).length == 0; }; + /** + * Add mobile detect helper classes to the body tag. + */ + Drupal.behaviors.culturefeedMobileDetect = { + attach: function(context, settings) { + var bodyClasses = []; + var md = new MobileDetect(window.navigator.userAgent); + + if (md.mobile() !== null) { + if (md.tablet() !== null) { + bodyClasses.push('isTablet'); + } + else { + bodyClasses.push('isPhone'); + } + } + else { + bodyClasses.push('isComputer'); + } + + if (md.os() === 'AndroidOs') { + bodyClasses.push('isAndroid'); + } + if (md.os() === 'iOS') { + bodyClasses.push('isIOS'); + } + + $.each(bodyClasses, function (key, value) { + $('body').addClass(value); + }); + } + }; + })(jQuery); From 23982a8a30a223a88ec1e59dc85862d643f783c9 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Wed, 19 Apr 2017 15:54:38 +0200 Subject: [PATCH 47/82] CF-448 move logic for map to JS --- js/culturefeed-bootstrap.js | 33 +++++++++++++++++++++++++++++ templates/culturefeed-event.tpl.php | 8 +------ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 23c927b..aa83066 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -401,4 +401,37 @@ } }; + /** + * Add the right map link + */ + Drupal.behaviors.culturefeedAddMapLink = { + attach: function (context, settings) { + var md = new MobileDetect(window.navigator.userAgent); + var title = Drupal.settings.culturefeed_map.title; + var zip = Drupal.settings.culturefeed_map.info.location.zip; + var city = Drupal.settings.culturefeed_map.info.location.city; + var street = Drupal.settings.culturefeed_map.info.location.street; + var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; + var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; + var querystring = title; + var mapLink = ''; + + if (zip) { querystring = querystring + '+' + zip; } + if (city) { querystring = querystring + '+' + city; } + if (street) { querystring = querystring + '+' + street; } + + if (md.os() === 'iOS') { + mapLink = '' + Drupal.t('Open map') + ''; + } + else if (md.os() === 'AndroidOs') { + mapLink = '' + Drupal.t('Open map') + ''; + } + else { + mapLink = ''; + } + + $('.map-js-link').html(mapLink); + } + }; + })(jQuery); diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index 971d1e6..a4cccb7 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -43,13 +43,7 @@ From 8c7147fa4b47be61accfe0d12e5c09b751739960 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Thu, 20 Apr 2017 12:13:55 +0200 Subject: [PATCH 51/82] CF-448 mobile detect js for map and telephone in productions --- templates/culturefeed-production.tpl.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index aa627ae..639562b 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -42,13 +42,7 @@ From a209abf2858a74aa45a70fc63095bd3061a60383 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Thu, 20 Apr 2017 12:15:33 +0200 Subject: [PATCH 52/82] CF-448 mobile detect js for map and telephones in actors --- templates/culturefeed-actor.tpl.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/templates/culturefeed-actor.tpl.php b/templates/culturefeed-actor.tpl.php index 6cab229..c5fdde0 100644 --- a/templates/culturefeed-actor.tpl.php +++ b/templates/culturefeed-actor.tpl.php @@ -22,13 +22,7 @@ From 03a2b2366853adb9a0ad1ce69d798f8c56cd1a90 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Thu, 20 Apr 2017 12:27:54 +0200 Subject: [PATCH 53/82] CF-448 mobile detect js for reservation phone numbers in events and productions --- js/culturefeed-bootstrap.js | 75 +++++++++++++++--------- templates/culturefeed-event.tpl.php | 2 +- templates/culturefeed-production.tpl.php | 2 +- 3 files changed, 50 insertions(+), 29 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 242c68d..51f026a 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -414,36 +414,40 @@ if (Drupal.settings.culturefeed_map) { var md = new MobileDetect(window.navigator.userAgent); var title = Drupal.settings.culturefeed_map.title; - var zip = Drupal.settings.culturefeed_map.info.location.zip; - var city = Drupal.settings.culturefeed_map.info.location.city; - var street = Drupal.settings.culturefeed_map.info.location.street; - var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; - var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; - var querystring = title; - var mapLink = ''; - - if (zip) { - querystring = querystring + '+' + zip; - } - if (city) { - querystring = querystring + '+' + city; - } - if (street) { - querystring = querystring + '+' + street; - } + // Map + if (Drupal.settings.culturefeed_map.info.location) { + var zip = Drupal.settings.culturefeed_map.info.location.zip; + var city = Drupal.settings.culturefeed_map.info.location.city; + var street = Drupal.settings.culturefeed_map.info.location.street; + var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; + var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; + var querystring = title; + var mapLink = ''; + + if (zip) { + querystring = querystring + '+' + zip; + } + if (city) { + querystring = querystring + '+' + city; + } + if (street) { + querystring = querystring + '+' + street; + } - if (md.os() === 'iOS') { - mapLink = '' + Drupal.t('Open map') + ''; - } - else if (md.os() === 'AndroidOS') { - mapLink = '' + Drupal.t('Open map') + ''; - } - else { - mapLink = ''; - } + if (md.os() === 'iOS') { + mapLink = '' + Drupal.t('Open map') + ''; + } + else if (md.os() === 'AndroidOS') { + mapLink = '' + Drupal.t('Open map') + ''; + } + else { + mapLink = ''; + } - $('.map-js-link').html(mapLink); + $('.map-js-link').html(mapLink); + } + // Contact phone if (Drupal.settings.culturefeed_map.info.contact.phone) { var phones = Drupal.settings.culturefeed_map.info.contact.phone; @@ -459,6 +463,23 @@ $('.phone-placeholder').html(phones); } + + // Reservation phone + if (Drupal.settings.culturefeed_map.info.reservation.phone) { + var resPhones = Drupal.settings.culturefeed_map.info.reservation.phone; + + if (md.mobile()) { + var linkResPhones = Array(); + resPhones = resPhones.split(', '); + + $.each(resPhones, function (key, phone) { + linkResPhones[key] = '' + phone + ''; + }); + resPhones = linkResPhones.join(', '); + } + + $('.reservation-phone-placeholder').html(resPhones); + } } } }; diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index 79cc077..c4c1f4b 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -121,7 +121,7 @@
    -
    +
    diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index 639562b..5ae4e02 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -97,7 +97,7 @@ - +
    From 5c5e9ca13315908751c625de8cc4a091c57b62a3 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Thu, 1 Jun 2017 20:15:09 +0200 Subject: [PATCH 54/82] CEP-1196 fix remove comment modal --- less/culturefeed/social.less | 11 ++++++++++- template.php | 12 ++++++------ .../culturefeed-social-comment-list-item.tpl.php | 7 +++++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/less/culturefeed/social.less b/less/culturefeed/social.less index acae3ad..b3dca43 100644 --- a/less/culturefeed/social.less +++ b/less/culturefeed/social.less @@ -54,4 +54,13 @@ display: inline-block; padding: 4px; } -} \ No newline at end of file +} + +/* activity delete link confirmation modal */ + +#culturefeed-social-page-activity-delete-confirm-form { + .button-decline { + .btn-link(); + margin-left: 15px; + } +} diff --git a/template.php b/template.php index 50330ae..af3f196 100644 --- a/template.php +++ b/template.php @@ -1872,11 +1872,11 @@ function culturefeed_bootstrap_preprocess_culturefeed_social_comment_list_item(& $remove_path = 'culturefeed/activity/delete/' . $activity->id; $attributes = array( - /*'class' => array('remove-link', 'use-ajax'), + 'class' => array('remove-link'), 'role' => 'button', 'data-toggle' => 'modal', 'data-target' => '#delete-wrapper-' . $activity->id, - 'data-remote' => url($remove_path . "/ajax", array('query' => $destination)),*/ + 'data-remote' => url($remove_path . "/ajax", array('query' => $destination)), ); if ($variables['level'] == 0) { @@ -1890,11 +1890,11 @@ function culturefeed_bootstrap_preprocess_culturefeed_social_comment_list_item(& $comment_url = 'culturefeed/activity/comment/' . $activity->id; $attributes = array( - /*'class' => array('comment-link link-icon'), + 'class' => array('comment-link link-icon'), 'role' => 'button', 'data-toggle' => 'modal', 'data-target' => '#comment-wrapper-' . $activity->id, - 'data-remote' => url($comment_url . "/ajax", array('query' => $destination)),*/ + 'data-remote' => url($comment_url . "/ajax", array('query' => $destination)), ); $variables['comment_link'] = l(t('Reply'), $comment_url . '/nojs', array( @@ -1939,11 +1939,11 @@ function culturefeed_bootstrap_preprocess_culturefeed_social_comment_list_item(& $abuse_url = 'culturefeed/activity/report-abuse/' . $activity->id; $attributes = array( - /*'class' => array('comment-abuse-link'), + 'class' => array('comment-abuse-link'), 'role' => 'button', 'data-toggle' => 'modal', 'data-target' => '#abuse-wrapper-' . $activity->id, - 'href' => url($abuse_url . "/ajax", array('query' => $destination)),*/ + 'href' => url($abuse_url . "/ajax", array('query' => $destination)), ); $variables['abuse_link'] = l(t('Report as inappropriate'), $abuse_url . '/nojs', array( diff --git a/templates/culturefeed-social-comment-list-item.tpl.php b/templates/culturefeed-social-comment-list-item.tpl.php index e8f9283..5bbe51d 100644 --- a/templates/culturefeed-social-comment-list-item.tpl.php +++ b/templates/culturefeed-social-comment-list-item.tpl.php @@ -45,6 +45,13 @@
    + + + From 4ee3669319efeee6d3b109b5ba9d7e3de12b252a Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Mon, 10 Jul 2017 12:13:38 +0200 Subject: [PATCH 55/82] UPS-2295 template for grouping memberships --- .../culturefeed-uitpas-memberships.tpl.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 templates/culturefeed-uitpas-memberships.tpl.php diff --git a/templates/culturefeed-uitpas-memberships.tpl.php b/templates/culturefeed-uitpas-memberships.tpl.php new file mode 100644 index 0000000..a6b4ba2 --- /dev/null +++ b/templates/culturefeed-uitpas-memberships.tpl.php @@ -0,0 +1,19 @@ + $membership_per_card_system): +?> +

    +
    - - - - - - ', '', array('attributes' => array('data-toggle' => 'collapse', 'class' => array('pull-right map-toggle')), 'fragment' => 'cf-map', 'html' => TRUE, 'external' => 'TRUE')) ?> - +

    From f4a96415271958f69064826fdfa397c03eccb334 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Wed, 19 Apr 2017 15:59:12 +0200 Subject: [PATCH 48/82] CF-448 execute map logic only when culturefeed_map settings are known. --- js/culturefeed-bootstrap.js | 54 +++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index aa83066..1a9f7d7 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -406,31 +406,39 @@ */ Drupal.behaviors.culturefeedAddMapLink = { attach: function (context, settings) { - var md = new MobileDetect(window.navigator.userAgent); - var title = Drupal.settings.culturefeed_map.title; - var zip = Drupal.settings.culturefeed_map.info.location.zip; - var city = Drupal.settings.culturefeed_map.info.location.city; - var street = Drupal.settings.culturefeed_map.info.location.street; - var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; - var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; - var querystring = title; - var mapLink = ''; - - if (zip) { querystring = querystring + '+' + zip; } - if (city) { querystring = querystring + '+' + city; } - if (street) { querystring = querystring + '+' + street; } + if (Drupal.settings.culturefeed_map) { + var md = new MobileDetect(window.navigator.userAgent); + var title = Drupal.settings.culturefeed_map.title; + var zip = Drupal.settings.culturefeed_map.info.location.zip; + var city = Drupal.settings.culturefeed_map.info.location.city; + var street = Drupal.settings.culturefeed_map.info.location.street; + var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; + var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; + var querystring = title; + var mapLink = ''; + + if (zip) { + querystring = querystring + '+' + zip; + } + if (city) { + querystring = querystring + '+' + city; + } + if (street) { + querystring = querystring + '+' + street; + } - if (md.os() === 'iOS') { - mapLink = '' + Drupal.t('Open map') + ''; - } - else if (md.os() === 'AndroidOs') { - mapLink = '' + Drupal.t('Open map') + ''; - } - else { - mapLink = ''; - } + if (md.os() === 'iOS') { + mapLink = '' + Drupal.t('Open map') + ''; + } + else if (md.os() === 'AndroidOs') { + mapLink = '' + Drupal.t('Open map') + ''; + } + else { + mapLink = ''; + } - $('.map-js-link').html(mapLink); + $('.map-js-link').html(mapLink); + } } }; From 1c87a464075129dc27c85307f0f3d8baa4ca3a88 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Wed, 19 Apr 2017 16:07:55 +0200 Subject: [PATCH 49/82] CF-448 use the correct string for checking Android --- js/culturefeed-bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 1a9f7d7..b67a62b 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -430,7 +430,7 @@ if (md.os() === 'iOS') { mapLink = '' + Drupal.t('Open map') + ''; } - else if (md.os() === 'AndroidOs') { + else if (md.os() === 'AndroidOS') { mapLink = '' + Drupal.t('Open map') + ''; } else { From b67ffc3c4639781ed85503c2eb5a9df3bab21d14 Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Thu, 20 Apr 2017 12:11:44 +0200 Subject: [PATCH 50/82] CF-448 set telephone number as link with mobile detect js --- js/culturefeed-bootstrap.js | 23 ++++++++++++++++++++++- templates/culturefeed-event.tpl.php | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index b67a62b..242c68d 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -402,8 +402,13 @@ }; /** - * Add the right map link + * Add the right links for maps and phones depending on the device. */ + function validate_phone(rawPhone) { + var phone = rawPhone.replace(new RegExp(' ', 'g'), '-'); + return phone.replace(new RegExp(/[^0-9+()]/, 'g'), ''); + } + Drupal.behaviors.culturefeedAddMapLink = { attach: function (context, settings) { if (Drupal.settings.culturefeed_map) { @@ -438,6 +443,22 @@ } $('.map-js-link').html(mapLink); + + if (Drupal.settings.culturefeed_map.info.contact.phone) { + var phones = Drupal.settings.culturefeed_map.info.contact.phone; + + if (md.mobile()) { + var linkPhones = Array(); + phones = phones.split(', '); + + $.each(phones, function (key, phone) { + linkPhones[key] = '' + phone + ''; + }); + phones = linkPhones.join(', '); + } + + $('.phone-placeholder').html(phones); + } } } }; diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index a4cccb7..79cc077 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -136,7 +136,7 @@
    -
    +
    - - - - - - ', '', array('attributes' => array('data-toggle' => 'collapse', 'class' => array('pull-right map-toggle')), 'fragment' => 'cf-map', 'html' => TRUE, 'external' => 'TRUE')) ?> - +

    @@ -115,9 +109,7 @@
    - -
    - +
    - - - - - - ', '', array('attributes' => array('data-toggle' => 'collapse', 'class' => array('pull-right map-toggle')), 'fragment' => 'cf-map', 'html' => TRUE, 'external' => 'TRUE')) ?> - +

    @@ -60,7 +54,7 @@
    -
    +
    + + + + + + + + + + +
    name; ?>endDate); ?>
    + \ No newline at end of file From 1ccb88ddad92724bc0e0141e08fd3f932e61a7ff Mon Sep 17 00:00:00 2001 From: Stijn Swaanen Date: Fri, 28 Jul 2017 12:00:03 +0200 Subject: [PATCH 56/82] CF-448 format phone numbers through javascript with mobile_detect.js --- js/culturefeed-bootstrap.js | 50 +++++++++-------------------- templates/culturefeed-actor.tpl.php | 4 ++- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 51f026a..7051279 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -398,6 +398,22 @@ $.each(bodyClasses, function (key, value) { $('body').addClass(value); }); + + // Format phones for mobile. + // Contact phone + if (Drupal.settings.culturefeed_agenda.contact.phones) { + var phones = Drupal.settings.culturefeed_agenda.contact.phones; + + if (md.mobile()) { + var linkPhones = Array(); + + $.each(phones, function (key, phone) { + linkPhones[key] = '' + phone + ''; + }); + phones = linkPhones.join(', '); + $('.phone-placeholder').html(phones); + } + } } }; @@ -446,40 +462,6 @@ $('.map-js-link').html(mapLink); } - - // Contact phone - if (Drupal.settings.culturefeed_map.info.contact.phone) { - var phones = Drupal.settings.culturefeed_map.info.contact.phone; - - if (md.mobile()) { - var linkPhones = Array(); - phones = phones.split(', '); - - $.each(phones, function (key, phone) { - linkPhones[key] = '' + phone + ''; - }); - phones = linkPhones.join(', '); - } - - $('.phone-placeholder').html(phones); - } - - // Reservation phone - if (Drupal.settings.culturefeed_map.info.reservation.phone) { - var resPhones = Drupal.settings.culturefeed_map.info.reservation.phone; - - if (md.mobile()) { - var linkResPhones = Array(); - resPhones = resPhones.split(', '); - - $.each(resPhones, function (key, phone) { - linkResPhones[key] = '' + phone + ''; - }); - resPhones = linkResPhones.join(', '); - } - - $('.reservation-phone-placeholder').html(resPhones); - } } } }; diff --git a/templates/culturefeed-actor.tpl.php b/templates/culturefeed-actor.tpl.php index c5fdde0..758b47e 100644 --- a/templates/culturefeed-actor.tpl.php +++ b/templates/culturefeed-actor.tpl.php @@ -54,7 +54,9 @@
    -
    + + +
    diff --git a/templates/culturefeed-event.tpl.php b/templates/culturefeed-event.tpl.php index 971d1e6..77c3149 100644 --- a/templates/culturefeed-event.tpl.php +++ b/templates/culturefeed-event.tpl.php @@ -24,10 +24,18 @@

    - - - -

    + +
    + +
    + +
    +
    + +
    + + +

    diff --git a/templates/culturefeed-production.tpl.php b/templates/culturefeed-production.tpl.php index aa627ae..8c29247 100644 --- a/templates/culturefeed-production.tpl.php +++ b/templates/culturefeed-production.tpl.php @@ -23,10 +23,18 @@

    - - - -

    + +
    + +
    + +
    +
    + +
    + + +

    From b20b78c47ff93897e10591365adc24d65bde8415 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Fri, 1 Sep 2017 17:05:40 +0200 Subject: [PATCH 67/82] CEP-1276 theme longdescription --- less/culturefeed/agenda.less | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/less/culturefeed/agenda.less b/less/culturefeed/agenda.less index 7d70070..680f964 100644 --- a/less/culturefeed/agenda.less +++ b/less/culturefeed/agenda.less @@ -203,3 +203,11 @@ margin-right: 4px; } } + +/* short vs long description */ + +.page-agenda { + #cf-longdescription { + margin-top: 20px; + } +} From e9c5f18b129fc37cecb1e3a4f2fa0643dc767896 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 17 Oct 2017 14:13:14 +0200 Subject: [PATCH 68/82] CF-448 add helper classes to restore original mobile detect behavior --- less/mobile-detect.less | 27 +++++++++++++++++++++++++++ less/style.less | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 less/mobile-detect.less diff --git a/less/mobile-detect.less b/less/mobile-detect.less new file mode 100644 index 0000000..21ece93 --- /dev/null +++ b/less/mobile-detect.less @@ -0,0 +1,27 @@ +body { + &.is-computer { + .hidden-computer { + display: none; + } + } + &.is-tablet { + .hidden-tablet { + display: none; + } + } + &.is-phone { + .hidden-phone { + display: none; + } + } + &.is-android { + .hidden-android { + display: none; + } + } + &.is-ios { + .hidden-ios { + display: none; + } + } +} diff --git a/less/style.less b/less/style.less index 411db29..8a03ceb 100644 --- a/less/style.less +++ b/less/style.less @@ -23,3 +23,6 @@ // Culturefeed Bootstrap theme. @import 'culturefeed.less'; + +// Mobile detect. +@import 'mobile-detect.less'; From e2e0dbd6d2411510f48afa54ec4aae71a5582e4c Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 17 Oct 2017 14:14:29 +0200 Subject: [PATCH 69/82] CF-448 make helper classes lowercase with dashes --- js/culturefeed-bootstrap.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 31279f1..a507823 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -378,21 +378,21 @@ if (md.mobile() !== null) { if (md.tablet() !== null) { - bodyClasses.push('isTablet'); + bodyClasses.push('is-tablet'); } else { - bodyClasses.push('isPhone'); + bodyClasses.push('is-phone'); } } else { - bodyClasses.push('isComputer'); + bodyClasses.push('is-computer'); } if (md.os() === 'AndroidOs') { - bodyClasses.push('isAndroid'); + bodyClasses.push('is-android'); } if (md.os() === 'iOS') { - bodyClasses.push('isIOS'); + bodyClasses.push('is-ios'); } $.each(bodyClasses, function (key, value) { From fa7525fdc49d027d3f39671d699d10a3ed0a35bb Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 17 Oct 2017 14:17:55 +0200 Subject: [PATCH 70/82] CF-448 fix typo for android body class --- js/culturefeed-bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index a507823..0cb5a65 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -388,7 +388,7 @@ bodyClasses.push('is-computer'); } - if (md.os() === 'AndroidOs') { + if (md.os() === 'AndroidOS') { bodyClasses.push('is-android'); } if (md.os() === 'iOS') { From 0cfb89b1899a7b975780fbb90140a496bb6e6c28 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 17 Oct 2017 14:18:27 +0200 Subject: [PATCH 71/82] CF-448 use consistent styling for map links --- js/culturefeed-bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 0cb5a65..96c2195 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -477,7 +477,7 @@ mapLink = '' + Drupal.t('Open map') + ''; } else if (md.os() === 'AndroidOS') { - mapLink = '' + Drupal.t('Open map') + ''; + mapLink = '' + Drupal.t('Open map') + ''; } else { mapLink = ''; From a8c952c9843f7170a8a91ca09081c7cd727a125f Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Wed, 8 Nov 2017 14:48:30 +0100 Subject: [PATCH 72/82] BVV-1315 fix typo in remove page modal --- template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.php b/template.php index af3f196..981cb50 100644 --- a/template.php +++ b/template.php @@ -1516,7 +1516,7 @@ function culturefeed_bootstrap_form_culturefeed_pages_delete_member_form_alter(& function culturefeed_bootstrap_form_culturefeed_pages_remove_page_confirm_form_alter(&$form, &$form_state, &$request_type) { if ($request_type != 'ajax') { - $modal_title = t('Remove member'); + $modal_title = t('Remove page'); $form['#prefix'] = culturefeed_bootstrap_modal_prefix($modal_title); $form['#suffix'] = culturefeed_bootstrap_modal_suffix(); } From 390cdd0b60e09da0c7d9de0208196a1e02e61b6e Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Thu, 21 Dec 2017 12:52:29 +0100 Subject: [PATCH 73/82] UIV-1922 set expires on profile-synchronization cookie --- js/synchronization.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/synchronization.js b/js/synchronization.js index a296e02..15e1e95 100644 --- a/js/synchronization.js +++ b/js/synchronization.js @@ -14,7 +14,7 @@ type: 'GET', success: function(data) { - $.cookie('profile-synchronization', 1); + $.cookie('profile-synchronization', 1, { expires: 365, path: '/' }); var new_content = "
    "; new_content += "
     - - - + + + + From bba4b698228f08b51f8430819326845e64b2157c Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Tue, 18 Dec 2018 17:26:29 +0100 Subject: [PATCH 76/82] CK-187 add keyword as parameter to basic pages search --- template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template.php b/template.php index 981cb50..77a812f 100644 --- a/template.php +++ b/template.php @@ -531,10 +531,10 @@ function culturefeed_bootstrap_preprocess_culturefeed_pages_basic_search_page(&$ } if ($variables['total_results'] > 0) { - $variables['total_results_message'] = '

    ' . t("@total pages found for @zipcode @search", array('@total' => $variables['total_results'], '@zipcode' => $variables['zipcode'], '@search' => $variables['search'], 'html' => TRUE)) . '

    '; + $variables['total_results_message'] = '

    ' . t("@total pages found for @zipcode @search @keyword", array('@total' => $variables['total_results'], '@zipcode' => $variables['zipcode'], '@search' => $variables['search'], '@keyword' => $variables['keyword'], 'html' => TRUE)) . '

    '; } else { - $variables['total_results_message'] = '

    ' .t("0 pages found for @zipcode @search", array('@zipcode' => $variables['zipcode'], '@search' => $variables['search'], 'html' => TRUE)) . '

    '; + $variables['total_results_message'] = '

    ' .t("0 pages found for @zipcode @search @keyword", array('@zipcode' => $variables['zipcode'], '@search' => $variables['search'], '@keyword' => $variables['keyword'], 'html' => TRUE)) . '

    '; } $query = drupal_get_query_parameters(); From bab111158fb77c34b5b34a7fda2d244365325896 Mon Sep 17 00:00:00 2001 From: Luk Dens Date: Mon, 11 Feb 2019 21:22:58 +0100 Subject: [PATCH 77/82] CK-250 make contactinfo less optional --- template.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template.php b/template.php index 77a812f..aa71be5 100644 --- a/template.php +++ b/template.php @@ -820,11 +820,11 @@ function culturefeed_bootstrap_form_culturefeed_pages_add_form_alter(&$form, &$f $form['contact'] = array( '#type' => 'fieldset', - '#title' => '

    ' . ' ' . t('Contact') . ' (' . t('Optional') . ')

    ', + '#title' => '

    ' . ' ' . t('Contact') . '

    ', '#default_value' => '', '#weight' => 13, '#collapsible' => TRUE, - '#collapsed' => TRUE, + '#collapsed' => FALSE, ); $form['contact']['street'] = array( @@ -847,7 +847,7 @@ function culturefeed_bootstrap_form_culturefeed_pages_add_form_alter(&$form, &$f $form['contact']['city'] = array( '#prefix' => '
    ', - '#suffix' => '
    ', + '#suffix' => '', '#type' => 'textfield', '#title' => t('City'), '#default_value' => '', @@ -1083,11 +1083,11 @@ function culturefeed_bootstrap_form_culturefeed_pages_edit_page_form_alter(&$for $form['contact'] = array( '#type' => 'fieldset', - '#title' => '

    ' . ' ' . t('Contact') . ' (' . t('Optional') . ')

    ', + '#title' => '

    ' . ' ' . t('Contact') . '

    ', '#default_value' => '', '#weight' => 10, '#collapsible' => TRUE, - '#collapsed' => TRUE, + '#collapsed' => FALSE, ); // Address. @@ -1112,7 +1112,7 @@ function culturefeed_bootstrap_form_culturefeed_pages_edit_page_form_alter(&$for $form['contact']['city'] = array( '#prefix' => '
    ', - '#suffix' => '
    ', + '#suffix' => '', '#type' => 'textfield', '#title' => t('City'), '#default_value' => $city, From 51ba603d97acbb824a2cc102e6e2bf2fc8d0ba64 Mon Sep 17 00:00:00 2001 From: Wouter Vanelslander Date: Wed, 10 Jul 2019 11:51:22 +0200 Subject: [PATCH 78/82] PUBS-63: Remove google+ links --- template.php | 20 -------------------- templates/culturefeed-page.tpl.php | 9 +-------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/template.php b/template.php index aa71be5..20d27b4 100644 --- a/template.php +++ b/template.php @@ -917,16 +917,6 @@ function culturefeed_bootstrap_form_culturefeed_pages_add_form_alter(&$form, &$f '#weight' => 15, ); - $form['contact']['linkGooglePlus'] = array( - '#type' => 'textfield', - '#title' => '', - '#default_value' => '', - '#field_prefix' => '
    ', - '#field_suffix' => '
    ', - '#attributes' => array('placeholder' => 'www.google.com/mypage'), - '#weight' => 16, - ); - $form['contact']['linkYouTube'] = array( '#type' => 'textfield', '#title' => '', @@ -1184,16 +1174,6 @@ function culturefeed_bootstrap_form_culturefeed_pages_edit_page_form_alter(&$for '#weight' => 19, ); - $form['contact']['linkGooglePlus'] = array( - '#type' => 'textfield', - '#title' => '', - '#default_value' => isset($links['linkGooglePlus']) ? $links['linkGooglePlus'] : '', - '#field_prefix' => '
    ', - '#field_suffix' => '
    ', - '#attributes' => array('placeholder' => 'www.google.com/mypage'), - '#weight' => 20, - ); - $form['contact']['linkYouTube'] = array( '#type' => 'textfield', '#title' => '', diff --git a/templates/culturefeed-page.tpl.php b/templates/culturefeed-page.tpl.php index b3ce47a..69fe226 100644 --- a/templates/culturefeed-page.tpl.php +++ b/templates/culturefeed-page.tpl.php @@ -108,14 +108,7 @@ -

    - -

    - - - - -

    +

    From 731303671e8112c66194ea4c956ea1a6fb71343f Mon Sep 17 00:00:00 2001 From: Wouter Vanelslander Date: Tue, 24 Sep 2019 14:50:35 +0200 Subject: [PATCH 79/82] PUBS-162: Added MPM logo --- img/museumpas.png | Bin 0 -> 5087 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/museumpas.png diff --git a/img/museumpas.png b/img/museumpas.png new file mode 100644 index 0000000000000000000000000000000000000000..8ddd60a2c7965192b20e9740d3f18d94e4b59407 GIT binary patch literal 5087 zcmV<56Cmt~P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N4024z=L_t(|+U;C-cofy% zerHRzWp~pcgpds#5)uLlkU~iUgf2ya@QEPBM_74 zF*1g+H*MU7qeo6L_TnY4AUwP`r@n=+eSqAYdyKs`c{Sv6*^?zMJ39|)X_py0E$uR9 z&68Wr*9e=P;8V85v3tS5#C=T=!G?5X7B1eSzrn z7wflih`V<6Hg@g&H)l*kLIRxP!Re_oGb4wSwrS%o!p_UPkMC2@k>xUT&=k-ezsw=c z9yM!^z?@s$B=tEpHg64ZFIYgMkDg` zNs?%q#^z1C8N0N!90v}hKGv8%3QkXzSq`2YgTa90Z}#D}g)c#^)?nw36iyzq*@B#$ zd+5@oL*qusWF|~XCWf$^FBD5BLo|S$ZiGSp4vP!B`9iUL3Yr=@Irm^TTR7=EcckEr z#d9E&Ns;``J{Sy!#~RZ|!D-?$vvM7#CnxVm(!3eiyZ0!ntJMzkWM$?ynmA#gA7NL2 zascX$sc;z(2ysjh#3MpMxk~CRZ@iYrS*$4k@d7A`OQYJAmFaj~s;kx5yZ0!jP92Zr zuJ1i_1B9XPjg%65x>-)hAA;`f zh%`%u8oI;3qT=-}C=7oCnr)}+EN?C-gLdC};zt`zjc%8H-}?9O!~DH@<8B-|{38k< zu}5+=5ijWFD_(^}B4+H22E2sr zK}lTTwf9ZPULFpfyDR59t=6G(={D$&UTSn*&cMEJ@Bd>F1Oh$)>!M}Z(pAj0xVV8B z8aI%!wOSqS-!F8kKBuNi+oufxRI0X!iHXFH?J1yXnpmI=7}ys*dj`PY-xs%TWm(JL z&9C#`w2qwnX^pPVyp&u5#oLphc=I_Je!mO-+3V2m{t4!SGA56D+bM`gg>lLXI<|p$ zY(MgTBB8^2)M_nZ>va0M$Ht~_Zf*($1a!vOadFtc?>GPuW0R0H4JF0pWcloT`1-cN zTKhf@xZ2lsVz;1b#ivge~w*l!V&&-`bp;|_Of1Nnlnb@tKA z%L64P)_;K8x3f@EQU)(C4*)>g`O8FJcXuT_Ha2}zseAzdiHXx0;%X5V7L4%l-ne%4 zHj$o@aTfyy_I)zMWpkc5YXcJ!rxU~l1a?7mjCFbL@9)c`mzP(fva$+Fr2?V|a>HKp z<#Cwrmx15b1KOh(LF?JAgNsdGQ*I&jKmNhk6>n^TcywRrfB22KAJ0P$M=;+06IJh% zdnvwuYsg+448Z#CIdtd;0DxX^z}PXfF?!4p+`nIlg9lC!rr)A^n1N@DdZJgQ6%7aR88+ zk&CcC!4PzB2XS04b~8=W(575)&_W(u6WI5tT*po- zj2IaW08l99P%0IutgLc4wvU2Si<4}dWvjQh7qg-SfW)Nf003X#HW)iDj_rhsBrYqP zy@ztuEC@r|*I6GW6u|9YGa>AuVhI@+PHwgxz$L0Xq%(#%H4wE33hsv0pDu?`D6BJ2 zuU>)p?6Y?r_6Z>WSqBWTzUu+tl~-N>kH>SEFWbp2fm2UhRR2DpE!JhL%I--TI&=VL z&YFzKs8D7#1ponooiTax7{+!}Dww}{3Mo9lTLSIwpP=2J2II|q(0U{I-fj>L2!w3T z2nag+kd2@yxP3YsqS#<)cAtasYA)z%Ehw1?!T>)=#z#OpWe^}>2T1ZAXr5^C$2C*55Z6r6LR>S2Q;QQ*)&tb6Kgvm`1bpz?xIsK5 z1j3%}>nvZ9^cBp-*5xlH62N`aJWxW%O)y-{gnDBt48LZ;Qd$iN_z-mThGbM9$X*@} zN-84qn+wWOv+fA=XRg6~uN0tZ@O?ZW8q@=>Nu$B{^LpB2-K218abo!8HcF?gtT&Hj zTsV{~XM%De2{B&DM#+SK5^3&h=RiD$ds?79_zNmt+XU3nG+}@rJohbO$TMX>K`E#+&(2 zZ(%plRsXxEPSOB?uF-N%OPV_xMVv6u53*T9As!J5Q0zWLv-2Fx1?(Xzt=2(%D4kQ@ zaQ+rdIYmU8@p>NUYW8qf7}5b=2i}HqE`Nk-b0DM0$2zz$~PbvbfwVu#ZO7@VNHn3$V0UtbXC4@o#a9cA6<{anT zCCvqmBF+}PRtmzVjcka4W+yu(ilPEQiG<7TM_*%&|S;GJf=@}@D zcpWZ%x7P1coTIA1N~t9BL@IrDX&4vm=7T6-VUOHfe^>_hD+bh#EkG)K%=Hg zQ*IG-saK%caTe+gWDrbkjHK~KK8#n{b2!Pka7dnwWNb@WHS{*|l{^nuxXvAASCIvV zUv8uN<9#TOeFqiuz6M>xPN(uWp95@;*#N+F>mJk_Qc*hjW0Z`3pNP@?E1*%t>3{qK zGq2h`J(Y~`}8GFh(ay2 zhtg58XbWSD`Uk*k-x7!h^&sAZwJ_euN7>X>1li3UO*U25g6AoR+vhI>6a`vqfc7Bk za^bi0gzkjZ8Od+&4a@IV=cD2LEtu{W5>udLLIfleB4Exhf&T0@Xj9T*NWa5e*PXZw zOK~N5t*p*WVMqsfB)c&(Js z9wZ&JJTLhp+tFOmjvHqlu!UsY|sDi@qJ==Vu#H3 zPn&e+5XcvdC4RC*a`mX$aTb)T1a7NmbB@exLCGc74f#VTKb!`>uV=mOQM~s&u^|Ug z@9E5cJDhsrc&(I#H(Ai7Z9SPOBCoyl2>`^ydP6#?KjT#gMS)i9AR62gUdL8I{pB&} zf4XT6yW{g9@biKwCK$3gBM1`sJ|6Ho_Ab;LQlUG38K%31fXNJAYb9Lzc7beG99+UW zG5L*GbD{b66f6~LxPP7av^i)H{x%+PT5EvzP&zc*PBWWzo|gjN7gs;+rZosp>>c;t z22*AMDi?1h(rC5L8m}UkH0-8N5q}%vgu(t0$MpiQl@h{U9pDnu!5SpQZ=Sy7zs*$n zS3`p|;PdCPF@=79K6w9wMVx$>E?vdiHEba1kRko?!n6sDef-#I96!b$btTPz5uH1? zXY93Wwi1D+|MxjtC(IUTcAbTG-@}kTtpPlR6vB}9kWL>Aaa=E=EzW4bt5+X{`OmUC z^9qCfA)Cp@Y-VQWVBOkeoI9J2f`TFl1bq0Z+G6O?0hs^lOn7*>H5pm9aGJQgck^)K zIC-`>Wy)9t_UJ;Sty`N+KEN3bxc>X!nZ2bW&{Z0SxbzFZVM=@wAqFuTO~}s5!`E3maOmGZ z;K}-LIJ2{-R4I6e6c3$3nq@Ex>-u8l#hT?HF;MHpm!<_fzHQ;Y9 z{;*yJPeDNuR<8W&iPYVoC(a%R_MgDgW%J%zt$zG#V{- z+ILk_%k>s}-zPRDn9kD{uw+F_pTth~l+zys_w;2-aU zdcz5b1_ePB69jQwFHkaZo#h?LtmKQI1tsQcz%3POPF~r|!@+Okj#jNb2`yb#RxY9< zCLlC42r;n{7(P6j^X-?Wgwq=E>@1eJ-o1M;;)e$X#W;H8B=LC&`;W6^H9(|p56N>; z5OgJv+AL)?){wph8&MeXhQo-mTGYy{Y=5-Du?C!0>o|F9qsjPu9^P4+#2KGUm#$*f zCmS#nK7d@C8c12*)1*q(7BR7r*tx^10WU6Q_dosn_d%~-fl#U1GB5G^zPg~d3!T$wSO+X+7wE%N zN}*U555-%PV7QzK{ka>^?)eGk!V0$hx2LROgZ3SELIY08C6LV~{f&IPps2xvqcC`I z6bc^{m5@nswO_8gM=j?rUFxOTVs=K0gRWk&Bsp zrhLa!)T1=uw%{qGb>_Wv@haBZC{@RgABOn&F^G>JgN3hsKzy$&KfmDV5@-L!`TJXg zc@h$)5yW-x-U+d>kq`5*0?4wm3PuBN`yCJfSideA#YH9XY3q%YlvH9$9uytU{B6!F zvU`gfs05;957tDe2v-eoH~_8l=1X* zYcx^zaEdtl#YL?Ey-(ks=-V#@zouIUG{Hs#&XE#lwBP*j~FapFxivUD35` z2WDm{Dk>$80&C&!u0(hQ_tS@sg;R?Y+iy;JdwW4FW)(9@NiPDhZbZk8AI79}#QQe) zSpDg8goOpyS)WWM#aA0XB#y$wBSRsb7F%yST_PK<0e|d)RN3vta9{{dS0m*a9RDqa8p002ovPDHLkV1hK) Bne_kw literal 0 HcmV?d00001 From fa7a5e9c53ce71809cc341cf8f59f3cdd8ffa7b3 Mon Sep 17 00:00:00 2001 From: Tim Dujardin Date: Wed, 2 Oct 2019 10:02:06 +0200 Subject: [PATCH 80/82] PUBS-97: Added JS file for PUBS-97 completion --- js/culturefeed-bootstrap.js | 343 +++++++++++++++++++----------------- 1 file changed, 179 insertions(+), 164 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index 96c2195..dd7ab59 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -1,23 +1,48 @@ (function ($) { - $(document).ready(function() { + function getScrollOffset() { + var offset = $('.navbar-header').height(); + var adminMenu = $('#admin-menu'); + + // drupal logged-in menu + if (adminMenu) { + offset += adminMenu.height(); + } + + return offset; + } + + $(document).ready(function () { + var extraOffset = getScrollOffset(); + + $(window).resize(function () { + extraOffset = getScrollOffset(); + }); + + $(".scroll-to-anchor").click(function (e) { + e.preventDefault(); + + $([document.documentElement, document.body]).animate({ + scrollTop: $($(this).attr('href')).offset().top - extraOffset + }, 300); + }); // Init popovers $("a[data-toggle=popover]") .popover() - .click(function(e) { + .click(function (e) { e.preventDefault() }) // skip-link focus - $("a[href^='#']").click(function() { - $("#"+$(this).attr("href").slice(1)+"").focus(); + $("a[href^='#']").click(function () { + $("#" + $(this).attr("href").slice(1) + "").focus(); }); - // Temp adding aria-expanded to dropdown untill base bootstrap is updated - $('.dropdown-toggle').click(function(){ + // Temp adding aria-expanded to dropdown untill base bootstrap is updated + $('.dropdown-toggle').click(function () { var status = $(this).attr('aria-expanded'); - if(status == 'false'){ + if (status == 'false') { $(this).attr('aria-expanded', 'true'); } else { $(this).attr('aria-expanded', 'false'); @@ -37,11 +62,11 @@ html: true, placement: 'top', trigger: 'manual', - content: function() { + content: function () { // see custom culturefeed-ui-connect-hover.tpl.php return $(".popover-login").html(); } - }).click(function(e) { + }).click(function (e) { $(this).popover('show'); clickedAway = false isVisible = true @@ -49,14 +74,11 @@ }); // hide popover - $(document).click(function(e) { - if (isVisible && clickedAway) - { + $(document).click(function (e) { + if (isVisible && clickedAway) { $popoverLogin.popover('hide') isVisible = clickedAway = false - } - else - { + } else { clickedAway = true } }); @@ -68,15 +90,15 @@ $("span[data-toggle=tooltip]").tooltip(); // Init the map if this toggles a map. - $(".map-toggle").click(function() { + $(".map-toggle").click(function () { Drupal.CultureFeed.Agenda.initializeMap(); }); // Count characters input field - limit 400 characters - $(function(){ - $('#limit-400').keyup(function(){ - limitChars('limit-400', 400, 'charlimitinfo'); - }) + $(function () { + $('#limit-400').keyup(function () { + limitChars('limit-400', 400, 'charlimitinfo'); + }) }); // Remove agenda tab from page timeline block if agenda block is not available @@ -87,22 +109,18 @@ }) // Count characters input field - limit - general - function limitChars(textid, limit, infodiv) - { - var text = $('#'+textid).val(); - text=text.replace(/[\n\r\n]+/g, ' '); - var textlength = text.length; - if(textlength > limit) - { - $('#' + infodiv).html('Maximum '+limit+' karakters!'); - $('#'+textid).val(text.substr(0,limit)); - return false; - } - else - { - $('#' + infodiv).html('Nog '+ (limit - textlength) +' resterende karakters'); - return true; - } + function limitChars(textid, limit, infodiv) { + var text = $('#' + textid).val(); + text = text.replace(/[\n\r\n]+/g, ' '); + var textlength = text.length; + if (textlength > limit) { + $('#' + infodiv).html('Maximum ' + limit + ' karakters!'); + $('#' + textid).val(text.substr(0, limit)); + return false; + } else { + $('#' + infodiv).html('Nog ' + (limit - textlength) + ' resterende karakters'); + return true; + } } /** @@ -111,7 +129,7 @@ Drupal.behaviors.fileValidateAutoAttach = { attach: function (context, settings) { if (settings.file && settings.file.elements) { - $.each(settings.file.elements, function(selector) { + $.each(settings.file.elements, function (selector) { var extensions = settings.file.elements[selector]; $(selector, context).once('validate', function () { $(this).bind('change', {extensions: extensions}, Drupal.file.validateExtension); @@ -121,7 +139,7 @@ }, detach: function (context, settings) { if (settings.file && settings.file.elements) { - $.each(settings.file.elements, function(selector) { + $.each(settings.file.elements, function (selector) { $(selector, context).unbind('change', Drupal.file.validateExtension); }); } @@ -132,8 +150,8 @@ * Add click events on the read more link. */ Drupal.behaviors.culturefeedPushMoreInfoToUitId = { - attach: function(context, settings) { - $('a.moreinfo-link', context).bind('click', function(e) { + attach: function (context, settings) { + $('a.moreinfo-link', context).bind('click', function (e) { e.preventDefault(); $.ajax($(this).prop('rel')); $('#cf-longdescription').toggle(); @@ -214,9 +232,10 @@ // Support for jquery datepicker. See http://stackoverflow.com/questions/21059598/implementing-jquery-datepicker-in-bootstrap-modal var enforceModalFocusFn = $.fn.modal.Constructor.prototype.enforceFocus; - $.fn.modal.Constructor.prototype.enforceFocus = function() {}; - $('#bootstrap-modal-container').on('hidden', function() { - $.fn.modal.Constructor.prototype.enforceFocus = enforceModalFocusFn; + $.fn.modal.Constructor.prototype.enforceFocus = function () { + }; + $('#bootstrap-modal-container').on('hidden', function () { + $.fn.modal.Constructor.prototype.enforceFocus = enforceModalFocusFn; }); var wrapper = $('#bootstrap-modal-container').find('.modal-content'); @@ -225,7 +244,7 @@ var new_content = $('

    ').html(response.data); $('#bootstrap-modal-container').find('.modal-content').html(new_content); - $('#bootstrap-modal-container').modal({show : true}); + $('#bootstrap-modal-container').modal({show: true}); Drupal.attachBehaviors(new_content, settings); }; @@ -305,7 +324,7 @@ if ($.custom && $.custom.categorisedAutocomplete) { // Take over the search function. - $.custom.categorisedAutocomplete.prototype.search = function(value, event) { + $.custom.categorisedAutocomplete.prototype.search = function (value, event) { var $throbber = $('.glyphicon-refresh', $(this.element).parent()); $throbber.addClass('glyphicon-spin'); @@ -315,11 +334,11 @@ // always save the actual value, not the one passed as an argument this.term = this._value(); - if ( value.length < this.options.minLength ) { - return this.close( event ); + if (value.length < this.options.minLength) { + return this.close(event); } - if ( this._trigger( "search", event ) === false ) { + if (this._trigger("search", event) === false) { return; } @@ -328,23 +347,23 @@ } // Take over the render menu function. - $.custom.categorisedAutocomplete.prototype._renderMenu = function(ul, items) { + $.custom.categorisedAutocomplete.prototype._renderMenu = function (ul, items) { var $throbber = $('.glyphicon-refresh', $(this.element).parent()); $throbber.removeClass('glyphicon-spin'); var that = this, - currentCategory = ""; - $.each(items, function(index, item) { + currentCategory = ""; + $.each(items, function (index, item) { var li; if (!item.label) { if (item.category != currentCategory) { - ul.append("
  • " + item.category + "
    • "); + ul.append("
  • " + item.category + "
    • "); currentCategory = item.category; } } else { if (item.category != currentCategory) { - ul.append("
  • " + item.category + "
    • "); + ul.append("
  • " + item.category + "
    • "); currentCategory = item.category; } li = that._renderItemData(ul, item); @@ -362,131 +381,127 @@ * Prevents the form from submitting if the suggestions popup is open * and closes the suggestions popup when doing so. */ - Drupal.autocompleteSubmit = function () { - return $('.form-autocomplete > .dropdown').each(function () { - this.owner.hidePopup(); - }).length == 0; - }; + Drupal.autocompleteSubmit = function () { + return $('.form-autocomplete > .dropdown').each(function () { + this.owner.hidePopup(); + }).length == 0; + }; - /** - * Add mobile detect helper classes to the body tag. - */ - Drupal.behaviors.culturefeedMobileDetect = { - attach: function(context, settings) { - var bodyClasses = []; - var md = new MobileDetect(window.navigator.userAgent); + /** + * Add mobile detect helper classes to the body tag. + */ + Drupal.behaviors.culturefeedMobileDetect = { + attach: function (context, settings) { + var bodyClasses = []; + var md = new MobileDetect(window.navigator.userAgent); - if (md.mobile() !== null) { - if (md.tablet() !== null) { - bodyClasses.push('is-tablet'); - } - else { - bodyClasses.push('is-phone'); - } - } - else { - bodyClasses.push('is-computer'); + if (md.mobile() !== null) { + if (md.tablet() !== null) { + bodyClasses.push('is-tablet'); + } else { + bodyClasses.push('is-phone'); } + } else { + bodyClasses.push('is-computer'); + } - if (md.os() === 'AndroidOS') { - bodyClasses.push('is-android'); - } - if (md.os() === 'iOS') { - bodyClasses.push('is-ios'); - } + if (md.os() === 'AndroidOS') { + bodyClasses.push('is-android'); + } + if (md.os() === 'iOS') { + bodyClasses.push('is-ios'); + } - $.each(bodyClasses, function (key, value) { - $('body').addClass(value); - }); + $.each(bodyClasses, function (key, value) { + $('body').addClass(value); + }); - // Format phones for mobile. - // Contact phone - if (Drupal.settings.culturefeed_agenda) { - if (Drupal.settings.culturefeed_agenda.contact) { - if (Drupal.settings.culturefeed_agenda.contact.phones) { - var phones = Drupal.settings.culturefeed_agenda.contact.phones; - - if (md.mobile()) { - var linkPhones = Array(); - phones = phones.split(', '); - - $.each(phones, function (key, phone) { - linkPhones[key] = '' + phone + ''; - }); - phones = linkPhones.join(', '); - $('.phone-placeholder').html(phones); - } - } + // Format phones for mobile. + // Contact phone + if (Drupal.settings.culturefeed_agenda) { + if (Drupal.settings.culturefeed_agenda.contact) { + if (Drupal.settings.culturefeed_agenda.contact.phones) { + var phones = Drupal.settings.culturefeed_agenda.contact.phones; + + if (md.mobile()) { + var linkPhones = Array(); + phones = phones.split(', '); + + $.each(phones, function (key, phone) { + linkPhones[key] = '' + phone + ''; + }); + phones = linkPhones.join(', '); + $('.phone-placeholder').html(phones); } + } + } + + // Reservation phone + if (Drupal.settings.culturefeed_agenda.reservation) { + if (Drupal.settings.culturefeed_agenda.reservation.phones) { + var resPhones = Drupal.settings.culturefeed_agenda.reservation.phones; + + if (md.mobile()) { + var linkResPhones = Array(); + resPhones = resPhones.split(', '); - // Reservation phone - if (Drupal.settings.culturefeed_agenda.reservation) { - if (Drupal.settings.culturefeed_agenda.reservation.phones) { - var resPhones = Drupal.settings.culturefeed_agenda.reservation.phones; - - if (md.mobile()) { - var linkResPhones = Array(); - resPhones = resPhones.split(', '); - - $.each(resPhones, function (key, phone) { - linkResPhones[key] = '' + phone + ''; - }); - resPhones = linkResPhones.join(', '); - $('.reservation-phone-placeholder').html(resPhones); - } - } + $.each(resPhones, function (key, phone) { + linkResPhones[key] = '' + phone + ''; + }); + resPhones = linkResPhones.join(', '); + $('.reservation-phone-placeholder').html(resPhones); } + } } } - }; - - /** - * Add the right links for maps and phones depending on the device. - */ - function validate_phone(rawPhone) { - var phone = rawPhone.replace(new RegExp(' ', 'g'), '-'); - return phone.replace(new RegExp(/[^0-9+()]/, 'g'), ''); } + }; - Drupal.behaviors.culturefeedAddMapLink = { - attach: function (context, settings) { - if (Drupal.settings.culturefeed_map) { - var md = new MobileDetect(window.navigator.userAgent); - var title = Drupal.settings.culturefeed_map.title; - // Map - if (Drupal.settings.culturefeed_map.info.location) { - var zip = Drupal.settings.culturefeed_map.info.location.zip; - var city = Drupal.settings.culturefeed_map.info.location.city; - var street = Drupal.settings.culturefeed_map.info.location.street; - var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; - var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; - var querystring = title; - var mapLink = ''; - - if (zip) { - querystring = querystring + '+' + zip; - } - if (city) { - querystring = querystring + '+' + city; - } - if (street) { - querystring = querystring + '+' + street; - } - - if (md.os() === 'iOS') { - mapLink = '' + Drupal.t('Open map') + ''; - } - else if (md.os() === 'AndroidOS') { - mapLink = '' + Drupal.t('Open map') + ''; - } - else { - mapLink = ''; - } - - $('.map-js-link').html(mapLink); - } + /** + * Add the right links for maps and phones depending on the device. + */ + function validate_phone(rawPhone) { + var phone = rawPhone.replace(new RegExp(' ', 'g'), '-'); + return phone.replace(new RegExp(/[^0-9+()]/, 'g'), ''); + } + + Drupal.behaviors.culturefeedAddMapLink = { + attach: function (context, settings) { + if (Drupal.settings.culturefeed_map) { + var md = new MobileDetect(window.navigator.userAgent); + var title = Drupal.settings.culturefeed_map.title; + // Map + if (Drupal.settings.culturefeed_map.info.location) { + var zip = Drupal.settings.culturefeed_map.info.location.zip; + var city = Drupal.settings.culturefeed_map.info.location.city; + var street = Drupal.settings.culturefeed_map.info.location.street; + var lat = (Drupal.settings.culturefeed_map.info.coordinates.lat) ? Drupal.settings.culturefeed_map.info.coordinates.lat : '0'; + var lng = (Drupal.settings.culturefeed_map.info.coordinates.lng) ? Drupal.settings.culturefeed_map.info.coordinates.lng : '0'; + var querystring = title; + var mapLink = ''; + + if (zip) { + querystring = querystring + '+' + zip; + } + if (city) { + querystring = querystring + '+' + city; + } + if (street) { + querystring = querystring + '+' + street; + } + + if (md.os() === 'iOS') { + mapLink = '' + Drupal.t('Open map') + ''; + } else if (md.os() === 'AndroidOS') { + mapLink = '' + Drupal.t('Open map') + ''; + } else { + mapLink = ''; + } + + $('.map-js-link').html(mapLink); } } - }; + } + }; })(jQuery); From 511a5d935a829165f03cd5aa437f85c19451b4b6 Mon Sep 17 00:00:00 2001 From: Nils Destoop Date: Wed, 2 Oct 2019 10:34:26 +0200 Subject: [PATCH 81/82] Switch to behavior + .once() --- js/culturefeed-bootstrap.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/js/culturefeed-bootstrap.js b/js/culturefeed-bootstrap.js index dd7ab59..9b353d1 100644 --- a/js/culturefeed-bootstrap.js +++ b/js/culturefeed-bootstrap.js @@ -13,19 +13,6 @@ } $(document).ready(function () { - var extraOffset = getScrollOffset(); - - $(window).resize(function () { - extraOffset = getScrollOffset(); - }); - - $(".scroll-to-anchor").click(function (e) { - e.preventDefault(); - - $([document.documentElement, document.body]).animate({ - scrollTop: $($(this).attr('href')).offset().top - extraOffset - }, 300); - }); // Init popovers $("a[data-toggle=popover]") @@ -159,6 +146,21 @@ } }; + /** + * Add smooth scroll on the anchor links. + */ + Drupal.behaviors.scrollToAnchorLinks = { + attach: function (context, settings) { + $(context).find(".scroll-to-anchor").once().click(function (e) { + e.preventDefault(); + + $([document.documentElement, document.body]).animate({ + scrollTop: $($(this).attr('href')).offset().top - getScrollOffset() + }, 300); + }); + } + } + if (Drupal.file) { /** From 2cdd3ed38beb6cfb530f12cdfc6d0638fcf6c750 Mon Sep 17 00:00:00 2001 From: Nils Destoop Date: Thu, 14 Nov 2019 17:36:33 +0100 Subject: [PATCH 82/82] Add EOL note --- README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/README.md b/README.md index 3b67a3e..c37db8a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,39 @@ +## Important note +In november 2019, publiq vzw (formerly known as CultuurNet) starts the End of Support phase of the Culturefeed Drupal 7 module suite. This means that you can continue to use Culturefeed, but publiq vzw will not invest anymore in this Drupal 7 module suite. + +As an exception, critical security updates will still be provided if needed. + +The End of Life (EOL) date of the module suite is set to the same date as the EOL of Drupal 7 core, ie. November 2021 (https://www.drupal.org/psa-2019-02-25). + +We built this final 4.0 release, which contains a major security update, and some incompatible changes compared to the latest 3.10.2 release. Some less used modules are moved to a separate repository. If you update to this version please check & should you use one of these modules, reinstall them from a separate repository. After that all things should work as usual. +- https://github.com/cultuurnet/culturefeed_pages [DEPRECATED] + +- https://github.com/cultuurnet/culturefeed_roles [DEPRECATED] + +- https://github.com/cultuurnet/culturefeed_messages [DEPRECATED] + +- https://github.com/cultuurnet/culturefeed_calendar [DEPRECATED] + +- https://github.com/cultuurnet/culturefeed_uitpas + +- https://github.com/cultuurnet/culturefeed_social + +- https://github.com/cultuurnet/culturefeed_userpoints_ui [DEPRECATED] + +- https://github.com/cultuurnet/culturefeed_entry_ui [DEPRECATED] + +### Alternatives + +As an alternative for the Culturefeed Drupal 7 module suite, publiq vzw focused on: + +- A new, easy to use API in a developer-friendly Json format: https://projectaanvraag.uitdatabank.be/#!/integrations#api + +- An even easier to use widget platform: https://projectaanvraag.uitdatabank.be/#!/integrations#widgets + +We also have a Drupal 8 version on https://github.com/cultuurnet/culturefeed_d8 with the most commonly used modules culturefeed_agenda, culturefeed_content, culturefeed_search, culturefeed_search_api and culturefeed_user. + +However, these modules will not contain the full functionality as was provided in the Drupal 7 edition, and it will not be heavily extended by publiq the same way we did this for the Drupal 7 edition. We are still happy to review and accept pull requests from external developers or partners, though. + # How to use this theme? ### culturefeed_bootstrap:
    - numberOfPoints . " " . t(" point(s)"); ?> -
    + +