From 243bd0aadad3017b8b62e18dff593e664f54694f Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 9 Dec 2014 09:19:25 +0100
Subject: [PATCH 001/275] CF-370 adding checkpermission

---
 lib/Drupal/DrupalCultureFeed_EntryApi.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index 3e145b10..9b7eade1 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -230,5 +230,12 @@ public static function addTranslationToActor(CultureFeed_Cdb_Item_Actor $actor,
   public static function removeTranslationFromActor(CultureFeed_Cdb_Item_Actor $actor, $lang) {
     self::getLoggedInUserInstance()->removeTranslationFromActor($actor, $lang);
   }
+  
+  /**
+   * @see CultureFeed_EntryApi::checkPermission()
+   */
+  public static function checkPermission($userid, $email, $ids) {
+    self::getLoggedInUserInstance()->checkPermission($userid, $email, $ids);
+  }
 
 }
\ No newline at end of file

From b2bb994da5b24697bed92afc5b7707b8450338ac Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Tue, 9 Dec 2014 15:09:10 +0100
Subject: [PATCH 002/275] CF-371 adding custom tags settings to cfe

---
 .../includes/culturefeed_entry_ui.admin.inc   |  9 ++++++++-
 .../includes/culturefeed_entry_ui.pages.inc   | 19 ++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index 732a656b..e8182d47 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -27,10 +27,17 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
 
   $form['culturefeed_entry_ui_custom_tags'] = array(
     '#type' => 'textarea',
-    '#title' => t('Custom tags'),
+    '#title' => t('Custom options on the /tags page'),
     '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
     '#description' => t('Custom tags specific for this site. Use a new line for each tag.'),
   );
+  
+  $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Custom tags to push to entry API'),
+    '#default_value' => variable_get('culturefeed_entry_ui_custom_entry_api_tags'),
+    '#description' => t('Tags pushed under the hood to Entry API. Use a new line for each tag.'),
+  );
 
   return system_settings_form($form);
 
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 3594888c..9225dd2a 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -744,7 +744,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     );
   }
 
-  // Tags todo
+  // Tags
   $form['extra']['keywords'] = array(
     '#type' => 'textfield',
     '#title' => t('Tags'),
@@ -2249,14 +2249,19 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   $event->setContactInfo($contact_object);
 
   // Keywords.
-  if ($values['keywords']) {
-    $keywords = explode(';', $values['keywords']);
-    foreach ($keywords as $keyword) {
-      $event->addKeyword($keyword);
-    }
+  $keywords_form = array();
+  if ($values['keywords']) {    
+    $keywords_form = explode(';', $values['keywords']);
+  }
+  if (variable_get('culturefeed_entry_ui_custom_entry_api_tags')) {
+    $custom_entry_api_tags = explode("\n", variable_get('culturefeed_entry_ui_custom_entry_api_tags'));
+  }
+  $keywords = array_map('trim',array_unique(array_merge($keywords_form,$custom_entry_api_tags)));
+  foreach ($keywords as $keyword) {
+    $event->addKeyword($keyword);
   }
 
-  // Members
+  // Members.
   if ($values['members']) {
     $event->setPrivate(TRUE);
   }

From 5b4a7f10abde00e64ba1339f7d2918eb717895d7 Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Wed, 10 Dec 2014 15:11:14 +0100
Subject: [PATCH 003/275] CF-370 adding checkpermission method

---
 lib/Drupal/DrupalCultureFeed_EntryApi.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index 9b7eade1..bedabbe4 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -235,7 +235,12 @@ public static function removeTranslationFromActor(CultureFeed_Cdb_Item_Actor $ac
    * @see CultureFeed_EntryApi::checkPermission()
    */
   public static function checkPermission($userid, $email, $ids) {
-    self::getLoggedInUserInstance()->checkPermission($userid, $email, $ids);
+    $permissions = json_decode( json_encode(self::getLoggedInUserInstance()->checkPermission($userid, $email, $ids)) , 1);
+    $parsed_permissons = array();
+    foreach ($permissions['event'] as $permission) {
+      $parsed_permissons[$permission['cdbid']] = $permission['editable'];
+    }
+    return $parsed_permissons;
   }
 
 }
\ No newline at end of file

From 360f31df5af4da1dc865a762c12b86c4cdb0dd95 Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Thu, 11 Dec 2014 14:44:00 +0100
Subject: [PATCH 004/275] CF-370 adding edit view

---
 .../culturefeed_entry_ui.views_default.inc    | 95 ++++++++++++++-----
 ...iews_handler_field_cdb_item_operations.inc | 21 +++-
 lib/Drupal/DrupalCultureFeed_EntryApi.php     | 11 ++-
 3 files changed, 96 insertions(+), 31 deletions(-)

diff --git a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
index 2461ffb2..22803df4 100644
--- a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
+++ b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
@@ -7,36 +7,41 @@
  * Implements hook_views_default_views().
  */
 function culturefeed_entry_ui_views_default_views() {
-  $views = array();
 
   $view = new view();
   $view->name = 'culturefeed_events_createdbycurrentuser';
   $view->description = '';
   $view->tag = 'default';
   $view->base_table = 'cdb_items';
-  $view->human_name = 'CultureFeed events created by current user';
+  $view->human_name = 'CultureFeed edit events';
   $view->core = 7;
   $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
+  
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Events created by me';
   $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['use_more_text'] = 'meer';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'create culturefeed events';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Toepassen';
+  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Opnieuw instellen';
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorteren op';
+  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Oplopend';
+  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Aflopend';
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'fields';
-  /* Header: UDB items: Create event */
+  /* Kop: Cdb items: Maak activiteit aan */
   $handler->display->display_options['header']['create']['id'] = 'create';
   $handler->display->display_options['header']['create']['table'] = 'cdb_items';
   $handler->display->display_options['header']['create']['field'] = 'create';
   $handler->display->display_options['header']['create']['empty'] = TRUE;
-  /* No results behavior: Global: Text area */
+  /* Gedrag bij ontbreken van resultaten: Algemeen: Tekstveld */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
@@ -44,14 +49,14 @@ function culturefeed_entry_ui_views_default_views() {
   $handler->display->display_options['empty']['area']['empty'] = TRUE;
   $handler->display->display_options['empty']['area']['content'] = 'Unable to find any events created by you.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  /* Field: UDB items: Titel */
+  /* Veld: Cdb items: Titel */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['link'] = 1;
-  /* Field: UDB items: Afbeelding */
+  /* Veld: Cdb items: Afbeelding */
   $handler->display->display_options['fields']['picture']['id'] = 'picture';
   $handler->display->display_options['fields']['picture']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['picture']['field'] = 'picture';
@@ -60,13 +65,13 @@ function culturefeed_entry_ui_views_default_views() {
   $handler->display->display_options['fields']['picture']['width'] = '100';
   $handler->display->display_options['fields']['picture']['height'] = '100';
   $handler->display->display_options['fields']['picture']['link'] = 1;
-  /* Field: UDB items: Short Description */
+  /* Veld: Cdb items: Short Description */
   $handler->display->display_options['fields']['description']['id'] = 'description';
   $handler->display->display_options['fields']['description']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['description']['field'] = 'description';
   $handler->display->display_options['fields']['description']['label'] = '';
   $handler->display->display_options['fields']['description']['element_label_colon'] = FALSE;
-  /* Field: UDB items: Locatie */
+  /* Veld: Cdb items: Locatie */
   $handler->display->display_options['fields']['location']['id'] = 'location';
   $handler->display->display_options['fields']['location']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['location']['field'] = 'location';
@@ -77,29 +82,29 @@ function culturefeed_entry_ui_views_default_views() {
     'title' => 0,
     'address' => 0,
   );
-  /* Field: UDB items: Kalendersamenvatting */
+  /* Veld: Cdb items: Calendar summary */
   $handler->display->display_options['fields']['when']['id'] = 'when';
   $handler->display->display_options['fields']['when']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['when']['field'] = 'when';
   $handler->display->display_options['fields']['when']['label'] = '';
   $handler->display->display_options['fields']['when']['element_label_colon'] = FALSE;
-  /* Field: UDB items: Last updated */
+  /* Veld: Cdb items: Laatst bijgewerkt */
   $handler->display->display_options['fields']['lastupdated']['id'] = 'lastupdated';
   $handler->display->display_options['fields']['lastupdated']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['lastupdated']['field'] = 'lastupdated';
   $handler->display->display_options['fields']['lastupdated']['date_format'] = 'short';
-  /* Field: UDB items: Operations */
+  /* Veld: Cdb items: Bewerkingen */
   $handler->display->display_options['fields']['operations']['id'] = 'operations';
   $handler->display->display_options['fields']['operations']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['operations']['field'] = 'operations';
   $handler->display->display_options['fields']['operations']['label'] = '';
   $handler->display->display_options['fields']['operations']['element_label_colon'] = FALSE;
-  /* Sort criterion: Cdb items: Last updated */
+  /* Sorteercriterium: Cdb items: Laatst bijgewerkt */
   $handler->display->display_options['sorts']['lastupdated']['id'] = 'lastupdated';
   $handler->display->display_options['sorts']['lastupdated']['table'] = 'cdb_items';
   $handler->display->display_options['sorts']['lastupdated']['field'] = 'lastupdated';
   $handler->display->display_options['sorts']['lastupdated']['order'] = 'DESC';
-  /* Filter criterion: UDB items: Type */
+  /* Filtercriterium: Cdb items: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'cdb_items';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -107,26 +112,70 @@ function culturefeed_entry_ui_views_default_views() {
     'event' => 'event',
   );
   $handler->display->display_options['filters']['type']['group'] = 1;
-  /* Filter criterion: UDB items: Created by current user */
+  /* Filtercriterium: Cdb items: Created by current user */
   $handler->display->display_options['filters']['createdbycurrentuser']['id'] = 'createdbycurrentuser';
   $handler->display->display_options['filters']['createdbycurrentuser']['table'] = 'cdb_items';
   $handler->display->display_options['filters']['createdbycurrentuser']['field'] = 'createdbycurrentuser';
-
+  $handler->display->display_options['filters']['createdbycurrentuser']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['operator_id'] = 'createdbycurrentuser_op';
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['label'] = 'Created by current user';
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['operator'] = 'createdbycurrentuser_op';
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['identifier'] = 'createdbycurrentuser';
+  
   /* Display: Block */
   $handler = $view->new_display('block', 'Block', 'block');
+  
+  /* Display: Pagina */
+  $handler = $view->new_display('page', 'Pagina', 'page_1');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Edit events';
+  $handler->display->display_options['defaults']['pager'] = FALSE;
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '10';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['quantity'] = '9';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Items per pagina';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Alle -';
+  $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Startpunt';
+  $handler->display->display_options['pager']['options']['tags']['first'] = '« eerste';
+  $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ vorige';
+  $handler->display->display_options['pager']['options']['tags']['next'] = 'volgende ›';
+  $handler->display->display_options['pager']['options']['tags']['last'] = 'laatste »';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filtercriterium: Cdb items: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'cdb_items';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'event' => 'event',
+  );
+  $handler->display->display_options['filters']['type']['group'] = 1;
+  $handler->display->display_options['path'] = 'agenda/edit';
   $translatables['culturefeed_events_createdbycurrentuser'] = array(
     t('Master'),
     t('Events created by me'),
-    t('more'),
-    t('Apply'),
-    t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
+    t('meer'),
+    t('Toepassen'),
+    t('Opnieuw instellen'),
+    t('Sorteren op'),
+    t('Oplopend'),
+    t('Aflopend'),
     t('Notification that no results were found'),
     t('Unable to find any events created by you.'),
-    t('Last updated'),
+    t('Laatst bijgewerkt'),
+    t('Created by current user'),
     t('Block'),
+    t('Pagina'),
+    t('Edit events'),
+    t('Items per pagina'),
+    t('- Alle -'),
+    t('Startpunt'),
+    t('« eerste'),
+    t('‹ vorige'),
+    t('volgende ›'),
+    t('laatste »'),
   );
 
   $views[$view->name] = $view;
diff --git a/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc b/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
index c1100033..3cfb7df2 100644
--- a/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
+++ b/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
@@ -33,13 +33,24 @@ class views_handler_field_cdb_item_operations extends views_handler_field {
           'title' => t('Delete'),
         )
       );
-
-      foreach ($ops as $op => $op_details) {
-        $path = culturefeed_entry_ui_entity_path($extended_entity, $op);
-        if ($path && user_access($op_details['permission'])) {
-          $links[$op] = l($op_details['title'], $path);
+      
+      
+      
+      $user = $cf_account = DrupalCultureFeed::getLoggedInUser();
+      
+      $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($user->id, $user->mbox, array('ids' => $extended_entity->getId()));
+      
+      if ($ubd_permission[$extended_entity->getId()] == 'true') {
+        foreach ($ops as $op => $op_details) {
+          $path = culturefeed_entry_ui_entity_path($extended_entity, $op);
+          if ($path && user_access($op_details['permission'])) {
+            $links[$op] = l($op_details['title'], $path);
+          }
         }
       }
+      else {
+        $links[] = '<button class="btn btn-default disabled">' . t('You don\' have permission to edit event') . '</button>';
+      }
     }
 
     if (!empty($links)) {
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index bedabbe4..243c8ba2 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -235,10 +235,15 @@ public static function removeTranslationFromActor(CultureFeed_Cdb_Item_Actor $ac
    * @see CultureFeed_EntryApi::checkPermission()
    */
   public static function checkPermission($userid, $email, $ids) {
-    $permissions = json_decode( json_encode(self::getLoggedInUserInstance()->checkPermission($userid, $email, $ids)) , 1);
+    $permissions = (array)self::getLoggedInUserInstance()->checkPermission($userid, $email, $ids);
     $parsed_permissons = array();
-    foreach ($permissions['event'] as $permission) {
-      $parsed_permissons[$permission['cdbid']] = $permission['editable'];
+    if (is_array($permissions['event'])) {
+      foreach ($permissions['event'] as $permission) {
+        $parsed_permissons[$permission->cdbid->__toString()] = $permission->editable->__toString();
+      }
+    }
+    else {
+      $parsed_permissons[$permissions['event']->cdbid->__toString()] = $permissions['event']->editable->__toString();
     }
     return $parsed_permissons;
   }

From 630026d1d28bc7ef902bea6f954dc14450f198ac Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Fri, 12 Dec 2014 14:34:44 +0100
Subject: [PATCH 005/275] PWK-213 adding max characters on short desc

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 9225dd2a..ca8b6fc3 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -705,6 +705,8 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     '#type' => 'textarea',
     '#title' => t('Short description'),
     '#rows' => 4,
+    '#maxlength' => 400,
+    '#description' => t('Maximum 400 characters'),
     '#default_value' => $default_short_description,
     '#element_validate' => array('culturefeed_entry_ui_validate_textarea_markup'),
   );

From 8b7345a5b3d2d2549b0c53c720a8f692fcf8c490 Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Fri, 12 Dec 2014 15:01:08 +0100
Subject: [PATCH 006/275] change to MEDIA_TYPE_PHOTO

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index ca8b6fc3..3559db54 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2016,7 +2016,7 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
 
     // Add to detail
     $file = new CultureFeed_Cdb_Data_File();
-    $file->setMediaType($file::MEDIA_TYPE_IMAGEWEB);
+    $file->setMediaType($file::MEDIA_TYPE_PHOTO);
     $file->setMain(TRUE);
     switch ($drupal_file->filemime) {
       case 'image/gif':

From d233c69ea29815b14d589547c12d9d759d96a1aa Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Fri, 12 Dec 2014 16:01:53 +0100
Subject: [PATCH 007/275] CF-370 remove tags out of check permission

---
 ...iews_handler_field_cdb_item_operations.inc | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc b/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
index 3cfb7df2..74b80372 100644
--- a/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
+++ b/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
@@ -19,25 +19,20 @@ class views_handler_field_cdb_item_operations extends views_handler_field {
     $links = array();
 
     if ($extended_entity->getType() === 'event') {
+      
+      // Update and delete
       $ops = array(
         'edit' => array(
           'permission' => 'edit culturefeed events',
           'title' => t('Edit'),
         ),
-        'tags' => array(
-          'permission' => 'manage object tags',
-          'title' => t('Tags'),
-        ),
         'delete' => array(
           'permission' => 'delete culturefeed events',
           'title' => t('Delete'),
         )
       );
       
-      
-      
       $user = $cf_account = DrupalCultureFeed::getLoggedInUser();
-      
       $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($user->id, $user->mbox, array('ids' => $extended_entity->getId()));
       
       if ($ubd_permission[$extended_entity->getId()] == 'true') {
@@ -49,8 +44,23 @@ class views_handler_field_cdb_item_operations extends views_handler_field {
         }
       }
       else {
-        $links[] = '<button class="btn btn-default disabled">' . t('You don\' have permission to edit event') . '</button>';
+        $links[] = '<button class="btn btn-default disabled">' . t('No permission to edit event') . '</button>';
+      }
+      
+      // Collaboration
+      $ops = array(
+        'tags' => array(
+          'permission' => 'manage object tags',
+          'title' => t('Tags'),
+        )
+      );
+      foreach ($ops as $op => $op_details) {
+        $path = culturefeed_entry_ui_entity_path($extended_entity, $op);
+        if ($path && user_access($op_details['permission'])) {
+          $links[$op] = l($op_details['title'], $path);
+        }
       }
+      
     }
 
     if (!empty($links)) {

From da3b27c111a38ab460f05704966cc285dce606b9 Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Mon, 15 Dec 2014 22:37:22 +0100
Subject: [PATCH 008/275] CF-375 fixing problems with urls

---
 .../includes/culturefeed_entry_ui.pages.inc            |  8 +++++++-
 culturefeed_entry_ui/js/culturefeed_entry_ui.js        | 10 ----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 3559db54..c6bb4b0c 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -216,6 +216,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
             CultureFeed_Cdb_Data_File::MEDIA_TYPE_YOUTUBE,
             CultureFeed_Cdb_Data_File::MEDIA_TYPE_GOOGLEPLUS,
             CultureFeed_Cdb_Data_File::MEDIA_TYPE_TWITTER,
+            CultureFeed_Cdb_Data_File::MEDIA_TYPE_WEBSITE,
           )
         );
 
@@ -1722,12 +1723,17 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
   }*/
 
   // Validate Links
+  $i = 0;
   foreach ($values['links'] as $link_data) {
     if (!empty($link_data['URL'])) {
+      if (!preg_match("@^https?://@", $link_data['URL'])) {
+        $link_data['URL'] = 'http://' . $link_data['URL'];
+      }
       if (!valid_url($link_data['URL'], TRUE)) {
-        form_set_error('links', t('Not a valid URL'));
+        form_set_error('links][' . $i . '][URL', t('Not a valid URL'));
       }
     }
+    $i++;
   }
 
   // Validate organiser.
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 34ccccc4..0e5025a7 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -54,16 +54,6 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
         }
       });
       
-      $('.link-field').focusout(function() {
-        if($(this).val() != '') {
-          console.log(this);
-          if($(this).val().indexOf('http://') == -1 || $(this).val().indexOf('https://') == -1) {
-            if($(this).val().substring(0,7) != 'http://' && $(this).val().substring(0,8) != 'https://') {
-	          $(this).val('http://' + $(this).val());
-	        }
-	      }
-	    }
-      });
 	}
 
   };

From 87fbacdb1dbaf35d526dc9d7b722f62d28d92c38 Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Tue, 16 Dec 2014 00:58:10 +0100
Subject: [PATCH 009/275] CF-376 temp workaround to get actor suggests without
 consumer key

---
 .../includes/culturefeed_entry_ui.pages.inc   |  6 +--
 culturefeed_search/culturefeed_search.module  | 15 ++++++-
 culturefeed_search/includes/pages.inc         | 45 ++++++++++++-------
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index c6bb4b0c..764aab44 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2,7 +2,7 @@
 /**
  * @file
  * Page callbacks for the entry api ui.
- */
+ */ 
 
 /**
  * Form callback: Create a new event, or edit an existing.
@@ -541,7 +541,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     $form['basic']['location']['actor']['location_actor_label'] = array(
       '#type' => 'textfield',
       '#title' => t('Location'),
-      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions',
+      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions/all',
       '#required' => FALSE,
       '#default_value' => isset($default_location_label) ? $default_location_label : '',
       '#size' => 80,
@@ -950,7 +950,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     $form['extra']['organiser']['actor']['organiser_actor_label'] = array(
       '#type' => 'textfield',
       '#title' => t('Organizer'),
-      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions',
+      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions/all',
       '#required' => FALSE,
       '#default_value' => $default_organiser_label,
     );
diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 1277f711..a43859e9 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -31,16 +31,27 @@ function culturefeed_search_menu() {
   $items['autocomplete/culturefeed/suggestions'] = array(
     'title' => 'Culturefeed suggestions autocomplete',
     'page callback' => 'culturefeed_search_suggestions_autocomplete_page',
-    'page arguments' => array(3, FALSE, NULL),
+    'page arguments' => array(3, FALSE, NULL, FALSE),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/pages.inc',
   );
 
+  // Autocomplete path for actor
   $items['autocomplete/culturefeed/actor-suggestions'] = array(
     'title' => 'Culturefeed suggestions autocomplete',
     'page callback' => 'culturefeed_search_suggestions_autocomplete_page',
-    'page arguments' => array(3, FALSE, 'actor'),
+    'page arguments' => array(3, FALSE, 'actor', FALSE),
+    'access arguments' => array('access content'),
+    'type' => MENU_CALLBACK,
+    'file' => 'includes/pages.inc',
+  );
+  
+  // Autocomplete path for all actors from production (temporary workaround for PWK-213)
+  $items['autocomplete/culturefeed/actor-suggestions/all'] = array(
+    'title' => 'Culturefeed suggestions autocomplete',
+    'page callback' => 'culturefeed_search_suggestions_autocomplete_page',
+    'page arguments' => array(4, FALSE, 'actor', TRUE),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/pages.inc',
diff --git a/culturefeed_search/includes/pages.inc b/culturefeed_search/includes/pages.inc
index 75bc9d74..ed7e88e7 100644
--- a/culturefeed_search/includes/pages.inc
+++ b/culturefeed_search/includes/pages.inc
@@ -5,11 +5,12 @@
  */
 
 use \Guzzle\Http\Exception;
+use \Guzzle\Http\Client;
 
 /**
  * Autcomplete callback for the suggestions on Cdb items.
  */
-function culturefeed_search_suggestions_autocomplete_page($search_string, $past = FALSE, $type = NULL) {
+function culturefeed_search_suggestions_autocomplete_page($search_string, $past = FALSE, $type = NULL, $all = FALSE) {
 
   $matches = array();
 
@@ -18,21 +19,35 @@ function culturefeed_search_suggestions_autocomplete_page($search_string, $past
     try {
 
       $types = !empty($type) ? array($type) : array();
-
-      // Get the list of suggestions from service.
-      $suggestions = culturefeed_get_search_service()->searchSuggestions($search_string, $types, $past);
-      if ($suggestions->hasSuggestions()) {
-        foreach ($suggestions as $suggestion) {
-          $title = $location_title = check_plain($suggestion->getTitle());
-          $location = $suggestion->getLocation();
-          if (!empty($location)) {
-            $location_title .= ' - <small class="muted">(' . $location . ')<small>';
+      
+      if (!$all) {
+        // Get the list of suggestions from service.
+        $suggestions = culturefeed_get_search_service()->searchSuggestions($search_string, $types, $past);
+        if ($suggestions->hasSuggestions()) {
+          foreach ($suggestions as $suggestion) {
+            $title = $location_title = check_plain($suggestion->getTitle());
+            $location = $suggestion->getLocation();
+            if (!empty($location)) {
+              $location_title .= ' - <small class="muted">(' . $location . ')<small>';
+            }
+            $object = new stdClass();
+            $object->title = $title;
+            $object->key = $suggestion->getCdbId();
+            $object->locationTitle = $location_title;
+            $matches[$suggestion->getCdbId()] = $object;
+          }
+        }
+      }
+      else {
+        $client = new Client();
+        $client->setDefaultHeaders(array('Accept' => 'application/json'));
+        $body = json_decode($client->get('http://search-prod.lodgon.com/search/rest/search/suggest/item?title=' . $search_string . '&fq=type:actor%20asset:true')->send()->getBody(TRUE));
+        foreach ($body->suggestions as $suggestion) {
+          $suffix = '';
+          if (!empty($suggestion->zipcode)) {
+            $suffix .= ' - (' . $suggestion->zipcode . ')';
           }
-          $object = new stdClass();
-          $object->title = $title;
-          $object->key = $suggestion->getCdbId();
-          $object->locationTitle = $location_title;
-          $matches[$suggestion->getCdbId()] = $object;
+          $matches[$suggestion->cdbid] = $suggestion->value . $suffix;
         }
       }
 

From 8b8243ca9b06a633c57173fa5b863574c12cd72b Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 17 Dec 2014 10:50:43 +0100
Subject: [PATCH 010/275] MSS-94 php 5.3 fix

---
 .../culturefeed_date_control/form/opening_times.inc           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc b/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
index 02715405..da4d707d 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
+++ b/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
@@ -56,14 +56,14 @@ function culturefeed_date_control_opening_times_process(array $element, array &$
     );
 
     $element['days'][$day][0]['open_from'] = array(
-      '#default_value' => isset($opening_times['days'][$day][0]['open_from']) ? $opening_times['days'][$day][0]['open_from'] : '',
+      '#default_value' => isset($opening_times['days'][$day]) && isset($opening_times['days'][$day][0]['open_from']) ? $opening_times['days'][$day][0]['open_from'] : '',
       '#description' => t('Format') . ': 12:00',
       '#size' => 12,
       '#type' => 'textfield',
     );
 
     $element['days'][$day][0]['open_till'] = array(
-      '#default_value' => isset($opening_times['days'][$day][0]['open_till']) ? $opening_times['days'][$day][0]['open_till'] : '',
+      '#default_value' => isset($opening_times['days'][$day]) && isset($opening_times['days'][$day][0]['open_till']) ? $opening_times['days'][$day][0]['open_till'] : '',
       '#description' => t('Format') . ': 12:00',
       '#size' => 12,
       '#type' => 'textfield',

From a963de2fe8e8aeea340c9eb3d7ecada265dd9fe7 Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Mon, 5 Jan 2015 17:01:47 +0100
Subject: [PATCH 011/275] adding $custom_entry_api_tags default value

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 54a74437..2db247bf 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2269,6 +2269,7 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
 
   // Keywords.
   $keywords_form = array();
+  $custom_entry_api_tags = array();
   if ($values['keywords']) {    
     $keywords_form = explode(';', $values['keywords']);
   }

From 383f7d54c92be70e5a73d09cfb55f8f691ccbb0c Mon Sep 17 00:00:00 2001
From: svenhoutmeyers <sven@cultuurnet.be>
Date: Tue, 6 Jan 2015 16:15:38 +0100
Subject: [PATCH 012/275] small bugfixes + watchdog

---
 .../includes/culturefeed_entry_ui.pages.inc     |  4 +++-
 culturefeed_search/includes/pages.inc           | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 2db247bf..da2c5aa7 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2296,10 +2296,12 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
     if ($update) {
       Drupalculturefeed_EntryApi::updateEvent($event);
       $form_state['#event_id'] = $event->getCdbId();
+      watchdog('culturefeed_entry_ui', 'Event %eventid updated.', array('%eventid' => $form_state['#event_id']));
       cache_clear_all('culturefeed:results:detail:event:' . $event->getCdbId(), 'cache_culturefeed_search');
     }
     else {
       $form_state['#event_id'] = Drupalculturefeed_EntryApi::createEvent($event);
+      watchdog('culturefeed_entry_ui', 'Event %eventid created.', array('%eventid' => $form_state['#event_id']));
     }
 
     $form_state['#update_event'] = $update;
@@ -2450,7 +2452,7 @@ function culturefeed_entry_ui_delete_event_form_submit($form, &$form_state) {
   try {
     Drupalculturefeed_EntryApi::deleteEvent($form_state['values']['id']);
     drupal_set_message(t('Event successfully deleted'));
-    $form_state['redirect'] = '<front>';
+    $form_state['redirect'] = 'agenda/edit';
   } catch (Exception $e) {
     watchdog_exception(WATCHDOG_ERROR, $e);
     drupal_set_message(t('An error occurred while deleting the event'), 'error');
diff --git a/culturefeed_search/includes/pages.inc b/culturefeed_search/includes/pages.inc
index ed7e88e7..d0fdadb9 100644
--- a/culturefeed_search/includes/pages.inc
+++ b/culturefeed_search/includes/pages.inc
@@ -42,12 +42,19 @@ function culturefeed_search_suggestions_autocomplete_page($search_string, $past
         $client = new Client();
         $client->setDefaultHeaders(array('Accept' => 'application/json'));
         $body = json_decode($client->get('http://search-prod.lodgon.com/search/rest/search/suggest/item?title=' . $search_string . '&fq=type:actor%20asset:true')->send()->getBody(TRUE));
-        foreach ($body->suggestions as $suggestion) {
-          $suffix = '';
-          if (!empty($suggestion->zipcode)) {
-            $suffix .= ' - (' . $suggestion->zipcode . ')';
+        if ($body->suggestions) {
+          foreach ($body->suggestions as $suggestion) {
+            $title = $location_title = check_plain($suggestion->value);
+            $location = $suggestion->zipcode;
+            if (!empty($location)) {
+              $location_title .= ' - <small class="muted">(' . $location->zipcode . ')<small>';
+            }
+            $object = new stdClass();
+            $object->title = $title;
+            $object->key = $suggestion->cdbid;
+            $object->locationTitle = $location_title;
+            $matches[$suggestion->cdbid] = $object;
           }
-          $matches[$suggestion->cdbid] = $suggestion->value . $suffix;
         }
       }
 

From a8bf987ea3b296171a34332f415e7d2eda934dcb Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 22 Jan 2015 10:55:10 +0100
Subject: [PATCH 013/275] MSS-117 point 2 custom locations can be edited now

---
 .../includes/culturefeed_entry_ui.pages.inc                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index da2c5aa7..a616f3c1 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -7,7 +7,7 @@
 /**
  * Form callback: Create a new event, or edit an existing.
  */
-function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
+function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
 
   $form = array();
 
@@ -110,8 +110,10 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
         $custom_location_street = $address->getStreet();
         $custom_location_number = $address->getHouseNumber();
         $custom_location_zip = $address->getZip();
-        $custom_location_city = $address->getCity();
         $custom_location_country = $address->getCountry();
+        if ($custom_location_country == 'BE') {
+          $custom_location_city = $custom_location_zip . ' ' . $address->getCity();
+        }
       }
     }
 

From 8676331b3984a8aabe5cd4fd131298676cee1e80 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 22 Jan 2015 13:41:47 +0100
Subject: [PATCH 014/275] MSS-124 fixing price issue

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index a616f3c1..c7448877 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -268,7 +268,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
 
     // Default price
     if ($info = $event_details->getPrice()) {
-      $default_price = $info->getValue();
+      $default_price = str_replace('.',',', $info->getValue());
       $default_free_price = 0;
       $default_price_description = $info->getDescription();
       if ($default_price == '0.00') {
@@ -2080,7 +2080,7 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   }
   else {
     if (!empty($values['price']['amount'])) {
-      $price = new CultureFeed_Cdb_Data_Price(floatval($values['price']['amount']));
+      $price = new CultureFeed_Cdb_Data_Price(floatval(str_replace(',','.', $values['price']['amount'])));
       if (!empty($values['price']['extra']['extra_info'])) {
         $price->setDescription($values['price']['extra']['extra_info']);
       }

From 2a5755bd896b02e2e8a21b0f19cca399917fd5f3 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 22 Jan 2015 15:09:46 +0100
Subject: [PATCH 015/275] MSS-123 possible fix for images with spaces in
 filename

---
 .../includes/culturefeed_entry_ui.pages.inc   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index a616f3c1..00aa3aca 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -259,6 +259,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
         if ($default_image) {
           file_usage_add($default_image, 'culturefeed_entry_ui', 'event', $default_image->fid);
           $default_image_hlink = $main_image->getHLink();
+          $default_copyright = $main_image->getCopyright();
         }
       } catch (Exception $e) {
         watchdog_exception('culturefeed_entry_ui', $e);
@@ -840,7 +841,15 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       '#value' => $default_image_hlink,
     );
   }
-
+  
+  // Copyright
+  $form['extra']['photo']['copyright_text'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Copyright'),
+    '#description' => t('Name of the copyright owner of this image.'),
+    '#default_value' => isset($default_copyright) ? $default_copyright : '',
+    '#size' => 30,
+  );
   $form['extra']['photo']['copyright'] = array(
     '#type' => 'checkbox',
     '#default_value' => isset($default_image->fid) ? 1 : 0,
@@ -1671,6 +1680,9 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
   if (!empty($values['photo']['upload']) && $values['photo']['copyright'] != 1) {
     form_set_error('photo', t('Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank.'));
   }
+  if (!empty($values['photo']['upload']) && empty($values['photo']['copyright_text'])) {
+    form_set_error('photo', t('Copyright field is required.'));
+  }
 
   // Validate categories
   if (empty($values['what'])) {
@@ -2025,17 +2037,22 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
 
   // Photo
   if ($values['photo']['upload']) {
+  
+    
 
     // Save to Drupal
     $drupal_file = file_load($values['photo']['upload']);
-    $drupal_file->status = FILE_STATUS_PERMANENT;
-
+    $drupal_file->status = FILE_STATUS_PERMANENT;    
+    $drupal_file->filename = urlencode($drupal_file->filename); //fix filenames with spaces
+    $drupal_file->uri = 'public://uploads/' . $drupal_file->filename;
     file_save($drupal_file);
     file_usage_add($drupal_file, 'culturefeed_entry_ui', 'event', $drupal_file->fid);
+    
 
     // Add to detail
     $file = new CultureFeed_Cdb_Data_File();
     $file->setMediaType($file::MEDIA_TYPE_PHOTO);
+    $file->setCopyright($values['photo']['copyright_text']);
     $file->setMain(TRUE);
     switch ($drupal_file->filemime) {
       case 'image/gif':

From 7c75c26eff99dae37b0fc03e2894dc91eba5d923 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 22 Jan 2015 15:25:44 +0100
Subject: [PATCH 016/275] MSS-119 punt 3 arrow keys and tabs

---
 .../js/bootstrap_autocomplete_override.js     | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index 000901db..c0a0ba43 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -1,8 +1,31 @@
 
 (function ($) {
-/**
- * Fills the suggestion popup with any matches received.
- */
+
+    /**
+     * Hides the autocomplete suggestions.
+     */
+    Drupal.jsAC.prototype.hidePopup = function (keycode) {
+        // Select item if the right key or mousebutton was pressed.
+        if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
+            this.input.value = $(this.selected).data('autocompleteValue');
+        }
+        // Hide popup.
+        var popup = this.popup;
+        if (popup) {
+            this.popup = null;
+            $(popup).fadeOut('fast', function () { $(popup).remove(); });
+        }
+        this.selected = false;
+        $(this.ariaLive).empty();
+
+        // Workaround for bootstrap losing tabindex on autocomplete popup.
+        $(this.input).parents('.form-item').next().find(':tabbable').focus();
+
+    };
+
+    /**
+     * Fills the suggestion popup with any matches received.
+     */
     Drupal.jsAC.prototype.found = function (matches) {
         // If no value in the textfield, do not show the popup.
         if (!this.input.value.length) {

From c67647c381d56cc32f549066e067635882fbd1fc Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 22 Jan 2015 15:48:37 +0100
Subject: [PATCH 017/275] MSS-119 point 3 extra conditions

---
 .../js/bootstrap_autocomplete_override.js                 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index c0a0ba43..7d2b8002 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -4,7 +4,7 @@
     /**
      * Hides the autocomplete suggestions.
      */
-    Drupal.jsAC.prototype.hidePopup = function (keycode) {
+    Drupal.jsAC.prototype.hidePopup = function (keycode, op) {
         // Select item if the right key or mousebutton was pressed.
         if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
             this.input.value = $(this.selected).data('autocompleteValue');
@@ -19,7 +19,9 @@
         $(this.ariaLive).empty();
 
         // Workaround for bootstrap losing tabindex on autocomplete popup.
-        $(this.input).parents('.form-item').next().find(':tabbable').focus();
+        if ((!op || op != 'empty') && this.input.value) {
+            $(this.input).parents('.form-item').next().find(':tabbable').focus();
+        }
 
     };
 
@@ -79,7 +81,7 @@
             }
             else {
                 $(this.popup).css({ visibility: 'hidden' });
-                this.hidePopup();
+                this.hidePopup(null, 'empty');
                 if (this.input.name == 'organiser[actor][organiser_actor_label]') {
                     $('#edit-organiser-add-new-actor').css({ display: 'block' });
                     $('#organiser_actor_id').val('');

From d704402be86ace715a36806d2ba6eae3175fe0e5 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 22 Jan 2015 15:56:07 +0100
Subject: [PATCH 018/275] adding transliteration

---
 culturefeed_entry_ui/culturefeed_entry_ui.info             | 1 +
 .../includes/culturefeed_entry_ui.pages.inc                | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.info b/culturefeed_entry_ui/culturefeed_entry_ui.info
index 14b0a6a8..f11ff2a3 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.info
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.info
@@ -11,6 +11,7 @@ dependencies[] = file
 dependencies[] = date
 dependencies[] = date_api
 dependencies[] = date_popup
+dependencies[] = transliteration
 
 files[] = views/handlers/views_handler_field_cdb_item_operations.inc
 files[] = views/handlers/views_handler_area_cdb_item_create.inc
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 00aa3aca..d3d949e0 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2037,17 +2037,12 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
 
   // Photo
   if ($values['photo']['upload']) {
-  
-    
 
     // Save to Drupal
     $drupal_file = file_load($values['photo']['upload']);
-    $drupal_file->status = FILE_STATUS_PERMANENT;    
-    $drupal_file->filename = urlencode($drupal_file->filename); //fix filenames with spaces
-    $drupal_file->uri = 'public://uploads/' . $drupal_file->filename;
+    $drupal_file->status = FILE_STATUS_PERMANENT;
     file_save($drupal_file);
     file_usage_add($drupal_file, 'culturefeed_entry_ui', 'event', $drupal_file->fid);
-    
 
     // Add to detail
     $file = new CultureFeed_Cdb_Data_File();

From 47c0686954645fed349ef66f0e2993adbfffb198 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 22 Jan 2015 15:56:46 +0100
Subject: [PATCH 019/275] MSS-119 point 3 more fixes

---
 .../js/bootstrap_autocomplete_override.js     | 24 -------------------
 .../js/culturefeed_entry_ui.js                |  9 ++++++-
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index 7d2b8002..4d2b2666 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -1,30 +1,6 @@
 
 (function ($) {
 
-    /**
-     * Hides the autocomplete suggestions.
-     */
-    Drupal.jsAC.prototype.hidePopup = function (keycode, op) {
-        // Select item if the right key or mousebutton was pressed.
-        if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
-            this.input.value = $(this.selected).data('autocompleteValue');
-        }
-        // Hide popup.
-        var popup = this.popup;
-        if (popup) {
-            this.popup = null;
-            $(popup).fadeOut('fast', function () { $(popup).remove(); });
-        }
-        this.selected = false;
-        $(this.ariaLive).empty();
-
-        // Workaround for bootstrap losing tabindex on autocomplete popup.
-        if ((!op || op != 'empty') && this.input.value) {
-            $(this.input).parents('.form-item').next().find(':tabbable').focus();
-        }
-
-    };
-
     /**
      * Fills the suggestion popup with any matches received.
      */
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 0e5025a7..da47b421 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -61,7 +61,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
     /**
      * Hides the autocomplete suggestions.
      */
-    Drupal.jsAC.prototype.hidePopup = function (keycode) {
+    Drupal.jsAC.prototype.hidePopup = function (keycode, op) {
 
         // Select item if the right key or mousebutton was pressed.
         if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
@@ -93,6 +93,13 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
         }
         this.selected = false;
         $(this.ariaLive).empty();
+
+        // Workaround for bootstrap losing tabindex on autocomplete popup.
+        if ((!op || op != 'empty') && this.input.value) {
+            $(this.input).parents('.form-item').next().find(':tabbable').focus();
+        }
+
+
     };
 
     /**

From 322f0ac1ecb61f204c1f3e176c3913f1ddef92b8 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 10:36:26 +0100
Subject: [PATCH 020/275] MSS-119 punt 5

---
 culturefeed_entry_ui/js/culturefeed_entry_ui.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index da47b421..cbbed6e1 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -58,6 +58,18 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 
   };
 
+    /**
+    *
+    * Fire the autocomplete on paste.
+    */
+    Drupal.behaviors.autocomplete_paste = {
+        attach: function (context, settings) {
+            $('.form-autocomplete input').bind("paste", function () {
+                $(this).populatePopup();
+            });
+        }
+    }
+
     /**
      * Hides the autocomplete suggestions.
      */

From e10faeaed446652484702d57c4418f30370c0686 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 11:12:32 +0100
Subject: [PATCH 021/275] MSS-120 contact email fix

---
 .../includes/culturefeed_entry_ui.pages.inc                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index a616f3c1..e9380889 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1847,8 +1847,10 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
             array_push($phones, $phone);
             break;
           case '1':
-            $mail = new CultureFeed_Cdb_Data_Mail($extra['channel_input'], FALSE, FALSE);
-            array_push($mails, $mail);
+            if ($extra['channel_input']) {
+              $mail = new CultureFeed_Cdb_Data_Mail($extra['channel_input'], FALSE, FALSE);
+              array_push($mails, $mail);
+            }
             break;
         }
       }

From 137c4aa6b16760bb35a1929dcbb62c7597dfebc6 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 12:32:04 +0100
Subject: [PATCH 022/275] MSS-121 maxlength

---
 .../includes/culturefeed_entry_ui.pages.inc   |   6 +-
 .../js/culturefeed_entry_ui.js                |  13 +-
 .../js/maxlength/jquery.maxlength-fr.js       |  12 +
 .../js/maxlength/jquery.maxlength.css         |  14 +
 .../js/maxlength/jquery.maxlength.js          | 230 ++++++++++++
 .../js/maxlength/jquery.maxlength.min.js      |   6 +
 .../js/maxlength/jquery.plugin.js             | 344 ++++++++++++++++++
 .../js/maxlength/jquery.plugin.min.js         |   4 +
 .../js/maxlength/maxlengthBasic.html          |  26 ++
 9 files changed, 653 insertions(+), 2 deletions(-)
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength.css
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.plugin.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/maxlengthBasic.html

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index e9380889..7267f059 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -189,6 +189,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       $default_long_description = $event_details->getLongDescription();
       $source_text = '/<p class="uiv-source">(.*)<\/p>/';
       $default_long_description = preg_replace($source_text, '', $default_long_description);
+      $default_long_description = filter_xss($default_long_description, array());
       //$default_long_description = substr($default_long_description, 0, -169);
       $form_state['#ld_needed'] = TRUE;
     }
@@ -709,9 +710,10 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     '#title' => t('Short description'),
     '#rows' => 4,
     '#maxlength' => 400,
-    '#description' => t('Maximum 400 characters'),
+    //'#description' => t('Maximum 400 characters'),
     '#default_value' => $default_short_description,
     '#element_validate' => array('culturefeed_entry_ui_validate_textarea_markup'),
+    '#suffix' => '<span id="edit-description-sd-short-description-maxlength-counter"></span>',
   );
 
   $form['extra']['description']['ld'] = array(
@@ -1380,6 +1382,8 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   else {
     $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js';
   }
+  $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.plugin.js';
+  $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength.js';
   return $form;
 
 }
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index cbbed6e1..e5c22d64 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -59,7 +59,18 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
   };
 
     /**
-    *
+     * Maxlength
+     */
+    Drupal.behaviors.maxlength = {
+        attach: function (context, settings) {
+            $('#edit-description-sd-short-description').maxlength({
+                max: 400,
+                feedbackTarget: '#edit-description-sd-short-description-maxlength-counter'
+            });
+        }
+    }
+
+    /**
     * Fire the autocomplete on paste.
     */
     Drupal.behaviors.autocomplete_paste = {
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js
new file mode 100644
index 00000000..e7cf26a3
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js
@@ -0,0 +1,12 @@
+/* http://keith-wood.name/maxlength.html
+   French initialisation for the jQuery Max Length extension
+   Written by Keith Wood (kbwood{at}iinet.com.au) April 2012. */
+(function($) { // hide the namespace
+
+$.maxlength.regionalOptions['fr'] = {
+	feedbackText: '{r} de caractères restants ({m} maximum)',
+	overflowText: '{o} de caractères trop ({m} maximum)'
+};
+$.maxlength.setDefaults($.maxlength.regionalOptions['fr']);
+
+})(jQuery);
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength.css b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.css
new file mode 100644
index 00000000..b4b3ed06
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.css
@@ -0,0 +1,14 @@
+/* Styles for Max Length plugin v2.0.0 */
+.maxlength-feedback {
+	margin-left: 0.5em;
+	font-size: 75%;
+}
+.maxlength-full {
+	background-color: #fee;
+}
+.maxlength-overflow {
+	background-color: #fcc;
+}
+.maxlength-disabled {
+	opacity: 0.5;
+}
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.js
new file mode 100644
index 00000000..71cd0da5
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.js
@@ -0,0 +1,230 @@
+/* http://keith-wood.name/maxlength.html
+   Textarea Max Length for jQuery v2.0.0.
+   Written by Keith Wood (kwood{at}iinet.com.au) May 2009.
+   Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
+   Please attribute the author if you use it. */
+
+(function($) { // hide the namespace
+
+	var pluginName = 'maxlength';
+
+	/** Create the maxlength plugin.
+		<p>Sets a textarea to limit the number of characters that may be entered.</p>
+		<p>Expects HTML like:</p>
+		<pre>&lt;textarea></textarea>
+		<p>Provide inline configuration like:</p>
+		<pre>&lt;textarea data-maxlength="name: 'value'">&lt;/textarea></pre>
+	 	@module MaxLength
+		@augments JQPlugin
+		@example $(selector).maxlength() */
+	$.JQPlugin.createPlugin({
+	
+		/** The name of the plugin. */
+		name: pluginName,
+			
+		/** Maxlength full callback.
+			Triggered when the text area is full or overflowing.
+			@callback fullCallback
+			@param overflowing {boolean} True if overflowing, false if not.
+			@example onFull: function(overflowing) {
+	$(this).addClass(overflowing ? 'overflow' : 'full');
+} */
+			
+		/** Default settings for the plugin.
+			@property [max=200] {number} Maximum length.
+			@property [truncate=true] {boolean} True to disallow further input, false to highlight only.
+			@property [showFeedback=true] {boolean} True to always show user feedback, 'active' for hover/focus only.
+			@property [feedbackTarget=null] {string|Element|jQuery|function} jQuery selector, element,
+				or jQuery object, or function for element to fill with feedback.
+			@property [onFull=null] {fullCallback} Callback when full or overflowing. */
+		defaultOptions: {
+			max: 200,
+			truncate: true,
+			showFeedback: true,
+			feedbackTarget: null,
+			onFull: null
+		},
+
+		/** Localisations for the plugin.
+			Entries are objects indexed by the language code ('' being the default US/English).
+			Each object has the following attributes.
+			@property [feedbackText='{r}&nbsp;characters&nbsp;remaining&nbsp;({m}&nbsp;maximum)'] {string}
+				Display text for feedback message, use {r} for remaining characters,
+				{c} for characters entered, {m} for maximum.
+			@property [overflowText='{o} characters too many ({m} maximum)'] {string}
+				Display text when past maximum, use substitutions above and {o} for characters past maximum. */
+		regionalOptions: { // Available regional settings, indexed by language/country code
+			'': { // Default regional settings - English/US
+				feedbackText: '{r} characters remaining ({m} maximum)',
+				overflowText: '{o} characters too many ({m} maximum)'
+			}
+		},
+		
+		/** Names of getter methods - those that can't be chained. */
+		_getters: ['curLength'],
+
+		_feedbackClass: pluginName + '-feedback', //Class name for the feedback section
+		_fullClass: pluginName + '-full', // Class name for indicating the textarea is full
+		_overflowClass: pluginName + '-overflow', // Class name for indicating the textarea is overflowing
+		_disabledClass: pluginName + '-disabled', // Class name for indicating the textarea is disabled
+
+		_instSettings: function(elem, options) {
+			return {feedbackTarget: $([])};
+		},
+
+		_postAttach: function(elem, inst) {
+			elem.on('keypress.' + inst.name, function(event) {
+					if (!inst.options.truncate) {
+						return true;
+					}
+					var ch = String.fromCharCode(
+						event.charCode == undefined ? event.keyCode : event.charCode);
+					return (event.ctrlKey || event.metaKey || ch == '\u0000' ||
+						$(this).val().length < inst.options.max);
+				}).
+				on('keyup.' + inst.name, function() { $.maxlength._checkLength(elem); });
+		},
+
+		_optionsChanged: function(elem, inst, options) {
+			$.extend(inst.options, options);
+			if (inst.feedbackTarget.length > 0) { // Remove old feedback element
+				if (inst.hadFeedbackTarget) {
+					inst.feedbackTarget.empty().val('').
+						removeClass(this._feedbackClass + ' ' + this._fullClass + ' ' + this._overflowClass);
+				}
+				else {
+					inst.feedbackTarget.remove();
+				}
+				inst.feedbackTarget = $([]);
+			}
+			if (inst.options.showFeedback) { // Add new feedback element
+				inst.hadFeedbackTarget = !!inst.options.feedbackTarget;
+				if ($.isFunction(inst.options.feedbackTarget)) {
+					inst.feedbackTarget = inst.options.feedbackTarget.apply(elem[0], []);
+				}
+				else if (inst.options.feedbackTarget) {
+					inst.feedbackTarget = $(inst.options.feedbackTarget);
+				}
+				else {
+					inst.feedbackTarget = $('<span></span>').insertAfter(elem);
+				}
+				inst.feedbackTarget.addClass(this._feedbackClass);
+			}
+			elem.off('mouseover.' + inst.name + ' focus.' + inst.name +
+				'mouseout.' + inst.name + ' blur.' + inst.name);
+			if (inst.options.showFeedback == 'active') { // Additional event handlers
+				elem.on('mouseover.' + inst.name, function() {
+						inst.feedbackTarget.css('visibility', 'visible');
+					}).on('mouseout.' + inst.name, function() {
+						if (!inst.focussed) {
+							inst.feedbackTarget.css('visibility', 'hidden');
+						}
+					}).on('focus.' + inst.name, function() {
+						inst.focussed = true;
+						inst.feedbackTarget.css('visibility', 'visible');
+					}).on('blur.' + inst.name, function() {
+						inst.focussed = false;
+						inst.feedbackTarget.css('visibility', 'hidden');
+					});
+				inst.feedbackTarget.css('visibility', 'hidden');
+			}
+			this._checkLength(elem);
+		},
+
+		/** Retrieve the counts of characters used and remaining.
+			@param elem {jQuery} The control to check.
+			@return {object} The current counts with attributes used and remaining.
+			@example var lengths = $(selector).maxlength('curLength'); */
+		curLength: function(elem) {
+			var inst = this._getInst(elem);
+			var value = elem.val();
+			var len = value.replace(/\r\n/g, '~~').replace(/\n/g, '~~').length;
+			return {used: len, remaining: inst.options.max - len};
+		},
+
+		/** Check the length of the text and notify accordingly.
+			@private
+			@param elem {jQuery} The control to check. */
+		_checkLength: function(elem) {
+			var inst = this._getInst(elem);
+			var value = elem.val();
+			var len = value.replace(/\r\n/g, '~~').replace(/\n/g, '~~').length;
+			elem.toggleClass(this._fullClass, len >= inst.options.max).
+			toggleClass(this._overflowClass, len > inst.options.max);
+			if (len > inst.options.max && inst.options.truncate) { // Truncation
+				var lines = elem.val().split(/\r\n|\n/);
+				value = '';
+				var i = 0;
+				while (value.length < inst.options.max && i < lines.length) {
+					value += lines[i].substring(0, inst.options.max - value.length) + '\r\n';
+					i++;
+				}
+				elem.val(value.substring(0, inst.options.max));
+				elem[0].scrollTop = elem[0].scrollHeight; // Scroll to bottom
+				len = inst.options.max;
+			}
+			inst.feedbackTarget.toggleClass(this._fullClass, len >= inst.options.max).
+				toggleClass(this._overflowClass, len > inst.options.max);
+			var feedback = (len > inst.options.max ? // Feedback
+				inst.options.overflowText : inst.options.feedbackText).
+					replace(/\{c\}/, len).replace(/\{m\}/, inst.options.max).
+					replace(/\{r\}/, inst.options.max - len).
+					replace(/\{o\}/, len - inst.options.max);
+			try {
+				inst.feedbackTarget.text(feedback);
+			}
+			catch(e) {
+				// Ignore
+			}
+			try {
+				inst.feedbackTarget.val(feedback);
+			}
+			catch(e) {
+				// Ignore
+			}
+			if (len >= inst.options.max && $.isFunction(inst.options.onFull)) {
+				inst.options.onFull.apply(elem, [len > inst.options.max]);
+			}
+		},
+
+		/** Enable the control.
+			@param elem {Element} The control to affect.
+			@example $(selector).maxlength('enable'); */
+		enable: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			var inst = this._getInst(elem);
+			elem.prop('disabled', false).removeClass(inst.name + '-disabled');
+			inst.feedbackTarget.removeClass(inst.name + '-disabled');
+		},
+
+		/** Disable the control.
+			@param elem {Element} The control to affect.
+			@example $(selector).maxlength('disable'); */
+		disable: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			var inst = this._getInst(elem);
+			elem.prop('disabled', true).addClass(inst.name + '-disabled');
+			inst.feedbackTarget.addClass(inst.name + '-disabled');
+		},
+
+		_preDestroy: function(elem, inst) {
+			if (inst.feedbackTarget.length > 0) {
+				if (inst.hadFeedbackTarget) {
+					inst.feedbackTarget.empty().val('').css('visibility', 'visible').
+						removeClass(this._feedbackClass + ' ' + this._fullClass + ' ' + this._overflowClass);
+				}
+				else {
+					inst.feedbackTarget.remove();
+				}
+			}
+			elem.removeClass(this._fullClass + ' ' + this._overflowClass).off('.' + inst.name);
+		}
+	});
+
+})(jQuery);
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js
new file mode 100644
index 00000000..584a87e6
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js
@@ -0,0 +1,6 @@
+/* http://keith-wood.name/maxlength.html
+   Textarea Max Length for jQuery v2.0.0.
+   Written by Keith Wood (kwood{at}iinet.com.au) May 2009.
+   Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
+   Please attribute the author if you use it. */
+(function($){var h='maxlength';$.JQPlugin.createPlugin({name:h,defaultOptions:{max:200,truncate:true,showFeedback:true,feedbackTarget:null,onFull:null},regionalOptions:{'':{feedbackText:'{r} characters remaining ({m} maximum)',overflowText:'{o} characters too many ({m} maximum)'}},_getters:['curLength'],_feedbackClass:h+'-feedback',_fullClass:h+'-full',_overflowClass:h+'-overflow',_disabledClass:h+'-disabled',_instSettings:function(a,b){return{feedbackTarget:$([])}},_postAttach:function(c,d){c.on('keypress.'+d.name,function(a){if(!d.options.truncate){return true}var b=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);return(a.ctrlKey||a.metaKey||b=='\u0000'||$(this).val().length<d.options.max)}).on('keyup.'+d.name,function(){$.maxlength._checkLength(c)})},_optionsChanged:function(a,b,c){$.extend(b.options,c);if(b.feedbackTarget.length>0){if(b.hadFeedbackTarget){b.feedbackTarget.empty().val('').removeClass(this._feedbackClass+' '+this._fullClass+' '+this._overflowClass)}else{b.feedbackTarget.remove()}b.feedbackTarget=$([])}if(b.options.showFeedback){b.hadFeedbackTarget=!!b.options.feedbackTarget;if($.isFunction(b.options.feedbackTarget)){b.feedbackTarget=b.options.feedbackTarget.apply(a[0],[])}else if(b.options.feedbackTarget){b.feedbackTarget=$(b.options.feedbackTarget)}else{b.feedbackTarget=$('<span></span>').insertAfter(a)}b.feedbackTarget.addClass(this._feedbackClass)}a.off('mouseover.'+b.name+' focus.'+b.name+'mouseout.'+b.name+' blur.'+b.name);if(b.options.showFeedback=='active'){a.on('mouseover.'+b.name,function(){b.feedbackTarget.css('visibility','visible')}).on('mouseout.'+b.name,function(){if(!b.focussed){b.feedbackTarget.css('visibility','hidden')}}).on('focus.'+b.name,function(){b.focussed=true;b.feedbackTarget.css('visibility','visible')}).on('blur.'+b.name,function(){b.focussed=false;b.feedbackTarget.css('visibility','hidden')});b.feedbackTarget.css('visibility','hidden')}this._checkLength(a)},curLength:function(a){var b=this._getInst(a);var c=a.val();var d=c.replace(/\r\n/g,'~~').replace(/\n/g,'~~').length;return{used:d,remaining:b.options.max-d}},_checkLength:function(a){var b=this._getInst(a);var c=a.val();var d=c.replace(/\r\n/g,'~~').replace(/\n/g,'~~').length;a.toggleClass(this._fullClass,d>=b.options.max).toggleClass(this._overflowClass,d>b.options.max);if(d>b.options.max&&b.options.truncate){var f=a.val().split(/\r\n|\n/);c='';var i=0;while(c.length<b.options.max&&i<f.length){c+=f[i].substring(0,b.options.max-c.length)+'\r\n';i++}a.val(c.substring(0,b.options.max));a[0].scrollTop=a[0].scrollHeight;d=b.options.max}b.feedbackTarget.toggleClass(this._fullClass,d>=b.options.max).toggleClass(this._overflowClass,d>b.options.max);var g=(d>b.options.max?b.options.overflowText:b.options.feedbackText).replace(/\{c\}/,d).replace(/\{m\}/,b.options.max).replace(/\{r\}/,b.options.max-d).replace(/\{o\}/,d-b.options.max);try{b.feedbackTarget.text(g)}catch(e){}try{b.feedbackTarget.val(g)}catch(e){}if(d>=b.options.max&&$.isFunction(b.options.onFull)){b.options.onFull.apply(a,[d>b.options.max])}},enable:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}var b=this._getInst(a);a.prop('disabled',false).removeClass(b.name+'-disabled');b.feedbackTarget.removeClass(b.name+'-disabled')},disable:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}var b=this._getInst(a);a.prop('disabled',true).addClass(b.name+'-disabled');b.feedbackTarget.addClass(b.name+'-disabled')},_preDestroy:function(a,b){if(b.feedbackTarget.length>0){if(b.hadFeedbackTarget){b.feedbackTarget.empty().val('').css('visibility','visible').removeClass(this._feedbackClass+' '+this._fullClass+' '+this._overflowClass)}else{b.feedbackTarget.remove()}}a.removeClass(this._fullClass+' '+this._overflowClass).off('.'+b.name)}})})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.plugin.js b/culturefeed_entry_ui/js/maxlength/jquery.plugin.js
new file mode 100644
index 00000000..71767a6b
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.plugin.js
@@ -0,0 +1,344 @@
+/* Simple JavaScript Inheritance
+ * By John Resig http://ejohn.org/
+ * MIT Licensed.
+ */
+// Inspired by base2 and Prototype
+(function(){
+	var initializing = false;
+
+	// The base JQClass implementation (does nothing)
+	window.JQClass = function(){};
+
+	// Collection of derived classes
+	JQClass.classes = {};
+ 
+	// Create a new JQClass that inherits from this class
+	JQClass.extend = function extender(prop) {
+		var base = this.prototype;
+
+		// Instantiate a base class (but only create the instance,
+		// don't run the init constructor)
+		initializing = true;
+		var prototype = new this();
+		initializing = false;
+
+		// Copy the properties over onto the new prototype
+		for (var name in prop) {
+			// Check if we're overwriting an existing function
+			prototype[name] = typeof prop[name] == 'function' &&
+				typeof base[name] == 'function' ?
+				(function(name, fn){
+					return function() {
+						var __super = this._super;
+
+						// Add a new ._super() method that is the same method
+						// but on the super-class
+						this._super = function(args) {
+							return base[name].apply(this, args || []);
+						};
+
+						var ret = fn.apply(this, arguments);				
+
+						// The method only need to be bound temporarily, so we
+						// remove it when we're done executing
+						this._super = __super;
+
+						return ret;
+					};
+				})(name, prop[name]) :
+				prop[name];
+		}
+
+		// The dummy class constructor
+		function JQClass() {
+			// All construction is actually done in the init method
+			if (!initializing && this._init) {
+				this._init.apply(this, arguments);
+			}
+		}
+
+		// Populate our constructed prototype object
+		JQClass.prototype = prototype;
+
+		// Enforce the constructor to be what we expect
+		JQClass.prototype.constructor = JQClass;
+
+		// And make this class extendable
+		JQClass.extend = extender;
+
+		return JQClass;
+	};
+})();
+
+(function($) { // Ensure $, encapsulate
+
+	/** Abstract base class for collection plugins v1.0.1.
+		Written by Keith Wood (kbwood{at}iinet.com.au) December 2013.
+		Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license.
+		@module $.JQPlugin
+		@abstract */
+	JQClass.classes.JQPlugin = JQClass.extend({
+
+		/** Name to identify this plugin.
+			@example name: 'tabs' */
+		name: 'plugin',
+
+		/** Default options for instances of this plugin (default: {}).
+			@example defaultOptions: {
+ 	selectedClass: 'selected',
+ 	triggers: 'click'
+ } */
+		defaultOptions: {},
+		
+		/** Options dependent on the locale.
+			Indexed by language and (optional) country code, with '' denoting the default language (English/US).
+			@example regionalOptions: {
+	'': {
+		greeting: 'Hi'
+	}
+ } */
+		regionalOptions: {},
+		
+		/** Names of getter methods - those that can't be chained (default: []).
+			@example _getters: ['activeTab'] */
+		_getters: [],
+
+		/** Retrieve a marker class for affected elements.
+			@private
+			@return {string} The marker class. */
+		_getMarker: function() {
+			return 'is-' + this.name;
+		},
+		
+		/** Initialise the plugin.
+			Create the jQuery bridge - plugin name <code>xyz</code>
+			produces <code>$.xyz</code> and <code>$.fn.xyz</code>. */
+		_init: function() {
+			// Apply default localisations
+			$.extend(this.defaultOptions, (this.regionalOptions && this.regionalOptions['']) || {});
+			// Camel-case the name
+			var jqName = camelCase(this.name);
+			// Expose jQuery singleton manager
+			$[jqName] = this;
+			// Expose jQuery collection plugin
+			$.fn[jqName] = function(options) {
+				var otherArgs = Array.prototype.slice.call(arguments, 1);
+				if ($[jqName]._isNotChained(options, otherArgs)) {
+					return $[jqName][options].apply($[jqName], [this[0]].concat(otherArgs));
+				}
+				return this.each(function() {
+					if (typeof options === 'string') {
+						if (options[0] === '_' || !$[jqName][options]) {
+							throw 'Unknown method: ' + options;
+						}
+						$[jqName][options].apply($[jqName], [this].concat(otherArgs));
+					}
+					else {
+						$[jqName]._attach(this, options);
+					}
+				});
+			};
+		},
+
+		/** Set default values for all subsequent instances.
+			@param options {object} The new default options.
+			@example $.plugin.setDefauls({name: value}) */
+		setDefaults: function(options) {
+			$.extend(this.defaultOptions, options || {});
+		},
+		
+		/** Determine whether a method is a getter and doesn't permit chaining.
+			@private
+			@param name {string} The method name.
+			@param otherArgs {any[]} Any other arguments for the method.
+			@return {boolean} True if this method is a getter, false otherwise. */
+		_isNotChained: function(name, otherArgs) {
+			if (name === 'option' && (otherArgs.length === 0 ||
+					(otherArgs.length === 1 && typeof otherArgs[0] === 'string'))) {
+				return true;
+			}
+			return $.inArray(name, this._getters) > -1;
+		},
+		
+		/** Initialise an element. Called internally only.
+			Adds an instance object as data named for the plugin.
+			@param elem {Element} The element to enhance.
+			@param options {object} Overriding settings. */
+		_attach: function(elem, options) {
+			elem = $(elem);
+			if (elem.hasClass(this._getMarker())) {
+				return;
+			}
+			elem.addClass(this._getMarker());
+			options = $.extend({}, this.defaultOptions, this._getMetadata(elem), options || {});
+			var inst = $.extend({name: this.name, elem: elem, options: options},
+				this._instSettings(elem, options));
+			elem.data(this.name, inst); // Save instance against element
+			this._postAttach(elem, inst);
+			this.option(elem, options);
+		},
+
+		/** Retrieve additional instance settings.
+			Override this in a sub-class to provide extra settings.
+			@param elem {jQuery} The current jQuery element.
+			@param options {object} The instance options.
+			@return {object} Any extra instance values.
+			@example _instSettings: function(elem, options) {
+ 	return {nav: elem.find(options.navSelector)};
+ } */
+		_instSettings: function(elem, options) {
+			return {};
+		},
+
+		/** Plugin specific post initialisation.
+			Override this in a sub-class to perform extra activities.
+			@param elem {jQuery} The current jQuery element.
+			@param inst {object} The instance settings.
+			@example _postAttach: function(elem, inst) {
+ 	elem.on('click.' + this.name, function() {
+ 		...
+ 	});
+ } */
+		_postAttach: function(elem, inst) {
+		},
+
+		/** Retrieve metadata configuration from the element.
+			Metadata is specified as an attribute:
+			<code>data-&lt;plugin name>="&lt;setting name>: '&lt;value>', ..."</code>.
+			Dates should be specified as strings in this format: 'new Date(y, m-1, d)'.
+			@private
+			@param elem {jQuery} The source element.
+			@return {object} The inline configuration or {}. */
+		_getMetadata: function(elem) {
+			try {
+				var data = elem.data(this.name.toLowerCase()) || '';
+				data = data.replace(/'/g, '"');
+				data = data.replace(/([a-zA-Z0-9]+):/g, function(match, group, i) { 
+					var count = data.substring(0, i).match(/"/g); // Handle embedded ':'
+					return (!count || count.length % 2 === 0 ? '"' + group + '":' : group + ':');
+				});
+				data = $.parseJSON('{' + data + '}');
+				for (var name in data) { // Convert dates
+					var value = data[name];
+					if (typeof value === 'string' && value.match(/^new Date\((.*)\)$/)) {
+						data[name] = eval(value);
+					}
+				}
+				return data;
+			}
+			catch (e) {
+				return {};
+			}
+		},
+
+		/** Retrieve the instance data for element.
+			@param elem {Element} The source element.
+			@return {object} The instance data or {}. */
+		_getInst: function(elem) {
+			return $(elem).data(this.name) || {};
+		},
+		
+		/** Retrieve or reconfigure the settings for a plugin.
+			@param elem {Element} The source element.
+			@param name {object|string} The collection of new option values or the name of a single option.
+			@param [value] {any} The value for a single named option.
+			@return {any|object} If retrieving a single value or all options.
+			@example $(selector).plugin('option', 'name', value)
+ $(selector).plugin('option', {name: value, ...})
+ var value = $(selector).plugin('option', 'name')
+ var options = $(selector).plugin('option') */
+		option: function(elem, name, value) {
+			elem = $(elem);
+			var inst = elem.data(this.name);
+			if  (!name || (typeof name === 'string' && value == null)) {
+				var options = (inst || {}).options;
+				return (options && name ? options[name] : options);
+			}
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			var options = name || {};
+			if (typeof name === 'string') {
+				options = {};
+				options[name] = value;
+			}
+			this._optionsChanged(elem, inst, options);
+			$.extend(inst.options, options);
+		},
+		
+		/** Plugin specific options processing.
+			Old value available in <code>inst.options[name]</code>, new value in <code>options[name]</code>.
+			Override this in a sub-class to perform extra activities.
+			@param elem {jQuery} The current jQuery element.
+			@param inst {object} The instance settings.
+			@param options {object} The new options.
+			@example _optionsChanged: function(elem, inst, options) {
+ 	if (options.name != inst.options.name) {
+ 		elem.removeClass(inst.options.name).addClass(options.name);
+ 	}
+ } */
+		_optionsChanged: function(elem, inst, options) {
+		},
+		
+		/** Remove all trace of the plugin.
+			Override <code>_preDestroy</code> for plugin-specific processing.
+			@param elem {Element} The source element.
+			@example $(selector).plugin('destroy') */
+		destroy: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			this._preDestroy(elem, this._getInst(elem));
+			elem.removeData(this.name).removeClass(this._getMarker());
+		},
+
+		/** Plugin specific pre destruction.
+			Override this in a sub-class to perform extra activities and undo everything that was
+			done in the <code>_postAttach</code> or <code>_optionsChanged</code> functions.
+			@param elem {jQuery} The current jQuery element.
+			@param inst {object} The instance settings.
+			@example _preDestroy: function(elem, inst) {
+ 	elem.off('.' + this.name);
+ } */
+		_preDestroy: function(elem, inst) {
+		}
+	});
+	
+	/** Convert names from hyphenated to camel-case.
+		@private
+		@param value {string} The original hyphenated name.
+		@return {string} The camel-case version. */
+	function camelCase(name) {
+		return name.replace(/-([a-z])/g, function(match, group) {
+			return group.toUpperCase();
+		});
+	}
+	
+	/** Expose the plugin base.
+		@namespace "$.JQPlugin" */
+	$.JQPlugin = {
+	
+		/** Create a new collection plugin.
+			@memberof "$.JQPlugin"
+			@param [superClass='JQPlugin'] {string} The name of the parent class to inherit from.
+			@param overrides {object} The property/function overrides for the new class.
+			@example $.JQPlugin.createPlugin({
+ 	name: 'tabs',
+ 	defaultOptions: {selectedClass: 'selected'},
+ 	_initSettings: function(elem, options) { return {...}; },
+ 	_postAttach: function(elem, inst) { ... }
+ }); */
+		createPlugin: function(superClass, overrides) {
+			if (typeof superClass === 'object') {
+				overrides = superClass;
+				superClass = 'JQPlugin';
+			}
+			superClass = camelCase(superClass);
+			var className = camelCase(overrides.name);
+			JQClass.classes[className] = JQClass.classes[superClass].extend(overrides);
+			new JQClass.classes[className]();
+		}
+	};
+
+})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js b/culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js
new file mode 100644
index 00000000..2323e543
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js
@@ -0,0 +1,4 @@
+/** Abstract base class for collection plugins v1.0.1.
+	Written by Keith Wood (kbwood{at}iinet.com.au) December 2013.
+	Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. */
+(function(){var j=false;window.JQClass=function(){};JQClass.classes={};JQClass.extend=function extender(f){var g=this.prototype;j=true;var h=new this();j=false;for(var i in f){h[i]=typeof f[i]=='function'&&typeof g[i]=='function'?(function(d,e){return function(){var b=this._super;this._super=function(a){return g[d].apply(this,a||[])};var c=e.apply(this,arguments);this._super=b;return c}})(i,f[i]):f[i]}function JQClass(){if(!j&&this._init){this._init.apply(this,arguments)}}JQClass.prototype=h;JQClass.prototype.constructor=JQClass;JQClass.extend=extender;return JQClass}})();(function($){JQClass.classes.JQPlugin=JQClass.extend({name:'plugin',defaultOptions:{},regionalOptions:{},_getters:[],_getMarker:function(){return'is-'+this.name},_init:function(){$.extend(this.defaultOptions,(this.regionalOptions&&this.regionalOptions[''])||{});var c=camelCase(this.name);$[c]=this;$.fn[c]=function(a){var b=Array.prototype.slice.call(arguments,1);if($[c]._isNotChained(a,b)){return $[c][a].apply($[c],[this[0]].concat(b))}return this.each(function(){if(typeof a==='string'){if(a[0]==='_'||!$[c][a]){throw'Unknown method: '+a;}$[c][a].apply($[c],[this].concat(b))}else{$[c]._attach(this,a)}})}},setDefaults:function(a){$.extend(this.defaultOptions,a||{})},_isNotChained:function(a,b){if(a==='option'&&(b.length===0||(b.length===1&&typeof b[0]==='string'))){return true}return $.inArray(a,this._getters)>-1},_attach:function(a,b){a=$(a);if(a.hasClass(this._getMarker())){return}a.addClass(this._getMarker());b=$.extend({},this.defaultOptions,this._getMetadata(a),b||{});var c=$.extend({name:this.name,elem:a,options:b},this._instSettings(a,b));a.data(this.name,c);this._postAttach(a,c);this.option(a,b)},_instSettings:function(a,b){return{}},_postAttach:function(a,b){},_getMetadata:function(d){try{var f=d.data(this.name.toLowerCase())||'';f=f.replace(/'/g,'"');f=f.replace(/([a-zA-Z0-9]+):/g,function(a,b,i){var c=f.substring(0,i).match(/"/g);return(!c||c.length%2===0?'"'+b+'":':b+':')});f=$.parseJSON('{'+f+'}');for(var g in f){var h=f[g];if(typeof h==='string'&&h.match(/^new Date\((.*)\)$/)){f[g]=eval(h)}}return f}catch(e){return{}}},_getInst:function(a){return $(a).data(this.name)||{}},option:function(a,b,c){a=$(a);var d=a.data(this.name);if(!b||(typeof b==='string'&&c==null)){var e=(d||{}).options;return(e&&b?e[b]:e)}if(!a.hasClass(this._getMarker())){return}var e=b||{};if(typeof b==='string'){e={};e[b]=c}this._optionsChanged(a,d,e);$.extend(d.options,e)},_optionsChanged:function(a,b,c){},destroy:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}this._preDestroy(a,this._getInst(a));a.removeData(this.name).removeClass(this._getMarker())},_preDestroy:function(a,b){}});function camelCase(c){return c.replace(/-([a-z])/g,function(a,b){return b.toUpperCase()})}$.JQPlugin={createPlugin:function(a,b){if(typeof a==='object'){b=a;a='JQPlugin'}a=camelCase(a);var c=camelCase(b.name);JQClass.classes[c]=JQClass.classes[a].extend(b);new JQClass.classes[c]()}}})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_entry_ui/js/maxlength/maxlengthBasic.html b/culturefeed_entry_ui/js/maxlength/maxlengthBasic.html
new file mode 100644
index 00000000..cef0ff94
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/maxlengthBasic.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+<title>jQuery Max Length Basics</title>
+<link rel="stylesheet" href="jquery.maxlength.css">
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+<script src="jquery.plugin.js"></script>
+<script src="jquery.maxlength.js"></script>
+<script>
+$(function() {
+	$('#maxLength').maxlength();
+});
+</script>
+</head>
+<body>
+<h1>jQuery Max Length Basics</h1>
+<p>This page demonstrates the very basics of the
+	<a href="http://keith-wood.name/maxlength.html">jQuery Max Length plugin</a>.
+	It contains the minimum requirements for using the plugin and
+	can be used as the basis for your own experimentation.</p>
+<p>For more detail see the <a href="http://keith-wood.name/maxlengthRef.html">documentation reference</a> page.</p>
+<p><span class="demoLabel">Default max length:</span>
+	<textarea id="maxLength" rows="5" cols="50"></textarea></p>
+</body>
+</html>

From 854474e16f7afc556e8df956e2db1ac2300a194e Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 12:44:40 +0100
Subject: [PATCH 023/275] MSS-121 use description area

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 3 +--
 culturefeed_entry_ui/js/culturefeed_entry_ui.js              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 7267f059..af000c55 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -710,10 +710,9 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     '#title' => t('Short description'),
     '#rows' => 4,
     '#maxlength' => 400,
-    //'#description' => t('Maximum 400 characters'),
+    '#description' => t('Maximum 400 characters'),
     '#default_value' => $default_short_description,
     '#element_validate' => array('culturefeed_entry_ui_validate_textarea_markup'),
-    '#suffix' => '<span id="edit-description-sd-short-description-maxlength-counter"></span>',
   );
 
   $form['extra']['description']['ld'] = array(
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index e5c22d64..d4623feb 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -65,7 +65,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
         attach: function (context, settings) {
             $('#edit-description-sd-short-description').maxlength({
                 max: 400,
-                feedbackTarget: '#edit-description-sd-short-description-maxlength-counter'
+                feedbackTarget: '#edit-description-sd .help-block, #edit-description-sd .description'
             });
         }
     }

From 8deed132f3b8a6e8d215454604e9aa96423a540d Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 12:49:02 +0100
Subject: [PATCH 024/275] MSS-121 strip tags from default value

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index af000c55..371c148d 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -189,7 +189,8 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       $default_long_description = $event_details->getLongDescription();
       $source_text = '/<p class="uiv-source">(.*)<\/p>/';
       $default_long_description = preg_replace($source_text, '', $default_long_description);
-      $default_long_description = filter_xss($default_long_description, array());
+      $allowed_tags = array('a', 'em', 'strong', 'ul', 'ol', 'li', 'hr');
+      $default_long_description = filter_xss($default_long_description, $allowed_tags);
       //$default_long_description = substr($default_long_description, 0, -169);
       $form_state['#ld_needed'] = TRUE;
     }

From 95cba72635584c8ef20b53e711dcd724c2500be6 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 13:26:01 +0100
Subject: [PATCH 025/275] MSS-122 modify behaviour for same end date

---
 .../culturefeed_date_control/form/date_control.inc     | 10 +++++++---
 .../culturefeed_date_control/form/hybrid.inc           |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc b/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
index 5676f49b..610948be 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
+++ b/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
@@ -45,7 +45,7 @@ function culturefeed_date_control_date_control_process(array $element, array &$f
     '#popup_date_format' => 'd-m-Y',
     '#popup_date_increment' => 1,
     '#select_time_format' => 'H:i',
-    '#select_time_increment' => 30,
+    '#select_time_increment' => 15,
     '#type' => 'culturefeed_date_control_hybrid',
   );
 
@@ -58,7 +58,7 @@ function culturefeed_date_control_date_control_process(array $element, array &$f
     '#popup_date_format' => 'd-m-Y',
     '#popup_date_increment' => 1,
     '#select_time_format' => 'H:i',
-    '#select_time_increment' => 30,
+    '#select_time_increment' => 15,
     '#type' => 'culturefeed_date_control_timestamps',
   );
 
@@ -171,7 +171,11 @@ function culturefeed_date_control_date_control_validate(array $element, array &$
       }
 
       // Timestamps.
-      if ($triggering_parent == 'add_date' || $triggering_parent == 'hour' || $triggering_parent == 'minute') {
+      if (
+        $triggering_parent == 'add_date' || $triggering_parent == 'hour' || $triggering_parent == 'minute' ||
+        ($triggering_parent == 'end_date' && isset($date_control['period']['start_date']) && isset($date_control['period']['end_date']) &&
+          $date_control['period']['start_date'] == $date_control['period']['end_date'])
+      ) {
 
         $type = 'timestamps';
         $date_control['timestamps']['stamps'] = array(
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc b/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
index d6a9e470..6d8bd78f 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
+++ b/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
@@ -88,7 +88,7 @@ function culturefeed_date_control_hybrid_process(array $element, array &$form_st
   $element['start_time'] = array(
     '#attributes' => array('class' => array('time-select-complete-minutes')),
     '#date_format' => 'H:i',
-    '#date_increment' => 30,
+    '#date_increment' => 15,
     '#default_value' => $time,
     '#title' => '',
     '#type' => 'date_select',
@@ -114,7 +114,7 @@ function culturefeed_date_control_hybrid_process(array $element, array &$form_st
     '#attributes' => array('class' => array('time-select-complete-minutes')),
     '#ajax' => $ajax_settings,
     '#date_format' => 'H:i',
-    '#date_increment' => 30,
+    '#date_increment' => 15,
     '#default_value' => '',
     '#title' => '',
     '#type' => 'date_select',

From 7f69e22ef19bf380278c5506d0e8d19559a4dcb9 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 14:33:55 +0100
Subject: [PATCH 026/275] MSS-119 enter on autocomplete

---
 culturefeed_entry_ui/js/culturefeed_entry_ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index cbbed6e1..75c225d4 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -81,7 +81,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 
                 this.input.value = $(this.selected).data('autocompleteTitle');
                 
-                if (this.input.name == 'actor[location_actor_label]') {
+                if (this.input.name == 'location[actor][location_actor_label]') {
 				  $('#location_actor_id').val($(this.selected).data('autocompleteValue'));
 				}
 		  

From d81a944c10770a8902a844e1a584f28530fb31cf Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 29 Jan 2015 17:09:44 +0100
Subject: [PATCH 027/275] CF-393 add stans translations

---
 .../translations/culturefeed_entry_ui.nl.po   | 668 +++++++++++-------
 1 file changed, 403 insertions(+), 265 deletions(-)

diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index b50676bc..1545bb80 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -1,657 +1,795 @@
+# $Id$
+#
+# Dutch translation of Drupal (general)
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+# Generated from files:
+#  culturefeed_entry_ui.module: n/a
+#  views/culturefeed_entry_ui.views_default.inc: n/a
+#  includes/culturefeed_entry_ui.pages.inc: n/a
+#  views/handlers/views_handler_field_cdb_item_operations.inc: n/a
+#  views/handlers/views_handler_area_cdb_item_create.inc: n/a
+#  culturefeed_entry_ui.info: n/a
+#  culturefeed_date_control/culturefeed_date_control.info: n/a
+#  culturefeed_date_control/culturefeed_date_control.module: n/a
+#  culturefeed_date_control/form/date_control.inc: n/a
+#  culturefeed_date_control/form/hybrid.inc: n/a
+#  culturefeed_date_control/form/timestamps.inc: n/a
+#  culturefeed_date_control/form/opening_times.inc: n/a
+#  culturefeed_date_control/form/period.inc: n/a
+#  culturefeed_date_control/theme/theme.inc: n/a
+#  includes/culturefeed_entry_ui.admin.inc: n/a
+#  js/bootstrap_autocomplete_override.js: n/a
+#  js/culturefeed_entry_ui.js: n/a
+#  views/culturefeed_entry_ui.views.inc: n/a
+#
 msgid ""
 msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2015-01-22 16:05+0100\n"
+"PO-Revision-Date: 2015-01-28 13:27+0100\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: POEditor.com\n"
-"Project-Id-Version: CFK - translations\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Language: nl\n"
+"X-Generator: Poedit 1.7.4\n"
 
-#: 
+#: culturefeed_entry_ui.module:18
 msgid "Manage object tags"
 msgstr "Beheer object tags"
 
-#: 
+#: culturefeed_entry_ui.module:19
 msgid "Manage all the tags from the objects on culturefeed (events, actors, ...)."
 msgstr "Beheer alle tags van objecten op culture feed (activiteiten, actoren ...)."
 
-#: 
+#: culturefeed_entry_ui.module:22
 msgid "Manage custom tags"
 msgstr "Manage custom tags"
 
-#: 
+#: culturefeed_entry_ui.module:23
 msgid "Manage custom tags from the objects on culturefeed (events, actors, ...) managed on the admin section."
 msgstr ""
 
-#: 
+#: culturefeed_entry_ui.module:26
 msgid "Create events"
 msgstr "Events aanmaken"
 
-#: 
+#: culturefeed_entry_ui.module:27
 msgid "Create new events through the entity api."
 msgstr "Maak activiteiten aan via Entry API"
 
-#: 
+#: culturefeed_entry_ui.module:30 views/culturefeed_entry_ui.views_default.inc:171
 msgid "Edit events"
 msgstr "Events aanpassen"
 
-#: 
+#: culturefeed_entry_ui.module:31
 msgid "Edit events through the entity api."
 msgstr "Pas activiteiten aan via Entry API"
 
-#: 
+#: culturefeed_entry_ui.module:34
 msgid "Delete events"
 msgstr "Verwijder events"
 
-#: 
+#: culturefeed_entry_ui.module:35
 msgid "Delete events through the entity api."
 msgstr "Verwijder activiteiten via Entry API"
 
-#: 
+#: culturefeed_entry_ui.module:135;63 includes/culturefeed_entry_ui.pages.inc:755;2508 views/handlers/views_handler_field_cdb_item_operations.inc:54
 msgid "Tags"
 msgstr "Labels"
 
-#: 
+#: culturefeed_entry_ui.module:150 views/handlers/views_handler_field_cdb_item_operations.inc:27
 msgid "Edit"
 msgstr "Bewerken"
 
-#: 
+#: culturefeed_entry_ui.module:168
 msgid "View"
 msgstr "Weergeven"
 
-#: 
-msgid "ZIP Code"
-msgstr "Postcode"
+#: culturefeed_entry_ui.module:375 views/handlers/views_handler_area_cdb_item_create.inc:19
+msgid "Add event"
+msgstr "Voeg activiteit toe"
+
+#: culturefeed_entry_ui.module:401
+msgid "Some disallowed html tags will be removed in the %field_name field. The allowed tags are %allowed_tags"
+msgstr "Niet toegelaten html-tags zullen verwijderd worden in het veld %field_name. De toegelaten tags zijn %allowed_tags"
 
-#: 
+#: culturefeed_entry_ui.module:71
 msgid "New event"
 msgstr "Maak nieuwe activiteit aan"
 
-#: 
+#: culturefeed_entry_ui.module:79
 msgid "Edit event"
 msgstr "Pas activiteit aan"
 
-#: 
+#: culturefeed_entry_ui.module:87
 msgid "Delete event"
 msgstr "Verwijder activiteit"
 
-#: 
+#: culturefeed_entry_ui.module:95 culturefeed_entry_ui.info:0
 msgid "CultureFeed Entry UI"
 msgstr "CultureFeed Entry UI"
 
-#: 
+#: culturefeed_entry_ui.module:96
 msgid "All configurations to entry api for this site"
 msgstr ""
 
-#: 
+#: culturefeed_entry_ui.info:0
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
 msgstr "Meertalig invoerformulier om activiteiten aan te maken, aan te passen en verwijderen in UiTdatabank via Entry API"
 
-#: 
+#: culturefeed_entry_ui.info:0 culturefeed_date_control/culturefeed_date_control.info:0
 msgid "CultureFeed"
 msgstr "CultureFeed"
 
-#: 
-msgid "Preferred language"
-msgstr "Voorkeur taal"
-
-#: 
-msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
-msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
+#: culturefeed_date_control/culturefeed_date_control.module:253
+msgid "AHAH callback"
+msgstr "AHAH terugkoppeling"
 
-#: 
-msgid "Custom tags"
+#: culturefeed_date_control/culturefeed_date_control.info:0
+msgid "CultureFeed Entry UI Date control"
 msgstr ""
 
-#: 
-msgid "Custom tags specific for this site. Use a new line for each tag."
+#: culturefeed_date_control/culturefeed_date_control.info:0
+msgid "Form element to manage dates in the Entry UI."
 msgstr ""
 
-#: 
+#: culturefeed_date_control/form/date_control.inc:28 includes/culturefeed_entry_ui.pages.inc:671
+msgid "Dates"
+msgstr "Datums"
+
+#: culturefeed_date_control/form/date_control.inc:87 culturefeed_date_control/form/hybrid.inc:131
+msgid "Permanent"
+msgstr "Permanent"
+
+#: culturefeed_date_control/form/hybrid.inc:83;108 culturefeed_date_control/form/timestamps.inc:104
+msgid "Date"
+msgstr "Datum"
+
+#: culturefeed_date_control/form/hybrid.inc:98
+msgid "+ add end date or time"
+msgstr "+ voeg einddatum toe"
+
+#: culturefeed_date_control/form/hybrid.inc:124 culturefeed_date_control/form/timestamps.inc:143
+msgid "+ add date"
+msgstr "+ voeg datum toe"
+
+#: culturefeed_date_control/form/opening_times.inc:24
 msgid "mon"
 msgstr "ma"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:25
 msgid "tue"
 msgstr "di"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:26
 msgid "wed"
 msgstr "woe"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:27
 msgid "thu"
 msgstr "don"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:28
 msgid "fri"
 msgstr "vrij"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:29
 msgid "sat"
 msgstr "zat"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:30
 msgid "sun"
 msgstr "zon"
 
-#: 
-msgid "Basic info"
-msgstr "Basisgegevens"
+#: culturefeed_date_control/form/opening_times.inc:36
+msgid "Yes"
+msgstr "Ja"
+
+#: culturefeed_date_control/form/opening_times.inc:36
+msgid "No"
+msgstr "Nee"
+
+#: culturefeed_date_control/form/opening_times.inc:37
+msgid "Open all day ?"
+msgstr "De hele dag geopend?"
+
+#: culturefeed_date_control/form/opening_times.inc:60;67
+msgid "Format"
+msgstr "Formaat"
+
+#: culturefeed_date_control/form/period.inc:82
+msgid "Start date"
+msgstr "Begindatum"
+
+#: culturefeed_date_control/form/period.inc:88
+msgid "+ add end date"
+msgstr "+ voeg einddatum toe"
+
+#: culturefeed_date_control/form/period.inc:99
+msgid "End date"
+msgstr "Einddatum"
+
+#: culturefeed_date_control/form/period.inc:106
+msgid "- remove end date"
+msgstr "- verwijder einddatum"
+
+#: culturefeed_date_control/form/timestamps.inc:92
+msgid "×"
+msgstr "x"
+
+#: culturefeed_date_control/form/timestamps.inc:131
+msgid "- remove end time"
+msgstr "- verwijder einduur"
 
-#: 
+#: culturefeed_date_control/form/timestamps.inc:136
+msgid "+ add end time"
+msgstr "+ voeg einduur toe"
+
+#: culturefeed_date_control/theme/theme.inc:64
+msgid "open"
+msgstr "open"
+
+#: culturefeed_date_control/theme/theme.inc:64
+msgid "from"
+msgstr "van"
+
+#: culturefeed_date_control/theme/theme.inc:64
+msgid "to"
+msgstr "tot"
+
+#: includes/culturefeed_entry_ui.admin.inc:21
+msgid "Preferred language"
+msgstr "Voorkeur taal"
+
+#: includes/culturefeed_entry_ui.admin.inc:23
+msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
+msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
+
+#: includes/culturefeed_entry_ui.admin.inc:30
+msgid "Custom options on the /tags page"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.admin.inc:32
+msgid "Custom tags specific for this site. Use a new line for each tag."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.admin.inc:37
+msgid "Custom tags to push to entry API"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.admin.inc:39
+msgid "Tags pushed under the hood to Entry API. Use a new line for each tag."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:374;1220;1251;1282;1313
 msgid "Event title"
 msgstr "Titel"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:422
 msgid "Concerts"
 msgstr "Concerten"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:443
 msgid "Dance"
 msgstr "Dansvoorstelling"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:464
 msgid "Film"
 msgstr "Film"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:488
 msgid "Theatre"
 msgstr "Theatervoorstelling"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:510
 msgid "Sport"
 msgstr "Sport"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:545
 msgid "Location"
 msgstr "Locatie"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:578
 msgid "Location not found, add location"
 msgstr "Locatie niet gevonden, voeg locatie toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:599
 msgid "Location Title"
 msgstr "Naam locatie"
 
-#: 
-msgid "Street"
-msgstr "Straat"
-
-#: 
-msgid "House Number"
-msgstr "Huisnummer"
-
-#: 
-msgid "City"
-msgstr "Stad of gemeente"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:614
 msgid "Country"
 msgstr "Land"
 
-#: 
-msgid "Dates"
-msgstr "Datums"
-
-#: 
-msgid "Permanent"
-msgstr "Permanent"
-
-#: 
-msgid "remove date"
-msgstr "datum verwijderen"
-
-#: 
-msgid "Date"
-msgstr "Begindatum"
-
-#: 
-msgid "+ add end date or time"
-msgstr "+ voeg einddatum toe"
-
-#: 
-msgid "End date"
-msgstr "Einddatum"
-
-#: 
-msgid "remove end date"
-msgstr "verwijder einddatum"
+#: includes/culturefeed_entry_ui.pages.inc:627
+msgid "ZIP Code"
+msgstr "Postcode"
 
-#: 
-msgid "+ add date"
-msgstr "+ voeg datum toe"
+#: includes/culturefeed_entry_ui.pages.inc:640
+msgid "City"
+msgstr "Stad of gemeente"
 
-#: 
-msgid "Open all day?"
-msgstr "Alle dagen open?"
+#: includes/culturefeed_entry_ui.pages.inc:649
+msgid "Street"
+msgstr "Straat"
 
-#: 
-msgid "Yes"
-msgstr "Ja"
+#: includes/culturefeed_entry_ui.pages.inc:649
+msgid "Street and House Number"
+msgstr "Straat en huisnummer"
 
-#: 
-msgid "No"
-msgstr "Nee"
+#: includes/culturefeed_entry_ui.pages.inc:657
+msgid "House Number"
+msgstr "Huisnummer"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:688
 msgid "Extra info"
 msgstr "Extra info"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:696;704;722
 msgid "Description"
 msgstr "Beschrijving"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:709;1226;1257;1288;1319
 msgid "Short description"
 msgstr "Korte omschrijving"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:712
+msgid "Maximum 400 characters"
+msgstr "Maximum 400 karakters"
+
+#: includes/culturefeed_entry_ui.pages.inc:730
 msgid "+ add long description"
 msgstr "+ voeg lange beschrijving toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:745;1233;1264;1295;1326
 msgid "Long description"
 msgstr "Lange beschrijving"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:756
 msgid "Add multiple tags seperated by a \";\""
 msgstr "Voeg meerdere trefwoorden toe, gescheiden met een \";\""
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:766
 msgid "Links"
 msgstr "Links"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:797
 msgid "+ add another link"
 msgstr "+ voeg een link toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:814
 msgid "Image"
 msgstr "Afbeelding"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:820
 msgid "Image upload"
 msgstr "Afbeelding opladen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:822
 msgid "Allowed extensions: gif png jpg jpeg"
 msgstr "Ondersteunde bestandsformaten: gif, png, jpg, jpeg"
 
-#: 
-msgid "I agree to the <a href="http://www.uitdatabank.be/uitportal/legal.aspx">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
-msgstr "Ik ga akkoord met de <a href="http://www.uitdatabank.be/uitportal/legal.aspx">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding te verspreiden."
+#: includes/culturefeed_entry_ui.pages.inc:847
+msgid "I agree to the <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
+msgstr ""
+"Ik ga akkoord met de <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding "
+"te verspreiden."
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:854;859;891
 msgid "Price"
 msgstr "Prijs"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:874
 msgid "Free event"
 msgstr "Gratis activiteit"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:898
 msgid "+ add conditions & discounts"
 msgstr "+ voeg voorwaarden en kortingen toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:925
 msgid "Price conditions & discounts"
 msgstr "Prijsvoorwaarden & kortingen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:954
 msgid "Organizer"
 msgstr "Organisator"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:978
 msgid "Organizer not found, add organizer"
 msgstr "Organisator niet gevonden, voeg organisator toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:995
 msgid "Name new organizer"
 msgstr "Naam nieuwe organisator"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1002
 msgid "Age"
 msgstr "Leeftijd"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1004
 msgid "For everyone"
 msgstr "Voor iedereen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1005
 msgid "For children (between 1 and 12 years)"
 msgstr "Voor kinderen (tussen 1 en 12 jaar)"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1006
 msgid "For youth (between 12 and 18 years)"
 msgstr "Voor jongeren (tussen 12 en 18 jaar)"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1007
 msgid "For adults (18+)"
 msgstr "Voor volwassenen (18+)"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1013
 msgid "Suitable for ages from"
 msgstr "Geschikt voor leeftijden vanaf"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1036
 msgid "Activities for children will get the 'Fly' label"
 msgstr "Activiteiten voor kinderen krijgen automatisch het 'Vlieg'-label"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1047;1491
 msgid "Contact"
-msgstr "Contactgegevens"
+msgstr "Contact"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1080
 msgid "+ add contact option"
 msgstr "+ voeg contactgegevens toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1094
 msgid "Performers"
 msgstr "Uitvoerders"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1129
 msgid "+ add another performer"
 msgstr "+ voeg nog een uitvoerder toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1143;1445
 msgid "Language"
 msgstr "Taal"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1176
 msgid "+ add more language info"
 msgstr "+ voeg meer taalinformatie toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1191
 msgid "Access"
 msgstr "Toegang"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1197
 msgid "Open for everyone"
 msgstr "Voor iedereen toegankelijk"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1197
 msgid "Only for members"
 msgstr "Enkel voor leden"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1204
 msgid "Translations"
 msgstr "Vertalingen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1212;1462
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1243;1460
 msgid "English"
 msgstr "Engels"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1274;1464
 msgid "French"
 msgstr "Frans"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1305;1463
 msgid "German"
 msgstr "Duits"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1334
 msgid "Publication date"
 msgstr "Publicatiedatum"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1358
 msgid "Save"
 msgstr "Opslaan"
 
-#: 
-msgid "Start time"
-msgstr "Starttijd"
-
-#: 
-msgid "End time"
-msgstr "Eindtijd"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1448
 msgid "Spoken"
 msgstr "Gesproken"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1449
 msgid "Dubbed"
 msgstr "Gedubd"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1450
 msgid "Subtitled"
 msgstr "Ondertiteld"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1457
 msgid "in"
 msgstr "in"
 
-#: 
-msgid "Contact"
-msgstr "Contact"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1500
 msgid "Input"
 msgstr "Invoer"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1516
 msgid "Performer"
 msgstr "Uitvoerder"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1524
 msgid "Role"
 msgstr "Rol"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1539
 msgid "Link"
 msgstr "Link"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1546
 msgid "for reservation"
 msgstr "voor reservatie"
 
-#: 
-msgid "Format"
-msgstr "Formaat"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1562
 msgid "Please fill in correct age"
 msgstr "Geef de juiste leeftijd op"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1579;1609
 msgid "Please fill in correct date and time"
 msgstr "Geef de juiste datum en tijdstip op"
 
-#: 
-msgid "A date is required."
-msgstr "Een datum is verplicht."
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1586
 msgid "Date field is invalid. The end date is earlier than the beginning date."
 msgstr "Ingevoerde datum niet correct: einddatum valt voor de begindatum"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1616
 msgid "Date field is invalid. The end time is earlier than the beginning time."
 msgstr "Ingevoerde datum niet correct: einduur valt voor beginuur"
 
-#: 
-msgid "Please fill in correct date"
-msgstr "Voer correcte datum in"
+#: includes/culturefeed_entry_ui.pages.inc:1650;1657
+msgid "Please fill in correct time."
+msgstr "Geef de juiste datum en tijdstip op"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1672
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
 msgstr "Geef aan dat je akkoord gaat met de algemene voorwaarden van UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt om de afbeelding te verspreiden via UiTdatabank."
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1677
 msgid "A category is required."
 msgstr "Een categorie is verplicht"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1683
 msgid "A title is required for a custom location"
 msgstr "Een titel is verplicht voor een nieuwe locatie"
 
-#: 
-msgid "A zip code is required for a custom location"
-msgstr "Een postcode is verplicht voor een nieuwe locatie"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1691
 msgid "A city is required for a custom location"
 msgstr "Een stad is verplicht voor een nieuwe locatie"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1698
 msgid "A location is required."
 msgstr "Een locatie is verplicht"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1703;1707
 msgid "We could not validate the location"
 msgstr "We kunnen de locatie niet bevestigen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1746
 msgid "Not a valid URL"
 msgstr "Geen geldige URL"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1758;1762
 msgid "We could not validate the organizer"
 msgstr "We kunnen de organisatie niet bevestigen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1778
 msgid "Not a valid email address"
 msgstr "Geen geldig emailadres"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1797
+msgid "If you translate something, you should also translate the title."
+msgstr "Als je een vertaling toevoegt, moet je ook de titel vertalen."
+
+#: includes/culturefeed_entry_ui.pages.inc:1935
 msgid "Order tickets"
 msgstr "Bestel tickets"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2313
 msgid "An error occurred while saving the event"
 msgstr "Er is een fout opgetreden tijdens het opslaan van de activiteit"
 
-#: 
-msgid "Event successfully updated"
-msgstr "Activiteit werd aangepast"
+#: includes/culturefeed_entry_ui.pages.inc:2414
+msgid "Saving the event"
+msgstr "gfh"
+
+#: includes/culturefeed_entry_ui.pages.inc:2421
+msgid "Initializing."
+msgstr "Aan het initialiseren."
 
-#: 
-msgid "Click here to update"
-msgstr "Klik hier om aan te passen"
+#: includes/culturefeed_entry_ui.pages.inc:2422
+msgid "Completed @current of @total."
+msgstr "@current van @total gereed."
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2440
 msgid "Are you sure you want to delete the event?"
 msgstr "Ben je zeker dat je de activiteit wil verwijderen?"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2442
 msgid "This action cannot be undone"
 msgstr "Deze actie kan niet ongedaan gemaakt worden"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2443 views/handlers/views_handler_field_cdb_item_operations.inc:31
 msgid "Delete"
 msgstr "Verwijder"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2444
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2456
 msgid "Event successfully deleted"
 msgstr "Activiteit werd verwijderd"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2460
 msgid "An error occurred while deleting the event"
 msgstr "Er is een fout opgetreden tijdens het verwijderen van de activiteit"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2501
+msgid "Custom tags"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:2510
 msgid "Seperate multiple tags by ;"
 msgstr "Scheid meerdere trefwoorden met ;"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2515 views/culturefeed_entry_ui.views_default.inc:31;160
 msgid "Submit"
 msgstr "Voeg toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2530
 msgid "Tag @tag is not permitted because it's already a custom tag."
 msgstr "Trefwoord @tag is niet toegelaten aangezien het al een bestaande marker is."
 
-#: 
-msgid "Autocomplete popup"
-msgstr "Popup voor automatisch aanvullen"
+#: includes/culturefeed_entry_ui.pages.inc:2577
+msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
+msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
 
-#: 
-msgid "open"
-msgstr "open"
+#: includes/culturefeed_entry_ui.pages.inc:2582
+msgid "You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to \"vragen@uitdatabank.be\"."
+msgstr "Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je hier vragen bij hebt, contacteer dan onze helpdesk via \"vragen@uitdatabank.be\"."
 
-#: 
-msgid "from"
-msgstr "van"
+#: includes/culturefeed_entry_ui.pages.inc:2585
+msgid "Error occured while saving the tags"
+msgstr "Er is een fout opgetreden tijdens het opslaan van de labels"
 
-#: 
-msgid "to"
-msgstr "tot"
+#: includes/culturefeed_entry_ui.pages.inc:2659
+msgid "The event %title has been created."
+msgstr "De activiteit %title werd aangemaakt."
+
+#: includes/culturefeed_entry_ui.pages.inc:2660
+msgid "The event %title has been updated."
+msgstr "Het event %title werd aangepast."
+
+#: includes/culturefeed_entry_ui.pages.inc:2301;2306
+msgid "culturefeed_entry_ui"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:2301
+msgid "Event %eventid updated."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:2306
+msgid "Event %eventid created."
+msgstr ""
+
+#: js/bootstrap_autocomplete_override.js:0 js/culturefeed_entry_ui.js:0
+msgid "Autocomplete popup"
+msgstr "Popup voor automatisch aanvullen"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:13
 msgid "Operations"
 msgstr "Bewerkingen"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:14
 msgid "Links to operations that can be performed"
 msgstr "Link naar mogelijke handelingen"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:20
 msgid "Create event"
 msgstr "Maak activiteit aan"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:21
 msgid "Link to create event"
 msgstr "Link om activiteit aan te maken"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:25
+msgid "More"
+msgstr "Meer"
+
+#: views/culturefeed_entry_ui.views_default.inc:32;161
+msgid "Reset"
+msgstr "Opnieuw instellen"
+
+#: views/culturefeed_entry_ui.views_default.inc:33;162
+msgid "Sort on"
+msgstr "Sorteer op"
+
+#: views/culturefeed_entry_ui.views_default.inc:34;163
+msgid "Ascending"
+msgstr "Oplopend"
+
+#: views/culturefeed_entry_ui.views_default.inc:35;164
+msgid "Descending"
+msgstr "Aflopend"
+
+#: views/culturefeed_entry_ui.views_default.inc:157
 msgid "Master"
 msgstr ""
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:158
 msgid "Events created by me"
 msgstr "Mijn activiteiten"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:159
 msgid "more"
 msgstr "meer"
 
-#: 
-msgid "Apply"
-msgstr "Pas toe"
-
-#: 
-msgid "Reset"
-msgstr "Opnieuw instellen"
-
-#: 
-msgid "Sort by"
-msgstr "Sorteer op"
-
-#: 
-msgid "Asc"
-msgstr "Stijgend"
-
-#: 
-msgid "Desc"
-msgstr "Dalend"
-
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:165
 msgid "Notification that no results were found"
 msgstr "Melding dat er geen resultaten werden gevonden"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:166
 msgid "Unable to find any events created by you."
 msgstr "Er werden geen activiteiten gevonden die door jou aangemaakt werden"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:167
 msgid "Last updated"
 msgstr "Laatst bijgewerkt"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:168
+msgid "Created by current user"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:169
 msgid "Block"
 msgstr "Blok"
 
-#: 
-msgid "Add event"
-msgstr "Voeg activiteit toe"
+#: views/culturefeed_entry_ui.views_default.inc:170
+msgid "Page"
+msgstr "Pagina"
 
+#: views/culturefeed_entry_ui.views_default.inc:172
+msgid "Items per page"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:173
+msgid "- All -"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:174
+msgid "Start"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:175
+msgid "« first"
+msgstr "« eerste"
+
+#: views/culturefeed_entry_ui.views_default.inc:176
+msgid "‹ previous"
+msgstr "‹ vorige"
+
+#: views/culturefeed_entry_ui.views_default.inc:177
+msgid "next ›"
+msgstr "volgende ›"
+
+#: views/culturefeed_entry_ui.views_default.inc:178
+msgid "last »"
+msgstr "laatste »"
+
+#: views/handlers/views_handler_field_cdb_item_operations.inc:47
+msgid "No permission to edit event"
+msgstr ""

From 7ff7c152e5186fb8af72b660fdd9e6e82b8a7537 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 29 Jan 2015 21:54:05 +0100
Subject: [PATCH 028/275] MSS-119 6. autocomplete and space

---
 .../js/bootstrap_autocomplete_override.js     | 62 ++++++++++++++++++-
 .../js/culturefeed_entry_ui.js                | 49 +++++++++++++++
 2 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index 4d2b2666..4492dacf 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -1,5 +1,4 @@
-
-(function ($) {
+jQuery(function($) {
 
     /**
      * Fills the suggestion popup with any matches received.
@@ -70,4 +69,61 @@
         }
     };
 
-})(jQuery);
+    if (Drupal.ACDB) {
+
+        /**
+         * Performs a cached and delayed search.
+         * Custom override: Don't show an error when people are navigation away of the site.
+         *
+         */
+        Drupal.ACDB.prototype.search = function (searchString) {
+            var db = this;
+            searchString = searchString.replace(/^\s+|\s+$/, '');
+            this.searchString = searchString;
+
+            // See if this string needs to be searched for anyway.
+            if (searchString.length <= 0 ||
+              searchString.charAt(searchString.length - 1) == ',') {
+                return;
+            }
+
+            // See if this key has been searched for before.
+            if (this.cache[searchString]) {
+                return this.owner.found(this.cache[searchString]);
+            }
+
+            // Initiate delayed search.
+            if (this.timer) {
+                clearTimeout(this.timer);
+            }
+            this.timer = setTimeout(function () {
+                db.owner.setStatus('begin');
+
+                // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
+                // encodeURIComponent to allow autocomplete search terms to contain slashes.
+                $.ajax({
+                    type: 'GET',
+                    url: db.uri + '/' + Drupal.encodePath(searchString),
+                    dataType: 'json',
+                    success: function (matches) {
+                        if (typeof matches.status == 'undefined' || matches.status != 0) {
+                            db.cache[searchString] = matches;
+                            // Verify if these are still the matches the user wants to see.
+                            if (db.searchString == searchString) {
+                                db.owner.found(matches);
+                            }
+                            db.owner.setStatus('found');
+                        }
+                    },
+                    error: function (xmlhttp) {
+                        if (xmlhttp.status) {
+                            alert(Drupal.ajaxError(xmlhttp, db.uri));
+                        }
+                    }
+                });
+            }, this.delay);
+        };
+
+    }
+
+});
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 62ee1798..8dd5050e 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -221,4 +221,53 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
         }
     };
 
+  /**
+   * Performs a cached and delayed search.
+   */
+  Drupal.ACDB.prototype.search = function (searchString) {console.log(searchString);
+    var db = this;
+    searchString = searchString.replace(/^\s+|\s+$/, '');
+    this.searchString = searchString;
+
+    // See if this string needs to be searched for anyway.
+    if (searchString.length <= 0 ||
+      searchString.charAt(searchString.length - 1) == ',') {
+      return;
+    }
+
+    // See if this key has been searched for before.
+    if (this.cache[searchString]) {
+      return this.owner.found(this.cache[searchString]);
+    }
+
+    // Initiate delayed search.
+    if (this.timer) {
+      clearTimeout(this.timer);
+    }
+    this.timer = setTimeout(function () {
+      db.owner.setStatus('begin');
+
+      // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
+      // encodeURIComponent to allow autocomplete search terms to contain slashes.
+      $.ajax({
+        type: 'GET',
+        url: db.uri + '/' + Drupal.encodePath(searchString),
+        dataType: 'json',
+        success: function (matches) {
+          if (typeof matches.status == 'undefined' || matches.status != 0) {
+            db.cache[searchString] = matches;
+            // Verify if these are still the matches the user wants to see.
+            //if (db.searchString == searchString) {
+            db.owner.found(matches);
+            //}
+            db.owner.setStatus('found');
+          }
+        },
+        error: function (xmlhttp) {
+          alert(Drupal.ajaxError(xmlhttp, db.uri));
+        }
+      });
+    }, this.delay);
+  };
+
 })(jQuery);

From a8bd072544f0e22e2d58622b752e3507afbf6c1d Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 3 Feb 2015 14:30:45 +0100
Subject: [PATCH 029/275] MSS-119 7. city validation

---
 .../includes/culturefeed_entry_ui.pages.inc                 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 27632401..ee8ff712 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1706,6 +1706,12 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
     if (empty($values['location']['new']['citywrapper']['city'])) {
       form_set_error('city', t('A city is required for a custom location'));
     }
+    else {
+      $available_city = culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE);
+      if (!isset($available_city[$values['location']['new']['citywrapper']['city']])) {
+        form_set_error('location', t('A valid location is required.'));
+      }
+    }
     $location = NULL;
   }
   else {

From 5672096f06ee02a2e1f8fb410a2c36a195104014 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 3 Feb 2015 15:12:04 +0100
Subject: [PATCH 030/275] MSS-19 8. autocomplete zipcode

---
 culturefeed_search/includes/pages.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_search/includes/pages.inc b/culturefeed_search/includes/pages.inc
index d0fdadb9..dc55974e 100644
--- a/culturefeed_search/includes/pages.inc
+++ b/culturefeed_search/includes/pages.inc
@@ -47,7 +47,7 @@ function culturefeed_search_suggestions_autocomplete_page($search_string, $past
             $title = $location_title = check_plain($suggestion->value);
             $location = $suggestion->zipcode;
             if (!empty($location)) {
-              $location_title .= ' - <small class="muted">(' . $location->zipcode . ')<small>';
+              $location_title .= ' - <small class="muted">(' . $location . ')<small>';
             }
             $object = new stdClass();
             $object->title = $title;

From 5318fd902fd946f9ce5cc3ed79acac9e00fce877 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 3 Feb 2015 15:16:38 +0100
Subject: [PATCH 031/275] MSS-119 also fix bootstrap override to use
 locationTitle

---
 culturefeed_entry_ui/js/bootstrap_autocomplete_override.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index 4492dacf..4e1b66b8 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -30,7 +30,7 @@ jQuery(function($) {
                     .appendTo(ul);
             }
             else if (typeof(matches[key]) == "object") {
-                value = matches[key].title;
+                value = matches[key].locationTitle;
                 $('<li></li>')
                     .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
                     .mousedown(function () { ac.select(this); })

From 731a83d7a300a1fc317eb5b3a0b6627ba26590b2 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 10 Feb 2015 11:24:25 +0100
Subject: [PATCH 032/275] fix valid location error when country != BE

---
 .../includes/culturefeed_entry_ui.pages.inc               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index ee8ff712..f62af5d9 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1698,18 +1698,18 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
     if (empty($values['location']['new']['location_title'])) {
       form_set_error('location_title', t('A title is required for a custom location'));
     }
-    /*if ($values['location']['new']['citywrapper']['country_select'] != 'BE') {
+    if ($values['location']['new']['citywrapper']['country_select'] != 'BE') {
       if (empty($values['location']['new']['citywrapper']['zip_code'])) {
         form_set_error('basic[zip_code]', t('A zip code is required for a custom location'));
       }
-    }*/
+    }
     if (empty($values['location']['new']['citywrapper']['city'])) {
       form_set_error('city', t('A city is required for a custom location'));
     }
-    else {
+    if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
       $available_city = culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE);
       if (!isset($available_city[$values['location']['new']['citywrapper']['city']])) {
-        form_set_error('location', t('A valid location is required.'));
+        form_set_error('location', t('A valid city is required for a custom location'));
       }
     }
     $location = NULL;

From b3b7d7a45d0340a718f7605b388f16c96fcf720d Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 10 Feb 2015 11:40:31 +0100
Subject: [PATCH 033/275] fix default address when country != BE

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index f62af5d9..4b4e6515 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -114,6 +114,9 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
         if ($custom_location_country == 'BE') {
           $custom_location_city = $custom_location_zip . ' ' . $address->getCity();
         }
+        else {
+          $custom_location_city = $address->getCity();
+        }
       }
     }
 

From a82d40cbd4e6c3b4f500dbb6d659987b82036aaf Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 10 Feb 2015 12:31:52 +0100
Subject: [PATCH 034/275] CF-393 fix translations

---
 .../includes/culturefeed_entry_ui.pages.inc   |   4 +-
 .../translations/culturefeed_entry_ui.nl.po   | 352 ++++++++++--------
 .../culturefeed_entry_ui.views_default.inc    |  68 ++--
 3 files changed, 233 insertions(+), 191 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 4b4e6515..3390bad1 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1460,7 +1460,7 @@ function culturefeed_entry_ui_attach_language_elements(&$form, $i, $info = NULL)
     '#type' => 'select',
     '#title' => t('Language'),
     '#options' => array(
-      0 => t(''),
+      0 => '',
       1 => t('Spoken'),
       2 => t('Dubbed'),
       3 => t('Subtitled'),
@@ -1472,7 +1472,7 @@ function culturefeed_entry_ui_attach_language_elements(&$form, $i, $info = NULL)
     '#type' => 'select',
     '#title' => t('in'),
     '#options' => array(
-      0 => t(''),
+      0 => '',
       1 => t('English'),
       //2 => t('Spanish'),
       3 => t('Dutch'),
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index 1545bb80..824c6286 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -22,19 +22,18 @@
 #  js/culturefeed_entry_ui.js: n/a
 #  views/culturefeed_entry_ui.views.inc: n/a
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2015-01-22 16:05+0100\n"
-"PO-Revision-Date: 2015-01-28 13:27+0100\n"
+"POT-Creation-Date: 2015-02-10 12:25+0100\n"
+"PO-Revision-Date: 2015-02-10 12:25+0100\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"Language: nl\n"
-"X-Generator: Poedit 1.7.4\n"
 
 #: culturefeed_entry_ui.module:18
 msgid "Manage object tags"
@@ -42,7 +41,9 @@ msgstr "Beheer object tags"
 
 #: culturefeed_entry_ui.module:19
 msgid "Manage all the tags from the objects on culturefeed (events, actors, ...)."
-msgstr "Beheer alle tags van objecten op culture feed (activiteiten, actoren ...)."
+msgstr ""
+"Beheer alle tags van objecten op culture feed (activiteiten, actoren "
+"...)."
 
 #: culturefeed_entry_ui.module:22
 msgid "Manage custom tags"
@@ -60,7 +61,7 @@ msgstr "Events aanmaken"
 msgid "Create new events through the entity api."
 msgstr "Maak activiteiten aan via Entry API"
 
-#: culturefeed_entry_ui.module:30 views/culturefeed_entry_ui.views_default.inc:171
+#: culturefeed_entry_ui.module:30 views/culturefeed_entry_ui.views_default.inc:131;171
 msgid "Edit events"
 msgstr "Events aanpassen"
 
@@ -76,7 +77,7 @@ msgstr "Verwijder events"
 msgid "Delete events through the entity api."
 msgstr "Verwijder activiteiten via Entry API"
 
-#: culturefeed_entry_ui.module:135;63 includes/culturefeed_entry_ui.pages.inc:755;2508 views/handlers/views_handler_field_cdb_item_operations.inc:54
+#: culturefeed_entry_ui.module:135;63 includes/culturefeed_entry_ui.pages.inc:761;2535 views/handlers/views_handler_field_cdb_item_operations.inc:54
 msgid "Tags"
 msgstr "Labels"
 
@@ -94,7 +95,9 @@ msgstr "Voeg activiteit toe"
 
 #: culturefeed_entry_ui.module:401
 msgid "Some disallowed html tags will be removed in the %field_name field. The allowed tags are %allowed_tags"
-msgstr "Niet toegelaten html-tags zullen verwijderd worden in het veld %field_name. De toegelaten tags zijn %allowed_tags"
+msgstr ""
+"Niet toegelaten html-tags zullen verwijderd worden in het veld "
+"%field_name. De toegelaten tags zijn %allowed_tags"
 
 #: culturefeed_entry_ui.module:71
 msgid "New event"
@@ -118,7 +121,9 @@ msgstr ""
 
 #: culturefeed_entry_ui.info:0
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
-msgstr "Meertalig invoerformulier om activiteiten aan te maken, aan te passen en verwijderen in UiTdatabank via Entry API"
+msgstr ""
+"Meertalig invoerformulier om activiteiten aan te maken, aan te passen "
+"en verwijderen in UiTdatabank via Entry API"
 
 #: culturefeed_entry_ui.info:0 culturefeed_date_control/culturefeed_date_control.info:0
 msgid "CultureFeed"
@@ -136,7 +141,7 @@ msgstr ""
 msgid "Form element to manage dates in the Entry UI."
 msgstr ""
 
-#: culturefeed_date_control/form/date_control.inc:28 includes/culturefeed_entry_ui.pages.inc:671
+#: culturefeed_date_control/form/date_control.inc:28 includes/culturefeed_entry_ui.pages.inc:677
 msgid "Dates"
 msgstr "Datums"
 
@@ -246,7 +251,9 @@ msgstr "Voorkeur taal"
 
 #: includes/culturefeed_entry_ui.admin.inc:23
 msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
-msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
+msgstr ""
+"Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal "
+"als backup"
 
 #: includes/culturefeed_entry_ui.admin.inc:30
 msgid "Custom options on the /tags page"
@@ -264,425 +271,458 @@ msgstr ""
 msgid "Tags pushed under the hood to Entry API. Use a new line for each tag."
 msgstr ""
 
-#: includes/culturefeed_entry_ui.pages.inc:374;1220;1251;1282;1313
+#: includes/culturefeed_entry_ui.pages.inc:380;1234;1265;1296;1327
 msgid "Event title"
 msgstr "Titel"
 
-#: includes/culturefeed_entry_ui.pages.inc:422
+#: includes/culturefeed_entry_ui.pages.inc:428
 msgid "Concerts"
 msgstr "Concerten"
 
-#: includes/culturefeed_entry_ui.pages.inc:443
+#: includes/culturefeed_entry_ui.pages.inc:449
 msgid "Dance"
 msgstr "Dansvoorstelling"
 
-#: includes/culturefeed_entry_ui.pages.inc:464
+#: includes/culturefeed_entry_ui.pages.inc:470
 msgid "Film"
 msgstr "Film"
 
-#: includes/culturefeed_entry_ui.pages.inc:488
+#: includes/culturefeed_entry_ui.pages.inc:494
 msgid "Theatre"
 msgstr "Theatervoorstelling"
 
-#: includes/culturefeed_entry_ui.pages.inc:510
+#: includes/culturefeed_entry_ui.pages.inc:516
 msgid "Sport"
 msgstr "Sport"
 
-#: includes/culturefeed_entry_ui.pages.inc:545
+#: includes/culturefeed_entry_ui.pages.inc:551
 msgid "Location"
 msgstr "Locatie"
 
-#: includes/culturefeed_entry_ui.pages.inc:578
+#: includes/culturefeed_entry_ui.pages.inc:584
 msgid "Location not found, add location"
 msgstr "Locatie niet gevonden, voeg locatie toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:599
+#: includes/culturefeed_entry_ui.pages.inc:605
 msgid "Location Title"
 msgstr "Naam locatie"
 
-#: includes/culturefeed_entry_ui.pages.inc:614
+#: includes/culturefeed_entry_ui.pages.inc:620
 msgid "Country"
 msgstr "Land"
 
-#: includes/culturefeed_entry_ui.pages.inc:627
+#: includes/culturefeed_entry_ui.pages.inc:633
 msgid "ZIP Code"
 msgstr "Postcode"
 
-#: includes/culturefeed_entry_ui.pages.inc:640
+#: includes/culturefeed_entry_ui.pages.inc:646
 msgid "City"
 msgstr "Stad of gemeente"
 
-#: includes/culturefeed_entry_ui.pages.inc:649
+#: includes/culturefeed_entry_ui.pages.inc:655
 msgid "Street"
 msgstr "Straat"
 
-#: includes/culturefeed_entry_ui.pages.inc:649
+#: includes/culturefeed_entry_ui.pages.inc:655
 msgid "Street and House Number"
 msgstr "Straat en huisnummer"
 
-#: includes/culturefeed_entry_ui.pages.inc:657
+#: includes/culturefeed_entry_ui.pages.inc:663
 msgid "House Number"
 msgstr "Huisnummer"
 
-#: includes/culturefeed_entry_ui.pages.inc:688
+#: includes/culturefeed_entry_ui.pages.inc:694
 msgid "Extra info"
 msgstr "Extra info"
 
-#: includes/culturefeed_entry_ui.pages.inc:696;704;722
+#: includes/culturefeed_entry_ui.pages.inc:702;710;728
 msgid "Description"
 msgstr "Beschrijving"
 
-#: includes/culturefeed_entry_ui.pages.inc:709;1226;1257;1288;1319
+#: includes/culturefeed_entry_ui.pages.inc:715;1240;1271;1302;1333
 msgid "Short description"
 msgstr "Korte omschrijving"
 
-#: includes/culturefeed_entry_ui.pages.inc:712
+#: includes/culturefeed_entry_ui.pages.inc:718
 msgid "Maximum 400 characters"
 msgstr "Maximum 400 karakters"
 
-#: includes/culturefeed_entry_ui.pages.inc:730
+#: includes/culturefeed_entry_ui.pages.inc:736
 msgid "+ add long description"
 msgstr "+ voeg lange beschrijving toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:745;1233;1264;1295;1326
+#: includes/culturefeed_entry_ui.pages.inc:751;1247;1278;1309;1340
 msgid "Long description"
 msgstr "Lange beschrijving"
 
-#: includes/culturefeed_entry_ui.pages.inc:756
+#: includes/culturefeed_entry_ui.pages.inc:762
 msgid "Add multiple tags seperated by a \";\""
 msgstr "Voeg meerdere trefwoorden toe, gescheiden met een \";\""
 
-#: includes/culturefeed_entry_ui.pages.inc:766
+#: includes/culturefeed_entry_ui.pages.inc:772
 msgid "Links"
 msgstr "Links"
 
-#: includes/culturefeed_entry_ui.pages.inc:797
+#: includes/culturefeed_entry_ui.pages.inc:803
 msgid "+ add another link"
 msgstr "+ voeg een link toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:814
+#: includes/culturefeed_entry_ui.pages.inc:820
 msgid "Image"
 msgstr "Afbeelding"
 
-#: includes/culturefeed_entry_ui.pages.inc:820
+#: includes/culturefeed_entry_ui.pages.inc:826
 msgid "Image upload"
 msgstr "Afbeelding opladen"
 
-#: includes/culturefeed_entry_ui.pages.inc:822
+#: includes/culturefeed_entry_ui.pages.inc:828
 msgid "Allowed extensions: gif png jpg jpeg"
 msgstr "Ondersteunde bestandsformaten: gif, png, jpg, jpeg"
 
-#: includes/culturefeed_entry_ui.pages.inc:847
+#: includes/culturefeed_entry_ui.pages.inc:853
+msgid "Copyright"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:854
+msgid "Name of the copyright owner of this image."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:861
 msgid "I agree to the <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
 msgstr ""
-"Ik ga akkoord met de <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding "
-"te verspreiden."
+"Ik ga akkoord met de <a "
+"href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene "
+"voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige "
+"rechten beschik om de afbeelding te verspreiden."
 
-#: includes/culturefeed_entry_ui.pages.inc:854;859;891
+#: includes/culturefeed_entry_ui.pages.inc:868;873;905
 msgid "Price"
 msgstr "Prijs"
 
-#: includes/culturefeed_entry_ui.pages.inc:874
+#: includes/culturefeed_entry_ui.pages.inc:888
 msgid "Free event"
 msgstr "Gratis activiteit"
 
-#: includes/culturefeed_entry_ui.pages.inc:898
+#: includes/culturefeed_entry_ui.pages.inc:912
 msgid "+ add conditions & discounts"
 msgstr "+ voeg voorwaarden en kortingen toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:925
+#: includes/culturefeed_entry_ui.pages.inc:939
 msgid "Price conditions & discounts"
 msgstr "Prijsvoorwaarden & kortingen"
 
-#: includes/culturefeed_entry_ui.pages.inc:954
+#: includes/culturefeed_entry_ui.pages.inc:968
 msgid "Organizer"
 msgstr "Organisator"
 
-#: includes/culturefeed_entry_ui.pages.inc:978
+#: includes/culturefeed_entry_ui.pages.inc:992
 msgid "Organizer not found, add organizer"
 msgstr "Organisator niet gevonden, voeg organisator toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:995
+#: includes/culturefeed_entry_ui.pages.inc:1009
 msgid "Name new organizer"
 msgstr "Naam nieuwe organisator"
 
-#: includes/culturefeed_entry_ui.pages.inc:1002
+#: includes/culturefeed_entry_ui.pages.inc:1016
 msgid "Age"
 msgstr "Leeftijd"
 
-#: includes/culturefeed_entry_ui.pages.inc:1004
+#: includes/culturefeed_entry_ui.pages.inc:1018
 msgid "For everyone"
 msgstr "Voor iedereen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1005
+#: includes/culturefeed_entry_ui.pages.inc:1019
 msgid "For children (between 1 and 12 years)"
 msgstr "Voor kinderen (tussen 1 en 12 jaar)"
 
-#: includes/culturefeed_entry_ui.pages.inc:1006
+#: includes/culturefeed_entry_ui.pages.inc:1020
 msgid "For youth (between 12 and 18 years)"
 msgstr "Voor jongeren (tussen 12 en 18 jaar)"
 
-#: includes/culturefeed_entry_ui.pages.inc:1007
+#: includes/culturefeed_entry_ui.pages.inc:1021
 msgid "For adults (18+)"
 msgstr "Voor volwassenen (18+)"
 
-#: includes/culturefeed_entry_ui.pages.inc:1013
+#: includes/culturefeed_entry_ui.pages.inc:1027
 msgid "Suitable for ages from"
 msgstr "Geschikt voor leeftijden vanaf"
 
-#: includes/culturefeed_entry_ui.pages.inc:1036
+#: includes/culturefeed_entry_ui.pages.inc:1050
 msgid "Activities for children will get the 'Fly' label"
 msgstr "Activiteiten voor kinderen krijgen automatisch het 'Vlieg'-label"
 
-#: includes/culturefeed_entry_ui.pages.inc:1047;1491
+#: includes/culturefeed_entry_ui.pages.inc:1061;1507
 msgid "Contact"
 msgstr "Contact"
 
-#: includes/culturefeed_entry_ui.pages.inc:1080
+#: includes/culturefeed_entry_ui.pages.inc:1094
 msgid "+ add contact option"
 msgstr "+ voeg contactgegevens toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1094
+#: includes/culturefeed_entry_ui.pages.inc:1108
 msgid "Performers"
 msgstr "Uitvoerders"
 
-#: includes/culturefeed_entry_ui.pages.inc:1129
+#: includes/culturefeed_entry_ui.pages.inc:1143
 msgid "+ add another performer"
 msgstr "+ voeg nog een uitvoerder toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1143;1445
+#: includes/culturefeed_entry_ui.pages.inc:1157;1461
 msgid "Language"
 msgstr "Taal"
 
-#: includes/culturefeed_entry_ui.pages.inc:1176
+#: includes/culturefeed_entry_ui.pages.inc:1190
 msgid "+ add more language info"
 msgstr "+ voeg meer taalinformatie toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1191
+#: includes/culturefeed_entry_ui.pages.inc:1205
 msgid "Access"
 msgstr "Toegang"
 
-#: includes/culturefeed_entry_ui.pages.inc:1197
+#: includes/culturefeed_entry_ui.pages.inc:1211
 msgid "Open for everyone"
 msgstr "Voor iedereen toegankelijk"
 
-#: includes/culturefeed_entry_ui.pages.inc:1197
+#: includes/culturefeed_entry_ui.pages.inc:1211
 msgid "Only for members"
 msgstr "Enkel voor leden"
 
-#: includes/culturefeed_entry_ui.pages.inc:1204
+#: includes/culturefeed_entry_ui.pages.inc:1218
 msgid "Translations"
 msgstr "Vertalingen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1212;1462
+#: includes/culturefeed_entry_ui.pages.inc:1226;1478
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: includes/culturefeed_entry_ui.pages.inc:1243;1460
+#: includes/culturefeed_entry_ui.pages.inc:1257;1476
 msgid "English"
 msgstr "Engels"
 
-#: includes/culturefeed_entry_ui.pages.inc:1274;1464
+#: includes/culturefeed_entry_ui.pages.inc:1288;1480
 msgid "French"
 msgstr "Frans"
 
-#: includes/culturefeed_entry_ui.pages.inc:1305;1463
+#: includes/culturefeed_entry_ui.pages.inc:1319;1479
 msgid "German"
 msgstr "Duits"
 
-#: includes/culturefeed_entry_ui.pages.inc:1334
+#: includes/culturefeed_entry_ui.pages.inc:1348
 msgid "Publication date"
 msgstr "Publicatiedatum"
 
-#: includes/culturefeed_entry_ui.pages.inc:1358
+#: includes/culturefeed_entry_ui.pages.inc:1372
 msgid "Save"
 msgstr "Opslaan"
 
-#: includes/culturefeed_entry_ui.pages.inc:1448
+#: includes/culturefeed_entry_ui.pages.inc:1464
 msgid "Spoken"
 msgstr "Gesproken"
 
-#: includes/culturefeed_entry_ui.pages.inc:1449
+#: includes/culturefeed_entry_ui.pages.inc:1465
 msgid "Dubbed"
 msgstr "Gedubd"
 
-#: includes/culturefeed_entry_ui.pages.inc:1450
+#: includes/culturefeed_entry_ui.pages.inc:1466
 msgid "Subtitled"
 msgstr "Ondertiteld"
 
-#: includes/culturefeed_entry_ui.pages.inc:1457
+#: includes/culturefeed_entry_ui.pages.inc:1473
 msgid "in"
 msgstr "in"
 
-#: includes/culturefeed_entry_ui.pages.inc:1500
+#: includes/culturefeed_entry_ui.pages.inc:1516
 msgid "Input"
 msgstr "Invoer"
 
-#: includes/culturefeed_entry_ui.pages.inc:1516
+#: includes/culturefeed_entry_ui.pages.inc:1532
 msgid "Performer"
 msgstr "Uitvoerder"
 
-#: includes/culturefeed_entry_ui.pages.inc:1524
+#: includes/culturefeed_entry_ui.pages.inc:1540
 msgid "Role"
 msgstr "Rol"
 
-#: includes/culturefeed_entry_ui.pages.inc:1539
+#: includes/culturefeed_entry_ui.pages.inc:1555
 msgid "Link"
 msgstr "Link"
 
-#: includes/culturefeed_entry_ui.pages.inc:1546
+#: includes/culturefeed_entry_ui.pages.inc:1562
 msgid "for reservation"
 msgstr "voor reservatie"
 
-#: includes/culturefeed_entry_ui.pages.inc:1562
+#: includes/culturefeed_entry_ui.pages.inc:1578
 msgid "Please fill in correct age"
 msgstr "Geef de juiste leeftijd op"
 
-#: includes/culturefeed_entry_ui.pages.inc:1579;1609
+#: includes/culturefeed_entry_ui.pages.inc:1595;1625
 msgid "Please fill in correct date and time"
 msgstr "Geef de juiste datum en tijdstip op"
 
-#: includes/culturefeed_entry_ui.pages.inc:1586
+#: includes/culturefeed_entry_ui.pages.inc:1602
 msgid "Date field is invalid. The end date is earlier than the beginning date."
 msgstr "Ingevoerde datum niet correct: einddatum valt voor de begindatum"
 
-#: includes/culturefeed_entry_ui.pages.inc:1616
+#: includes/culturefeed_entry_ui.pages.inc:1632
 msgid "Date field is invalid. The end time is earlier than the beginning time."
 msgstr "Ingevoerde datum niet correct: einduur valt voor beginuur"
 
-#: includes/culturefeed_entry_ui.pages.inc:1650;1657
+#: includes/culturefeed_entry_ui.pages.inc:1666;1673
 msgid "Please fill in correct time."
 msgstr "Geef de juiste datum en tijdstip op"
 
-#: includes/culturefeed_entry_ui.pages.inc:1672
+#: includes/culturefeed_entry_ui.pages.inc:1688
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
-msgstr "Geef aan dat je akkoord gaat met de algemene voorwaarden van UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt om de afbeelding te verspreiden via UiTdatabank."
+msgstr ""
+"Geef aan dat je akkoord gaat met de algemene voorwaarden van "
+"UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt "
+"om de afbeelding te verspreiden via UiTdatabank."
 
-#: includes/culturefeed_entry_ui.pages.inc:1677
+#: includes/culturefeed_entry_ui.pages.inc:1691
+msgid "Copyright field is required."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:1696
 msgid "A category is required."
 msgstr "Een categorie is verplicht"
 
-#: includes/culturefeed_entry_ui.pages.inc:1683
+#: includes/culturefeed_entry_ui.pages.inc:1702
 msgid "A title is required for a custom location"
 msgstr "Een titel is verplicht voor een nieuwe locatie"
 
-#: includes/culturefeed_entry_ui.pages.inc:1691
+#: includes/culturefeed_entry_ui.pages.inc:1706
+msgid "A zip code is required for a custom location"
+msgstr "Een postcode is verplicht voor een nieuwe locatie"
+
+#: includes/culturefeed_entry_ui.pages.inc:1710
 msgid "A city is required for a custom location"
 msgstr "Een stad is verplicht voor een nieuwe locatie"
 
-#: includes/culturefeed_entry_ui.pages.inc:1698
+#: includes/culturefeed_entry_ui.pages.inc:1715
+msgid "A valid city is required for a custom location"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:1723
 msgid "A location is required."
 msgstr "Een locatie is verplicht"
 
-#: includes/culturefeed_entry_ui.pages.inc:1703;1707
+#: includes/culturefeed_entry_ui.pages.inc:1728;1732
 msgid "We could not validate the location"
 msgstr "We kunnen de locatie niet bevestigen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1746
+#: includes/culturefeed_entry_ui.pages.inc:1771
 msgid "Not a valid URL"
 msgstr "Geen geldige URL"
 
-#: includes/culturefeed_entry_ui.pages.inc:1758;1762
+#: includes/culturefeed_entry_ui.pages.inc:1783;1787
 msgid "We could not validate the organizer"
 msgstr "We kunnen de organisatie niet bevestigen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1778
+#: includes/culturefeed_entry_ui.pages.inc:1803
 msgid "Not a valid email address"
 msgstr "Geen geldig emailadres"
 
-#: includes/culturefeed_entry_ui.pages.inc:1797
+#: includes/culturefeed_entry_ui.pages.inc:1822
 msgid "If you translate something, you should also translate the title."
 msgstr "Als je een vertaling toevoegt, moet je ook de titel vertalen."
 
-#: includes/culturefeed_entry_ui.pages.inc:1935
+#: includes/culturefeed_entry_ui.pages.inc:1962
 msgid "Order tickets"
 msgstr "Bestel tickets"
 
-#: includes/culturefeed_entry_ui.pages.inc:2313
+#: includes/culturefeed_entry_ui.pages.inc:2340
 msgid "An error occurred while saving the event"
 msgstr "Er is een fout opgetreden tijdens het opslaan van de activiteit"
 
-#: includes/culturefeed_entry_ui.pages.inc:2414
+#: includes/culturefeed_entry_ui.pages.inc:2441
 msgid "Saving the event"
 msgstr "gfh"
 
-#: includes/culturefeed_entry_ui.pages.inc:2421
+#: includes/culturefeed_entry_ui.pages.inc:2448
 msgid "Initializing."
 msgstr "Aan het initialiseren."
 
-#: includes/culturefeed_entry_ui.pages.inc:2422
+#: includes/culturefeed_entry_ui.pages.inc:2449
 msgid "Completed @current of @total."
 msgstr "@current van @total gereed."
 
-#: includes/culturefeed_entry_ui.pages.inc:2440
+#: includes/culturefeed_entry_ui.pages.inc:2467
 msgid "Are you sure you want to delete the event?"
 msgstr "Ben je zeker dat je de activiteit wil verwijderen?"
 
-#: includes/culturefeed_entry_ui.pages.inc:2442
+#: includes/culturefeed_entry_ui.pages.inc:2469
 msgid "This action cannot be undone"
 msgstr "Deze actie kan niet ongedaan gemaakt worden"
 
-#: includes/culturefeed_entry_ui.pages.inc:2443 views/handlers/views_handler_field_cdb_item_operations.inc:31
+#: includes/culturefeed_entry_ui.pages.inc:2470 views/handlers/views_handler_field_cdb_item_operations.inc:31
 msgid "Delete"
 msgstr "Verwijder"
 
-#: includes/culturefeed_entry_ui.pages.inc:2444
+#: includes/culturefeed_entry_ui.pages.inc:2471
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: includes/culturefeed_entry_ui.pages.inc:2456
+#: includes/culturefeed_entry_ui.pages.inc:2483
 msgid "Event successfully deleted"
 msgstr "Activiteit werd verwijderd"
 
-#: includes/culturefeed_entry_ui.pages.inc:2460
+#: includes/culturefeed_entry_ui.pages.inc:2487
 msgid "An error occurred while deleting the event"
 msgstr "Er is een fout opgetreden tijdens het verwijderen van de activiteit"
 
-#: includes/culturefeed_entry_ui.pages.inc:2501
+#: includes/culturefeed_entry_ui.pages.inc:2528
 msgid "Custom tags"
 msgstr ""
 
-#: includes/culturefeed_entry_ui.pages.inc:2510
+#: includes/culturefeed_entry_ui.pages.inc:2537
 msgid "Seperate multiple tags by ;"
 msgstr "Scheid meerdere trefwoorden met ;"
 
-#: includes/culturefeed_entry_ui.pages.inc:2515 views/culturefeed_entry_ui.views_default.inc:31;160
+#: includes/culturefeed_entry_ui.pages.inc:2542
 msgid "Submit"
 msgstr "Voeg toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:2530
+#: includes/culturefeed_entry_ui.pages.inc:2557
 msgid "Tag @tag is not permitted because it's already a custom tag."
-msgstr "Trefwoord @tag is niet toegelaten aangezien het al een bestaande marker is."
+msgstr ""
+"Trefwoord @tag is niet toegelaten aangezien het al een bestaande "
+"marker is."
 
-#: includes/culturefeed_entry_ui.pages.inc:2577
+#: includes/culturefeed_entry_ui.pages.inc:2604
 msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
-msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
+msgstr ""
+"De labels werden aangepast. Het kan echter een half uur duren "
+"vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) "
+"zichtbaar zijn."
 
-#: includes/culturefeed_entry_ui.pages.inc:2582
+#: includes/culturefeed_entry_ui.pages.inc:2609
 msgid "You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to \"vragen@uitdatabank.be\"."
-msgstr "Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je hier vragen bij hebt, contacteer dan onze helpdesk via \"vragen@uitdatabank.be\"."
+msgstr ""
+"Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je "
+"hier vragen bij hebt, contacteer dan onze helpdesk via "
+"\"vragen@uitdatabank.be\"."
 
-#: includes/culturefeed_entry_ui.pages.inc:2585
+#: includes/culturefeed_entry_ui.pages.inc:2612
 msgid "Error occured while saving the tags"
 msgstr "Er is een fout opgetreden tijdens het opslaan van de labels"
 
-#: includes/culturefeed_entry_ui.pages.inc:2659
+#: includes/culturefeed_entry_ui.pages.inc:2686
 msgid "The event %title has been created."
 msgstr "De activiteit %title werd aangemaakt."
 
-#: includes/culturefeed_entry_ui.pages.inc:2660
+#: includes/culturefeed_entry_ui.pages.inc:2687
 msgid "The event %title has been updated."
 msgstr "Het event %title werd aangepast."
 
-#: includes/culturefeed_entry_ui.pages.inc:2301;2306
+#: includes/culturefeed_entry_ui.pages.inc:2328;2333
 msgid "culturefeed_entry_ui"
 msgstr ""
 
-#: includes/culturefeed_entry_ui.pages.inc:2301
+#: includes/culturefeed_entry_ui.pages.inc:2328
 msgid "Event %eventid updated."
 msgstr ""
 
-#: includes/culturefeed_entry_ui.pages.inc:2306
+#: includes/culturefeed_entry_ui.pages.inc:2333
 msgid "Event %eventid created."
 msgstr ""
 
@@ -706,16 +746,20 @@ msgstr "Maak activiteit aan"
 msgid "Link to create event"
 msgstr "Link om activiteit aan te maken"
 
-#: views/culturefeed_entry_ui.views_default.inc:25
-msgid "More"
-msgstr "Meer"
+#: views/culturefeed_entry_ui.views_default.inc:25;159
+msgid "more"
+msgstr "meer"
+
+#: views/culturefeed_entry_ui.views_default.inc:31;160
+msgid "Select"
+msgstr "Selecteren"
 
 #: views/culturefeed_entry_ui.views_default.inc:32;161
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
 #: views/culturefeed_entry_ui.views_default.inc:33;162
-msgid "Sort on"
+msgid "Sort"
 msgstr "Sorteer op"
 
 #: views/culturefeed_entry_ui.views_default.inc:34;163
@@ -726,70 +770,68 @@ msgstr "Oplopend"
 msgid "Descending"
 msgstr "Aflopend"
 
-#: views/culturefeed_entry_ui.views_default.inc:157
-msgid "Master"
-msgstr ""
-
-#: views/culturefeed_entry_ui.views_default.inc:158
-msgid "Events created by me"
-msgstr "Mijn activiteiten"
-
-#: views/culturefeed_entry_ui.views_default.inc:159
-msgid "more"
-msgstr "meer"
-
-#: views/culturefeed_entry_ui.views_default.inc:165
+#: views/culturefeed_entry_ui.views_default.inc:48;165
 msgid "Notification that no results were found"
 msgstr "Melding dat er geen resultaten werden gevonden"
 
-#: views/culturefeed_entry_ui.views_default.inc:166
+#: views/culturefeed_entry_ui.views_default.inc:50;166
 msgid "Unable to find any events created by you."
 msgstr "Er werden geen activiteiten gevonden die door jou aangemaakt werden"
 
-#: views/culturefeed_entry_ui.views_default.inc:167
-msgid "Last updated"
-msgstr "Laatst bijgewerkt"
-
-#: views/culturefeed_entry_ui.views_default.inc:168
+#: views/culturefeed_entry_ui.views_default.inc:121;168
 msgid "Created by current user"
 msgstr ""
 
-#: views/culturefeed_entry_ui.views_default.inc:169
+#: views/culturefeed_entry_ui.views_default.inc:126;169
 msgid "Block"
 msgstr "Blok"
 
-#: views/culturefeed_entry_ui.views_default.inc:170
+#: views/culturefeed_entry_ui.views_default.inc:129;170
 msgid "Page"
 msgstr "Pagina"
 
-#: views/culturefeed_entry_ui.views_default.inc:172
-msgid "Items per page"
+#: views/culturefeed_entry_ui.views_default.inc:138;172
+msgid "Items on page"
 msgstr ""
 
-#: views/culturefeed_entry_ui.views_default.inc:173
+#: views/culturefeed_entry_ui.views_default.inc:139;173
 msgid "- All -"
 msgstr ""
 
-#: views/culturefeed_entry_ui.views_default.inc:174
+#: views/culturefeed_entry_ui.views_default.inc:140;174
 msgid "Start"
 msgstr ""
 
-#: views/culturefeed_entry_ui.views_default.inc:175
+#: views/culturefeed_entry_ui.views_default.inc:141;175
 msgid "« first"
 msgstr "« eerste"
 
-#: views/culturefeed_entry_ui.views_default.inc:176
+#: views/culturefeed_entry_ui.views_default.inc:142;176
 msgid "‹ previous"
 msgstr "‹ vorige"
 
-#: views/culturefeed_entry_ui.views_default.inc:177
+#: views/culturefeed_entry_ui.views_default.inc:143;177
 msgid "next ›"
 msgstr "volgende ›"
 
-#: views/culturefeed_entry_ui.views_default.inc:178
+#: views/culturefeed_entry_ui.views_default.inc:144;178
 msgid "last »"
 msgstr "laatste »"
 
+#: views/culturefeed_entry_ui.views_default.inc:157
+msgid "Master"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:158
+msgid "Events created by me"
+msgstr "Mijn activiteiten"
+
+#: views/culturefeed_entry_ui.views_default.inc:167
+msgid "Last updated"
+msgstr "Laatst bijgewerkt"
+
 #: views/handlers/views_handler_field_cdb_item_operations.inc:47
 msgid "No permission to edit event"
 msgstr ""
+
+<div class="culturefeed-dev-query">Requested 0 API calls in 0 ms Queries exceeding 100 ms are <span class="slow-query">highlighted</span>.</div>
\ No newline at end of file
diff --git a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
index 22803df4..d17207e9 100644
--- a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
+++ b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
@@ -22,17 +22,17 @@ function culturefeed_entry_ui_views_default_views() {
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Events created by me';
   $handler->display->display_options['use_more_always'] = FALSE;
-  $handler->display->display_options['use_more_text'] = 'meer';
+  $handler->display->display_options['use_more_text'] = t('more');
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'create culturefeed events';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['exposed_form']['type'] = 'basic';
-  $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Toepassen';
-  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Opnieuw instellen';
-  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorteren op';
-  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Oplopend';
-  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Aflopend';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = t('Select');
+  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = t('Reset');
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = t('Sort');
+  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = t('Ascending');
+  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = t('Descending');
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'fields';
@@ -45,9 +45,9 @@ function culturefeed_entry_ui_views_default_views() {
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
-  $handler->display->display_options['empty']['area']['label'] = 'Notification that no results were found';
+  $handler->display->display_options['empty']['area']['label'] = t('Notification that no results were found');
   $handler->display->display_options['empty']['area']['empty'] = TRUE;
-  $handler->display->display_options['empty']['area']['content'] = 'Unable to find any events created by you.';
+  $handler->display->display_options['empty']['area']['content'] = t('Unable to find any events created by you.');
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   /* Veld: Cdb items: Titel */
   $handler->display->display_options['fields']['title']['id'] = 'title';
@@ -118,30 +118,30 @@ function culturefeed_entry_ui_views_default_views() {
   $handler->display->display_options['filters']['createdbycurrentuser']['field'] = 'createdbycurrentuser';
   $handler->display->display_options['filters']['createdbycurrentuser']['exposed'] = TRUE;
   $handler->display->display_options['filters']['createdbycurrentuser']['expose']['operator_id'] = 'createdbycurrentuser_op';
-  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['label'] = 'Created by current user';
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['label'] = t('Created by current user');
   $handler->display->display_options['filters']['createdbycurrentuser']['expose']['operator'] = 'createdbycurrentuser_op';
   $handler->display->display_options['filters']['createdbycurrentuser']['expose']['identifier'] = 'createdbycurrentuser';
   
   /* Display: Block */
-  $handler = $view->new_display('block', 'Block', 'block');
+  $handler = $view->new_display('block', t('Block'), 'block');
   
   /* Display: Pagina */
-  $handler = $view->new_display('page', 'Pagina', 'page_1');
+  $handler = $view->new_display('page', t('Page'), 'page_1');
   $handler->display->display_options['defaults']['title'] = FALSE;
-  $handler->display->display_options['title'] = 'Edit events';
+  $handler->display->display_options['title'] = t('Edit events');
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '10';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['pager']['options']['id'] = '0';
   $handler->display->display_options['pager']['options']['quantity'] = '9';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Items per pagina';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Alle -';
-  $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Startpunt';
-  $handler->display->display_options['pager']['options']['tags']['first'] = '« eerste';
-  $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ vorige';
-  $handler->display->display_options['pager']['options']['tags']['next'] = 'volgende ›';
-  $handler->display->display_options['pager']['options']['tags']['last'] = 'laatste »';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = t('Items on page');
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = t('- All -');
+  $handler->display->display_options['pager']['options']['expose']['offset_label'] = t('Start');
+  $handler->display->display_options['pager']['options']['tags']['first'] = t('« first');
+  $handler->display->display_options['pager']['options']['tags']['previous'] = t('‹ previous');
+  $handler->display->display_options['pager']['options']['tags']['next'] = t('next ›');
+  $handler->display->display_options['pager']['options']['tags']['last'] = t('last »');
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filtercriterium: Cdb items: Type */
@@ -156,26 +156,26 @@ function culturefeed_entry_ui_views_default_views() {
   $translatables['culturefeed_events_createdbycurrentuser'] = array(
     t('Master'),
     t('Events created by me'),
-    t('meer'),
-    t('Toepassen'),
-    t('Opnieuw instellen'),
-    t('Sorteren op'),
-    t('Oplopend'),
-    t('Aflopend'),
+    t('more'),
+    t('Select'),
+    t('Reset'),
+    t('Sort'),
+    t('Ascending'),
+    t('Descending'),
     t('Notification that no results were found'),
     t('Unable to find any events created by you.'),
-    t('Laatst bijgewerkt'),
+    t('Last updated'),
     t('Created by current user'),
     t('Block'),
-    t('Pagina'),
+    t('Page'),
     t('Edit events'),
-    t('Items per pagina'),
-    t('- Alle -'),
-    t('Startpunt'),
-    t('« eerste'),
-    t('‹ vorige'),
-    t('volgende ›'),
-    t('laatste »'),
+    t('Items on page'),
+    t('- All -'),
+    t('Start'),
+    t('« first'),
+    t('‹ previous'),
+    t('next ›'),
+    t('last »'),
   );
 
   $views[$view->name] = $view;

From 894ebbb4c1db61a3171e7f3d2850e1d779c4e6a4 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 12 Feb 2015 13:59:37 +0100
Subject: [PATCH 035/275] MSS-119 punt 8 zip markup

---
 culturefeed_entry_ui/js/bootstrap_autocomplete_override.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index 4e1b66b8..1d1effe5 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -36,7 +36,7 @@ jQuery(function($) {
                     .mousedown(function () { ac.select(this); })
                     .mouseover(function () { ac.highlight(this); })
                     .mouseout(function () { ac.unhighlight(this); })
-                    .data('autocompleteTitle', value)
+                    .data('autocompleteTitle', matches[key].title)
                     .data('autocompleteValue', matches[key].key)
                     .appendTo(ul);
             }

From ff3a759dbfa886e47becffb0d05c4b83e242d5a4 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 12 Feb 2015 14:27:31 +0100
Subject: [PATCH 036/275] MSS-119 punt 7 better error message for custom city

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index ee8ff712..d7dd724e 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1709,7 +1709,7 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
     else {
       $available_city = culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE);
       if (!isset($available_city[$values['location']['new']['citywrapper']['city']])) {
-        form_set_error('location', t('A valid location is required.'));
+        form_set_error('location][new][citywrapper][city', t('Please select a city from the list.'));
       }
     }
     $location = NULL;

From 06df9025c52a9355775e5fe8733914089fff6fb3 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 13 Feb 2015 11:29:05 +0100
Subject: [PATCH 037/275] fix issues for stan

---
 .../includes/culturefeed_entry_ui.pages.inc   | 11 ++--
 .../translations/culturefeed_entry_ui.nl.po   | 60 ++++++-------------
 2 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index a346a561..6b664d5b 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1489,7 +1489,7 @@ function culturefeed_entry_ui_attach_language_elements(&$form, $i, $info = NULL)
  */
 function culturefeed_entry_ui_attach_contacts_elements(&$form, $i, $info = NULL) {
 
-  $options = array(0 => 'Phone', 1 => 'Email');
+  $options = array(0 => t('Phone'), 1 => t('E-mail'));
   $contact_type = 0;
 
   if ($info[0] == 'phone') {
@@ -1699,15 +1699,18 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
   // Validate location
   if (isset($form_state['#location_needed']) && $form_state['#location_needed']) {
     if (empty($values['location']['new']['location_title'])) {
-      form_set_error('location_title', t('A title is required for a custom location'));
+      form_set_error('location][new][location_title', t('A title is required for a custom location'));
     }
     if ($values['location']['new']['citywrapper']['country_select'] != 'BE') {
       if (empty($values['location']['new']['citywrapper']['zip_code'])) {
-        form_set_error('basic[zip_code]', t('A zip code is required for a custom location'));
+        form_set_error('location][new][citywrapper][zip_code', t('A zip code is required for a custom location'));
+      }
+      if (strlen($values['location']['new']['citywrapper']['zip_code']) < 5 || strlen($values['location']['new']['citywrapper']['zip_code']) > 15) {
+        form_set_error('location][new][citywrapper][zip_code', t('A zip code has minimum 4 characters'));
       }
     }
     if (empty($values['location']['new']['citywrapper']['city'])) {
-      form_set_error('city', t('A city is required for a custom location'));
+      form_set_error('location][new][citywrapper][city', t('A city is required for a custom location'));
     }
     if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
       $available_city = culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE);
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index 824c6286..4b9143da 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -22,18 +22,19 @@
 #  js/culturefeed_entry_ui.js: n/a
 #  views/culturefeed_entry_ui.views.inc: n/a
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "POT-Creation-Date: 2015-02-10 12:25+0100\n"
-"PO-Revision-Date: 2015-02-10 12:25+0100\n"
+"PO-Revision-Date: 2015-02-10 15:54+0100\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Language: nl\n"
+"X-Generator: Poedit 1.7.4\n"
 
 #: culturefeed_entry_ui.module:18
 msgid "Manage object tags"
@@ -41,9 +42,7 @@ msgstr "Beheer object tags"
 
 #: culturefeed_entry_ui.module:19
 msgid "Manage all the tags from the objects on culturefeed (events, actors, ...)."
-msgstr ""
-"Beheer alle tags van objecten op culture feed (activiteiten, actoren "
-"...)."
+msgstr "Beheer alle tags van objecten op culture feed (activiteiten, actoren ...)."
 
 #: culturefeed_entry_ui.module:22
 msgid "Manage custom tags"
@@ -95,9 +94,7 @@ msgstr "Voeg activiteit toe"
 
 #: culturefeed_entry_ui.module:401
 msgid "Some disallowed html tags will be removed in the %field_name field. The allowed tags are %allowed_tags"
-msgstr ""
-"Niet toegelaten html-tags zullen verwijderd worden in het veld "
-"%field_name. De toegelaten tags zijn %allowed_tags"
+msgstr "Niet toegelaten html-tags zullen verwijderd worden in het veld %field_name. De toegelaten tags zijn %allowed_tags"
 
 #: culturefeed_entry_ui.module:71
 msgid "New event"
@@ -121,9 +118,7 @@ msgstr ""
 
 #: culturefeed_entry_ui.info:0
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
-msgstr ""
-"Meertalig invoerformulier om activiteiten aan te maken, aan te passen "
-"en verwijderen in UiTdatabank via Entry API"
+msgstr "Meertalig invoerformulier om activiteiten aan te maken, aan te passen en verwijderen in UiTdatabank via Entry API"
 
 #: culturefeed_entry_ui.info:0 culturefeed_date_control/culturefeed_date_control.info:0
 msgid "CultureFeed"
@@ -251,9 +246,7 @@ msgstr "Voorkeur taal"
 
 #: includes/culturefeed_entry_ui.admin.inc:23
 msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
-msgstr ""
-"Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal "
-"als backup"
+msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
 
 #: includes/culturefeed_entry_ui.admin.inc:30
 msgid "Custom options on the /tags page"
@@ -381,19 +374,17 @@ msgstr "Ondersteunde bestandsformaten: gif, png, jpg, jpeg"
 
 #: includes/culturefeed_entry_ui.pages.inc:853
 msgid "Copyright"
-msgstr ""
+msgstr "Copyright"
 
 #: includes/culturefeed_entry_ui.pages.inc:854
 msgid "Name of the copyright owner of this image."
-msgstr ""
+msgstr "Naam van de copyright eigenaar van deze afbeelding"
 
 #: includes/culturefeed_entry_ui.pages.inc:861
 msgid "I agree to the <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
 msgstr ""
-"Ik ga akkoord met de <a "
-"href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene "
-"voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige "
-"rechten beschik om de afbeelding te verspreiden."
+"Ik ga akkoord met de <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding "
+"te verspreiden."
 
 #: includes/culturefeed_entry_ui.pages.inc:868;873;905
 msgid "Price"
@@ -573,14 +564,11 @@ msgstr "Geef de juiste datum en tijdstip op"
 
 #: includes/culturefeed_entry_ui.pages.inc:1688
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
-msgstr ""
-"Geef aan dat je akkoord gaat met de algemene voorwaarden van "
-"UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt "
-"om de afbeelding te verspreiden via UiTdatabank."
+msgstr "Geef aan dat je akkoord gaat met de algemene voorwaarden van UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt om de afbeelding te verspreiden via UiTdatabank."
 
 #: includes/culturefeed_entry_ui.pages.inc:1691
 msgid "Copyright field is required."
-msgstr ""
+msgstr "Het veld 'copyright' is verplicht."
 
 #: includes/culturefeed_entry_ui.pages.inc:1696
 msgid "A category is required."
@@ -600,7 +588,7 @@ msgstr "Een stad is verplicht voor een nieuwe locatie"
 
 #: includes/culturefeed_entry_ui.pages.inc:1715
 msgid "A valid city is required for a custom location"
-msgstr ""
+msgstr "Een geldige stad/gemeente is verplicht voor een nieuwe locatie"
 
 #: includes/culturefeed_entry_ui.pages.inc:1723
 msgid "A location is required."
@@ -684,23 +672,15 @@ msgstr "Voeg toe"
 
 #: includes/culturefeed_entry_ui.pages.inc:2557
 msgid "Tag @tag is not permitted because it's already a custom tag."
-msgstr ""
-"Trefwoord @tag is niet toegelaten aangezien het al een bestaande "
-"marker is."
+msgstr "Trefwoord @tag is niet toegelaten aangezien het al een bestaande marker is."
 
 #: includes/culturefeed_entry_ui.pages.inc:2604
 msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
-msgstr ""
-"De labels werden aangepast. Het kan echter een half uur duren "
-"vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) "
-"zichtbaar zijn."
+msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
 
 #: includes/culturefeed_entry_ui.pages.inc:2609
 msgid "You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to \"vragen@uitdatabank.be\"."
-msgstr ""
-"Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je "
-"hier vragen bij hebt, contacteer dan onze helpdesk via "
-"\"vragen@uitdatabank.be\"."
+msgstr "Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je hier vragen bij hebt, contacteer dan onze helpdesk via \"vragen@uitdatabank.be\"."
 
 #: includes/culturefeed_entry_ui.pages.inc:2612
 msgid "Error occured while saving the tags"
@@ -800,7 +780,7 @@ msgstr ""
 
 #: views/culturefeed_entry_ui.views_default.inc:140;174
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #: views/culturefeed_entry_ui.views_default.inc:141;175
 msgid "« first"
@@ -832,6 +812,4 @@ msgstr "Laatst bijgewerkt"
 
 #: views/handlers/views_handler_field_cdb_item_operations.inc:47
 msgid "No permission to edit event"
-msgstr ""
-
-<div class="culturefeed-dev-query">Requested 0 API calls in 0 ms Queries exceeding 100 ms are <span class="slow-query">highlighted</span>.</div>
\ No newline at end of file
+msgstr "Geen toelating om event aan te passen"

From e4370c3b4ff782ca0da193db9fa4b79848942aac Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 13 Feb 2015 11:34:32 +0100
Subject: [PATCH 038/275] fix gfh on save event

---
 culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index 4b9143da..94583cf9 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -624,7 +624,7 @@ msgstr "Er is een fout opgetreden tijdens het opslaan van de activiteit"
 
 #: includes/culturefeed_entry_ui.pages.inc:2441
 msgid "Saving the event"
-msgstr "gfh"
+msgstr "Evenement aan het bewaren"
 
 #: includes/culturefeed_entry_ui.pages.inc:2448
 msgid "Initializing."

From e584298d6505a53dd5d169f65849a9cbfbb61c65 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Fri, 13 Feb 2015 16:41:45 +0100
Subject: [PATCH 039/275] MSS-119 punt 5

---
 culturefeed_entry_ui/js/culturefeed_entry_ui.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 8dd5050e..855fa857 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -74,9 +74,9 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
     * Fire the autocomplete on paste.
     */
     Drupal.behaviors.autocomplete_paste = {
-        attach: function (context, settings) {
-            $('.form-autocomplete input').bind("paste", function () {
-                $(this).populatePopup();
+        attach: function () {
+            $('input.form-autocomplete, .form-autocomplete input.form-text').bind("input propertychange", function (event) {
+              $(this).trigger('keyup');
             });
         }
     }

From 33b6dc0f56b73ebdae9acf09ab5e60a4257c2d6a Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Mon, 16 Feb 2015 12:27:28 +0100
Subject: [PATCH 040/275] MSS-119 de nice to have's

---
 culturefeed_entry_ui/culturefeed_entry_ui.module          | 7 +++++++
 .../includes/culturefeed_entry_ui.pages.inc               | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 03d929b8..81576f01 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -237,10 +237,17 @@ function culturefeed_entry_ui_add_more_submit($form, &$form_state) {
     
     case 'location_add_more':
       $form_state['#location_needed'] = TRUE;
+      if (isset($form_state['values']['location']['actor']['location_actor_label']) && $form_state['values']['location']['actor']['location_actor_label']) {
+        $form_state['#location_actor_label'] = $form_state['values']['location']['actor']['location_actor_label'];
+      }
+
       break;
       
     case 'actor_add_more':
       $form_state['#actor_needed'] = TRUE;
+      if (isset($form_state['input']['organiser']['actor']['organiser_actor_label']) && $form_state['input']['organiser']['actor']['organiser_actor_label']) {
+        $form_state['#actor_label'] = $form_state['input']['organiser']['actor']['organiser_actor_label'];
+      }
       break;
       
     case 'performers_add_more':
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index d7dd724e..63711472 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -597,10 +597,14 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
 
     $country = isset($form_state['values']['location']['new']['citywrapper']['country_select']) && $form_state['values']['location']['new']['citywrapper']['country_select'] ? $form_state['values']['location']['new']['citywrapper']['country_select'] : ($custom_location_country ? $custom_location_country : 'BE');
 
+    $default_location_title = $custom_location_title ? $custom_location_title : '';
+    if (isset($form_state['#location_actor_label'])) {
+      $default_location_title = $form_state['#location_actor_label'];
+    }
     $form['basic']['location']['new']['location_title'] = array(
       '#type' => 'textfield',
       '#title' => t('Location Title'),
-      '#default_value' => $custom_location_title ? $custom_location_title : '',
+      '#default_value' => $default_location_title,
       '#required' => FALSE,
       '#size' => 80,
     );
@@ -1001,9 +1005,11 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   );
 
   if (isset($form_state['#actor_needed'])) {
+    $default_actor = isset($form_state['#actor_label']) ? $form_state['#actor_label'] : '';
     $form['extra']['organiser']['new_actor'] = array(
       '#type' => 'textfield',
       '#title' => t('Name new organizer'),
+      '#default_value' => $default_actor,
     );
   }
 

From 327d4333549045405c1165a6e0dc4fe515523a4c Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 19 Feb 2015 10:55:57 +0100
Subject: [PATCH 041/275] UPS-1362 put advantages back on event detail page

---
 .../includes/event_details_advantages.inc     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/culturefeed_uitpas/includes/event_details_advantages.inc b/culturefeed_uitpas/includes/event_details_advantages.inc
index a7e78d38..a3e3a1dc 100644
--- a/culturefeed_uitpas/includes/event_details_advantages.inc
+++ b/culturefeed_uitpas/includes/event_details_advantages.inc
@@ -63,17 +63,24 @@ function culturefeed_uitpas_event_details_advantages_get() {
       $query->unexpired = TRUE;
       $result = $cf->uitpas()->getPromotionPoints($query);
 
-      if ($result->total && $event->locationId) {
+      if ($result->total) {
 
-        $item_list['items'][] = array(
-          'data' => l(t('Show advantages at') . ' ' .  $event->locationName , 'agenda/a/' . culturefeed_search_slug($event->locationName) . '/' . $event->locationId),
-          'class' => array('uitpas_has_promotion'),
-        );
+				foreach ($result->objects as $object) {
+					$item_list['items'][] = array(
+						'data' => $object->title,
+						'class' => array('uitpas_has_promotion'),
+					);
+				}
 
       }
-      
+
+			if ($event->locationId) {
+				$item_list['items'][] = array(
+					'data' => l(t('Show advantages at') . ' ' .  $event->locationName , 'agenda/a/' . culturefeed_search_slug($event->locationName) . '/' . $event->locationId),
+					'class' => array('uitpas_has_promotion'),
+				);
+			}
       else {
-        
         $item_list['items'][] = array(
           'data' => l(t('Show advantages at') . ' ' .  $event->organiserName , 'agenda/a/' . culturefeed_search_slug($event->organiserName) . '/' . $event->organiserId),
           'class' => array('uitpas_has_promotion'),

From 1c908a9346e1974d7e9ed2ddc1472cf9a4d85e84 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 19 Feb 2015 15:13:42 +0100
Subject: [PATCH 042/275] UPS-1603 fix link of pager on my promotions

---
 culturefeed_uitpas/includes/profile_promotions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_uitpas/includes/profile_promotions.inc b/culturefeed_uitpas/includes/profile_promotions.inc
index 5515829a..0666cbc2 100644
--- a/culturefeed_uitpas/includes/profile_promotions.inc
+++ b/culturefeed_uitpas/includes/profile_promotions.inc
@@ -64,7 +64,7 @@ function culturefeed_uitpas_profile_promotions_get($filter = NULL) {
   }
 
   // Solution csdco on from https://www.drupal.org/node/1049354
-  $_GET['q'] = 'promotions';
+  $_GET['q'] = 'culturefeed/profile/uitpas/promotions';
 
   return array(
     array(

From fe240e8166009e3d6b278e5ae6ea2421adbc13f7 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 19 Feb 2015 15:56:33 +0100
Subject: [PATCH 043/275] UPS-1604 all available card systems in filter form on
 my promotions

---
 culturefeed_uitpas/includes/profile_promotions.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/culturefeed_uitpas/includes/profile_promotions.inc b/culturefeed_uitpas/includes/profile_promotions.inc
index 0666cbc2..30bc0705 100644
--- a/culturefeed_uitpas/includes/profile_promotions.inc
+++ b/culturefeed_uitpas/includes/profile_promotions.inc
@@ -127,14 +127,13 @@ function culturefeed_uitpas_profile_promotions_filter_sort($form, $form_state) {
     '#markup' => '<li><a href="/culturefeed/profile/uitpas/advantages">' . t('Welcome Advantages') . '</a></li>',
   );
 
-  $uitpas_user = culturefeed_uitpas_get_uitpas_user();
-
-  $card_systems = $uitpas_user->passholder->cardSystemSpecific;
+	$cf = DrupalCultureFeed::getConsumerInstance();
+	$card_systems = $cf->uitpas()->getCardSystems();
 
   $options = array();
-  foreach ($card_systems as $system) {
-    $options[$system->cardSystem->id] = $system->cardSystem->name;
-  }
+	foreach ($card_systems as $system) {
+		$options[$system->id] = $system->name;
+	}
 
   $id = drupal_html_id('profile-promotions-filter-sort');
   $form['profile_promotions']['#prefix'] = '<div id="' . $id . '">';

From 6d1845f6c06056fd1717fa25474451bff69a5d75 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 24 Feb 2015 08:32:46 +0100
Subject: [PATCH 044/275] UPS-1362 put event-details-advantages in a block tpl
 + links

---
 culturefeed_uitpas/culturefeed_uitpas.blocks.inc          | 2 +-
 culturefeed_uitpas/culturefeed_uitpas.theme.inc           | 8 ++++++++
 culturefeed_uitpas/includes/event_details_advantages.inc  | 7 +++++--
 .../culturefeed-uitpas-event-details-advantages.tpl.php   | 6 ++++++
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php

diff --git a/culturefeed_uitpas/culturefeed_uitpas.blocks.inc b/culturefeed_uitpas/culturefeed_uitpas.blocks.inc
index fa54ac1a..c0c00cf6 100644
--- a/culturefeed_uitpas/culturefeed_uitpas.blocks.inc
+++ b/culturefeed_uitpas/culturefeed_uitpas.blocks.inc
@@ -113,11 +113,11 @@ function culturefeed_uitpas_block_view($delta = '') {
     case 'uitpas_event_details_advantages':
       module_load_include('inc', 'culturefeed_uitpas', 'includes/event_details_advantages');
       $content = culturefeed_uitpas_event_details_advantages_get();
+
       if ($content) {
 
         $block['subject'] = t("UiTPAS Advantages");
         $block['content'] = $content;
-
       }
       break;
 
diff --git a/culturefeed_uitpas/culturefeed_uitpas.theme.inc b/culturefeed_uitpas/culturefeed_uitpas.theme.inc
index 0e382a50..ad32d790 100644
--- a/culturefeed_uitpas/culturefeed_uitpas.theme.inc
+++ b/culturefeed_uitpas/culturefeed_uitpas.theme.inc
@@ -111,6 +111,14 @@ function culturefeed_uitpas_theme() {
       'file' => 'theme.inc',
       'template' => 'culturefeed-uitpas-profile-summary',
     ),
+		'culturefeed_uitpas_event_details_advantages' => array(
+			'variables' => array(
+        'items' => array(),
+      ),
+      'path' => drupal_get_path('module', 'culturefeed_uitpas') . '/theme',
+      'file' => 'theme.inc',
+      'template' => 'culturefeed-uitpas-event-details-advantages',
+		),
     'culturefeed_uitpas_promotion' => array(
       'variables' => array('promotion' => NULL),
       'path' => drupal_get_path('module', 'culturefeed_uitpas') . '/theme',
diff --git a/culturefeed_uitpas/includes/event_details_advantages.inc b/culturefeed_uitpas/includes/event_details_advantages.inc
index a3e3a1dc..542ecfba 100644
--- a/culturefeed_uitpas/includes/event_details_advantages.inc
+++ b/culturefeed_uitpas/includes/event_details_advantages.inc
@@ -67,7 +67,7 @@ function culturefeed_uitpas_event_details_advantages_get() {
 
 				foreach ($result->objects as $object) {
 					$item_list['items'][] = array(
-						'data' => $object->title,
+						'data' => l($object->title , 'promotion/' . culturefeed_search_slug($object->title) . '/' . $object->id),
 						'class' => array('uitpas_has_promotion'),
 					);
 				}
@@ -93,7 +93,10 @@ function culturefeed_uitpas_event_details_advantages_get() {
     }
 
     if (count($item_list['items'])) {
-      return theme('item_list', $item_list);
+			return array(
+				'#theme' => 'culturefeed_uitpas_event_details_advantages',
+				'#items' => $item_list['items'],
+			);
     }
 
   }
diff --git a/culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php b/culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php
new file mode 100644
index 00000000..8b0d3a0e
--- /dev/null
+++ b/culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php
@@ -0,0 +1,6 @@
+<ul>
+
+	<?php foreach ($items as $item): ?>
+		<li class="<?php print $item['class'][0]; ?>"><?php print $item['data']; ?></li>
+	<?php endforeach; ?>
+</ul>
\ No newline at end of file

From f720485fd2cd030fd0b81b5785bd5488959a7e36 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 24 Feb 2015 11:07:42 +0100
Subject: [PATCH 045/275] button to footer in culturefeed_entry_ui view

---
 .../views/culturefeed_entry_ui.views_default.inc          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
index d17207e9..546044fb 100644
--- a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
+++ b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
@@ -37,10 +37,10 @@ function culturefeed_entry_ui_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'fields';
   /* Kop: Cdb items: Maak activiteit aan */
-  $handler->display->display_options['header']['create']['id'] = 'create';
-  $handler->display->display_options['header']['create']['table'] = 'cdb_items';
-  $handler->display->display_options['header']['create']['field'] = 'create';
-  $handler->display->display_options['header']['create']['empty'] = TRUE;
+  $handler->display->display_options['footer']['create']['id'] = 'create';
+  $handler->display->display_options['footer']['create']['table'] = 'cdb_items';
+  $handler->display->display_options['footer']['create']['field'] = 'create';
+  $handler->display->display_options['footer']['create']['empty'] = TRUE;
   /* Gedrag bij ontbreken van resultaten: Algemeen: Tekstveld */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';

From 1a179d82261a4c4ea68634475299f191dadd9291 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 24 Feb 2015 13:18:47 +0100
Subject: [PATCH 046/275] PWK-233 fix edit on detail and image on edit

---
 culturefeed_entry_ui/culturefeed_entry_ui.module             | 3 ++-
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 03d929b8..91680f66 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -140,9 +140,10 @@ function culturefeed_entry_ui_menu_local_tasks_alter(&$data, $router_item, $root
   }
   
   $culturefeed_user = DrupalCultureFeed::getLoggedInUser();
+  $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($culturefeed_user->id, $culturefeed_user->mbox, array('ids' => $event->getId()));
   
   // Add tab for editing the event.
-  if (user_access('edit culturefeed events') && ($event->getEntity()->getCreatedBy() == $culturefeed_user->mbox)) {
+  if (user_access('edit culturefeed events') && ($event->getEntity()->getCreatedBy() == $culturefeed_user->mbox || $ubd_permission[$event->getId()] == 'true')) {
 
     $link = array(
       'href' => $path . '/edit',
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 6b664d5b..f7aa8738 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -260,7 +260,8 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       }
 
       try {
-        $default_image = system_retrieve_file('http:' . $main_image->getHLink(), 'public://uploads/' . $main_image->getFileName(), TRUE);
+        $default_image = system_retrieve_file('http:' . $main_image->getHLink(), 'public://uploads/', TRUE);
+        
         if ($default_image) {
           file_usage_add($default_image, 'culturefeed_entry_ui', 'event', $default_image->fid);
           $default_image_hlink = $main_image->getHLink();

From 23b1f7d115d1930302d9b738ab21bdb5e725abae Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 24 Feb 2015 15:12:15 +0100
Subject: [PATCH 047/275] MSS-119 punt 4: location control

---
 .../culturefeed_entry_ui.info                 |   1 +
 .../culturefeed_entry_ui.module               |  32 +-
 .../culturefeed_location_control.info         |   5 +
 .../culturefeed_location_control.module       | 113 ++++++
 .../form/asset.inc                            | 163 +++++++++
 .../form/custom.inc                           | 223 ++++++++++++
 .../form/location_control.inc                 | 198 ++++++++++
 .../includes/culturefeed_entry_ui.pages.inc   | 296 +--------------
 .../form/culturefeed_entry_ui.location.inc    | 246 +++++++++++++
 .../js/bootstrap_autocomplete_override.js     | 252 +++++++------
 .../js/culturefeed_entry_ui.js                | 343 ++++++++++--------
 11 files changed, 1288 insertions(+), 584 deletions(-)
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
 create mode 100644 culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.info b/culturefeed_entry_ui/culturefeed_entry_ui.info
index f11ff2a3..99ca5414 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.info
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.info
@@ -7,6 +7,7 @@ dependencies[] = culturefeed_search
 dependencies[] = culturefeed_search_views
 dependencies[] = culturefeed
 dependencies[] = culturefeed_date_control
+dependencies[] = culturefeed_location_control
 dependencies[] = file
 dependencies[] = date
 dependencies[] = date_api
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 81576f01..7b3d0987 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -235,14 +235,6 @@ function culturefeed_entry_ui_add_more_submit($form, &$form_state) {
       $form_state['#price_needed'] = TRUE;
       break;
     
-    case 'location_add_more':
-      $form_state['#location_needed'] = TRUE;
-      if (isset($form_state['values']['location']['actor']['location_actor_label']) && $form_state['values']['location']['actor']['location_actor_label']) {
-        $form_state['#location_actor_label'] = $form_state['values']['location']['actor']['location_actor_label'];
-      }
-
-      break;
-      
     case 'actor_add_more':
       $form_state['#actor_needed'] = TRUE;
       if (isset($form_state['input']['organiser']['actor']['organiser_actor_label']) && $form_state['input']['organiser']['actor']['organiser_actor_label']) {
@@ -277,40 +269,30 @@ function culturefeed_entry_ui_add_more_js($form, $form_state) {
 
   switch ($form_state['input']['_triggering_element_name']) {
 
-    case 'location[new][citywrapper][country_select]':
-      return $form['basic']['location']['new']['citywrapper'];
-
     case 'links_add_more':
       return $form['extra']['links'];
 
     case 'opening_times_add_more':
       return $form['basic']['period_or_permanent']['opening_times'];
-      
+
     case 'price_add_more':
       return $form['extra']['price']['extra'];
-      
+
     case 'ld_add_more':
       return $form['extra']['description']['ld'];
-    
-    case 'location_add_more':
-      //$form['basic']['location']['add_new_location']['#attributes'] = array('style' => array('display:none;'));
-      return $form['basic']['location'];
-      
+
     case 'actor_add_more':
       return $form['extra']['organiser'];
-    
+
     case 'performers_add_more':
       return $form['extra']['performers']['wrapper'];
-      
+
     case 'contacts_add_more':
       return $form['extra']['contacts']['wrapper'];
-    
+
     case 'languages_add_more':
       return $form['extra']['language']['wrapper'];
-      
-    case 'location[actor][location_actor_id]':
-      return $form['basic']['location']['actor'];
-      
+
     case 'organiser_actor_id':
       return $form['extra']['organiser']['actor'];
   }
diff --git a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
new file mode 100644
index 00000000..00612f51
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
@@ -0,0 +1,5 @@
+name = CultureFeed Entry UI Location control
+description = Form element to manage locations in the Entry UI.
+package = CultureFeed
+version = VERSION
+core = 7.x
diff --git a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
new file mode 100644
index 00000000..90cee499
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed location control module.
+ */
+
+require_once 'form/asset.inc';
+require_once 'form/custom.inc';
+require_once 'form/location_control.inc';
+
+/**
+ * Ajax callback for the location control element.
+ *
+ * @todo move to a more general module, culturefeed date control does the same.
+ */
+function culturefeed_location_control_ajax_callback() {
+
+  list($form, $form_state, $form_id, $form_build_id, $commands) = ajax_get_form();
+  drupal_process_form($form['#form_id'], $form, $form_state);
+  $parents = func_get_args();
+
+  $form = drupal_array_get_nested_value($form, $parents);
+  $output = drupal_render($form);
+  $result = array(
+    '#type' => 'ajax',
+    '#commands' => ajax_prepare_response($output),
+  );
+  return $result;
+
+}
+
+/**
+ * Checks if the triggering element is part of the element.
+ *
+ * @todo move to a more general module, culturefeed date control does the same.
+ *
+ * @param array $triggering_element
+ *   The triggering element.
+ * @param array $element
+ *   The element.
+ *
+ * @return bool
+ *   True or false.
+ */
+function culturefeed_location_control_check_trigger_element(array $triggering_element, array $element) {
+  return array_intersect($triggering_element['#parents'], $element['#parents']) == $element['#parents'];
+}
+
+/**
+ * Implements hook_element_info().
+ *
+ * This is a complex ajax driven form element.  Several new ajax buttons are
+ * added based on initial interaction or default value.  Most of the logic is
+ * taken from the core managed file field.
+ *
+ * - To ensure all buttons remain registered in the form, visibility is set
+ *   through access in a pre render function.
+ * - Element validation functions are used to set the data.
+ * - A custom ajax callback path to ensure the form is rerenderd.
+ *
+ * @see file_managed_file_pre_render()
+ * @see file_managed_file_value()
+ */
+function culturefeed_location_control_element_info() {
+
+  return array(
+    'culturefeed_location_control' => array(
+      '#element_validate' => array('culturefeed_location_control_location_control_validate'),
+      '#input' => TRUE,
+      '#pre_render' => array('culturefeed_location_control_location_control_pre_render'),
+      '#process' => array('culturefeed_location_control_location_control_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_location_control_location_control_value_callback',
+    ),
+    'culturefeed_location_control_asset' => array(
+      '#element_validate' => array('culturefeed_location_control_asset_validate'),
+      '#input' => TRUE,
+      '#process' => array('culturefeed_location_control_asset_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_location_control_asset_value_callback',
+    ),
+    'culturefeed_location_control_custom' => array(
+      '#element_validate' => array('culturefeed_location_control_custom_validate'),
+      '#input' => TRUE,
+      '#pre_render' => array('culturefeed_location_control_custom_pre_render'),
+      '#process' => array('culturefeed_location_control_custom_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_location_control_custom_value_callback',
+    ),
+  );
+
+}
+
+/**
+ * Implements hook_menu().
+ *
+ * @todo move to a more general module, culturefeed date control does the same.
+ */
+function culturefeed_location_control_menu() {
+
+  return array(
+    'culturefeed_elements/location/ajax' => array(
+      'title' => 'AHAH callback',
+      'page callback' => 'culturefeed_location_control_ajax_callback',
+      'delivery callback' => 'ajax_deliver',
+      'access callback' => TRUE,
+      'theme callback' => 'ajax_base_page_theme',
+      'type' => MENU_CALLBACK,
+    ),
+  );
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc b/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
new file mode 100644
index 00000000..8f4ff745
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed location control asset functions.
+ */
+
+/**
+ * Sets the culturefeed location control asset form elements.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_location_control_asset_process(array $element, array &$form_state, array $form) {
+
+  $element_id = $element['#id'];
+  $array_parents = $element['#array_parents'];
+
+  $element['#prefix'] = "<div id=\"" . $element_id . "-ajax-wrapper\">";
+  $element['#suffix'] = "</div>";
+
+  if (isset($element['#location_control'])) {
+    $element_id = $element['#location_control']['#id'];
+    $array_parents = $element['#location_control']['#array_parents'];
+  }
+
+  $asset = $element['#value'];
+
+  $ajax_settings = array(
+    'effect' => 'none',
+    'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+    'progress' => array('type' => 'throbber'),
+    'wrapper' => $element_id . '-ajax-wrapper',
+  );
+
+  $ajax_button = array(
+    '#access' => TRUE,
+    '#ajax' => $ajax_settings,
+    '#attributes' => array(
+      'class' => array('add-more-link btn-link'),
+    ),
+    '#limit_validation_errors' => array($element['#parents']),
+    '#submit' => array('culturefeed_location_control_location_control_submit'),
+    '#type' => 'submit',
+  );
+
+  $element['label'] = array(
+    '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions/all',
+    '#default_value' => isset($asset['label']) ? $asset['label'] : '',
+    '#required' => FALSE,
+    '#size' => 80,
+    '#title' => t('Location'),
+    '#type' => 'textfield',
+  );
+  if ($asset['id']) {
+    $element['label']['#attributes']['readonly'] = 'readonly';
+  }
+
+  // @see culturefeed_entry_ui.js.
+  $element['id'] = array(
+    '#attributes' => array(
+      'id' => 'location_actor_id',
+    ),
+    '#default_value' => isset($asset['id']) ? $asset['id'] : '',
+    '#type' => 'hidden',
+  );
+
+  $element['asset_remove'] = $ajax_button + array(
+    '#id' => 'location_asset_remove',
+    '#name' => 'asset_remove',
+    '#value' => t('Remove address'),
+  );
+  if (!$asset['id']) {
+    $element['asset_remove']['#attributes']['style'] = 'display: none;';
+  }
+
+  $element['new'] = $ajax_button + array(
+    '#id' => 'location_custom_add',
+    '#name' => 'new',
+    '#value' => t('Location not found, add location'),
+  );
+  $element['new']['#attributes']['style'] = 'display: none;';
+
+  return $element;
+
+}
+
+/**
+ * Validate and alter the culturefeed location control asset form values.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_asset_validate(array &$element, array &$form_state) {
+
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#parents']);
+  $asset = $element['#value'];
+
+  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+
+    switch ($triggering_parent) {
+
+      case 'asset_remove':
+
+        $asset['id'] = '';
+        $asset['label'] = '';
+
+    }
+
+    drupal_array_set_nested_value($form_state['input'], $element['#parents'], $asset);
+
+  }
+
+}
+
+/**
+ * Value callback for the culturefeed location control asset element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_location_control_asset_value_callback(array $element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array(
+      'id' => '',
+      'label' => '',
+    );
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+
+      $default_value = $element['#default_value'];
+      $value['id'] = $default_value['id'];
+      $value['label'] = $default_value['label'];
+
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc b/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
new file mode 100644
index 00000000..e1553563
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed location control custom functions.
+ */
+
+/**
+ * Pre renders the culturefeed location control custom.
+ *
+ * @param array $element
+ *   The element.
+ *
+ * @return array $element
+ *   The element.
+ */
+function culturefeed_location_control_custom_pre_render(array $element) {
+
+  $custom = $element['#value'];
+  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : 'BE';
+
+  if ($country == 'BE') {
+    $element['zip']['#access'] = FALSE;
+  }
+  else {
+    $element['number']['#access'] = FALSE;
+  }
+
+  return $element;
+
+}
+
+/**
+ * Sets the culturefeed location control custom form elements.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_location_control_custom_process(array $element, array &$form_state, array $form) {
+
+  $element_id = $element['#id'];
+  $array_parents = $element['#array_parents'];
+
+  $element['#prefix'] = "<div id=\"" . $element_id . "-ajax-wrapper\">";
+  $element['#suffix'] = "</div>";
+
+  $custom = $element['#value'];
+
+  $ajax_settings = array(
+    'effect' => 'none',
+    'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+    'progress' => array('type' => 'throbber'),
+    'wrapper' => $element_id . '-ajax-wrapper',
+  );
+
+  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : 'BE';
+
+  $element['title'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Location Title'),
+    '#default_value' => isset($custom['title']) ? $custom['title'] : '',
+    '#required' => FALSE,
+    '#size' => 80,
+  );
+
+  $element['country'] = array(
+    '#ajax' => $ajax_settings,
+    '#default_value' => $country,
+    '#required' => FALSE,
+    '#title' => t('Country'),
+    '#type' => 'select',
+    '#options' => country_get_list(),
+  );
+
+  $element['zip'] = array(
+    '#access' => TRUE,
+    '#attributes' => array(
+      'style' => array('margin-right:30px;'),
+    ),
+    '#default_value' => isset($custom['zip']) ? $custom['zip'] : '',
+    '#required' => FALSE,
+    '#size' => 10,
+    '#title' => t('ZIP Code'),
+    '#type' => 'textfield',
+  );
+
+  $element['city'] = array(
+    '#autocomplete_path' => ($country == 'BE') ? 'autocomplete/culturefeed/city-suggestion' : '',
+    '#default_value' => isset($custom['city']) ? $custom['city'] : '',
+    '#required' => FALSE,
+    '#size' => 60,
+    '#title' => t('City'),
+    '#type' => 'textfield',
+  );
+
+  $element['street'] = array(
+    '#default_value' => isset($custom['street']) ? $custom['street'] : '',
+    '#required' => FALSE,
+    '#size' => 60,
+    '#title' => ($country == 'BE') ? t('Street') : t('Street and House Number'),
+    '#type' => 'textfield',
+  );
+
+  $element['number'] = array(
+    '#access' => TRUE,
+    '#default_value' => isset($custom['number']) ? $custom['number'] : '',
+    '#required' => FALSE,
+    '#size' => 10,
+    '#title' => t('House Number'),
+    '#type' => 'textfield',
+  );
+
+  if (isset($element['#location_control'])) {
+    $element_id = $element['#location_control']['#id'];
+    $array_parents = $element['#location_control']['#array_parents'];
+  }
+
+  $element['custom_remove'] = array(
+    '#access' => TRUE,
+    '#ajax' => array(
+      'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+      'wrapper' => $element_id . '-ajax-wrapper',
+    ) + $ajax_settings,
+    '#attributes' => array('class' => array('add-more-link btn-link')),
+    '#limit_validation_errors' => array($element['#parents']),
+    '#name' => 'custom_remove',
+    '#submit' => array('culturefeed_location_control_location_control_submit'),
+    '#type' => 'submit',
+    '#value' => t('Remove address'),
+  );
+
+  return $element;
+
+}
+
+/**
+ * Validate and alter the culturefeed location control custom form values.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_custom_validate(array &$element, array &$form_state) {
+
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#parents']);
+  $custom = $element['#value'];
+
+  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+
+    switch ($triggering_parent) {
+
+      case 'custom_remove':
+
+        $custom['city'] = '';
+        $custom['country'] = '';
+        $custom['number'] = '';
+        $custom['street'] = '';
+        $custom['title'] = '';
+        $custom['zip'] = '';
+
+    }
+
+    drupal_array_set_nested_value($form_state['input'], $element['#parents'], $custom);
+
+  }
+
+}
+
+/**
+ * Value callback for the culturefeed location control custom element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_location_control_custom_value_callback(array $element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array(
+      'city' => '',
+      'country' => '',
+      'number' => '',
+      'street' => '',
+      'title' => '',
+      'zip' => '',
+    );
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+
+      $default_value = $element['#default_value'];
+      $value['city'] = $default_value['city'];
+      $value['country'] = $default_value['country'];
+      $value['number'] = $default_value['number'];
+      $value['street'] = $default_value['street'];
+      $value['title'] = $default_value['title'];
+      $value['zip'] = $default_value['zip'];
+
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc b/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
new file mode 100644
index 00000000..f62e4e5c
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
@@ -0,0 +1,198 @@
+<?php
+
+/**
+ * @file
+ * Contains the functions for the culturefeed location control form element.
+ */
+
+/**
+ * Pre renders the culturefeed location control custom.
+ *
+ * @param array $element
+ *   The element.
+ *
+ * @return array $element
+ *   The element.
+ */
+function culturefeed_location_control_location_control_pre_render(array $element) {
+
+  $location_control = $element['#value'];
+
+  if ($location_control['location_control']['type'] == 'asset') {
+    $element['location_control']['custom']['#access'] = FALSE;
+  }
+  elseif ($location_control['location_control']['type'] == 'custom') {
+    $element['location_control']['asset']['#access'] = FALSE;
+  }
+
+  return $element;
+
+}
+
+/**
+ * Returns the culturefeed location control element.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_location_control_location_control_process(array $element, array &$form_state, array $form) {
+
+  $location_control = $element['#value']['location_control'];
+
+  $element['location_control'] = array(
+    '#attributes' => array(
+      'id' => $element['#id'] . '-ajax-wrapper',
+    ),
+    '#type' => 'container',
+  );
+
+  // Type.
+  $element['location_control']['type'] = array(
+    '#type' => 'hidden',
+    '#value' => $location_control['type'],
+  );
+
+  // Asset.
+  $element['location_control']['asset'] = array(
+    '#access' => TRUE,
+    '#default_value' => isset($location_control['asset']) ? $location_control['asset'] : '',
+    '#location_control' => $element,
+    '#type' => 'culturefeed_location_control_asset',
+  );
+
+  // Custom.
+  $element['location_control']['custom'] = array(
+    '#access' => TRUE,
+    '#default_value' => isset($location_control['custom']) ? $location_control['custom'] : '',
+    '#location_control' => $element,
+    '#type' => 'culturefeed_location_control_custom',
+  );
+
+  return $element;
+
+}
+
+/**
+ * Submit handler for the ajax buttons.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_location_control_submit(array $form, array &$form_state) {
+
+  $form_state['rebuild'] = TRUE;
+
+}
+
+/**
+ * Validate and alter the culturefeed location control form values.
+ *
+ * This is where the element switching is set, based on values.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_location_control_validate(array $element, array &$form_state) {
+
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#parents']);
+
+  // Use form_state instead of element as individual sub elements have changes
+  // that won't be reflected in element.
+  $values = drupal_array_get_nested_value($form_state['input'], $element['#parents']);
+  $location_control = $values['location_control'];
+
+  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+
+    $type = $location_control['type'];
+
+    // Custom.
+    if ($triggering_parent == 'new') {
+
+      $type = 'custom';
+      if (isset($location_control['asset']['label']) && $location_control['asset']['label']) {
+        $location_control['custom']['title'] = $location_control['asset']['label'];
+      }
+
+    }
+
+    // Remove.
+    if ($triggering_parent == 'asset_remove' || $triggering_parent == 'custom_remove') {
+
+      $type = 'asset';
+
+    }
+
+    $location_control['type'] = $type;
+    $element['#parents'][] = 'location_control';
+
+    drupal_array_set_nested_value($form_state['input'], $element['#parents'], $location_control);
+  }
+
+}
+
+/**
+ * Value callback for the location control element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_location_control_location_control_value_callback(array &$element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array(
+      'location_control' => array(
+        'type' => 'asset',
+        'asset' => array(),
+        'custom' => array(),
+      ),
+    );
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+
+      $location_control = $value['location_control'];
+      $default_value = $element['#default_value'];
+
+      // Asset.
+      if ($default_value['asset']['id']) {
+        $location_control['asset'] = $default_value['asset'];
+        $location_control['type'] = 'asset';
+      }
+
+      // Custom.
+      if ($default_value['custom']['title']) {
+        $location_control['custom'] = $default_value['custom'];
+        $location_control['type'] = 'custom';
+      }
+
+      $value['location_control'] = $location_control;
+
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 63711472..217edbde 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -17,14 +17,6 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   $category_defaults = array();
   $eventtype_default = '';
   $themetype_default = '';
-  $default_location_label = '';
-  $default_location_id = '';
-  $custom_location_title = '';
-  $custom_location_street = '';
-  $custom_location_number = '';
-  $custom_location_zip = '';
-  $custom_location_city = '';
-  $custom_location_country = '';
   $default_organiser_label = '';
   $default_organiser_id = '';
   $publication_date = '';
@@ -49,11 +41,6 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     $form_state['#themes_needed'] = '';
   }
 
-  if (!isset($form_state['#location_needed'])) {
-    $form_state['#location_needed'] = FALSE;
-  }
-  $form_state['#zip_needed'] = FALSE;
-
   // Language vars
   $nl_title = '';
   $nl_short_description = '';
@@ -96,27 +83,6 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       }
     }
 
-    // Default location.
-    if ($location = $event->getLocation()) {
-      $address = $location->getAddress()->getPhysicalAddress();
-      if ($location->getCdbId()) {
-        $default_location_id = $location->getCdbId();
-        $default_location_label = $location->getLabel();
-        $form_state['#location_needed'] = FALSE;
-      }
-      else {
-        $form_state['#location_needed'] = TRUE;
-        $custom_location_title = $location->getLabel();
-        $custom_location_street = $address->getStreet();
-        $custom_location_number = $address->getHouseNumber();
-        $custom_location_zip = $address->getZip();
-        $custom_location_country = $address->getCountry();
-        if ($custom_location_country == 'BE') {
-          $custom_location_city = $custom_location_zip . ' ' . $address->getCity();
-        }
-      }
-    }
-
     // Default organiser.
     if ($organiser = $event->getOrganiser()) {
       $default_organiser_label = $organiser->getLabel();
@@ -528,150 +494,9 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     );
   }
 
-  $form['basic']['location'] = array(
-    '#prefix' => '<div id="location-ajax-wrapper">',
-    '#suffix' => '</div>',
-    '#type' => 'container',
-    '#tree' => TRUE,
-  );
-
-  if (!$form_state['#location_needed']) {
-    $form['basic']['location']['actor'] = array(
-      '#tree' => TRUE,
-      '#type' => 'container',
-      '#prefix' => '<div id="known-location-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    $form['basic']['location']['actor']['location_actor_label'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Location'),
-      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions/all',
-      '#required' => FALSE,
-      '#default_value' => isset($default_location_label) ? $default_location_label : '',
-      '#size' => 80,
-    );
-
-    $form['basic']['location']['actor']['location_actor_id'] = array(
-      '#id' => 'location_actor_id',
-      '#type' => 'hidden',
-      '#default_value' => isset($default_location_id) ? $default_location_id : '',
-      '#ajax' => array(
-        'callback' => 'culturefeed_entry_ui_add_more_js',
-        'wrapper' => 'location-ajax-wrapper',
-        'event' => 'location_eventsearch',
-      ),
-      '#attributes' => array(
-        'id' => 'location_actor_id',
-      ),
-    );
-  }
-
-  $form['basic']['location']['new'] = array(
-    '#tree' => TRUE,
-    '#type' => 'container',
-    '#prefix' => '<div id="new-location-wrapper">',
-    '#suffix' => '</div>',
-  );
-
-  if (!$form_state['#location_needed']) {
-    $form['basic']['location']['new']['add_new_location'] = array(
-      '#type' => 'submit',
-      '#name' => 'location_add_more',
-      '#value' => t('Location not found, add location'),
-      '#attributes' => array(
-        'class' => array('add-more-link btn-link'),
-        'style' => array('display:none'),
-      ),
-      '#ajax' => array(
-        'callback' => 'culturefeed_entry_ui_add_more_js',
-        'wrapper' => 'location-ajax-wrapper',
-        'effect' => 'none',
-      ),
-      '#limit_validation_errors' => array(array('location')),
-      '#submit' => array('culturefeed_entry_ui_add_more_submit'),
-    );
-  }
-
-  if ($form_state['#location_needed']) {
-
-    $country = isset($form_state['values']['location']['new']['citywrapper']['country_select']) && $form_state['values']['location']['new']['citywrapper']['country_select'] ? $form_state['values']['location']['new']['citywrapper']['country_select'] : ($custom_location_country ? $custom_location_country : 'BE');
-
-    $default_location_title = $custom_location_title ? $custom_location_title : '';
-    if (isset($form_state['#location_actor_label'])) {
-      $default_location_title = $form_state['#location_actor_label'];
-    }
-    $form['basic']['location']['new']['location_title'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Location Title'),
-      '#default_value' => $default_location_title,
-      '#required' => FALSE,
-      '#size' => 80,
-    );
-
-    $form['basic']['location']['new']['citywrapper'] = array(
-      '#tree' => TRUE,
-      '#type' => 'container',
-      '#prefix' => '<div id="citywrapper-ajax-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    $form['basic']['location']['new']['citywrapper']['country_select'] = array(
-      '#type' => 'select',
-      '#title' => t('Country'),
-      '#options' => country_get_list(),
-      '#default_value' => $custom_location_country ? $custom_location_country : 'BE',
-      '#required' => FALSE,
-      '#ajax' => array(
-        'callback' => 'culturefeed_entry_ui_add_more_js',
-        'wrapper' => 'citywrapper-ajax-wrapper',
-        'effect' => 'none',
-      ),
-    );
-
-    $form['basic']['location']['new']['citywrapper']['zip_code'] = array(
-      '#type' => 'textfield',
-      '#title' => ($country == 'BE') ? '' : t('ZIP Code'),
-      '#default_value' => $custom_location_zip ? $custom_location_zip : '',
-      '#required' => FALSE,
-      '#size' => 10,
-      '#attributes' => array(
-        'style' => array(
-          ($country == 'BE') ? 'display:none;' : 'display:block;margin-right:30px;',
-        ),
-      ),
-    );
-
-    $form['basic']['location']['new']['citywrapper']['city'] = array(
-      '#type' => 'textfield',
-      '#title' => t('City'),
-      '#default_value' => $custom_location_city ? $custom_location_city : '',
-      '#autocomplete_path' => ($country == 'BE') ? 'autocomplete/culturefeed/city-suggestion' : '',
-      '#required' => FALSE,
-      '#size' => 60,
-    );
-
-    $form['basic']['location']['new']['citywrapper']['street'] = array(
-      '#type' => 'textfield',
-      '#title' => ($country == 'BE') ? t('Street') : t('Street and House Number'),
-      '#default_value' => $custom_location_street ? $custom_location_street : '',
-      '#required' => FALSE,
-      '#size' => 60,
-    );
-
-    $form['basic']['location']['new']['citywrapper']['house_number'] = array(
-      '#type' => 'textfield',
-      '#title' => ($country == 'BE') ? t('House Number') : '',
-      '#default_value' => $custom_location_number ? $custom_location_number : '',
-      '#required' => FALSE,
-      '#size' => 10,
-      '#attributes' => array(
-        'style' => array(
-          ($country == 'BE') ? 'display:block;' : 'display:none;',
-        ),
-      ),
-    );
-  }
+  // Location control.
+  form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/form/culturefeed_entry_ui.location');
+  culturefeed_entry_ui_location_form($form, $form_state, $event);
 
   // Date control
   $form['basic']['when'] = array(
@@ -1700,68 +1525,7 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
   }
 
   // Validate location
-  if (isset($form_state['#location_needed']) && $form_state['#location_needed']) {
-    if (empty($values['location']['new']['location_title'])) {
-      form_set_error('location_title', t('A title is required for a custom location'));
-    }
-    /*if ($values['location']['new']['citywrapper']['country_select'] != 'BE') {
-      if (empty($values['location']['new']['citywrapper']['zip_code'])) {
-        form_set_error('basic[zip_code]', t('A zip code is required for a custom location'));
-      }
-    }*/
-    if (empty($values['location']['new']['citywrapper']['city'])) {
-      form_set_error('city', t('A city is required for a custom location'));
-    }
-    else {
-      $available_city = culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE);
-      if (!isset($available_city[$values['location']['new']['citywrapper']['city']])) {
-        form_set_error('location][new][citywrapper][city', t('Please select a city from the list.'));
-      }
-    }
-    $location = NULL;
-  }
-  else {
-    try {
-      if ($values['location']['actor']['location_actor_label'] == '') {
-        form_set_error('location', t('A location is required.'));
-      }
-      else {
-        $location = culturefeed_search_item_load($values['location']['actor']['location_actor_id'], 'actor');
-        if (!$location) {
-          form_set_error('location', t('We could not validate the location'));
-        }
-      }
-    } catch (Exception $e) {
-      form_set_error('location', t('We could not validate the location'));
-    }
-  }
-
-
-  /*if (!empty($values['location']['actor']['location_actor_id'])) {
-
-    try {
-      $location = culturefeed_search_item_load($values['location']['actor']['location_actor_id'], 'actor');
-      if (!$location) {
-        form_set_error('location', t('We could not validate the location'));
-      }
-    } catch (Exception $e) {
-      form_set_error('location', t('We could not validate the location'));
-    }
-  }
-  else {
-    if (empty($values['location']['location_title'])) {
-      form_set_error('location_title', t('A title is required for a custom location'));
-    }
-    if ($values['location']['citywrapper']['country'] != 'BE') {
-      if (empty($values['location']['citywrapper']['zip_code'])) {
-        form_set_error('basic[zip_code]', t('A zip code is required for a custom location'));
-      }
-    }
-    if (empty($values['location']['citywrapper']['city'])) {
-      form_set_error('city', t('A city is required for a custom location'));
-    }
-    $location = NULL;
-  }*/
+  $location = culturefeed_entry_ui_location_form_validate($form, $form_state);
 
   // Validate Links
   $i = 0;
@@ -2210,56 +1974,8 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
 
   $event->setDetails($details);
 
-  // Asset Location / Address.
-  if ($location) {
-    $addresses = $location->getEntity()->getContactInfo()->getAddresses();
-
-    /* @var CultureFeed_Cdb_Data_Address $address */
-    $address = $addresses[0];
-    $location_detail = $location->getEntity()->getDetails()
-      ->getDetailByLanguage(culturefeed_search_get_preferred_language());
-    if (!$location_detail) {
-      $location_detail = $location->getEntity()->getDetails()
-        ->getDetailByLanguage("nl");
-    }
-
-    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
-    $cdb_location->setLabel($location_detail->getTitle());
-    $cdb_location->setCdbid($location->getEntity()->getCdbId());
-    $event->setLocation($cdb_location);
-  }
-  else {
-    $address = new CultureFeed_Cdb_Data_Address();
-    $physical_address = new CultureFeed_Cdb_Data_Address_PhysicalAddress();
-    $physical_address->setStreet($values['location']['new']['citywrapper']['street']);
-    if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
-      $physical_address->setHouseNumber($values['location']['new']['citywrapper']['house_number']);
-    }
-    else {
-      $physical_address->setHouseNumber('');
-    }
-    if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
-      $physical_address->setZip(substr($values['location']['new']['citywrapper']['city'], 0, 4));
-      $physical_address->setCity(substr($values['location']['new']['citywrapper']['city'], 5));
-    }
-    else {
-      $physical_address->setCity($values['location']['new']['citywrapper']['city']);
-      if(empty($values['location']['new']['citywrapper']['zip_code'])) {
-        $physical_address->setZip('0000');  
-      }
-      else {
-        $physical_address->setZip($values['location']['new']['citywrapper']['zip_code']);
-      }
-    }
-    $physical_address->setCountry($values['location']['new']['citywrapper']['country_select']);
-    $address->setLabel($values['location']['new']['location_title']);
-    $address->setPhysicalAddress($physical_address);
-    $address->setLabel($values['location']['new']['location_title']);
-
-    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
-    $cdb_location->setLabel($values['location']['new']['location_title']);
-    $event->setLocation($cdb_location);
-  }
+  // Location.
+  $address = culturefeed_entry_ui_location_form_save($event, $location, $form_state);
 
   // Event organiser.
   if ($organiser) {
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
new file mode 100644
index 00000000..643b05c5
--- /dev/null
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
@@ -0,0 +1,246 @@
+<?php
+
+/**
+ * Contains culturefeed_entry_ui.location.inc.
+ */
+
+/**
+ * Adds the location form element.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The extended event.
+ */
+function culturefeed_entry_ui_location_form(array &$form, array &$form_state, \CultureFeed_Cdb_Item_Event $event = NULL) {
+
+  // Default values.
+  $default_location_id = '';
+  $default_location_label = '';
+  $custom_location_title = '';
+  $custom_location_street = '';
+  $custom_location_number = '';
+  $custom_location_zip = '';
+  $custom_location_city = '';
+  $custom_location_country = '';
+
+  if ($event) {
+
+    // Default location.
+    if ($location = $event->getLocation()) {
+
+      if ($location->getCdbId()) {
+        $default_location_id = $location->getCdbId();
+        $default_location_label = $location->getLabel();
+      }
+      else {
+
+        $address = $location->getAddress()->getPhysicalAddress();
+        $custom_location_title = $location->getLabel();
+        $custom_location_street = $address->getStreet();
+        $custom_location_number = $address->getHouseNumber();
+        $custom_location_zip = $address->getZip();
+        $custom_location_country = $address->getCountry();
+        if ($custom_location_country == 'BE') {
+          $custom_location_city = $custom_location_zip . ' ' . $address->getCity();
+        }
+
+      }
+
+    }
+
+  }
+
+  // Form element.
+  $form['basic']['location'] = array(
+    '#type' => 'culturefeed_location_control',
+    '#default_value' => array(
+      'asset' => array(
+        'id' => $default_location_id,
+        'label' => $default_location_label,
+      ),
+      'custom' => array(
+        'city' => $custom_location_city,
+        'country' => $custom_location_country,
+        'number' => $custom_location_number,
+        'street' => $custom_location_street,
+        'title' => $custom_location_title,
+        'zip' => $custom_location_zip,
+      ),
+    ),
+  );
+
+}
+
+/**
+ * Validation handler for the location.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The location, NULL or \CultuurNet\Search\ActivityStatsExtendedEntity
+ */
+function culturefeed_entry_ui_location_form_validate(array $form, array &$form_state) {
+
+  $values = array(
+    'type' => '',
+    'asset' => array(),
+    'custom' => array(),
+  );
+
+  if (isset($form_state['values']['location']['location_control'])) {
+    $values = $form_state['values']['location']['location_control'];
+  }
+
+  $location = NULL;
+
+  // Custom.
+  if ($values['type'] == 'custom') {
+
+    if (empty($values['custom']['title'])) {
+      form_set_error('location][location_control][custom][title', t('A title is required for a custom location'));
+    }
+
+    if (empty($values['custom']['city'])) {
+      form_set_error('location][location_control][custom][city', t('A city is required for a custom location'));
+    }
+    else {
+
+      // If an existing event is edited, the main city is not shown.
+      $available_cities = culturefeed_search_get_city_suggestions($values['custom']['city'], TRUE);
+      $cities = array();
+      $pattern = '/ \(.*?\)/';
+      foreach ($available_cities as $available_city) {
+        $cities[] = preg_replace($pattern, '', $available_city);
+      }
+      $city = preg_replace($pattern, '', $values['custom']['city']);
+      if (!in_array($city, $cities)) {
+        form_set_error('location[location_control][custom][city', t('Please select a city from the list.'));
+      }
+
+    }
+
+  }
+
+  elseif ($values['type'] == 'asset') {
+
+    try {
+
+      if ($values['asset']['label'] == '') {
+        form_set_error('location', t('A location is required.'));
+      }
+      else {
+        $location = culturefeed_search_item_load($values['asset']['id'], 'actor');
+        if (!$location) {
+          form_set_error('location', t('We could not validate the location'));
+        }
+      }
+
+    }
+
+    catch (Exception $e) {
+      form_set_error('location', t('We could not validate the location'));
+    }
+
+  }
+
+  return $location;
+
+}
+
+/**
+ * Save handler for the location.
+ *
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The event.
+ * @param mixed $location
+ *   NULL or \CultuurNet\Search\ActivityStatsExtendedEntity.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return \CultureFeed_Cdb_Data_Address
+ *   The address.
+ */
+function culturefeed_entry_ui_location_form_save(\CultureFeed_Cdb_Item_Event &$event, $location, array $form_state) {
+
+  $values = array(
+    'type' => '',
+    'asset' => array(),
+    'custom' => array(),
+  );
+
+  if (isset($form_state['values']['location']['location_control'])) {
+    $values = $form_state['values']['location']['location_control'];
+  }
+
+  $address = NULL;
+
+  // Asset Location / Address.
+  if ($location) {
+
+    $addresses = $location->getEntity()->getContactInfo()->getAddresses();
+
+    /* @var CultureFeed_Cdb_Data_Address $address */
+    $address = $addresses[0];
+    $location_detail = $location->getEntity()->getDetails()
+      ->getDetailByLanguage(culturefeed_search_get_preferred_language());
+    if (!$location_detail) {
+      $location_detail = $location->getEntity()->getDetails()
+        ->getDetailByLanguage("nl");
+    }
+
+    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
+    $cdb_location->setLabel($location_detail->getTitle());
+    $cdb_location->setCdbid($location->getEntity()->getCdbId());
+    $event->setLocation($cdb_location);
+  }
+
+  else {
+
+    $address = new CultureFeed_Cdb_Data_Address();
+    $physical_address = new CultureFeed_Cdb_Data_Address_PhysicalAddress();
+
+    // Street and number.
+    $physical_address->setStreet($values['custom']['street']);
+    if ($values['custom']['country'] == 'BE') {
+      $physical_address->setHouseNumber($values['custom']['number']);
+    }
+    else {
+      $physical_address->setHouseNumber('');
+    }
+
+    // Zip and city.
+    if ($values['custom']['country'] == 'BE') {
+      $physical_address->setZip(substr($values['custom']['city'], 0, 4));
+      $physical_address->setCity(substr($values['custom']['city'], 5));
+    }
+    else {
+      $physical_address->setCity($values['custom']['city']);
+      if (empty($values['custom']['zip'])) {
+        $physical_address->setZip('0000');
+      }
+      else {
+        $physical_address->setZip($values['custom']['zip']);
+      }
+    }
+
+    // Country.
+    $physical_address->setCountry($values['custom']['country']);
+
+    $address->setLabel($values['custom']['title']);
+    $address->setPhysicalAddress($physical_address);
+
+    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
+    $cdb_location->setLabel($values['custom']['title']);
+    $event->setLocation($cdb_location);
+
+  }
+
+  return $address;
+
+}
diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
index 1d1effe5..e0aff99c 100644
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
@@ -1,129 +1,151 @@
 jQuery(function($) {
 
-    /**
-     * Fills the suggestion popup with any matches received.
-     */
-    Drupal.jsAC.prototype.found = function (matches) {
-        // If no value in the textfield, do not show the popup.
-        if (!this.input.value.length) {
-            return false;
-        }
+  /**
+   * Fills the suggestion popup with any matches received.
+   */
+  Drupal.jsAC.prototype.found = function (matches) {
 
-        // Prepare matches.
-        var ul = $('<ul class="dropdown-menu"></ul>');
-        var ac = this;
-        ul.css({
-            display: 'block',
-            right: 0
-        });
-        for (key in matches) {
-
-            var value;
-            if (typeof(matches[key]) == "string") {
-                value = matches[key];
-                $('<li></li>')
-                    .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
-                    .mousedown(function () { ac.select(this); })
-                    .mouseover(function () { ac.highlight(this); })
-                    .mouseout(function () { ac.unhighlight(this); })
-                    .data('autocompleteValue', value)
-                    .appendTo(ul);
-            }
-            else if (typeof(matches[key]) == "object") {
-                value = matches[key].locationTitle;
-                $('<li></li>')
-                    .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
-                    .mousedown(function () { ac.select(this); })
-                    .mouseover(function () { ac.highlight(this); })
-                    .mouseout(function () { ac.unhighlight(this); })
-                    .data('autocompleteTitle', matches[key].title)
-                    .data('autocompleteValue', matches[key].key)
-                    .appendTo(ul);
-            }
+    // If no value in the textfield, do not show the popup.
+    if (!this.input.value.length) {
+      return false;
+    }
+
+    // Prepare matches.
+    var ul = $('<ul class="dropdown-menu"></ul>');
+    var ac = this;
+    ul.css({
+      display: 'block',
+      right: 0
+    });
+    for (key in matches) {
+
+      var value;
+
+      if (typeof(matches[key]) == "string") {
+
+        value = matches[key];
+        $('<li></li>')
+          .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
+          .mousedown(function () { ac.select(this); })
+          .mouseover(function () { ac.highlight(this); })
+          .mouseout(function () { ac.unhighlight(this); })
+          .data('autocompleteValue', value)
+          .appendTo(ul);
+
+      }
+      else if (typeof(matches[key]) == "object") {
+
+        value = matches[key].locationTitle;
+        $('<li></li>')
+          .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
+          .mousedown(function () { ac.select(this); })
+          .mouseover(function () { ac.highlight(this); })
+          .mouseout(function () { ac.unhighlight(this); })
+          .data('autocompleteTitle', matches[key].title)
+          .data('autocompleteValue', matches[key].key)
+          .appendTo(ul);
+
+      }
+
+    }
+
+    // Show popup with matches, if any.
+    if (this.popup) {
+
+      if (ul.children().length) {
+
+        $(this.popup).empty().append(ul).show();
+        $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#edit-organiser-add-new-actor').css({ display: 'none' });
+        }
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_custom_add').hide();
         }
 
-        // Show popup with matches, if any.
-        if (this.popup) {
-            if (ul.children().length) {
-                $(this.popup).empty().append(ul).show();
-                $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                    $('#edit-organiser-add-new-actor').css({ display: 'none' });
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-                    $('#edit-location-new-add-new-location').css({ display: 'none' });
-                }
-            }
-            else {
-                $(this.popup).css({ visibility: 'hidden' });
-                this.hidePopup(null, 'empty');
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                    $('#edit-organiser-add-new-actor').css({ display: 'block' });
-                    $('#organiser_actor_id').val('');
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-                    $('#edit-location-new-add-new-location').css({ display: 'block' });
-                    $('#location_actor_id').val('');
-                }
-            }
+      }
+
+      else {
+
+        $(this.popup).css({ visibility: 'hidden' });
+        this.hidePopup(null, 'empty');
+
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#edit-organiser-add-new-actor').css({ display: 'block' });
+          $('#organiser_actor_id').val('');
+        }
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_custom_add').show();
+          $('#location_actor_id').val('');
         }
-    };
 
-    if (Drupal.ACDB) {
-
-        /**
-         * Performs a cached and delayed search.
-         * Custom override: Don't show an error when people are navigation away of the site.
-         *
-         */
-        Drupal.ACDB.prototype.search = function (searchString) {
-            var db = this;
-            searchString = searchString.replace(/^\s+|\s+$/, '');
-            this.searchString = searchString;
-
-            // See if this string needs to be searched for anyway.
-            if (searchString.length <= 0 ||
-              searchString.charAt(searchString.length - 1) == ',') {
-                return;
-            }
+      }
+
+    }
+
+  };
+
+  if (Drupal.ACDB) {
+
+    /**
+     * Performs a cached and delayed search.
+     * Custom override: Don't show an error when people are navigation away of the site.
+     *
+     */
+    Drupal.ACDB.prototype.search = function (searchString) {
+      var db = this;
+      searchString = searchString.replace(/^\s+|\s+$/, '');
+      this.searchString = searchString;
 
-            // See if this key has been searched for before.
-            if (this.cache[searchString]) {
-                return this.owner.found(this.cache[searchString]);
+      // See if this string needs to be searched for anyway.
+      if (searchString.length <= 0 ||
+        searchString.charAt(searchString.length - 1) == ',') {
+        return;
+      }
+
+      // See if this key has been searched for before.
+      if (this.cache[searchString]) {
+        return this.owner.found(this.cache[searchString]);
+      }
+
+      // Initiate delayed search.
+      if (this.timer) {
+        clearTimeout(this.timer);
+      }
+      this.timer = setTimeout(function () {
+
+        db.owner.setStatus('begin');
+
+        // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
+        // encodeURIComponent to allow autocomplete search terms to contain slashes.
+        $.ajax({
+          type: 'GET',
+          url: db.uri + '/' + Drupal.encodePath(searchString),
+          dataType: 'json',
+
+          success: function (matches) {
+            if (typeof matches.status == 'undefined' || matches.status != 0) {
+              db.cache[searchString] = matches;
+              // Verify if these are still the matches the user wants to see.
+              if (db.searchString == searchString) {
+                db.owner.found(matches);
+              }
+              db.owner.setStatus('found');
             }
+          },
 
-            // Initiate delayed search.
-            if (this.timer) {
-                clearTimeout(this.timer);
+          error: function (xmlhttp) {
+            if (xmlhttp.status) {
+              alert(Drupal.ajaxError(xmlhttp, db.uri));
             }
-            this.timer = setTimeout(function () {
-                db.owner.setStatus('begin');
-
-                // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
-                // encodeURIComponent to allow autocomplete search terms to contain slashes.
-                $.ajax({
-                    type: 'GET',
-                    url: db.uri + '/' + Drupal.encodePath(searchString),
-                    dataType: 'json',
-                    success: function (matches) {
-                        if (typeof matches.status == 'undefined' || matches.status != 0) {
-                            db.cache[searchString] = matches;
-                            // Verify if these are still the matches the user wants to see.
-                            if (db.searchString == searchString) {
-                                db.owner.found(matches);
-                            }
-                            db.owner.setStatus('found');
-                        }
-                    },
-                    error: function (xmlhttp) {
-                        if (xmlhttp.status) {
-                            alert(Drupal.ajaxError(xmlhttp, db.uri));
-                        }
-                    }
-                });
-            }, this.delay);
-        };
+          }
 
-    }
+        });
+
+      }, this.delay);
+
+    };
+
+  }
 
 });
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 855fa857..4cefa100 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -8,6 +8,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 (function ($) {
   
   Drupal.behaviors.price = {
+
     attach: function (context, settings) {
     
       $(window).bind('load', function() {
@@ -19,7 +20,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
           $('#edit-price-extra-extra-info').val('');
         }
         else {
-	      //$('#edit-price-amount').val('');
+          //$('#edit-price-amount').val('');
           $('#edit-price-amount').removeAttr('disabled');
           $('#edit-price-amount').css('color','#000');
           $('#edit-price-extra').css('display','block');  
@@ -27,7 +28,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
       });
       
       $('#edit-price-free').change(function () {
-	    if($("#edit-price-free").attr("checked")==true) {
+        if($("#edit-price-free").attr("checked")==true) {
           $('#edit-price-amount').val('0');
           $('#edit-price-amount').attr('disabled','disabled');
           $('#edit-price-amount').css('color','#ccc');
@@ -35,7 +36,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
           $('#edit-price-extra-extra-info').val('');
         }
         else {
-	      $('#edit-price-amount').val('');
+          $('#edit-price-amount').val('');
           $('#edit-price-amount').removeAttr('disabled');
           $('#edit-price-amount').css('color','#000');
           $('#edit-price-extra').css('display','block');  
@@ -43,188 +44,222 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
       });
       
       $('#edit-location-actor-location-actor-label').change(function() {
-        if($('#edit-location-actor-location-actor-label').val() == '') {
-	      $('#location_actor_id').val('');
+        if($("[name='location[location_control][asset][label]']").val() == '') {
+          $('#location_actor_id').val('');
         }
       });
       
       $('#edit-organiser-actor-organiser-actor-label').change(function() {
         if($('#edit-organiser-actor-organiser-actor-label').val() == '') {
-	      $('#organiser_actor_id').val('');
+          $('#organiser_actor_id').val('');
         }
       });
-      
-	}
+
+    }
 
   };
 
-    /**
-     * Maxlength
-     */
-    Drupal.behaviors.maxlength = {
-        attach: function (context, settings) {
-            $('#edit-description-sd-short-description').maxlength({
-                max: 400,
-                feedbackTarget: '#edit-description-sd .help-block, #edit-description-sd .description'
-            });
-        }
+  /**
+   * Maxlength
+   */
+  Drupal.behaviors.maxlength = {
+
+    attach: function (context, settings) {
+      $('#edit-description-sd-short-description').maxlength({
+        max: 400,
+        feedbackTarget: '#edit-description-sd .help-block, #edit-description-sd .description'
+      });
     }
 
-    /**
-    * Fire the autocomplete on paste.
-    */
-    Drupal.behaviors.autocomplete_paste = {
-        attach: function () {
-            $('input.form-autocomplete, .form-autocomplete input.form-text').bind("input propertychange", function (event) {
-              $(this).trigger('keyup');
-            });
-        }
+  }
+
+  /**
+   * Fire the autocomplete on paste.
+   */
+  Drupal.behaviors.autocomplete_paste = {
+
+    attach: function () {
+      $('input.form-autocomplete, .form-autocomplete input.form-text').bind("input propertychange", function (event) {
+        $(this).trigger('keyup');
+      });
     }
 
-    /**
-     * Hides the autocomplete suggestions.
-     */
-    Drupal.jsAC.prototype.hidePopup = function (keycode, op) {
-
-        // Select item if the right key or mousebutton was pressed.
-        if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
-            if ($(this.selected).data('autocompleteTitle') != undefined) {
-
-                this.input.value = $(this.selected).data('autocompleteTitle');
-                
-                if (this.input.name == 'location[actor][location_actor_label]') {
-				  $('#location_actor_id').val($(this.selected).data('autocompleteValue'));
-				}
-		  
-				if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-				  $('#organiser_actor_id').val($(this.selected).data('autocompleteValue'));
-				}
-            }
-            else {
-                this.input.value = $(this.selected).data('autocompleteValue');
-            }
+  }
 
-        }
+  /**
+   * Hides the autocomplete suggestions.
+   */
+  Drupal.jsAC.prototype.hidePopup = function (keycode, op) {
 
-        // Hide popup.
-        var popup = this.popup;
-        if (popup) {
-            this.popup = null;
-            $(popup).fadeOut('fast', function () {
-                $(popup).remove();
-            });
+    // Select item if the right key or mousebutton was pressed.
+    if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
+
+      if ($(this.selected).data('autocompleteTitle') != undefined) {
+
+        this.input.value = $(this.selected).data('autocompleteTitle');
+
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_actor_id').val($(this.selected).data('autocompleteValue'));
+          $('#location_asset_remove').show();
+          $(this.input).attr('readonly', 'readonly');
         }
-        this.selected = false;
-        $(this.ariaLive).empty();
 
-        // Workaround for bootstrap losing tabindex on autocomplete popup.
-        if ((!op || op != 'empty') && this.input.value) {
-            $(this.input).parents('.form-item').next().find(':tabbable').focus();
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#organiser_actor_id').val($(this.selected).data('autocompleteValue'));
         }
 
+      }
 
-    };
+      else {
+        this.input.value = $(this.selected).data('autocompleteValue');
+      }
 
-    /**
-     * Fills the suggestion popup with any matches received.
-     */
-    Drupal.jsAC.prototype.found = function (matches) {
-        // If no value in the textfield, do not show the popup.
-        if (!this.input.value.length) {
-		    return false;
-        }
+    }
 
-        // Prepare matches.
-        var ul = $('<ul></ul>');
-        var ac = this;
-        for (key in matches) {
-            var row = matches[key];
-            if (typeof(row) == "string") {
-                $('<li></li>')
-                    .html($('<div></div>').html(matches[key]))
-                    .mousedown(function () {
-                        ac.select(this);
-                    })
-                    .mouseover(function () {
-                        ac.highlight(this);
-                    })
-                    .mouseout(function () {
-                        ac.unhighlight(this);
-                    })
-                    .data('autocompleteValue', key)
-                    .appendTo(ul);
-            }
-            else if (typeof(row) == "object") {
-                $('<li></li>')
-                    .html($('<div></div>').html(row.locationTitle))
-                    .mousedown(function () {
-                        ac.select(this);
-                    })
-                    .mouseover(function () {
-                        ac.highlight(this);
-                    })
-                    .mouseout(function () {
-                        ac.unhighlight(this);
-                    })
-                    .data('autocompleteTitle', row.title)
-                    //.data('autocompleteLocationTitle', 'TEST')
-                    .data('autocompleteValue', row.key)
-                    .appendTo(ul);
-            }
-        }
+    // Hide popup.
+    var popup = this.popup;
+    if (popup) {
+
+      this.popup = null;
+      $(popup).fadeOut('fast', function () {
+        $(popup).remove();
+      });
+
+    }
+    this.selected = false;
+    $(this.ariaLive).empty();
+
+    // Workaround for bootstrap losing tabindex on autocomplete popup.
+    if ((!op || op != 'empty') && this.input.value) {
+      $(this.input).parents('.form-item').next().find(':tabbable').focus();
+    }
+
+  };
+
+  /**
+   * Fills the suggestion popup with any matches received.
+   */
+  Drupal.jsAC.prototype.found = function (matches) {
+
+    // If no value in the textfield, do not show the popup.
+    if (!this.input.value.length) {
+      return false;
+    }
 
-        // Show popup with matches, if any.
-        if (this.popup) {
-            if (ul.children().length) {
-                $(this.popup).empty().append(ul).show();
-                $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                  $('#edit-organiser-add-new-actor').css({ display: 'none' });
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-	              $('#edit-location-new-add-new-location').css({ display: 'none' });  
-                }
-            }
-            else {
-                $(this.popup).css({ visibility: 'hidden' });
-                this.hidePopup();
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                  $('#edit-organiser-add-new-actor').css({ display: 'block' });
-                  $('#organiser_actor_id').val('');
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-	              $('#edit-location-new-add-new-location').css({ display: 'block' });
-	              $('#location_actor_id').val('');  
-                }
-            }
+    // Prepare matches.
+    var ul = $('<ul></ul>');
+    var ac = this;
+    for (key in matches) {
+
+      var row = matches[key];
+
+      if (typeof(row) == "string") {
+
+        $('<li></li>')
+          .html($('<div></div>').html(matches[key]))
+          .mousedown(function () {
+            ac.select(this);
+          })
+          .mouseover(function () {
+            ac.highlight(this);
+          })
+          .mouseout(function () {
+            ac.unhighlight(this);
+          })
+          .data('autocompleteValue', key)
+          .appendTo(ul);
+
+      }
+
+      else if (typeof(row) == "object") {
+
+        $('<li></li>')
+          .html($('<div></div>').html(row.locationTitle))
+          .mousedown(function () {
+            ac.select(this);
+          })
+          .mouseover(function () {
+            ac.highlight(this);
+          })
+          .mouseout(function () {
+            ac.unhighlight(this);
+          })
+          .data('autocompleteTitle', row.title)
+          .data('autocompleteValue', row.key)
+          .appendTo(ul);
+
+      }
+
+    }
+
+    // Show popup with matches, if any.
+    if (this.popup) {
+
+      if (ul.children().length) {
+
+        $(this.popup).empty().append(ul).show();
+        $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
+
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#edit-organiser-add-new-actor').css({ display: 'none' });
         }
-    };
-
-    /**
-     * Puts the currently highlighted suggestion into the autocomplete field.
-     */
-    Drupal.jsAC.prototype.select = function (node) {
-        if ($(node).data('autocompleteTitle') != undefined) {
-          this.input.value = $(node).data('autocompleteTitle');
-          
-          if (this.input.name == 'location[actor][location_actor_label]') {
-		    $('#location_actor_id').val($(node).data('autocompleteValue'));
-		  }
-		  
-		  if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-		    $('#organiser_actor_id').val($(node).data('autocompleteValue'));
-		  }
-		  
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_custom_add').hide();
         }
-        else {
-            this.input.value = $(node).data('autocompleteValue');
+
+      }
+
+      else {
+
+        $(this.popup).css({ visibility: 'hidden' });
+        this.hidePopup();
+
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#edit-organiser-add-new-actor').css({ display: 'block' });
+          $('#organiser_actor_id').val('');
         }
-    };
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_custom_add').show();
+          $('#location_actor_id').val('');
+        }
+
+      }
+
+    }
+
+  };
+
+  /**
+   * Puts the currently highlighted suggestion into the autocomplete field.
+   */
+  Drupal.jsAC.prototype.select = function (node) {
+
+    if ($(node).data('autocompleteTitle') != undefined) {
+
+      this.input.value = $(node).data('autocompleteTitle');
+          
+      if (this.input.name == 'location[location_control][asset][label]') {
+        $('#location_actor_id').val($(node).data('autocompleteValue'));
+        $('#location_asset_remove').show();
+        $(this.input).attr('readonly', 'readonly');
+      }
+
+      if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+        $('#organiser_actor_id').val($(node).data('autocompleteValue'));
+      }
+
+    }
+
+    else {
+      this.input.value = $(node).data('autocompleteValue');
+    }
+
+  };
 
   /**
    * Performs a cached and delayed search.
    */
-  Drupal.ACDB.prototype.search = function (searchString) {console.log(searchString);
+  Drupal.ACDB.prototype.search = function (searchString) {
     var db = this;
     searchString = searchString.replace(/^\s+|\s+$/, '');
     this.searchString = searchString;

From 7be1758961ea73386909f254db37e86be280c264 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 25 Feb 2015 08:47:05 +0100
Subject: [PATCH 048/275] MSS-119 punt 4 ensure other changes still work

---
 .../culturefeed_location_control/form/location_control.inc  | 1 +
 .../includes/culturefeed_entry_ui.pages.inc                 | 2 +-
 .../includes/form/culturefeed_entry_ui.location.inc         | 2 +-
 culturefeed_entry_ui/js/culturefeed_entry_ui.js             | 6 +++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc b/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
index f62e4e5c..e212373d 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
@@ -48,6 +48,7 @@ function culturefeed_location_control_location_control_process(array $element, a
 
   $element['location_control'] = array(
     '#attributes' => array(
+      'class' => array('clearfix'),
       'id' => $element['#id'] . '-ajax-wrapper',
     ),
     '#type' => 'container',
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 217edbde..5defd9e3 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -350,7 +350,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   // Eventtypes
   $form['basic']['what'] = array(
     '#type' => 'container',
-    '#prefix' => '<div id="what-ajax-wrapper">',
+    '#prefix' => '<div id="what-ajax-wrapper" class="clearfix">',
     '#suffix' => '</div>'
   );
 
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
index 643b05c5..17739922 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
@@ -120,7 +120,7 @@ function culturefeed_entry_ui_location_form_validate(array $form, array &$form_s
       }
       $city = preg_replace($pattern, '', $values['custom']['city']);
       if (!in_array($city, $cities)) {
-        form_set_error('location[location_control][custom][city', t('Please select a city from the list.'));
+        form_set_error('location][location_control][custom][city', t('Please select a city from the list.'));
       }
 
     }
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 4cefa100..7637fe45 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -131,7 +131,11 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 
     // Workaround for bootstrap losing tabindex on autocomplete popup.
     if ((!op || op != 'empty') && this.input.value) {
-      $(this.input).parents('.form-item').next().find(':tabbable').focus();
+
+      var inputs = $(this.input).closest('form').find(':input:visible');
+      var index = inputs.index($(this.input));
+      inputs.eq(index + 1).focus();
+
     }
 
   };

From 644331958ff562e6af6448259ab5df3708d75898 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 26 Feb 2015 15:34:43 +0100
Subject: [PATCH 049/275] PWK-237 fix problem with lower cities

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index f7aa8738..3ee4b8dc 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1714,8 +1714,8 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
       form_set_error('location][new][citywrapper][city', t('A city is required for a custom location'));
     }
     if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
-      $available_city = culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE);
-      if (!isset($available_city[$values['location']['new']['citywrapper']['city']])) {
+      $available_city = array_change_key_case(culturefeed_search_get_city_suggestions($values['location']['new']['citywrapper']['city'], TRUE));
+      if (!isset($available_city[strtolower($values['location']['new']['citywrapper']['city'])])) {
         form_set_error('location][new][citywrapper][city', t('A valid city is required for a custom location.'));
       }
     }

From 57bd831563ba2ef2ea35cb1664f2ee151a0f819a Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Mon, 2 Mar 2015 11:21:27 +0100
Subject: [PATCH 050/275] fix bug for anonymous users

---
 culturefeed_entry_ui/culturefeed_entry_ui.module | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 91680f66..f9e330d5 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -140,10 +140,12 @@ function culturefeed_entry_ui_menu_local_tasks_alter(&$data, $router_item, $root
   }
   
   $culturefeed_user = DrupalCultureFeed::getLoggedInUser();
-  $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($culturefeed_user->id, $culturefeed_user->mbox, array('ids' => $event->getId()));
+  if ($culturefeed_user) {
+    $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($culturefeed_user->id, $culturefeed_user->mbox, array('ids' => $event->getId()));
+  }
   
   // Add tab for editing the event.
-  if (user_access('edit culturefeed events') && ($event->getEntity()->getCreatedBy() == $culturefeed_user->mbox || $ubd_permission[$event->getId()] == 'true')) {
+  if (user_access('edit culturefeed events') && ($event->getEntity()->getCreatedBy() == $culturefeed_user->mbox || (isset($ubd_permission) && $ubd_permission[$event->getId()] == 'true'))) {
 
     $link = array(
       'href' => $path . '/edit',

From b9799291e35a5e9678b7e83242914d20ed10fab2 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 5 Mar 2015 16:16:30 +0100
Subject: [PATCH 051/275] UPS-1604 get only permanent card systems in
 promotions list

---
 culturefeed_uitpas/includes/profile_advantages.inc | 4 ++--
 culturefeed_uitpas/includes/profile_promotions.inc | 5 +++--
 culturefeed_uitpas/includes/promotions.inc         | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/culturefeed_uitpas/includes/profile_advantages.inc b/culturefeed_uitpas/includes/profile_advantages.inc
index 4035fbbb..957c052e 100644
--- a/culturefeed_uitpas/includes/profile_advantages.inc
+++ b/culturefeed_uitpas/includes/profile_advantages.inc
@@ -20,7 +20,7 @@ function culturefeed_uitpas_profile_advantages_get() {
   if ($uitpas_user->user && $uitpas_user->passholder) {
 
     $card_system_id = variable_get('culturefeed_uitpas_cardsystem_id');
-    $uitpas_number = 0;
+
     if ($card_system_id && isset($uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber)) {
       $uitpas_number = $uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber;
     }
@@ -49,7 +49,7 @@ function culturefeed_uitpas_profile_advantages_get() {
     drupal_set_title(format_plural($uitpas_user->passholder->points, $singular, $plural), PASS_THROUGH);
 
   }
-  
+
   // Solution csdco on from https://www.drupal.org/node/1049354
   $_GET['q'] = 'promotions';
 
diff --git a/culturefeed_uitpas/includes/profile_promotions.inc b/culturefeed_uitpas/includes/profile_promotions.inc
index 30bc0705..3e9a5adb 100644
--- a/culturefeed_uitpas/includes/profile_promotions.inc
+++ b/culturefeed_uitpas/includes/profile_promotions.inc
@@ -20,7 +20,7 @@ function culturefeed_uitpas_profile_promotions_get($filter = NULL) {
   if ($uitpas_user->user && $uitpas_user->passholder) {
 
     $card_system_id = variable_get('culturefeed_uitpas_cardsystem_id');
-    $uitpas_number = 0;
+
     if ($card_system_id && isset($uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber)) {
       $uitpas_number = $uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber;
     }
@@ -128,7 +128,8 @@ function culturefeed_uitpas_profile_promotions_filter_sort($form, $form_state) {
   );
 
 	$cf = DrupalCultureFeed::getConsumerInstance();
-	$card_systems = $cf->uitpas()->getCardSystems();
+	$kind_of_card_systems = 'permanent';
+	$card_systems = $cf->uitpas()->getCardSystems($kind_of_card_systems);
 
   $options = array();
 	foreach ($card_systems as $system) {
diff --git a/culturefeed_uitpas/includes/promotions.inc b/culturefeed_uitpas/includes/promotions.inc
index 3f35a7f7..8c8be13f 100644
--- a/culturefeed_uitpas/includes/promotions.inc
+++ b/culturefeed_uitpas/includes/promotions.inc
@@ -145,8 +145,8 @@ function culturefeed_uitpas_promotions_filter_sort($form, $form_state) {
   );
 
   $cf = DrupalCultureFeed::getConsumerInstance();
-
-  $card_systems = $cf->uitpas()->getCardSystems();
+	$kind_of_card_systems = 'permanent';
+  $card_systems = $cf->uitpas()->getCardSystems($kind_of_card_systems);
 
   $options = array();
   foreach ($card_systems as $system) {

From 7d1c40300f49fdc3922de21ef393ed5b1c836295 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 12 Mar 2015 12:29:35 +0100
Subject: [PATCH 052/275] put some countable data in the timestamp array

---
 culturefeed_agenda/includes/helpers.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index baca80a8..d6e3d5d5 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -600,6 +600,8 @@ function culturefeed_agenda_parse_timestamps($timestamps) {
       $timestamps_array[$current_timestamp] = array(
         'day' => date('D', strtotime($date)),
         'date' => date('d/m', strtotime($date)),
+				'year' => date('Y', strtotime($date)),
+				'countable_date' => date('Y-m-d', strtotime($date)),
       );
       if ($timestamp->getStartTime()) {
         $timestamps_array[$current_timestamp]['begintime'] = date('H:i', strtotime($timestamp->getStartTime()));

From 2c0e7cbe25c91c9fff513e2aefa48d63a030a81e Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 12 Mar 2015 14:16:32 +0100
Subject: [PATCH 053/275] MSS-135 fix paging in ajax

---
 culturefeed_uitpas/includes/promotions.inc | 46 ++++++++--------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/culturefeed_uitpas/includes/promotions.inc b/culturefeed_uitpas/includes/promotions.inc
index 3f35a7f7..41193af4 100644
--- a/culturefeed_uitpas/includes/promotions.inc
+++ b/culturefeed_uitpas/includes/promotions.inc
@@ -57,42 +57,17 @@ function culturefeed_uitpas_promotions_get($filter = NULL) {
       }
     }
 
-    $tmp_q = $_GET['q']; // Store the current value of $_GET['q'].
-    $_GET['q'] = 'my/custom/callback'; // Change the value of $_GET['q'] to the "correct" path you want the pager to link to.
-
-    pager_default_initialize($result->total, $promotions_max);
-
-
-    $_GET['q'] = $tmp_q; // Return $_GET['q'] to the proper value.
-
   }
   catch (Exception $e) {
 
     watchdog_exception('culturefeed_uitpas_promotions', $e);
-    pager_default_initialize(0, $promotions_max);
-
-  }
 
-  // Solution csdco on from https://www.drupal.org/node/1049354
-  $_GET['q'] = 'promotions';
-
-  $promotions_pager_min = ($promotions_page * $promotions_max) + 1;
-  $promotions_pager_max = ($promotions_page * $promotions_max) + $promotions_max;
-  if ($promotions_pager_max > $promotions_total) {
-    $promotions_pager_max = $promotions_total;
   }
 
   return array(
-    array(
-      '#theme' => 'culturefeed_uitpas_promotions',
-      '#promotions' => $promotions,
-      '#promotions_total' => $promotions_total,
-      '#promotions_pager_min' => $promotions_pager_min,
-      '#promotions_pager_max' => $promotions_pager_max,
-    ),
-    array(
-      '#theme' => 'pager',
-    ),
+    '#theme' => 'culturefeed_uitpas_promotions',
+    '#promotions' => $promotions,
+    '#promotions_total' => $promotions_total,
   );
 
 }
@@ -148,6 +123,8 @@ function culturefeed_uitpas_promotions_filter_sort($form, $form_state) {
 
   $card_systems = $cf->uitpas()->getCardSystems();
 
+  $filter = isset($form_state['values']['filter']) ? $form_state['values']['filter'] : (isset($_GET['filter']) ? $_GET['filter'] : NULL);
+
   $options = array();
   foreach ($card_systems as $system) {
     $options[$system->id] = $system->name;
@@ -171,15 +148,26 @@ function culturefeed_uitpas_promotions_filter_sort($form, $form_state) {
     ),
   );
 
-  $filter = isset($form_state['values']['filter']) ? $form_state['values']['filter'] : NULL;
   $results = culturefeed_uitpas_promotions_get($filter);
   $form['promotions']['result'] = array(
     '#markup' => drupal_render($results),
   );
 
+  // Pager.
+  $promotions_max = variable_get('culturefeed_uitpas_promotions_promotions_max', 20);
+
+  pager_default_initialize($results['#promotions_total'], $promotions_max);
+
+  // Solution csdco on from https://www.drupal.org/node/1049354
+  $tmp_q = $_GET['q'];
+  $_GET['q'] = 'promotions';
+  $form['promotions']['pager']['#markup'] = theme('pager', array('parameters' => array('filter' => $filter)));
+  $_GET['q'] = $tmp_q;
+
   $form['promotions']['#attached']['css'][] = drupal_get_path('module', 'culturefeed_uitpas') . '/css/culturefeed_uitpas.css';
 
   return $form;
+
 }
 
 function culturefeed_uitpas_promotions_ajax_callback($form, $form_state) {

From 7989ba2e22d99acc39ef1cbeb1be39b806760d71 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Mon, 16 Mar 2015 15:28:02 +0100
Subject: [PATCH 054/275] PWK-242, PWK-243 raw keywords and block of events of
 organiser.

---
 culturefeed_agenda/culturefeed_agenda.module  | 28 ++++++++++++
 culturefeed_agenda/includes/blocks.inc        | 43 +++++++++++++++++++
 ...ulturefeed-agenda-organiser-events.tpl.php | 15 +++++++
 culturefeed_agenda/theme/theme.inc            | 38 +++++++++++++++-
 4 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 9686708f..15cfbc2d 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -134,6 +134,13 @@ function culturefeed_agenda_theme() {
     'file' => 'theme.inc',
   );
 
+	$theme['culturefeed_agenda_organiser_events'] = array(
+		'variables' => array('items' => array(), 'organiser' => NULL),
+		'template' => 'culturefeed-agenda-organiser-events',
+		'path' => $path,
+		'file' => 'theme.inc',
+	);
+
   return $theme;
 
 }
@@ -384,6 +391,11 @@ function culturefeed_agenda_block_info() {
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
 
+	$blocks['agenda-organiser-events'] = array(
+		'info' => t('Culturefeed agenda: Organiser events'),
+		'cache' => DRUPAL_CACHE_PER_PAGE,
+	);
+
   return $blocks;
 
 }
@@ -589,6 +601,14 @@ function culturefeed_agenda_block_configure($delta) {
     );
 
   }
+	elseif ($delta == 'agenda-organiser-events') {
+		$form['agenda_organiser_event_amount'] = array(
+			'#title' => t('Amount of results to show'),
+			'#type' => 'textfield',
+			'#default_value' => variable_get('agenda_organiser_event_amount', 10),
+			'#description' => t('Enter the number of results to show in the block.'),
+		);
+	}
 
   return $form;
 
@@ -643,6 +663,11 @@ function culturefeed_agenda_block_save($delta, $edit) {
 
   }
 
+	elseif ($delta == 'agenda-organiser-events') {
+
+		variable_set('agenda_organiser_event_amount', $edit['agenda_organiser_event_amount']);
+	}
+
 }
 
 /**
@@ -673,6 +698,9 @@ function culturefeed_agenda_block_view($delta) {
 
     case  'agenda-event-types':
       return culturefeed_agenda_block_event_types();
+
+		case 'agenda-organiser-events':
+			return culturefeed_agenda_block_organiser_events();
   }
 
   return $block;
diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
index 971d2956..25cbd2a9 100644
--- a/culturefeed_agenda/includes/blocks.inc
+++ b/culturefeed_agenda/includes/blocks.inc
@@ -265,6 +265,49 @@ function culturefeed_agenda_search_block_form_submit($form, &$form_state) {
 
 }
 
+function culturefeed_agenda_block_organiser_events() {
+	$item = culturefeed_agenda_get_active_object();
+	if (!$item || $item->getType() == 'actor') {
+		return;
+	}
+
+	$organiser_id = $item->getEntity()->getOrganiser()->getCdbid();
+	$amount = variable_get('agenda_organiser_event_amount', 10);
+
+	$parameters = array();
+	$parameters[] = new \CultuurNet\Search\Parameter\Query('organiser_cdbid:' . $organiser_id);
+	$parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event OR type:production');
+	$parameters[] = new \CultuurNet\Search\Parameter\Group();
+	$parameters[] = new \CultuurNet\Search\Parameter\Rows($amount);
+
+	try {
+
+		$result = culturefeed_get_search_service()->search($parameters);
+
+		if ($result->getTotalCount() == 0) {
+			return;
+		}
+
+	}
+	catch (Exception $e) {
+		watchdog_exception('culturefeed_agenda', $e);
+		return;
+	}
+
+	$content = array(
+		'#theme' => 'culturefeed_agenda_organiser_events',
+		'#organiser' => $item->getEntity()->getOrganiser(),
+		'#items' => $result->getItems(),
+	);
+
+	$block = array(
+		'subject' => '',
+		'content' => $content,
+	);
+
+	return $block;
+}
+
 /**
  * Show the upcoming program of current actor.
  */
diff --git a/culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php
new file mode 100644
index 00000000..92df2ea3
--- /dev/null
+++ b/culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @file
+ * Actor program file.
+ */
+?>
+
+<?php if (!empty($items)): ?>
+	<ul>
+  <?php foreach ($items as $item): ?>
+  	<li><?php print $item ?></li>
+  <?php endforeach;?>
+	</ul>
+	<p><?php print t('More of ') . $organiser_link; ?></p>
+<?php endif; ?>
diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 2b89b4e5..ba38a67c 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -313,10 +313,12 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
 
   $keywords = $cdb_item->getKeywords();
   $variables['keywords'] = '';
-  if ($keywords) {
 
+  if ($keywords) {
+		$variables['raw_keywords'] = array();
     $linked_keywords = array();
     foreach ($keywords as $keyword) {
+			$variables['raw_keywords'][] = $keyword;
       $linked_keywords[] = l($keyword, 'agenda/search', array('query' => array('keyword' => urlencode($keyword))));
     }
 
@@ -973,3 +975,37 @@ function theme_culturefeed_agenda_search_block_field_settings($variables) {
   return theme('table', $table_variables);
 
 }
+
+/**
+ * Preprocess the agenda organiser events block.
+ */
+function culturefeed_agenda_preprocess_culturefeed_agenda_organiser_events(&$variables) {
+	$items = array();
+	foreach ($variables['items'] as $item) {
+		/*$items[] = theme('culturefeed_agenda_organiser_events_item', array(
+			'item' => $item,
+		));*/
+		$type = $item->getType();
+		if ($type == 'event') {
+			$type = 'e';
+		}
+		else if ($type == 'production') {
+			$type = 'p';
+		}
+
+		$event = $item->getEntity();
+		$event_detail = $event->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
+
+		$title = $event_detail->getTitle();
+		$cdbid = $event->getCdbid();
+
+		$items[] = '<a href="/agenda/' . $type . '/slug/' . $cdbid . '">' . $title . '</a>';
+	}
+	$variables['items'] = $items;
+
+	$organiser = $variables['organiser']->getLabel();
+	$organiser_id = $variables['organiser']->getCdbid();
+	$variables['organiser_link'] = '<a href="/agenda/a/' . $organiser . '/' . $organiser_id . '">' . $organiser . '</a>';
+
+
+}

From d6d1f33703d4a848b5cd33112a5f9620b43382ae Mon Sep 17 00:00:00 2001
From: Jochen Stals <stalski@322618.no-reply.drupal.org>
Date: Mon, 23 Mar 2015 15:13:39 +0100
Subject: [PATCH 055/275] added culturefeed-agenda-event-types.tpl.

---
 .../culturefeed-agenda-event-types.tpl.php    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php

diff --git a/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php
new file mode 100644
index 00000000..ee24288e
--- /dev/null
+++ b/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @vars
+ *   - $items: multi-level array with children as key for the children.
+ */
+
+?>
+
+<?php foreach ($items as $tid => $item) : ?>
+
+  <h2><?php print $item['item']->name; ?></h2>
+  <?php if (!empty($item['children'])): ?>
+  <ul>
+  <?php foreach ($item['children'] as $child_tid => $child_item) : ?>
+  <li><?php print l($child_item['item']->name, 'agenda/search', array('query' => array('facet' => array('category_eventtype_id' => array($child_item['item']->tid))))); ?></li>
+  <?php endforeach; ?>
+  </ul>
+  <?php endif; ?>
+
+<?php endforeach; ?>

From 9d80995bcca0d55d5bb019998000686737508dc6 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Mon, 23 Mar 2015 15:38:20 +0100
Subject: [PATCH 056/275] UIV-1063 related activities settings, merge sort and
 sort direction into one field

---
 culturefeed_agenda/culturefeed_agenda.module | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 1672d02a..3596c023 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -424,20 +424,10 @@ function culturefeed_agenda_block_configure($delta) {
     $form['agenda_related_activities_sort'] = array(
       '#title' => t('Sort field'),
       '#type' => 'textfield',
-      '#default_value' => variable_get('agenda_related_activities_sort'),
+      '#default_value' => variable_get('agenda_related_activities_sort') . (!empty(variable_get('agenda_related_activities_sort_direction')) ? ' ' . variable_get('agenda_related_activities_sort_direction') : ''),
       '#description' => t('Field to sort on. Example startdate'),
     );
 
-    $form['agenda_related_activities_sort_direction'] = array(
-      '#title' => t('Sort direction'),
-      '#type' => 'select',
-      '#options' => array(
-        \CultuurNet\Search\Parameter\Sort::DIRECTION_ASC => t('Ascending'),
-        \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC => t('Descending'),
-      ),
-      '#default_value' => variable_get('agenda_related_activities_sort_direction', 'asc'),
-    );
-
     $form['agenda_related_activities_total_items'] = array(
       '#title' => t('Items to show'),
       '#type' => 'textfield',
@@ -605,7 +595,7 @@ function culturefeed_agenda_block_save($delta, $edit) {
     variable_set('agenda_related_activities_range', $edit['agenda_related_activities_range']);
     variable_set('agenda_related_activities_extra_query', $edit['agenda_related_activities_extra_query']);
     variable_set('agenda_related_activities_sort', $edit['agenda_related_activities_sort']);
-    variable_set('agenda_related_activities_sort_direction', $edit['agenda_related_activities_sort_direction']);
+    variable_set('agenda_related_activities_sort_direction', '');
     variable_set('agenda_related_activities_total_items', $edit['agenda_related_activities_total_items']);
 
   }

From a981271ee62b290bc2c09dbc9161a1a47dcc3924 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 26 Mar 2015 14:13:58 +0100
Subject: [PATCH 057/275] PWK-252 fix actor suggestions

---
 culturefeed_search/includes/pages.inc         | 48 ++++++-------------
 .../DrupalCultureFeedSearchService_Cache.php  |  4 +-
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/culturefeed_search/includes/pages.inc b/culturefeed_search/includes/pages.inc
index dc55974e..a23e507a 100644
--- a/culturefeed_search/includes/pages.inc
+++ b/culturefeed_search/includes/pages.inc
@@ -19,42 +19,22 @@ function culturefeed_search_suggestions_autocomplete_page($search_string, $past
     try {
 
       $types = !empty($type) ? array($type) : array();
+      $extra_parameters[] = !empty($all) ? new \CultuurNet\Search\Parameter\Parameter('admin','true') : array();
       
-      if (!$all) {
-        // Get the list of suggestions from service.
-        $suggestions = culturefeed_get_search_service()->searchSuggestions($search_string, $types, $past);
-        if ($suggestions->hasSuggestions()) {
-          foreach ($suggestions as $suggestion) {
-            $title = $location_title = check_plain($suggestion->getTitle());
-            $location = $suggestion->getLocation();
-            if (!empty($location)) {
-              $location_title .= ' - <small class="muted">(' . $location . ')<small>';
-            }
-            $object = new stdClass();
-            $object->title = $title;
-            $object->key = $suggestion->getCdbId();
-            $object->locationTitle = $location_title;
-            $matches[$suggestion->getCdbId()] = $object;
-          }
-        }
-      }
-      else {
-        $client = new Client();
-        $client->setDefaultHeaders(array('Accept' => 'application/json'));
-        $body = json_decode($client->get('http://search-prod.lodgon.com/search/rest/search/suggest/item?title=' . $search_string . '&fq=type:actor%20asset:true')->send()->getBody(TRUE));
-        if ($body->suggestions) {
-          foreach ($body->suggestions as $suggestion) {
-            $title = $location_title = check_plain($suggestion->value);
-            $location = $suggestion->zipcode;
-            if (!empty($location)) {
-              $location_title .= ' - <small class="muted">(' . $location . ')<small>';
-            }
-            $object = new stdClass();
-            $object->title = $title;
-            $object->key = $suggestion->cdbid;
-            $object->locationTitle = $location_title;
-            $matches[$suggestion->cdbid] = $object;
+      // Get the list of suggestions from service.
+      $suggestions = culturefeed_get_search_service()->searchSuggestions($search_string, $types, $past, $extra_parameters);
+      if ($suggestions->hasSuggestions()) {
+        foreach ($suggestions as $suggestion) {
+          $title = $location_title = check_plain($suggestion->getTitle());
+          $location = $suggestion->getLocation();
+          if (!empty($location)) {
+            $location_title .= ' - <small class="muted">(' . $location . ')<small>';
           }
+          $object = new stdClass();
+          $object->title = $title;
+          $object->key = $suggestion->getCdbId();
+          $object->locationTitle = $location_title;
+          $matches[$suggestion->getCdbId()] = $object;
         }
       }
 
diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
index 2fe7f12b..79285f71 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
@@ -129,12 +129,12 @@ public function searchPages($parameters = array()) {
    */
   public function searchSuggestions($search_string, $types = array(), $past = FALSE, $extra_parameters = array()) {
 
-    $cid = sprintf('suggestions:%s', md5($search_string . implode('|', $types) . $past));
+    $cid = sprintf('suggestions:%s', md5($search_string . implode('|', $types) . $past . implode('|', $extra_parameters)));
     if ($cache = $this->cacheGet($cid)) {
       return $cache->data;
     }
 
-    $suggestions = $this->realSearchService->searchSuggestions($search_string, $types, $past);
+    $suggestions = $this->realSearchService->searchSuggestions($search_string, $types, $past, $extra_parameters);
     $this->cacheSet($cid, $suggestions, REQUEST_TIME + CULTUREFEED_SEARCH_CACHE_EXPIRES);
 
     return $suggestions;

From 5923131332a632320fb2e383478716dcd2a9d483 Mon Sep 17 00:00:00 2001
From: Dietrich Moerman <dietrich.moerman@wunderkraut.com>
Date: Fri, 27 Mar 2015 13:54:44 +0100
Subject: [PATCH 058/275] UIT-38: Use Between and And input fields for date
 facet.

---
 .../culturefeed_search_ui.module              |  8 ++--
 culturefeed_search_ui/includes/blocks.inc     | 41 ++++++++++---------
 .../lib/Drupal/CultureFeedSearchPage.php      | 27 ++++--------
 culturefeed_search_ui/theme/theme.inc         |  4 +-
 4 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index a5962c5a..6b6fce8a 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -967,13 +967,15 @@ function culturefeed_search_ui_culturefeed_search_ui_active_filters($culturefeed
   }
 
   // Check if user is filtering on date range.
-  if (!empty($query['date_range'])) {
+  if (!empty($query['date_from']) && !empty($query['date_to'])
+      && DateTime::createFromFormat('d/m/Y', $query['date_from'])
+      && DateTime::createFromFormat('d/m/Y', $query['date_to'])) {
     $search_query = $query;
-    unset($search_query['date_range']);
+    unset($search_query['date_from'], $search_query['date_to']);
     $url = url($path, array('query' => $search_query));
     $build['date_search'] =  array(
       '#theme' => 'culturefeed_search_active_filters_item',
-      '#label' => $query['date_range'],
+      '#label' => $query['date_from'] . ' - ' . $query['date_to'],
       '#url' => $url
     );
   }
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index d4f9395c..bbffcafd 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -212,13 +212,21 @@ function culturefeed_search_ui_date_facet_form() {
 
   $form['#attributes']['class'][] = 'append-button';
 
-  $form['date_range'] = array(
+  $form['date_from'] = array(
     '#type' => 'textfield',
     '#size' => 28,
-    '#title' => t('Choose a date'),
+    '#title' => t('Between'),
     '#title_display' => 'invisible',
-    '#default_value' => isset($_GET['date_range']) ? $_GET['date_range'] : '',
-    '#attributes' => array('placeholder' => t('Or choose a custom date'), 'autocomplete' => 'off'),
+    '#default_value' => isset($_GET['date_from']) ? $_GET['date_from'] : '',
+    '#attributes' => array('placeholder' => t('Between'), 'autocomplete' => 'off'),
+  );
+  $form['date_to'] = array(
+    '#type' => 'textfield',
+    '#size' => 28,
+    '#title' => t('And'),
+    '#title_display' => 'invisible',
+    '#default_value' => isset($_GET['date_to']) ? $_GET['date_to'] : '',
+    '#attributes' => array('placeholder' => t('And'), 'autocomplete' => 'off'),
   );
 
   $form['submit'] = array(
@@ -238,21 +246,14 @@ function culturefeed_search_ui_date_facet_form() {
  */
 function culturefeed_search_ui_date_facet_form_validate($form, &$form_state) {
 
-  if (!empty($form_state['values']['date_range'])) {
-
-    $form_state['values']['date_range'] = str_replace(t('till'), '-', $form_state['values']['date_range']);
-    $dates = explode('-', $form_state['values']['date_range']);
-    $startDate = DateTime::createFromFormat('d/m/Y', trim($dates[0]));
-    if (!$startDate) {
-      form_set_error('date_range', t('Please enter a valid date'));
-    }
-    elseif (isset($dates[1])) {
-      $endDate = DateTime::createFromFormat('d/m/Y', trim($dates[1]));
-      if (!$endDate) {
-        form_set_error('date_range', t('Please enter a valid date'));
-      }
+  $error = FALSE;
+  foreach (array('date_from', 'date_to') as $key) {
+    if (!empty($form_state['values'][$key]) && !DateTime::createFromFormat('d/m/Y', $form_state['values'][$key])) {
+      form_set_error($key, !$error ? t('Please enter a valid date') : '');
+      $error = TRUE;
     }
   }
+
 }
 
 /**
@@ -267,8 +268,10 @@ function culturefeed_search_ui_date_facet_form_submit($form, &$form_state) {
     unset($query['facet']);
   }
 
-  if (!empty($form_state['values']['date_range'])) {
-    $query['date_range'] = $form_state['values']['date_range'];
+  foreach (array('date_from', 'date_to') as $key) {
+    if (!empty($form_state['values'][$key])) {
+      $query[$key] = $form_state['values'][$key];
+    }
   }
 
   $form_state['redirect'] = array(
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 9d32ff59..1d2959bc 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -398,27 +398,16 @@ public function loadPage() {
   protected function addFacetFilters($params) {
 
     // Add the date range facet.
-    if (isset($params['date_range'])) {
-
-      $dates = explode('-', $params['date_range']);
-      $startDate = DateTime::createFromFormat('d/m/Y', trim($dates[0]));
-      if ($startDate) {
-        $endDate = clone $startDate;
-        if (isset($dates[1])) {
-          $endDateTime = DateTime::createFromFormat('d/m/Y', trim($dates[1]));
-          if ($endDateTime) {
-            $endDate = $endDateTime;
-          }
-        }
+    if (!empty($params['date_from']) && !empty($params['date_to'])
+        && ($startDate = DateTime::createFromFormat('d/m/Y', $params['date_from']))
+        && ($endDate = DateTime::createFromFormat('d/m/Y', $params['date_to']))) {
+      // Set start date time on beginning of the day.
+      $startDate->setTime(0, 0, 1);
 
-        // Set start date time on beginning of the day.
-        $startDate->setTime(0, 0, 1);
+      // Set end date time to end of the day day, to it searches on full day.
+      $endDate->setTime(23, 59, 59);
 
-        // Set end date time to end of the day day, to it searches on full day.
-        $endDate->setTime(23, 59, 59);
-
-        $this->parameters[] = new Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
-      }
+      $this->parameters[] = new Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
     }
 
     // Add search on coordinates.
diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 6bf3da4e..6cb93a35 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -406,8 +406,8 @@ function culturefeed_search_ui_preprocess_culturefeed_search_facet_item(&$variab
   }
 
   // When the facet is datetype, we don't want to keep a date range filter..
-  if ($facet_key == 'datetype' && isset($query['date_range'])) {
-    unset($query['date_range']);
+  if ($facet_key == 'datetype') {
+    unset($query['date_from'], $query['date_to']);
   }
 
   // Agefrom facet is active when min_age is given.

From 9895d3db53c5e586122affb41fe909899d3188f5 Mon Sep 17 00:00:00 2001
From: Dietrich Moerman <dietrich.moerman@wunderkraut.com>
Date: Sat, 28 Mar 2015 23:23:33 +0100
Subject: [PATCH 059/275] UIT-38: Install Date Range Picker for selecting
 ranges; use for date search facet.

---
 .../css/daterangepicker-bs2.css               |  287 ++++
 .../css/daterangepicker-bs3.css               |  319 ++++
 .../css/ui.daterangepicker.css                |  104 --
 .../culturefeed_search_ui.module              |   24 +-
 culturefeed_search_ui/includes/blocks.inc     |    9 +-
 .../js/daterangepicker.jQuery.compressed.js   |    1 -
 culturefeed_search_ui/js/daterangepicker.js   | 1280 +++++++++++++++++
 culturefeed_search_ui/js/moment.min.js        |    7 +
 culturefeed_search_ui/js/search_ui.js         |   76 +-
 9 files changed, 1979 insertions(+), 128 deletions(-)
 create mode 100644 culturefeed_search_ui/css/daterangepicker-bs2.css
 create mode 100644 culturefeed_search_ui/css/daterangepicker-bs3.css
 delete mode 100755 culturefeed_search_ui/css/ui.daterangepicker.css
 delete mode 100644 culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js
 create mode 100644 culturefeed_search_ui/js/daterangepicker.js
 create mode 100644 culturefeed_search_ui/js/moment.min.js

diff --git a/culturefeed_search_ui/css/daterangepicker-bs2.css b/culturefeed_search_ui/css/daterangepicker-bs2.css
new file mode 100644
index 00000000..e222688a
--- /dev/null
+++ b/culturefeed_search_ui/css/daterangepicker-bs2.css
@@ -0,0 +1,287 @@
+/*!
+ * Stylesheet for the Date Range Picker, for use with Bootstrap 2.x
+ *
+ * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+ *
+ * Built for http://www.improvely.com
+ */
+
+.daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+  float: left;
+  margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
+.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
+  float: right;
+  margin: 4px;
+}
+
+.daterangepicker .ranges {
+  width: 160px;
+  text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+  float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+  padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 250px;
+}
+.daterangepicker.show-calendar .calendar {
+    display: block;
+}
+
+.daterangepicker .calendar.single .calendar-date {
+  border: none;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  white-space: nowrap;
+  text-align: center;
+}
+
+.daterangepicker .daterangepicker_start_input label,
+.daterangepicker .daterangepicker_end_input label {
+  color: #333;
+  font-size: 11px;
+  margin-bottom: 2px;
+  text-transform: uppercase;
+  text-shadow: 1px 1px 0 #fff;
+}
+
+.daterangepicker .ranges input {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}
+
+.daterangepicker .calendar-date {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 8px auto 0 auto;
+  line-height: 30px;
+}
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.openscenter:before {
+  position: absolute;
+  top: -7px;
+  left: 0;  
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.openscenter:after {
+  position: absolute;
+  top: -6px;
+  left: 0;  
+  right: 0;  
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.daterangepicker td.off {
+  color: #999;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 60px;
+  margin-bottom: 0;
+}
+
+.daterangepicker_start_input {
+  float: left;
+}
+
+.daterangepicker_end_input {
+  float: left; 
+  padding-left: 11px
+}
+
+.daterangepicker th.month {
+  width: auto;
+}
diff --git a/culturefeed_search_ui/css/daterangepicker-bs3.css b/culturefeed_search_ui/css/daterangepicker-bs3.css
new file mode 100644
index 00000000..c9c8fedf
--- /dev/null
+++ b/culturefeed_search_ui/css/daterangepicker-bs3.css
@@ -0,0 +1,319 @@
+/*!
+ * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
+ *
+ * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+ *
+ * Built for http://www.improvely.com
+ */
+
+ .daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+  float: left;
+  margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
+.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
+  float: right;
+  margin: 4px;
+}
+
+.daterangepicker.single .ranges, .daterangepicker.single .calendar {
+  float: none;
+}
+
+.daterangepicker .ranges {
+  width: 160px;
+  text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+  float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+  padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker.show-calendar .calendar {
+    display: block;
+}
+
+.daterangepicker .calendar.single .calendar-date {
+  border: none;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  white-space: nowrap;
+  text-align: center;
+  min-width: 32px;
+}
+
+.daterangepicker .daterangepicker_start_input label,
+.daterangepicker .daterangepicker_end_input label {
+  color: #333;
+  display: block;
+  font-size: 11px;
+  font-weight: normal;
+  height: 20px;
+  line-height: 20px;
+  margin-bottom: 2px;
+  text-shadow: #fff 1px 1px 0px;
+  text-transform: uppercase;
+  width: 74px;
+}
+
+.daterangepicker .ranges input {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges .input-mini {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555;
+  display: block;
+  font-size: 11px;
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+  margin: 0 0 10px 0;
+  padding: 0 6px;
+  width: 74px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}
+
+.daterangepicker .calendar-date {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 8px auto 0 auto;
+  line-height: 30px;
+}
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.openscenter:before {
+  position: absolute;
+  top: -7px;
+  left: 0;  
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.openscenter:after {
+  position: absolute;
+  top: -6px;
+  left: 0;  
+  right: 0;  
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.daterangepicker td.off {
+  color: #999;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.daterangepicker td.start-date {
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: #3071a9;
+  color: #fff;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin-bottom: 0;
+}
+
+.daterangepicker_start_input {
+  float: left;
+}
+
+.daterangepicker_end_input {
+  float: left; 
+  padding-left: 11px
+}
+
+.daterangepicker th.month {
+  width: auto;
+}
diff --git a/culturefeed_search_ui/css/ui.daterangepicker.css b/culturefeed_search_ui/css/ui.daterangepicker.css
deleted file mode 100755
index 18d40806..00000000
--- a/culturefeed_search_ui/css/ui.daterangepicker.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/*styles for jquery ui daterangepicker plugin */
-
-.ui-daterangepickercontain {
-	z-index: 999;
-}
-.ui-daterangepickercontain .ui-daterangepicker {
-	float: left;
-	padding: 5px !important;
-	width: auto;
-	display: inline;
-	background-image: none !important;
-	clear: left;
-	position: absolute;
-	z-index: 9999;
-}
-.ui-daterangepicker ul, .ui-daterangepicker .ranges, .ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
-	float: left;
-	padding: 0;
-	margin: 0;
-}
-.ui-daterangepicker .ranges {
-	width: auto;
-	position: relative;
-	padding: 5px 5px 40px 0;
-	margin-left: 10px;
-}
-.ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
-	margin-left: 5px;
-}
-.ui-daterangepicker button.btnDone {
-	margin: 0 5px 5px 0;
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	clear: both;
-	cursor: pointer;
-	font-size: 1.1em;
-}
-.ui-daterangepicker ul {
-	width: 17.6em;
-	background: none;
-	border: 0;
-}
-.ui-daterangepicker li {
-	list-style: none;
-	padding: 1px;
-	cursor: pointer;
-	margin: 1px 0;
-}
-.ui-daterangepicker li.ui-state-hover, .ui-daterangepicker li.ui-state-active {
-	padding: 0;
-}
-.ui-daterangepicker li.preset_0 {
-	margin-top: 1.5em !important;
-}
-.ui-daterangepicker .ui-widget-content a {
-	text-decoration: none !important;
-}
-.ui-daterangepicker li a {
-	font-weight: normal;
-	margin: .3em .5em;
-	display: block;
-}
-.ui-daterangepicker li span {
-	float: right;
-	margin: .3em .2em;
-}
-.ui-daterangepicker .title-start, .ui-daterangepicker .title-end {
-	display: block;
-	margin: 0 0 .2em;
-	font-size: 1em;
-	padding: 0 4px 2px;
-}
-.ui-daterangepicker .ui-datepicker-inline {
-	font-size: 1em;
-}
-.ui-daterangepicker-arrows {
-	padding: 2px;
-	width: 204px;
-	position: relative;
-}
-.ui-daterangepicker-arrows input.ui-rangepicker-input {
-	width: 158px;
-	margin: 0 2px 0 20px;
-	padding: 2px;
-	height: 1.1em;
-}
-.ui-daterangepicker-arrows .ui-daterangepicker-prev, .ui-daterangepicker-arrows .ui-daterangepicker-next {
-	position: absolute;
-	top: 2px; 
-	padding: 1px;
-}
-.ui-daterangepicker-arrows .ui-daterangepicker-prev {
-	left: 2px;
-}
-.ui-daterangepicker-arrows .ui-daterangepicker-next {
-	right: 2px;
-}
-.ui-daterangepicker-arrows .ui-daterangepicker-prev:hover, 
-.ui-daterangepicker-arrows .ui-daterangepicker-next:hover,
-.ui-daterangepicker-arrows .ui-daterangepicker-prev:focus, 
-.ui-daterangepicker-arrows .ui-daterangepicker-next:focus {
-	padding: 0;
-}
diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 6b6fce8a..1573b665 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -325,19 +325,29 @@ function culturefeed_search_ui_library() {
 
   $path = drupal_get_path('module', 'culturefeed_search_ui');
 
-  // Date range picker
+  // Moment.js: Parse, validate, manipulate, and display dates in JavaScript.
+  $libraries['ui.moment'] = array(
+    'title' => 'Moment.js',
+    'website' => 'http://momentjs.com/',
+    'version' => '2.9.0',
+    'js' => array(
+      $path . '/js/moment.min.js' => array(),
+    ),
+  );
+
+  // Date Range Picker: A JavaScript widget for choosing date ranges.
   $libraries['ui.daterangepicker'] = array(
-    'title' => 'Datejs',
-    'website' => 'http://filamentgroup.com/lab/date_range_picker_using_jquery_ui_16_and_jquery_ui_css_framework/',
-    'version' => '1',
+    'title' => 'Date Range Picker',
+    'website' => 'http://www.daterangepicker.com/',
+    'version' => '1.3.19+master',
     'js' => array(
-      $path . '/js/daterangepicker.jQuery.compressed.js' => array(),
+      $path . '/js/daterangepicker.js' => array(),
     ),
     'css' => array(
-      $path . '/css/ui.daterangepicker.css' => array(),
+      $path . '/css/daterangepicker-bs3.css' => array(),
     ),
     'dependencies' => array(
-      array('system', 'ui.datepicker'),
+      array('culturefeed_search_ui', 'ui.moment'),
     ),
   );
 
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index bbffcafd..eea8f9d9 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -228,10 +228,17 @@ function culturefeed_search_ui_date_facet_form() {
     '#default_value' => isset($_GET['date_to']) ? $_GET['date_to'] : '',
     '#attributes' => array('placeholder' => t('And'), 'autocomplete' => 'off'),
   );
-
+  $form['date_range'] = array(
+    '#markup' => l('<span>' . t('Specific dates') . '</span>', 'javascript:', array(
+      'html' => TRUE,
+      'external' => TRUE,
+      'attributes' => array('id' => 'specific-dates-range'),
+    )),
+  );
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Ok'),
+    '#attributes' => array('id' => 'submit-specific-dates'),
   );
 
   $form['#attached']['library'][] = array('culturefeed_search_ui', 'ui.daterangepicker');
diff --git a/culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js b/culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js
deleted file mode 100644
index caa48ea2..00000000
--- a/culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){a.fn.daterangepicker=function(s){var d=a(this);var e=a.extend({presetRanges:[{text:"Today",dateStart:"today",dateEnd:"today"},{text:"Last 7 days",dateStart:"today-7days",dateEnd:"today"},{text:"Month to date",dateStart:function(){return Date.parse("today").moveToFirstDayOfMonth()},dateEnd:"today"},{text:"Year to date",dateStart:function(){var w=Date.parse("today");w.setMonth(0);w.setDate(1);return w},dateEnd:"today"},{text:"The previous Month",dateStart:function(){return Date.parse("1 month ago").moveToFirstDayOfMonth()},dateEnd:function(){return Date.parse("1 month ago").moveToLastDayOfMonth()}}],presets:{specificDate:"Specific Date",allDatesBefore:"All Dates Before",allDatesAfter:"All Dates After",dateRange:"Date Range"},rangeStartTitle:"Start date",rangeEndTitle:"End date",nextLinkText:"Next",prevLinkText:"Prev",target:d,doneButtonText:"Done",earliestDate:Date.parse("-15years"),latestDate:Date.parse("+15years"),constrainDates:false,rangeSplitter:"-",dateFormat:"m/d/yy",closeOnSelect:true,arrows:false,appendTo:"body",onClose:function(){},onOpen:function(){},onChange:function(){},datepickerOptions:null},s);var g={onSelect:function(A,z){var y=j.find(".range-start");var B=j.find(".range-end");if(j.find(".ui-daterangepicker-specificDate").is(".ui-state-active")){B.datepicker("setDate",y.datepicker("getDate"))}a(this).trigger("constrainOtherPicker");var x=b(y.datepicker("getDate"));var w=b(B.datepicker("getDate"));if(d.length==2){d.eq(0).val(x);d.eq(1).val(w)}else{d.val((x!=w)?x+" "+e.rangeSplitter+" "+w:x)}if(e.closeOnSelect){if(!j.find("li.ui-state-active").is(".ui-daterangepicker-dateRange")&&!j.is(":animated")){k()}a(this).trigger("constrainOtherPicker");e.onChange()}},defaultDate:+0};d.bind("change",e.onChange);e.datepickerOptions=(s)?a.extend(g,s.datepickerOptions):g;var m,l=Date.parse("today");var o,i;if(d.size()==2){o=Date.parse(d.eq(0).val());i=Date.parse(d.eq(1).val());if(o==null){o=i}if(i==null){i=o}}else{o=Date.parse(d.val().split(e.rangeSplitter)[0]);i=Date.parse(d.val().split(e.rangeSplitter)[1]);if(i==null){i=o}}if(o!=null){m=o}if(i!=null){l=i}var j=a('<div class="ui-daterangepicker ui-widget ui-helper-clearfix ui-widget-content ui-corner-all"></div>');var u=(function(){var y=a('<ul class="ui-widget-content"></ul>').appendTo(j);a.each(e.presetRanges,function(){a('<li class="ui-daterangepicker-'+this.text.replace(/ /g,"")+' ui-corner-all"><a href="#">'+this.text+"</a></li>").data("dateStart",this.dateStart).data("dateEnd",this.dateEnd).appendTo(y)});var w=0;a.each(e.presets,function(x,z){a('<li class="ui-daterangepicker-'+x+" preset_"+w+' ui-helper-clearfix ui-corner-all"><span class="ui-icon ui-icon-triangle-1-e"></span><a href="#">'+z+"</a></li>").appendTo(y);w++});y.find("li").hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).click(function(){j.find(".ui-state-active").removeClass("ui-state-active");a(this).addClass("ui-state-active");q(a(this),j,n,f);return false});return y})();function b(y){if(!y.getDate()){return""}var x=y.getDate();var A=y.getMonth();var z=y.getFullYear();A++;var w=e.dateFormat;return a.datepicker.formatDate(w,y)}a.fn.restoreDateFromData=function(){if(a(this).data("saveDate")){a(this).datepicker("setDate",a(this).data("saveDate")).removeData("saveDate")}return this};a.fn.saveDateToData=function(){if(!a(this).data("saveDate")){a(this).data("saveDate",a(this).datepicker("getDate"))}return this};function t(){if(j.data("state")=="closed"){v();j.fadeIn(300).data("state","open");e.onOpen()}}function k(){if(j.data("state")=="open"){j.fadeOut(300).data("state","closed");e.onClose()}}function c(){if(j.data("state")=="open"){k()}else{t()}}function v(){var w=p||d;var A=w.offset(),y="left",z=A.left,x=a(window).width()-z-w.outerWidth();if(z>x){y="right",z=x}j.parent().css(y,z).css("top",A.top+w.outerHeight())}function q(z,y,A,w){if(z.is(".ui-daterangepicker-specificDate")){w.hide();A.show();y.find(".title-start").text(e.presets.specificDate);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").restoreDateFromData().css("opacity",0).hide(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-allDatesBefore")){w.hide();A.show();y.find(".title-end").text(e.presets.allDatesBefore);y.find(".range-start").saveDateToData().datepicker("setDate",e.earliestDate).css("opacity",0).hide(400);y.find(".range-end").restoreDateFromData().css("opacity",1).show(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-allDatesAfter")){w.hide();A.show();y.find(".title-start").text(e.presets.allDatesAfter);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").saveDateToData().datepicker("setDate",e.latestDate).css("opacity",0).hide(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-dateRange")){w.hide();A.show();y.find(".title-start").text(e.rangeStartTitle);y.find(".title-end").text(e.rangeEndTitle);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").restoreDateFromData().css("opacity",1).show(400);setTimeout(function(){w.fadeIn()},400)}else{w.hide();y.find(".range-start, .range-end").css("opacity",0).hide(400,function(){A.hide()});var B=(typeof z.data("dateStart")=="string")?Date.parse(z.data("dateStart")):z.data("dateStart")();var x=(typeof z.data("dateEnd")=="string")?Date.parse(z.data("dateEnd")):z.data("dateEnd")();y.find(".range-start").datepicker("setDate",B).find(".ui-datepicker-current-day").trigger("click");y.find(".range-end").datepicker("setDate",x).find(".ui-datepicker-current-day").trigger("click")}}}}return false}var n=a('<div class="ranges ui-widget-header ui-corner-all ui-helper-clearfix"><div class="range-start"><span class="title-start">Start Date</span></div><div class="range-end"><span class="title-end">End Date</span></div></div>').appendTo(j);n.find(".range-start, .range-end").datepicker(e.datepickerOptions);n.find(".range-start").datepicker("setDate",m);n.find(".range-end").datepicker("setDate",l);n.find(".range-start, .range-end").bind("constrainOtherPicker",function(){if(e.constrainDates){if(a(this).is(".range-start")){j.find(".range-end").datepicker("option","minDate",a(this).datepicker("getDate"))}else{j.find(".range-start").datepicker("option","maxDate",a(this).datepicker("getDate"))}}}).trigger("constrainOtherPicker");var f=a('<button class="btnDone ui-state-default ui-corner-all">'+e.doneButtonText+"</button>").click(function(){j.find(".ui-datepicker-current-day").trigger("click");k()}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).appendTo(n);a(this).click(function(){c();return false});n.hide().find(".range-start, .range-end, .btnDone").hide();j.data("state","closed");n.find(".ui-datepicker").css("display","block");a(e.appendTo).append(j);j.wrap('<div class="ui-daterangepickercontain"></div>');if(e.arrows&&d.size()==1){var h=a('<a href="#" class="ui-daterangepicker-prev ui-corner-all" title="'+e.prevLinkText+'"><span class="ui-icon ui-icon-circle-triangle-w">'+e.prevLinkText+"</span></a>");var r=a('<a href="#" class="ui-daterangepicker-next ui-corner-all" title="'+e.nextLinkText+'"><span class="ui-icon ui-icon-circle-triangle-e">'+e.nextLinkText+"</span></a>");a(this).addClass("ui-rangepicker-input ui-widget-content").wrap('<div class="ui-daterangepicker-arrows ui-widget ui-widget-header ui-helper-clearfix ui-corner-all"></div>').before(h).before(r).parent().find("a").click(function(){var x=n.find(".range-start").datepicker("getDate");var w=n.find(".range-end").datepicker("getDate");var y=Math.abs(new TimeSpan(x-w).getTotalMilliseconds())+86400000;if(a(this).is(".ui-daterangepicker-prev")){y=-y}n.find(".range-start, .range-end ").each(function(){var z=a(this).datepicker("getDate");if(z==null){return false}a(this).datepicker("setDate",z.add({milliseconds:y})).find(".ui-datepicker-current-day").trigger("click")});return false}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")});var p=d.parent()}a(document).click(function(){if(j.is(":visible")){k()}});j.click(function(){return false}).hide();return this}})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_search_ui/js/daterangepicker.js b/culturefeed_search_ui/js/daterangepicker.js
new file mode 100644
index 00000000..dae63e68
--- /dev/null
+++ b/culturefeed_search_ui/js/daterangepicker.js
@@ -0,0 +1,1280 @@
+/**
+* @version: 1.3.19
+* @author: Dan Grossman http://www.dangrossman.info/
+* @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
+* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+* @website: https://www.improvely.com/
+*/
+
+(function(root, factory) {
+
+  if (typeof define === 'function' && define.amd) {
+    define(['moment', 'jquery', 'exports'], function(momentjs, $, exports) {
+      root.daterangepicker = factory(root, exports, momentjs, $);
+    });
+
+  } else if (typeof exports !== 'undefined') {
+    var momentjs = require('moment');
+    var jQuery;
+    try {
+      jQuery = require('jquery');
+    } catch (err) {
+      jQuery = window.jQuery;
+      if (!jQuery) throw new Error('jQuery dependency not found');
+    }
+
+    factory(root, exports, momentjs, jQuery);
+
+  // Finally, as a browser global.
+  } else {
+    root.daterangepicker = factory(root, {}, root.moment, (root.jQuery || root.Zepto || root.ender || root.$));
+  }
+
+}(this, function(root, daterangepicker, moment, $) {
+
+    var DateRangePicker = function (element, options, cb) {
+
+        // by default, the daterangepicker element is placed at the bottom of HTML body
+        this.parentEl = 'body';
+
+        //element that triggered the date range picker
+        this.element = $(element);
+
+        //tracks visible state
+        this.isShowing = false;
+
+        //create the picker HTML object
+        var DRPTemplate = '<div class="daterangepicker dropdown-menu">' +
+                '<div class="calendar first left"></div>' +
+                '<div class="calendar second right"></div>' +
+                '<div class="ranges">' +
+                  '<div class="range_inputs">' +
+                    '<div class="daterangepicker_start_input">' +
+                      '<label for="daterangepicker_start"></label>' +
+                      '<input class="input-mini" type="text" name="daterangepicker_start" value="" />' +
+                    '</div>' +
+                    '<div class="daterangepicker_end_input">' +
+                      '<label for="daterangepicker_end"></label>' +
+                      '<input class="input-mini" type="text" name="daterangepicker_end" value="" />' +
+                    '</div>' +
+                    '<button class="applyBtn" disabled="disabled"></button>&nbsp;' +
+                    '<button class="cancelBtn"></button>' +
+                  '</div>' +
+                '</div>' +
+              '</div>';
+
+        //custom options
+        if (typeof options !== 'object' || options === null)
+            options = {};
+
+        this.parentEl = (typeof options === 'object' && options.parentEl && $(options.parentEl).length) ? $(options.parentEl) : $(this.parentEl);
+        this.container = $(DRPTemplate).appendTo(this.parentEl);
+
+        this.setOptions(options, cb);
+
+        //apply CSS classes and labels to buttons
+        var c = this.container;
+        $.each(this.buttonClasses, function (idx, val) {
+            c.find('button').addClass(val);
+        });
+        this.container.find('.daterangepicker_start_input label').html(this.locale.fromLabel);
+        this.container.find('.daterangepicker_end_input label').html(this.locale.toLabel);
+        if (this.applyClass.length)
+            this.container.find('.applyBtn').addClass(this.applyClass);
+        if (this.cancelClass.length)
+            this.container.find('.cancelBtn').addClass(this.cancelClass);
+        this.container.find('.applyBtn').html(this.locale.applyLabel);
+        this.container.find('.cancelBtn').html(this.locale.cancelLabel);
+
+        //event listeners
+
+        this.container.find('.calendar')
+            .on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
+            .on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
+            .on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
+            .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.hoverDate, this))
+            .on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
+            .on('change.daterangepicker', 'select.yearselect', $.proxy(this.updateMonthYear, this))
+            .on('change.daterangepicker', 'select.monthselect', $.proxy(this.updateMonthYear, this))
+            .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.updateTime, this));
+
+        this.container.find('.ranges')
+            .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
+            .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
+            .on('click.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this))
+            .on('change.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.inputsChanged, this))
+            .on('keydown.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.inputsKeydown, this))
+            .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
+            .on('mouseenter.daterangepicker', 'li', $.proxy(this.enterRange, this))
+            .on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this));
+
+        if (this.element.is('input')) {
+            this.element.on({
+                'click.daterangepicker': $.proxy(this.show, this),
+                'focus.daterangepicker': $.proxy(this.show, this),
+                'keyup.daterangepicker': $.proxy(this.updateFromControl, this)
+            });
+        } else {
+            this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
+        }
+
+    };
+
+    DateRangePicker.prototype = {
+
+        constructor: DateRangePicker,
+
+        setOptions: function(options, callback) {
+
+            this.startDate = moment().startOf('day');
+            this.endDate = moment().endOf('day');
+            this.timeZone = moment().utcOffset();
+            this.minDate = false;
+            this.maxDate = false;
+            this.dateLimit = false;
+
+            this.showDropdowns = false;
+            this.showWeekNumbers = false;
+            this.timePicker = false;
+            this.timePickerSeconds = false;
+            this.timePickerIncrement = 30;
+            this.timePicker12Hour = true;
+            this.singleDatePicker = false;
+            this.ranges = {};
+
+            this.opens = 'right';
+            if (this.element.hasClass('pull-right'))
+                this.opens = 'left';
+
+            this.buttonClasses = ['btn', 'btn-small btn-sm'];
+            this.applyClass = 'btn-success';
+            this.cancelClass = 'btn-default';
+
+            this.format = 'MM/DD/YYYY';
+            this.separator = ' - ';
+
+            this.locale = {
+                applyLabel: 'Apply',
+                cancelLabel: 'Cancel',
+                fromLabel: 'From',
+                toLabel: 'To',
+                weekLabel: 'W',
+                customRangeLabel: 'Custom Range',
+                daysOfWeek: moment.weekdaysMin(),
+                monthNames: moment.monthsShort(),
+                firstDay: moment.localeData()._week.dow
+            };
+
+            this.cb = function () { };
+
+            if (typeof options.format === 'string')
+                this.format = options.format;
+
+            if (typeof options.separator === 'string')
+                this.separator = options.separator;
+
+            if (typeof options.startDate === 'string')
+                this.startDate = moment(options.startDate, this.format);
+
+            if (typeof options.endDate === 'string')
+                this.endDate = moment(options.endDate, this.format);
+
+            if (typeof options.minDate === 'string')
+                this.minDate = moment(options.minDate, this.format);
+
+            if (typeof options.maxDate === 'string')
+                this.maxDate = moment(options.maxDate, this.format);
+
+            if (typeof options.startDate === 'object')
+                this.startDate = moment(options.startDate);
+
+            if (typeof options.endDate === 'object')
+                this.endDate = moment(options.endDate);
+
+            if (typeof options.minDate === 'object')
+                this.minDate = moment(options.minDate);
+
+            if (typeof options.maxDate === 'object')
+                this.maxDate = moment(options.maxDate);
+
+            if (typeof options.applyClass === 'string')
+                this.applyClass = options.applyClass;
+
+            if (typeof options.cancelClass === 'string')
+                this.cancelClass = options.cancelClass;
+
+            if (typeof options.dateLimit === 'object')
+                this.dateLimit = options.dateLimit;
+
+            if (typeof options.locale === 'object') {
+
+                if (typeof options.locale.daysOfWeek === 'object') {
+                    // Create a copy of daysOfWeek to avoid modification of original
+                    // options object for reusability in multiple daterangepicker instances
+                    this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
+                }
+
+                if (typeof options.locale.monthNames === 'object') {
+                  this.locale.monthNames = options.locale.monthNames.slice();
+                }
+
+                if (typeof options.locale.firstDay === 'number') {
+                  this.locale.firstDay = options.locale.firstDay;
+                }
+
+                if (typeof options.locale.applyLabel === 'string') {
+                  this.locale.applyLabel = options.locale.applyLabel;
+                }
+
+                if (typeof options.locale.cancelLabel === 'string') {
+                  this.locale.cancelLabel = options.locale.cancelLabel;
+                }
+
+                if (typeof options.locale.fromLabel === 'string') {
+                  this.locale.fromLabel = options.locale.fromLabel;
+                }
+
+                if (typeof options.locale.toLabel === 'string') {
+                  this.locale.toLabel = options.locale.toLabel;
+                }
+
+                if (typeof options.locale.weekLabel === 'string') {
+                  this.locale.weekLabel = options.locale.weekLabel;
+                }
+
+                if (typeof options.locale.customRangeLabel === 'string') {
+                  this.locale.customRangeLabel = options.locale.customRangeLabel;
+                }
+            }
+
+            if (typeof options.opens === 'string')
+                this.opens = options.opens;
+
+            if (typeof options.showWeekNumbers === 'boolean') {
+                this.showWeekNumbers = options.showWeekNumbers;
+            }
+
+            if (typeof options.buttonClasses === 'string') {
+                this.buttonClasses = [options.buttonClasses];
+            }
+
+            if (typeof options.buttonClasses === 'object') {
+                this.buttonClasses = options.buttonClasses;
+            }
+
+            if (typeof options.showDropdowns === 'boolean') {
+                this.showDropdowns = options.showDropdowns;
+            }
+
+            if (typeof options.singleDatePicker === 'boolean') {
+                this.singleDatePicker = options.singleDatePicker;
+                if (this.singleDatePicker) {
+                    this.endDate = this.startDate.clone();
+                }
+            }
+
+            if (typeof options.timePicker === 'boolean') {
+                this.timePicker = options.timePicker;
+            }
+
+            if (typeof options.timePickerSeconds === 'boolean') {
+                this.timePickerSeconds = options.timePickerSeconds;
+            }
+
+            if (typeof options.timePickerIncrement === 'number') {
+                this.timePickerIncrement = options.timePickerIncrement;
+            }
+
+            if (typeof options.timePicker12Hour === 'boolean') {
+                this.timePicker12Hour = options.timePicker12Hour;
+            }
+
+            // update day names order to firstDay
+            if (this.locale.firstDay != 0) {
+                var iterator = this.locale.firstDay;
+                while (iterator > 0) {
+                    this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift());
+                    iterator--;
+                }
+            }
+
+            var start, end, range;
+
+            //if no start/end dates set, check if an input element contains initial values
+            if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') {
+                if ($(this.element).is('input[type=text]')) {
+                    var val = $(this.element).val(),
+                        split = val.split(this.separator);
+
+                    start = end = null;
+
+                    if (split.length == 2) {
+                        start = moment(split[0], this.format);
+                        end = moment(split[1], this.format);
+                    } else if (this.singleDatePicker && val !== "") {
+                        start = moment(val, this.format);
+                        end = moment(val, this.format);
+                    }
+                    if (start !== null && end !== null) {
+                        this.startDate = start;
+                        this.endDate = end;
+                    }
+                }
+            }
+
+            // bind the time zone used to build the calendar to either the timeZone passed in through the options or the zone of the startDate (which will be the local time zone by default)
+            if (typeof options.timeZone === 'string' || typeof options.timeZone === 'number') {
+                this.timeZone = options.timeZone;
+                this.startDate.utcOffset(this.timeZone);
+                this.endDate.utcOffset(this.timeZone);
+            } else {
+                this.timeZone = moment(this.startDate).utcOffset();
+            }
+
+            if (typeof options.ranges === 'object') {
+                for (range in options.ranges) {
+
+                    if (typeof options.ranges[range][0] === 'string')
+                        start = moment(options.ranges[range][0], this.format);
+                    else
+                        start = moment(options.ranges[range][0]);
+
+                    if (typeof options.ranges[range][1] === 'string')
+                        end = moment(options.ranges[range][1], this.format);
+                    else
+                        end = moment(options.ranges[range][1]);
+
+                    // If we have a min/max date set, bound this range
+                    // to it, but only if it would otherwise fall
+                    // outside of the min/max.
+                    if (this.minDate && start.isBefore(this.minDate))
+                        start = moment(this.minDate);
+
+                    if (this.maxDate && end.isAfter(this.maxDate))
+                        end = moment(this.maxDate);
+
+                    // If the end of the range is before the minimum (if min is set) OR
+                    // the start of the range is after the max (also if set) don't display this
+                    // range option.
+                    if ((this.minDate && end.isBefore(this.minDate)) || (this.maxDate && start.isAfter(this.maxDate))) {
+                        continue;
+                    }
+
+                    this.ranges[range] = [start, end];
+                }
+
+                var list = '<ul>';
+                for (range in this.ranges) {
+                    list += '<li>' + range + '</li>';
+                }
+                list += '<li>' + this.locale.customRangeLabel + '</li>';
+                list += '</ul>';
+                this.container.find('.ranges ul').remove();
+                this.container.find('.ranges').prepend(list);
+            }
+
+            if (typeof callback === 'function') {
+                this.cb = callback;
+            }
+
+            if (!this.timePicker) {
+                this.startDate = this.startDate.startOf('day');
+                this.endDate = this.endDate.endOf('day');
+            }
+
+            if (this.singleDatePicker) {
+                this.opens = 'right';
+                this.container.addClass('single');
+                this.container.find('.calendar.right').show();
+                this.container.find('.calendar.left').hide();
+                if (!this.timePicker) {
+                    this.container.find('.ranges').hide();
+                } else {
+                    this.container.find('.ranges .daterangepicker_start_input, .ranges .daterangepicker_end_input').hide();
+                }
+                if (!this.container.find('.calendar.right').hasClass('single'))
+                    this.container.find('.calendar.right').addClass('single');
+            } else {
+                this.container.removeClass('single');
+                this.container.find('.calendar.right').removeClass('single');
+                this.container.find('.ranges').show();
+            }
+
+            this.oldStartDate = this.startDate.clone();
+            this.oldEndDate = this.endDate.clone();
+            this.oldChosenLabel = this.chosenLabel;
+
+            this.leftCalendar = {
+                month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute(), this.startDate.second()]),
+                calendar: []
+            };
+
+            this.rightCalendar = {
+                month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute(), this.endDate.second()]),
+                calendar: []
+            };
+
+            if (this.opens == 'right' || this.opens == 'center') {
+                //swap calendar positions
+                var first = this.container.find('.calendar.first');
+                var second = this.container.find('.calendar.second');
+
+                if (second.hasClass('single')) {
+                    second.removeClass('single');
+                    first.addClass('single');
+                }
+
+                first.removeClass('left').addClass('right');
+                second.removeClass('right').addClass('left');
+
+                if (this.singleDatePicker) {
+                    first.show();
+                    second.hide();
+                }
+            }
+
+            if (typeof options.ranges === 'undefined' && !this.singleDatePicker) {
+                this.container.addClass('show-calendar');
+            }
+
+            this.container.addClass('opens' + this.opens);
+
+            this.updateView();
+            this.updateCalendars();
+
+        },
+
+        setStartDate: function(startDate) {
+            if (typeof startDate === 'string')
+                this.startDate = moment(startDate, this.format).utcOffset(this.timeZone);
+
+            if (typeof startDate === 'object')
+                this.startDate = moment(startDate);
+
+            if (!this.timePicker)
+                this.startDate = this.startDate.startOf('day');
+
+            this.oldStartDate = this.startDate.clone();
+
+            this.updateView();
+            this.updateCalendars();
+            this.updateInputText();
+        },
+
+        setEndDate: function(endDate) {
+            if (typeof endDate === 'string')
+                this.endDate = moment(endDate, this.format).utcOffset(this.timeZone);
+
+            if (typeof endDate === 'object')
+                this.endDate = moment(endDate);
+
+            if (!this.timePicker)
+                this.endDate = this.endDate.endOf('day');
+
+            this.oldEndDate = this.endDate.clone();
+
+            this.updateView();
+            this.updateCalendars();
+            this.updateInputText();
+        },
+
+        updateView: function () {
+            this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
+            this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
+            this.updateFormInputs();
+        },
+
+        updateFormInputs: function () {
+            this.container.find('input[name=daterangepicker_start]').val(this.startDate.format(this.format));
+            this.container.find('input[name=daterangepicker_end]').val(this.endDate.format(this.format));
+
+            if (this.startDate.isSame(this.endDate) || this.startDate.isBefore(this.endDate)) {
+                this.container.find('button.applyBtn').removeAttr('disabled');
+            } else {
+                this.container.find('button.applyBtn').attr('disabled', 'disabled');
+            }
+        },
+
+        updateFromControl: function () {
+            if (!this.element.is('input')) return;
+            if (!this.element.val().length) return;
+
+            var dateString = this.element.val().split(this.separator),
+                start = null,
+                end = null;
+
+            if(dateString.length === 2) {
+                start = moment(dateString[0], this.format).utcOffset(this.timeZone);
+                end = moment(dateString[1], this.format).utcOffset(this.timeZone);
+            }
+
+            if (this.singleDatePicker || start === null || end === null) {
+                start = moment(this.element.val(), this.format).utcOffset(this.timeZone);
+                end = start;
+            }
+
+            if (end.isBefore(start)) return;
+
+            this.oldStartDate = this.startDate.clone();
+            this.oldEndDate = this.endDate.clone();
+
+            this.startDate = start;
+            this.endDate = end;
+
+            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
+                this.notify();
+
+            this.updateCalendars();
+        },
+
+        notify: function () {
+            this.updateView();
+            this.cb(this.startDate, this.endDate, this.chosenLabel);
+        },
+
+        move: function () {
+            var parentOffset = { top: 0, left: 0 };
+            var parentRightEdge = $(window).width();
+            if (!this.parentEl.is('body')) {
+                parentOffset = {
+                    top: this.parentEl.offset().top - this.parentEl.scrollTop(),
+                    left: this.parentEl.offset().left - this.parentEl.scrollLeft()
+                };
+                parentRightEdge = this.parentEl[0].clientWidth + this.parentEl.offset().left;
+            }
+
+            if (this.opens == 'left') {
+                this.container.css({
+                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+                    right: parentRightEdge - this.element.offset().left - this.element.outerWidth(),
+                    left: 'auto'
+                });
+                if (this.container.offset().left < 0) {
+                    this.container.css({
+                        right: 'auto',
+                        left: 9
+                    });
+                }
+            } else if (this.opens == 'center') {
+                this.container.css({
+                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+                    left: this.element.offset().left - parentOffset.left + this.element.outerWidth() / 2
+                            - this.container.outerWidth() / 2,
+                    right: 'auto'
+                });
+                if (this.container.offset().left < 0) {
+                    this.container.css({
+                        right: 'auto',
+                        left: 9
+                    });
+                }
+            } else {
+                this.container.css({
+                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+                    left: this.element.offset().left - parentOffset.left,
+                    right: 'auto'
+                });
+                if (this.container.offset().left + this.container.outerWidth() > $(window).width()) {
+                    this.container.css({
+                        left: 'auto',
+                        right: 0
+                    });
+                }
+            }
+        },
+
+        toggle: function (e) {
+            if (this.element.hasClass('active')) {
+                this.hide();
+            } else {
+                this.show();
+            }
+        },
+
+        show: function (e) {
+            if (this.isShowing) return;
+
+            this.element.addClass('active');
+            this.container.show();
+            this.move();
+
+            // Create a click proxy that is private to this instance of datepicker, for unbinding
+            this._outsideClickProxy = $.proxy(function (e) { this.outsideClick(e); }, this);
+            // Bind global datepicker mousedown for hiding and
+            $(document)
+              .on('mousedown.daterangepicker', this._outsideClickProxy)
+              // also support mobile devices
+              .on('touchend.daterangepicker', this._outsideClickProxy)
+              // also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
+              .on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy)
+              // and also close when focus changes to outside the picker (eg. tabbing between controls)
+              .on('focusin.daterangepicker', this._outsideClickProxy);
+
+            this.isShowing = true;
+            this.element.trigger('show.daterangepicker', this);
+        },
+
+        outsideClick: function (e) {
+            var target = $(e.target);
+            // if the page is clicked anywhere except within the daterangerpicker/button
+            // itself then call this.hide()
+            if (
+                // ie modal dialog fix
+                e.type == "focusin" ||
+                target.closest(this.element).length ||
+                target.closest(this.container).length ||
+                target.closest('.calendar-date').length
+                ) return;
+            this.hide();
+        },
+
+        hide: function (e) {
+            if (!this.isShowing) return;
+
+            $(document)
+              .off('.daterangepicker');
+
+            this.element.removeClass('active');
+            this.container.hide();
+
+            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
+                this.notify();
+
+            this.oldStartDate = this.startDate.clone();
+            this.oldEndDate = this.endDate.clone();
+
+            this.isShowing = false;
+            this.element.trigger('hide.daterangepicker', this);
+        },
+
+        enterRange: function (e) {
+            // mouse pointer has entered a range label
+            var label = e.target.innerHTML;
+            if (label == this.locale.customRangeLabel) {
+                this.updateView();
+            } else {
+                var dates = this.ranges[label];
+                this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.format));
+                this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.format));
+            }
+        },
+
+        showCalendars: function() {
+            this.container.addClass('show-calendar');
+            this.move();
+            this.element.trigger('showCalendar.daterangepicker', this);
+        },
+
+        hideCalendars: function() {
+            this.container.removeClass('show-calendar');
+            this.element.trigger('hideCalendar.daterangepicker', this);
+        },
+
+        // when a date is typed into the start to end date textboxes
+        inputsChanged: function (e) {
+            var el = $(e.target);
+            var date = moment(el.val(), this.format);
+            if (!date.isValid()) return;
+
+            var startDate, endDate;
+            if (el.attr('name') === 'daterangepicker_start') {
+                startDate = (false !== this.minDate && date.isBefore(this.minDate)) ? this.minDate : date;
+                endDate = this.endDate;
+            } else {
+                startDate = this.startDate;
+                endDate = (false !== this.maxDate && date.isAfter(this.maxDate)) ? this.maxDate : date;
+            }
+            this.setCustomDates(startDate, endDate);
+        },
+
+        inputsKeydown: function(e) {
+            if (e.keyCode === 13) {
+                this.inputsChanged(e);
+                this.notify();
+            }
+        },
+
+        updateInputText: function() {
+            if (this.element.is('input') && !this.singleDatePicker) {
+                this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format));
+                this.element.trigger('change');
+            } else if (this.element.is('input')) {
+                this.element.val(this.endDate.format(this.format));
+                this.element.trigger('change');
+            }
+        },
+
+        clickRange: function (e) {
+            var label = e.target.innerHTML;
+            this.chosenLabel = label;
+            if (label == this.locale.customRangeLabel) {
+                this.showCalendars();
+            } else {
+                var dates = this.ranges[label];
+
+                this.startDate = dates[0];
+                this.endDate = dates[1];
+
+                if (!this.timePicker) {
+                    this.startDate.startOf('day');
+                    this.endDate.endOf('day');
+                }
+
+                this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
+                this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
+                this.updateCalendars();
+
+                this.updateInputText();
+
+                this.hideCalendars();
+                this.hide();
+                this.element.trigger('apply.daterangepicker', this);
+            }
+        },
+
+        clickPrev: function (e) {
+            var cal = $(e.target).parents('.calendar');
+            if (cal.hasClass('left')) {
+                this.leftCalendar.month.subtract(1, 'month');
+            } else {
+                this.rightCalendar.month.subtract(1, 'month');
+            }
+            this.updateCalendars();
+        },
+
+        clickNext: function (e) {
+            var cal = $(e.target).parents('.calendar');
+            if (cal.hasClass('left')) {
+                this.leftCalendar.month.add(1, 'month');
+            } else {
+                this.rightCalendar.month.add(1, 'month');
+            }
+            this.updateCalendars();
+        },
+
+        hoverDate: function (e) {
+            var title = $(e.target).attr('data-title');
+            var row = title.substr(1, 1);
+            var col = title.substr(3, 1);
+            var cal = $(e.target).parents('.calendar');
+
+            if (cal.hasClass('left')) {
+                this.container.find('input[name=daterangepicker_start]').val(this.leftCalendar.calendar[row][col].format(this.format));
+            } else {
+                this.container.find('input[name=daterangepicker_end]').val(this.rightCalendar.calendar[row][col].format(this.format));
+            }
+        },
+
+        setCustomDates: function(startDate, endDate) {
+            this.chosenLabel = this.locale.customRangeLabel;
+            if (startDate.isAfter(endDate)) {
+                var difference = this.endDate.diff(this.startDate);
+                endDate = moment(startDate).add(difference, 'ms');
+                if (this.maxDate && endDate.isAfter(this.maxDate)) {
+                  endDate = this.maxDate.clone();
+                }
+            }
+            this.startDate = startDate;
+            this.endDate = endDate;
+
+            this.updateView();
+            this.updateCalendars();
+        },
+
+        clickDate: function (e) {
+            var title = $(e.target).attr('data-title');
+            var row = title.substr(1, 1);
+            var col = title.substr(3, 1);
+            var cal = $(e.target).parents('.calendar');
+
+            var startDate, endDate;
+            if (cal.hasClass('left')) {
+                startDate = this.leftCalendar.calendar[row][col];
+                endDate = this.endDate;
+                if (typeof this.dateLimit === 'object') {
+                    var maxDate = moment(startDate).add(this.dateLimit).startOf('day');
+                    if (endDate.isAfter(maxDate)) {
+                        endDate = maxDate;
+                    }
+                }
+            } else {
+                startDate = this.startDate;
+                endDate = this.rightCalendar.calendar[row][col];
+                if (typeof this.dateLimit === 'object') {
+                    var minDate = moment(endDate).subtract(this.dateLimit).startOf('day');
+                    if (startDate.isBefore(minDate)) {
+                        startDate = minDate;
+                    }
+                }
+            }
+
+            if (this.singleDatePicker && cal.hasClass('left')) {
+                endDate = startDate.clone();
+            } else if (this.singleDatePicker && cal.hasClass('right')) {
+                startDate = endDate.clone();
+            }
+
+            cal.find('td').removeClass('active');
+
+            $(e.target).addClass('active');
+
+            this.setCustomDates(startDate, endDate);
+
+            if (!this.timePicker)
+                endDate.endOf('day');
+
+            if (this.singleDatePicker && !this.timePicker)
+                this.clickApply();
+        },
+
+        clickApply: function (e) {
+            this.updateInputText();
+            this.hide();
+            this.element.trigger('apply.daterangepicker', this);
+        },
+
+        clickCancel: function (e) {
+            this.startDate = this.oldStartDate;
+            this.endDate = this.oldEndDate;
+            this.chosenLabel = this.oldChosenLabel;
+            this.updateView();
+            this.updateCalendars();
+            this.hide();
+            this.element.trigger('cancel.daterangepicker', this);
+        },
+
+        updateMonthYear: function (e) {
+            var isLeft = $(e.target).closest('.calendar').hasClass('left'),
+                leftOrRight = isLeft ? 'left' : 'right',
+                cal = this.container.find('.calendar.'+leftOrRight);
+
+            // Month must be Number for new moment versions
+            var month = parseInt(cal.find('.monthselect').val(), 10);
+            var year = cal.find('.yearselect').val();
+
+            if (!isLeft && !this.singleDatePicker) {
+                if (year < this.startDate.year() || (year == this.startDate.year() && month < this.startDate.month())) {
+                    month = this.startDate.month();
+                    year = this.startDate.year();
+                }
+            }
+
+            if (this.minDate) {
+                if (year < this.minDate.year() || (year == this.minDate.year() && month < this.minDate.month())) {
+                    month = this.minDate.month();
+                    year = this.minDate.year();
+                }
+            }
+
+            if (this.maxDate) {
+                if (year > this.maxDate.year() || (year == this.maxDate.year() && month > this.maxDate.month())) {
+                    month = this.maxDate.month();
+                    year = this.maxDate.year();
+                }
+            }
+
+
+            this[leftOrRight+'Calendar'].month.month(month).year(year);
+            this.updateCalendars();
+        },
+
+        updateTime: function(e) {
+
+            var cal = $(e.target).closest('.calendar'),
+                isLeft = cal.hasClass('left');
+
+            var hour = parseInt(cal.find('.hourselect').val(), 10);
+            var minute = parseInt(cal.find('.minuteselect').val(), 10);
+            var second = 0;
+
+            if (this.timePickerSeconds) {
+                second = parseInt(cal.find('.secondselect').val(), 10);
+            }
+
+            if (this.timePicker12Hour) {
+                var ampm = cal.find('.ampmselect').val();
+                if (ampm === 'PM' && hour < 12)
+                    hour += 12;
+                if (ampm === 'AM' && hour === 12)
+                    hour = 0;
+            }
+
+            if (isLeft) {
+                var start = this.startDate.clone();
+                start.hour(hour);
+                start.minute(minute);
+                start.second(second);
+                this.startDate = start;
+                this.leftCalendar.month.hour(hour).minute(minute).second(second);
+                if (this.singleDatePicker)
+                    this.endDate = start.clone();
+            } else {
+                var end = this.endDate.clone();
+                end.hour(hour);
+                end.minute(minute);
+                end.second(second);
+                this.endDate = end;
+                if (this.singleDatePicker)
+                    this.startDate = end.clone();
+                this.rightCalendar.month.hour(hour).minute(minute).second(second);
+            }
+
+            this.updateView();
+            this.updateCalendars();
+        },
+
+        updateCalendars: function () {
+            this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), this.leftCalendar.month.second(), 'left');
+            this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), this.rightCalendar.month.second(), 'right');
+            this.container.find('.calendar.left').empty().html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate, 'left'));
+            this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.singleDatePicker ? this.minDate : this.startDate, this.maxDate, 'right'));
+
+            this.container.find('.ranges li').removeClass('active');
+            var customRange = true;
+            var i = 0;
+            for (var range in this.ranges) {
+                if (this.timePicker) {
+                    if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
+                        customRange = false;
+                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
+                            .addClass('active').html();
+                    }
+                } else {
+                    //ignore times when comparing dates if time picker is not enabled
+                    if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
+                        customRange = false;
+                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
+                            .addClass('active').html();
+                    }
+                }
+                i++;
+            }
+            if (customRange) {
+                this.chosenLabel = this.container.find('.ranges li:last').addClass('active').html();
+                this.showCalendars();
+            }
+        },
+
+        buildCalendar: function (month, year, hour, minute, second, side) {
+            var daysInMonth = moment([year, month]).daysInMonth();
+            var firstDay = moment([year, month, 1]);
+            var lastDay = moment([year, month, daysInMonth]);
+            var lastMonth = moment(firstDay).subtract(1, 'month').month();
+            var lastYear = moment(firstDay).subtract(1, 'month').year();
+
+            var daysInLastMonth = moment([lastYear, lastMonth]).daysInMonth();
+
+            var dayOfWeek = firstDay.day();
+
+            var i;
+
+            //initialize a 6 rows x 7 columns array for the calendar
+            var calendar = [];
+            calendar.firstDay = firstDay;
+            calendar.lastDay = lastDay;
+
+            for (i = 0; i < 6; i++) {
+                calendar[i] = [];
+            }
+
+            //populate the calendar with date objects
+            var startDay = daysInLastMonth - dayOfWeek + this.locale.firstDay + 1;
+            if (startDay > daysInLastMonth)
+                startDay -= 7;
+
+            if (dayOfWeek == this.locale.firstDay)
+                startDay = daysInLastMonth - 6;
+
+            var curDate = moment([lastYear, lastMonth, startDay, 12, minute, second]).utcOffset(this.timeZone);
+
+            var col, row;
+            for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add(24, 'hour')) {
+                if (i > 0 && col % 7 === 0) {
+                    col = 0;
+                    row++;
+                }
+                calendar[row][col] = curDate.clone().hour(hour);
+                curDate.hour(12);
+
+                if (this.minDate && calendar[row][col].format('YYYY-MM-DD') == this.minDate.format('YYYY-MM-DD') && calendar[row][col].isBefore(this.minDate) && side == 'left') {
+                    calendar[row][col] = this.minDate.clone();
+                }
+
+                if (this.maxDate && calendar[row][col].format('YYYY-MM-DD') == this.maxDate.format('YYYY-MM-DD') && calendar[row][col].isAfter(this.maxDate) && side == 'right') {
+                    calendar[row][col] = this.maxDate.clone();
+                }
+
+            }
+
+            return calendar;
+        },
+
+        renderDropdowns: function (selected, minDate, maxDate) {
+            var currentMonth = selected.month();
+            var currentYear = selected.year();
+            var maxYear = (maxDate && maxDate.year()) || (currentYear + 5);
+            var minYear = (minDate && minDate.year()) || (currentYear - 50);
+
+            var monthHtml = '<select class="monthselect">';
+            var inMinYear = currentYear == minYear;
+            var inMaxYear = currentYear == maxYear;
+
+            for (var m = 0; m < 12; m++) {
+                if ((!inMinYear || m >= minDate.month()) && (!inMaxYear || m <= maxDate.month())) {
+                    monthHtml += "<option value='" + m + "'" +
+                        (m === currentMonth ? " selected='selected'" : "") +
+                        ">" + this.locale.monthNames[m] + "</option>";
+                }
+            }
+            monthHtml += "</select>";
+
+            var yearHtml = '<select class="yearselect">';
+
+            for (var y = minYear; y <= maxYear; y++) {
+                yearHtml += '<option value="' + y + '"' +
+                    (y === currentYear ? ' selected="selected"' : '') +
+                    '>' + y + '</option>';
+            }
+
+            yearHtml += '</select>';
+
+            return monthHtml + yearHtml;
+        },
+
+        renderCalendar: function (calendar, selected, minDate, maxDate, side) {
+
+            var html = '<div class="calendar-date">';
+            html += '<table class="table-condensed">';
+            html += '<thead>';
+            html += '<tr>';
+
+            // add empty cell for week number
+            if (this.showWeekNumbers)
+                html += '<th></th>';
+
+            if (!minDate || minDate.isBefore(calendar.firstDay)) {
+                html += '<th class="prev available"><i class="fa fa-arrow-left icon icon-arrow-left glyphicon glyphicon-arrow-left"></i></th>';
+            } else {
+                html += '<th></th>';
+            }
+
+            var dateHtml = this.locale.monthNames[calendar[1][1].month()] + calendar[1][1].format(" YYYY");
+
+            if (this.showDropdowns) {
+                dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate);
+            }
+
+            html += '<th colspan="5" class="month">' + dateHtml + '</th>';
+            if (!maxDate || maxDate.isAfter(calendar.lastDay)) {
+                html += '<th class="next available"><i class="fa fa-arrow-right icon icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>';
+            } else {
+                html += '<th></th>';
+            }
+
+            html += '</tr>';
+            html += '<tr>';
+
+            // add week number label
+            if (this.showWeekNumbers)
+                html += '<th class="week">' + this.locale.weekLabel + '</th>';
+
+            $.each(this.locale.daysOfWeek, function (index, dayOfWeek) {
+                html += '<th>' + dayOfWeek + '</th>';
+            });
+
+            html += '</tr>';
+            html += '</thead>';
+            html += '<tbody>';
+
+            for (var row = 0; row < 6; row++) {
+                html += '<tr>';
+
+                // add week number
+                if (this.showWeekNumbers)
+                    html += '<td class="week">' + calendar[row][0].week() + '</td>';
+
+                for (var col = 0; col < 7; col++) {
+                    var cname = 'available ';
+                    cname += (calendar[row][col].month() == calendar[1][1].month()) ? '' : 'off';
+
+                    if ((minDate && calendar[row][col].isBefore(minDate, 'day')) || (maxDate && calendar[row][col].isAfter(maxDate, 'day'))) {
+                        cname = ' off disabled ';
+                    } else if (calendar[row][col].format('YYYY-MM-DD') == selected.format('YYYY-MM-DD')) {
+                        cname += ' active ';
+                        if (calendar[row][col].format('YYYY-MM-DD') == this.startDate.format('YYYY-MM-DD')) {
+                            cname += ' start-date ';
+                        }
+                        if (calendar[row][col].format('YYYY-MM-DD') == this.endDate.format('YYYY-MM-DD')) {
+                            cname += ' end-date ';
+                        }
+                    } else if (calendar[row][col] >= this.startDate && calendar[row][col] <= this.endDate) {
+                        cname += ' in-range ';
+                        if (calendar[row][col].isSame(this.startDate)) { cname += ' start-date '; }
+                        if (calendar[row][col].isSame(this.endDate)) { cname += ' end-date '; }
+                    }
+
+                    var title = 'r' + row + 'c' + col;
+                    html += '<td class="' + cname.replace(/\s+/g, ' ').replace(/^\s?(.*?)\s?$/, '$1') + '" data-title="' + title + '">' + calendar[row][col].date() + '</td>';
+                }
+                html += '</tr>';
+            }
+
+            html += '</tbody>';
+            html += '</table>';
+            html += '</div>';
+
+            var i;
+            if (this.timePicker) {
+
+                html += '<div class="calendar-time">';
+                html += '<select class="hourselect">';
+
+                // Disallow selections before the minDate or after the maxDate
+                var min_hour = 0;
+                var max_hour = 23;
+
+                if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == minDate.format('YYYY-MM-DD')) {
+                    min_hour = minDate.hour();
+                    if (selected.hour() < min_hour)
+                        selected.hour(min_hour);
+                    if (this.timePicker12Hour && min_hour >= 12 && selected.hour() >= 12)
+                        min_hour -= 12;
+                    if (this.timePicker12Hour && min_hour == 12)
+                        min_hour = 1;
+                }
+
+                if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == maxDate.format('YYYY-MM-DD')) {
+                    max_hour = maxDate.hour();
+                    if (selected.hour() > max_hour)
+                        selected.hour(max_hour);
+                    if (this.timePicker12Hour && max_hour >= 12 && selected.hour() >= 12)
+                        max_hour -= 12;
+                }
+
+                var start = 0;
+                var end = 23;
+                var selected_hour = selected.hour();
+                if (this.timePicker12Hour) {
+                    start = 1;
+                    end = 12;
+                    if (selected_hour >= 12)
+                        selected_hour -= 12;
+                    if (selected_hour === 0)
+                        selected_hour = 12;
+                }
+
+                for (i = start; i <= end; i++) {
+
+                    if (i == selected_hour) {
+                        html += '<option value="' + i + '" selected="selected">' + i + '</option>';
+                    } else if (i < min_hour || i > max_hour) {
+                        html += '<option value="' + i + '" disabled="disabled" class="disabled">' + i + '</option>';
+                    } else {
+                        html += '<option value="' + i + '">' + i + '</option>';
+                    }
+                }
+
+                html += '</select> : ';
+
+                html += '<select class="minuteselect">';
+
+                // Disallow selections before the minDate or after the maxDate
+                var min_minute = 0;
+                var max_minute = 59;
+
+                if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD h A') == minDate.format('YYYY-MM-DD h A')) {
+                    min_minute = minDate.minute();
+                    if (selected.minute() < min_minute)
+                        selected.minute(min_minute);
+                }
+
+                if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD h A') == maxDate.format('YYYY-MM-DD h A')) {
+                    max_minute = maxDate.minute();
+                    if (selected.minute() > max_minute)
+                        selected.minute(max_minute);
+                }
+
+                for (i = 0; i < 60; i += this.timePickerIncrement) {
+                    var num = i;
+                    if (num < 10)
+                        num = '0' + num;
+                    if (i == selected.minute()) {
+                        html += '<option value="' + i + '" selected="selected">' + num + '</option>';
+                    } else if (i < min_minute || i > max_minute) {
+                        html += '<option value="' + i + '" disabled="disabled" class="disabled">' + num + '</option>';
+                    } else {
+                        html += '<option value="' + i + '">' + num + '</option>';
+                    }
+                }
+
+                html += '</select> ';
+
+                if (this.timePickerSeconds) {
+                    html += ': <select class="secondselect">';
+
+                    for (i = 0; i < 60; i += this.timePickerIncrement) {
+                        var num = i;
+                        if (num < 10)
+                            num = '0' + num;
+                        if (i == selected.second()) {
+                            html += '<option value="' + i + '" selected="selected">' + num + '</option>';
+                        } else {
+                            html += '<option value="' + i + '">' + num + '</option>';
+                        }
+                    }
+
+                    html += '</select>';
+                }
+
+                if (this.timePicker12Hour) {
+                    html += '<select class="ampmselect">';
+
+                    // Disallow selection before the minDate or after the maxDate
+                    var am_html = '';
+                    var pm_html = '';
+
+                    if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == minDate.format('YYYY-MM-DD') && minDate.hour() >= 12) {
+                        am_html = ' disabled="disabled" class="disabled"';
+                    }
+
+                    if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == maxDate.format('YYYY-MM-DD') && maxDate.hour() < 12) {
+                        pm_html = ' disabled="disabled" class="disabled"';
+                    }
+
+                    if (selected.hour() >= 12) {
+                        html += '<option value="AM"' + am_html + '>AM</option><option value="PM" selected="selected"' + pm_html + '>PM</option>';
+                    } else {
+                        html += '<option value="AM" selected="selected"' + am_html + '>AM</option><option value="PM"' + pm_html + '>PM</option>';
+                    }
+                    html += '</select>';
+                }
+
+                html += '</div>';
+
+            }
+
+            return html;
+
+        },
+
+        remove: function() {
+
+            this.container.remove();
+            this.element.off('.daterangepicker');
+            this.element.removeData('daterangepicker');
+
+        }
+
+    };
+
+    $.fn.daterangepicker = function (options, cb) {
+        this.each(function () {
+            var el = $(this);
+            if (el.data('daterangepicker'))
+                el.data('daterangepicker').remove();
+            el.data('daterangepicker', new DateRangePicker(el, options, cb));
+        });
+        return this;
+    };
+
+}));
diff --git a/culturefeed_search_ui/js/moment.min.js b/culturefeed_search_ui/js/moment.min.js
new file mode 100644
index 00000000..024d488f
--- /dev/null
+++ b/culturefeed_search_ui/js/moment.min.js
@@ -0,0 +1,7 @@
+//! moment.js
+//! version : 2.9.0
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+(function(a){function b(a,b,c){switch(arguments.length){case 2:return null!=a?a:b;case 3:return null!=a?a:null!=b?b:c;default:throw new Error("Implement me")}}function c(a,b){return Bb.call(a,b)}function d(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function e(a){vb.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function f(a,b){var c=!0;return o(function(){return c&&(e(a),c=!1),b.apply(this,arguments)},b)}function g(a,b){sc[a]||(e(b),sc[a]=!0)}function h(a,b){return function(c){return r(a.call(this,c),b)}}function i(a,b){return function(c){return this.localeData().ordinal(a.call(this,c),b)}}function j(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function k(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function l(){}function m(a,b){b!==!1&&H(a),p(this,a),this._d=new Date(+a._d),uc===!1&&(uc=!0,vb.updateOffset(this),uc=!1)}function n(a){var b=A(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=vb.localeData(),this._bubble()}function o(a,b){for(var d in b)c(b,d)&&(a[d]=b[d]);return c(b,"toString")&&(a.toString=b.toString),c(b,"valueOf")&&(a.valueOf=b.valueOf),a}function p(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Kb.length>0)for(c in Kb)d=Kb[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function q(a){return 0>a?Math.ceil(a):Math.floor(a)}function r(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function s(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function t(a,b){var c;return b=M(b,a),a.isBefore(b)?c=s(a,b):(c=s(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function u(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(g(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=vb.duration(c,d),v(this,e,a),this}}function v(a,b,c,d){var e=b._milliseconds,f=b._days,g=b._months;d=null==d?!0:d,e&&a._d.setTime(+a._d+e*c),f&&pb(a,"Date",ob(a,"Date")+f*c),g&&nb(a,ob(a,"Month")+g*c),d&&vb.updateOffset(a,f||g)}function w(a){return"[object Array]"===Object.prototype.toString.call(a)}function x(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function y(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&C(a[d])!==C(b[d]))&&g++;return g+f}function z(a){if(a){var b=a.toLowerCase().replace(/(.)s$/,"$1");a=lc[a]||mc[b]||b}return a}function A(a){var b,d,e={};for(d in a)c(a,d)&&(b=z(d),b&&(e[b]=a[d]));return e}function B(b){var c,d;if(0===b.indexOf("week"))c=7,d="day";else{if(0!==b.indexOf("month"))return;c=12,d="month"}vb[b]=function(e,f){var g,h,i=vb._locale[b],j=[];if("number"==typeof e&&(f=e,e=a),h=function(a){var b=vb().utc().set(d,a);return i.call(vb._locale,b,e||"")},null!=f)return h(f);for(g=0;c>g;g++)j.push(h(g));return j}}function C(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function D(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function E(a,b,c){return jb(vb([a,11,31+b-c]),b,c).week}function F(a){return G(a)?366:365}function G(a){return a%4===0&&a%100!==0||a%400===0}function H(a){var b;a._a&&-2===a._pf.overflow&&(b=a._a[Db]<0||a._a[Db]>11?Db:a._a[Eb]<1||a._a[Eb]>D(a._a[Cb],a._a[Db])?Eb:a._a[Fb]<0||a._a[Fb]>24||24===a._a[Fb]&&(0!==a._a[Gb]||0!==a._a[Hb]||0!==a._a[Ib])?Fb:a._a[Gb]<0||a._a[Gb]>59?Gb:a._a[Hb]<0||a._a[Hb]>59?Hb:a._a[Ib]<0||a._a[Ib]>999?Ib:-1,a._pf._overflowDayOfYear&&(Cb>b||b>Eb)&&(b=Eb),a._pf.overflow=b)}function I(b){return null==b._isValid&&(b._isValid=!isNaN(b._d.getTime())&&b._pf.overflow<0&&!b._pf.empty&&!b._pf.invalidMonth&&!b._pf.nullInput&&!b._pf.invalidFormat&&!b._pf.userInvalidated,b._strict&&(b._isValid=b._isValid&&0===b._pf.charsLeftOver&&0===b._pf.unusedTokens.length&&b._pf.bigHour===a)),b._isValid}function J(a){return a?a.toLowerCase().replace("_","-"):a}function K(a){for(var b,c,d,e,f=0;f<a.length;){for(e=J(a[f]).split("-"),b=e.length,c=J(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=L(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&y(e,c,!0)>=b-1)break;b--}f++}return null}function L(a){var b=null;if(!Jb[a]&&Lb)try{b=vb.locale(),require("./locale/"+a),vb.locale(b)}catch(c){}return Jb[a]}function M(a,b){var c,d;return b._isUTC?(c=b.clone(),d=(vb.isMoment(a)||x(a)?+a:+vb(a))-+c,c._d.setTime(+c._d+d),vb.updateOffset(c,!1),c):vb(a).local()}function N(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function O(a){var b,c,d=a.match(Pb);for(b=0,c=d.length;c>b;b++)d[b]=rc[d[b]]?rc[d[b]]:N(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function P(a,b){return a.isValid()?(b=Q(b,a.localeData()),nc[b]||(nc[b]=O(b)),nc[b](a)):a.localeData().invalidDate()}function Q(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Qb.lastIndex=0;d>=0&&Qb.test(a);)a=a.replace(Qb,c),Qb.lastIndex=0,d-=1;return a}function R(a,b){var c,d=b._strict;switch(a){case"Q":return _b;case"DDDD":return bc;case"YYYY":case"GGGG":case"gggg":return d?cc:Tb;case"Y":case"G":case"g":return ec;case"YYYYYY":case"YYYYY":case"GGGGG":case"ggggg":return d?dc:Ub;case"S":if(d)return _b;case"SS":if(d)return ac;case"SSS":if(d)return bc;case"DDD":return Sb;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return Wb;case"a":case"A":return b._locale._meridiemParse;case"x":return Zb;case"X":return $b;case"Z":case"ZZ":return Xb;case"T":return Yb;case"SSSS":return Vb;case"MM":case"DD":case"YY":case"GG":case"gg":case"HH":case"hh":case"mm":case"ss":case"ww":case"WW":return d?ac:Rb;case"M":case"D":case"d":case"H":case"h":case"m":case"s":case"w":case"W":case"e":case"E":return Rb;case"Do":return d?b._locale._ordinalParse:b._locale._ordinalParseLenient;default:return c=new RegExp($(Z(a.replace("\\","")),"i"))}}function S(a){a=a||"";var b=a.match(Xb)||[],c=b[b.length-1]||[],d=(c+"").match(jc)||["-",0,0],e=+(60*d[1])+C(d[2]);return"+"===d[0]?e:-e}function T(a,b,c){var d,e=c._a;switch(a){case"Q":null!=b&&(e[Db]=3*(C(b)-1));break;case"M":case"MM":null!=b&&(e[Db]=C(b)-1);break;case"MMM":case"MMMM":d=c._locale.monthsParse(b,a,c._strict),null!=d?e[Db]=d:c._pf.invalidMonth=b;break;case"D":case"DD":null!=b&&(e[Eb]=C(b));break;case"Do":null!=b&&(e[Eb]=C(parseInt(b.match(/\d{1,2}/)[0],10)));break;case"DDD":case"DDDD":null!=b&&(c._dayOfYear=C(b));break;case"YY":e[Cb]=vb.parseTwoDigitYear(b);break;case"YYYY":case"YYYYY":case"YYYYYY":e[Cb]=C(b);break;case"a":case"A":c._meridiem=b;break;case"h":case"hh":c._pf.bigHour=!0;case"H":case"HH":e[Fb]=C(b);break;case"m":case"mm":e[Gb]=C(b);break;case"s":case"ss":e[Hb]=C(b);break;case"S":case"SS":case"SSS":case"SSSS":e[Ib]=C(1e3*("0."+b));break;case"x":c._d=new Date(C(b));break;case"X":c._d=new Date(1e3*parseFloat(b));break;case"Z":case"ZZ":c._useUTC=!0,c._tzm=S(b);break;case"dd":case"ddd":case"dddd":d=c._locale.weekdaysParse(b),null!=d?(c._w=c._w||{},c._w.d=d):c._pf.invalidWeekday=b;break;case"w":case"ww":case"W":case"WW":case"d":case"e":case"E":a=a.substr(0,1);case"gggg":case"GGGG":case"GGGGG":a=a.substr(0,2),b&&(c._w=c._w||{},c._w[a]=C(b));break;case"gg":case"GG":c._w=c._w||{},c._w[a]=vb.parseTwoDigitYear(b)}}function U(a){var c,d,e,f,g,h,i;c=a._w,null!=c.GG||null!=c.W||null!=c.E?(g=1,h=4,d=b(c.GG,a._a[Cb],jb(vb(),1,4).year),e=b(c.W,1),f=b(c.E,1)):(g=a._locale._week.dow,h=a._locale._week.doy,d=b(c.gg,a._a[Cb],jb(vb(),g,h).year),e=b(c.w,1),null!=c.d?(f=c.d,g>f&&++e):f=null!=c.e?c.e+g:g),i=kb(d,e,f,h,g),a._a[Cb]=i.year,a._dayOfYear=i.dayOfYear}function V(a){var c,d,e,f,g=[];if(!a._d){for(e=X(a),a._w&&null==a._a[Eb]&&null==a._a[Db]&&U(a),a._dayOfYear&&(f=b(a._a[Cb],e[Cb]),a._dayOfYear>F(f)&&(a._pf._overflowDayOfYear=!0),d=fb(f,0,a._dayOfYear),a._a[Db]=d.getUTCMonth(),a._a[Eb]=d.getUTCDate()),c=0;3>c&&null==a._a[c];++c)a._a[c]=g[c]=e[c];for(;7>c;c++)a._a[c]=g[c]=null==a._a[c]?2===c?1:0:a._a[c];24===a._a[Fb]&&0===a._a[Gb]&&0===a._a[Hb]&&0===a._a[Ib]&&(a._nextDay=!0,a._a[Fb]=0),a._d=(a._useUTC?fb:eb).apply(null,g),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[Fb]=24)}}function W(a){var b;a._d||(b=A(a._i),a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],V(a))}function X(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function Y(b){if(b._f===vb.ISO_8601)return void ab(b);b._a=[],b._pf.empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,j=0;for(e=Q(b._f,b._locale).match(Pb)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(R(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&b._pf.unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),j+=d.length),rc[f]?(d?b._pf.empty=!1:b._pf.unusedTokens.push(f),T(f,d,b)):b._strict&&!d&&b._pf.unusedTokens.push(f);b._pf.charsLeftOver=i-j,h.length>0&&b._pf.unusedInput.push(h),b._pf.bigHour===!0&&b._a[Fb]<=12&&(b._pf.bigHour=a),b._a[Fb]=k(b._locale,b._a[Fb],b._meridiem),V(b),H(b)}function Z(a){return a.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e})}function $(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function _(a){var b,c,e,f,g;if(0===a._f.length)return a._pf.invalidFormat=!0,void(a._d=new Date(0/0));for(f=0;f<a._f.length;f++)g=0,b=p({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._pf=d(),b._f=a._f[f],Y(b),I(b)&&(g+=b._pf.charsLeftOver,g+=10*b._pf.unusedTokens.length,b._pf.score=g,(null==e||e>g)&&(e=g,c=b));o(a,c||b)}function ab(a){var b,c,d=a._i,e=fc.exec(d);if(e){for(a._pf.iso=!0,b=0,c=hc.length;c>b;b++)if(hc[b][1].exec(d)){a._f=hc[b][0]+(e[6]||" ");break}for(b=0,c=ic.length;c>b;b++)if(ic[b][1].exec(d)){a._f+=ic[b][0];break}d.match(Xb)&&(a._f+="Z"),Y(a)}else a._isValid=!1}function bb(a){ab(a),a._isValid===!1&&(delete a._isValid,vb.createFromInputFallback(a))}function cb(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function db(b){var c,d=b._i;d===a?b._d=new Date:x(d)?b._d=new Date(+d):null!==(c=Mb.exec(d))?b._d=new Date(+c[1]):"string"==typeof d?bb(b):w(d)?(b._a=cb(d.slice(0),function(a){return parseInt(a,10)}),V(b)):"object"==typeof d?W(b):"number"==typeof d?b._d=new Date(d):vb.createFromInputFallback(b)}function eb(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function fb(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function gb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function hb(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function ib(a,b,c){var d=vb.duration(a).abs(),e=Ab(d.as("s")),f=Ab(d.as("m")),g=Ab(d.as("h")),h=Ab(d.as("d")),i=Ab(d.as("M")),j=Ab(d.as("y")),k=e<oc.s&&["s",e]||1===f&&["m"]||f<oc.m&&["mm",f]||1===g&&["h"]||g<oc.h&&["hh",g]||1===h&&["d"]||h<oc.d&&["dd",h]||1===i&&["M"]||i<oc.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,hb.apply({},k)}function jb(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=vb(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function kb(a,b,c,d,e){var f,g,h=fb(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:F(a-1)+g}}function lb(b){var c,d=b._i,e=b._f;return b._locale=b._locale||vb.localeData(b._l),null===d||e===a&&""===d?vb.invalid({nullInput:!0}):("string"==typeof d&&(b._i=d=b._locale.preparse(d)),vb.isMoment(d)?new m(d,!0):(e?w(e)?_(b):Y(b):db(b),c=new m(b),c._nextDay&&(c.add(1,"d"),c._nextDay=a),c))}function mb(a,b){var c,d;if(1===b.length&&w(b[0])&&(b=b[0]),!b.length)return vb();for(c=b[0],d=1;d<b.length;++d)b[d][a](c)&&(c=b[d]);return c}function nb(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),D(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function ob(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function pb(a,b,c){return"Month"===b?nb(a,c):a._d["set"+(a._isUTC?"UTC":"")+b](c)}function qb(a,b){return function(c){return null!=c?(pb(this,a,c),vb.updateOffset(this,b),this):ob(this,a)}}function rb(a){return 400*a/146097}function sb(a){return 146097*a/400}function tb(a){vb.duration.fn[a]=function(){return this._data[a]}}function ub(a){"undefined"==typeof ender&&(wb=zb.moment,zb.moment=a?f("Accessing Moment through the global scope is deprecated, and will be removed in an upcoming release.",vb):vb)}for(var vb,wb,xb,yb="2.9.0",zb="undefined"==typeof global||"undefined"!=typeof window&&window!==global.window?this:global,Ab=Math.round,Bb=Object.prototype.hasOwnProperty,Cb=0,Db=1,Eb=2,Fb=3,Gb=4,Hb=5,Ib=6,Jb={},Kb=[],Lb="undefined"!=typeof module&&module&&module.exports,Mb=/^\/?Date\((\-?\d+)/i,Nb=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,Ob=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,Pb=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g,Qb=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Rb=/\d\d?/,Sb=/\d{1,3}/,Tb=/\d{1,4}/,Ub=/[+\-]?\d{1,6}/,Vb=/\d+/,Wb=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Xb=/Z|[\+\-]\d\d:?\d\d/gi,Yb=/T/i,Zb=/[\+\-]?\d+/,$b=/[\+\-]?\d+(\.\d{1,3})?/,_b=/\d/,ac=/\d\d/,bc=/\d{3}/,cc=/\d{4}/,dc=/[+-]?\d{6}/,ec=/[+-]?\d+/,fc=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,gc="YYYY-MM-DDTHH:mm:ssZ",hc=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],ic=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],jc=/([\+\-]|\d\d)/gi,kc=("Date|Hours|Minutes|Seconds|Milliseconds".split("|"),{Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6}),lc={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",D:"date",w:"week",W:"isoWeek",M:"month",Q:"quarter",y:"year",DDD:"dayOfYear",e:"weekday",E:"isoWeekday",gg:"weekYear",GG:"isoWeekYear"},mc={dayofyear:"dayOfYear",isoweekday:"isoWeekday",isoweek:"isoWeek",weekyear:"weekYear",isoweekyear:"isoWeekYear"},nc={},oc={s:45,m:45,h:22,d:26,M:11},pc="DDD w W M D d".split(" "),qc="M D H h m s w W".split(" "),rc={M:function(){return this.month()+1},MMM:function(a){return this.localeData().monthsShort(this,a)},MMMM:function(a){return this.localeData().months(this,a)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(a){return this.localeData().weekdaysMin(this,a)},ddd:function(a){return this.localeData().weekdaysShort(this,a)},dddd:function(a){return this.localeData().weekdays(this,a)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return r(this.year()%100,2)},YYYY:function(){return r(this.year(),4)},YYYYY:function(){return r(this.year(),5)},YYYYYY:function(){var a=this.year(),b=a>=0?"+":"-";return b+r(Math.abs(a),6)},gg:function(){return r(this.weekYear()%100,2)},gggg:function(){return r(this.weekYear(),4)},ggggg:function(){return r(this.weekYear(),5)},GG:function(){return r(this.isoWeekYear()%100,2)},GGGG:function(){return r(this.isoWeekYear(),4)},GGGGG:function(){return r(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return C(this.milliseconds()/100)},SS:function(){return r(C(this.milliseconds()/10),2)},SSS:function(){return r(this.milliseconds(),3)},SSSS:function(){return r(this.milliseconds(),3)},Z:function(){var a=this.utcOffset(),b="+";return 0>a&&(a=-a,b="-"),b+r(C(a/60),2)+":"+r(C(a)%60,2)},ZZ:function(){var a=this.utcOffset(),b="+";return 0>a&&(a=-a,b="-"),b+r(C(a/60),2)+r(C(a)%60,2)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},x:function(){return this.valueOf()},X:function(){return this.unix()},Q:function(){return this.quarter()}},sc={},tc=["months","monthsShort","weekdays","weekdaysShort","weekdaysMin"],uc=!1;pc.length;)xb=pc.pop(),rc[xb+"o"]=i(rc[xb],xb);for(;qc.length;)xb=qc.pop(),rc[xb+xb]=h(rc[xb],2);rc.DDDD=h(rc.DDD,3),o(l.prototype,{set:function(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(a){return this._months[a.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(a){return this._monthsShort[a.month()]},monthsParse:function(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=vb.utc([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(a){return this._weekdays[a.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(a){return this._weekdaysShort[a.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(a){return this._weekdaysMin[a.day()]},weekdaysParse:function(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=vb([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b},_longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},longDateFormat:function(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b},isPM:function(a){return"p"===(a+"").toLowerCase().charAt(0)},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.apply(b,[c]):d},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)},pastFuture:function(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)},ordinal:function(a){return this._ordinal.replace("%d",a)},_ordinal:"%d",_ordinalParse:/\d{1,2}/,preparse:function(a){return a},postformat:function(a){return a},week:function(a){return jb(a,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6},firstDayOfWeek:function(){return this._week.dow},firstDayOfYear:function(){return this._week.doy},_invalidDate:"Invalid date",invalidDate:function(){return this._invalidDate}}),vb=function(b,c,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._i=b,g._f=c,g._l=e,g._strict=f,g._isUTC=!1,g._pf=d(),lb(g)},vb.suppressDeprecationWarnings=!1,vb.createFromInputFallback=f("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),vb.min=function(){var a=[].slice.call(arguments,0);return mb("isBefore",a)},vb.max=function(){var a=[].slice.call(arguments,0);return mb("isAfter",a)},vb.utc=function(b,c,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._useUTC=!0,g._isUTC=!0,g._l=e,g._i=b,g._f=c,g._strict=f,g._pf=d(),lb(g).utc()},vb.unix=function(a){return vb(1e3*a)},vb.duration=function(a,b){var d,e,f,g,h=a,i=null;return vb.isDuration(a)?h={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(h={},b?h[b]=a:h.milliseconds=a):(i=Nb.exec(a))?(d="-"===i[1]?-1:1,h={y:0,d:C(i[Eb])*d,h:C(i[Fb])*d,m:C(i[Gb])*d,s:C(i[Hb])*d,ms:C(i[Ib])*d}):(i=Ob.exec(a))?(d="-"===i[1]?-1:1,f=function(a){var b=a&&parseFloat(a.replace(",","."));return(isNaN(b)?0:b)*d},h={y:f(i[2]),M:f(i[3]),d:f(i[4]),h:f(i[5]),m:f(i[6]),s:f(i[7]),w:f(i[8])}):null==h?h={}:"object"==typeof h&&("from"in h||"to"in h)&&(g=t(vb(h.from),vb(h.to)),h={},h.ms=g.milliseconds,h.M=g.months),e=new n(h),vb.isDuration(a)&&c(a,"_locale")&&(e._locale=a._locale),e},vb.version=yb,vb.defaultFormat=gc,vb.ISO_8601=function(){},vb.momentProperties=Kb,vb.updateOffset=function(){},vb.relativeTimeThreshold=function(b,c){return oc[b]===a?!1:c===a?oc[b]:(oc[b]=c,!0)},vb.lang=f("moment.lang is deprecated. Use moment.locale instead.",function(a,b){return vb.locale(a,b)}),vb.locale=function(a,b){var c;return a&&(c="undefined"!=typeof b?vb.defineLocale(a,b):vb.localeData(a),c&&(vb.duration._locale=vb._locale=c)),vb._locale._abbr},vb.defineLocale=function(a,b){return null!==b?(b.abbr=a,Jb[a]||(Jb[a]=new l),Jb[a].set(b),vb.locale(a),Jb[a]):(delete Jb[a],null)},vb.langData=f("moment.langData is deprecated. Use moment.localeData instead.",function(a){return vb.localeData(a)}),vb.localeData=function(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return vb._locale;if(!w(a)){if(b=L(a))return b;a=[a]}return K(a)},vb.isMoment=function(a){return a instanceof m||null!=a&&c(a,"_isAMomentObject")},vb.isDuration=function(a){return a instanceof n};for(xb=tc.length-1;xb>=0;--xb)B(tc[xb]);vb.normalizeUnits=function(a){return z(a)},vb.invalid=function(a){var b=vb.utc(0/0);return null!=a?o(b._pf,a):b._pf.userInvalidated=!0,b},vb.parseZone=function(){return vb.apply(null,arguments).parseZone()},vb.parseTwoDigitYear=function(a){return C(a)+(C(a)>68?1900:2e3)},vb.isDate=x,o(vb.fn=m.prototype,{clone:function(){return vb(this)},valueOf:function(){return+this._d-6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){var a=vb(this).utc();return 0<a.year()&&a.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():P(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):P(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds()]},isValid:function(){return I(this)},isDSTShifted:function(){return this._a?this.isValid()&&y(this._a,(this._isUTC?vb.utc(this._a):vb(this._a)).toArray())>0:!1},parsingFlags:function(){return o({},this._pf)},invalidAt:function(){return this._pf.overflow},utc:function(a){return this.utcOffset(0,a)},local:function(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(this._dateUtcOffset(),"m")),this},format:function(a){var b=P(this,a||vb.defaultFormat);return this.localeData().postformat(b)},add:u(1,"add"),subtract:u(-1,"subtract"),diff:function(a,b,c){var d,e,f=M(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=z(b),"year"===b||"month"===b||"quarter"===b?(e=j(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:q(e)},from:function(a,b){return vb.duration({to:this,from:a}).locale(this.locale()).humanize(!b)},fromNow:function(a){return this.from(vb(),a)},calendar:function(a){var b=a||vb(),c=M(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this,vb(b)))},isLeapYear:function(){return G(this.year())},isDST:function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=gb(a,this.localeData()),this.add(a-b,"d")):b},month:qb("Month",!0),startOf:function(a){switch(a=z(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a?this.weekday(0):"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this},endOf:function(b){return b=z(b),b===a||"millisecond"===b?this:this.startOf(b).add(1,"isoWeek"===b?"week":b).subtract(1,"ms")},isAfter:function(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=vb.isMoment(a)?a:vb(a),+this>+a):(c=vb.isMoment(a)?+a:+vb(a),c<+this.clone().startOf(b))},isBefore:function(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=vb.isMoment(a)?a:vb(a),+a>+this):(c=vb.isMoment(a)?+a:+vb(a),+this.clone().endOf(b)<c)},isBetween:function(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)},isSame:function(a,b){var c;return b=z(b||"millisecond"),"millisecond"===b?(a=vb.isMoment(a)?a:vb(a),+this===+a):(c=+vb(a),+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))},min:f("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(a){return a=vb.apply(null,arguments),this>a?this:a}),max:f("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(a){return a=vb.apply(null,arguments),a>this?this:a}),zone:f("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",function(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}),utcOffset:function(a,b){var c,d=this._offset||0;return null!=a?("string"==typeof a&&(a=S(a)),Math.abs(a)<16&&(a=60*a),!this._isUTC&&b&&(c=this._dateUtcOffset()),this._offset=a,this._isUTC=!0,null!=c&&this.add(c,"m"),d!==a&&(!b||this._changeInProgress?v(this,vb.duration(a-d,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,vb.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?d:this._dateUtcOffset()},isLocal:function(){return!this._isUTC},isUtcOffset:function(){return this._isUTC},isUtc:function(){return this._isUTC&&0===this._offset},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},parseZone:function(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(S(this._i)),this},hasAlignedHourOffset:function(a){return a=a?vb(a).utcOffset():0,(this.utcOffset()-a)%60===0},daysInMonth:function(){return D(this.year(),this.month())},dayOfYear:function(a){var b=Ab((vb(this).startOf("day")-vb(this).startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")},quarter:function(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)},weekYear:function(a){var b=jb(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")},isoWeekYear:function(a){var b=jb(this,1,4).year;return null==a?b:this.add(a-b,"y")},week:function(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")},isoWeek:function(a){var b=jb(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")},weekday:function(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")},isoWeekday:function(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)},isoWeeksInYear:function(){return E(this.year(),1,4)},weeksInYear:function(){var a=this.localeData()._week;return E(this.year(),a.dow,a.doy)},get:function(a){return a=z(a),this[a]()},set:function(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else a=z(a),"function"==typeof this[a]&&this[a](b);return this},locale:function(b){var c;return b===a?this._locale._abbr:(c=vb.localeData(b),null!=c&&(this._locale=c),this)},lang:f("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(b){return b===a?this.localeData():this.locale(b)}),localeData:function(){return this._locale},_dateUtcOffset:function(){return 15*-Math.round(this._d.getTimezoneOffset()/15)}}),vb.fn.millisecond=vb.fn.milliseconds=qb("Milliseconds",!1),vb.fn.second=vb.fn.seconds=qb("Seconds",!1),vb.fn.minute=vb.fn.minutes=qb("Minutes",!1),vb.fn.hour=vb.fn.hours=qb("Hours",!0),vb.fn.date=qb("Date",!0),vb.fn.dates=f("dates accessor is deprecated. Use date instead.",qb("Date",!0)),vb.fn.year=qb("FullYear",!0),vb.fn.years=f("years accessor is deprecated. Use year instead.",qb("FullYear",!0)),vb.fn.days=vb.fn.day,vb.fn.months=vb.fn.month,vb.fn.weeks=vb.fn.week,vb.fn.isoWeeks=vb.fn.isoWeek,vb.fn.quarters=vb.fn.quarter,vb.fn.toJSON=vb.fn.toISOString,vb.fn.isUTC=vb.fn.isUtc,o(vb.duration.fn=n.prototype,{_bubble:function(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;g.milliseconds=d%1e3,a=q(d/1e3),g.seconds=a%60,b=q(a/60),g.minutes=b%60,c=q(b/60),g.hours=c%24,e+=q(c/24),h=q(rb(e)),e-=q(sb(h)),f+=q(e/30),e%=30,h+=q(f/12),f%=12,g.days=e,g.months=f,g.years=h},abs:function(){return this._milliseconds=Math.abs(this._milliseconds),this._days=Math.abs(this._days),this._months=Math.abs(this._months),this._data.milliseconds=Math.abs(this._data.milliseconds),this._data.seconds=Math.abs(this._data.seconds),this._data.minutes=Math.abs(this._data.minutes),this._data.hours=Math.abs(this._data.hours),this._data.months=Math.abs(this._data.months),this._data.years=Math.abs(this._data.years),this},weeks:function(){return q(this.days()/7)},valueOf:function(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*C(this._months/12)
+},humanize:function(a){var b=ib(this,!a,this.localeData());return a&&(b=this.localeData().pastFuture(+this,b)),this.localeData().postformat(b)},add:function(a,b){var c=vb.duration(a,b);return this._milliseconds+=c._milliseconds,this._days+=c._days,this._months+=c._months,this._bubble(),this},subtract:function(a,b){var c=vb.duration(a,b);return this._milliseconds-=c._milliseconds,this._days-=c._days,this._months-=c._months,this._bubble(),this},get:function(a){return a=z(a),this[a.toLowerCase()+"s"]()},as:function(a){var b,c;if(a=z(a),"month"===a||"year"===a)return b=this._days+this._milliseconds/864e5,c=this._months+12*rb(b),"month"===a?c:c/12;switch(b=this._days+Math.round(sb(this._months/12)),a){case"week":return b/7+this._milliseconds/6048e5;case"day":return b+this._milliseconds/864e5;case"hour":return 24*b+this._milliseconds/36e5;case"minute":return 24*b*60+this._milliseconds/6e4;case"second":return 24*b*60*60+this._milliseconds/1e3;case"millisecond":return Math.floor(24*b*60*60*1e3)+this._milliseconds;default:throw new Error("Unknown unit "+a)}},lang:vb.fn.lang,locale:vb.fn.locale,toIsoString:f("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",function(){return this.toISOString()}),toISOString:function(){var a=Math.abs(this.years()),b=Math.abs(this.months()),c=Math.abs(this.days()),d=Math.abs(this.hours()),e=Math.abs(this.minutes()),f=Math.abs(this.seconds()+this.milliseconds()/1e3);return this.asSeconds()?(this.asSeconds()<0?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"},localeData:function(){return this._locale},toJSON:function(){return this.toISOString()}}),vb.duration.fn.toString=vb.duration.fn.toISOString;for(xb in kc)c(kc,xb)&&tb(xb.toLowerCase());vb.duration.fn.asMilliseconds=function(){return this.as("ms")},vb.duration.fn.asSeconds=function(){return this.as("s")},vb.duration.fn.asMinutes=function(){return this.as("m")},vb.duration.fn.asHours=function(){return this.as("h")},vb.duration.fn.asDays=function(){return this.as("d")},vb.duration.fn.asWeeks=function(){return this.as("weeks")},vb.duration.fn.asMonths=function(){return this.as("M")},vb.duration.fn.asYears=function(){return this.as("y")},vb.locale("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===C(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),Lb?module.exports=vb:"function"==typeof define&&define.amd?(define(function(a,b,c){return c.config&&c.config()&&c.config().noGlobal===!0&&(zb.moment=wb),vb}),ub(!0)):ub()}).call(this);
\ No newline at end of file
diff --git a/culturefeed_search_ui/js/search_ui.js b/culturefeed_search_ui/js/search_ui.js
index 7c50fde6..4eb3aabb 100644
--- a/culturefeed_search_ui/js/search_ui.js
+++ b/culturefeed_search_ui/js/search_ui.js
@@ -13,7 +13,7 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {};
      if ($('#edit-sort').length > 0) {
        Drupal.CulturefeedSearch.bindSortDropdown();
      }
-     if ($('#edit-date-range').length > 0) {
+     if ($('#specific-dates-range').length > 0) {
        Drupal.CulturefeedSearch.bindDatePicker();
      }
 
@@ -26,21 +26,67 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {};
    * Bind the datepicker functionality.
    */
   Drupal.CulturefeedSearch.bindDatePicker = function() {
-    $('#edit-date-range').daterangepicker({
-      presetRanges: [],
-      presets : {
-        specificDate: Drupal.t('Specific date'),
-        dateRange: Drupal.t('Period from/to')
-      },
-      rangeStartTitle: Drupal.t('Start date'),
-      rangeEndTitle: Drupal.t('End date'),
-      doneButtonText: Drupal.t('OK'),
-      dateFormat: 'd/m/yy',
-      earliestDate : Date.parse(),
-      constrainDates : true,
-      appendTo: '.form-item-date-range'
+    var format = 'DD/MM/YYYY';
+    var from = $('#edit-date-from').val();
+    var to = $('#edit-date-to').val();
+
+    $('#edit-date-from').hide();
+    $('#edit-date-to').hide();
+    $('#submit-specific-dates').hide();
+
+    if (from && to) {
+      $('#specific-dates-range span').html(from + ' - ' + to);
+    }
+
+    $('#specific-dates-range').daterangepicker({
+      format: format,
+      startDate: from ? from : moment(),
+      endDate: to ? to : moment(),
+      opens: 'right',
+      showWeekNumbers: false,
+      applyClass: "btn-primary",
+      cancelClass: "btn-link",
+      locale: {
+        cancelLabel: Drupal.t('Cancel'),
+        applyLabel: Drupal.t('Apply'),
+        fromLabel: Drupal.t('Between'),
+        toLabel: Drupal.t('And'),
+        monthNames: [
+          Drupal.t('January'),
+          Drupal.t('February'),
+          Drupal.t('March'),
+          Drupal.t('April'),
+          Drupal.t('May'),
+          Drupal.t('June'),
+          Drupal.t('July'),
+          Drupal.t('August'),
+          Drupal.t('September'),
+          Drupal.t('October'),
+          Drupal.t('November'),
+          Drupal.t('December')
+        ],
+        daysOfWeek: [
+          Drupal.t('Sun'),
+          Drupal.t('Mon'),
+          Drupal.t('Tue'),
+          Drupal.t('Wed'),
+          Drupal.t('Thu'),
+          Drupal.t('Fri'),
+          Drupal.t('Sat')
+        ],
+        firstDay: 1
+      }
+    }, function(start, end) {
+      var from = start.format(format);
+      var to = end.format(format);
+      $('#specific-dates-range span').html(from + ' - ' + to);
+      $('#edit-date-from').val(from);
+      $('#edit-date-to').val(to);
+      $('#specific-dates-range').closest('form').submit();
+    }).click(function (e) {
+      e.preventDefault();
     });
-  }
+  };
 
   /**
    * Click listener on autosubmit fields.

From 8988949262814aef2cbfa9718a0b4ce97e07ce68 Mon Sep 17 00:00:00 2001
From: Dietrich Moerman <dietrich.moerman@wunderkraut.com>
Date: Sat, 28 Mar 2015 23:42:49 +0100
Subject: [PATCH 060/275] UIT-38: Validate dates in JS.

---
 culturefeed_search_ui/js/search_ui.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/js/search_ui.js b/culturefeed_search_ui/js/search_ui.js
index 4eb3aabb..8e861ef4 100644
--- a/culturefeed_search_ui/js/search_ui.js
+++ b/culturefeed_search_ui/js/search_ui.js
@@ -27,8 +27,10 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {};
    */
   Drupal.CulturefeedSearch.bindDatePicker = function() {
     var format = 'DD/MM/YYYY';
-    var from = $('#edit-date-from').val();
-    var to = $('#edit-date-to').val();
+    var from = moment($('#edit-date-from').val(), format, true).isValid()
+      ? $('#edit-date-from').val() : null;
+    var to = moment($('#edit-date-to').val(), format, true).isValid()
+      ? $('#edit-date-to').val() : null;
 
     $('#edit-date-from').hide();
     $('#edit-date-to').hide();

From 842fb126a9d357e9d36cbb9d3aeff7c7c25edd21 Mon Sep 17 00:00:00 2001
From: Dietrich Moerman <dietrich.moerman@wunderkraut.com>
Date: Mon, 30 Mar 2015 11:06:31 +0200
Subject: [PATCH 061/275] UIT-38: Use JS library versions from prototype.

---
 .../css/daterangepicker-bs2.css               | 287 ------------------
 .../css/daterangepicker-bs3.css               | 264 +++-------------
 .../culturefeed_search_ui.module              |   4 +-
 culturefeed_search_ui/js/daterangepicker.js   | 115 +++----
 culturefeed_search_ui/js/moment.min.js        |   5 +-
 5 files changed, 111 insertions(+), 564 deletions(-)
 delete mode 100644 culturefeed_search_ui/css/daterangepicker-bs2.css

diff --git a/culturefeed_search_ui/css/daterangepicker-bs2.css b/culturefeed_search_ui/css/daterangepicker-bs2.css
deleted file mode 100644
index e222688a..00000000
--- a/culturefeed_search_ui/css/daterangepicker-bs2.css
+++ /dev/null
@@ -1,287 +0,0 @@
-/*!
- * Stylesheet for the Date Range Picker, for use with Bootstrap 2.x
- *
- * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
- * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
- *
- * Built for http://www.improvely.com
- */
-
-.daterangepicker.dropdown-menu {
-  max-width: none;
-  z-index: 3000;
-}
-
-.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
-  float: left;
-  margin: 4px;
-}
-
-.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
-.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
-  float: right;
-  margin: 4px;
-}
-
-.daterangepicker .ranges {
-  width: 160px;
-  text-align: left;
-}
-
-.daterangepicker .ranges .range_inputs>div {
-  float: left;
-}
-
-.daterangepicker .ranges .range_inputs>div:nth-child(2) {
-  padding-left: 11px;
-}
-
-.daterangepicker .calendar {
-  display: none;
-  max-width: 250px;
-}
-.daterangepicker.show-calendar .calendar {
-    display: block;
-}
-
-.daterangepicker .calendar.single .calendar-date {
-  border: none;
-}
-
-.daterangepicker .calendar th, .daterangepicker .calendar td {
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  white-space: nowrap;
-  text-align: center;
-}
-
-.daterangepicker .daterangepicker_start_input label,
-.daterangepicker .daterangepicker_end_input label {
-  color: #333;
-  font-size: 11px;
-  margin-bottom: 2px;
-  text-transform: uppercase;
-  text-shadow: 1px 1px 0 #fff;
-}
-
-.daterangepicker .ranges input {
-  font-size: 11px;
-}
-
-.daterangepicker .ranges ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.daterangepicker .ranges li {
-  font-size: 13px;
-  background: #f5f5f5;
-  border: 1px solid #f5f5f5;
-  color: #08c;
-  padding: 3px 12px;
-  margin-bottom: 8px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  cursor: pointer;
-}
-
-.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
-  background: #08c;
-  border: 1px solid #08c;
-  color: #fff;
-}
-
-.daterangepicker .calendar-date {
-  border: 1px solid #ddd;
-  padding: 4px;
-  border-radius: 4px;
-  background: #fff;
-}
-
-.daterangepicker .calendar-time {
-  text-align: center;
-  margin: 8px auto 0 auto;
-  line-height: 30px;
-}
-
-.daterangepicker {
-  position: absolute;
-  background: #fff;
-  top: 100px;
-  left: 20px;
-  padding: 4px;
-  margin-top: 1px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-
-.daterangepicker.opensleft:before {
-  position: absolute;
-  top: -7px;
-  right: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.daterangepicker.opensleft:after {
-  position: absolute;
-  top: -6px;
-  right: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.daterangepicker.openscenter:before {
-  position: absolute;
-  top: -7px;
-  left: 0;  
-  right: 0;
-  width: 0;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.daterangepicker.openscenter:after {
-  position: absolute;
-  top: -6px;
-  left: 0;  
-  right: 0;  
-  width: 0;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.daterangepicker.opensright:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.daterangepicker.opensright:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.daterangepicker table {
-  width: 100%;
-  margin: 0;
-}
-
-.daterangepicker td, .daterangepicker th {
-  text-align: center;
-  width: 20px;
-  height: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  cursor: pointer;
-  white-space: nowrap;
-}
-
-.daterangepicker td.off {
-  color: #999;
-}
-
-.daterangepicker td.disabled, .daterangepicker option.disabled {
-  color: #999;
-}
-
-.daterangepicker td.available:hover, .daterangepicker th.available:hover {
-  background: #eee;
-}
-
-.daterangepicker td.in-range {
-  background: #ebf4f8;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-
-.daterangepicker td.active, .daterangepicker td.active:hover {
-  background-color: #006dcc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(top, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.daterangepicker td.week, .daterangepicker th.week {
-  font-size: 80%;
-  color: #ccc;
-}
-
-.daterangepicker select.monthselect, .daterangepicker select.yearselect {
-  font-size: 12px;
-  padding: 1px;
-  height: auto;
-  margin: 0;
-  cursor: default;
-}
-
-.daterangepicker select.monthselect {
-  margin-right: 2%;
-  width: 56%;
-}
-
-.daterangepicker select.yearselect {
-  width: 40%;
-}
-
-.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
-  width: 60px;
-  margin-bottom: 0;
-}
-
-.daterangepicker_start_input {
-  float: left;
-}
-
-.daterangepicker_end_input {
-  float: left; 
-  padding-left: 11px
-}
-
-.daterangepicker th.month {
-  width: auto;
-}
diff --git a/culturefeed_search_ui/css/daterangepicker-bs3.css b/culturefeed_search_ui/css/daterangepicker-bs3.css
index c9c8fedf..6819a952 100644
--- a/culturefeed_search_ui/css/daterangepicker-bs3.css
+++ b/culturefeed_search_ui/css/daterangepicker-bs3.css
@@ -1,103 +1,41 @@
+/* */
+/* */
 /*!
- * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
- *
- * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
- * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
- *
- * Built for http://www.improvely.com
- */
-
- .daterangepicker.dropdown-menu {
+* Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
+*
+* Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
+* Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+*
+* Built for http://www.improvely.com
+*/
+.daterangepicker.dropdown-menu {
   max-width: none;
   z-index: 3000;
 }
-
-.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
-  float: left;
-  margin: 4px;
+.daterangepicker .ranges .range_inputs .btn-block {
+  clear: both;
+  position: relative;
 }
-
-.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
-.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
-  float: right;
-  margin: 4px;
-}
-
-.daterangepicker.single .ranges, .daterangepicker.single .calendar {
-  float: none;
-}
-
-.daterangepicker .ranges {
-  width: 160px;
-  text-align: left;
-}
-
-.daterangepicker .ranges .range_inputs>div {
-  float: left;
-}
-
-.daterangepicker .ranges .range_inputs>div:nth-child(2) {
-  padding-left: 11px;
-}
-
 .daterangepicker .calendar {
   display: none;
-  max-width: 270px;
 }
-
 .daterangepicker.show-calendar .calendar {
-    display: block;
+  display: block;
 }
-
 .daterangepicker .calendar.single .calendar-date {
   border: none;
 }
-
-.daterangepicker .calendar th, .daterangepicker .calendar td {
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+.daterangepicker .calendar th,
+.daterangepicker .calendar td {
   white-space: nowrap;
   text-align: center;
   min-width: 32px;
 }
-
-.daterangepicker .daterangepicker_start_input label,
-.daterangepicker .daterangepicker_end_input label {
-  color: #333;
-  display: block;
-  font-size: 11px;
-  font-weight: normal;
-  height: 20px;
-  line-height: 20px;
-  margin-bottom: 2px;
-  text-shadow: #fff 1px 1px 0px;
-  text-transform: uppercase;
-  width: 74px;
-}
-
-.daterangepicker .ranges input {
-  font-size: 11px;
-}
-
-.daterangepicker .ranges .input-mini {
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  color: #555;
-  display: block;
-  font-size: 11px;
-  height: 30px;
-  line-height: 30px;
-  vertical-align: middle;
-  margin: 0 0 10px 0;
-  padding: 0 6px;
-  width: 74px;
-}
-
 .daterangepicker .ranges ul {
   list-style: none;
   margin: 0;
   padding: 0;
 }
-
 .daterangepicker .ranges li {
   font-size: 13px;
   background: #f5f5f5;
@@ -110,210 +48,104 @@
   border-radius: 5px;
   cursor: pointer;
 }
-
-.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+.daterangepicker .ranges li.active,
+.daterangepicker .ranges li:hover {
   background: #08c;
   border: 1px solid #08c;
   color: #fff;
 }
-
 .daterangepicker .calendar-date {
   border: 1px solid #ddd;
   padding: 4px;
-  border-radius: 4px;
+  border-radius: 1px;
   background: #fff;
 }
-
 .daterangepicker .calendar-time {
   text-align: center;
   margin: 8px auto 0 auto;
   line-height: 30px;
 }
-
 .daterangepicker {
   position: absolute;
-  background: #fff;
   top: 100px;
   left: 20px;
-  padding: 4px;
+  padding: 15px;
   margin-top: 1px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-
-.daterangepicker.opensleft:before {
-  position: absolute;
-  top: -7px;
-  right: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.daterangepicker.opensleft:after {
-  position: absolute;
-  top: -6px;
-  right: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.daterangepicker.openscenter:before {
-  position: absolute;
-  top: -7px;
-  left: 0;  
-  right: 0;
-  width: 0;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.daterangepicker.openscenter:after {
-  position: absolute;
-  top: -6px;
-  left: 0;  
-  right: 0;  
-  width: 0;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.daterangepicker.opensright:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.daterangepicker.opensright:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
+  background-color: #F3F3F3;
 }
-
 .daterangepicker table {
   width: 100%;
   margin: 0;
 }
-
-.daterangepicker td, .daterangepicker th {
+.daterangepicker td,
+.daterangepicker th {
   text-align: center;
   width: 20px;
   height: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
   cursor: pointer;
   white-space: nowrap;
 }
-
 .daterangepicker td.off {
   color: #999;
 }
-
-.daterangepicker td.disabled, .daterangepicker option.disabled {
+.daterangepicker td.disabled,
+.daterangepicker option.disabled {
   color: #999;
 }
-
-.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+.daterangepicker td.available:hover,
+.daterangepicker th.available:hover {
   background: #eee;
 }
-
 .daterangepicker td.in-range {
-  background: #ebf4f8;
+  background: #c7e5ff;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
 }
-
-.daterangepicker td.start-date {
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
-}
-
-.daterangepicker td.end-date {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
-}
-
 .daterangepicker td.start-date.end-date {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
 }
-
-.daterangepicker td.active, .daterangepicker td.active:hover {
-  background-color: #357ebd;
+.daterangepicker td.active,
+.daterangepicker td.active:hover {
+  background-color: #004f94;
   border-color: #3071a9;
   color: #fff;
 }
-
-.daterangepicker td.week, .daterangepicker th.week {
+.daterangepicker td.week,
+.daterangepicker th.week {
   font-size: 80%;
   color: #ccc;
 }
-
-.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+.daterangepicker select.monthselect,
+.daterangepicker select.yearselect {
   font-size: 12px;
   padding: 1px;
   height: auto;
   margin: 0;
   cursor: default;
 }
-
 .daterangepicker select.monthselect {
   margin-right: 2%;
   width: 56%;
 }
-
 .daterangepicker select.yearselect {
   width: 40%;
 }
-
-.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+.daterangepicker select.hourselect,
+.daterangepicker select.minuteselect,
+.daterangepicker select.secondselect,
+.daterangepicker select.ampmselect {
   width: 50px;
   margin-bottom: 0;
 }
-
-.daterangepicker_start_input {
-  float: left;
-}
-
-.daterangepicker_end_input {
-  float: left; 
-  padding-left: 11px
-}
-
 .daterangepicker th.month {
   width: auto;
 }
diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 1573b665..76f3fcc3 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -329,7 +329,7 @@ function culturefeed_search_ui_library() {
   $libraries['ui.moment'] = array(
     'title' => 'Moment.js',
     'website' => 'http://momentjs.com/',
-    'version' => '2.9.0',
+    'version' => '2.8.1',
     'js' => array(
       $path . '/js/moment.min.js' => array(),
     ),
@@ -339,7 +339,7 @@ function culturefeed_search_ui_library() {
   $libraries['ui.daterangepicker'] = array(
     'title' => 'Date Range Picker',
     'website' => 'http://www.daterangepicker.com/',
-    'version' => '1.3.19+master',
+    'version' => '1.3.17',
     'js' => array(
       $path . '/js/daterangepicker.js' => array(),
     ),
diff --git a/culturefeed_search_ui/js/daterangepicker.js b/culturefeed_search_ui/js/daterangepicker.js
index dae63e68..7e11af3a 100644
--- a/culturefeed_search_ui/js/daterangepicker.js
+++ b/culturefeed_search_ui/js/daterangepicker.js
@@ -1,11 +1,14 @@
 /**
-* @version: 1.3.19
+* @version: 1.3.17
 * @author: Dan Grossman http://www.dangrossman.info/
-* @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
+* @date: 2014-11-25
+* @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved.
 * @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
-* @website: https://www.improvely.com/
+* @website: http://www.improvely.com/
 */
 
+/* TEMPLATE */
+
 (function(root, factory) {
 
   if (typeof define === 'function' && define.amd) {
@@ -44,23 +47,42 @@
         this.isShowing = false;
 
         //create the picker HTML object
-        var DRPTemplate = '<div class="daterangepicker dropdown-menu">' +
-                '<div class="calendar first left"></div>' +
-                '<div class="calendar second right"></div>' +
-                '<div class="ranges">' +
-                  '<div class="range_inputs">' +
-                    '<div class="daterangepicker_start_input">' +
-                      '<label for="daterangepicker_start"></label>' +
-                      '<input class="input-mini" type="text" name="daterangepicker_start" value="" />' +
-                    '</div>' +
-                    '<div class="daterangepicker_end_input">' +
-                      '<label for="daterangepicker_end"></label>' +
-                      '<input class="input-mini" type="text" name="daterangepicker_end" value="" />' +
-                    '</div>' +
-                    '<button class="applyBtn" disabled="disabled"></button>&nbsp;' +
-                    '<button class="cancelBtn"></button>' +
+        var DRPTemplate = '';
+
+        //create the picker HTML object
+        DRPTemplate =
+              '<div class="daterangepicker dropdown-menu">' +
+              '<div class="row">' +
+                '<div class="col-sm-6 col-xs-12">'+
+                  '<div class="daterangepicker_start_input">' +
+                    '<label for="daterangepicker_start"></label>' +
+                  '</div>' +
+                  '<div class="form-group">' +
+                    '<div class="calendar first left"></div>'+
+                  '</div>'+
+                  '<div class="form-group">'+
+                  '<input class="form-control" type="text" name="daterangepicker_start" value="" />' +
+                  '</div>'+
+                '</div>' +
+                '<div class="col-sm-6 col-xs-12">' +
+                  '<div class="daterangepicker_end_input">' +
+                    '<label for="daterangepicker_end"></label>' +
                   '</div>' +
+                  '<div class="form-group">' +
+                    '<div class="calendar second right"></div>'+
+                  '</div>'+
+                  '<div class="form-group">'+
+                  '<input class="form-control" type="text" name="daterangepicker_end" value="" />' +
+                  '</div>'+
                 '</div>' +
+              '</div>'+
+              '<div class="row">'+
+                '<div class="col-xs-12 ranges">' +
+                  '<button class="applyBtn" disabled="disabled"></button>' +
+                  ' ' +
+                  '<button class="cancelBtn"></button>' +
+                '</div>' +
+              '</div>' +
               '</div>';
 
         //custom options
@@ -128,7 +150,7 @@
 
             this.startDate = moment().startOf('day');
             this.endDate = moment().endOf('day');
-            this.timeZone = moment().utcOffset();
+            this.timeZone = moment().zone();
             this.minDate = false;
             this.maxDate = false;
             this.dateLimit = false;
@@ -146,7 +168,7 @@
             if (this.element.hasClass('pull-right'))
                 this.opens = 'left';
 
-            this.buttonClasses = ['btn', 'btn-small btn-sm'];
+            this.buttonClasses = ['btn', ''];
             this.applyClass = 'btn-success';
             this.cancelClass = 'btn-default';
 
@@ -325,10 +347,10 @@
             // bind the time zone used to build the calendar to either the timeZone passed in through the options or the zone of the startDate (which will be the local time zone by default)
             if (typeof options.timeZone === 'string' || typeof options.timeZone === 'number') {
                 this.timeZone = options.timeZone;
-                this.startDate.utcOffset(this.timeZone);
-                this.endDate.utcOffset(this.timeZone);
+                this.startDate.zone(this.timeZone);
+                this.endDate.zone(this.timeZone);
             } else {
-                this.timeZone = moment(this.startDate).utcOffset();
+                this.timeZone = moment(this.startDate).zone();
             }
 
             if (typeof options.ranges === 'object') {
@@ -415,6 +437,9 @@
             };
 
             if (this.opens == 'right' || this.opens == 'center') {
+
+                /*
+
                 //swap calendar positions
                 var first = this.container.find('.calendar.first');
                 var second = this.container.find('.calendar.second');
@@ -431,6 +456,8 @@
                     first.show();
                     second.hide();
                 }
+
+                */
             }
 
             if (typeof options.ranges === 'undefined' && !this.singleDatePicker) {
@@ -446,7 +473,7 @@
 
         setStartDate: function(startDate) {
             if (typeof startDate === 'string')
-                this.startDate = moment(startDate, this.format).utcOffset(this.timeZone);
+                this.startDate = moment(startDate, this.format).zone(this.timeZone);
 
             if (typeof startDate === 'object')
                 this.startDate = moment(startDate);
@@ -463,7 +490,7 @@
 
         setEndDate: function(endDate) {
             if (typeof endDate === 'string')
-                this.endDate = moment(endDate, this.format).utcOffset(this.timeZone);
+                this.endDate = moment(endDate, this.format).zone(this.timeZone);
 
             if (typeof endDate === 'object')
                 this.endDate = moment(endDate);
@@ -504,12 +531,12 @@
                 end = null;
 
             if(dateString.length === 2) {
-                start = moment(dateString[0], this.format).utcOffset(this.timeZone);
-                end = moment(dateString[1], this.format).utcOffset(this.timeZone);
+                start = moment(dateString[0], this.format).zone(this.timeZone);
+                end = moment(dateString[1], this.format).zone(this.timeZone);
             }
 
             if (this.singleDatePicker || start === null || end === null) {
-                start = moment(this.element.val(), this.format).utcOffset(this.timeZone);
+                start = moment(this.element.val(), this.format).zone(this.timeZone);
                 end = start;
             }
 
@@ -678,11 +705,11 @@
 
             var startDate, endDate;
             if (el.attr('name') === 'daterangepicker_start') {
-                startDate = (false !== this.minDate && date.isBefore(this.minDate)) ? this.minDate : date;
+                startDate = date;
                 endDate = this.endDate;
             } else {
                 startDate = this.startDate;
-                endDate = (false !== this.maxDate && date.isAfter(this.maxDate)) ? this.maxDate : date;
+                endDate = date;
             }
             this.setCustomDates(startDate, endDate);
         },
@@ -697,10 +724,8 @@
         updateInputText: function() {
             if (this.element.is('input') && !this.singleDatePicker) {
                 this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format));
-                this.element.trigger('change');
             } else if (this.element.is('input')) {
                 this.element.val(this.endDate.format(this.format));
-                this.element.trigger('change');
             }
         },
 
@@ -771,7 +796,7 @@
                 var difference = this.endDate.diff(this.startDate);
                 endDate = moment(startDate).add(difference, 'ms');
                 if (this.maxDate && endDate.isAfter(this.maxDate)) {
-                  endDate = this.maxDate.clone();
+                  endDate = this.maxDate;
                 }
             }
             this.startDate = startDate;
@@ -852,28 +877,6 @@
             var month = parseInt(cal.find('.monthselect').val(), 10);
             var year = cal.find('.yearselect').val();
 
-            if (!isLeft && !this.singleDatePicker) {
-                if (year < this.startDate.year() || (year == this.startDate.year() && month < this.startDate.month())) {
-                    month = this.startDate.month();
-                    year = this.startDate.year();
-                }
-            }
-
-            if (this.minDate) {
-                if (year < this.minDate.year() || (year == this.minDate.year() && month < this.minDate.month())) {
-                    month = this.minDate.month();
-                    year = this.minDate.year();
-                }
-            }
-
-            if (this.maxDate) {
-                if (year > this.maxDate.year() || (year == this.maxDate.year() && month > this.maxDate.month())) {
-                    month = this.maxDate.month();
-                    year = this.maxDate.year();
-                }
-            }
-
-
             this[leftOrRight+'Calendar'].month.month(month).year(year);
             this.updateCalendars();
         },
@@ -985,7 +988,7 @@
             if (dayOfWeek == this.locale.firstDay)
                 startDay = daysInLastMonth - 6;
 
-            var curDate = moment([lastYear, lastMonth, startDay, 12, minute, second]).utcOffset(this.timeZone);
+            var curDate = moment([lastYear, lastMonth, startDay, 12, minute, second]).zone(this.timeZone);
 
             var col, row;
             for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add(24, 'hour')) {
diff --git a/culturefeed_search_ui/js/moment.min.js b/culturefeed_search_ui/js/moment.min.js
index 024d488f..c30bbff2 100644
--- a/culturefeed_search_ui/js/moment.min.js
+++ b/culturefeed_search_ui/js/moment.min.js
@@ -1,7 +1,6 @@
 //! moment.js
-//! version : 2.9.0
+//! version : 2.8.1
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
-(function(a){function b(a,b,c){switch(arguments.length){case 2:return null!=a?a:b;case 3:return null!=a?a:null!=b?b:c;default:throw new Error("Implement me")}}function c(a,b){return Bb.call(a,b)}function d(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function e(a){vb.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function f(a,b){var c=!0;return o(function(){return c&&(e(a),c=!1),b.apply(this,arguments)},b)}function g(a,b){sc[a]||(e(b),sc[a]=!0)}function h(a,b){return function(c){return r(a.call(this,c),b)}}function i(a,b){return function(c){return this.localeData().ordinal(a.call(this,c),b)}}function j(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function k(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function l(){}function m(a,b){b!==!1&&H(a),p(this,a),this._d=new Date(+a._d),uc===!1&&(uc=!0,vb.updateOffset(this),uc=!1)}function n(a){var b=A(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=vb.localeData(),this._bubble()}function o(a,b){for(var d in b)c(b,d)&&(a[d]=b[d]);return c(b,"toString")&&(a.toString=b.toString),c(b,"valueOf")&&(a.valueOf=b.valueOf),a}function p(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Kb.length>0)for(c in Kb)d=Kb[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function q(a){return 0>a?Math.ceil(a):Math.floor(a)}function r(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function s(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function t(a,b){var c;return b=M(b,a),a.isBefore(b)?c=s(a,b):(c=s(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function u(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(g(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=vb.duration(c,d),v(this,e,a),this}}function v(a,b,c,d){var e=b._milliseconds,f=b._days,g=b._months;d=null==d?!0:d,e&&a._d.setTime(+a._d+e*c),f&&pb(a,"Date",ob(a,"Date")+f*c),g&&nb(a,ob(a,"Month")+g*c),d&&vb.updateOffset(a,f||g)}function w(a){return"[object Array]"===Object.prototype.toString.call(a)}function x(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function y(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&C(a[d])!==C(b[d]))&&g++;return g+f}function z(a){if(a){var b=a.toLowerCase().replace(/(.)s$/,"$1");a=lc[a]||mc[b]||b}return a}function A(a){var b,d,e={};for(d in a)c(a,d)&&(b=z(d),b&&(e[b]=a[d]));return e}function B(b){var c,d;if(0===b.indexOf("week"))c=7,d="day";else{if(0!==b.indexOf("month"))return;c=12,d="month"}vb[b]=function(e,f){var g,h,i=vb._locale[b],j=[];if("number"==typeof e&&(f=e,e=a),h=function(a){var b=vb().utc().set(d,a);return i.call(vb._locale,b,e||"")},null!=f)return h(f);for(g=0;c>g;g++)j.push(h(g));return j}}function C(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function D(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function E(a,b,c){return jb(vb([a,11,31+b-c]),b,c).week}function F(a){return G(a)?366:365}function G(a){return a%4===0&&a%100!==0||a%400===0}function H(a){var b;a._a&&-2===a._pf.overflow&&(b=a._a[Db]<0||a._a[Db]>11?Db:a._a[Eb]<1||a._a[Eb]>D(a._a[Cb],a._a[Db])?Eb:a._a[Fb]<0||a._a[Fb]>24||24===a._a[Fb]&&(0!==a._a[Gb]||0!==a._a[Hb]||0!==a._a[Ib])?Fb:a._a[Gb]<0||a._a[Gb]>59?Gb:a._a[Hb]<0||a._a[Hb]>59?Hb:a._a[Ib]<0||a._a[Ib]>999?Ib:-1,a._pf._overflowDayOfYear&&(Cb>b||b>Eb)&&(b=Eb),a._pf.overflow=b)}function I(b){return null==b._isValid&&(b._isValid=!isNaN(b._d.getTime())&&b._pf.overflow<0&&!b._pf.empty&&!b._pf.invalidMonth&&!b._pf.nullInput&&!b._pf.invalidFormat&&!b._pf.userInvalidated,b._strict&&(b._isValid=b._isValid&&0===b._pf.charsLeftOver&&0===b._pf.unusedTokens.length&&b._pf.bigHour===a)),b._isValid}function J(a){return a?a.toLowerCase().replace("_","-"):a}function K(a){for(var b,c,d,e,f=0;f<a.length;){for(e=J(a[f]).split("-"),b=e.length,c=J(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=L(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&y(e,c,!0)>=b-1)break;b--}f++}return null}function L(a){var b=null;if(!Jb[a]&&Lb)try{b=vb.locale(),require("./locale/"+a),vb.locale(b)}catch(c){}return Jb[a]}function M(a,b){var c,d;return b._isUTC?(c=b.clone(),d=(vb.isMoment(a)||x(a)?+a:+vb(a))-+c,c._d.setTime(+c._d+d),vb.updateOffset(c,!1),c):vb(a).local()}function N(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function O(a){var b,c,d=a.match(Pb);for(b=0,c=d.length;c>b;b++)d[b]=rc[d[b]]?rc[d[b]]:N(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function P(a,b){return a.isValid()?(b=Q(b,a.localeData()),nc[b]||(nc[b]=O(b)),nc[b](a)):a.localeData().invalidDate()}function Q(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Qb.lastIndex=0;d>=0&&Qb.test(a);)a=a.replace(Qb,c),Qb.lastIndex=0,d-=1;return a}function R(a,b){var c,d=b._strict;switch(a){case"Q":return _b;case"DDDD":return bc;case"YYYY":case"GGGG":case"gggg":return d?cc:Tb;case"Y":case"G":case"g":return ec;case"YYYYYY":case"YYYYY":case"GGGGG":case"ggggg":return d?dc:Ub;case"S":if(d)return _b;case"SS":if(d)return ac;case"SSS":if(d)return bc;case"DDD":return Sb;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return Wb;case"a":case"A":return b._locale._meridiemParse;case"x":return Zb;case"X":return $b;case"Z":case"ZZ":return Xb;case"T":return Yb;case"SSSS":return Vb;case"MM":case"DD":case"YY":case"GG":case"gg":case"HH":case"hh":case"mm":case"ss":case"ww":case"WW":return d?ac:Rb;case"M":case"D":case"d":case"H":case"h":case"m":case"s":case"w":case"W":case"e":case"E":return Rb;case"Do":return d?b._locale._ordinalParse:b._locale._ordinalParseLenient;default:return c=new RegExp($(Z(a.replace("\\","")),"i"))}}function S(a){a=a||"";var b=a.match(Xb)||[],c=b[b.length-1]||[],d=(c+"").match(jc)||["-",0,0],e=+(60*d[1])+C(d[2]);return"+"===d[0]?e:-e}function T(a,b,c){var d,e=c._a;switch(a){case"Q":null!=b&&(e[Db]=3*(C(b)-1));break;case"M":case"MM":null!=b&&(e[Db]=C(b)-1);break;case"MMM":case"MMMM":d=c._locale.monthsParse(b,a,c._strict),null!=d?e[Db]=d:c._pf.invalidMonth=b;break;case"D":case"DD":null!=b&&(e[Eb]=C(b));break;case"Do":null!=b&&(e[Eb]=C(parseInt(b.match(/\d{1,2}/)[0],10)));break;case"DDD":case"DDDD":null!=b&&(c._dayOfYear=C(b));break;case"YY":e[Cb]=vb.parseTwoDigitYear(b);break;case"YYYY":case"YYYYY":case"YYYYYY":e[Cb]=C(b);break;case"a":case"A":c._meridiem=b;break;case"h":case"hh":c._pf.bigHour=!0;case"H":case"HH":e[Fb]=C(b);break;case"m":case"mm":e[Gb]=C(b);break;case"s":case"ss":e[Hb]=C(b);break;case"S":case"SS":case"SSS":case"SSSS":e[Ib]=C(1e3*("0."+b));break;case"x":c._d=new Date(C(b));break;case"X":c._d=new Date(1e3*parseFloat(b));break;case"Z":case"ZZ":c._useUTC=!0,c._tzm=S(b);break;case"dd":case"ddd":case"dddd":d=c._locale.weekdaysParse(b),null!=d?(c._w=c._w||{},c._w.d=d):c._pf.invalidWeekday=b;break;case"w":case"ww":case"W":case"WW":case"d":case"e":case"E":a=a.substr(0,1);case"gggg":case"GGGG":case"GGGGG":a=a.substr(0,2),b&&(c._w=c._w||{},c._w[a]=C(b));break;case"gg":case"GG":c._w=c._w||{},c._w[a]=vb.parseTwoDigitYear(b)}}function U(a){var c,d,e,f,g,h,i;c=a._w,null!=c.GG||null!=c.W||null!=c.E?(g=1,h=4,d=b(c.GG,a._a[Cb],jb(vb(),1,4).year),e=b(c.W,1),f=b(c.E,1)):(g=a._locale._week.dow,h=a._locale._week.doy,d=b(c.gg,a._a[Cb],jb(vb(),g,h).year),e=b(c.w,1),null!=c.d?(f=c.d,g>f&&++e):f=null!=c.e?c.e+g:g),i=kb(d,e,f,h,g),a._a[Cb]=i.year,a._dayOfYear=i.dayOfYear}function V(a){var c,d,e,f,g=[];if(!a._d){for(e=X(a),a._w&&null==a._a[Eb]&&null==a._a[Db]&&U(a),a._dayOfYear&&(f=b(a._a[Cb],e[Cb]),a._dayOfYear>F(f)&&(a._pf._overflowDayOfYear=!0),d=fb(f,0,a._dayOfYear),a._a[Db]=d.getUTCMonth(),a._a[Eb]=d.getUTCDate()),c=0;3>c&&null==a._a[c];++c)a._a[c]=g[c]=e[c];for(;7>c;c++)a._a[c]=g[c]=null==a._a[c]?2===c?1:0:a._a[c];24===a._a[Fb]&&0===a._a[Gb]&&0===a._a[Hb]&&0===a._a[Ib]&&(a._nextDay=!0,a._a[Fb]=0),a._d=(a._useUTC?fb:eb).apply(null,g),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[Fb]=24)}}function W(a){var b;a._d||(b=A(a._i),a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],V(a))}function X(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function Y(b){if(b._f===vb.ISO_8601)return void ab(b);b._a=[],b._pf.empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,j=0;for(e=Q(b._f,b._locale).match(Pb)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(R(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&b._pf.unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),j+=d.length),rc[f]?(d?b._pf.empty=!1:b._pf.unusedTokens.push(f),T(f,d,b)):b._strict&&!d&&b._pf.unusedTokens.push(f);b._pf.charsLeftOver=i-j,h.length>0&&b._pf.unusedInput.push(h),b._pf.bigHour===!0&&b._a[Fb]<=12&&(b._pf.bigHour=a),b._a[Fb]=k(b._locale,b._a[Fb],b._meridiem),V(b),H(b)}function Z(a){return a.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e})}function $(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function _(a){var b,c,e,f,g;if(0===a._f.length)return a._pf.invalidFormat=!0,void(a._d=new Date(0/0));for(f=0;f<a._f.length;f++)g=0,b=p({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._pf=d(),b._f=a._f[f],Y(b),I(b)&&(g+=b._pf.charsLeftOver,g+=10*b._pf.unusedTokens.length,b._pf.score=g,(null==e||e>g)&&(e=g,c=b));o(a,c||b)}function ab(a){var b,c,d=a._i,e=fc.exec(d);if(e){for(a._pf.iso=!0,b=0,c=hc.length;c>b;b++)if(hc[b][1].exec(d)){a._f=hc[b][0]+(e[6]||" ");break}for(b=0,c=ic.length;c>b;b++)if(ic[b][1].exec(d)){a._f+=ic[b][0];break}d.match(Xb)&&(a._f+="Z"),Y(a)}else a._isValid=!1}function bb(a){ab(a),a._isValid===!1&&(delete a._isValid,vb.createFromInputFallback(a))}function cb(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function db(b){var c,d=b._i;d===a?b._d=new Date:x(d)?b._d=new Date(+d):null!==(c=Mb.exec(d))?b._d=new Date(+c[1]):"string"==typeof d?bb(b):w(d)?(b._a=cb(d.slice(0),function(a){return parseInt(a,10)}),V(b)):"object"==typeof d?W(b):"number"==typeof d?b._d=new Date(d):vb.createFromInputFallback(b)}function eb(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function fb(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function gb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function hb(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function ib(a,b,c){var d=vb.duration(a).abs(),e=Ab(d.as("s")),f=Ab(d.as("m")),g=Ab(d.as("h")),h=Ab(d.as("d")),i=Ab(d.as("M")),j=Ab(d.as("y")),k=e<oc.s&&["s",e]||1===f&&["m"]||f<oc.m&&["mm",f]||1===g&&["h"]||g<oc.h&&["hh",g]||1===h&&["d"]||h<oc.d&&["dd",h]||1===i&&["M"]||i<oc.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,hb.apply({},k)}function jb(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=vb(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function kb(a,b,c,d,e){var f,g,h=fb(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:F(a-1)+g}}function lb(b){var c,d=b._i,e=b._f;return b._locale=b._locale||vb.localeData(b._l),null===d||e===a&&""===d?vb.invalid({nullInput:!0}):("string"==typeof d&&(b._i=d=b._locale.preparse(d)),vb.isMoment(d)?new m(d,!0):(e?w(e)?_(b):Y(b):db(b),c=new m(b),c._nextDay&&(c.add(1,"d"),c._nextDay=a),c))}function mb(a,b){var c,d;if(1===b.length&&w(b[0])&&(b=b[0]),!b.length)return vb();for(c=b[0],d=1;d<b.length;++d)b[d][a](c)&&(c=b[d]);return c}function nb(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),D(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function ob(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function pb(a,b,c){return"Month"===b?nb(a,c):a._d["set"+(a._isUTC?"UTC":"")+b](c)}function qb(a,b){return function(c){return null!=c?(pb(this,a,c),vb.updateOffset(this,b),this):ob(this,a)}}function rb(a){return 400*a/146097}function sb(a){return 146097*a/400}function tb(a){vb.duration.fn[a]=function(){return this._data[a]}}function ub(a){"undefined"==typeof ender&&(wb=zb.moment,zb.moment=a?f("Accessing Moment through the global scope is deprecated, and will be removed in an upcoming release.",vb):vb)}for(var vb,wb,xb,yb="2.9.0",zb="undefined"==typeof global||"undefined"!=typeof window&&window!==global.window?this:global,Ab=Math.round,Bb=Object.prototype.hasOwnProperty,Cb=0,Db=1,Eb=2,Fb=3,Gb=4,Hb=5,Ib=6,Jb={},Kb=[],Lb="undefined"!=typeof module&&module&&module.exports,Mb=/^\/?Date\((\-?\d+)/i,Nb=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,Ob=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,Pb=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g,Qb=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Rb=/\d\d?/,Sb=/\d{1,3}/,Tb=/\d{1,4}/,Ub=/[+\-]?\d{1,6}/,Vb=/\d+/,Wb=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Xb=/Z|[\+\-]\d\d:?\d\d/gi,Yb=/T/i,Zb=/[\+\-]?\d+/,$b=/[\+\-]?\d+(\.\d{1,3})?/,_b=/\d/,ac=/\d\d/,bc=/\d{3}/,cc=/\d{4}/,dc=/[+-]?\d{6}/,ec=/[+-]?\d+/,fc=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,gc="YYYY-MM-DDTHH:mm:ssZ",hc=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],ic=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],jc=/([\+\-]|\d\d)/gi,kc=("Date|Hours|Minutes|Seconds|Milliseconds".split("|"),{Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6}),lc={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",D:"date",w:"week",W:"isoWeek",M:"month",Q:"quarter",y:"year",DDD:"dayOfYear",e:"weekday",E:"isoWeekday",gg:"weekYear",GG:"isoWeekYear"},mc={dayofyear:"dayOfYear",isoweekday:"isoWeekday",isoweek:"isoWeek",weekyear:"weekYear",isoweekyear:"isoWeekYear"},nc={},oc={s:45,m:45,h:22,d:26,M:11},pc="DDD w W M D d".split(" "),qc="M D H h m s w W".split(" "),rc={M:function(){return this.month()+1},MMM:function(a){return this.localeData().monthsShort(this,a)},MMMM:function(a){return this.localeData().months(this,a)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(a){return this.localeData().weekdaysMin(this,a)},ddd:function(a){return this.localeData().weekdaysShort(this,a)},dddd:function(a){return this.localeData().weekdays(this,a)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return r(this.year()%100,2)},YYYY:function(){return r(this.year(),4)},YYYYY:function(){return r(this.year(),5)},YYYYYY:function(){var a=this.year(),b=a>=0?"+":"-";return b+r(Math.abs(a),6)},gg:function(){return r(this.weekYear()%100,2)},gggg:function(){return r(this.weekYear(),4)},ggggg:function(){return r(this.weekYear(),5)},GG:function(){return r(this.isoWeekYear()%100,2)},GGGG:function(){return r(this.isoWeekYear(),4)},GGGGG:function(){return r(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return C(this.milliseconds()/100)},SS:function(){return r(C(this.milliseconds()/10),2)},SSS:function(){return r(this.milliseconds(),3)},SSSS:function(){return r(this.milliseconds(),3)},Z:function(){var a=this.utcOffset(),b="+";return 0>a&&(a=-a,b="-"),b+r(C(a/60),2)+":"+r(C(a)%60,2)},ZZ:function(){var a=this.utcOffset(),b="+";return 0>a&&(a=-a,b="-"),b+r(C(a/60),2)+r(C(a)%60,2)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},x:function(){return this.valueOf()},X:function(){return this.unix()},Q:function(){return this.quarter()}},sc={},tc=["months","monthsShort","weekdays","weekdaysShort","weekdaysMin"],uc=!1;pc.length;)xb=pc.pop(),rc[xb+"o"]=i(rc[xb],xb);for(;qc.length;)xb=qc.pop(),rc[xb+xb]=h(rc[xb],2);rc.DDDD=h(rc.DDD,3),o(l.prototype,{set:function(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(a){return this._months[a.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(a){return this._monthsShort[a.month()]},monthsParse:function(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=vb.utc([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(a){return this._weekdays[a.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(a){return this._weekdaysShort[a.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(a){return this._weekdaysMin[a.day()]},weekdaysParse:function(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=vb([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b},_longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},longDateFormat:function(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b},isPM:function(a){return"p"===(a+"").toLowerCase().charAt(0)},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.apply(b,[c]):d},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)},pastFuture:function(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)},ordinal:function(a){return this._ordinal.replace("%d",a)},_ordinal:"%d",_ordinalParse:/\d{1,2}/,preparse:function(a){return a},postformat:function(a){return a},week:function(a){return jb(a,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6},firstDayOfWeek:function(){return this._week.dow},firstDayOfYear:function(){return this._week.doy},_invalidDate:"Invalid date",invalidDate:function(){return this._invalidDate}}),vb=function(b,c,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._i=b,g._f=c,g._l=e,g._strict=f,g._isUTC=!1,g._pf=d(),lb(g)},vb.suppressDeprecationWarnings=!1,vb.createFromInputFallback=f("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),vb.min=function(){var a=[].slice.call(arguments,0);return mb("isBefore",a)},vb.max=function(){var a=[].slice.call(arguments,0);return mb("isAfter",a)},vb.utc=function(b,c,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._useUTC=!0,g._isUTC=!0,g._l=e,g._i=b,g._f=c,g._strict=f,g._pf=d(),lb(g).utc()},vb.unix=function(a){return vb(1e3*a)},vb.duration=function(a,b){var d,e,f,g,h=a,i=null;return vb.isDuration(a)?h={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(h={},b?h[b]=a:h.milliseconds=a):(i=Nb.exec(a))?(d="-"===i[1]?-1:1,h={y:0,d:C(i[Eb])*d,h:C(i[Fb])*d,m:C(i[Gb])*d,s:C(i[Hb])*d,ms:C(i[Ib])*d}):(i=Ob.exec(a))?(d="-"===i[1]?-1:1,f=function(a){var b=a&&parseFloat(a.replace(",","."));return(isNaN(b)?0:b)*d},h={y:f(i[2]),M:f(i[3]),d:f(i[4]),h:f(i[5]),m:f(i[6]),s:f(i[7]),w:f(i[8])}):null==h?h={}:"object"==typeof h&&("from"in h||"to"in h)&&(g=t(vb(h.from),vb(h.to)),h={},h.ms=g.milliseconds,h.M=g.months),e=new n(h),vb.isDuration(a)&&c(a,"_locale")&&(e._locale=a._locale),e},vb.version=yb,vb.defaultFormat=gc,vb.ISO_8601=function(){},vb.momentProperties=Kb,vb.updateOffset=function(){},vb.relativeTimeThreshold=function(b,c){return oc[b]===a?!1:c===a?oc[b]:(oc[b]=c,!0)},vb.lang=f("moment.lang is deprecated. Use moment.locale instead.",function(a,b){return vb.locale(a,b)}),vb.locale=function(a,b){var c;return a&&(c="undefined"!=typeof b?vb.defineLocale(a,b):vb.localeData(a),c&&(vb.duration._locale=vb._locale=c)),vb._locale._abbr},vb.defineLocale=function(a,b){return null!==b?(b.abbr=a,Jb[a]||(Jb[a]=new l),Jb[a].set(b),vb.locale(a),Jb[a]):(delete Jb[a],null)},vb.langData=f("moment.langData is deprecated. Use moment.localeData instead.",function(a){return vb.localeData(a)}),vb.localeData=function(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return vb._locale;if(!w(a)){if(b=L(a))return b;a=[a]}return K(a)},vb.isMoment=function(a){return a instanceof m||null!=a&&c(a,"_isAMomentObject")},vb.isDuration=function(a){return a instanceof n};for(xb=tc.length-1;xb>=0;--xb)B(tc[xb]);vb.normalizeUnits=function(a){return z(a)},vb.invalid=function(a){var b=vb.utc(0/0);return null!=a?o(b._pf,a):b._pf.userInvalidated=!0,b},vb.parseZone=function(){return vb.apply(null,arguments).parseZone()},vb.parseTwoDigitYear=function(a){return C(a)+(C(a)>68?1900:2e3)},vb.isDate=x,o(vb.fn=m.prototype,{clone:function(){return vb(this)},valueOf:function(){return+this._d-6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){var a=vb(this).utc();return 0<a.year()&&a.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():P(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):P(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds()]},isValid:function(){return I(this)},isDSTShifted:function(){return this._a?this.isValid()&&y(this._a,(this._isUTC?vb.utc(this._a):vb(this._a)).toArray())>0:!1},parsingFlags:function(){return o({},this._pf)},invalidAt:function(){return this._pf.overflow},utc:function(a){return this.utcOffset(0,a)},local:function(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(this._dateUtcOffset(),"m")),this},format:function(a){var b=P(this,a||vb.defaultFormat);return this.localeData().postformat(b)},add:u(1,"add"),subtract:u(-1,"subtract"),diff:function(a,b,c){var d,e,f=M(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=z(b),"year"===b||"month"===b||"quarter"===b?(e=j(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:q(e)},from:function(a,b){return vb.duration({to:this,from:a}).locale(this.locale()).humanize(!b)},fromNow:function(a){return this.from(vb(),a)},calendar:function(a){var b=a||vb(),c=M(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this,vb(b)))},isLeapYear:function(){return G(this.year())},isDST:function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=gb(a,this.localeData()),this.add(a-b,"d")):b},month:qb("Month",!0),startOf:function(a){switch(a=z(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a?this.weekday(0):"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this},endOf:function(b){return b=z(b),b===a||"millisecond"===b?this:this.startOf(b).add(1,"isoWeek"===b?"week":b).subtract(1,"ms")},isAfter:function(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=vb.isMoment(a)?a:vb(a),+this>+a):(c=vb.isMoment(a)?+a:+vb(a),c<+this.clone().startOf(b))},isBefore:function(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=vb.isMoment(a)?a:vb(a),+a>+this):(c=vb.isMoment(a)?+a:+vb(a),+this.clone().endOf(b)<c)},isBetween:function(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)},isSame:function(a,b){var c;return b=z(b||"millisecond"),"millisecond"===b?(a=vb.isMoment(a)?a:vb(a),+this===+a):(c=+vb(a),+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))},min:f("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(a){return a=vb.apply(null,arguments),this>a?this:a}),max:f("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(a){return a=vb.apply(null,arguments),a>this?this:a}),zone:f("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",function(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}),utcOffset:function(a,b){var c,d=this._offset||0;return null!=a?("string"==typeof a&&(a=S(a)),Math.abs(a)<16&&(a=60*a),!this._isUTC&&b&&(c=this._dateUtcOffset()),this._offset=a,this._isUTC=!0,null!=c&&this.add(c,"m"),d!==a&&(!b||this._changeInProgress?v(this,vb.duration(a-d,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,vb.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?d:this._dateUtcOffset()},isLocal:function(){return!this._isUTC},isUtcOffset:function(){return this._isUTC},isUtc:function(){return this._isUTC&&0===this._offset},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},parseZone:function(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(S(this._i)),this},hasAlignedHourOffset:function(a){return a=a?vb(a).utcOffset():0,(this.utcOffset()-a)%60===0},daysInMonth:function(){return D(this.year(),this.month())},dayOfYear:function(a){var b=Ab((vb(this).startOf("day")-vb(this).startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")},quarter:function(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)},weekYear:function(a){var b=jb(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")},isoWeekYear:function(a){var b=jb(this,1,4).year;return null==a?b:this.add(a-b,"y")},week:function(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")},isoWeek:function(a){var b=jb(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")},weekday:function(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")},isoWeekday:function(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)},isoWeeksInYear:function(){return E(this.year(),1,4)},weeksInYear:function(){var a=this.localeData()._week;return E(this.year(),a.dow,a.doy)},get:function(a){return a=z(a),this[a]()},set:function(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else a=z(a),"function"==typeof this[a]&&this[a](b);return this},locale:function(b){var c;return b===a?this._locale._abbr:(c=vb.localeData(b),null!=c&&(this._locale=c),this)},lang:f("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(b){return b===a?this.localeData():this.locale(b)}),localeData:function(){return this._locale},_dateUtcOffset:function(){return 15*-Math.round(this._d.getTimezoneOffset()/15)}}),vb.fn.millisecond=vb.fn.milliseconds=qb("Milliseconds",!1),vb.fn.second=vb.fn.seconds=qb("Seconds",!1),vb.fn.minute=vb.fn.minutes=qb("Minutes",!1),vb.fn.hour=vb.fn.hours=qb("Hours",!0),vb.fn.date=qb("Date",!0),vb.fn.dates=f("dates accessor is deprecated. Use date instead.",qb("Date",!0)),vb.fn.year=qb("FullYear",!0),vb.fn.years=f("years accessor is deprecated. Use year instead.",qb("FullYear",!0)),vb.fn.days=vb.fn.day,vb.fn.months=vb.fn.month,vb.fn.weeks=vb.fn.week,vb.fn.isoWeeks=vb.fn.isoWeek,vb.fn.quarters=vb.fn.quarter,vb.fn.toJSON=vb.fn.toISOString,vb.fn.isUTC=vb.fn.isUtc,o(vb.duration.fn=n.prototype,{_bubble:function(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;g.milliseconds=d%1e3,a=q(d/1e3),g.seconds=a%60,b=q(a/60),g.minutes=b%60,c=q(b/60),g.hours=c%24,e+=q(c/24),h=q(rb(e)),e-=q(sb(h)),f+=q(e/30),e%=30,h+=q(f/12),f%=12,g.days=e,g.months=f,g.years=h},abs:function(){return this._milliseconds=Math.abs(this._milliseconds),this._days=Math.abs(this._days),this._months=Math.abs(this._months),this._data.milliseconds=Math.abs(this._data.milliseconds),this._data.seconds=Math.abs(this._data.seconds),this._data.minutes=Math.abs(this._data.minutes),this._data.hours=Math.abs(this._data.hours),this._data.months=Math.abs(this._data.months),this._data.years=Math.abs(this._data.years),this},weeks:function(){return q(this.days()/7)},valueOf:function(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*C(this._months/12)
-},humanize:function(a){var b=ib(this,!a,this.localeData());return a&&(b=this.localeData().pastFuture(+this,b)),this.localeData().postformat(b)},add:function(a,b){var c=vb.duration(a,b);return this._milliseconds+=c._milliseconds,this._days+=c._days,this._months+=c._months,this._bubble(),this},subtract:function(a,b){var c=vb.duration(a,b);return this._milliseconds-=c._milliseconds,this._days-=c._days,this._months-=c._months,this._bubble(),this},get:function(a){return a=z(a),this[a.toLowerCase()+"s"]()},as:function(a){var b,c;if(a=z(a),"month"===a||"year"===a)return b=this._days+this._milliseconds/864e5,c=this._months+12*rb(b),"month"===a?c:c/12;switch(b=this._days+Math.round(sb(this._months/12)),a){case"week":return b/7+this._milliseconds/6048e5;case"day":return b+this._milliseconds/864e5;case"hour":return 24*b+this._milliseconds/36e5;case"minute":return 24*b*60+this._milliseconds/6e4;case"second":return 24*b*60*60+this._milliseconds/1e3;case"millisecond":return Math.floor(24*b*60*60*1e3)+this._milliseconds;default:throw new Error("Unknown unit "+a)}},lang:vb.fn.lang,locale:vb.fn.locale,toIsoString:f("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",function(){return this.toISOString()}),toISOString:function(){var a=Math.abs(this.years()),b=Math.abs(this.months()),c=Math.abs(this.days()),d=Math.abs(this.hours()),e=Math.abs(this.minutes()),f=Math.abs(this.seconds()+this.milliseconds()/1e3);return this.asSeconds()?(this.asSeconds()<0?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"},localeData:function(){return this._locale},toJSON:function(){return this.toISOString()}}),vb.duration.fn.toString=vb.duration.fn.toISOString;for(xb in kc)c(kc,xb)&&tb(xb.toLowerCase());vb.duration.fn.asMilliseconds=function(){return this.as("ms")},vb.duration.fn.asSeconds=function(){return this.as("s")},vb.duration.fn.asMinutes=function(){return this.as("m")},vb.duration.fn.asHours=function(){return this.as("h")},vb.duration.fn.asDays=function(){return this.as("d")},vb.duration.fn.asWeeks=function(){return this.as("weeks")},vb.duration.fn.asMonths=function(){return this.as("M")},vb.duration.fn.asYears=function(){return this.as("y")},vb.locale("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===C(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),Lb?module.exports=vb:"function"==typeof define&&define.amd?(define(function(a,b,c){return c.config&&c.config()&&c.config().noGlobal===!0&&(zb.moment=wb),vb}),ub(!0)):ub()}).call(this);
\ No newline at end of file
+(function(a){function b(a,b,c){switch(arguments.length){case 2:return null!=a?a:b;case 3:return null!=a?a:null!=b?b:c;default:throw new Error("Implement me")}}function c(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function d(a){rb.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function e(a,b){var c=!0;return l(function(){return c&&(d(a),c=!1),b.apply(this,arguments)},b)}function f(a,b){nc[a]||(d(b),nc[a]=!0)}function g(a,b){return function(c){return o(a.call(this,c),b)}}function h(a,b){return function(c){return this.localeData().ordinal(a.call(this,c),b)}}function i(){}function j(a,b){b!==!1&&E(a),m(this,a),this._d=new Date(+a._d)}function k(a){var b=x(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=rb.localeData(),this._bubble()}function l(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return b.hasOwnProperty("toString")&&(a.toString=b.toString),b.hasOwnProperty("valueOf")&&(a.valueOf=b.valueOf),a}function m(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Fb.length>0)for(c in Fb)d=Fb[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function n(a){return 0>a?Math.ceil(a):Math.floor(a)}function o(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function p(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function q(a,b){var c;return b=J(b,a),a.isBefore(b)?c=p(a,b):(c=p(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function r(a,b){return function(c,d){var e,g;return null===d||isNaN(+d)||(f(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),g=c,c=d,d=g),c="string"==typeof c?+c:c,e=rb.duration(c,d),s(this,e,a),this}}function s(a,b,c,d){var e=b._milliseconds,f=b._days,g=b._months;d=null==d?!0:d,e&&a._d.setTime(+a._d+e*c),f&&lb(a,"Date",kb(a,"Date")+f*c),g&&jb(a,kb(a,"Month")+g*c),d&&rb.updateOffset(a,f||g)}function t(a){return"[object Array]"===Object.prototype.toString.call(a)}function u(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function v(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&z(a[d])!==z(b[d]))&&g++;return g+f}function w(a){if(a){var b=a.toLowerCase().replace(/(.)s$/,"$1");a=gc[a]||hc[b]||b}return a}function x(a){var b,c,d={};for(c in a)a.hasOwnProperty(c)&&(b=w(c),b&&(d[b]=a[c]));return d}function y(b){var c,d;if(0===b.indexOf("week"))c=7,d="day";else{if(0!==b.indexOf("month"))return;c=12,d="month"}rb[b]=function(e,f){var g,h,i=rb._locale[b],j=[];if("number"==typeof e&&(f=e,e=a),h=function(a){var b=rb().utc().set(d,a);return i.call(rb._locale,b,e||"")},null!=f)return h(f);for(g=0;c>g;g++)j.push(h(g));return j}}function z(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function A(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function B(a,b,c){return fb(rb([a,11,31+b-c]),b,c).week}function C(a){return D(a)?366:365}function D(a){return a%4===0&&a%100!==0||a%400===0}function E(a){var b;a._a&&-2===a._pf.overflow&&(b=a._a[yb]<0||a._a[yb]>11?yb:a._a[zb]<1||a._a[zb]>A(a._a[xb],a._a[yb])?zb:a._a[Ab]<0||a._a[Ab]>23?Ab:a._a[Bb]<0||a._a[Bb]>59?Bb:a._a[Cb]<0||a._a[Cb]>59?Cb:a._a[Db]<0||a._a[Db]>999?Db:-1,a._pf._overflowDayOfYear&&(xb>b||b>zb)&&(b=zb),a._pf.overflow=b)}function F(a){return null==a._isValid&&(a._isValid=!isNaN(a._d.getTime())&&a._pf.overflow<0&&!a._pf.empty&&!a._pf.invalidMonth&&!a._pf.nullInput&&!a._pf.invalidFormat&&!a._pf.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===a._pf.charsLeftOver&&0===a._pf.unusedTokens.length)),a._isValid}function G(a){return a?a.toLowerCase().replace("_","-"):a}function H(a){for(var b,c,d,e,f=0;f<a.length;){for(e=G(a[f]).split("-"),b=e.length,c=G(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=I(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&v(e,c,!0)>=b-1)break;b--}f++}return null}function I(a){var b=null;if(!Eb[a]&&Gb)try{b=rb.locale(),require("./locale/"+a),rb.locale(b)}catch(c){}return Eb[a]}function J(a,b){return b._isUTC?rb(a).zone(b._offset||0):rb(a).local()}function K(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function L(a){var b,c,d=a.match(Kb);for(b=0,c=d.length;c>b;b++)d[b]=mc[d[b]]?mc[d[b]]:K(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function M(a,b){return a.isValid()?(b=N(b,a.localeData()),ic[b]||(ic[b]=L(b)),ic[b](a)):a.localeData().invalidDate()}function N(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Lb.lastIndex=0;d>=0&&Lb.test(a);)a=a.replace(Lb,c),Lb.lastIndex=0,d-=1;return a}function O(a,b){var c,d=b._strict;switch(a){case"Q":return Wb;case"DDDD":return Yb;case"YYYY":case"GGGG":case"gggg":return d?Zb:Ob;case"Y":case"G":case"g":return _b;case"YYYYYY":case"YYYYY":case"GGGGG":case"ggggg":return d?$b:Pb;case"S":if(d)return Wb;case"SS":if(d)return Xb;case"SSS":if(d)return Yb;case"DDD":return Nb;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return Rb;case"a":case"A":return b._locale._meridiemParse;case"X":return Ub;case"Z":case"ZZ":return Sb;case"T":return Tb;case"SSSS":return Qb;case"MM":case"DD":case"YY":case"GG":case"gg":case"HH":case"hh":case"mm":case"ss":case"ww":case"WW":return d?Xb:Mb;case"M":case"D":case"d":case"H":case"h":case"m":case"s":case"w":case"W":case"e":case"E":return Mb;case"Do":return Vb;default:return c=new RegExp(X(W(a.replace("\\","")),"i"))}}function P(a){a=a||"";var b=a.match(Sb)||[],c=b[b.length-1]||[],d=(c+"").match(ec)||["-",0,0],e=+(60*d[1])+z(d[2]);return"+"===d[0]?-e:e}function Q(a,b,c){var d,e=c._a;switch(a){case"Q":null!=b&&(e[yb]=3*(z(b)-1));break;case"M":case"MM":null!=b&&(e[yb]=z(b)-1);break;case"MMM":case"MMMM":d=c._locale.monthsParse(b),null!=d?e[yb]=d:c._pf.invalidMonth=b;break;case"D":case"DD":null!=b&&(e[zb]=z(b));break;case"Do":null!=b&&(e[zb]=z(parseInt(b,10)));break;case"DDD":case"DDDD":null!=b&&(c._dayOfYear=z(b));break;case"YY":e[xb]=rb.parseTwoDigitYear(b);break;case"YYYY":case"YYYYY":case"YYYYYY":e[xb]=z(b);break;case"a":case"A":c._isPm=c._locale.isPM(b);break;case"H":case"HH":case"h":case"hh":e[Ab]=z(b);break;case"m":case"mm":e[Bb]=z(b);break;case"s":case"ss":e[Cb]=z(b);break;case"S":case"SS":case"SSS":case"SSSS":e[Db]=z(1e3*("0."+b));break;case"X":c._d=new Date(1e3*parseFloat(b));break;case"Z":case"ZZ":c._useUTC=!0,c._tzm=P(b);break;case"dd":case"ddd":case"dddd":d=c._locale.weekdaysParse(b),null!=d?(c._w=c._w||{},c._w.d=d):c._pf.invalidWeekday=b;break;case"w":case"ww":case"W":case"WW":case"d":case"e":case"E":a=a.substr(0,1);case"gggg":case"GGGG":case"GGGGG":a=a.substr(0,2),b&&(c._w=c._w||{},c._w[a]=z(b));break;case"gg":case"GG":c._w=c._w||{},c._w[a]=rb.parseTwoDigitYear(b)}}function R(a){var c,d,e,f,g,h,i;c=a._w,null!=c.GG||null!=c.W||null!=c.E?(g=1,h=4,d=b(c.GG,a._a[xb],fb(rb(),1,4).year),e=b(c.W,1),f=b(c.E,1)):(g=a._locale._week.dow,h=a._locale._week.doy,d=b(c.gg,a._a[xb],fb(rb(),g,h).year),e=b(c.w,1),null!=c.d?(f=c.d,g>f&&++e):f=null!=c.e?c.e+g:g),i=gb(d,e,f,h,g),a._a[xb]=i.year,a._dayOfYear=i.dayOfYear}function S(a){var c,d,e,f,g=[];if(!a._d){for(e=U(a),a._w&&null==a._a[zb]&&null==a._a[yb]&&R(a),a._dayOfYear&&(f=b(a._a[xb],e[xb]),a._dayOfYear>C(f)&&(a._pf._overflowDayOfYear=!0),d=bb(f,0,a._dayOfYear),a._a[yb]=d.getUTCMonth(),a._a[zb]=d.getUTCDate()),c=0;3>c&&null==a._a[c];++c)a._a[c]=g[c]=e[c];for(;7>c;c++)a._a[c]=g[c]=null==a._a[c]?2===c?1:0:a._a[c];a._d=(a._useUTC?bb:ab).apply(null,g),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()+a._tzm)}}function T(a){var b;a._d||(b=x(a._i),a._a=[b.year,b.month,b.day,b.hour,b.minute,b.second,b.millisecond],S(a))}function U(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function V(a){if(a._f===rb.ISO_8601)return void Z(a);a._a=[],a._pf.empty=!0;var b,c,d,e,f,g=""+a._i,h=g.length,i=0;for(d=N(a._f,a._locale).match(Kb)||[],b=0;b<d.length;b++)e=d[b],c=(g.match(O(e,a))||[])[0],c&&(f=g.substr(0,g.indexOf(c)),f.length>0&&a._pf.unusedInput.push(f),g=g.slice(g.indexOf(c)+c.length),i+=c.length),mc[e]?(c?a._pf.empty=!1:a._pf.unusedTokens.push(e),Q(e,c,a)):a._strict&&!c&&a._pf.unusedTokens.push(e);a._pf.charsLeftOver=h-i,g.length>0&&a._pf.unusedInput.push(g),a._isPm&&a._a[Ab]<12&&(a._a[Ab]+=12),a._isPm===!1&&12===a._a[Ab]&&(a._a[Ab]=0),S(a),E(a)}function W(a){return a.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e})}function X(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function Y(a){var b,d,e,f,g;if(0===a._f.length)return a._pf.invalidFormat=!0,void(a._d=new Date(0/0));for(f=0;f<a._f.length;f++)g=0,b=m({},a),b._pf=c(),b._f=a._f[f],V(b),F(b)&&(g+=b._pf.charsLeftOver,g+=10*b._pf.unusedTokens.length,b._pf.score=g,(null==e||e>g)&&(e=g,d=b));l(a,d||b)}function Z(a){var b,c,d=a._i,e=ac.exec(d);if(e){for(a._pf.iso=!0,b=0,c=cc.length;c>b;b++)if(cc[b][1].exec(d)){a._f=cc[b][0]+(e[6]||" ");break}for(b=0,c=dc.length;c>b;b++)if(dc[b][1].exec(d)){a._f+=dc[b][0];break}d.match(Sb)&&(a._f+="Z"),V(a)}else a._isValid=!1}function $(a){Z(a),a._isValid===!1&&(delete a._isValid,rb.createFromInputFallback(a))}function _(b){var c,d=b._i;d===a?b._d=new Date:u(d)?b._d=new Date(+d):null!==(c=Hb.exec(d))?b._d=new Date(+c[1]):"string"==typeof d?$(b):t(d)?(b._a=d.slice(0),S(b)):"object"==typeof d?T(b):"number"==typeof d?b._d=new Date(d):rb.createFromInputFallback(b)}function ab(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function bb(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function cb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function db(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function eb(a,b,c){var d=rb.duration(a).abs(),e=wb(d.as("s")),f=wb(d.as("m")),g=wb(d.as("h")),h=wb(d.as("d")),i=wb(d.as("M")),j=wb(d.as("y")),k=e<jc.s&&["s",e]||1===f&&["m"]||f<jc.m&&["mm",f]||1===g&&["h"]||g<jc.h&&["hh",g]||1===h&&["d"]||h<jc.d&&["dd",h]||1===i&&["M"]||i<jc.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,db.apply({},k)}function fb(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=rb(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function gb(a,b,c,d,e){var f,g,h=bb(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:C(a-1)+g}}function hb(b){var c=b._i,d=b._f;return b._locale=b._locale||rb.localeData(b._l),null===c||d===a&&""===c?rb.invalid({nullInput:!0}):("string"==typeof c&&(b._i=c=b._locale.preparse(c)),rb.isMoment(c)?new j(c,!0):(d?t(d)?Y(b):V(b):_(b),new j(b)))}function ib(a,b){var c,d;if(1===b.length&&t(b[0])&&(b=b[0]),!b.length)return rb();for(c=b[0],d=1;d<b.length;++d)b[d][a](c)&&(c=b[d]);return c}function jb(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),A(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function kb(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function lb(a,b,c){return"Month"===b?jb(a,c):a._d["set"+(a._isUTC?"UTC":"")+b](c)}function mb(a,b){return function(c){return null!=c?(lb(this,a,c),rb.updateOffset(this,b),this):kb(this,a)}}function nb(a){return 400*a/146097}function ob(a){return 146097*a/400}function pb(a){rb.duration.fn[a]=function(){return this._data[a]}}function qb(a){"undefined"==typeof ender&&(sb=vb.moment,vb.moment=a?e("Accessing Moment through the global scope is deprecated, and will be removed in an upcoming release.",rb):rb)}for(var rb,sb,tb,ub="2.8.1",vb="undefined"!=typeof global?global:this,wb=Math.round,xb=0,yb=1,zb=2,Ab=3,Bb=4,Cb=5,Db=6,Eb={},Fb=[],Gb="undefined"!=typeof module&&module.exports,Hb=/^\/?Date\((\-?\d+)/i,Ib=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,Jb=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,Kb=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g,Lb=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,Mb=/\d\d?/,Nb=/\d{1,3}/,Ob=/\d{1,4}/,Pb=/[+\-]?\d{1,6}/,Qb=/\d+/,Rb=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Sb=/Z|[\+\-]\d\d:?\d\d/gi,Tb=/T/i,Ub=/[\+\-]?\d+(\.\d{1,3})?/,Vb=/\d{1,2}/,Wb=/\d/,Xb=/\d\d/,Yb=/\d{3}/,Zb=/\d{4}/,$b=/[+-]?\d{6}/,_b=/[+-]?\d+/,ac=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,bc="YYYY-MM-DDTHH:mm:ssZ",cc=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],dc=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ec=/([\+\-]|\d\d)/gi,fc=("Date|Hours|Minutes|Seconds|Milliseconds".split("|"),{Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6}),gc={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",D:"date",w:"week",W:"isoWeek",M:"month",Q:"quarter",y:"year",DDD:"dayOfYear",e:"weekday",E:"isoWeekday",gg:"weekYear",GG:"isoWeekYear"},hc={dayofyear:"dayOfYear",isoweekday:"isoWeekday",isoweek:"isoWeek",weekyear:"weekYear",isoweekyear:"isoWeekYear"},ic={},jc={s:45,m:45,h:22,d:26,M:11},kc="DDD w W M D d".split(" "),lc="M D H h m s w W".split(" "),mc={M:function(){return this.month()+1},MMM:function(a){return this.localeData().monthsShort(this,a)},MMMM:function(a){return this.localeData().months(this,a)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(a){return this.localeData().weekdaysMin(this,a)},ddd:function(a){return this.localeData().weekdaysShort(this,a)},dddd:function(a){return this.localeData().weekdays(this,a)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return o(this.year()%100,2)},YYYY:function(){return o(this.year(),4)},YYYYY:function(){return o(this.year(),5)},YYYYYY:function(){var a=this.year(),b=a>=0?"+":"-";return b+o(Math.abs(a),6)},gg:function(){return o(this.weekYear()%100,2)},gggg:function(){return o(this.weekYear(),4)},ggggg:function(){return o(this.weekYear(),5)},GG:function(){return o(this.isoWeekYear()%100,2)},GGGG:function(){return o(this.isoWeekYear(),4)},GGGGG:function(){return o(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return z(this.milliseconds()/100)},SS:function(){return o(z(this.milliseconds()/10),2)},SSS:function(){return o(this.milliseconds(),3)},SSSS:function(){return o(this.milliseconds(),3)},Z:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+o(z(a/60),2)+":"+o(z(a)%60,2)},ZZ:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+o(z(a/60),2)+o(z(a)%60,2)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()},Q:function(){return this.quarter()}},nc={},oc=["months","monthsShort","weekdays","weekdaysShort","weekdaysMin"];kc.length;)tb=kc.pop(),mc[tb+"o"]=h(mc[tb],tb);for(;lc.length;)tb=lc.pop(),mc[tb+tb]=g(mc[tb],2);mc.DDDD=g(mc.DDD,3),l(i.prototype,{set:function(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(a){return this._months[a.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(a){return this._monthsShort[a.month()]},monthsParse:function(a){var b,c,d;for(this._monthsParse||(this._monthsParse=[]),b=0;12>b;b++)if(this._monthsParse[b]||(c=rb.utc([2e3,b]),d="^"+this.months(c,"")+"|^"+this.monthsShort(c,""),this._monthsParse[b]=new RegExp(d.replace(".",""),"i")),this._monthsParse[b].test(a))return b},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(a){return this._weekdays[a.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(a){return this._weekdaysShort[a.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(a){return this._weekdaysMin[a.day()]},weekdaysParse:function(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=rb([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},longDateFormat:function(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b},isPM:function(a){return"p"===(a+"").toLowerCase().charAt(0)},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(a,b){var c=this._calendar[a];return"function"==typeof c?c.apply(b):c},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)},pastFuture:function(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)},ordinal:function(a){return this._ordinal.replace("%d",a)},_ordinal:"%d",preparse:function(a){return a},postformat:function(a){return a},week:function(a){return fb(a,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6},_invalidDate:"Invalid date",invalidDate:function(){return this._invalidDate}}),rb=function(b,d,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._i=b,g._f=d,g._l=e,g._strict=f,g._isUTC=!1,g._pf=c(),hb(g)},rb.suppressDeprecationWarnings=!1,rb.createFromInputFallback=e("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i)}),rb.min=function(){var a=[].slice.call(arguments,0);return ib("isBefore",a)},rb.max=function(){var a=[].slice.call(arguments,0);return ib("isAfter",a)},rb.utc=function(b,d,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._useUTC=!0,g._isUTC=!0,g._l=e,g._i=b,g._f=d,g._strict=f,g._pf=c(),hb(g).utc()},rb.unix=function(a){return rb(1e3*a)},rb.duration=function(a,b){var c,d,e,f,g=a,h=null;return rb.isDuration(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=Ib.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:z(h[zb])*c,h:z(h[Ab])*c,m:z(h[Bb])*c,s:z(h[Cb])*c,ms:z(h[Db])*c}):(h=Jb.exec(a))?(c="-"===h[1]?-1:1,e=function(a){var b=a&&parseFloat(a.replace(",","."));return(isNaN(b)?0:b)*c},g={y:e(h[2]),M:e(h[3]),d:e(h[4]),h:e(h[5]),m:e(h[6]),s:e(h[7]),w:e(h[8])}):"object"==typeof g&&("from"in g||"to"in g)&&(f=q(rb(g.from),rb(g.to)),g={},g.ms=f.milliseconds,g.M=f.months),d=new k(g),rb.isDuration(a)&&a.hasOwnProperty("_locale")&&(d._locale=a._locale),d},rb.version=ub,rb.defaultFormat=bc,rb.ISO_8601=function(){},rb.momentProperties=Fb,rb.updateOffset=function(){},rb.relativeTimeThreshold=function(b,c){return jc[b]===a?!1:c===a?jc[b]:(jc[b]=c,!0)},rb.lang=e("moment.lang is deprecated. Use moment.locale instead.",function(a,b){return rb.locale(a,b)}),rb.locale=function(a,b){var c;return a&&(c="undefined"!=typeof b?rb.defineLocale(a,b):rb.localeData(a),c&&(rb.duration._locale=rb._locale=c)),rb._locale._abbr},rb.defineLocale=function(a,b){return null!==b?(b.abbr=a,Eb[a]||(Eb[a]=new i),Eb[a].set(b),rb.locale(a),Eb[a]):(delete Eb[a],null)},rb.langData=e("moment.langData is deprecated. Use moment.localeData instead.",function(a){return rb.localeData(a)}),rb.localeData=function(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return rb._locale;if(!t(a)){if(b=I(a))return b;a=[a]}return H(a)},rb.isMoment=function(a){return a instanceof j||null!=a&&a.hasOwnProperty("_isAMomentObject")},rb.isDuration=function(a){return a instanceof k};for(tb=oc.length-1;tb>=0;--tb)y(oc[tb]);rb.normalizeUnits=function(a){return w(a)},rb.invalid=function(a){var b=rb.utc(0/0);return null!=a?l(b._pf,a):b._pf.userInvalidated=!0,b},rb.parseZone=function(){return rb.apply(null,arguments).parseZone()},rb.parseTwoDigitYear=function(a){return z(a)+(z(a)>68?1900:2e3)},l(rb.fn=j.prototype,{clone:function(){return rb(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){var a=rb(this).utc();return 0<a.year()&&a.year()<=9999?M(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):M(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds()]},isValid:function(){return F(this)},isDSTShifted:function(){return this._a?this.isValid()&&v(this._a,(this._isUTC?rb.utc(this._a):rb(this._a)).toArray())>0:!1},parsingFlags:function(){return l({},this._pf)},invalidAt:function(){return this._pf.overflow},utc:function(a){return this.zone(0,a)},local:function(a){return this._isUTC&&(this.zone(0,a),this._isUTC=!1,a&&this.add(this._d.getTimezoneOffset(),"m")),this},format:function(a){var b=M(this,a||rb.defaultFormat);return this.localeData().postformat(b)},add:r(1,"add"),subtract:r(-1,"subtract"),diff:function(a,b,c){var d,e,f=J(a,this),g=6e4*(this.zone()-f.zone());return b=w(b),"year"===b||"month"===b?(d=432e5*(this.daysInMonth()+f.daysInMonth()),e=12*(this.year()-f.year())+(this.month()-f.month()),e+=(this-rb(this).startOf("month")-(f-rb(f).startOf("month")))/d,e-=6e4*(this.zone()-rb(this).startOf("month").zone()-(f.zone()-rb(f).startOf("month").zone()))/d,"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:n(e)},from:function(a,b){return rb.duration({to:this,from:a}).locale(this.locale()).humanize(!b)},fromNow:function(a){return this.from(rb(),a)},calendar:function(a){var b=a||rb(),c=J(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this))},isLeapYear:function(){return D(this.year())},isDST:function(){return this.zone()<this.clone().month(0).zone()||this.zone()<this.clone().month(5).zone()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=cb(a,this.localeData()),this.add(a-b,"d")):b},month:mb("Month",!0),startOf:function(a){switch(a=w(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a?this.weekday(0):"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this},endOf:function(a){return a=w(a),this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")},isAfter:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)>+rb(a).startOf(b)},isBefore:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)<+rb(a).startOf(b)},isSame:function(a,b){return b=b||"ms",+this.clone().startOf(b)===+J(a,this).startOf(b)},min:e("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(a){return a=rb.apply(null,arguments),this>a?this:a}),max:e("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(a){return a=rb.apply(null,arguments),a>this?this:a}),zone:function(a,b){var c,d=this._offset||0;return null==a?this._isUTC?d:this._d.getTimezoneOffset():("string"==typeof a&&(a=P(a)),Math.abs(a)<16&&(a=60*a),!this._isUTC&&b&&(c=this._d.getTimezoneOffset()),this._offset=a,this._isUTC=!0,null!=c&&this.subtract(c,"m"),d!==a&&(!b||this._changeInProgress?s(this,rb.duration(d-a,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,rb.updateOffset(this,!0),this._changeInProgress=null)),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},parseZone:function(){return this._tzm?this.zone(this._tzm):"string"==typeof this._i&&this.zone(this._i),this},hasAlignedHourOffset:function(a){return a=a?rb(a).zone():0,(this.zone()-a)%60===0},daysInMonth:function(){return A(this.year(),this.month())},dayOfYear:function(a){var b=wb((rb(this).startOf("day")-rb(this).startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")},quarter:function(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)},weekYear:function(a){var b=fb(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")},isoWeekYear:function(a){var b=fb(this,1,4).year;return null==a?b:this.add(a-b,"y")},week:function(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")},isoWeek:function(a){var b=fb(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")},weekday:function(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")},isoWeekday:function(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)},isoWeeksInYear:function(){return B(this.year(),1,4)},weeksInYear:function(){var a=this.localeData()._week;return B(this.year(),a.dow,a.doy)},get:function(a){return a=w(a),this[a]()},set:function(a,b){return a=w(a),"function"==typeof this[a]&&this[a](b),this},locale:function(b){return b===a?this._locale._abbr:(this._locale=rb.localeData(b),this)},lang:e("moment().lang() is deprecated. Use moment().localeData() instead.",function(b){return b===a?this.localeData():(this._locale=rb.localeData(b),this)}),localeData:function(){return this._locale}}),rb.fn.millisecond=rb.fn.milliseconds=mb("Milliseconds",!1),rb.fn.second=rb.fn.seconds=mb("Seconds",!1),rb.fn.minute=rb.fn.minutes=mb("Minutes",!1),rb.fn.hour=rb.fn.hours=mb("Hours",!0),rb.fn.date=mb("Date",!0),rb.fn.dates=e("dates accessor is deprecated. Use date instead.",mb("Date",!0)),rb.fn.year=mb("FullYear",!0),rb.fn.years=e("years accessor is deprecated. Use year instead.",mb("FullYear",!0)),rb.fn.days=rb.fn.day,rb.fn.months=rb.fn.month,rb.fn.weeks=rb.fn.week,rb.fn.isoWeeks=rb.fn.isoWeek,rb.fn.quarters=rb.fn.quarter,rb.fn.toJSON=rb.fn.toISOString,l(rb.duration.fn=k.prototype,{_bubble:function(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;g.milliseconds=d%1e3,a=n(d/1e3),g.seconds=a%60,b=n(a/60),g.minutes=b%60,c=n(b/60),g.hours=c%24,e+=n(c/24),h=n(nb(e)),e-=n(ob(h)),f+=n(e/30),e%=30,h+=n(f/12),f%=12,g.days=e,g.months=f,g.years=h},abs:function(){return this._milliseconds=Math.abs(this._milliseconds),this._days=Math.abs(this._days),this._months=Math.abs(this._months),this._data.milliseconds=Math.abs(this._data.milliseconds),this._data.seconds=Math.abs(this._data.seconds),this._data.minutes=Math.abs(this._data.minutes),this._data.hours=Math.abs(this._data.hours),this._data.months=Math.abs(this._data.months),this._data.years=Math.abs(this._data.years),this},weeks:function(){return n(this.days()/7)},valueOf:function(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*z(this._months/12)},humanize:function(a){var b=eb(this,!a,this.localeData());return a&&(b=this.localeData().pastFuture(+this,b)),this.localeData().postformat(b)},add:function(a,b){var c=rb.duration(a,b);return this._milliseconds+=c._milliseconds,this._days+=c._days,this._months+=c._months,this._bubble(),this},subtract:function(a,b){var c=rb.duration(a,b);return this._milliseconds-=c._milliseconds,this._days-=c._days,this._months-=c._months,this._bubble(),this},get:function(a){return a=w(a),this[a.toLowerCase()+"s"]()},as:function(a){var b,c;if(a=w(a),b=this._days+this._milliseconds/864e5,"month"===a||"year"===a)return c=this._months+12*nb(b),"month"===a?c:c/12;switch(b+=ob(this._months/12),a){case"week":return b/7;case"day":return b;case"hour":return 24*b;case"minute":return 24*b*60;case"second":return 24*b*60*60;case"millisecond":return 24*b*60*60*1e3;default:throw new Error("Unknown unit "+a)}},lang:rb.fn.lang,locale:rb.fn.locale,toIsoString:e("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",function(){return this.toISOString()}),toISOString:function(){var a=Math.abs(this.years()),b=Math.abs(this.months()),c=Math.abs(this.days()),d=Math.abs(this.hours()),e=Math.abs(this.minutes()),f=Math.abs(this.seconds()+this.milliseconds()/1e3);return this.asSeconds()?(this.asSeconds()<0?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"},localeData:function(){return this._locale}});for(tb in fc)fc.hasOwnProperty(tb)&&pb(tb.toLowerCase());rb.duration.fn.asMilliseconds=function(){return this.as("ms")},rb.duration.fn.asSeconds=function(){return this.as("s")},rb.duration.fn.asMinutes=function(){return this.as("m")},rb.duration.fn.asHours=function(){return this.as("h")},rb.duration.fn.asDays=function(){return this.as("d")},rb.duration.fn.asWeeks=function(){return this.as("weeks")},rb.duration.fn.asMonths=function(){return this.as("M")},rb.duration.fn.asYears=function(){return this.as("y")},rb.locale("en",{ordinal:function(a){var b=a%10,c=1===z(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),Gb?module.exports=rb:"function"==typeof define&&define.amd?(define("moment",function(a,b,c){return c.config&&c.config()&&c.config().noGlobal===!0&&(vb.moment=sb),rb}),qb(!0)):qb()}).call(this);
\ No newline at end of file

From 9efdb23e5fa44cb4e0bdc303a5e6e189e44fb583 Mon Sep 17 00:00:00 2001
From: Dietrich Moerman <dietrich.moerman@wunderkraut.com>
Date: Mon, 30 Mar 2015 11:58:50 +0200
Subject: [PATCH 062/275] UIT-38: Correct the position and weight of the Date
 Range Picker CSS.

---
 culturefeed_search_ui/culturefeed_search_ui.module | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 76f3fcc3..cb1d3666 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -344,7 +344,10 @@ function culturefeed_search_ui_library() {
       $path . '/js/daterangepicker.js' => array(),
     ),
     'css' => array(
-      $path . '/css/daterangepicker-bs3.css' => array(),
+      $path . '/css/daterangepicker-bs3.css' => array(
+        'weight' => 100,
+        'group' => CSS_THEME,
+      ),
     ),
     'dependencies' => array(
       array('culturefeed_search_ui', 'ui.moment'),

From 9a040f041b8f98c6197c8b384469669aa92b3e8f Mon Sep 17 00:00:00 2001
From: Nicolas Leroy <nicolas.leroy@gmail.com>
Date: Fri, 3 Apr 2015 12:21:05 +0200
Subject: [PATCH 063/275] UIV-1077: Added two functions to initiate a calendar
 formatter (HTML or plain text)

---
 culturefeed_agenda/includes/helpers.inc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index baca80a8..10bb8e32 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -777,3 +777,22 @@ function culturefeed_agenda_get_category_list_of_item($category_type, $cdb_item)
 
 }
 
+/**
+ * A function to initiate a HTML calendar formatter.
+ * @return \CultuurNet\CalendarSummary\CalendarHTMLFormatter
+ */
+function culturefeed_agenda_get_html_calendar_formatter() {
+  $formatter = new CultuurNet\CalendarSummary\CalendarHTMLFormatter();
+
+  return $formatter;
+}
+
+/**
+ * A function to initiate a plain text calendar formatter.
+ * @return \CultuurNet\CalendarSummary\CalendarPlainTextFormatter
+ */
+function culturefeed_agenda_get_plain_text_calendar_formatter() {
+  $formatter = new CultuurNet\CalendarSummary\CalendarPlainTextFormatter();
+
+  return $formatter;
+}

From b55f55238bbec7400acbd1c09f0715a1a79e18d5 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 7 Apr 2015 12:24:37 +0200
Subject: [PATCH 064/275] PWK-241 has picture filter

---
 .../views_handler_field_cdb_item_picture.inc   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index aa60b8c0..53c6d098 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -13,6 +13,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
 
     $options['width'] = array('default' => 100);
     $options['height'] = array('default' => 100);
+		$options['format'] = array('default' => 'image');
     $options['link'] = array('default' => FALSE);
 
     return $options;
@@ -37,6 +38,16 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       '#required' => TRUE,
     );
 
+		$form['format'] = array(
+			'#type' => 'select',
+			'#title' => t('Format'),
+			'#options' => array(
+				'image' => t('image'),
+				'url' => t('url'),
+			),
+			'#default_value' => isset($this->options['format']) ? $this->options['format'] : 'image',
+		);
+
     $form['link'] = array(
       '#type' => 'checkbox',
       '#title' => t('Link the picture to the detail page'),
@@ -72,7 +83,12 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     }
 
     if (!empty($main_picture)) {
-      $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+			if ($this->options['format'] == 'image') {
+				$image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+			}
+			else if ($this->options['format'] == 'url') {
+				$image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+			}
 
       if ($this->options['link']) {
         $path = culturefeed_search_detail_path($extended_entity->getType(), $extended_entity->getId(), $extended_entity->getTitle(culturefeed_search_get_preferred_language()));

From 0e92ddee1d9a2f750f139ef97591680787ed6fef Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 7 Apr 2015 12:25:08 +0200
Subject: [PATCH 065/275] PWK-241 field cdb_item_category

---
 .../culturefeed_search_views.info             |  1 +
 .../views/culturefeed_search_views.views.inc  |  9 +++
 .../views_handler_field_cdb_item_category.inc | 68 +++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc

diff --git a/culturefeed_search_views/culturefeed_search_views.info b/culturefeed_search_views/culturefeed_search_views.info
index ada64929..4042251c 100644
--- a/culturefeed_search_views/culturefeed_search_views.info
+++ b/culturefeed_search_views/culturefeed_search_views.info
@@ -35,6 +35,7 @@ files[] = views/handlers/field/views_handler_field_cdb_item_location.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_organiser.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_picture.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_short_description.inc
+files[] = views/handlers/field/views_handler_field_cdb_item_category.inc
 
 
 dependencies[] = culturefeed_search
diff --git a/culturefeed_search_views/views/culturefeed_search_views.views.inc b/culturefeed_search_views/views/culturefeed_search_views.views.inc
index 42789bce..fa4fb934 100644
--- a/culturefeed_search_views/views/culturefeed_search_views.views.inc
+++ b/culturefeed_search_views/views/culturefeed_search_views.views.inc
@@ -201,6 +201,15 @@ function culturefeed_search_views_data() {
     ),
   );
 
+	// Category.
+	$data['cdb_items']['category'] = array(
+		'title' => t('Category'),
+		'help' => t('Category of the cdb item'),
+		'field' => array(
+			'handler' => 'views_handler_field_cdb_item_category',
+		),
+	);
+
   // Organiser.
   $data['cdb_items']['organiser'] = array(
     'title' => t('Organiser'),
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
new file mode 100644
index 00000000..417feac1
--- /dev/null
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * A handler to provide proper displays for the categories of a cdb item.
+ */
+class views_handler_field_cdb_item_category extends views_handler_field {
+
+	/**
+	 * @see views_handler_field::option_definition()
+	 */
+	function option_definition() {
+		$options = parent::option_definition();
+
+		$options['link'] = array('default' => FALSE);
+
+		return $options;
+	}
+
+	/**
+	 * @see views_handler_field::options_form()
+	 */
+	function options_form(&$form, &$form_state) {
+
+		$form['link'] = array(
+			'#type' => 'checkbox',
+			'#title' => t('Link the category to the category result page'),
+			'#default_value' => isset($this->options['link']) ? $this->options['link'] : FALSE,
+		);
+
+		parent::options_form($form, $form_state);
+
+	}
+
+  /**
+   * @see views_handler_field::render()
+   */
+  function render($extended_entity) {
+
+    if (!method_exists($extended_entity->getEntity(), 'getCategories')) {
+      return;
+    }
+
+		$categories = culturefeed_agenda_get_category_list_of_item('eventtype', $extended_entity->getEntity());
+
+    if (!$categories) {
+      return;
+    }
+
+		$categories_names = array();
+
+		if ($this->options['link']) {
+			foreach ($categories['links'] as $category) {
+				$categories_names[] = $category;
+			}
+			$categories_names = implode(', ', $categories_names);
+		}
+		else {
+			foreach ($categories['text'] as $category) {
+				$categories_names[] = $category;
+			}
+			$categories_names = implode(', ', $categories_names);
+		}
+
+		return $categories_names;
+
+  }
+
+}

From eed57605acdd1e73ebbcb3cfdec8dd8766512aa8 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 7 Apr 2015 12:25:26 +0200
Subject: [PATCH 066/275] PWK-241 relative date range

---
 ...er_filter_culturefeed_search_daterange.inc | 148 ++++++++++++++----
 1 file changed, 116 insertions(+), 32 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
index 93b21634..1703651a 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
@@ -5,16 +5,20 @@
  */
 class views_handler_filter_culturefeed_search_daterange extends views_handler_filter {
 
-  private $start_date;
+  private $option_absolute;
+	private $start_date;
   private $end_date;
+	private $relative_date;
 
   /**
    * @see views_handler_filter::init()
    */
   function init(&$view, &$options) {
     parent::init($view, $options);
+		$this->option_absolute = $this->options['option_absolute'];
     $this->start_date = $this->options['start_date'];
     $this->end_date = $this->options['end_date'];
+		$this->relative_date = $this->options['relative_date'];
   }
 
   /**
@@ -23,8 +27,10 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
   function option_definition() {
 
     $options = parent::option_definition();
+		$options['option_absolute'] = array('default' => 0);
     $options['start_date'] = array('default' => '');
     $options['end_date'] = array('default' => '');
+		$options['relative_date'] = array('default' => '');
 
     return $options;
 
@@ -34,13 +40,28 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    * @see views_handler_filter::value_form()
    */
   function value_form(&$form, &$form_state) {
+		$form['option_absolute'] = array(
+			'#type' => 'radios',
+			'#title' => t('Absolute or relative date'),
+			'#default_value' => $this->option_absolute,
+			'#options' => array(
+				0 => t('Absolute'),
+				1 => t('Relative')
+			),
+			'#description' => t('Do you want to use an absolute start date or a relative one?'),
+		);
     $form['start_date'] = array(
       '#type' => 'textfield',
       '#title' => t('Start date'),
       '#size' => 30,
       '#default_value' => $this->start_date,
       '#description' => t('Format: !date_format', array('!date_format' => date('d/m/Y'))),
-      '#required' => TRUE,
+      //'#required' => TRUE,
+			'#states' => array(
+				'visible' => array(
+					':input[name="options[option_absolute]"]' => array('value' => 0),
+				),
+			),
     );
     $form['end_date'] = array(
       '#type' => 'textfield',
@@ -48,7 +69,24 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
       '#size' => 30,
       '#default_value' => $this->end_date,
       '#description' => t('Format: !date_format', array('!date_format' => date('d/m/Y'))),
+			'#states' => array(
+				'visible' => array(
+					':input[name="options[option_absolute]"]' => array('value' => 0),
+				),
+			),
     );
+		$form['relative_date'] = array(
+			'#type' => 'textfield',
+			'#title' => t('Relative date'),
+			'#size' => 30,
+			'#default_value' => $this->relative_date,
+			'#description' => t('A relative date starting from now. For eg. +2 weeks, tomorrow.'),
+			'#states' => array(
+				'visible' => array(
+					':input[name="options[option_absolute]"]' => array('value' => 1),
+				),
+			),
+		);
   }
 
   /**
@@ -56,18 +94,34 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    */
   function value_validate($form, &$form_state) {
 
-    $startDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['start_date']);
-    if (!$startDate) {
-      form_set_error('start_date', t('The entered start date is not in the correct format'));
-    }
-
-    if (!empty($form_state['values']['options']['start_date'])) {
-      $endDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['start_date']);
-      if (!$endDate) {
-        form_set_error('start_date', t('The entered end date is not in the correct format'));
-      }
-    }
-
+		$optionAbsolute = $form_state['values']['options']['option_absolute'];
+
+		if ($optionAbsolute == 0) {
+			if (!empty($form_state['values']['options']['start_date'])) {
+				$startDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['start_date']);
+				if (!$startDate) {
+					form_set_error('start_date', t('The entered start date is not in the correct format'));
+				}
+			}
+
+			if (!empty($form_state['values']['options']['end_date'])) {
+				$endDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['end_date']);
+				if (!$endDate) {
+					form_set_error('start_date', t('The entered end date is not in the correct format'));
+				}
+			}
+		}
+		else if ($optionAbsolute == 1) {
+			if (!empty($form_state['values']['options']['relative_date'])) {
+				$now = new DateTime();
+				$rel_start_date = clone $now;
+				$rel_start_date->modify($this->relative_date);
+
+				if (!$rel_start_date) {
+					form_set_error('relative_date', t('The entered relative date is not in the correct format'));
+				}
+			}
+		}
   }
 
   /**
@@ -75,13 +129,28 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    */
   function admin_summary() {
 
-    if (!empty($this->end_date)) {
-      return check_plain(t('Between @start_date and @end_date', array('@start_date' => $this->start_date, '@end_date' => $this->end_date)));
-    }
-    else {
-      return check_plain($this->start_date);
-    }
-
+		if ($this->option_absolute == 0) {
+			if (!empty($this->end_date)) {
+				return check_plain(t('Between @start_date and @end_date', array(
+					'@start_date' => $this->start_date,
+					'@end_date' => $this->end_date
+				)));
+			}
+			else {
+				return check_plain($this->start_date);
+			}
+		}
+		else if ($this->option_absolute == 1) {
+			if (!empty($this->relative_date)) {
+				$now = new DateTime();
+				$rel_start_date = clone $now;
+				$rel_start_date->modify($this->relative_date);
+
+				return check_plain(t('Starting from @relative_start_date', array(
+					'@relative_start_date' => $rel_start_date->format('d/m/Y'),
+				)));
+			}
+		}
   }
 
   /**
@@ -89,21 +158,36 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    */
   function query() {
 
-    $startDate = DateTime::createFromFormat('d/m/Y', $this->start_date);
-    $endDate = $startDate;
-    if (!empty($this->end_date)) {
-      $endDate = DateTime::createFromFormat('d/m/Y', $this->end_date);
-    }
+		if ($this->option_absolute == 0) {
+			$startDate = DateTime::createFromFormat('d/m/Y', $this->start_date);
+			$endDate = $startDate;
+			if (!empty($this->end_date)) {
+				$endDate = DateTime::createFromFormat('d/m/Y', $this->end_date);
+			}
+
+			// Set start date time on beginning of the day.
+			$startDate->setTime(0, 0, 1);
+
+			// Set end date time to end of the day day, to it searches on full day.
+			$endDate->setTime(23, 59, 59);
+
+			$parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
 
-    // Set start date time on beginning of the day.
-    $startDate->setTime(0, 0, 1);
+			$this->query->add_parameter($parameter);
+		}
+		else if ($this->option_absolute == 1) {
+			$now = new DateTime();
+			$rel_start_date = clone $now;
+			$rel_start_date->modify($this->relative_date);
+			$rel_start_date->format('d/m/Y');
 
-    // Set end date time to end of the day day, to it searches on full day.
-    $endDate->setTime(23, 59, 59);
+			// Set start date time on beginning of the day.
+			$rel_start_date->setTime(0, 0, 1);
 
-    $parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
+			$parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $rel_start_date->getTimestamp(), '*');
 
-    $this->query->add_parameter($parameter);
+			$this->query->add_parameter($parameter);
+		}
 
   }
 

From c5be97a579a41dd08d6aa3a448e7354abbacc8df Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Tue, 7 Apr 2015 15:38:30 +0200
Subject: [PATCH 067/275] UIT-41: Added support for metatag module on profile
 pages and search pages

---
 .../culturefeed_search_ui.module              | 37 ++++++++++++++++++-
 culturefeed_ui/culturefeed_ui.module          | 20 ++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 6c4d7427..6d0aad25 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -602,7 +602,7 @@ function culturefeed_search_ui_block_configure($delta) {
       $form[$config_label][$i]['api-filter-query'] = array(
         '#title' => t('Filterquery for API'),
         '#type' => 'textfield',
-        '#default_value' => isset($options[$i]['api-filter-query']) ? $options[$i]['api-filter-query'] : '', 
+        '#default_value' => isset($options[$i]['api-filter-query']) ? $options[$i]['api-filter-query'] : '',
         '#maxlength' => 255
       );
     }
@@ -900,6 +900,41 @@ function culturefeed_search_ui_page_alter(&$variables) {
 
 }
 
+/**
+ * Implements hook_metatag_page_cache_cid_parts_alter().
+ */
+function culturefeed_search_ui_metatag_page_cache_cid_parts_alter(&$cid_parts) {
+
+  // Add active facets to the metatag cid, this is needed for unique titels per active facet.
+  $culturefeedFacetingComponent = culturefeed_get_facet_component();
+  if (!$culturefeedFacetingComponent instanceof \CultuurNet\Search\Component\Facet\FacetComponent) {
+    return;
+  }
+
+  // Add the value of every active filter to the metadata cid.
+  $active_filters = module_invoke_all('culturefeed_search_ui_active_filters', $culturefeedFacetingComponent);
+  if (!empty($active_filters)) {
+
+    $values = array();
+    foreach ($active_filters as $key => $active_filter) {
+
+      if (!isset($active_filter['#label'])) {
+        foreach ($active_filter as $subkey => $subitem) {
+          $values[] = $key . ':' . $subkey;
+        }
+      }
+      else {
+        $values[] = $key;
+      }
+
+    }
+
+  }
+
+  $cid_parts['active_cf_filters'] = implode(',', $values);
+
+}
+
 /**
  * Implements hook_culturefeed_search_ui_active_filters().
  */
diff --git a/culturefeed_ui/culturefeed_ui.module b/culturefeed_ui/culturefeed_ui.module
index 484d2f96..0c0b19f9 100644
--- a/culturefeed_ui/culturefeed_ui.module
+++ b/culturefeed_ui/culturefeed_ui.module
@@ -488,3 +488,23 @@ function culturefeed_ui_page_build() {
     culturefeed_ui_set_cookies_message();
   }
 }
+
+/**
+ * Implements hook_metatag_page_cache_cid_parts_alter().
+ */
+function culturefeed_ui_metatag_page_cache_cid_parts_alter(&$cid_parts) {
+
+  // Create unique cid for the cf profile edit screens.
+  $edit_screens = array(
+    'profile',
+    'account',
+    'emails',
+    'activities',
+    'searches',
+    'calendar'
+  );
+  if (arg(0) == 'culturefeed' && in_array(arg(1), $edit_screens)) {
+    $cid_parts['cf_uid'] = DrupalCultureFeed::getLoggedInUserId();
+  }
+
+}
\ No newline at end of file

From a4b45eae1c58bd5cfc28b5fa6ecf526eec4cdca6 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 9 Apr 2015 08:41:51 +0200
Subject: [PATCH 068/275] MSS-135 fix totals

---
 culturefeed_uitpas/includes/promotions.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/culturefeed_uitpas/includes/promotions.inc b/culturefeed_uitpas/includes/promotions.inc
index 41193af4..19aa588b 100644
--- a/culturefeed_uitpas/includes/promotions.inc
+++ b/culturefeed_uitpas/includes/promotions.inc
@@ -68,6 +68,8 @@ function culturefeed_uitpas_promotions_get($filter = NULL) {
     '#theme' => 'culturefeed_uitpas_promotions',
     '#promotions' => $promotions,
     '#promotions_total' => $promotions_total,
+    '#promotions_pager_min' => ($promotions_page * $promotions_max) + 1,
+    '#promotions_pager_max' => ($promotions_page * $promotions_max) + $promotions_max,
   );
 
 }

From df32aed6b8e2370d21842a1503777cef57bcb6b5 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 9 Apr 2015 10:31:54 +0200
Subject: [PATCH 069/275] MSS-135 undo cleanup

---
 culturefeed_uitpas/includes/promotions.inc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/culturefeed_uitpas/includes/promotions.inc b/culturefeed_uitpas/includes/promotions.inc
index 19aa588b..a44935e3 100644
--- a/culturefeed_uitpas/includes/promotions.inc
+++ b/culturefeed_uitpas/includes/promotions.inc
@@ -64,12 +64,18 @@ function culturefeed_uitpas_promotions_get($filter = NULL) {
 
   }
 
+  $promotions_pager_min = ($promotions_page * $promotions_max) + 1;
+  $promotions_pager_max = ($promotions_page * $promotions_max) + $promotions_max;
+  if ($promotions_pager_max > $promotions_total) {
+    $promotions_pager_max = $promotions_total;
+  }
+
   return array(
     '#theme' => 'culturefeed_uitpas_promotions',
     '#promotions' => $promotions,
     '#promotions_total' => $promotions_total,
-    '#promotions_pager_min' => ($promotions_page * $promotions_max) + 1,
-    '#promotions_pager_max' => ($promotions_page * $promotions_max) + $promotions_max,
+    '#promotions_pager_min' => $promotions_pager_min,
+    '#promotions_pager_max' => $promotions_pager_max,
   );
 
 }

From efa44bcbecb371288ffad5bf5facc192828c7a83 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 10 Apr 2015 15:58:06 +0200
Subject: [PATCH 070/275] add variables for new calendar formats

---
 culturefeed_agenda/theme/theme.inc | 87 ++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 2b89b4e5..7eeedec3 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -481,6 +481,76 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
 
     // When.
     $variables['when'] = check_plain($event_detail->getCalendarSummary());
+    
+    // Format Calendar details to readable & themable HTML.
+    $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
+    
+    // Large Calendar format (for detail pages).
+    $variables['when_lg'] = '';
+    try {
+      $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
+    }
+    catch (Exception $e) {
+    } 
+    
+    // Medium Calendar format (for event-summary on search result pages).
+    $variables['when_md'] = '';
+    try {
+      $variables['when_md'] = $html_formatter->format($calendar, 'md');
+    }
+    catch (Exception $e) {
+    }
+    
+    // Small Calendar format (for mini-summary in event teasers).
+    $variables['when_sm'] = '';
+    try {
+      $variables['when_sm'] = $html_formatter->format($calendar, 'sm');
+    }
+    catch (Exception $e) {
+    }
+    
+    // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
+    $variables['when_xs'] = '';
+    try {
+      $variables['when_xs'] = $html_formatter->format($calendar, 'xs');
+    }
+    catch (Exception $e) {
+    }
+    
+    // Format calendar to TXT
+    $txt_formatter = culturefeed_agenda_get_plain_text_calendar_formatter();
+    
+    // Large Calendar format (for detail pages).
+    $variables['when_lg_txt'] = '';
+    try {
+      $variables['when_lg_txt'] = $txt_formatter->format($calendar, 'lg');
+    }
+    catch (Exception $e) {
+    } 
+    
+    // Medium Calendar format (for event-summary on search result pages).
+    $variables['when_md_txt'] = '';
+    try {
+      $variables['when_md_txt'] = $txt_formatter->format($calendar, 'md');
+    }
+    catch (Exception $e) {
+    }
+    
+    // Small Calendar format (for mini-summary in event teasers).
+    $variables['when_sm_txt'] = '';
+    try {
+      $variables['when_sm_txt'] = $txt_formatter->format($calendar, 'sm');
+    }
+    catch (Exception $e) {
+    }
+    
+    // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
+    $variables['when_xs_txt'] = '';
+    try {
+      $variables['when_xs_txt'] = $txt_formatter->format($calendar, 'xs');
+    }
+    catch (Exception $e) {
+    }
 
   }
 
@@ -523,7 +593,24 @@ function _culturefeed_agenda_preprocess_production(&$variables) {
       if ($event) {
         $event_detail = $event->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
         if ($event_detail) {
+        
+          // Calendar.
+          if ($calendar = $event->getEntity()->getCalendar()) {
+            $variables['calendar'] = culturefeed_agenda_parse_calendar($calendar);
+          }
+
           $variables['when'] = $event_detail->getCalendarSummary();
+        
+          // Format Calendar details to readable & themable HTML.
+          $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
+          
+          // Large Calendar format (for detail pages).
+          $variables['when_lg'] = '';
+          try {
+            $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
+          }
+          catch (Exception $e) {
+          } 
         }
 
         // Add location information from the event.

From fd1a34a39904d6bdd4936afc67cc2abe04a3b2f6 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Sat, 11 Apr 2015 11:24:54 +0200
Subject: [PATCH 071/275] add calendar-summary lib to composer.json

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f06036c8..1cf8bafd 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,8 @@
     "require": {
       "cultuurnet/search": "~1.0",
       "cultuurnet/cdb": "~2.0",
-      "cultuurnet/culturefeed-php": "~1.0"
+      "cultuurnet/culturefeed-php": "~1.0",
+      "cultuurnet/calendar-summary": "~1.0"
     },
     "require-dev": {
       "phing/phing": "~2.10"

From b023b2ba00079e336c4512d32631a56e73e88a67 Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Mon, 13 Apr 2015 09:50:54 +0200
Subject: [PATCH 072/275] Fix notice when no filters are active

---
 culturefeed_search_ui/culturefeed_search_ui.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 8007b032..8a8735aa 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -920,9 +920,9 @@ function culturefeed_search_ui_metatag_page_cache_cid_parts_alter(&$cid_parts) {
 
     }
 
-  }
+    $cid_parts['active_cf_filters'] = implode(',', $values);
 
-  $cid_parts['active_cf_filters'] = implode(',', $values);
+  }
 
 }
 

From 357bf56db110ace3c6853e9aec3449dd15501bc7 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 13 Apr 2015 15:18:22 +0200
Subject: [PATCH 073/275] UIV-1063 update description of sort field

---
 culturefeed_agenda/culturefeed_agenda.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 3596c023..2309c424 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -425,7 +425,7 @@ function culturefeed_agenda_block_configure($delta) {
       '#title' => t('Sort field'),
       '#type' => 'textfield',
       '#default_value' => variable_get('agenda_related_activities_sort') . (!empty(variable_get('agenda_related_activities_sort_direction')) ? ' ' . variable_get('agenda_related_activities_sort_direction') : ''),
-      '#description' => t('Field to sort on. Example startdate'),
+      '#description' => t('Field + direction to sort on. Example permanent asc, availableto asc, weight desc'),
     );
 
     $form['agenda_related_activities_total_items'] = array(

From 9791f2fdcaa3efc9de1484837d41600e987ad711 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 14 Apr 2015 10:22:48 +0200
Subject: [PATCH 074/275] UIV-1063 fix fatal error

---
 culturefeed_agenda/culturefeed_agenda.module | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 2309c424..686f4617 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -420,11 +420,15 @@ function culturefeed_agenda_block_configure($delta) {
       '#default_value' => variable_get('agenda_related_activities_extra_query'),
       '#description' => t('Make sure this is a correct solr query. Example title:mytitle'),
     );
+    
+    // sort_direction is no longer a seperate field. Add it to the sort field if variable exists.
+    $sort_direction = variable_get('agenda_related_activities_sort_direction', '');
+    $default_sort = variable_get('agenda_related_activities_sort') . ' ' . $sort_direction;
 
     $form['agenda_related_activities_sort'] = array(
       '#title' => t('Sort field'),
       '#type' => 'textfield',
-      '#default_value' => variable_get('agenda_related_activities_sort') . (!empty(variable_get('agenda_related_activities_sort_direction')) ? ' ' . variable_get('agenda_related_activities_sort_direction') : ''),
+      '#default_value' => $default_sort,
       '#description' => t('Field + direction to sort on. Example permanent asc, availableto asc, weight desc'),
     );
 

From 05e77ce85e6ce12eeaa7cb964509a90f29da66f6 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 14 Apr 2015 11:49:33 +0200
Subject: [PATCH 075/275] UIV-1105 move city suggest to top of list when it
 matches search item.

---
 culturefeed_search/includes/helpers.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search/includes/helpers.inc b/culturefeed_search/includes/helpers.inc
index 8fe02ad5..e1fcf48b 100644
--- a/culturefeed_search/includes/helpers.inc
+++ b/culturefeed_search/includes/helpers.inc
@@ -609,7 +609,7 @@ function culturefeed_search_get_flandersregion_suggestions($search_string, $incl
   $query->condition('did', 'flandersregion');
   //$query->condition('language', culturefeed_search_get_preferred_language());
   $query->condition('language', 'und');
-  $query->condition('name', '%' . db_like($search_string) . '%', 'LIKE');
+	$query->condition('name', '%' . db_like($search_string) . '%', 'LIKE');
   $query->condition('name', '%(' . db_like($search_string) . '%)', 'NOT LIKE');
   if(!$include_regions) {
     $query->isNotNull('p1');
@@ -635,6 +635,14 @@ function culturefeed_search_get_flandersregion_suggestions($search_string, $incl
     $suggestions[$old_parts . $row->name] = $row->name;
   }
 
+	foreach ($suggestions as $key => $suggestion) {
+		if (strtolower($suggestion) == strtolower($search_string)) {
+			$val = $suggestion;
+			unset($suggestion);
+			$suggestions = array($key => $val) + $suggestions;
+		}
+	}
+
   return $suggestions;
 
 }

From 1ae9e19c398bfc7f2bc179256a5bc10cf5dfffa3 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 14 Apr 2015 14:29:34 +0200
Subject: [PATCH 076/275] PWK-241 culturefeed search views sort by weight

---
 .../culturefeed_search_views.info             |   1 +
 .../views/culturefeed_search_views.views.inc  |   8 ++
 ...er_filter_culturefeed_search_daterange.inc |  16 ++-
 ...handler_filter_culturefeed_search_tags.inc | 128 ++++++++++++++++--
 ...handler_sort_culturefeed_search_weight.inc |  17 +++
 5 files changed, 151 insertions(+), 19 deletions(-)
 create mode 100644 culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc

diff --git a/culturefeed_search_views/culturefeed_search_views.info b/culturefeed_search_views/culturefeed_search_views.info
index 4042251c..8af3e689 100644
--- a/culturefeed_search_views/culturefeed_search_views.info
+++ b/culturefeed_search_views/culturefeed_search_views.info
@@ -27,6 +27,7 @@ files[] = views/handlers/sort/views_handler_sort_culturefeed_search_recommends.i
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_comments.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_agefrom.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_lastupdated.inc
+files[] = views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_title.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_lastupdated.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_link.inc
diff --git a/culturefeed_search_views/views/culturefeed_search_views.views.inc b/culturefeed_search_views/views/culturefeed_search_views.views.inc
index fa4fb934..f4223466 100644
--- a/culturefeed_search_views/views/culturefeed_search_views.views.inc
+++ b/culturefeed_search_views/views/culturefeed_search_views.views.inc
@@ -264,6 +264,14 @@ function culturefeed_search_views_data() {
     ),
   );
 
+	$data['cdb_items']['weight_sort'] = array(
+		'title' => t('Weight'),
+		'help' => t('Sort on weight.'),
+		'sort' => array(
+			'handler' => 'views_handler_sort_culturefeed_search_weight'
+		),
+	);
+
   return $data;
 
 }
diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
index 1703651a..f1e8e29f 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
@@ -166,14 +166,22 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
 			}
 
 			// Set start date time on beginning of the day.
-			$startDate->setTime(0, 0, 1);
+			if (!empty($startDate)) {
+				$startDate->setTime(0, 0, 1);
+			}
 
 			// Set end date time to end of the day day, to it searches on full day.
-			$endDate->setTime(23, 59, 59);
+			if (!empty($endDate)) {
+				$endDate->setTime(23, 59, 59);
+			}
 
-			$parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
+			if (!empty($startDate) && !empty($endDate)) {
+				$parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
+			}
 
-			$this->query->add_parameter($parameter);
+			if (isset($parameter)) {
+				$this->query->add_parameter($parameter);
+			}
 		}
 		else if ($this->option_absolute == 1) {
 			$now = new DateTime();
diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
index 638f4d8d..797a7409 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
@@ -10,33 +10,131 @@ class views_handler_filter_culturefeed_search_tags extends views_handler_filter_
    */
   function init(&$view, &$options) {
     parent::init($view, $options);
-    $this->search_field = 'keywords';
+		$this->operator = $this->options['operator'];
+		for ($i = 0; $i < 10; $i++) {
+			$this->keyword[$i]['inverse'] = $this->options['keyword'][$i]['not'];
+			$this->keyword[$i]['value'] = $this->options['keyword'][$i]['value'];
+		}
   }
 
+	/**
+	 * @see views_handler_filter::option_definition()
+	 */
+	function option_definition() {
+
+		$options = parent::option_definition();
+		$options['operator'] = array('default' => 'or');
+		for ($i = 0; $i < 10; $i++) {
+			$options['keyword'][$i]['not'] = array('default' => FALSE);
+			$options['keyword'][$i]['value'] = array('default' => '');
+		}
+
+		return $options;
+
+	}
+
   /**
    * @see views_handler_filter::value_form()
    */
   function value_form(&$form, &$form_state) {
-    $form['value'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Keywords'),
-      '#size' => 30,
-      '#default_value' => $this->value,
-      '#description' => t('For OR use this syntax: Mijnkindopkamp OR UiTPAS Regio Aalst. AND not supplied yet.'),
-    );
+
+		$form['operator'] = array(
+			'#title' => t('How to apply filters on the query'),
+			'#description' => t('Select the operator for the search filters'),
+			'#type' => 'radios',
+			'#options' => array(
+				'and' => t('Use AND-operator'),
+				'or' => t('Use OR-operator'),
+			),
+			'#default_value' => $this->operator,
+		);
+
+		for ($i = 0; $i < 10; $i++) {
+
+				$form['keyword'][$i]['value'] = array(
+					'#title' => t('Keyword'),
+					'#type' => 'textfield',
+					'#default_value' => $this->keyword[$i]['value'],
+					'#maxlength' => 255,
+					'#attributes' => array(
+						'style' => 'float:left;'
+					),
+				);
+				$form['keyword'][$i]['not'] = array(
+					'#title' => t('Inverse'),
+					'#type' => 'checkbox',
+					'#default_value' => $this->keyword[$i]['inverse'],
+					'#attributes' => array(
+						'style' => 'float:left;'
+					),
+				);
+		}
   }
-  
+
   /**
    * @see views_handler_filter::query()
    */
   function query() {
 
-    $values = explode(' OR ', $this->getValue());
-    $keywords = array();
-    foreach ($values as $value) {
-      $keywords[] = '"' . str_replace('"', '\"', $value) . '"';
-    }
-    $this->query->add_where($this->options['group'], 'fq', $this->search_field . ':' . implode(' OR ', $keywords));
+		$operator = $this->operator;
+		$keywords = array();
+		$keywords_inverse = array();
+		for ($i = 0; $i < 10; $i++) {
+			if (!empty($this->keyword[$i]['value']) && $this->keyword[$i]['inverse'] == 1) {
+				$keywords_inverse[$i] = $this->keyword[$i]['value'];
+			}
+			else if (!empty($this->keyword[$i]['value'])) {
+				$keywords[$i] = $this->keyword[$i]['value'];
+			}
+		}
+
+		if ($operator == 'and') {
+			if (!empty($keywords)) {
+				$value_keywords = '(keywords:' . implode(' AND ', $keywords) . ')';
+				$value = $value_keywords;
+			}
+			if (!empty($keywords_inverse)) {
+				$value_inverse_keywords = '(!keywords:' . implode(' AND ', $keywords_inverse) . ')';
+				if (!empty($keywords)) {
+					$value .= ' AND ' . $value_inverse_keywords;
+				}
+				else {
+					$value = $value_inverse_keywords;
+				}
+			}
+		}
+		else if ($operator == 'or') {
+			if (!empty($keywords)) {
+				$value_keywords = '(keywords:' . implode(' OR ', $keywords) . ')';
+				$value = $value_keywords;
+			}
+			if (!empty($keywords_inverse)) {
+				$value_inverse_keywords = '(!keywords:' . implode(' OR ', $keywords_inverse) . ')';
+				if (!empty($keywords)) {
+					$value .= ' OR ' . $value_inverse_keywords;
+				}
+				else {
+					$value = $value_inverse_keywords;
+				}
+			}
+		}
+
+		$parameter = new \CultuurNet\Search\Parameter\FilterQuery($value);
+		$this->query->add_parameter($parameter);
+
   }
 
+	/**
+	 * @see views_handler_filter::admin_summary()
+	 */
+	function admin_summary() {
+		$keywords = array();
+		foreach ($this->keyword as $keyword) {
+			if ($keyword['value'] != '') {
+				$keywords[] = $keyword['value'];
+			}
+		}
+		return implode(', ', $keywords);
+	}
+
 }
\ No newline at end of file
diff --git a/culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc b/culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
new file mode 100644
index 00000000..41aa969e
--- /dev/null
+++ b/culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @class
+ * Handler class for sorting on date.
+ */
+class views_handler_sort_culturefeed_search_weight extends views_handler_sort_culturefeed_search_base {
+
+  /**
+   * @see views_handler::init()
+   */
+  function init(&$view, &$options) {
+    parent::init($view, $options);
+    $this->sort_field = 'weight';
+  }
+
+}
\ No newline at end of file

From b1a12ebd0838ad079fca9fb45aabac4d0ef8b711 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 14 Apr 2015 15:01:48 +0200
Subject: [PATCH 077/275] MSS-157 add override option in culturefeed search
 views fields for title, image and short description

---
 .../views_handler_field_cdb_item_picture.inc  | 24 +++++++++---
 ...ndler_field_cdb_item_short_description.inc | 39 +++++++++++++++++--
 .../views_handler_field_cdb_item_title.inc    | 15 ++++++-
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 53c6d098..422ab3fc 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -11,9 +11,10 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
   function option_definition() {
     $options = parent::option_definition();
 
+    $options['override'] = array('default' => FALSE);
     $options['width'] = array('default' => 100);
     $options['height'] = array('default' => 100);
-		$options['format'] = array('default' => 'image');
+    $options['format'] = array('default' => 'image');
     $options['link'] = array('default' => FALSE);
 
     return $options;
@@ -24,6 +25,13 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
    */
   function options_form(&$form, &$form_state) {
 
+    $form['override'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Override with collaboration data'),
+      '#description' => t('If collaboration data is provided content of this field will be overriden when this is checked.'),
+      '#default_value' => isset($this->options['override']) ? $this->options['override'] : FALSE,
+    );
+
     $form['width'] = array(
       '#type' => 'textfield',
       '#title' => t('Width'),
@@ -69,10 +77,16 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     }
 
     $main_picture = '';
-    $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
-    foreach ($pictures as $picture) {
-      if ($picture->isMain()) {
-        $main_picture = $picture->getHLink();
+
+    if ($this->options['override']) {
+      $main_picture = 'This picture is overriden';
+    }
+    else {
+      $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
+      foreach ($pictures as $picture) {
+        if ($picture->isMain()) {
+          $main_picture = $picture->getHLink();
+        }
       }
     }
 
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index 8f9d016d..460efaec 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -5,14 +5,47 @@
  */
 class views_handler_field_cdb_item_short_description extends views_handler_field {
 
+  /**
+   * @see views_handler_field::option_definition()
+   */
+  function option_definition() {
+    $options = parent::option_definition();
+
+    $options['override'] = array('default' => FALSE);
+
+    return $options;
+	}
+
+  /**
+   * @see views_handler_field::options_form()
+   */
+  function options_form(&$form, &$form_state) {
+
+    $form['override'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Override with collaboration data'),
+      '#description' => t('If collaboration data is provided content of this field will be overriden when this is checked.'),
+      '#default_value' => isset($this->options['override']) ? $this->options['override'] : FALSE,
+    );
+
+    parent::options_form($form, $form_state);
+	}
+
   /**
    * @see views_handler_field::render()
    */
   function render($extended_entity) {
-    $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
-    if ($details) {
-      return $details->getShortDescription();
+
+    if ($this->options['override']) {
+      $short_description = 'This short description is overriden';
+    }
+    else {
+      $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
+      if ($details) {
+        $short_description = $details->getShortDescription();
+      }
     }
+    return $short_description;
   }
 
 }
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index fc7c8fbe..e345a019 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -11,6 +11,7 @@ class views_handler_field_cdb_item_title extends views_handler_field {
   function option_definition() {
     $options = parent::option_definition();
 
+    $options['override'] = array('default' => FALSE);
     $options['link'] = array('default' => FALSE);
 
     return $options;
@@ -21,6 +22,13 @@ class views_handler_field_cdb_item_title extends views_handler_field {
    */
   function options_form(&$form, &$form_state) {
 
+    $form['override'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Override with collaboration data'),
+      '#description' => t('If collaboration data is provided content of this field will be overriden when this is checked.'),
+      '#default_value' => isset($this->options['override']) ? $this->options['override'] : FALSE,
+    );
+
     $form['link'] = array(
       '#type' => 'checkbox',
       '#title' => t('Link the title to the detail page'),
@@ -36,7 +44,12 @@ class views_handler_field_cdb_item_title extends views_handler_field {
    */
   function render($extended_entity) {
 
-    $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+    if ($this->options['override']) {
+      $title = 'This title is overriden';
+    }
+    else {
+      $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+    }
 
     if ($this->options['link']) {
       return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);

From 544863e7ab6f03f9424d0d16da188ed338e13bbe Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 14 Apr 2015 15:49:25 +0200
Subject: [PATCH 078/275] MSS-151 add temporary event subscriber to set CDB
 version tot 3.3

---
 .../lib/Drupal/DrupalCultureFeedSearchService.php             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
index 2e9af806..b9b982ea 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
@@ -32,6 +32,10 @@ private function __construct(ConsumerCredentials $consumerCredentials) {
 
     $endpoint = variable_get('culturefeed_search_api_location', CULTUREFEED_SEARCH_API_LOCATION);
     $service = new \CultuurNet\Search\Guzzle\Service($endpoint, $consumerCredentials);
+    // Temporary workaround to set CDB to 3.3
+    $clientFactory = $service->getHttpClientFactory();
+    $clientFactory->addSubscriber(new \CultuurNet\Cdb\CdbEventSubscriber());
+    $service->setHttpClientFactory($clientFactory);
 
     module_invoke_all('culturefeed_search_service_created', $service);
 

From b73677863d422a32117d42c219d00fa831582124 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 14 Apr 2015 16:17:46 +0200
Subject: [PATCH 079/275] MSS-155 create default views for upcoming events in
 culturefeed search views

---
 .../views/culturefeed_search_views.views.inc  |  16 ++
 .../views/views/upcoming.inc                  | 172 ++++++++++++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 culturefeed_search_views/views/views/upcoming.inc

diff --git a/culturefeed_search_views/views/culturefeed_search_views.views.inc b/culturefeed_search_views/views/culturefeed_search_views.views.inc
index f4223466..60d5c8fb 100644
--- a/culturefeed_search_views/views/culturefeed_search_views.views.inc
+++ b/culturefeed_search_views/views/culturefeed_search_views.views.inc
@@ -308,3 +308,19 @@ function culturefeed_search_views_views_plugins() {
   );
 
 }
+
+/**
+ * Implements hook_views_default_views().
+ **/
+function culturefeed_search_views_views_default_views() {
+  $files = file_scan_directory(drupal_get_path('module', 'culturefeed_search_views'). '/views/views', '/.inc/');
+  foreach ($files as $filepath => $file) {
+    require $filepath;
+    if (isset($view)) {
+      $views[$view->name] = $view;
+    }
+  }
+  if ($views) {
+    return $views;
+  }
+}
diff --git a/culturefeed_search_views/views/views/upcoming.inc b/culturefeed_search_views/views/views/upcoming.inc
new file mode 100644
index 00000000..435e550c
--- /dev/null
+++ b/culturefeed_search_views/views/views/upcoming.inc
@@ -0,0 +1,172 @@
+<?php
+
+$view = new view();
+$view->name = 'upcoming';
+$view->description = '';
+$view->tag = 'default';
+$view->base_table = 'cdb_items';
+$view->human_name = 'Binnenkort';
+$view->core = 7;
+$view->api_version = '3.0';
+$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+/* Display: Master */
+$handler = $view->new_display('default', 'Master', 'default');
+$handler->display->display_options['title'] = 'Binnenkort';
+$handler->display->display_options['use_more_always'] = FALSE;
+$handler->display->display_options['use_more_text'] = 'meer';
+$handler->display->display_options['access']['type'] = 'none';
+$handler->display->display_options['cache']['type'] = 'none';
+$handler->display->display_options['query']['type'] = 'views_query';
+$handler->display->display_options['exposed_form']['type'] = 'basic';
+$handler->display->display_options['exposed_form']['options']['submit_button'] = 'Pas toe';
+$handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Opnieuw instellen';
+$handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorteer op';
+$handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Stijgend';
+$handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Dalend';
+$handler->display->display_options['pager']['type'] = 'some';
+$handler->display->display_options['pager']['options']['items_per_page'] = '5';
+$handler->display->display_options['style_plugin'] = 'default';
+$handler->display->display_options['row_plugin'] = 'fields';
+$handler->display->display_options['row_options']['default_field_elements'] = FALSE;
+/* Veld: UDB items: Afbeelding */
+$handler->display->display_options['fields']['picture']['id'] = 'picture';
+$handler->display->display_options['fields']['picture']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['picture']['field'] = 'picture';
+$handler->display->display_options['fields']['picture']['label'] = '';
+$handler->display->display_options['fields']['picture']['element_type'] = '0';
+$handler->display->display_options['fields']['picture']['element_class'] = 'img-responsive';
+$handler->display->display_options['fields']['picture']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['picture']['element_default_classes'] = FALSE;
+$handler->display->display_options['fields']['picture']['override'] = 0;
+$handler->display->display_options['fields']['picture']['width'] = '300';
+$handler->display->display_options['fields']['picture']['height'] = '300';
+$handler->display->display_options['fields']['picture']['format'] = 'url';
+$handler->display->display_options['fields']['picture']['link'] = 0;
+/* Veld: UDB items: Titel */
+$handler->display->display_options['fields']['title']['id'] = 'title';
+$handler->display->display_options['fields']['title']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['title']['field'] = 'title';
+$handler->display->display_options['fields']['title']['label'] = '';
+$handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['title']['override'] = 0;
+$handler->display->display_options['fields']['title']['link'] = 1;
+/* Veld: UDB items: Short Description */
+$handler->display->display_options['fields']['description']['id'] = 'description';
+$handler->display->display_options['fields']['description']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['description']['field'] = 'description';
+$handler->display->display_options['fields']['description']['label'] = '';
+$handler->display->display_options['fields']['description']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['description']['override'] = 0;
+/* Veld: UDB items: Kalendersamenvatting */
+$handler->display->display_options['fields']['when']['id'] = 'when';
+$handler->display->display_options['fields']['when']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['when']['field'] = 'when';
+$handler->display->display_options['fields']['when']['label'] = 'Wanneer';
+$handler->display->display_options['fields']['when']['element_label_colon'] = FALSE;
+/* Veld: UDB items: Locatie */
+$handler->display->display_options['fields']['location']['id'] = 'location';
+$handler->display->display_options['fields']['location']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['location']['field'] = 'location';
+$handler->display->display_options['fields']['location']['label'] = 'Waar';
+$handler->display->display_options['fields']['location']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['location']['show'] = array(
+  'city' => 'city',
+  'title' => 0,
+  'address' => 0,
+);
+/* Veld: UDB items: Link */
+$handler->display->display_options['fields']['link']['id'] = 'link';
+$handler->display->display_options['fields']['link']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['link']['field'] = 'link';
+$handler->display->display_options['fields']['link']['label'] = '';
+$handler->display->display_options['fields']['link']['element_label_colon'] = FALSE;
+/* Veld: UDB items: Categorie */
+$handler->display->display_options['fields']['category']['id'] = 'category';
+$handler->display->display_options['fields']['category']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['category']['field'] = 'category';
+$handler->display->display_options['fields']['category']['label'] = '';
+$handler->display->display_options['fields']['category']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['category']['link'] = 1;
+/* Sort criterion: UDB items: Gewicht */
+$handler->display->display_options['sorts']['weight_sort']['id'] = 'weight_sort';
+$handler->display->display_options['sorts']['weight_sort']['table'] = 'cdb_items';
+$handler->display->display_options['sorts']['weight_sort']['field'] = 'weight_sort';
+$handler->display->display_options['sorts']['weight_sort']['order'] = 'DESC';
+/* Sort criterion: UDB items: Datum */
+$handler->display->display_options['sorts']['date']['id'] = 'date';
+$handler->display->display_options['sorts']['date']['table'] = 'cdb_items';
+$handler->display->display_options['sorts']['date']['field'] = 'date';
+$handler->display->display_options['sorts']['date']['order'] = 'ASC';
+/* Filter criterion: UDB items: Has Image */
+$handler->display->display_options['filters']['hasimage']['id'] = 'hasimage';
+$handler->display->display_options['filters']['hasimage']['table'] = 'cdb_items';
+$handler->display->display_options['filters']['hasimage']['field'] = 'hasimage';
+/* Filter criterion: UDB items: Datum */
+$handler->display->display_options['filters']['date']['id'] = 'date';
+$handler->display->display_options['filters']['date']['table'] = 'cdb_items';
+$handler->display->display_options['filters']['date']['field'] = 'date';
+$handler->display->display_options['filters']['date']['option_absolute'] = '1';
+$handler->display->display_options['filters']['date']['relative_date'] = '+2 weeks';
+/* Filter criterion: UDB items: Labels */
+$handler->display->display_options['filters']['tags']['id'] = 'tags';
+$handler->display->display_options['filters']['tags']['table'] = 'cdb_items';
+$handler->display->display_options['filters']['tags']['field'] = 'tags';
+$handler->display->display_options['filters']['tags']['keyword'] = array(
+  0 => array(
+    'value' => 'erkend scvw',
+    'not' => 0,
+  ),
+  1 => array(
+    'value' => 'pretting_geleerd_niet_binnenkort',
+    'not' => 1,
+  ),
+  2 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  3 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  4 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  5 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  6 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  7 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  8 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  9 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+);
+
+/* Display: Block */
+$handler = $view->new_display('block', 'Block', 'block');
+$translatables['binnenkort'] = array(
+  t('Master'),
+  t('Binnenkort'),
+  t('meer'),
+  t('Pas toe'),
+  t('Opnieuw instellen'),
+  t('Sorteer op'),
+  t('Stijgend'),
+  t('Dalend'),
+  t('Wanneer'),
+  t('Waar'),
+  t('Block'),
+);

From 78fa6682e61c057fd30f8402700022e94e27fe77 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 14 Apr 2015 21:03:08 +0200
Subject: [PATCH 080/275] MSS-151 cdb schema version injection

---
 culturefeed_search/culturefeed_search.info    |  3 +-
 .../lib/Drupal/CdbEventSubscriber.php         | 29 +++++++++++++++++++
 .../Drupal/DrupalCultureFeedSearchService.php |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 culturefeed_search/lib/Drupal/CdbEventSubscriber.php

diff --git a/culturefeed_search/culturefeed_search.info b/culturefeed_search/culturefeed_search.info
index 214dfd46..45b8449f 100644
--- a/culturefeed_search/culturefeed_search.info
+++ b/culturefeed_search/culturefeed_search.info
@@ -10,4 +10,5 @@ files[] = lib/Drupal/Import/CnapiHeadingImport.php
 files[] = lib/Drupal/DrupalCultureFeedSearchService.php
 files[] = lib/Drupal/DrupalCultureFeedSearchService_Cache.php
 files[] = lib/Drupal/DrupalNodeExtendedEntity.php
-files[] = lib/Drupal/GenericContentExtendedEntity.php
\ No newline at end of file
+files[] = lib/Drupal/GenericContentExtendedEntity.php
+files[] = lib/Drupal/CdbEventSubscriber.php
\ No newline at end of file
diff --git a/culturefeed_search/lib/Drupal/CdbEventSubscriber.php b/culturefeed_search/lib/Drupal/CdbEventSubscriber.php
new file mode 100644
index 00000000..f85d36f4
--- /dev/null
+++ b/culturefeed_search/lib/Drupal/CdbEventSubscriber.php
@@ -0,0 +1,29 @@
+<?php
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\EventDispatcher\Event;
+
+class CdbEventSubscriber implements EventSubscriberInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    return array(
+      'request.before_send' => array('onRequestBeforeSend', 255),
+    );
+  }
+
+  /**
+   * Called before a request is sent
+   *
+   * @param Event $event
+   */
+  public function onRequestBeforeSend(Event $event) {
+
+    $request = $event['request'];
+    $request->getQuery()->set('version', '3.3');
+
+  }
+
+}
diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
index b9b982ea..32362cd5 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
@@ -34,7 +34,7 @@ private function __construct(ConsumerCredentials $consumerCredentials) {
     $service = new \CultuurNet\Search\Guzzle\Service($endpoint, $consumerCredentials);
     // Temporary workaround to set CDB to 3.3
     $clientFactory = $service->getHttpClientFactory();
-    $clientFactory->addSubscriber(new \CultuurNet\Cdb\CdbEventSubscriber());
+    $clientFactory->addSubscriber(new CdbEventSubscriber());
     $service->setHttpClientFactory($clientFactory);
 
     module_invoke_all('culturefeed_search_service_created', $service);

From 2b56228293cb4f922e3e5321438e53ed4aaa1c20 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 15 Apr 2015 10:18:56 +0200
Subject: [PATCH 081/275] MSS-155 remove dependency of image url formatter

---
 culturefeed_search_views/views/views/upcoming.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/culturefeed_search_views/views/views/upcoming.inc b/culturefeed_search_views/views/views/upcoming.inc
index 435e550c..11180a4b 100644
--- a/culturefeed_search_views/views/views/upcoming.inc
+++ b/culturefeed_search_views/views/views/upcoming.inc
@@ -41,7 +41,6 @@ $handler->display->display_options['fields']['picture']['element_default_classes
 $handler->display->display_options['fields']['picture']['override'] = 0;
 $handler->display->display_options['fields']['picture']['width'] = '300';
 $handler->display->display_options['fields']['picture']['height'] = '300';
-$handler->display->display_options['fields']['picture']['format'] = 'url';
 $handler->display->display_options['fields']['picture']['link'] = 0;
 /* Veld: UDB items: Titel */
 $handler->display->display_options['fields']['title']['id'] = 'title';

From 660605779b7c062a7cce133f180351fab52fb660 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 15 Apr 2015 10:23:29 +0200
Subject: [PATCH 082/275] MSS-157 add form elements for collaborative data

---
 .../culturefeed_entry_ui.module               |  4 +
 .../culturefeed_entry_ui.collaboration.inc    | 90 +++++++++++++++++++
 .../includes/culturefeed_entry_ui.pages.inc   |  6 ++
 3 files changed, 100 insertions(+)
 create mode 100644 culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 03d929b8..6b8df778 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -34,6 +34,10 @@ function culturefeed_entry_ui_permission() {
       'title' => t('Delete events'),
       'description' => t('Delete events through the entity api.'),
     ),
+    'manage culturefeed collaborative info' => array(
+      'title' => t('Manage culturefeed collaborative info'),
+      'description' => t('Manage culturefeed collaborative info through the entity api.'),
+    ),
   );
 }
 
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc
new file mode 100644
index 00000000..cc736de4
--- /dev/null
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_entry_ui.collaboration.inc.
+ */
+
+/**
+ * Attaches the collaboration elements to the form.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param Culturefeed_Cdb_Data_EventDetail $event_details
+ *   The event details.
+ */
+function culturefeed_entry_ui_attach_collaboration_elements(&$form, $form_state, Culturefeed_Cdb_Data_EventDetail $event_details = NULL) {
+
+  if ($event_details) {
+
+    $media_links = $event_details->getMedia()->byMediaTypes(array(CultureFeed_Cdb_Data_File::MEDIA_TYPE_WEBRESOURCE));
+    foreach ($media_links as $link) {
+
+      if ($link->getSubBrand()) {
+
+        $sub_brand = $link->getSubBrand();
+        $description = drupal_json_decode($link->getDescription());
+
+        if ($description['keyword']) {
+          culturefeed_entry_ui_attach_collaboration_element($form, $form_state, $sub_brand, $description);
+        }
+
+      }
+
+    }
+
+  }
+
+  // Add an empty element for new data.
+  culturefeed_entry_ui_attach_collaboration_element($form, $form_state);
+
+}
+
+/**
+ * Attaches the collaboration element to the form.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param string $sub_brand
+ *   The collaborative sub brand.
+ * @param array $description
+ *   The collaborative description.
+ */
+function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state, $sub_brand = NULL, $description = NULL) {
+
+  $sub_brand = ($sub_brand) ? $sub_brand : 'new_collaboration';
+
+  $form['extra'][$sub_brand] = array(
+    '#group' => 'vertical_tabs',
+    '#title' => isset($description['keyword']) ? $description['keyword'] : t('New collaboration data'),
+    '#type' => 'fieldset',
+  );
+
+  $form['extra'][$sub_brand]['sub_brand'] = array(
+    '#type' => 'value',
+    '#value' => $sub_brand,
+  );
+
+  $form['extra'][$sub_brand]['keyword'] = array(
+    '#default_value' => isset($description['keyword']) ? $description['keyword'] : '',
+    '#title' => t('Keyword'),
+    '#type' => 'textfield',
+  );
+
+  $form['extra'][$sub_brand]['title'] = array(
+    '#default_value' => isset($description['title']) ? $description['title'] : '',
+    '#title' => t('Title'),
+    '#type' => 'textfield',
+  );
+
+  $form['extra'][$sub_brand]['text'] = array(
+    '#default_value' => isset($description['text']) ? $description['text'] : '',
+    '#title' => t('Short description'),
+    '#type' => 'textarea',
+  );
+
+}
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index d12736c7..55fd6326 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1347,6 +1347,12 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     '#title' => t('Public'),
   );*/
 
+  // Add collaboration data.
+  if (user_access('manage culturefeed collaborative info')) {
+    form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/culturefeed_entry_ui.collaboration');
+    culturefeed_entry_ui_attach_collaboration_elements($form, $form_state, (isset($event_details)) ? $event_details : NULL);
+  }
+
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),

From 97c74da1d6478ae99c54e3aee5eb6ddfcbcd241b Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 15 Apr 2015 11:31:05 +0200
Subject: [PATCH 083/275] MSS-155 upcoming view

---
 .../views/views/upcoming.inc                    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/culturefeed_search_views/views/views/upcoming.inc b/culturefeed_search_views/views/views/upcoming.inc
index 11180a4b..4acfbc4f 100644
--- a/culturefeed_search_views/views/views/upcoming.inc
+++ b/culturefeed_search_views/views/views/upcoming.inc
@@ -5,7 +5,7 @@ $view->name = 'upcoming';
 $view->description = '';
 $view->tag = 'default';
 $view->base_table = 'cdb_items';
-$view->human_name = 'Binnenkort';
+$view->human_name = 'upcoming';
 $view->core = 7;
 $view->api_version = '3.0';
 $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
@@ -28,16 +28,12 @@ $handler->display->display_options['pager']['type'] = 'some';
 $handler->display->display_options['pager']['options']['items_per_page'] = '5';
 $handler->display->display_options['style_plugin'] = 'default';
 $handler->display->display_options['row_plugin'] = 'fields';
-$handler->display->display_options['row_options']['default_field_elements'] = FALSE;
 /* Veld: UDB items: Afbeelding */
 $handler->display->display_options['fields']['picture']['id'] = 'picture';
 $handler->display->display_options['fields']['picture']['table'] = 'cdb_items';
 $handler->display->display_options['fields']['picture']['field'] = 'picture';
 $handler->display->display_options['fields']['picture']['label'] = '';
-$handler->display->display_options['fields']['picture']['element_type'] = '0';
-$handler->display->display_options['fields']['picture']['element_class'] = 'img-responsive';
 $handler->display->display_options['fields']['picture']['element_label_colon'] = FALSE;
-$handler->display->display_options['fields']['picture']['element_default_classes'] = FALSE;
 $handler->display->display_options['fields']['picture']['override'] = 0;
 $handler->display->display_options['fields']['picture']['width'] = '300';
 $handler->display->display_options['fields']['picture']['height'] = '300';
@@ -101,24 +97,27 @@ $handler->display->display_options['sorts']['date']['order'] = 'ASC';
 $handler->display->display_options['filters']['hasimage']['id'] = 'hasimage';
 $handler->display->display_options['filters']['hasimage']['table'] = 'cdb_items';
 $handler->display->display_options['filters']['hasimage']['field'] = 'hasimage';
+$handler->display->display_options['filters']['hasimage']['group'] = 1;
 /* Filter criterion: UDB items: Datum */
 $handler->display->display_options['filters']['date']['id'] = 'date';
 $handler->display->display_options['filters']['date']['table'] = 'cdb_items';
 $handler->display->display_options['filters']['date']['field'] = 'date';
+$handler->display->display_options['filters']['date']['group'] = 1;
 $handler->display->display_options['filters']['date']['option_absolute'] = '1';
 $handler->display->display_options['filters']['date']['relative_date'] = '+2 weeks';
 /* Filter criterion: UDB items: Labels */
 $handler->display->display_options['filters']['tags']['id'] = 'tags';
 $handler->display->display_options['filters']['tags']['table'] = 'cdb_items';
 $handler->display->display_options['filters']['tags']['field'] = 'tags';
+$handler->display->display_options['filters']['tags']['group'] = 1;
 $handler->display->display_options['filters']['tags']['keyword'] = array(
   0 => array(
-    'value' => 'erkend scvw',
+    'value' => '',
     'not' => 0,
   ),
   1 => array(
-    'value' => 'pretting_geleerd_niet_binnenkort',
-    'not' => 1,
+    'value' => '',
+    'not' => 0,
   ),
   2 => array(
     'value' => '',
@@ -156,7 +155,7 @@ $handler->display->display_options['filters']['tags']['keyword'] = array(
 
 /* Display: Block */
 $handler = $view->new_display('block', 'Block', 'block');
-$translatables['binnenkort'] = array(
+$translatables['upcoming'] = array(
   t('Master'),
   t('Binnenkort'),
   t('meer'),

From 8efe4a1ffa9845f36540f077595d5e94188f0b52 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 15 Apr 2015 12:15:45 +0200
Subject: [PATCH 084/275] CF-414 remove dependency of entry_ui in
 cf_search_views

---
 .../views/culturefeed_search_views.views.inc    | 16 ----------------
 .../culturefeed_search_views.views_default.inc  | 17 +++++++++++++++++
 ...s_handler_filter_culturefeed_search_tags.inc |  6 ++++--
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 culturefeed_search_views/views/culturefeed_search_views.views_default.inc

diff --git a/culturefeed_search_views/views/culturefeed_search_views.views.inc b/culturefeed_search_views/views/culturefeed_search_views.views.inc
index 60d5c8fb..f4223466 100644
--- a/culturefeed_search_views/views/culturefeed_search_views.views.inc
+++ b/culturefeed_search_views/views/culturefeed_search_views.views.inc
@@ -308,19 +308,3 @@ function culturefeed_search_views_views_plugins() {
   );
 
 }
-
-/**
- * Implements hook_views_default_views().
- **/
-function culturefeed_search_views_views_default_views() {
-  $files = file_scan_directory(drupal_get_path('module', 'culturefeed_search_views'). '/views/views', '/.inc/');
-  foreach ($files as $filepath => $file) {
-    require $filepath;
-    if (isset($view)) {
-      $views[$view->name] = $view;
-    }
-  }
-  if ($views) {
-    return $views;
-  }
-}
diff --git a/culturefeed_search_views/views/culturefeed_search_views.views_default.inc b/culturefeed_search_views/views/culturefeed_search_views.views_default.inc
new file mode 100644
index 00000000..06ba7de5
--- /dev/null
+++ b/culturefeed_search_views/views/culturefeed_search_views.views_default.inc
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Implements hook_views_default_views().
+ **/
+function culturefeed_search_views_views_default_views() {
+  $files = file_scan_directory(drupal_get_path('module', 'culturefeed_search_views'). '/views/views', '/.inc/');
+  foreach ($files as $filepath => $file) {
+    require $filepath;
+    if (isset($view)) {
+      $views[$view->name] = $view;
+    }
+  }
+  if ($views) {
+    return $views;
+  }
+}
\ No newline at end of file
diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
index 797a7409..9bc485f3 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
@@ -119,8 +119,10 @@ class views_handler_filter_culturefeed_search_tags extends views_handler_filter_
 			}
 		}
 
-		$parameter = new \CultuurNet\Search\Parameter\FilterQuery($value);
-		$this->query->add_parameter($parameter);
+    if (isset($value)) {
+      $parameter = new \CultuurNet\Search\Parameter\FilterQuery($value);
+      $this->query->add_parameter($parameter);
+    }
 
   }
 

From 43415f680d922896cb6ecd8de9566c94acb4b0f3 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 15 Apr 2015 14:21:15 +0200
Subject: [PATCH 085/275] removing commenting from cf_entry

---
 .../includes/culturefeed_entry_ui.pages.inc           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 48767781..495d0d74 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -327,10 +327,9 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     /*if ($info = $event->getAvailableFrom()) {
 	  $publication_date = $event->getAvailableFrom();
     }
-   */
+    */
   }
 
-  /**
   // Build the form.
 
   // Basic.
@@ -598,12 +597,12 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     '#title' => t('Links'),
   );
 
-  /*if ($default_links) {
+  if ($default_links) {
     $links_count = count($default_links);
   }
-  else {*/
-  $links_count = 0;
-  //}
+  else {
+    $links_count = 0;
+  }
   // Add link type selections.
   if ($default_links) {
     foreach ($default_links as $i => $info) {

From 9e2e28eedee853a78ccb91a6fcf99e15097630ad Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 16 Apr 2015 13:47:50 +0200
Subject: [PATCH 086/275] MSS-157 module start + basic field definition

---
 culturefeed_content/culturefeed_content.info  |   6 +
 .../culturefeed_content.install               |  38 +++++++
 .../culturefeed_content.module                | 103 ++++++++++++++++++
 .../culturefeed_tips/culturefeed_tips.info    |   6 +
 .../culturefeed_tips/culturefeed_tips.install |  17 +++
 .../culturefeed_tips/culturefeed_tips.module  |  23 ++++
 6 files changed, 193 insertions(+)
 create mode 100644 culturefeed_content/culturefeed_content.info
 create mode 100644 culturefeed_content/culturefeed_content.install
 create mode 100644 culturefeed_content/culturefeed_content.module
 create mode 100644 culturefeed_content/culturefeed_tips/culturefeed_tips.info
 create mode 100644 culturefeed_content/culturefeed_tips/culturefeed_tips.install
 create mode 100644 culturefeed_content/culturefeed_tips/culturefeed_tips.module

diff --git a/culturefeed_content/culturefeed_content.info b/culturefeed_content/culturefeed_content.info
new file mode 100644
index 00000000..fb152120
--- /dev/null
+++ b/culturefeed_content/culturefeed_content.info
@@ -0,0 +1,6 @@
+name = CultureFeed Content
+description = Field to render a CultureFeed search.
+package = CultureFeed
+version = VERSION
+core = 7.x
+dependencies[] = culturefeed
diff --git a/culturefeed_content/culturefeed_content.install b/culturefeed_content/culturefeed_content.install
new file mode 100644
index 00000000..4be28fc1
--- /dev/null
+++ b/culturefeed_content/culturefeed_content.install
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_content.install.
+ */
+
+/**
+ * Implements hook_field_schema().
+ */
+function culturefeed_content_field_schema($field) {
+
+  if ($field['type'] == 'culturefeed_content') {
+
+    return array(
+      'columns' => array(
+        'filter_query' => array(
+          'type' => 'text',
+          'size' => 'medium',
+        ),
+        'query_string' => array(
+          'type' => 'text',
+          'size' => 'medium',
+        ),
+        'rows' => array(
+          'type' => 'int',
+          'size' => 'medium',
+        ),
+        'sort' => array(
+          'type' => 'text',
+          'size' => 'medium',
+        ),
+      ),
+    );
+
+  }
+
+}
diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
new file mode 100644
index 00000000..b39378cc
--- /dev/null
+++ b/culturefeed_content/culturefeed_content.module
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_content.module.
+ */
+
+/**
+ * Implements hook_field_formatter_info().
+ */
+function culturefeed_content_field_formatter_info() {
+
+  return array(
+    'culturefeed_content_default' => array(
+      'label' => t('Default CultureFeed content formatter'),
+      'field types' => array('culturefeed_content'),
+    ),
+  );
+
+}
+
+/**
+ * Implements hook_field_formatter_view().
+ */
+function culturefeed_content_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
+
+  $element = array();
+
+  switch ($display['type']) {
+
+    case 'culturefeed_content_default':
+      foreach ($items as $delta => $item) {
+        $element[$delta] = array('#markup' => 'test:' . $delta);
+      }
+      break;
+
+  }
+
+  return $element;
+}
+
+/**
+ * Implements hook_field_info().
+ */
+function culturefeed_content_field_info() {
+
+  return array(
+    'culturefeed_content' => array(
+      'label' => t('CultureFeed content'),
+      'description' => t('Renders a CultureFeed search.'),
+      'settings' => array(),
+      'instance_settings' => array(),
+      'default_widget' => 'culturefeed_content_default',
+      'default_formatter' => 'culturefeed_content_default',
+    ),
+  );
+
+}
+
+/**
+ * Implements hook_field_is_empty().
+ */
+function culturefeed_content_field_is_empty($item, $field) {
+
+  if (empty($item['value']) && (string) $item['value'] !== '0') {
+    return TRUE;
+  }
+  return FALSE;
+
+}
+
+/**
+ * Implements hook_field_widget_form().
+ */
+function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
+
+  $element['filter_query'] = array(
+    '#title' => t('Filter query'),
+    '#type' => 'textarea',
+  );
+
+  return $element;
+
+}
+
+/**
+ * Implements hook_field_widget_info().
+ */
+function culturefeed_content_field_widget_info() {
+
+  return array(
+    'culturefeed_content_default' => array(
+      'label' => t('Default CultureFeed content widget'),
+      'field types' => array('culturefeed_content'),
+      'settings' => array(),
+      'behaviors' => array(
+        'multiple values' => FIELD_BEHAVIOR_DEFAULT,
+        'default value' => FIELD_BEHAVIOR_DEFAULT,
+      ),
+    ),
+  );
+
+}
diff --git a/culturefeed_content/culturefeed_tips/culturefeed_tips.info b/culturefeed_content/culturefeed_tips/culturefeed_tips.info
new file mode 100644
index 00000000..250586b4
--- /dev/null
+++ b/culturefeed_content/culturefeed_tips/culturefeed_tips.info
@@ -0,0 +1,6 @@
+name = CultureFeed Tips
+description = Content type to highlight specific events.
+package = CultureFeed
+version = VERSION
+core = 7.x
+dependencies[] = culturefeed
diff --git a/culturefeed_content/culturefeed_tips/culturefeed_tips.install b/culturefeed_content/culturefeed_tips/culturefeed_tips.install
new file mode 100644
index 00000000..65a945c8
--- /dev/null
+++ b/culturefeed_content/culturefeed_tips/culturefeed_tips.install
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_content.install.
+ */
+
+/**
+ * Implements hook_install().
+ */
+function culturefeed_tips_install() {
+
+  node_types_rebuild();
+  $types = node_type_get_types();
+  $tip = $types['culturefeed_tip'];
+
+}
diff --git a/culturefeed_content/culturefeed_tips/culturefeed_tips.module b/culturefeed_content/culturefeed_tips/culturefeed_tips.module
new file mode 100644
index 00000000..28fcd088
--- /dev/null
+++ b/culturefeed_content/culturefeed_tips/culturefeed_tips.module
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_content.module.
+ */
+
+/**
+ * Implements hook_node_info().
+ */
+function culturefeed_tips_node_info() {
+
+  return array(
+    'culturefeed_tip' => array(
+      'base' => 'node_content',
+      'description' => t('Content type to highlight specific events.'),
+      'has_title' => TRUE,
+      'locked' => FALSE,
+      'name' => t('Culturefeed tip'),
+    ),
+  );
+
+}

From d70e2d3895012a3cc5952a3057e885c7036e5fa2 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 16 Apr 2015 15:57:58 +0200
Subject: [PATCH 087/275] MSS-156 field rendering

---
 .../culturefeed_content.module                | 125 +++++++++++++++++-
 1 file changed, 120 insertions(+), 5 deletions(-)

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index b39378cc..5ffed26d 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -5,6 +5,37 @@
  * Contains culturefeed_content.module.
  */
 
+/**
+ * Implements hook_field_create_instance().
+ */
+function culturefeed_content_field_create_instance($instance) {
+
+  // Set some default values.
+  $instance['default_value'] = array(
+    array(
+      'rows' => 50,
+      'sort' => 'permanent asc,availableto asc,weight desc',
+    ),
+  );
+  field_update_instance($instance);
+
+}
+
+/**
+ * Validation handler for the CultureFeed content field.
+ */
+function culturefeed_content_field_culturefeed_content_validate($element, &$form_state, $form) {
+
+  $items = array(
+    'filter_query' => $element['wrapper']['filter_query']['#value'],
+    'query_string' => $element['wrapper']['query_string']['#value'],
+    'rows' => $element['wrapper']['rows']['#value'],
+    'sort' => $element['wrapper']['sort']['#value'],
+  );
+  form_set_value($element, $items, $form_state);
+
+}
+
 /**
  * Implements hook_field_formatter_info().
  */
@@ -25,18 +56,68 @@ function culturefeed_content_field_formatter_info() {
 function culturefeed_content_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
 
   $element = array();
-
   switch ($display['type']) {
 
     case 'culturefeed_content_default':
+
       foreach ($items as $delta => $item) {
-        $element[$delta] = array('#markup' => 'test:' . $delta);
+
+        $filter_query = $item['filter_query'];
+        $query_string = $item['query_string'];
+        $rows = isset($item['rows']) ? $item['rows'] : 'permanent asc,availableto asc,weight desc';
+        $sort = isset($item['sort']) ? $item['sort'] : 50;
+
+        if (empty($query_string)) {
+          $query_string = '*:*';
+        }
+
+        $parameters = array();
+        if ($query_string) {
+          $parameters[] = new \CultuurNet\Search\Parameter\Query($query_string);
+        }
+        if ($filter_query) {
+          $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery($filter_query);
+        }
+
+        $parameters[] = new \CultuurNet\Search\Parameter\Parameter('sort', $sort);
+        $parameters[] = new \CultuurNet\Search\Parameter\Rows($rows);
+        $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event OR type:production');
+        $parameters[] = new \CultuurNet\Search\Parameter\Group();
+
+        // Execute search.
+        try {
+          $result = culturefeed_get_search_service()->search($parameters);
+        }
+        catch (Exception $e) {
+          watchdog_exception('culturefeed_content', $e);
+          return FALSE;
+        }
+
+        $search_results = $result->getItems();
+
+        // Render the results.
+        $build = array();
+
+        if ($result->getTotalCount() > 0) {
+
+          foreach ($search_results as $search_result) {
+            $build[] = array(
+              '#theme' => 'culturefeed_' . $search_result->getType() . '_summary',
+              '#item' => $search_result,
+            );
+          }
+
+        }
+
+        $element[$delta] = $build;
+
       }
       break;
 
   }
 
   return $element;
+
 }
 
 /**
@@ -49,7 +130,6 @@ function culturefeed_content_field_info() {
       'label' => t('CultureFeed content'),
       'description' => t('Renders a CultureFeed search.'),
       'settings' => array(),
-      'instance_settings' => array(),
       'default_widget' => 'culturefeed_content_default',
       'default_formatter' => 'culturefeed_content_default',
     ),
@@ -62,7 +142,7 @@ function culturefeed_content_field_info() {
  */
 function culturefeed_content_field_is_empty($item, $field) {
 
-  if (empty($item['value']) && (string) $item['value'] !== '0') {
+  if (empty($item)) {
     return TRUE;
   }
   return FALSE;
@@ -74,11 +154,46 @@ function culturefeed_content_field_is_empty($item, $field) {
  */
 function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
 
-  $element['filter_query'] = array(
+  $filter_query = isset($items[$delta]['filter_query']) ? $items[$delta]['filter_query'] : '';
+  $query_string = isset($items[$delta]['query_string']) ? $items[$delta]['query_string'] : '';
+  $rows = isset($items[$delta]['rows']) ? $items[$delta]['rows'] : '';
+  $sort = isset($items[$delta]['sort']) ? $items[$delta]['sort'] : '';
+
+  $element['wrapper'] = array(
+    '#title' => t('CultureFeed content'),
+    '#type' => 'fieldset',
+  );
+
+  $element['wrapper']['filter_query'] = array(
+    '#default_value' => $filter_query,
+    '#required' => $element['#required'],
     '#title' => t('Filter query'),
     '#type' => 'textarea',
   );
 
+  $element['wrapper']['query_string'] = array(
+    '#default_value' => $query_string,
+    '#required' => $element['#required'],
+    '#title' => t('Query string'),
+    '#type' => 'textarea',
+  );
+
+  $element['wrapper']['rows'] = array(
+    '#default_value' => $rows,
+    '#required' => $element['#required'],
+    '#title' => t('Rows'),
+    '#type' => 'textfield',
+  );
+
+  $element['wrapper']['sort'] = array(
+    '#default_value' => $sort,
+    '#required' => $element['#required'],
+    '#title' => t('Sort'),
+    '#type' => 'textfield',
+  );
+
+  $element['#element_validate'] = array('culturefeed_content_field_culturefeed_content_validate');
+
   return $element;
 
 }

From 423afca2cf9d682130c9baf75b986dc743e1a1c7 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Thu, 16 Apr 2015 16:00:29 +0200
Subject: [PATCH 088/275] add most common share options to culturefeed agenda

---
 .../theme/culturefeed-actor.tpl.php           | 14 ++++++++-
 .../theme/culturefeed-event.tpl.php           | 12 ++++++++
 .../theme/culturefeed-production.tpl.php      | 12 ++++++++
 culturefeed_agenda/theme/theme.inc            | 29 +++++++++++++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/culturefeed-actor.tpl.php b/culturefeed_agenda/theme/culturefeed-actor.tpl.php
index d26c7638..579e552b 100644
--- a/culturefeed_agenda/theme/culturefeed-actor.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-actor.tpl.php
@@ -72,4 +72,16 @@
   <?php print $video; ?>
 <?php endforeach; ?>
 
-<?php print $recommend_link; ?>
\ No newline at end of file
+<?php print $recommend_link; ?>
+
+<div>
+  <?php print $facebook_link; ?>
+  <br>
+  <?php print $googleplus_link; ?>
+  <br>
+  <?php print $twitter_link; ?>
+  <br>
+  <?php print $whatsapp_link; ?>
+  <br>
+  <?php print $mail_link; ?>
+</div>
diff --git a/culturefeed_agenda/theme/culturefeed-event.tpl.php b/culturefeed_agenda/theme/culturefeed-event.tpl.php
index be889637..541e0c83 100644
--- a/culturefeed_agenda/theme/culturefeed-event.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-event.tpl.php
@@ -190,3 +190,15 @@
   <?php print $button; ?>
 <?php endforeach; ?>
 <?php endif; ?>
+
+<div>
+  <?php print $facebook_link; ?>
+  <br>
+  <?php print $googleplus_link; ?>
+  <br>
+  <?php print $twitter_link; ?>
+  <br>
+  <?php print $whatsapp_link; ?>
+  <br>
+  <?php print $mail_link; ?>
+</div>
diff --git a/culturefeed_agenda/theme/culturefeed-production.tpl.php b/culturefeed_agenda/theme/culturefeed-production.tpl.php
index a3c00587..d182e257 100644
--- a/culturefeed_agenda/theme/culturefeed-production.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-production.tpl.php
@@ -94,3 +94,15 @@
 <?php foreach ($pictures as $picture): ?>
   <img src="<?php print $picture; ?>?width=160&height=120&crop=auto" />
 <?php endforeach; ?>
+
+<div>
+  <?php print $facebook_link; ?>
+  <br>
+  <?php print $googleplus_link; ?>
+  <br>
+  <?php print $twitter_link; ?>
+  <br>
+  <?php print $whatsapp_link; ?>
+  <br>
+  <?php print $mail_link; ?>
+</div>
\ No newline at end of file
diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index ba38a67c..89a2aa70 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -358,6 +358,35 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       }
     }
 
+    // Absolute link to detail.
+    $variables['share_url'] = url($variables['url'], array('absolute' => TRUE));
+
+    // Set prefix for share URL's.
+    $variables['facebook_prefix'] = 'https://www.facebook.com/sharer/sharer.php?u=';
+    $variables['googleplus_prefix'] = 'https://plus.google.com/share?url=';
+    $variables['twitter_prefix'] = 'https://twitter.com/intent/tweet?text=';
+    $variables['whatsapp_prefix'] = 'whatsapp://send?text=';
+
+    // Share URL's.      
+    $variables['facebook_url'] = $variables['facebook_prefix'] . $variables['share_url'];
+    $variables['googleplus_url'] = $variables['googleplus_prefix'] . $variables['share_url'];
+    $variables['twitter_url'] = $variables['twitter_prefix'] . $variables['share_url'];
+    $variables['whatsapp_url'] = $variables['whatsapp_prefix'] . $variables['share_url'];
+
+    if (module_exists('forward')) {
+      $variables['mail_url'] = url('forward', array('query' => array('path' => $variables['url'])));
+    }
+    else {
+      $variables['mail_url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . $variables['share_url']; 
+    }
+
+    // Share Links.      
+    $variables['facebook_link'] = l(t('Share on Facebook'), $variables['facebook_url'], array('attributes' => array('class' => array('share-link','facebook-share'))));
+    $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus_url'], array('attributes' => array('class' => array('share-link','googleplus-share'))));
+    $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter_url'], array('attributes' => array('class' => array('share-link','twitter-share'))));
+    $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp_url'], array('attributes' => array('class' => array('share-link','whatsapp-share')), 'external' => TRUE));
+    $variables['mail_link'] = l(t('Mail this page'), $variables['mail_url'], array('attributes' => array('class' => array('share-link','forward-mail'))));
+
   }
 
   // All categories.

From 714fa5b270e9980002337c790bd612fdf34b30e6 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 17 Apr 2015 16:39:16 +0200
Subject: [PATCH 089/275] add options for social share links

---
 culturefeed_agenda/theme/theme.inc | 63 ++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 89a2aa70..a40a6e49 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -360,18 +360,23 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
 
     // Absolute link to detail.
     $variables['share_url'] = url($variables['url'], array('absolute' => TRUE));
+    
+    $variables['facebook'] = array();
+    $variables['googleplus'] = array();
+    $variables['twitter'] = array();
+    $variables['whatsapp'] = array();
 
     // Set prefix for share URL's.
-    $variables['facebook_prefix'] = 'https://www.facebook.com/sharer/sharer.php?u=';
-    $variables['googleplus_prefix'] = 'https://plus.google.com/share?url=';
-    $variables['twitter_prefix'] = 'https://twitter.com/intent/tweet?text=';
-    $variables['whatsapp_prefix'] = 'whatsapp://send?text=';
+    $variables['facebook']['prefix'] = 'https://www.facebook.com/sharer/sharer.php?u=';
+    $variables['googleplus']['prefix'] = 'https://plus.google.com/share?url=';
+    $variables['twitter']['prefix'] = 'https://twitter.com/intent/tweet?text=';
+    $variables['whatsapp']['prefix'] = 'whatsapp://send?text=';
 
     // Share URL's.      
-    $variables['facebook_url'] = $variables['facebook_prefix'] . $variables['share_url'];
-    $variables['googleplus_url'] = $variables['googleplus_prefix'] . $variables['share_url'];
-    $variables['twitter_url'] = $variables['twitter_prefix'] . $variables['share_url'];
-    $variables['whatsapp_url'] = $variables['whatsapp_prefix'] . $variables['share_url'];
+    $variables['facebook']['url'] = $variables['facebook']['prefix'] . $variables['share_url'];
+    $variables['googleplus']['url'] = $variables['googleplus']['prefix'] . $variables['share_url'];
+    $variables['twitter']['url'] = $variables['twitter']['prefix'] . $variables['share_url'];
+    $variables['whatsapp']['url'] = $variables['whatsapp']['prefix'] . $variables['share_url'];
 
     if (module_exists('forward')) {
       $variables['mail_url'] = url('forward', array('query' => array('path' => $variables['url'])));
@@ -380,12 +385,44 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $variables['mail_url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . $variables['share_url']; 
     }
 
+    // Add options.  
+    $variables['facebook']['options'] = array(
+      'attributes' => array(
+        'class' => array('share-link','facebook-share'),
+        'target' => '_blank',
+      ),
+    );
+    $variables['googleplus']['options'] = array(
+      'attributes' => array(
+        'class' => array('share-link','googleplus-share'),
+        'target' => '_blank',
+      ),
+    );
+    $variables['twitter']['options'] = array(
+      'attributes' => array(
+        'class' => array('share-link','twitter-share'),
+        'target' => '_blank',
+      ),
+    );
+    $variables['whatsapp']['options'] = array(
+      'attributes' => array(
+        'class' => array('share-link','whatsapp-share'),
+      ),
+      'external' => TRUE,
+    );
+    $variables['mail']['options'] = array(
+      'attributes' => array(
+        'class' => array('share-link','forward-mail'),
+      ),
+      'external' => TRUE,
+    );
+
     // Share Links.      
-    $variables['facebook_link'] = l(t('Share on Facebook'), $variables['facebook_url'], array('attributes' => array('class' => array('share-link','facebook-share'))));
-    $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus_url'], array('attributes' => array('class' => array('share-link','googleplus-share'))));
-    $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter_url'], array('attributes' => array('class' => array('share-link','twitter-share'))));
-    $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp_url'], array('attributes' => array('class' => array('share-link','whatsapp-share')), 'external' => TRUE));
-    $variables['mail_link'] = l(t('Mail this page'), $variables['mail_url'], array('attributes' => array('class' => array('share-link','forward-mail'))));
+    $variables['facebook_link'] = l(t('Share on Facebook'), $variables['facebook']['url'], $variables['facebook']['options']);
+    $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus']['url'], $variables['googleplus']['options']);
+    $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter']['url'], $variables['twitter']['options']);
+    $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp']['url'], $variables['whatsapp']['options']);
+    $variables['mail_link'] = l(t('Mail'), $variables['mail_url'], $variables['mail']['options']);
 
   }
 

From f1597b24a9bc5e43082180e5b64ff52a51a56d09 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 17 Apr 2015 16:39:48 +0200
Subject: [PATCH 090/275] use dialog when Facebook app id is set

---
 culturefeed_agenda/theme/theme.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index a40a6e49..a5bc7162 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -423,6 +423,9 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter']['url'], $variables['twitter']['options']);
     $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp']['url'], $variables['whatsapp']['options']);
     $variables['mail_link'] = l(t('Mail'), $variables['mail_url'], $variables['mail']['options']);
+    
+    // Use dialog when Facebook app id is set.
+    culturefeed_search_ui_add_facebook_share();
 
   }
 

From c784def0d55707708ce65f15521ce9fa89f0a341 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 17 Apr 2015 16:42:47 +0200
Subject: [PATCH 091/275] add tracking of CultureFeed_Activity types

---
 culturefeed_agenda/theme/theme.inc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index a5bc7162..5d3ffb82 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -385,10 +385,20 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $variables['mail_url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . $variables['share_url']; 
     }
 
+    // Prepare to push share activities to Culturefeed.
+    if (culturefeed_is_culturefeed_user()) {
+      $track = TRUE;
+      $content_type = culturefeed_get_content_type($item->getType());
+      $id = $item->getId();
+      $track_facebook = url('culturefeed/do/' . CultureFeed_Activity::TYPE_FACEBOOK .'/' . $content_type . '/' . urlencode($id) . '/ajax');
+      $track_twitter = url('culturefeed/do/' . CultureFeed_Activity::TYPE_TWITTER .'/' . $content_type . '/' . urlencode($id) . '/ajax');
+    }
+    
     // Add options.  
     $variables['facebook']['options'] = array(
       'attributes' => array(
         'class' => array('share-link','facebook-share'),
+        'rel' => $track ? $track_facebook : '' ,
         'target' => '_blank',
       ),
     );
@@ -401,6 +411,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     $variables['twitter']['options'] = array(
       'attributes' => array(
         'class' => array('share-link','twitter-share'),
+        'rel' => $track ? $track_twitter : '' ,
         'target' => '_blank',
       ),
     );

From 8d6a9f6512301dd1b6f0bc902bdabaf327ea5b7e Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 17 Apr 2015 17:22:16 +0200
Subject: [PATCH 092/275] remove target blank

---
 culturefeed_agenda/theme/theme.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 5d3ffb82..5459c876 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -399,20 +399,17 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       'attributes' => array(
         'class' => array('share-link','facebook-share'),
         'rel' => $track ? $track_facebook : '' ,
-        'target' => '_blank',
       ),
     );
     $variables['googleplus']['options'] = array(
       'attributes' => array(
         'class' => array('share-link','googleplus-share'),
-        'target' => '_blank',
       ),
     );
     $variables['twitter']['options'] = array(
       'attributes' => array(
         'class' => array('share-link','twitter-share'),
         'rel' => $track ? $track_twitter : '' ,
-        'target' => '_blank',
       ),
     );
     $variables['whatsapp']['options'] = array(

From 6c90a786eef5dfe175583df0bca77a06146ffdd7 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 20 Apr 2015 08:35:33 +0200
Subject: [PATCH 093/275] replace all when's with new variables

---
 .../theme/culturefeed-agenda-actor-program-item.tpl.php       | 4 ++--
 .../culturefeed-agenda-nearby-activities-list-item.tpl.php    | 4 ++--
 .../theme/culturefeed-event-mini-summary.tpl.php              | 4 ++--
 culturefeed_agenda/theme/culturefeed-event-summary.tpl.php    | 4 ++--
 culturefeed_agenda/theme/culturefeed-event.tpl.php            | 2 +-
 .../theme/culturefeed-production-mini-summary.tpl.php         | 4 ++--
 .../theme/culturefeed-production-summary.tpl.php              | 4 ++--
 culturefeed_agenda/theme/culturefeed-production.tpl.php       | 4 ++--
 .../theme/culturefeed-calendar-activity-mini.tpl.php          | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/culturefeed_agenda/theme/culturefeed-agenda-actor-program-item.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-actor-program-item.tpl.php
index 946a8d09..11b61e08 100644
--- a/culturefeed_agenda/theme/culturefeed-agenda-actor-program-item.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-agenda-actor-program-item.tpl.php
@@ -6,8 +6,8 @@
 
 ?>
 <div>
-    <?php if (!empty($when)): ?>
-    <?php print $when; ?>
+    <?php if (!empty($when_md)): ?>
+    <?php print $when_md; ?>
     <?php endif; ?>
 
     <a href="<?php print $url ?>"><?php print $title; ?></a>
diff --git a/culturefeed_agenda/theme/culturefeed-agenda-nearby-activities-list-item.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-nearby-activities-list-item.tpl.php
index 2dca97c7..b6bee24b 100644
--- a/culturefeed_agenda/theme/culturefeed-agenda-nearby-activities-list-item.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-agenda-nearby-activities-list-item.tpl.php
@@ -14,6 +14,6 @@
   <?php print $location['city']; ?>
 <?php endif;?>
 
-<?php if (isset($when)): ?>
-  <?php print $when; ?>
+<?php if (isset($when_md)): ?>
+  <?php print $when_md; ?>
 <?php endif;?>
diff --git a/culturefeed_agenda/theme/culturefeed-event-mini-summary.tpl.php b/culturefeed_agenda/theme/culturefeed-event-mini-summary.tpl.php
index 3c62ec7f..ddc48917 100644
--- a/culturefeed_agenda/theme/culturefeed-event-mini-summary.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-event-mini-summary.tpl.php
@@ -16,8 +16,8 @@
 <?php if (isset($location['city'])): ?>
 <?php print $location['city']; ?>
 <?php endif;?>
-<?php if (isset($when)): ?>
-, <?php print $when; ?>
+<?php if (isset($when_sm)): ?>
+, <?php print $when_sm; ?>
 <?php endif;?>
 </p>
 
diff --git a/culturefeed_agenda/theme/culturefeed-event-summary.tpl.php b/culturefeed_agenda/theme/culturefeed-event-summary.tpl.php
index 8de46425..83539450 100644
--- a/culturefeed_agenda/theme/culturefeed-event-summary.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-event-summary.tpl.php
@@ -47,9 +47,9 @@
     <dd><?php if (!empty($location['title'])): print $location['title']; endif; ?> <?php if (!empty($location['city'])): print $location['city']; endif; ?></dd>
     <?php endif; ?>
 
-    <?php if (!empty($when)): ?>
+    <?php if (!empty($when_md)): ?>
     <dt><?php print t('When'); ?></dt>
-    <dd><?php print $when; ?></dd>
+    <dd><?php print $when_md; ?></dd>
     <?php endif; ?>
 
     <?php if (!empty($organiser)): ?>
diff --git a/culturefeed_agenda/theme/culturefeed-event.tpl.php b/culturefeed_agenda/theme/culturefeed-event.tpl.php
index be889637..5df53f21 100644
--- a/culturefeed_agenda/theme/culturefeed-event.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-event.tpl.php
@@ -76,7 +76,7 @@
       <dd><?php print t('This event is finished.'); ?></dd>
     <?php endif; ?>
   <?php else: ?>
-    <dd><?php print $when; ?></dd>
+    <dd><?php print $when_lg; ?></dd>
   <?php endif; ?>
 
    <?php if (!empty($personal_calendar_buttons)): ?>
diff --git a/culturefeed_agenda/theme/culturefeed-production-mini-summary.tpl.php b/culturefeed_agenda/theme/culturefeed-production-mini-summary.tpl.php
index cc467415..292ca0a3 100644
--- a/culturefeed_agenda/theme/culturefeed-production-mini-summary.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-production-mini-summary.tpl.php
@@ -16,8 +16,8 @@
 <?php if (isset($location['city'])): ?>
 <?php print $location['city']; ?>
 <?php endif;?>
-<?php if (isset($when)): ?>
-, <?php print $when; ?>
+<?php if (isset($when_sm)): ?>
+, <?php print $when_sm; ?>
 <?php endif;?>
 </p>
 
diff --git a/culturefeed_agenda/theme/culturefeed-production-summary.tpl.php b/culturefeed_agenda/theme/culturefeed-production-summary.tpl.php
index b5810737..60b4e8c7 100644
--- a/culturefeed_agenda/theme/culturefeed-production-summary.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-production-summary.tpl.php
@@ -47,8 +47,8 @@
     <dd><?php if (!empty($location['title'])): print $location['title']; endif; ?> <?php if (!empty($location['city'])): print $location['city']; endif; ?></dd>
     <?php endif; ?>
 
-    <?php if (!empty($when)): ?>
-    <dt><?php print t('When'); ?></dt>
+    <?php if (!empty($when_md)): ?>
+    <dt><?php print t('When_md'); ?></dt>
     <dd><?php print $when; ?></dd>
     <?php endif; ?>
 
diff --git a/culturefeed_agenda/theme/culturefeed-production.tpl.php b/culturefeed_agenda/theme/culturefeed-production.tpl.php
index a3c00587..7b96a117 100644
--- a/culturefeed_agenda/theme/culturefeed-production.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-production.tpl.php
@@ -44,9 +44,9 @@
   </dd>
   <?php endif; ?>
 
-  <?php if (!empty($when)): ?>
+  <?php if (!empty($when_lg)): ?>
   <dt><?php print t('When'); ?></dt>
-  <dd><?php print $when; ?></dd>
+  <dd><?php print $when_lg; ?></dd>
   <?php endif; ?>
 
   <?php if ($organiser): ?>
diff --git a/culturefeed_calendar/theme/culturefeed-calendar-activity-mini.tpl.php b/culturefeed_calendar/theme/culturefeed-calendar-activity-mini.tpl.php
index 847eab5c..dbd458a1 100644
--- a/culturefeed_calendar/theme/culturefeed-calendar-activity-mini.tpl.php
+++ b/culturefeed_calendar/theme/culturefeed-calendar-activity-mini.tpl.php
@@ -6,6 +6,6 @@
 ?>
 
 <h3><?php print $title; ?></h3>
-<span><?php print $when; ?></span>
+<span><?php print $when_md; ?></span>
 <a href="<?php print $edit_link['url'] ?>"><?php print $edit_link['text']; ?></a>
 <a href="<?php print $delete_link['url'] ?>"><?php print $delete_link['text']; ?></a>
\ No newline at end of file

From 284f949d3e94c37ea36708619330655d5a9c157c Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Mon, 20 Apr 2015 10:20:01 +0200
Subject: [PATCH 094/275] PWK-261 put custom location validation back in

---
 .../form/culturefeed_entry_ui.location.inc    | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
index 17739922..db2437ed 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
@@ -102,27 +102,43 @@ function culturefeed_entry_ui_location_form_validate(array $form, array &$form_s
   // Custom.
   if ($values['type'] == 'custom') {
 
+    
     if (empty($values['custom']['title'])) {
       form_set_error('location][location_control][custom][title', t('A title is required for a custom location'));
     }
-
-    if (empty($values['custom']['city'])) {
-      form_set_error('location][location_control][custom][city', t('A city is required for a custom location'));
-    }
-    else {
-
-      // If an existing event is edited, the main city is not shown.
-      $available_cities = culturefeed_search_get_city_suggestions($values['custom']['city'], TRUE);
-      $cities = array();
-      $pattern = '/ \(.*?\)/';
-      foreach ($available_cities as $available_city) {
-        $cities[] = preg_replace($pattern, '', $available_city);
+     
+    if ($values['custom']['country'] != 'BE') {
+      if (empty($values['custom']['zip'])) {
+        form_set_error('location][location_control][custom][zip', t('A zip code is required for a custom location'));
       }
-      $city = preg_replace($pattern, '', $values['custom']['city']);
-      if (!in_array($city, $cities)) {
-        form_set_error('location][location_control][custom][city', t('Please select a city from the list.'));
+      
+      if (strlen($values['custom']['zip']) < 4 || strlen($values['custom']['zip']) > 15) {
+        form_set_error('location][location_control][custom][zip', t('A zip code has minimum 4 characters'));
       }
+    }
+    
+    if ($values['custom']['country'] == 'BE') {
+  
+      $available_city = array_change_key_case(culturefeed_search_get_city_suggestions($values['custom']['city'], TRUE));
+      if (!isset($available_city[strtolower($values['custom']['city'])])) {
+        form_set_error('location][location_control][custom][city', t('A valid city is required for a custom location.'));
+      }
+      else {
 
+        // If an existing event is edited, the main city is not shown.
+        $available_cities = culturefeed_search_get_city_suggestions($values['custom']['city'], TRUE);
+        $cities = array();
+        $pattern = '/ \(.*?\)/';
+        foreach ($available_cities as $available_city) {
+          $cities[] = preg_replace($pattern, '', $available_city);
+        }
+        $city = preg_replace($pattern, '', $values['custom']['city']);
+        if (!in_array($city, $cities)) {
+          form_set_error('location][location_control][custom][city', t('Please select a city from the list.'));
+        }
+        
+      } 
+      
     }
 
   }

From b41e520bb79f5173831835b3a9ce4e99430567ef Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 20 Apr 2015 14:34:26 +0200
Subject: [PATCH 095/275] use when_md_txt format for calendar info in meta
 description

---
 culturefeed_agenda/theme/theme.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 7eeedec3..3712327f 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -835,7 +835,7 @@ function _culturefeed_agenda_preprocess_event_production_metatags($variables) {
     $description_parts[] = t('Location: @location', array('@location' => $variables['location']['title'] . ', ' . $variables['location']['city']));
   }
   if (!empty($variables['when'])) {
-    $description_parts[] = t('When: @when', array('@when' => $variables['when']));
+    $description_parts[] = t('When: @when', array('@when' => $variables['when_md_txt']));
   }
   if (!empty($variables['organiser'])) {
     $description_parts[] = t('Organisation: @organisation', array('@organisation' => $variables['organiser']['title']));

From 56574bd084f341a126e50969a7baf41c32c61be3 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 20 Apr 2015 15:28:03 +0200
Subject: [PATCH 096/275] add more cnapi parameters to redirect

---
 culturefeed_search_ui/includes/helpers.inc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 2313f91e..224db7f7 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -204,6 +204,18 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     }
   }
 
+  // Query is now search.
+  if (isset($_GET['query'])) {
+    $query = $_GET['query'];
+    $new_query['search'] = $query;
+  }
+
+  // K is now keyword.
+  if (isset($_GET['k'])) {
+    $k = $_GET['k'];
+    $new_query['keyword'] = $k;
+  }
+
   if (!empty($new_query)) {
     drupal_goto(current_path(), array('query' => $new_query), 301);
   }

From fd13642fb2cb2980f6f61e461ff81b448e8ca7dd Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 21 Apr 2015 10:45:04 +0200
Subject: [PATCH 097/275] MSS-156 remove default content type

---
 .../culturefeed_content.module                | 25 +++++++++++--------
 .../culturefeed_tips/culturefeed_tips.info    |  6 -----
 .../culturefeed_tips/culturefeed_tips.install | 17 -------------
 .../culturefeed_tips/culturefeed_tips.module  | 23 -----------------
 4 files changed, 15 insertions(+), 56 deletions(-)
 delete mode 100644 culturefeed_content/culturefeed_tips/culturefeed_tips.info
 delete mode 100644 culturefeed_content/culturefeed_tips/culturefeed_tips.install
 delete mode 100644 culturefeed_content/culturefeed_tips/culturefeed_tips.module

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index 5ffed26d..f25962c4 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -1,5 +1,7 @@
 <?php
 
+define('CULTUREFEED_CONTENT_DEFAULT_ROWS', 50);
+define('CULTUREFEED_CONTENT_DEFAULT_SORT', 'permanent asc,availableto asc,weight desc');
 /**
  * @file
  * Contains culturefeed_content.module.
@@ -13,8 +15,8 @@ function culturefeed_content_field_create_instance($instance) {
   // Set some default values.
   $instance['default_value'] = array(
     array(
-      'rows' => 50,
-      'sort' => 'permanent asc,availableto asc,weight desc',
+      'rows' => CULTUREFEED_CONTENT_DEFAULT_ROWS,
+      'sort' => CULTUREFEED_CONTENT_DEFAULT_SORT,
     ),
   );
   field_update_instance($instance);
@@ -26,11 +28,14 @@ function culturefeed_content_field_create_instance($instance) {
  */
 function culturefeed_content_field_culturefeed_content_validate($element, &$form_state, $form) {
 
+  $parents = $element['#parents'];
+  $parents[] = 'wrapper';
+  $values = drupal_array_get_nested_value($form_state['values'], $parents);
   $items = array(
-    'filter_query' => $element['wrapper']['filter_query']['#value'],
-    'query_string' => $element['wrapper']['query_string']['#value'],
-    'rows' => $element['wrapper']['rows']['#value'],
-    'sort' => $element['wrapper']['sort']['#value'],
+    'filter_query' => $values['filter_query'],
+    'query_string' => $values['query_string'],
+    'rows' => ($values['rows']) ? $values['rows'] : CULTUREFEED_CONTENT_DEFAULT_ROWS,
+    'sort' => $values['sort'],
   );
   form_set_value($element, $items, $form_state);
 
@@ -64,8 +69,8 @@ function culturefeed_content_field_formatter_view($entity_type, $entity, $field,
 
         $filter_query = $item['filter_query'];
         $query_string = $item['query_string'];
-        $rows = isset($item['rows']) ? $item['rows'] : 'permanent asc,availableto asc,weight desc';
-        $sort = isset($item['sort']) ? $item['sort'] : 50;
+        $sort = isset($item['sort']) ? $item['sort'] : CULTUREFEED_CONTENT_DEFAULT_SORT;
+        $rows = isset($item['rows']) ? $item['rows'] : CULTUREFEED_CONTENT_DEFAULT_ROWS;
 
         if (empty($query_string)) {
           $query_string = '*:*';
@@ -168,14 +173,14 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
     '#default_value' => $filter_query,
     '#required' => $element['#required'],
     '#title' => t('Filter query'),
-    '#type' => 'textarea',
+    '#type' => 'textfield',
   );
 
   $element['wrapper']['query_string'] = array(
     '#default_value' => $query_string,
     '#required' => $element['#required'],
     '#title' => t('Query string'),
-    '#type' => 'textarea',
+    '#type' => 'textfield',
   );
 
   $element['wrapper']['rows'] = array(
diff --git a/culturefeed_content/culturefeed_tips/culturefeed_tips.info b/culturefeed_content/culturefeed_tips/culturefeed_tips.info
deleted file mode 100644
index 250586b4..00000000
--- a/culturefeed_content/culturefeed_tips/culturefeed_tips.info
+++ /dev/null
@@ -1,6 +0,0 @@
-name = CultureFeed Tips
-description = Content type to highlight specific events.
-package = CultureFeed
-version = VERSION
-core = 7.x
-dependencies[] = culturefeed
diff --git a/culturefeed_content/culturefeed_tips/culturefeed_tips.install b/culturefeed_content/culturefeed_tips/culturefeed_tips.install
deleted file mode 100644
index 65a945c8..00000000
--- a/culturefeed_content/culturefeed_tips/culturefeed_tips.install
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains culturefeed_content.install.
- */
-
-/**
- * Implements hook_install().
- */
-function culturefeed_tips_install() {
-
-  node_types_rebuild();
-  $types = node_type_get_types();
-  $tip = $types['culturefeed_tip'];
-
-}
diff --git a/culturefeed_content/culturefeed_tips/culturefeed_tips.module b/culturefeed_content/culturefeed_tips/culturefeed_tips.module
deleted file mode 100644
index 28fcd088..00000000
--- a/culturefeed_content/culturefeed_tips/culturefeed_tips.module
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains culturefeed_content.module.
- */
-
-/**
- * Implements hook_node_info().
- */
-function culturefeed_tips_node_info() {
-
-  return array(
-    'culturefeed_tip' => array(
-      'base' => 'node_content',
-      'description' => t('Content type to highlight specific events.'),
-      'has_title' => TRUE,
-      'locked' => FALSE,
-      'name' => t('Culturefeed tip'),
-    ),
-  );
-
-}

From addcd4e3f0244656736bbc7623208061298df60e Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 21 Apr 2015 12:17:40 +0200
Subject: [PATCH 098/275] MSS-157 remove saved search dependency

---
 .../culturefeed_content.module                | 104 ++++++++++-
 .../includes/helpers.inc                      | 163 ------------------
 culturefeed_saved_searches/includes/pages.inc |   4 +-
 culturefeed_saved_searches/theme/theme.inc    |   4 +-
 culturefeed_search/culturefeed_search.module  | 156 +++++++++++++++++
 culturefeed_search/includes/helpers.inc       |  24 +++
 6 files changed, 286 insertions(+), 169 deletions(-)

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index f25962c4..7a16f6e2 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -1,12 +1,13 @@
 <?php
 
-define('CULTUREFEED_CONTENT_DEFAULT_ROWS', 50);
-define('CULTUREFEED_CONTENT_DEFAULT_SORT', 'permanent asc,availableto asc,weight desc');
 /**
  * @file
  * Contains culturefeed_content.module.
  */
 
+define('CULTUREFEED_CONTENT_DEFAULT_ROWS', 50);
+define('CULTUREFEED_CONTENT_DEFAULT_SORT', 'permanent asc,availableto asc,weight desc');
+
 /**
  * Implements hook_field_create_instance().
  */
@@ -112,6 +113,29 @@ function culturefeed_content_field_formatter_view($entity_type, $entity, $field,
             );
           }
 
+          if ($result->getTotalCount() > $rows && module_exists('culturefeed_agenda')) {
+
+            if (function_exists('culturefeed_search_get_search_url_query')) {
+
+              $query = 'q=' . html_entity_decode($query_string) . ($filter_query ? '&fq=' . html_entity_decode($filter_query) : '');
+
+              $build[] = array(
+                '#theme' => 'culturefeed_content_all_results_link',
+                '#query' => culturefeed_search_get_search_url_query($query),
+              );
+
+            }
+
+          }
+
+        }
+
+        else {
+
+          $build[] = array(
+            '#theme' => 'culturefeed_content_empty_text',
+          );
+
         }
 
         $element[$delta] = $build;
@@ -221,3 +245,79 @@ function culturefeed_content_field_widget_info() {
   );
 
 }
+
+/**
+ * Implements hook_theme().
+ */
+function culturefeed_content_theme() {
+
+  return array(
+    'culturefeed_content_empty_text' => array(
+      'variables' => array(
+        'empty_text' => t('No results found.'),
+      ),
+    ),
+    'culturefeed_content_all_results_link' => array(
+      'variables' => array(
+        'link_text' => t('Show all events'),
+        'query' => '',
+        'classes' => array(),
+      ),
+    ),
+  );
+
+}
+
+/**
+ * Returns HTML for the all results link.
+ *
+ * @param array $variables
+ *   The variables.
+ *
+ * @return string
+ *   The HTML.
+ */
+function theme_culturefeed_content_all_results_link(array $variables) {
+
+  $build[] = array(
+    '#markup' => l(
+      $variables['link_text'],
+      'agenda/search',
+      array(
+        'html' => TRUE,
+        'attributes' => array(
+          'class' => $variables['classes'],
+        ),
+        'query' => $variables['query'],
+      )
+    ),
+  );
+
+  return drupal_render($build);
+
+}
+
+/**
+ * Returns HTML for the empty text.
+ *
+ * @param array $variables
+ *   The variables.
+ *
+ * @return string
+ *   The HTML.
+ */
+function theme_culturefeed_content_empty_text(array $variables) {
+
+  $build = array(
+    '#type' => 'container',
+    '#attributes' => array(
+      'class' => array('alert', 'alert-info'),
+    ),
+    'empty_text' => array(
+      '#markup' => $variables['empty_text'],
+    ),
+  );
+
+  return drupal_render($build);
+
+}
diff --git a/culturefeed_saved_searches/includes/helpers.inc b/culturefeed_saved_searches/includes/helpers.inc
index 9ed9b627..bc208eec 100644
--- a/culturefeed_saved_searches/includes/helpers.inc
+++ b/culturefeed_saved_searches/includes/helpers.inc
@@ -17,166 +17,3 @@ function culturefeed_saved_searches_frequency_options() {
   );
 
 }
-
-/**
- * Get the query for the search url of a saved search.
- */
-function culturefeed_saved_search_get_search_url_query($search) {
-
-  // Check for custom filter options.
-  $filter_options = variable_get('culturefeed_search_filter_options', culturefeed_search_ui_default_filter_options());
-  $filter_options += variable_get('culturefeed_search_filter_options_2', culturefeed_search_ui_default_filter_options());
-  $known_queries = array();
-  foreach ($filter_options as $filter) {
-    $known_queries[$filter['api-filter-query']] = $filter['query-string'];
-  }
-
-  $query = array();
-  foreach (explode('&', $search->query) as $key => $value) {
-
-    $param = explode('=', $value);
-    if ($param[0] == 'group') {
-      continue;
-    }
-
-    // Param q = the search
-    if ($param[0] == 'q') {
-      if ($param[1] == '*:*') {
-        continue;
-      }
-      $query['search'] = $param[1];
-    }
-    // Search on location
-    elseif ($param[0] == 'zipcode') {
-      $query['location'] = $param[1];
-    }
-    // Filterqueries are most of the time facets.
-    elseif ($param[0] == 'fq') {
-
-      // First check if the query is a custom filter option.
-      if (isset($known_queries[$param[1]])) {
-        $query[$known_queries[$param[1]]] = TRUE;
-        continue;
-      }
-
-      $conditions = explode(' OR ', $param[1]);
-      foreach ($conditions as $condition) {
-
-        // Also check for every part of the condition.
-        if (isset($known_queries[$condition])) {
-          $query[$known_queries[$condition]] = TRUE;
-          continue;
-        }
-
-        $search_on = explode(':', $condition);
-
-        $facet_field = $search_on[0];
-        $facet_field = str_replace(array('(', ')', '"'), '', $facet_field);
-
-        $facet_value = isset($search_on[1]) ? $search_on[1] : '';
-        $facet_value = str_replace(array('(', ')', '"'), '', $facet_value);
-
-        // Check what type of filter it is.
-        switch ($facet_field) {
-
-          // Agefrom facet.
-          case 'agefrom':
-            $query['min_age'] = culturefeed_saved_search_get_agefrom_value($facet_value);
-            break;
-
-          // Filtering on an actor.
-          case 'actor':
-            $query['actor'] = $facet_value;
-
-          // Filtering on location.
-          case 'category_flandersregion_name':
-            $query['location'] = $facet_value;
-            break;
-            
-          // Filter location category facility Id.
-          case 'location_category_facility_id':
-            $query['facet']['location_category_facility_id'][0] = $facet_value;
-            break;
-
-          // Normal facets.
-          case 'category_id':
-          case 'type':
-
-            $values = explode(',', $facet_value);
-
-            // Region facets are location searches.
-            if (substr($facet_value, 0, 4) == 'reg.') {
-
-              $term = culturefeed_search_get_term_by_id($facet_value, LANGUAGE_NONE);
-              $term_parts = explode(' ', $term->name);
-
-              // If first part is numeric: do location search.
-              if (is_numeric($term_parts[0])) {
-                $query['regId'] = $facet_value;
-                $query['location'] = culturefeed_search_get_term_translation($facet_value);
-              }
-              // Otherwise set flandersregion facet active.
-              else {
-                $query['facet']['flandersregion'][0] = $facet_value;
-              }
-            }
-            else {
-              if (!isset($query['facet'][$search_on[0]])) {
-                $query['facet'][$search_on[0]] = array();
-              }
-              $query['facet'][$search_on[0]] = array_merge($query['facet'][$search_on[0]], $values);
-            }
-
-            if (isset($query['facet']['type'])) {
-              foreach ($query['facet']['type'] as $key => $content_type) {
-                if (in_array($content_type, array('production', 'event'))) {
-                  unset($query['facet']['type'][$key]);
-                }
-              }
-
-            }
-
-            break;
-
-          default:
-            // unsupported filter options.
-
-        }
-
-
-      }
-
-    }
-
-  }
-
-  // Get the correct categorie facets.
-  if (isset($query['facet']['category_id'])) {
-    $terms = db_select('culturefeed_search_terms', 't')
-      ->condition('tid', $query['facet']['category_id'])
-      ->condition('language', LANGUAGE_NONE)
-      ->fields('t', array('tid', 'did'))->execute();
-
-    foreach ($terms as $term) {
-      $query['facet']['category_' . $term->did . '_id'][] = $term->tid;
-      unset($query['facet']['category_id']);
-    }
-
-  }
-
-  return $query;
-
-}
-
-/**
- * Get the agefrom querystring to be set active.
- */
-function culturefeed_saved_search_get_agefrom_value($facet_value) {
-
-  $options = culturefeed_search_ui_get_age_range_facet_options();
-  foreach ($options as $key => $option) {
-    if ($option['range'] == $facet_value) {
-      return $key;
-    }
-  }
-}
\ No newline at end of file
diff --git a/culturefeed_saved_searches/includes/pages.inc b/culturefeed_saved_searches/includes/pages.inc
index 98406f8e..1869117c 100644
--- a/culturefeed_saved_searches/includes/pages.inc
+++ b/culturefeed_saved_searches/includes/pages.inc
@@ -110,7 +110,7 @@ function culturefeed_saved_searches_save_search_form_submit($form, &$form_state)
   }
 
   // Construct URL redirect with same search params.
-  $form_state['redirect'] = array('agenda/search', array('query' => culturefeed_saved_search_get_search_url_query($savedSearch)));
+  $form_state['redirect'] = array('agenda/search', array('query' => culturefeed_search_get_search_url_query($savedSearch->query)));
 
 }
 
@@ -141,7 +141,7 @@ function culturefeed_saved_searches_page_my_searches() {
  * Page callback to view a given search.
  */
 function culturefeed_saved_searches_redirect(CultureFeed_SavedSearches_SavedSearch $search) {
-  drupal_goto('agenda/search', array('query' => culturefeed_saved_search_get_search_url_query($search)));
+  drupal_goto('agenda/search', array('query' => culturefeed_search_get_search_url_query($search->query)));
 }
 
 /**
diff --git a/culturefeed_saved_searches/theme/theme.inc b/culturefeed_saved_searches/theme/theme.inc
index cf7b7fd2..f21ef0ad 100644
--- a/culturefeed_saved_searches/theme/theme.inc
+++ b/culturefeed_saved_searches/theme/theme.inc
@@ -21,7 +21,7 @@ function culturefeed_saved_searches_preprocess_culturefeed_saved_searches_manage
       'form' => drupal_get_form('culturefeed_saved_searches_edit_frequency_form', $search),
       'id' => (int)$search->id,
       'delete_url' => url('culturefeed/searches/' . $search->id . '/delete'),
-      'search_url' => url('agenda/search', array('query' => culturefeed_saved_search_get_search_url_query($search))),
+      'search_url' => url('agenda/search', array('query' => culturefeed_search_get_search_url_query($search->query))),
     );
     $items[] = $item;
   }
@@ -44,7 +44,7 @@ function culturefeed_saved_searches_preprocess_culturefeed_saved_searches_list(&
   foreach ($searches as $search) {
     $item = array(
       'title' => check_plain($search->name),
-      'search_url' => url('agenda/search', array('query' => culturefeed_saved_search_get_search_url_query($search))),
+      'search_url' => url('agenda/search', array('query' => culturefeed_search_get_search_url_query($search->query))),
     );
     $items[] = $item;
   }
diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 65bdfccd..5d639301 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -156,3 +156,159 @@ function culturefeed_search_cache_flush_submit($form, $form_state) {
   _culturefeed_search_flush_caches();
 
 }
+
+/**
+ * Get the query for a search url.
+ *
+ * @param string $search_query
+ *   The search query.
+ *
+ * @return string
+ *   The url.
+ */
+function culturefeed_search_get_search_url_query($search_query) {
+
+  // Check for custom filter options.
+  $filter_options = variable_get('culturefeed_search_filter_options', culturefeed_search_ui_default_filter_options());
+  $filter_options += variable_get('culturefeed_search_filter_options_2', culturefeed_search_ui_default_filter_options());
+  $known_queries = array();
+  foreach ($filter_options as $filter) {
+    $known_queries[$filter['api-filter-query']] = $filter['query-string'];
+  }
+
+  $query = array();
+  foreach (explode('&', $search_query) as $key => $value) {
+
+    $param = explode('=', $value);
+    if ($param[0] == 'group') {
+      continue;
+    }
+
+    // Param q = the search
+    if ($param[0] == 'q') {
+      if ($param[1] == '*:*') {
+        continue;
+      }
+      $query['search'] = $param[1];
+    }
+    // Search on location
+    elseif ($param[0] == 'zipcode') {
+      $query['location'] = $param[1];
+    }
+    // Filterqueries are most of the time facets.
+    elseif ($param[0] == 'fq') {
+
+      // First check if the query is a custom filter option.
+      if (isset($known_queries[$param[1]])) {
+        $query[$known_queries[$param[1]]] = TRUE;
+        continue;
+      }
+
+      $conditions = explode(' OR ', $param[1]);
+      foreach ($conditions as $condition) {
+
+        // Also check for every part of the condition.
+        if (isset($known_queries[$condition])) {
+          $query[$known_queries[$condition]] = TRUE;
+          continue;
+        }
+
+        $search_on = explode(':', $condition);
+
+        $facet_field = $search_on[0];
+        $facet_field = str_replace(array('(', ')', '"'), '', $facet_field);
+
+        $facet_value = isset($search_on[1]) ? $search_on[1] : '';
+        $facet_value = str_replace(array('(', ')', '"'), '', $facet_value);
+
+        // Check what type of filter it is.
+        switch ($facet_field) {
+
+          // Agefrom facet.
+          case 'agefrom':
+            $query['min_age'] = culturefeed_search_get_agefrom_value($facet_value);
+            break;
+
+          // Filtering on an actor.
+          case 'actor':
+            $query['actor'] = $facet_value;
+
+          // Filtering on location.
+          case 'category_flandersregion_name':
+            $query['location'] = $facet_value;
+            break;
+
+          // Filter location category facility Id.
+          case 'location_category_facility_id':
+            $query['facet']['location_category_facility_id'][0] = $facet_value;
+            break;
+
+          // Normal facets.
+          case 'category_id':
+          case 'type':
+
+            $values = explode(',', $facet_value);
+
+            // Region facets are location searches.
+            if (substr($facet_value, 0, 4) == 'reg.') {
+
+              $term = culturefeed_search_get_term_by_id($facet_value, LANGUAGE_NONE);
+              $term_parts = explode(' ', $term->name);
+
+              // If first part is numeric: do location search.
+              if (is_numeric($term_parts[0])) {
+                $query['regId'] = $facet_value;
+                $query['location'] = culturefeed_search_get_term_translation($facet_value);
+              }
+              // Otherwise set flandersregion facet active.
+              else {
+                $query['facet']['flandersregion'][0] = $facet_value;
+              }
+            }
+            else {
+              if (!isset($query['facet'][$search_on[0]])) {
+                $query['facet'][$search_on[0]] = array();
+              }
+              $query['facet'][$search_on[0]] = array_merge($query['facet'][$search_on[0]], $values);
+            }
+
+            if (isset($query['facet']['type'])) {
+              foreach ($query['facet']['type'] as $key => $content_type) {
+                if (in_array($content_type, array('production', 'event'))) {
+                  unset($query['facet']['type'][$key]);
+                }
+              }
+
+            }
+
+            break;
+
+          default:
+            // unsupported filter options.
+
+        }
+
+
+      }
+
+    }
+
+  }
+
+  // Get the correct categorie facets.
+  if (isset($query['facet']['category_id'])) {
+    $terms = db_select('culturefeed_search_terms', 't')
+      ->condition('tid', $query['facet']['category_id'])
+      ->condition('language', LANGUAGE_NONE)
+      ->fields('t', array('tid', 'did'))->execute();
+
+    foreach ($terms as $term) {
+      $query['facet']['category_' . $term->did . '_id'][] = $term->tid;
+      unset($query['facet']['category_id']);
+    }
+
+  }
+
+  return $query;
+
+}
diff --git a/culturefeed_search/includes/helpers.inc b/culturefeed_search/includes/helpers.inc
index e1fcf48b..6722e556 100644
--- a/culturefeed_search/includes/helpers.inc
+++ b/culturefeed_search/includes/helpers.inc
@@ -817,6 +817,30 @@ function culturefeed_search_term_translations($tids = array(), $return_tids = FA
   return !empty($terms) ? TRUE : FALSE;
 }
 
+/**
+ * Get the agefrom querystring to be set active.
+ *
+ * @param string $facet_value
+ *   The facet value.
+ *
+ * @return int
+ *   The key.
+ */
+function culturefeed_search_get_agefrom_value($facet_value) {
+
+  if (module_exists('culturefeed_search_ui')) {
+
+    $options = culturefeed_search_ui_get_age_range_facet_options();
+    foreach ($options as $key => $option) {
+      if ($option['range'] == $facet_value) {
+        return $key;
+      }
+    }
+
+  }
+
+}
+
 /**
  * Get the translation for a term.
  *

From 18d96bade602280d7378986089309fbe123896d6 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 21 Apr 2015 13:10:35 +0200
Subject: [PATCH 099/275] MSS-151 move workaround into temporary module

---
 .../CdbEventSubscriber.php                    |  0
 culturefeed_mss_151/culturefeed_mss_151.info  |  7 +++++++
 .../culturefeed_mss_151.module                | 19 +++++++++++++++++++
 .../Drupal/DrupalCultureFeedSearchService.php |  4 ----
 4 files changed, 26 insertions(+), 4 deletions(-)
 rename {culturefeed_search/lib/Drupal => culturefeed_mss_151}/CdbEventSubscriber.php (100%)
 create mode 100644 culturefeed_mss_151/culturefeed_mss_151.info
 create mode 100644 culturefeed_mss_151/culturefeed_mss_151.module

diff --git a/culturefeed_search/lib/Drupal/CdbEventSubscriber.php b/culturefeed_mss_151/CdbEventSubscriber.php
similarity index 100%
rename from culturefeed_search/lib/Drupal/CdbEventSubscriber.php
rename to culturefeed_mss_151/CdbEventSubscriber.php
diff --git a/culturefeed_mss_151/culturefeed_mss_151.info b/culturefeed_mss_151/culturefeed_mss_151.info
new file mode 100644
index 00000000..77e9bf5b
--- /dev/null
+++ b/culturefeed_mss_151/culturefeed_mss_151.info
@@ -0,0 +1,7 @@
+name = CultureFeed MSS 151
+description = Temporary module to enable cdb v 3.3.
+package = CultureFeed
+version = VERSION
+core = 7.x
+
+files[] = CdbEventSubscriber.php
diff --git a/culturefeed_mss_151/culturefeed_mss_151.module b/culturefeed_mss_151/culturefeed_mss_151.module
new file mode 100644
index 00000000..c4ef773f
--- /dev/null
+++ b/culturefeed_mss_151/culturefeed_mss_151.module
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_mss_151.module.
+ */
+
+/**
+ * Implements hook_culturefeed_search_service_created().
+ */
+function culturefeed_mss_151_culturefeed_search_service_created($service) {
+
+  /** @var \CultuurNet\Search\Guzzle\Service $service */
+  // Temporary workaround to set CDB to 3.3
+  $client_factory = $service->getHttpClientFactory();
+  $client_factory->addSubscriber(new CdbEventSubscriber());
+  $service->setHttpClientFactory($client_factory);
+
+}
diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
index 32362cd5..2e9af806 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
@@ -32,10 +32,6 @@ private function __construct(ConsumerCredentials $consumerCredentials) {
 
     $endpoint = variable_get('culturefeed_search_api_location', CULTUREFEED_SEARCH_API_LOCATION);
     $service = new \CultuurNet\Search\Guzzle\Service($endpoint, $consumerCredentials);
-    // Temporary workaround to set CDB to 3.3
-    $clientFactory = $service->getHttpClientFactory();
-    $clientFactory->addSubscriber(new CdbEventSubscriber());
-    $service->setHttpClientFactory($clientFactory);
 
     module_invoke_all('culturefeed_search_service_created', $service);
 

From ff7ee90b26a908980439537175222776a6d674fe Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 21 Apr 2015 14:12:45 +0200
Subject: [PATCH 100/275] PWK-265 move autocomplete javascript to culturefeed
 bootstrap

---
 .../includes/culturefeed_entry_ui.pages.inc   |  29 +---
 .../js/bootstrap_autocomplete_override.js     | 151 ------------------
 2 files changed, 5 insertions(+), 175 deletions(-)
 delete mode 100644 culturefeed_entry_ui/js/bootstrap_autocomplete_override.js

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 495d0d74..56443c73 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2,7 +2,7 @@
 /**
  * @file
  * Page callbacks for the entry api ui.
- */ 
+ */
 
 /**
  * Form callback: Create a new event, or edit an existing.
@@ -224,7 +224,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
 
       try {
         $default_image = system_retrieve_file('http:' . $main_image->getHLink(), 'public://uploads/', TRUE);
-        
+
         if ($default_image) {
           file_usage_add($default_image, 'culturefeed_entry_ui', 'event', $default_image->fid);
           $default_image_hlink = $main_image->getHLink();
@@ -671,7 +671,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       '#value' => $default_image_hlink,
     );
   }
-  
+
   // Copyright
   $form['extra']['photo']['copyright_text'] = array(
     '#type' => 'textfield',
@@ -1201,26 +1201,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   );
 
   $form['#attached']['css'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/css/culturefeed_entry_ui.css';
-  global $theme;
-  if ($theme == 'culturefeed_bootstrap') {
-    // Ensure the javascript files are added after the bootstrap js files as
-    // these override the custom entury ui autocomplete js.
-    $form['#attached']['js'][] = array(
-      'data' => drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js',
-      'group' => JS_THEME,
-      'every_page' => FALSE,
-      'weight' => 5,
-    );
-    $form['#attached']['js'][] = array(
-      'data' => drupal_get_path('module', 'culturefeed_entry_ui') . '/js/bootstrap_autocomplete_override.js',
-      'group' => JS_THEME,
-      'every_page' => FALSE,
-      'weight' => 6,
-    );
-  }
-  else {
-    $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js';
-  }
+  $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js';
   $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.plugin.js';
   $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength.js';
   return $form;
@@ -2017,7 +1998,7 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   // Keywords.
   $keywords_form = array();
   $custom_entry_api_tags = array();
-  if ($values['keywords']) {    
+  if ($values['keywords']) {
     $keywords_form = explode(';', $values['keywords']);
   }
   if (variable_get('culturefeed_entry_ui_custom_entry_api_tags')) {
diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
deleted file mode 100644
index e0aff99c..00000000
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ /dev/null
@@ -1,151 +0,0 @@
-jQuery(function($) {
-
-  /**
-   * Fills the suggestion popup with any matches received.
-   */
-  Drupal.jsAC.prototype.found = function (matches) {
-
-    // If no value in the textfield, do not show the popup.
-    if (!this.input.value.length) {
-      return false;
-    }
-
-    // Prepare matches.
-    var ul = $('<ul class="dropdown-menu"></ul>');
-    var ac = this;
-    ul.css({
-      display: 'block',
-      right: 0
-    });
-    for (key in matches) {
-
-      var value;
-
-      if (typeof(matches[key]) == "string") {
-
-        value = matches[key];
-        $('<li></li>')
-          .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
-          .mousedown(function () { ac.select(this); })
-          .mouseover(function () { ac.highlight(this); })
-          .mouseout(function () { ac.unhighlight(this); })
-          .data('autocompleteValue', value)
-          .appendTo(ul);
-
-      }
-      else if (typeof(matches[key]) == "object") {
-
-        value = matches[key].locationTitle;
-        $('<li></li>')
-          .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
-          .mousedown(function () { ac.select(this); })
-          .mouseover(function () { ac.highlight(this); })
-          .mouseout(function () { ac.unhighlight(this); })
-          .data('autocompleteTitle', matches[key].title)
-          .data('autocompleteValue', matches[key].key)
-          .appendTo(ul);
-
-      }
-
-    }
-
-    // Show popup with matches, if any.
-    if (this.popup) {
-
-      if (ul.children().length) {
-
-        $(this.popup).empty().append(ul).show();
-        $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
-        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-          $('#edit-organiser-add-new-actor').css({ display: 'none' });
-        }
-        if (this.input.name == 'location[location_control][asset][label]') {
-          $('#location_custom_add').hide();
-        }
-
-      }
-
-      else {
-
-        $(this.popup).css({ visibility: 'hidden' });
-        this.hidePopup(null, 'empty');
-
-        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-          $('#edit-organiser-add-new-actor').css({ display: 'block' });
-          $('#organiser_actor_id').val('');
-        }
-        if (this.input.name == 'location[location_control][asset][label]') {
-          $('#location_custom_add').show();
-          $('#location_actor_id').val('');
-        }
-
-      }
-
-    }
-
-  };
-
-  if (Drupal.ACDB) {
-
-    /**
-     * Performs a cached and delayed search.
-     * Custom override: Don't show an error when people are navigation away of the site.
-     *
-     */
-    Drupal.ACDB.prototype.search = function (searchString) {
-      var db = this;
-      searchString = searchString.replace(/^\s+|\s+$/, '');
-      this.searchString = searchString;
-
-      // See if this string needs to be searched for anyway.
-      if (searchString.length <= 0 ||
-        searchString.charAt(searchString.length - 1) == ',') {
-        return;
-      }
-
-      // See if this key has been searched for before.
-      if (this.cache[searchString]) {
-        return this.owner.found(this.cache[searchString]);
-      }
-
-      // Initiate delayed search.
-      if (this.timer) {
-        clearTimeout(this.timer);
-      }
-      this.timer = setTimeout(function () {
-
-        db.owner.setStatus('begin');
-
-        // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
-        // encodeURIComponent to allow autocomplete search terms to contain slashes.
-        $.ajax({
-          type: 'GET',
-          url: db.uri + '/' + Drupal.encodePath(searchString),
-          dataType: 'json',
-
-          success: function (matches) {
-            if (typeof matches.status == 'undefined' || matches.status != 0) {
-              db.cache[searchString] = matches;
-              // Verify if these are still the matches the user wants to see.
-              if (db.searchString == searchString) {
-                db.owner.found(matches);
-              }
-              db.owner.setStatus('found');
-            }
-          },
-
-          error: function (xmlhttp) {
-            if (xmlhttp.status) {
-              alert(Drupal.ajaxError(xmlhttp, db.uri));
-            }
-          }
-
-        });
-
-      }, this.delay);
-
-    };
-
-  }
-
-});

From 2fa7f6212b6bee14d2f349f3a9f7dc6803c33e94 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 21 Apr 2015 15:31:14 +0200
Subject: [PATCH 101/275] PWK-266 fix empty city !=BE after saving

---
 .../includes/form/culturefeed_entry_ui.location.inc       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
index db2437ed..474f3541 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
@@ -46,6 +46,9 @@ function culturefeed_entry_ui_location_form(array &$form, array &$form_state, \C
         if ($custom_location_country == 'BE') {
           $custom_location_city = $custom_location_zip . ' ' . $address->getCity();
         }
+        else {
+          $custom_location_city = $address->getCity();
+        }
 
       }
 
@@ -115,6 +118,11 @@ function culturefeed_entry_ui_location_form_validate(array $form, array &$form_s
       if (strlen($values['custom']['zip']) < 4 || strlen($values['custom']['zip']) > 15) {
         form_set_error('location][location_control][custom][zip', t('A zip code has minimum 4 characters'));
       }
+      
+      if (empty($values['custom']['city'])) {
+        form_set_error('location][location_control][custom][city', t('A city is required for a custom location'));
+      }
+      
     }
     
     if ($values['custom']['country'] == 'BE') {

From 981f928897096ed19cd13d8c1f512a8d8ce52d70 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 21 Apr 2015 15:35:13 +0200
Subject: [PATCH 102/275] PWK-269 make setting of default country

---
 .../culturefeed_location_control/form/custom.inc       |  4 ++--
 .../includes/culturefeed_entry_ui.admin.inc            | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc b/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
index e1553563..471649b4 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
@@ -17,7 +17,7 @@
 function culturefeed_location_control_custom_pre_render(array $element) {
 
   $custom = $element['#value'];
-  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : 'BE';
+  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : variable_get('culturefeed_entry_ui_default_country');
 
   if ($country == 'BE') {
     $element['zip']['#access'] = FALSE;
@@ -60,7 +60,7 @@ function culturefeed_location_control_custom_process(array $element, array &$for
     'wrapper' => $element_id . '-ajax-wrapper',
   );
 
-  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : 'BE';
+  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : variable_get('culturefeed_entry_ui_default_country');
 
   $element['title'] = array(
     '#type' => 'textfield',
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index e8182d47..19aa0911 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -31,7 +31,7 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
     '#description' => t('Custom tags specific for this site. Use a new line for each tag.'),
   );
-  
+
   $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
     '#type' => 'textarea',
     '#title' => t('Custom tags to push to entry API'),
@@ -39,6 +39,14 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     '#description' => t('Tags pushed under the hood to Entry API. Use a new line for each tag.'),
   );
 
+  $form['culturefeed_entry_ui_default_country'] = array(
+    '#type' => 'select',
+    '#options' => country_get_list(),
+    '#title' => t('Default country'),
+    '#default_value' => variable_get('culturefeed_entry_ui_default_country'),
+    '#description' => t('Select the default country for the entry form.'),
+  );
+
   return system_settings_form($form);
 
 }

From ae4f23aa09f0fed20f1e5b35918f88305ba1bf54 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 21 Apr 2015 15:39:14 +0200
Subject: [PATCH 103/275] PWK-269 give country setting default value of BE

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index 19aa0911..be59a0ca 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -43,7 +43,7 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     '#type' => 'select',
     '#options' => country_get_list(),
     '#title' => t('Default country'),
-    '#default_value' => variable_get('culturefeed_entry_ui_default_country'),
+    '#default_value' => variable_get('culturefeed_entry_ui_default_country') ? variable_get('culturefeed_entry_ui_default_country') : 'BE',
     '#description' => t('Select the default country for the entry form.'),
   );
 

From 9c57ee274ca9d37360be8ffb99afe28fc58b1d01 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 22 Apr 2015 08:45:21 +0200
Subject: [PATCH 104/275] MSS-151 rename module

---
 .../CdbEventSubscriber.php                                        | 0
 .../culturefeed_cdb_upgrade.info                                  | 0
 .../culturefeed_cdb_upgrade.module                                | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {culturefeed_mss_151 => culturefeed_cdb_upgrade}/CdbEventSubscriber.php (100%)
 rename culturefeed_mss_151/culturefeed_mss_151.info => culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info (100%)
 rename culturefeed_mss_151/culturefeed_mss_151.module => culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module (100%)

diff --git a/culturefeed_mss_151/CdbEventSubscriber.php b/culturefeed_cdb_upgrade/CdbEventSubscriber.php
similarity index 100%
rename from culturefeed_mss_151/CdbEventSubscriber.php
rename to culturefeed_cdb_upgrade/CdbEventSubscriber.php
diff --git a/culturefeed_mss_151/culturefeed_mss_151.info b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
similarity index 100%
rename from culturefeed_mss_151/culturefeed_mss_151.info
rename to culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
diff --git a/culturefeed_mss_151/culturefeed_mss_151.module b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
similarity index 100%
rename from culturefeed_mss_151/culturefeed_mss_151.module
rename to culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module

From 9e7c658677646390bddd44a294c61f423c6aef6c Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 22 Apr 2015 10:26:27 +0200
Subject: [PATCH 105/275] add mapping for cnapi datetype

---
 culturefeed_search_ui/includes/helpers.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 224db7f7..a6eb6f9d 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -216,6 +216,12 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     $new_query['keyword'] = $k;
   }
 
+  // Datetype is now facet[datetype][0].
+  if (isset($_GET['datetype'])) {
+    $datetype = $_GET['datetype'];
+    $new_query['facet']['datetype'][0] = $datetype;
+  }
+
   if (!empty($new_query)) {
     drupal_goto(current_path(), array('query' => $new_query), 301);
   }

From fa21ef26585f38e3e383b2e7ecf1a4162e888d67 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 22 Apr 2015 10:42:10 +0200
Subject: [PATCH 106/275] UIV-1208 adding headingid to
 culturefeed_search_ui_redirect_cnapi_urls

---
 culturefeed_search_ui/includes/helpers.inc | 147 +++++++++++++++++++++
 1 file changed, 147 insertions(+)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index a6eb6f9d..d5494e5b 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -221,6 +221,22 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     $datetype = $_GET['datetype'];
     $new_query['facet']['datetype'][0] = $datetype;
   }
+  
+  // Headingid's
+  if (isset($_GET['headingid'])) {
+    
+    $mapping = culturefeed_search_ui_get_headings_mapping($_GET['headingid']);
+    
+    // Voor kinderen is not a facet
+    if (isset($mapping['voorkinderen'])) {
+      $new_query['voor-kinderen'] = '1';
+      unset($mapping['voorkinderen']);
+    }
+    foreach ($mapping as $category => $id) {
+      $new_query['facet'][$category][0] = $id;
+    }
+  }
+  
 
   if (!empty($new_query)) {
     drupal_goto(current_path(), array('query' => $new_query), 301);
@@ -228,6 +244,137 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
 
 }
 
+
+/**
+ * Helper fucntion to redirect all old headingid's
+ */
+function culturefeed_search_ui_get_headings_mapping($headingid) {
+
+  $mapping = array(
+    44 => array('eventtype' => '0.50.4.0.0'),
+    45 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.1.0.0'),
+    46 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.2.0.0'),
+    47 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.1.0'),
+    48 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.2.0'),
+    49 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.3.0'),
+    50 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.4.0.0'),
+    51 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.5.0'),
+    52 => array('eventtype' => '0.54.0.0.0'),
+    53 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.1.0.0'),
+    54 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.2.0.0'),
+    55 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.3.0.0'),
+    56 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.5.0.0'),
+    57 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.1.0.0 '),
+    58 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.1.0.0 '),
+    59 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.10.0.0'),
+    60 => array('eventtype' => '0.55.0.0.0','theme' => '1.4.0.0.0'),
+    61 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.5.0.0'),
+    62 => array('eventtype' => '0.55.0.0.0','theme' => '1.5.0.0.0'),
+    63 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.4.0.0'),
+    64 => array('eventtype' => '0.50.6.0.0'),
+    65 => array('eventtype' => '0.3.2.0.0'),
+    66 => array('eventtype' => '0.5.0.0.0'),
+    67 => array('eventtype' => '0.5.0.0.0','theme' => '1.8.1.0.0'),
+    68 => array('eventtype' => '0.5.0.0.0','theme' => '1.3.1.0.0 '),
+    69 => array('eventtype' => '0.5.0.0.0','theme' => '1.9.1.0.0'),
+    70 => array('eventtype' => '0.5.0.0.0','theme' => '1.7.2.0.0'),
+    71 => array('eventtype' => '0.5.0.0.0','theme' => '1.10.0.0.0'),
+    73 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.13.0.0'),
+    74 => array('eventtype' => '0.0.0.0.0'),
+    75 => array('eventtype' => '0.0.0.0.0','theme' => '1.1.0.0.0'),
+    76 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.2.0.0'),
+    77 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.1.0.0'),
+    78 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.3.0.0'),
+    79 => array('eventtype' => '0.0.0.0.0','theme' => '1.2.1.0.0'),
+    80 => array('eventtype' => '0.0.0.0.0','theme' => '1.2.2.0.0'),
+    81 => array('eventtype' => '0.14.0.0.0'),
+    82 => array('eventtype' => '0.15.0.0.0'),
+    83 => array('eventtype' => '0.6.0.0.0'),
+    84 => array('eventtype' => '0.37.0.0.0'),
+    85 => array('eventtype' => '0.3.1.0.0'),
+    86 => array('eventtype' => '0.50.21.0.0'),
+    87 => array('eventtype' => '0.49.0.0.0'),
+    89 => array('eventtype' => '0.53.0.0.0'),
+    90 => array('eventtype' => '0.28.0.0.0'),
+    91 => array('eventtype' => '0.7.0.0.0'),
+    92 => array('eventtype' => '0.59.0.0.0'),
+    93 => array('eventtype' => '0.17.0.0.0'),
+    94 => array('umv' => 'umv.6','voorkinderen' => '1'),
+    95 => array('eventtype' => '0.50.4.0.0','voorkinderen' => '1'),
+    96 => array('eventtype' => '0.54.0.0.0','voorkinderen' => '1'),
+    97 => array('eventtype' => '0.55.0.0.0','voorkinderen' => '1'),
+    98 => array('eventtype' => '0.50.6.0.0','voorkinderen' => '1'),
+    99 => array('umv' => 'umv.1','voorkinderen' => '1'),
+    100 => array('eventtype' => '0.5.0.0.0','voorkinderen' => '1'),
+    101 => array('umv' => 'umv.2','voorkinderen' => '1'),
+    102 => array('umv' => 'umv.8','voorkinderen' => '1'),
+    103 => array('umv' => 'umv.4','voorkinderen' => '1'),
+    104 => array('umv' => 'umv.5','voorkinderen' => '1'),
+    121 => array('eventtype' => '0.55.0.0.0','theme' => '1.4.0.0.0'),
+    122 => array('eventtype' => '0.55.0.0.0','theme' => '1.5.0.0.0'),
+    125 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.2.0.0'),
+    126 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.12.0.0'),
+    127 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.1.0.0'),
+    128 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.6.0.0 '),
+    129 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.8.0.0'),
+    130 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.3.0.0'),
+    131 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.13.0.0'),
+    132 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.10.0.0'),
+    133 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.4.0.0'),
+    134 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.7.0.0'),
+    135 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.11.0.0'),
+    136 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.14.0.0'),
+    137 => array('eventtype' => '0.3.2.0.0'),
+    138 => array('eventtype' => '0.3.2.0.0'),
+    139 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.13.0.0'),
+    140 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.3.0.0'),
+    141 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.6.0.0'),
+    142 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.11.0.0'),
+    143 => array('eventtype' => '0.19.0.0.0','theme' => '1.58.8.0.0'),
+    144 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.10.0.0'),
+    145 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.12.0.0'),
+    146 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.14.0.0'),
+    147 => array('eventtype' => '0.56.0.0.0'),
+    148 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.5.0.0'),
+    149 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.9.0.0'),
+    150 => array('eventtype' => '0.15.0.0.0'),
+    151 => array('eventtype' => '0.16.0.0.0'),
+    152 => array('eventtype' => '0.12.0.0.0'),
+    153 => array('eventtype' => '0.3.1.0.0','theme' => '1.42.0.0.0'),
+    154 => array('eventtype' => '0.3.1.0.0','theme' => '1.21.0.0.0'),
+    155 => array('eventtype' => '0.3.1.0.0','theme' => '1.37.0.0.0'),
+    156 => array('eventtype' => '0.3.1.0.0','theme' => '1.61.0.0.0'),
+    157 => array('eventtype' => '0.3.1.0.0','theme' => '1.43.0.0.0'),
+    158 => array('eventtype' => '0.3.1.0.0','theme' => '1.41.0.0.0'),
+    159 => array('eventtype' => '0.3.1.0.0','theme' => '1.37.1.0.0'),
+    160 => array('eventtype' => '0.3.1.0.0','theme' => '1.37.2.0.0'),
+    161 => array('eventtype' => '0.3.1.0.0','theme' => '1.44.0.0.0'),
+    162 => array('eventtype' => '0.3.1.0.0','theme' => '1.64.0.0.0'),
+    163 => array('eventtype' => '0.3.1.0.0','theme' => '1.25.0.0.0'),
+    164 => array('eventtype' => '0.3.1.0.0','theme' => '1.51.13.0.0'),
+    165 => array('eventtype' => '0.57.0.0.0'),
+    166 => array('eventtype' => '1.50.0.0.0'),
+    167 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.13.0.0'),
+    168 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.14.0.0'),
+    169 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.3.0.0'),
+    170 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.6.0.0'),
+    171 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.11.0.0'),
+    172 => array('eventtype' => '0.59.0.0.0','theme' => '1.58.8.0.0'),
+    173 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.10.0.0'),
+    174 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.12.0.0'),
+    175 => array('umv' => 'umv.9','voorkinderen' => '1'),
+    176 => array('eventtype' => '0.100.0.0.0'),
+    177 => array('eventtype' => '0.100.2.0.0'),
+    178 => array('eventtype' => '0.100.1.0.0'),
+    179 => array('voorkinderen' => '1'),
+    205 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.15.0.0'),
+    206 => array('eventtype' => '0.3.1.0.0','theme' => '1.65.0.0.0')
+  );
+
+  return $mapping[$headingid];
+
+}
+
 /**
  * Load all searchable types.
  * This wil invoke a hook. Modules can define following stuff.

From 470ef0a965a5d7f2426f4b628862513be366819b Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 22 Apr 2015 10:52:02 +0200
Subject: [PATCH 107/275] add mapping for cnapi date

---
 culturefeed_search_ui/includes/helpers.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index d5494e5b..f8b1515f 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -221,6 +221,13 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     $datetype = $_GET['datetype'];
     $new_query['facet']['datetype'][0] = $datetype;
   }
+
+  // Date is now date_range.
+  if (isset($_GET['date'])) {
+    $date = $_GET['date'];
+    $new_date = date("d/m/Y", strtotime($date));
+    $new_query['date_range'] = $new_date;
+  }
   
   // Headingid's
   if (isset($_GET['headingid'])) {
@@ -236,7 +243,6 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
       $new_query['facet'][$category][0] = $id;
     }
   }
-  
 
   if (!empty($new_query)) {
     drupal_goto(current_path(), array('query' => $new_query), 301);

From 61f5c7d146a38341ab0569b2225d96b17521b9f6 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 22 Apr 2015 11:08:58 +0200
Subject: [PATCH 108/275] use heading instead of headingid

---
 culturefeed_search_ui/includes/helpers.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index f8b1515f..18b0044f 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -229,10 +229,10 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     $new_query['date_range'] = $new_date;
   }
   
-  // Headingid's
-  if (isset($_GET['headingid'])) {
+  // Headings are now a combination of facets.
+  if (isset($_GET['heading'])) {
     
-    $mapping = culturefeed_search_ui_get_headings_mapping($_GET['headingid']);
+    $mapping = culturefeed_search_ui_get_headings_mapping($_GET['heading']);
     
     // Voor kinderen is not a facet
     if (isset($mapping['voorkinderen'])) {
@@ -250,11 +250,10 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
 
 }
 
-
 /**
  * Helper fucntion to redirect all old headingid's
  */
-function culturefeed_search_ui_get_headings_mapping($headingid) {
+function culturefeed_search_ui_get_headings_mapping($heading) {
 
   $mapping = array(
     44 => array('eventtype' => '0.50.4.0.0'),
@@ -377,7 +376,7 @@ function culturefeed_search_ui_get_headings_mapping($headingid) {
     206 => array('eventtype' => '0.3.1.0.0','theme' => '1.65.0.0.0')
   );
 
-  return $mapping[$headingid];
+  return $mapping[$heading];
 
 }
 

From fd5f535b26c5b7419fdd730418c71268423bef35 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 22 Apr 2015 11:13:15 +0200
Subject: [PATCH 109/275] use category facet names that trigger
 culturefeed_agenda_url_outbound_alter

---
 culturefeed_search_ui/includes/helpers.inc | 236 ++++++++++-----------
 1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 18b0044f..62d6fc05 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -256,124 +256,124 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
 function culturefeed_search_ui_get_headings_mapping($heading) {
 
   $mapping = array(
-    44 => array('eventtype' => '0.50.4.0.0'),
-    45 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.1.0.0'),
-    46 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.2.0.0'),
-    47 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.1.0'),
-    48 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.2.0'),
-    49 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.3.0'),
-    50 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.4.0.0'),
-    51 => array('eventtype' => '0.50.4.0.0','theme' => '1.8.3.5.0'),
-    52 => array('eventtype' => '0.54.0.0.0'),
-    53 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.1.0.0'),
-    54 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.2.0.0'),
-    55 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.3.0.0'),
-    56 => array('eventtype' => '0.54.0.0.0','theme' => '1.9.5.0.0'),
-    57 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.1.0.0 '),
-    58 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.1.0.0 '),
-    59 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.10.0.0'),
-    60 => array('eventtype' => '0.55.0.0.0','theme' => '1.4.0.0.0'),
-    61 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.5.0.0'),
-    62 => array('eventtype' => '0.55.0.0.0','theme' => '1.5.0.0.0'),
-    63 => array('eventtype' => '0.55.0.0.0','theme' => '1.3.4.0.0'),
-    64 => array('eventtype' => '0.50.6.0.0'),
-    65 => array('eventtype' => '0.3.2.0.0'),
-    66 => array('eventtype' => '0.5.0.0.0'),
-    67 => array('eventtype' => '0.5.0.0.0','theme' => '1.8.1.0.0'),
-    68 => array('eventtype' => '0.5.0.0.0','theme' => '1.3.1.0.0 '),
-    69 => array('eventtype' => '0.5.0.0.0','theme' => '1.9.1.0.0'),
-    70 => array('eventtype' => '0.5.0.0.0','theme' => '1.7.2.0.0'),
-    71 => array('eventtype' => '0.5.0.0.0','theme' => '1.10.0.0.0'),
-    73 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.13.0.0'),
-    74 => array('eventtype' => '0.0.0.0.0'),
-    75 => array('eventtype' => '0.0.0.0.0','theme' => '1.1.0.0.0'),
-    76 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.2.0.0'),
-    77 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.1.0.0'),
-    78 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.3.0.0'),
-    79 => array('eventtype' => '0.0.0.0.0','theme' => '1.2.1.0.0'),
-    80 => array('eventtype' => '0.0.0.0.0','theme' => '1.2.2.0.0'),
-    81 => array('eventtype' => '0.14.0.0.0'),
-    82 => array('eventtype' => '0.15.0.0.0'),
-    83 => array('eventtype' => '0.6.0.0.0'),
-    84 => array('eventtype' => '0.37.0.0.0'),
-    85 => array('eventtype' => '0.3.1.0.0'),
-    86 => array('eventtype' => '0.50.21.0.0'),
-    87 => array('eventtype' => '0.49.0.0.0'),
-    89 => array('eventtype' => '0.53.0.0.0'),
-    90 => array('eventtype' => '0.28.0.0.0'),
-    91 => array('eventtype' => '0.7.0.0.0'),
-    92 => array('eventtype' => '0.59.0.0.0'),
-    93 => array('eventtype' => '0.17.0.0.0'),
-    94 => array('umv' => 'umv.6','voorkinderen' => '1'),
-    95 => array('eventtype' => '0.50.4.0.0','voorkinderen' => '1'),
-    96 => array('eventtype' => '0.54.0.0.0','voorkinderen' => '1'),
-    97 => array('eventtype' => '0.55.0.0.0','voorkinderen' => '1'),
-    98 => array('eventtype' => '0.50.6.0.0','voorkinderen' => '1'),
-    99 => array('umv' => 'umv.1','voorkinderen' => '1'),
-    100 => array('eventtype' => '0.5.0.0.0','voorkinderen' => '1'),
-    101 => array('umv' => 'umv.2','voorkinderen' => '1'),
-    102 => array('umv' => 'umv.8','voorkinderen' => '1'),
-    103 => array('umv' => 'umv.4','voorkinderen' => '1'),
-    104 => array('umv' => 'umv.5','voorkinderen' => '1'),
-    121 => array('eventtype' => '0.55.0.0.0','theme' => '1.4.0.0.0'),
-    122 => array('eventtype' => '0.55.0.0.0','theme' => '1.5.0.0.0'),
-    125 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.2.0.0'),
-    126 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.12.0.0'),
-    127 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.1.0.0'),
-    128 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.6.0.0 '),
-    129 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.8.0.0'),
-    130 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.3.0.0'),
-    131 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.13.0.0'),
-    132 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.10.0.0'),
-    133 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.4.0.0'),
-    134 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.7.0.0'),
-    135 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.11.0.0'),
-    136 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.14.0.0'),
-    137 => array('eventtype' => '0.3.2.0.0'),
-    138 => array('eventtype' => '0.3.2.0.0'),
-    139 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.13.0.0'),
-    140 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.3.0.0'),
-    141 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.6.0.0'),
-    142 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.11.0.0'),
-    143 => array('eventtype' => '0.19.0.0.0','theme' => '1.58.8.0.0'),
-    144 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.10.0.0'),
-    145 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.12.0.0'),
-    146 => array('eventtype' => '0.19.0.0.0','theme' => '1.51.14.0.0'),
-    147 => array('eventtype' => '0.56.0.0.0'),
-    148 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.5.0.0'),
-    149 => array('eventtype' => '0.0.0.0.0','theme' => '1.0.9.0.0'),
-    150 => array('eventtype' => '0.15.0.0.0'),
-    151 => array('eventtype' => '0.16.0.0.0'),
-    152 => array('eventtype' => '0.12.0.0.0'),
-    153 => array('eventtype' => '0.3.1.0.0','theme' => '1.42.0.0.0'),
-    154 => array('eventtype' => '0.3.1.0.0','theme' => '1.21.0.0.0'),
-    155 => array('eventtype' => '0.3.1.0.0','theme' => '1.37.0.0.0'),
-    156 => array('eventtype' => '0.3.1.0.0','theme' => '1.61.0.0.0'),
-    157 => array('eventtype' => '0.3.1.0.0','theme' => '1.43.0.0.0'),
-    158 => array('eventtype' => '0.3.1.0.0','theme' => '1.41.0.0.0'),
-    159 => array('eventtype' => '0.3.1.0.0','theme' => '1.37.1.0.0'),
-    160 => array('eventtype' => '0.3.1.0.0','theme' => '1.37.2.0.0'),
-    161 => array('eventtype' => '0.3.1.0.0','theme' => '1.44.0.0.0'),
-    162 => array('eventtype' => '0.3.1.0.0','theme' => '1.64.0.0.0'),
-    163 => array('eventtype' => '0.3.1.0.0','theme' => '1.25.0.0.0'),
-    164 => array('eventtype' => '0.3.1.0.0','theme' => '1.51.13.0.0'),
-    165 => array('eventtype' => '0.57.0.0.0'),
-    166 => array('eventtype' => '1.50.0.0.0'),
-    167 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.13.0.0'),
-    168 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.14.0.0'),
-    169 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.3.0.0'),
-    170 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.6.0.0'),
-    171 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.11.0.0'),
-    172 => array('eventtype' => '0.59.0.0.0','theme' => '1.58.8.0.0'),
-    173 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.10.0.0'),
-    174 => array('eventtype' => '0.59.0.0.0','theme' => '1.51.12.0.0'),
-    175 => array('umv' => 'umv.9','voorkinderen' => '1'),
-    176 => array('eventtype' => '0.100.0.0.0'),
-    177 => array('eventtype' => '0.100.2.0.0'),
-    178 => array('eventtype' => '0.100.1.0.0'),
-    179 => array('voorkinderen' => '1'),
-    205 => array('eventtype' => '0.50.6.0.0','theme' => '1.7.15.0.0'),
-    206 => array('eventtype' => '0.3.1.0.0','theme' => '1.65.0.0.0')
+    44 => array('category_eventtype_id' => '0.50.4.0.0'),
+    45 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.1.0.0'),
+    46 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.2.0.0'),
+    47 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.3.1.0'),
+    48 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.3.2.0'),
+    49 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.3.3.0'),
+    50 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.4.0.0'),
+    51 => array('category_eventtype_id' => '0.50.4.0.0','category_theme_id' => '1.8.3.5.0'),
+    52 => array('category_eventtype_id' => '0.54.0.0.0'),
+    53 => array('category_eventtype_id' => '0.54.0.0.0','category_theme_id' => '1.9.1.0.0'),
+    54 => array('category_eventtype_id' => '0.54.0.0.0','category_theme_id' => '1.9.2.0.0'),
+    55 => array('category_eventtype_id' => '0.54.0.0.0','category_theme_id' => '1.9.3.0.0'),
+    56 => array('category_eventtype_id' => '0.54.0.0.0','category_theme_id' => '1.9.5.0.0'),
+    57 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.3.1.0.0 '),
+    58 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.3.1.0.0 '),
+    59 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.3.10.0.0'),
+    60 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.4.0.0.0'),
+    61 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.3.5.0.0'),
+    62 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.5.0.0.0'),
+    63 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.3.4.0.0'),
+    64 => array('category_eventtype_id' => '0.50.6.0.0'),
+    65 => array('category_eventtype_id' => '0.3.2.0.0'),
+    66 => array('category_eventtype_id' => '0.5.0.0.0'),
+    67 => array('category_eventtype_id' => '0.5.0.0.0','category_theme_id' => '1.8.1.0.0'),
+    68 => array('category_eventtype_id' => '0.5.0.0.0','category_theme_id' => '1.3.1.0.0 '),
+    69 => array('category_eventtype_id' => '0.5.0.0.0','category_theme_id' => '1.9.1.0.0'),
+    70 => array('category_eventtype_id' => '0.5.0.0.0','category_theme_id' => '1.7.2.0.0'),
+    71 => array('category_eventtype_id' => '0.5.0.0.0','category_theme_id' => '1.10.0.0.0'),
+    73 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.13.0.0'),
+    74 => array('category_eventtype_id' => '0.0.0.0.0'),
+    75 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.1.0.0.0'),
+    76 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.0.2.0.0'),
+    77 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.0.1.0.0'),
+    78 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.0.3.0.0'),
+    79 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.2.1.0.0'),
+    80 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.2.2.0.0'),
+    81 => array('category_eventtype_id' => '0.14.0.0.0'),
+    82 => array('category_eventtype_id' => '0.15.0.0.0'),
+    83 => array('category_eventtype_id' => '0.6.0.0.0'),
+    84 => array('category_eventtype_id' => '0.37.0.0.0'),
+    85 => array('category_eventtype_id' => '0.3.1.0.0'),
+    86 => array('category_eventtype_id' => '0.50.21.0.0'),
+    87 => array('category_eventtype_id' => '0.49.0.0.0'),
+    89 => array('category_eventtype_id' => '0.53.0.0.0'),
+    90 => array('category_eventtype_id' => '0.28.0.0.0'),
+    91 => array('category_eventtype_id' => '0.7.0.0.0'),
+    92 => array('category_eventtype_id' => '0.59.0.0.0'),
+    93 => array('category_eventtype_id' => '0.17.0.0.0'),
+    94 => array('category_umv_id' => 'umv.6','voor_kinderen' => '1'),
+    95 => array('category_eventtype_id' => '0.50.4.0.0','voor_kinderen' => '1'),
+    96 => array('category_eventtype_id' => '0.54.0.0.0','voor_kinderen' => '1'),
+    97 => array('category_eventtype_id' => '0.55.0.0.0','voor_kinderen' => '1'),
+    98 => array('category_eventtype_id' => '0.50.6.0.0','voor_kinderen' => '1'),
+    99 => array('category_umv_id' => 'umv.1','voor_kinderen' => '1'),
+    100 => array('category_eventtype_id' => '0.5.0.0.0','voor_kinderen' => '1'),
+    101 => array('category_umv_id' => 'umv.2','voor_kinderen' => '1'),
+    102 => array('category_umv_id' => 'umv.8','voor_kinderen' => '1'),
+    103 => array('category_umv_id' => 'umv.4','voor_kinderen' => '1'),
+    104 => array('category_umv_id' => 'umv.5','voor_kinderen' => '1'),
+    121 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.4.0.0.0'),
+    122 => array('category_eventtype_id' => '0.55.0.0.0','category_theme_id' => '1.5.0.0.0'),
+    125 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.2.0.0'),
+    126 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.12.0.0'),
+    127 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.1.0.0'),
+    128 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.6.0.0 '),
+    129 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.8.0.0'),
+    130 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.3.0.0'),
+    131 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.13.0.0'),
+    132 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.10.0.0'),
+    133 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.4.0.0'),
+    134 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.7.0.0'),
+    135 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.11.0.0'),
+    136 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.14.0.0'),
+    137 => array('category_eventtype_id' => '0.3.2.0.0'),
+    138 => array('category_eventtype_id' => '0.3.2.0.0'),
+    139 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.13.0.0'),
+    140 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.3.0.0'),
+    141 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.6.0.0'),
+    142 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.11.0.0'),
+    143 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.58.8.0.0'),
+    144 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.10.0.0'),
+    145 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.12.0.0'),
+    146 => array('category_eventtype_id' => '0.19.0.0.0','category_theme_id' => '1.51.14.0.0'),
+    147 => array('category_eventtype_id' => '0.56.0.0.0'),
+    148 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.0.5.0.0'),
+    149 => array('category_eventtype_id' => '0.0.0.0.0','category_theme_id' => '1.0.9.0.0'),
+    150 => array('category_eventtype_id' => '0.15.0.0.0'),
+    151 => array('category_eventtype_id' => '0.16.0.0.0'),
+    152 => array('category_eventtype_id' => '0.12.0.0.0'),
+    153 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.42.0.0.0'),
+    154 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.21.0.0.0'),
+    155 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.37.0.0.0'),
+    156 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.61.0.0.0'),
+    157 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.43.0.0.0'),
+    158 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.41.0.0.0'),
+    159 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.37.1.0.0'),
+    160 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.37.2.0.0'),
+    161 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.44.0.0.0'),
+    162 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.64.0.0.0'),
+    163 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.25.0.0.0'),
+    164 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.51.13.0.0'),
+    165 => array('category_eventtype_id' => '0.57.0.0.0'),
+    166 => array('category_eventtype_id' => '1.50.0.0.0'),
+    167 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.13.0.0'),
+    168 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.14.0.0'),
+    169 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.3.0.0'),
+    170 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.6.0.0'),
+    171 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.11.0.0'),
+    172 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.58.8.0.0'),
+    173 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.10.0.0'),
+    174 => array('category_eventtype_id' => '0.59.0.0.0','category_theme_id' => '1.51.12.0.0'),
+    175 => array('category_umv_id' => 'umv.9','voor_kinderen' => '1'),
+    176 => array('category_eventtype_id' => '0.100.0.0.0'),
+    177 => array('category_eventtype_id' => '0.100.2.0.0'),
+    178 => array('category_eventtype_id' => '0.100.1.0.0'),
+    179 => array('voor_kinderen' => '1'),
+    205 => array('category_eventtype_id' => '0.50.6.0.0','category_theme_id' => '1.7.15.0.0'),
+    206 => array('category_eventtype_id' => '0.3.1.0.0','category_theme_id' => '1.65.0.0.0')
   );
 
   return $mapping[$heading];

From b6c08046547027e245b2ea53af3c7775d4a3d958 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 22 Apr 2015 11:13:52 +0200
Subject: [PATCH 110/275] add default support for custom filter "voor-kinderen"

---
 culturefeed_search_ui/includes/helpers.inc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 62d6fc05..4a6b0953 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -235,9 +235,9 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     $mapping = culturefeed_search_ui_get_headings_mapping($_GET['heading']);
     
     // Voor kinderen is not a facet
-    if (isset($mapping['voorkinderen'])) {
+    if (isset($mapping['voor_kinderen'])) {
       $new_query['voor-kinderen'] = '1';
-      unset($mapping['voorkinderen']);
+      unset($mapping['voor_kinderen']);
     }
     foreach ($mapping as $category => $id) {
       $new_query['facet'][$category][0] = $id;
@@ -548,6 +548,12 @@ function culturefeed_search_ui_default_filter_options() {
       'query-string' => 'for-toddlers',
       'api-filter-query' => 'agefrom:(3 OR 4 OR 5)'
     ),
+    array(
+      'exposed' => TRUE,
+      'title' => 'Geschikt voor kinderen',
+      'query-string' => 'voor-kinderen',
+      'api-filter-query' => '(agefrom:[* TO 12] OR keywords:"ook voor kinderen")'
+    ),
   );
 }
 

From e9242a2e877b0e3690ad39b32fcd21ce07882470 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 22 Apr 2015 11:28:32 +0200
Subject: [PATCH 111/275] merge branch develop into MSS-135

---
 culturefeed_agenda/culturefeed_agenda.module  |  48 +-
 culturefeed_agenda/includes/blocks.inc        |  43 ++
 culturefeed_agenda/includes/helpers.inc       |   2 +
 ...ulturefeed-agenda-organiser-events.tpl.php |  15 +
 culturefeed_agenda/theme/theme.inc            |  38 +-
 .../form/date_control.inc                     |  10 +-
 .../culturefeed_date_control/form/hybrid.inc  |   4 +-
 .../form/opening_times.inc                    |   4 +-
 .../culturefeed_entry_ui.info                 |   2 +
 .../culturefeed_entry_ui.module               |  36 +-
 .../culturefeed_location_control.info         |   5 +
 .../culturefeed_location_control.module       | 113 +++
 .../form/asset.inc                            | 163 +++++
 .../form/custom.inc                           | 223 ++++++
 .../form/location_control.inc                 | 199 +++++
 .../includes/culturefeed_entry_ui.admin.inc   |  17 +-
 .../includes/culturefeed_entry_ui.pages.inc   | 395 ++--------
 .../form/culturefeed_entry_ui.location.inc    | 270 +++++++
 .../js/bootstrap_autocomplete_override.js     |  72 --
 .../js/culturefeed_entry_ui.js                | 388 ++++++----
 .../js/maxlength/jquery.maxlength-fr.js       |  12 +
 .../js/maxlength/jquery.maxlength.css         |  14 +
 .../js/maxlength/jquery.maxlength.js          | 230 ++++++
 .../js/maxlength/jquery.maxlength.min.js      |   6 +
 .../js/maxlength/jquery.plugin.js             | 344 +++++++++
 .../js/maxlength/jquery.plugin.min.js         |   4 +
 .../js/maxlength/maxlengthBasic.html          |  26 +
 .../translations/culturefeed_entry_ui.nl.po   | 682 +++++++++++-------
 .../culturefeed_entry_ui.views_default.inc    | 103 ++-
 ...iews_handler_field_cdb_item_operations.inc |  31 +-
 culturefeed_search/culturefeed_search.module  |  15 +-
 culturefeed_search/includes/helpers.inc       |  14 +-
 culturefeed_search/includes/pages.inc         |   8 +-
 .../DrupalCultureFeedSearchService_Cache.php  |   4 +-
 .../culturefeed_search_ui.module              |  71 +-
 culturefeed_search_ui/includes/blocks.inc     |  66 +-
 culturefeed_search_ui/includes/helpers.inc    |  24 +-
 .../lib/Drupal/CultureFeedSearchPage.php      |   1 +
 ...eed-search-block-filter-links-item.tpl.php |   6 +-
 ...turefeed-search-block-filter-links.tpl.php |   2 +-
 .../culturefeed_search_views.info             |   2 +
 .../views/culturefeed_search_views.views.inc  |  17 +
 ...culturefeed_search_views.views_default.inc |  17 +
 .../views_handler_field_cdb_item_category.inc |  68 ++
 .../views_handler_field_cdb_item_picture.inc  |  40 +-
 ...ndler_field_cdb_item_short_description.inc |  39 +-
 .../views_handler_field_cdb_item_title.inc    |  15 +-
 ...er_filter_culturefeed_search_daterange.inc | 164 ++++-
 ...handler_filter_culturefeed_search_tags.inc | 128 +++-
 ...handler_sort_culturefeed_search_weight.inc |  17 +
 .../views/views/upcoming.inc                  | 170 +++++
 culturefeed_ui/culturefeed_ui.module          |  20 +
 .../culturefeed_uitpas.blocks.inc             |   2 +-
 .../culturefeed_uitpas.theme.inc              |   8 +
 .../includes/event_details_advantages.inc     |  26 +-
 .../includes/profile_advantages.inc           |   4 +-
 .../includes/profile_promotions.inc           |  16 +-
 culturefeed_uitpas/includes/promotions.inc    |   4 +-
 ...ed-uitpas-event-details-advantages.tpl.php |   6 +
 lib/Drupal/DrupalCultureFeed_EntryApi.php     |  17 +
 60 files changed, 3453 insertions(+), 1037 deletions(-)
 create mode 100644 culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
 create mode 100644 culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
 create mode 100644 culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
 delete mode 100644 culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength.css
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.plugin.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/maxlengthBasic.html
 create mode 100644 culturefeed_search_views/views/culturefeed_search_views.views_default.inc
 create mode 100644 culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
 create mode 100644 culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
 create mode 100644 culturefeed_search_views/views/views/upcoming.inc
 create mode 100644 culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 1672d02a..7e9031e9 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -134,6 +134,13 @@ function culturefeed_agenda_theme() {
     'file' => 'theme.inc',
   );
 
+	$theme['culturefeed_agenda_organiser_events'] = array(
+		'variables' => array('items' => array(), 'organiser' => NULL),
+		'template' => 'culturefeed-agenda-organiser-events',
+		'path' => $path,
+		'file' => 'theme.inc',
+	);
+
   return $theme;
 
 }
@@ -384,6 +391,11 @@ function culturefeed_agenda_block_info() {
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
 
+	$blocks['agenda-organiser-events'] = array(
+		'info' => t('Culturefeed agenda: Organiser events'),
+		'cache' => DRUPAL_CACHE_PER_PAGE,
+	);
+
   return $blocks;
 
 }
@@ -420,22 +432,16 @@ function culturefeed_agenda_block_configure($delta) {
       '#default_value' => variable_get('agenda_related_activities_extra_query'),
       '#description' => t('Make sure this is a correct solr query. Example title:mytitle'),
     );
+    
+    // sort_direction is no longer a seperate field. Add it to the sort field if variable exists.
+    $sort_direction = variable_get('agenda_related_activities_sort_direction', '');
+    $default_sort = variable_get('agenda_related_activities_sort') . ' ' . $sort_direction;
 
     $form['agenda_related_activities_sort'] = array(
       '#title' => t('Sort field'),
       '#type' => 'textfield',
-      '#default_value' => variable_get('agenda_related_activities_sort'),
-      '#description' => t('Field to sort on. Example startdate'),
-    );
-
-    $form['agenda_related_activities_sort_direction'] = array(
-      '#title' => t('Sort direction'),
-      '#type' => 'select',
-      '#options' => array(
-        \CultuurNet\Search\Parameter\Sort::DIRECTION_ASC => t('Ascending'),
-        \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC => t('Descending'),
-      ),
-      '#default_value' => variable_get('agenda_related_activities_sort_direction', 'asc'),
+      '#default_value' => $default_sort,
+      '#description' => t('Field + direction to sort on. Example permanent asc, availableto asc, weight desc'),
     );
 
     $form['agenda_related_activities_total_items'] = array(
@@ -589,6 +595,14 @@ function culturefeed_agenda_block_configure($delta) {
     );
 
   }
+	elseif ($delta == 'agenda-organiser-events') {
+		$form['agenda_organiser_event_amount'] = array(
+			'#title' => t('Amount of results to show'),
+			'#type' => 'textfield',
+			'#default_value' => variable_get('agenda_organiser_event_amount', 10),
+			'#description' => t('Enter the number of results to show in the block.'),
+		);
+	}
 
   return $form;
 
@@ -605,7 +619,7 @@ function culturefeed_agenda_block_save($delta, $edit) {
     variable_set('agenda_related_activities_range', $edit['agenda_related_activities_range']);
     variable_set('agenda_related_activities_extra_query', $edit['agenda_related_activities_extra_query']);
     variable_set('agenda_related_activities_sort', $edit['agenda_related_activities_sort']);
-    variable_set('agenda_related_activities_sort_direction', $edit['agenda_related_activities_sort_direction']);
+    variable_set('agenda_related_activities_sort_direction', '');
     variable_set('agenda_related_activities_total_items', $edit['agenda_related_activities_total_items']);
 
   }
@@ -643,6 +657,11 @@ function culturefeed_agenda_block_save($delta, $edit) {
 
   }
 
+	elseif ($delta == 'agenda-organiser-events') {
+
+		variable_set('agenda_organiser_event_amount', $edit['agenda_organiser_event_amount']);
+	}
+
 }
 
 /**
@@ -673,6 +692,9 @@ function culturefeed_agenda_block_view($delta) {
 
     case  'agenda-event-types':
       return culturefeed_agenda_block_event_types();
+
+		case 'agenda-organiser-events':
+			return culturefeed_agenda_block_organiser_events();
   }
 
   return $block;
diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
index 2998879d..82b9cee1 100644
--- a/culturefeed_agenda/includes/blocks.inc
+++ b/culturefeed_agenda/includes/blocks.inc
@@ -263,6 +263,49 @@ function culturefeed_agenda_search_block_form_submit($form, &$form_state) {
 
 }
 
+function culturefeed_agenda_block_organiser_events() {
+	$item = culturefeed_agenda_get_active_object();
+	if (!$item || $item->getType() == 'actor') {
+		return;
+	}
+
+	$organiser_id = $item->getEntity()->getOrganiser()->getCdbid();
+	$amount = variable_get('agenda_organiser_event_amount', 10);
+
+	$parameters = array();
+	$parameters[] = new \CultuurNet\Search\Parameter\Query('organiser_cdbid:' . $organiser_id);
+	$parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event OR type:production');
+	$parameters[] = new \CultuurNet\Search\Parameter\Group();
+	$parameters[] = new \CultuurNet\Search\Parameter\Rows($amount);
+
+	try {
+
+		$result = culturefeed_get_search_service()->search($parameters);
+
+		if ($result->getTotalCount() == 0) {
+			return;
+		}
+
+	}
+	catch (Exception $e) {
+		watchdog_exception('culturefeed_agenda', $e);
+		return;
+	}
+
+	$content = array(
+		'#theme' => 'culturefeed_agenda_organiser_events',
+		'#organiser' => $item->getEntity()->getOrganiser(),
+		'#items' => $result->getItems(),
+	);
+
+	$block = array(
+		'subject' => '',
+		'content' => $content,
+	);
+
+	return $block;
+}
+
 /**
  * Show the upcoming program of current actor.
  */
diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index baca80a8..d6e3d5d5 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -600,6 +600,8 @@ function culturefeed_agenda_parse_timestamps($timestamps) {
       $timestamps_array[$current_timestamp] = array(
         'day' => date('D', strtotime($date)),
         'date' => date('d/m', strtotime($date)),
+				'year' => date('Y', strtotime($date)),
+				'countable_date' => date('Y-m-d', strtotime($date)),
       );
       if ($timestamp->getStartTime()) {
         $timestamps_array[$current_timestamp]['begintime'] = date('H:i', strtotime($timestamp->getStartTime()));
diff --git a/culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php
new file mode 100644
index 00000000..92df2ea3
--- /dev/null
+++ b/culturefeed_agenda/theme/culturefeed-agenda-organiser-events.tpl.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @file
+ * Actor program file.
+ */
+?>
+
+<?php if (!empty($items)): ?>
+	<ul>
+  <?php foreach ($items as $item): ?>
+  	<li><?php print $item ?></li>
+  <?php endforeach;?>
+	</ul>
+	<p><?php print t('More of ') . $organiser_link; ?></p>
+<?php endif; ?>
diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 2b89b4e5..ba38a67c 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -313,10 +313,12 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
 
   $keywords = $cdb_item->getKeywords();
   $variables['keywords'] = '';
-  if ($keywords) {
 
+  if ($keywords) {
+		$variables['raw_keywords'] = array();
     $linked_keywords = array();
     foreach ($keywords as $keyword) {
+			$variables['raw_keywords'][] = $keyword;
       $linked_keywords[] = l($keyword, 'agenda/search', array('query' => array('keyword' => urlencode($keyword))));
     }
 
@@ -973,3 +975,37 @@ function theme_culturefeed_agenda_search_block_field_settings($variables) {
   return theme('table', $table_variables);
 
 }
+
+/**
+ * Preprocess the agenda organiser events block.
+ */
+function culturefeed_agenda_preprocess_culturefeed_agenda_organiser_events(&$variables) {
+	$items = array();
+	foreach ($variables['items'] as $item) {
+		/*$items[] = theme('culturefeed_agenda_organiser_events_item', array(
+			'item' => $item,
+		));*/
+		$type = $item->getType();
+		if ($type == 'event') {
+			$type = 'e';
+		}
+		else if ($type == 'production') {
+			$type = 'p';
+		}
+
+		$event = $item->getEntity();
+		$event_detail = $event->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
+
+		$title = $event_detail->getTitle();
+		$cdbid = $event->getCdbid();
+
+		$items[] = '<a href="/agenda/' . $type . '/slug/' . $cdbid . '">' . $title . '</a>';
+	}
+	$variables['items'] = $items;
+
+	$organiser = $variables['organiser']->getLabel();
+	$organiser_id = $variables['organiser']->getCdbid();
+	$variables['organiser_link'] = '<a href="/agenda/a/' . $organiser . '/' . $organiser_id . '">' . $organiser . '</a>';
+
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc b/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
index 5676f49b..610948be 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
+++ b/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
@@ -45,7 +45,7 @@ function culturefeed_date_control_date_control_process(array $element, array &$f
     '#popup_date_format' => 'd-m-Y',
     '#popup_date_increment' => 1,
     '#select_time_format' => 'H:i',
-    '#select_time_increment' => 30,
+    '#select_time_increment' => 15,
     '#type' => 'culturefeed_date_control_hybrid',
   );
 
@@ -58,7 +58,7 @@ function culturefeed_date_control_date_control_process(array $element, array &$f
     '#popup_date_format' => 'd-m-Y',
     '#popup_date_increment' => 1,
     '#select_time_format' => 'H:i',
-    '#select_time_increment' => 30,
+    '#select_time_increment' => 15,
     '#type' => 'culturefeed_date_control_timestamps',
   );
 
@@ -171,7 +171,11 @@ function culturefeed_date_control_date_control_validate(array $element, array &$
       }
 
       // Timestamps.
-      if ($triggering_parent == 'add_date' || $triggering_parent == 'hour' || $triggering_parent == 'minute') {
+      if (
+        $triggering_parent == 'add_date' || $triggering_parent == 'hour' || $triggering_parent == 'minute' ||
+        ($triggering_parent == 'end_date' && isset($date_control['period']['start_date']) && isset($date_control['period']['end_date']) &&
+          $date_control['period']['start_date'] == $date_control['period']['end_date'])
+      ) {
 
         $type = 'timestamps';
         $date_control['timestamps']['stamps'] = array(
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc b/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
index d6a9e470..6d8bd78f 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
+++ b/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
@@ -88,7 +88,7 @@ function culturefeed_date_control_hybrid_process(array $element, array &$form_st
   $element['start_time'] = array(
     '#attributes' => array('class' => array('time-select-complete-minutes')),
     '#date_format' => 'H:i',
-    '#date_increment' => 30,
+    '#date_increment' => 15,
     '#default_value' => $time,
     '#title' => '',
     '#type' => 'date_select',
@@ -114,7 +114,7 @@ function culturefeed_date_control_hybrid_process(array $element, array &$form_st
     '#attributes' => array('class' => array('time-select-complete-minutes')),
     '#ajax' => $ajax_settings,
     '#date_format' => 'H:i',
-    '#date_increment' => 30,
+    '#date_increment' => 15,
     '#default_value' => '',
     '#title' => '',
     '#type' => 'date_select',
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc b/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
index 02715405..da4d707d 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
+++ b/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
@@ -56,14 +56,14 @@ function culturefeed_date_control_opening_times_process(array $element, array &$
     );
 
     $element['days'][$day][0]['open_from'] = array(
-      '#default_value' => isset($opening_times['days'][$day][0]['open_from']) ? $opening_times['days'][$day][0]['open_from'] : '',
+      '#default_value' => isset($opening_times['days'][$day]) && isset($opening_times['days'][$day][0]['open_from']) ? $opening_times['days'][$day][0]['open_from'] : '',
       '#description' => t('Format') . ': 12:00',
       '#size' => 12,
       '#type' => 'textfield',
     );
 
     $element['days'][$day][0]['open_till'] = array(
-      '#default_value' => isset($opening_times['days'][$day][0]['open_till']) ? $opening_times['days'][$day][0]['open_till'] : '',
+      '#default_value' => isset($opening_times['days'][$day]) && isset($opening_times['days'][$day][0]['open_till']) ? $opening_times['days'][$day][0]['open_till'] : '',
       '#description' => t('Format') . ': 12:00',
       '#size' => 12,
       '#type' => 'textfield',
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.info b/culturefeed_entry_ui/culturefeed_entry_ui.info
index 14b0a6a8..99ca5414 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.info
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.info
@@ -7,10 +7,12 @@ dependencies[] = culturefeed_search
 dependencies[] = culturefeed_search_views
 dependencies[] = culturefeed
 dependencies[] = culturefeed_date_control
+dependencies[] = culturefeed_location_control
 dependencies[] = file
 dependencies[] = date
 dependencies[] = date_api
 dependencies[] = date_popup
+dependencies[] = transliteration
 
 files[] = views/handlers/views_handler_field_cdb_item_operations.inc
 files[] = views/handlers/views_handler_area_cdb_item_create.inc
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 03d929b8..b9c90b8d 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -140,9 +140,12 @@ function culturefeed_entry_ui_menu_local_tasks_alter(&$data, $router_item, $root
   }
   
   $culturefeed_user = DrupalCultureFeed::getLoggedInUser();
+  if ($culturefeed_user) {
+    $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($culturefeed_user->id, $culturefeed_user->mbox, array('ids' => $event->getId()));
+  }
   
   // Add tab for editing the event.
-  if (user_access('edit culturefeed events') && ($event->getEntity()->getCreatedBy() == $culturefeed_user->mbox)) {
+  if (user_access('edit culturefeed events') && ($event->getEntity()->getCreatedBy() == $culturefeed_user->mbox || (isset($ubd_permission) && $ubd_permission[$event->getId()] == 'true'))) {
 
     $link = array(
       'href' => $path . '/edit',
@@ -235,12 +238,11 @@ function culturefeed_entry_ui_add_more_submit($form, &$form_state) {
       $form_state['#price_needed'] = TRUE;
       break;
     
-    case 'location_add_more':
-      $form_state['#location_needed'] = TRUE;
-      break;
-      
     case 'actor_add_more':
       $form_state['#actor_needed'] = TRUE;
+      if (isset($form_state['input']['organiser']['actor']['organiser_actor_label']) && $form_state['input']['organiser']['actor']['organiser_actor_label']) {
+        $form_state['#actor_label'] = $form_state['input']['organiser']['actor']['organiser_actor_label'];
+      }
       break;
       
     case 'performers_add_more':
@@ -270,40 +272,30 @@ function culturefeed_entry_ui_add_more_js($form, $form_state) {
 
   switch ($form_state['input']['_triggering_element_name']) {
 
-    case 'location[new][citywrapper][country_select]':
-      return $form['basic']['location']['new']['citywrapper'];
-
     case 'links_add_more':
       return $form['extra']['links'];
 
     case 'opening_times_add_more':
       return $form['basic']['period_or_permanent']['opening_times'];
-      
+
     case 'price_add_more':
       return $form['extra']['price']['extra'];
-      
+
     case 'ld_add_more':
       return $form['extra']['description']['ld'];
-    
-    case 'location_add_more':
-      //$form['basic']['location']['add_new_location']['#attributes'] = array('style' => array('display:none;'));
-      return $form['basic']['location'];
-      
+
     case 'actor_add_more':
       return $form['extra']['organiser'];
-    
+
     case 'performers_add_more':
       return $form['extra']['performers']['wrapper'];
-      
+
     case 'contacts_add_more':
       return $form['extra']['contacts']['wrapper'];
-    
+
     case 'languages_add_more':
       return $form['extra']['language']['wrapper'];
-      
-    case 'location[actor][location_actor_id]':
-      return $form['basic']['location']['actor'];
-      
+
     case 'organiser_actor_id':
       return $form['extra']['organiser']['actor'];
   }
diff --git a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
new file mode 100644
index 00000000..00612f51
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
@@ -0,0 +1,5 @@
+name = CultureFeed Entry UI Location control
+description = Form element to manage locations in the Entry UI.
+package = CultureFeed
+version = VERSION
+core = 7.x
diff --git a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
new file mode 100644
index 00000000..90cee499
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed location control module.
+ */
+
+require_once 'form/asset.inc';
+require_once 'form/custom.inc';
+require_once 'form/location_control.inc';
+
+/**
+ * Ajax callback for the location control element.
+ *
+ * @todo move to a more general module, culturefeed date control does the same.
+ */
+function culturefeed_location_control_ajax_callback() {
+
+  list($form, $form_state, $form_id, $form_build_id, $commands) = ajax_get_form();
+  drupal_process_form($form['#form_id'], $form, $form_state);
+  $parents = func_get_args();
+
+  $form = drupal_array_get_nested_value($form, $parents);
+  $output = drupal_render($form);
+  $result = array(
+    '#type' => 'ajax',
+    '#commands' => ajax_prepare_response($output),
+  );
+  return $result;
+
+}
+
+/**
+ * Checks if the triggering element is part of the element.
+ *
+ * @todo move to a more general module, culturefeed date control does the same.
+ *
+ * @param array $triggering_element
+ *   The triggering element.
+ * @param array $element
+ *   The element.
+ *
+ * @return bool
+ *   True or false.
+ */
+function culturefeed_location_control_check_trigger_element(array $triggering_element, array $element) {
+  return array_intersect($triggering_element['#parents'], $element['#parents']) == $element['#parents'];
+}
+
+/**
+ * Implements hook_element_info().
+ *
+ * This is a complex ajax driven form element.  Several new ajax buttons are
+ * added based on initial interaction or default value.  Most of the logic is
+ * taken from the core managed file field.
+ *
+ * - To ensure all buttons remain registered in the form, visibility is set
+ *   through access in a pre render function.
+ * - Element validation functions are used to set the data.
+ * - A custom ajax callback path to ensure the form is rerenderd.
+ *
+ * @see file_managed_file_pre_render()
+ * @see file_managed_file_value()
+ */
+function culturefeed_location_control_element_info() {
+
+  return array(
+    'culturefeed_location_control' => array(
+      '#element_validate' => array('culturefeed_location_control_location_control_validate'),
+      '#input' => TRUE,
+      '#pre_render' => array('culturefeed_location_control_location_control_pre_render'),
+      '#process' => array('culturefeed_location_control_location_control_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_location_control_location_control_value_callback',
+    ),
+    'culturefeed_location_control_asset' => array(
+      '#element_validate' => array('culturefeed_location_control_asset_validate'),
+      '#input' => TRUE,
+      '#process' => array('culturefeed_location_control_asset_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_location_control_asset_value_callback',
+    ),
+    'culturefeed_location_control_custom' => array(
+      '#element_validate' => array('culturefeed_location_control_custom_validate'),
+      '#input' => TRUE,
+      '#pre_render' => array('culturefeed_location_control_custom_pre_render'),
+      '#process' => array('culturefeed_location_control_custom_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_location_control_custom_value_callback',
+    ),
+  );
+
+}
+
+/**
+ * Implements hook_menu().
+ *
+ * @todo move to a more general module, culturefeed date control does the same.
+ */
+function culturefeed_location_control_menu() {
+
+  return array(
+    'culturefeed_elements/location/ajax' => array(
+      'title' => 'AHAH callback',
+      'page callback' => 'culturefeed_location_control_ajax_callback',
+      'delivery callback' => 'ajax_deliver',
+      'access callback' => TRUE,
+      'theme callback' => 'ajax_base_page_theme',
+      'type' => MENU_CALLBACK,
+    ),
+  );
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc b/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
new file mode 100644
index 00000000..8f4ff745
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed location control asset functions.
+ */
+
+/**
+ * Sets the culturefeed location control asset form elements.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_location_control_asset_process(array $element, array &$form_state, array $form) {
+
+  $element_id = $element['#id'];
+  $array_parents = $element['#array_parents'];
+
+  $element['#prefix'] = "<div id=\"" . $element_id . "-ajax-wrapper\">";
+  $element['#suffix'] = "</div>";
+
+  if (isset($element['#location_control'])) {
+    $element_id = $element['#location_control']['#id'];
+    $array_parents = $element['#location_control']['#array_parents'];
+  }
+
+  $asset = $element['#value'];
+
+  $ajax_settings = array(
+    'effect' => 'none',
+    'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+    'progress' => array('type' => 'throbber'),
+    'wrapper' => $element_id . '-ajax-wrapper',
+  );
+
+  $ajax_button = array(
+    '#access' => TRUE,
+    '#ajax' => $ajax_settings,
+    '#attributes' => array(
+      'class' => array('add-more-link btn-link'),
+    ),
+    '#limit_validation_errors' => array($element['#parents']),
+    '#submit' => array('culturefeed_location_control_location_control_submit'),
+    '#type' => 'submit',
+  );
+
+  $element['label'] = array(
+    '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions/all',
+    '#default_value' => isset($asset['label']) ? $asset['label'] : '',
+    '#required' => FALSE,
+    '#size' => 80,
+    '#title' => t('Location'),
+    '#type' => 'textfield',
+  );
+  if ($asset['id']) {
+    $element['label']['#attributes']['readonly'] = 'readonly';
+  }
+
+  // @see culturefeed_entry_ui.js.
+  $element['id'] = array(
+    '#attributes' => array(
+      'id' => 'location_actor_id',
+    ),
+    '#default_value' => isset($asset['id']) ? $asset['id'] : '',
+    '#type' => 'hidden',
+  );
+
+  $element['asset_remove'] = $ajax_button + array(
+    '#id' => 'location_asset_remove',
+    '#name' => 'asset_remove',
+    '#value' => t('Remove address'),
+  );
+  if (!$asset['id']) {
+    $element['asset_remove']['#attributes']['style'] = 'display: none;';
+  }
+
+  $element['new'] = $ajax_button + array(
+    '#id' => 'location_custom_add',
+    '#name' => 'new',
+    '#value' => t('Location not found, add location'),
+  );
+  $element['new']['#attributes']['style'] = 'display: none;';
+
+  return $element;
+
+}
+
+/**
+ * Validate and alter the culturefeed location control asset form values.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_asset_validate(array &$element, array &$form_state) {
+
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#parents']);
+  $asset = $element['#value'];
+
+  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+
+    switch ($triggering_parent) {
+
+      case 'asset_remove':
+
+        $asset['id'] = '';
+        $asset['label'] = '';
+
+    }
+
+    drupal_array_set_nested_value($form_state['input'], $element['#parents'], $asset);
+
+  }
+
+}
+
+/**
+ * Value callback for the culturefeed location control asset element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_location_control_asset_value_callback(array $element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array(
+      'id' => '',
+      'label' => '',
+    );
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+
+      $default_value = $element['#default_value'];
+      $value['id'] = $default_value['id'];
+      $value['label'] = $default_value['label'];
+
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc b/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
new file mode 100644
index 00000000..471649b4
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed location control custom functions.
+ */
+
+/**
+ * Pre renders the culturefeed location control custom.
+ *
+ * @param array $element
+ *   The element.
+ *
+ * @return array $element
+ *   The element.
+ */
+function culturefeed_location_control_custom_pre_render(array $element) {
+
+  $custom = $element['#value'];
+  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : variable_get('culturefeed_entry_ui_default_country');
+
+  if ($country == 'BE') {
+    $element['zip']['#access'] = FALSE;
+  }
+  else {
+    $element['number']['#access'] = FALSE;
+  }
+
+  return $element;
+
+}
+
+/**
+ * Sets the culturefeed location control custom form elements.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_location_control_custom_process(array $element, array &$form_state, array $form) {
+
+  $element_id = $element['#id'];
+  $array_parents = $element['#array_parents'];
+
+  $element['#prefix'] = "<div id=\"" . $element_id . "-ajax-wrapper\">";
+  $element['#suffix'] = "</div>";
+
+  $custom = $element['#value'];
+
+  $ajax_settings = array(
+    'effect' => 'none',
+    'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+    'progress' => array('type' => 'throbber'),
+    'wrapper' => $element_id . '-ajax-wrapper',
+  );
+
+  $country = isset($custom['country']) && $custom['country'] ? $custom['country'] : variable_get('culturefeed_entry_ui_default_country');
+
+  $element['title'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Location Title'),
+    '#default_value' => isset($custom['title']) ? $custom['title'] : '',
+    '#required' => FALSE,
+    '#size' => 80,
+  );
+
+  $element['country'] = array(
+    '#ajax' => $ajax_settings,
+    '#default_value' => $country,
+    '#required' => FALSE,
+    '#title' => t('Country'),
+    '#type' => 'select',
+    '#options' => country_get_list(),
+  );
+
+  $element['zip'] = array(
+    '#access' => TRUE,
+    '#attributes' => array(
+      'style' => array('margin-right:30px;'),
+    ),
+    '#default_value' => isset($custom['zip']) ? $custom['zip'] : '',
+    '#required' => FALSE,
+    '#size' => 10,
+    '#title' => t('ZIP Code'),
+    '#type' => 'textfield',
+  );
+
+  $element['city'] = array(
+    '#autocomplete_path' => ($country == 'BE') ? 'autocomplete/culturefeed/city-suggestion' : '',
+    '#default_value' => isset($custom['city']) ? $custom['city'] : '',
+    '#required' => FALSE,
+    '#size' => 60,
+    '#title' => t('City'),
+    '#type' => 'textfield',
+  );
+
+  $element['street'] = array(
+    '#default_value' => isset($custom['street']) ? $custom['street'] : '',
+    '#required' => FALSE,
+    '#size' => 60,
+    '#title' => ($country == 'BE') ? t('Street') : t('Street and House Number'),
+    '#type' => 'textfield',
+  );
+
+  $element['number'] = array(
+    '#access' => TRUE,
+    '#default_value' => isset($custom['number']) ? $custom['number'] : '',
+    '#required' => FALSE,
+    '#size' => 10,
+    '#title' => t('House Number'),
+    '#type' => 'textfield',
+  );
+
+  if (isset($element['#location_control'])) {
+    $element_id = $element['#location_control']['#id'];
+    $array_parents = $element['#location_control']['#array_parents'];
+  }
+
+  $element['custom_remove'] = array(
+    '#access' => TRUE,
+    '#ajax' => array(
+      'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+      'wrapper' => $element_id . '-ajax-wrapper',
+    ) + $ajax_settings,
+    '#attributes' => array('class' => array('add-more-link btn-link')),
+    '#limit_validation_errors' => array($element['#parents']),
+    '#name' => 'custom_remove',
+    '#submit' => array('culturefeed_location_control_location_control_submit'),
+    '#type' => 'submit',
+    '#value' => t('Remove address'),
+  );
+
+  return $element;
+
+}
+
+/**
+ * Validate and alter the culturefeed location control custom form values.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_custom_validate(array &$element, array &$form_state) {
+
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#parents']);
+  $custom = $element['#value'];
+
+  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+
+    switch ($triggering_parent) {
+
+      case 'custom_remove':
+
+        $custom['city'] = '';
+        $custom['country'] = '';
+        $custom['number'] = '';
+        $custom['street'] = '';
+        $custom['title'] = '';
+        $custom['zip'] = '';
+
+    }
+
+    drupal_array_set_nested_value($form_state['input'], $element['#parents'], $custom);
+
+  }
+
+}
+
+/**
+ * Value callback for the culturefeed location control custom element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_location_control_custom_value_callback(array $element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array(
+      'city' => '',
+      'country' => '',
+      'number' => '',
+      'street' => '',
+      'title' => '',
+      'zip' => '',
+    );
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+
+      $default_value = $element['#default_value'];
+      $value['city'] = $default_value['city'];
+      $value['country'] = $default_value['country'];
+      $value['number'] = $default_value['number'];
+      $value['street'] = $default_value['street'];
+      $value['title'] = $default_value['title'];
+      $value['zip'] = $default_value['zip'];
+
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc b/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
new file mode 100644
index 00000000..e212373d
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
@@ -0,0 +1,199 @@
+<?php
+
+/**
+ * @file
+ * Contains the functions for the culturefeed location control form element.
+ */
+
+/**
+ * Pre renders the culturefeed location control custom.
+ *
+ * @param array $element
+ *   The element.
+ *
+ * @return array $element
+ *   The element.
+ */
+function culturefeed_location_control_location_control_pre_render(array $element) {
+
+  $location_control = $element['#value'];
+
+  if ($location_control['location_control']['type'] == 'asset') {
+    $element['location_control']['custom']['#access'] = FALSE;
+  }
+  elseif ($location_control['location_control']['type'] == 'custom') {
+    $element['location_control']['asset']['#access'] = FALSE;
+  }
+
+  return $element;
+
+}
+
+/**
+ * Returns the culturefeed location control element.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_location_control_location_control_process(array $element, array &$form_state, array $form) {
+
+  $location_control = $element['#value']['location_control'];
+
+  $element['location_control'] = array(
+    '#attributes' => array(
+      'class' => array('clearfix'),
+      'id' => $element['#id'] . '-ajax-wrapper',
+    ),
+    '#type' => 'container',
+  );
+
+  // Type.
+  $element['location_control']['type'] = array(
+    '#type' => 'hidden',
+    '#value' => $location_control['type'],
+  );
+
+  // Asset.
+  $element['location_control']['asset'] = array(
+    '#access' => TRUE,
+    '#default_value' => isset($location_control['asset']) ? $location_control['asset'] : '',
+    '#location_control' => $element,
+    '#type' => 'culturefeed_location_control_asset',
+  );
+
+  // Custom.
+  $element['location_control']['custom'] = array(
+    '#access' => TRUE,
+    '#default_value' => isset($location_control['custom']) ? $location_control['custom'] : '',
+    '#location_control' => $element,
+    '#type' => 'culturefeed_location_control_custom',
+  );
+
+  return $element;
+
+}
+
+/**
+ * Submit handler for the ajax buttons.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_location_control_submit(array $form, array &$form_state) {
+
+  $form_state['rebuild'] = TRUE;
+
+}
+
+/**
+ * Validate and alter the culturefeed location control form values.
+ *
+ * This is where the element switching is set, based on values.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_location_control_location_control_validate(array $element, array &$form_state) {
+
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#parents']);
+
+  // Use form_state instead of element as individual sub elements have changes
+  // that won't be reflected in element.
+  $values = drupal_array_get_nested_value($form_state['input'], $element['#parents']);
+  $location_control = $values['location_control'];
+
+  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+
+    $type = $location_control['type'];
+
+    // Custom.
+    if ($triggering_parent == 'new') {
+
+      $type = 'custom';
+      if (isset($location_control['asset']['label']) && $location_control['asset']['label']) {
+        $location_control['custom']['title'] = $location_control['asset']['label'];
+      }
+
+    }
+
+    // Remove.
+    if ($triggering_parent == 'asset_remove' || $triggering_parent == 'custom_remove') {
+
+      $type = 'asset';
+
+    }
+
+    $location_control['type'] = $type;
+    $element['#parents'][] = 'location_control';
+
+    drupal_array_set_nested_value($form_state['input'], $element['#parents'], $location_control);
+  }
+
+}
+
+/**
+ * Value callback for the location control element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_location_control_location_control_value_callback(array &$element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array(
+      'location_control' => array(
+        'type' => 'asset',
+        'asset' => array(),
+        'custom' => array(),
+      ),
+    );
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+
+      $location_control = $value['location_control'];
+      $default_value = $element['#default_value'];
+
+      // Asset.
+      if ($default_value['asset']['id']) {
+        $location_control['asset'] = $default_value['asset'];
+        $location_control['type'] = 'asset';
+      }
+
+      // Custom.
+      if ($default_value['custom']['title']) {
+        $location_control['custom'] = $default_value['custom'];
+        $location_control['type'] = 'custom';
+      }
+
+      $value['location_control'] = $location_control;
+
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index 732a656b..be59a0ca 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -27,11 +27,26 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
 
   $form['culturefeed_entry_ui_custom_tags'] = array(
     '#type' => 'textarea',
-    '#title' => t('Custom tags'),
+    '#title' => t('Custom options on the /tags page'),
     '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
     '#description' => t('Custom tags specific for this site. Use a new line for each tag.'),
   );
 
+  $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Custom tags to push to entry API'),
+    '#default_value' => variable_get('culturefeed_entry_ui_custom_entry_api_tags'),
+    '#description' => t('Tags pushed under the hood to Entry API. Use a new line for each tag.'),
+  );
+
+  $form['culturefeed_entry_ui_default_country'] = array(
+    '#type' => 'select',
+    '#options' => country_get_list(),
+    '#title' => t('Default country'),
+    '#default_value' => variable_get('culturefeed_entry_ui_default_country') ? variable_get('culturefeed_entry_ui_default_country') : 'BE',
+    '#description' => t('Select the default country for the entry form.'),
+  );
+
   return system_settings_form($form);
 
 }
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index d12736c7..56443c73 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -7,7 +7,7 @@
 /**
  * Form callback: Create a new event, or edit an existing.
  */
-function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
+function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
 
   $form = array();
 
@@ -17,14 +17,6 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
   $category_defaults = array();
   $eventtype_default = '';
   $themetype_default = '';
-  $default_location_label = '';
-  $default_location_id = '';
-  $custom_location_title = '';
-  $custom_location_street = '';
-  $custom_location_number = '';
-  $custom_location_zip = '';
-  $custom_location_city = '';
-  $custom_location_country = '';
   $default_organiser_label = '';
   $default_organiser_id = '';
   $publication_date = '';
@@ -49,11 +41,6 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     $form_state['#themes_needed'] = '';
   }
 
-  if (!isset($form_state['#location_needed'])) {
-    $form_state['#location_needed'] = FALSE;
-  }
-  $form_state['#zip_needed'] = FALSE;
-
   // Language vars
   $nl_title = '';
   $nl_short_description = '';
@@ -96,25 +83,6 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
       }
     }
 
-    // Default location.
-    if ($location = $event->getLocation()) {
-      $address = $location->getAddress()->getPhysicalAddress();
-      if ($location->getCdbId()) {
-        $default_location_id = $location->getCdbId();
-        $default_location_label = $location->getLabel();
-        $form_state['#location_needed'] = FALSE;
-      }
-      else {
-        $form_state['#location_needed'] = TRUE;
-        $custom_location_title = $location->getLabel();
-        $custom_location_street = $address->getStreet();
-        $custom_location_number = $address->getHouseNumber();
-        $custom_location_zip = $address->getZip();
-        $custom_location_city = $address->getCity();
-        $custom_location_country = $address->getCountry();
-      }
-    }
-
     // Default organiser.
     if ($organiser = $event->getOrganiser()) {
       $default_organiser_label = $organiser->getLabel();
@@ -187,6 +155,8 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
       $default_long_description = $event_details->getLongDescription();
       $source_text = '/<p class="uiv-source">(.*)<\/p>/';
       $default_long_description = preg_replace($source_text, '', $default_long_description);
+      $allowed_tags = array('a', 'em', 'strong', 'ul', 'ol', 'li', 'hr');
+      $default_long_description = filter_xss($default_long_description, $allowed_tags);
       //$default_long_description = substr($default_long_description, 0, -169);
       $form_state['#ld_needed'] = TRUE;
     }
@@ -216,6 +186,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
             CultureFeed_Cdb_Data_File::MEDIA_TYPE_YOUTUBE,
             CultureFeed_Cdb_Data_File::MEDIA_TYPE_GOOGLEPLUS,
             CultureFeed_Cdb_Data_File::MEDIA_TYPE_TWITTER,
+            CultureFeed_Cdb_Data_File::MEDIA_TYPE_WEBSITE,
           )
         );
 
@@ -252,10 +223,12 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
       }
 
       try {
-        $default_image = system_retrieve_file('http:' . $main_image->getHLink(), 'public://uploads/' . $main_image->getFileName(), TRUE);
+        $default_image = system_retrieve_file('http:' . $main_image->getHLink(), 'public://uploads/', TRUE);
+
         if ($default_image) {
           file_usage_add($default_image, 'culturefeed_entry_ui', 'event', $default_image->fid);
           $default_image_hlink = $main_image->getHLink();
+          $default_copyright = $main_image->getCopyright();
         }
       } catch (Exception $e) {
         watchdog_exception('culturefeed_entry_ui', $e);
@@ -265,7 +238,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
 
     // Default price
     if ($info = $event_details->getPrice()) {
-      $default_price = $info->getValue();
+      $default_price = str_replace('.',',', $info->getValue());
       $default_free_price = 0;
       $default_price_description = $info->getDescription();
       if ($default_price == '0.00') {
@@ -354,10 +327,9 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     /*if ($info = $event->getAvailableFrom()) {
 	  $publication_date = $event->getAvailableFrom();
     }
-   */
+    */
   }
 
-  /**
   // Build the form.
 
   // Basic.
@@ -377,7 +349,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
   // Eventtypes
   $form['basic']['what'] = array(
     '#type' => 'container',
-    '#prefix' => '<div id="what-ajax-wrapper">',
+    '#prefix' => '<div id="what-ajax-wrapper" class="clearfix">',
     '#suffix' => '</div>'
   );
 
@@ -521,146 +493,9 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     );
   }
 
-  $form['basic']['location'] = array(
-    '#prefix' => '<div id="location-ajax-wrapper">',
-    '#suffix' => '</div>',
-    '#type' => 'container',
-    '#tree' => TRUE,
-  );
-
-  if (!$form_state['#location_needed']) {
-    $form['basic']['location']['actor'] = array(
-      '#tree' => TRUE,
-      '#type' => 'container',
-      '#prefix' => '<div id="known-location-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    $form['basic']['location']['actor']['location_actor_label'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Location'),
-      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions',
-      '#required' => FALSE,
-      '#default_value' => isset($default_location_label) ? $default_location_label : '',
-      '#size' => 80,
-    );
-
-    $form['basic']['location']['actor']['location_actor_id'] = array(
-      '#id' => 'location_actor_id',
-      '#type' => 'hidden',
-      '#default_value' => isset($default_location_id) ? $default_location_id : '',
-      '#ajax' => array(
-        'callback' => 'culturefeed_entry_ui_add_more_js',
-        'wrapper' => 'location-ajax-wrapper',
-        'event' => 'location_eventsearch',
-      ),
-      '#attributes' => array(
-        'id' => 'location_actor_id',
-      ),
-    );
-  }
-
-  $form['basic']['location']['new'] = array(
-    '#tree' => TRUE,
-    '#type' => 'container',
-    '#prefix' => '<div id="new-location-wrapper">',
-    '#suffix' => '</div>',
-  );
-
-  if (!$form_state['#location_needed']) {
-    $form['basic']['location']['new']['add_new_location'] = array(
-      '#type' => 'submit',
-      '#name' => 'location_add_more',
-      '#value' => t('Location not found, add location'),
-      '#attributes' => array(
-        'class' => array('add-more-link btn-link'),
-        'style' => array('display:none'),
-      ),
-      '#ajax' => array(
-        'callback' => 'culturefeed_entry_ui_add_more_js',
-        'wrapper' => 'location-ajax-wrapper',
-        'effect' => 'none',
-      ),
-      '#limit_validation_errors' => array(array('location')),
-      '#submit' => array('culturefeed_entry_ui_add_more_submit'),
-    );
-  }
-
-  if ($form_state['#location_needed']) {
-
-    $country = isset($form_state['values']['location']['new']['citywrapper']['country_select']) && $form_state['values']['location']['new']['citywrapper']['country_select'] ? $form_state['values']['location']['new']['citywrapper']['country_select'] : ($custom_location_country ? $custom_location_country : 'BE');
-
-    $form['basic']['location']['new']['location_title'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Location Title'),
-      '#default_value' => $custom_location_title ? $custom_location_title : '',
-      '#required' => FALSE,
-      '#size' => 80,
-    );
-
-    $form['basic']['location']['new']['citywrapper'] = array(
-      '#tree' => TRUE,
-      '#type' => 'container',
-      '#prefix' => '<div id="citywrapper-ajax-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    $form['basic']['location']['new']['citywrapper']['country_select'] = array(
-      '#type' => 'select',
-      '#title' => t('Country'),
-      '#options' => country_get_list(),
-      '#default_value' => $custom_location_country ? $custom_location_country : 'BE',
-      '#required' => FALSE,
-      '#ajax' => array(
-        'callback' => 'culturefeed_entry_ui_add_more_js',
-        'wrapper' => 'citywrapper-ajax-wrapper',
-        'effect' => 'none',
-      ),
-    );
-
-    $form['basic']['location']['new']['citywrapper']['zip_code'] = array(
-      '#type' => 'textfield',
-      '#title' => ($country == 'BE') ? '' : t('ZIP Code'),
-      '#default_value' => $custom_location_zip ? $custom_location_zip : '',
-      '#required' => FALSE,
-      '#size' => 10,
-      '#attributes' => array(
-        'style' => array(
-          ($country == 'BE') ? 'display:none;' : 'display:block;margin-right:30px;',
-        ),
-      ),
-    );
-
-    $form['basic']['location']['new']['citywrapper']['city'] = array(
-      '#type' => 'textfield',
-      '#title' => t('City'),
-      '#default_value' => $custom_location_city ? $custom_location_city : '',
-      '#autocomplete_path' => ($country == 'BE') ? 'autocomplete/culturefeed/city-suggestion' : '',
-      '#required' => FALSE,
-      '#size' => 60,
-    );
-
-    $form['basic']['location']['new']['citywrapper']['street'] = array(
-      '#type' => 'textfield',
-      '#title' => ($country == 'BE') ? t('Street') : t('Street and House Number'),
-      '#default_value' => $custom_location_street ? $custom_location_street : '',
-      '#required' => FALSE,
-      '#size' => 60,
-    );
-
-    $form['basic']['location']['new']['citywrapper']['house_number'] = array(
-      '#type' => 'textfield',
-      '#title' => ($country == 'BE') ? t('House Number') : '',
-      '#default_value' => $custom_location_number ? $custom_location_number : '',
-      '#required' => FALSE,
-      '#size' => 10,
-      '#attributes' => array(
-        'style' => array(
-          ($country == 'BE') ? 'display:block;' : 'display:none;',
-        ),
-      ),
-    );
-  }
+  // Location control.
+  form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/form/culturefeed_entry_ui.location');
+  culturefeed_entry_ui_location_form($form, $form_state, $event);
 
   // Date control
   $form['basic']['when'] = array(
@@ -704,6 +539,8 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     '#type' => 'textarea',
     '#title' => t('Short description'),
     '#rows' => 4,
+    '#maxlength' => 400,
+    '#description' => t('Maximum 400 characters'),
     '#default_value' => $default_short_description,
     '#element_validate' => array('culturefeed_entry_ui_validate_textarea_markup'),
   );
@@ -743,7 +580,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     );
   }
 
-  // Tags todo
+  // Tags
   $form['extra']['keywords'] = array(
     '#type' => 'textfield',
     '#title' => t('Tags'),
@@ -760,12 +597,12 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     '#title' => t('Links'),
   );
 
-  /*if ($default_links) {
+  if ($default_links) {
     $links_count = count($default_links);
   }
-  else {*/
-  $links_count = 0;
-  //}
+  else {
+    $links_count = 0;
+  }
   // Add link type selections.
   if ($default_links) {
     foreach ($default_links as $i => $info) {
@@ -835,6 +672,14 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     );
   }
 
+  // Copyright
+  $form['extra']['photo']['copyright_text'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Copyright'),
+    '#description' => t('Name of the copyright owner of this image.'),
+    '#default_value' => isset($default_copyright) ? $default_copyright : '',
+    '#size' => 30,
+  );
   $form['extra']['photo']['copyright'] = array(
     '#type' => 'checkbox',
     '#default_value' => isset($default_image->fid) ? 1 : 0,
@@ -946,7 +791,7 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
     $form['extra']['organiser']['actor']['organiser_actor_label'] = array(
       '#type' => 'textfield',
       '#title' => t('Organizer'),
-      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions',
+      '#autocomplete_path' => 'autocomplete/culturefeed/actor-suggestions/all',
       '#required' => FALSE,
       '#default_value' => $default_organiser_label,
     );
@@ -984,9 +829,11 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
   );
 
   if (isset($form_state['#actor_needed'])) {
+    $default_actor = isset($form_state['#actor_label']) ? $form_state['#actor_label'] : '';
     $form['extra']['organiser']['new_actor'] = array(
       '#type' => 'textfield',
       '#title' => t('Name new organizer'),
+      '#default_value' => $default_actor,
     );
   }
 
@@ -1354,26 +1201,9 @@ function culturefeed_entry_ui_event_form($form, $form_state, $event = NULL) {
   );
 
   $form['#attached']['css'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/css/culturefeed_entry_ui.css';
-  global $theme;
-  if ($theme == 'culturefeed_bootstrap') {
-    // Ensure the javascript files are added after the bootstrap js files as
-    // these override the custom entury ui autocomplete js.
-    $form['#attached']['js'][] = array(
-      'data' => drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js',
-      'group' => JS_THEME,
-      'every_page' => FALSE,
-      'weight' => 5,
-    );
-    $form['#attached']['js'][] = array(
-      'data' => drupal_get_path('module', 'culturefeed_entry_ui') . '/js/bootstrap_autocomplete_override.js',
-      'group' => JS_THEME,
-      'every_page' => FALSE,
-      'weight' => 6,
-    );
-  }
-  else {
-    $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js';
-  }
+  $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js';
+  $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.plugin.js';
+  $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength.js';
   return $form;
 
 }
@@ -1438,7 +1268,7 @@ function culturefeed_entry_ui_attach_language_elements(&$form, $i, $info = NULL)
     '#type' => 'select',
     '#title' => t('Language'),
     '#options' => array(
-      0 => t(''),
+      0 => '',
       1 => t('Spoken'),
       2 => t('Dubbed'),
       3 => t('Subtitled'),
@@ -1450,7 +1280,7 @@ function culturefeed_entry_ui_attach_language_elements(&$form, $i, $info = NULL)
     '#type' => 'select',
     '#title' => t('in'),
     '#options' => array(
-      0 => t(''),
+      0 => '',
       1 => t('English'),
       //2 => t('Spanish'),
       3 => t('Dutch'),
@@ -1467,7 +1297,7 @@ function culturefeed_entry_ui_attach_language_elements(&$form, $i, $info = NULL)
  */
 function culturefeed_entry_ui_attach_contacts_elements(&$form, $i, $info = NULL) {
 
-  $options = array(0 => 'Phone', 1 => 'Email');
+  $options = array(0 => t('Phone'), 1 => t('E-mail'));
   $contact_type = 0;
 
   if ($info[0] == 'phone') {
@@ -1665,6 +1495,9 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
   if (!empty($values['photo']['upload']) && $values['photo']['copyright'] != 1) {
     form_set_error('photo', t('Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank.'));
   }
+  if (!empty($values['photo']['upload']) && empty($values['photo']['copyright_text'])) {
+    form_set_error('photo', t('Copyright field is required.'));
+  }
 
   // Validate categories
   if (empty($values['what'])) {
@@ -1672,70 +1505,20 @@ function culturefeed_entry_ui_event_save_validate($form, &$form_state) {
   }
 
   // Validate location
-  if (isset($form_state['#location_needed']) && $form_state['#location_needed']) {
-    if (empty($values['location']['new']['location_title'])) {
-      form_set_error('location_title', t('A title is required for a custom location'));
-    }
-    /*if ($values['location']['new']['citywrapper']['country_select'] != 'BE') {
-      if (empty($values['location']['new']['citywrapper']['zip_code'])) {
-        form_set_error('basic[zip_code]', t('A zip code is required for a custom location'));
-      }
-    }*/
-    if (empty($values['location']['new']['citywrapper']['city'])) {
-      form_set_error('city', t('A city is required for a custom location'));
-    }
-    $location = NULL;
-  }
-  else {
-    try {
-      if ($values['location']['actor']['location_actor_label'] == '') {
-        form_set_error('location', t('A location is required.'));
-      }
-      else {
-        $location = culturefeed_search_item_load($values['location']['actor']['location_actor_id'], 'actor');
-        if (!$location) {
-          form_set_error('location', t('We could not validate the location'));
-        }
-      }
-    } catch (Exception $e) {
-      form_set_error('location', t('We could not validate the location'));
-    }
-  }
-
-
-  /*if (!empty($values['location']['actor']['location_actor_id'])) {
-
-    try {
-      $location = culturefeed_search_item_load($values['location']['actor']['location_actor_id'], 'actor');
-      if (!$location) {
-        form_set_error('location', t('We could not validate the location'));
-      }
-    } catch (Exception $e) {
-      form_set_error('location', t('We could not validate the location'));
-    }
-  }
-  else {
-    if (empty($values['location']['location_title'])) {
-      form_set_error('location_title', t('A title is required for a custom location'));
-    }
-    if ($values['location']['citywrapper']['country'] != 'BE') {
-      if (empty($values['location']['citywrapper']['zip_code'])) {
-        form_set_error('basic[zip_code]', t('A zip code is required for a custom location'));
-      }
-    }
-    if (empty($values['location']['citywrapper']['city'])) {
-      form_set_error('city', t('A city is required for a custom location'));
-    }
-    $location = NULL;
-  }*/
+  $location = culturefeed_entry_ui_location_form_validate($form, $form_state);
 
   // Validate Links
+  $i = 0;
   foreach ($values['links'] as $link_data) {
     if (!empty($link_data['URL'])) {
+      if (!preg_match("@^https?://@", $link_data['URL'])) {
+        $link_data['URL'] = 'http://' . $link_data['URL'];
+      }
       if (!valid_url($link_data['URL'], TRUE)) {
-        form_set_error('links', t('Not a valid URL'));
+        form_set_error('links][' . $i . '][URL', t('Not a valid URL'));
       }
     }
+    $i++;
   }
 
   // Validate organiser.
@@ -1836,8 +1619,10 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
             array_push($phones, $phone);
             break;
           case '1':
-            $mail = new CultureFeed_Cdb_Data_Mail($extra['channel_input'], FALSE, FALSE);
-            array_push($mails, $mail);
+            if ($extra['channel_input']) {
+              $mail = new CultureFeed_Cdb_Data_Mail($extra['channel_input'], FALSE, FALSE);
+              array_push($mails, $mail);
+            }
             break;
         }
       }
@@ -2018,13 +1803,13 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
     // Save to Drupal
     $drupal_file = file_load($values['photo']['upload']);
     $drupal_file->status = FILE_STATUS_PERMANENT;
-
     file_save($drupal_file);
     file_usage_add($drupal_file, 'culturefeed_entry_ui', 'event', $drupal_file->fid);
 
     // Add to detail
     $file = new CultureFeed_Cdb_Data_File();
-    $file->setMediaType($file::MEDIA_TYPE_IMAGEWEB);
+    $file->setMediaType($file::MEDIA_TYPE_PHOTO);
+    $file->setCopyright($values['photo']['copyright_text']);
     $file->setMain(TRUE);
     switch ($drupal_file->filemime) {
       case 'image/gif':
@@ -2069,7 +1854,7 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   }
   else {
     if (!empty($values['price']['amount'])) {
-      $price = new CultureFeed_Cdb_Data_Price(floatval($values['price']['amount']));
+      $price = new CultureFeed_Cdb_Data_Price(floatval(str_replace(',','.', $values['price']['amount'])));
       if (!empty($values['price']['extra']['extra_info'])) {
         $price->setDescription($values['price']['extra']['extra_info']);
       }
@@ -2169,56 +1954,8 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
 
   $event->setDetails($details);
 
-  // Asset Location / Address.
-  if ($location) {
-    $addresses = $location->getEntity()->getContactInfo()->getAddresses();
-
-    /* @var CultureFeed_Cdb_Data_Address $address */
-    $address = $addresses[0];
-    $location_detail = $location->getEntity()->getDetails()
-      ->getDetailByLanguage(culturefeed_search_get_preferred_language());
-    if (!$location_detail) {
-      $location_detail = $location->getEntity()->getDetails()
-        ->getDetailByLanguage("nl");
-    }
-
-    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
-    $cdb_location->setLabel($location_detail->getTitle());
-    $cdb_location->setCdbid($location->getEntity()->getCdbId());
-    $event->setLocation($cdb_location);
-  }
-  else {
-    $address = new CultureFeed_Cdb_Data_Address();
-    $physical_address = new CultureFeed_Cdb_Data_Address_PhysicalAddress();
-    $physical_address->setStreet($values['location']['new']['citywrapper']['street']);
-    if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
-      $physical_address->setHouseNumber($values['location']['new']['citywrapper']['house_number']);
-    }
-    else {
-      $physical_address->setHouseNumber('');
-    }
-    if ($values['location']['new']['citywrapper']['country_select'] == 'BE') {
-      $physical_address->setZip(substr($values['location']['new']['citywrapper']['city'], 0, 4));
-      $physical_address->setCity(substr($values['location']['new']['citywrapper']['city'], 5));
-    }
-    else {
-      $physical_address->setCity($values['location']['new']['citywrapper']['city']);
-      if(empty($values['location']['new']['citywrapper']['zip_code'])) {
-        $physical_address->setZip('0000');
-      }
-      else {
-        $physical_address->setZip($values['location']['new']['citywrapper']['zip_code']);
-      }
-    }
-    $physical_address->setCountry($values['location']['new']['citywrapper']['country_select']);
-    $address->setLabel($values['location']['new']['location_title']);
-    $address->setPhysicalAddress($physical_address);
-    $address->setLabel($values['location']['new']['location_title']);
-
-    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
-    $cdb_location->setLabel($values['location']['new']['location_title']);
-    $event->setLocation($cdb_location);
-  }
+  // Location.
+  $address = culturefeed_entry_ui_location_form_save($event, $location, $form_state);
 
   // Event organiser.
   if ($organiser) {
@@ -2259,14 +1996,20 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   $event->setContactInfo($contact_object);
 
   // Keywords.
+  $keywords_form = array();
+  $custom_entry_api_tags = array();
   if ($values['keywords']) {
-    $keywords = explode(';', $values['keywords']);
-    foreach ($keywords as $keyword) {
-      $event->addKeyword($keyword);
-    }
+    $keywords_form = explode(';', $values['keywords']);
+  }
+  if (variable_get('culturefeed_entry_ui_custom_entry_api_tags')) {
+    $custom_entry_api_tags = explode("\n", variable_get('culturefeed_entry_ui_custom_entry_api_tags'));
+  }
+  $keywords = array_map('trim',array_unique(array_merge($keywords_form,$custom_entry_api_tags)));
+  foreach ($keywords as $keyword) {
+    $event->addKeyword($keyword);
   }
 
-  // Members
+  // Members.
   if ($values['members']) {
     $event->setPrivate(TRUE);
   }
@@ -2281,10 +2024,12 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
     if ($update) {
       Drupalculturefeed_EntryApi::updateEvent($event);
       $form_state['#event_id'] = $event->getCdbId();
+      watchdog('culturefeed_entry_ui', 'Event %eventid updated.', array('%eventid' => $form_state['#event_id']));
       cache_clear_all('culturefeed:results:detail:event:' . $event->getCdbId(), 'cache_culturefeed_search');
     }
     else {
       $form_state['#event_id'] = Drupalculturefeed_EntryApi::createEvent($event);
+      watchdog('culturefeed_entry_ui', 'Event %eventid created.', array('%eventid' => $form_state['#event_id']));
     }
 
     $form_state['#update_event'] = $update;
@@ -2435,7 +2180,7 @@ function culturefeed_entry_ui_delete_event_form_submit($form, &$form_state) {
   try {
     Drupalculturefeed_EntryApi::deleteEvent($form_state['values']['id']);
     drupal_set_message(t('Event successfully deleted'));
-    $form_state['redirect'] = '<front>';
+    $form_state['redirect'] = 'agenda/edit';
   } catch (Exception $e) {
     watchdog_exception(WATCHDOG_ERROR, $e);
     drupal_set_message(t('An error occurred while deleting the event'), 'error');
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
new file mode 100644
index 00000000..474f3541
--- /dev/null
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
@@ -0,0 +1,270 @@
+<?php
+
+/**
+ * Contains culturefeed_entry_ui.location.inc.
+ */
+
+/**
+ * Adds the location form element.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The extended event.
+ */
+function culturefeed_entry_ui_location_form(array &$form, array &$form_state, \CultureFeed_Cdb_Item_Event $event = NULL) {
+
+  // Default values.
+  $default_location_id = '';
+  $default_location_label = '';
+  $custom_location_title = '';
+  $custom_location_street = '';
+  $custom_location_number = '';
+  $custom_location_zip = '';
+  $custom_location_city = '';
+  $custom_location_country = '';
+
+  if ($event) {
+
+    // Default location.
+    if ($location = $event->getLocation()) {
+
+      if ($location->getCdbId()) {
+        $default_location_id = $location->getCdbId();
+        $default_location_label = $location->getLabel();
+      }
+      else {
+
+        $address = $location->getAddress()->getPhysicalAddress();
+        $custom_location_title = $location->getLabel();
+        $custom_location_street = $address->getStreet();
+        $custom_location_number = $address->getHouseNumber();
+        $custom_location_zip = $address->getZip();
+        $custom_location_country = $address->getCountry();
+        if ($custom_location_country == 'BE') {
+          $custom_location_city = $custom_location_zip . ' ' . $address->getCity();
+        }
+        else {
+          $custom_location_city = $address->getCity();
+        }
+
+      }
+
+    }
+
+  }
+
+  // Form element.
+  $form['basic']['location'] = array(
+    '#type' => 'culturefeed_location_control',
+    '#default_value' => array(
+      'asset' => array(
+        'id' => $default_location_id,
+        'label' => $default_location_label,
+      ),
+      'custom' => array(
+        'city' => $custom_location_city,
+        'country' => $custom_location_country,
+        'number' => $custom_location_number,
+        'street' => $custom_location_street,
+        'title' => $custom_location_title,
+        'zip' => $custom_location_zip,
+      ),
+    ),
+  );
+
+}
+
+/**
+ * Validation handler for the location.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The location, NULL or \CultuurNet\Search\ActivityStatsExtendedEntity
+ */
+function culturefeed_entry_ui_location_form_validate(array $form, array &$form_state) {
+
+  $values = array(
+    'type' => '',
+    'asset' => array(),
+    'custom' => array(),
+  );
+
+  if (isset($form_state['values']['location']['location_control'])) {
+    $values = $form_state['values']['location']['location_control'];
+  }
+
+  $location = NULL;
+
+  // Custom.
+  if ($values['type'] == 'custom') {
+
+    
+    if (empty($values['custom']['title'])) {
+      form_set_error('location][location_control][custom][title', t('A title is required for a custom location'));
+    }
+     
+    if ($values['custom']['country'] != 'BE') {
+      if (empty($values['custom']['zip'])) {
+        form_set_error('location][location_control][custom][zip', t('A zip code is required for a custom location'));
+      }
+      
+      if (strlen($values['custom']['zip']) < 4 || strlen($values['custom']['zip']) > 15) {
+        form_set_error('location][location_control][custom][zip', t('A zip code has minimum 4 characters'));
+      }
+      
+      if (empty($values['custom']['city'])) {
+        form_set_error('location][location_control][custom][city', t('A city is required for a custom location'));
+      }
+      
+    }
+    
+    if ($values['custom']['country'] == 'BE') {
+  
+      $available_city = array_change_key_case(culturefeed_search_get_city_suggestions($values['custom']['city'], TRUE));
+      if (!isset($available_city[strtolower($values['custom']['city'])])) {
+        form_set_error('location][location_control][custom][city', t('A valid city is required for a custom location.'));
+      }
+      else {
+
+        // If an existing event is edited, the main city is not shown.
+        $available_cities = culturefeed_search_get_city_suggestions($values['custom']['city'], TRUE);
+        $cities = array();
+        $pattern = '/ \(.*?\)/';
+        foreach ($available_cities as $available_city) {
+          $cities[] = preg_replace($pattern, '', $available_city);
+        }
+        $city = preg_replace($pattern, '', $values['custom']['city']);
+        if (!in_array($city, $cities)) {
+          form_set_error('location][location_control][custom][city', t('Please select a city from the list.'));
+        }
+        
+      } 
+      
+    }
+
+  }
+
+  elseif ($values['type'] == 'asset') {
+
+    try {
+
+      if ($values['asset']['label'] == '') {
+        form_set_error('location', t('A location is required.'));
+      }
+      else {
+        $location = culturefeed_search_item_load($values['asset']['id'], 'actor');
+        if (!$location) {
+          form_set_error('location', t('We could not validate the location'));
+        }
+      }
+
+    }
+
+    catch (Exception $e) {
+      form_set_error('location', t('We could not validate the location'));
+    }
+
+  }
+
+  return $location;
+
+}
+
+/**
+ * Save handler for the location.
+ *
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The event.
+ * @param mixed $location
+ *   NULL or \CultuurNet\Search\ActivityStatsExtendedEntity.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return \CultureFeed_Cdb_Data_Address
+ *   The address.
+ */
+function culturefeed_entry_ui_location_form_save(\CultureFeed_Cdb_Item_Event &$event, $location, array $form_state) {
+
+  $values = array(
+    'type' => '',
+    'asset' => array(),
+    'custom' => array(),
+  );
+
+  if (isset($form_state['values']['location']['location_control'])) {
+    $values = $form_state['values']['location']['location_control'];
+  }
+
+  $address = NULL;
+
+  // Asset Location / Address.
+  if ($location) {
+
+    $addresses = $location->getEntity()->getContactInfo()->getAddresses();
+
+    /* @var CultureFeed_Cdb_Data_Address $address */
+    $address = $addresses[0];
+    $location_detail = $location->getEntity()->getDetails()
+      ->getDetailByLanguage(culturefeed_search_get_preferred_language());
+    if (!$location_detail) {
+      $location_detail = $location->getEntity()->getDetails()
+        ->getDetailByLanguage("nl");
+    }
+
+    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
+    $cdb_location->setLabel($location_detail->getTitle());
+    $cdb_location->setCdbid($location->getEntity()->getCdbId());
+    $event->setLocation($cdb_location);
+  }
+
+  else {
+
+    $address = new CultureFeed_Cdb_Data_Address();
+    $physical_address = new CultureFeed_Cdb_Data_Address_PhysicalAddress();
+
+    // Street and number.
+    $physical_address->setStreet($values['custom']['street']);
+    if ($values['custom']['country'] == 'BE') {
+      $physical_address->setHouseNumber($values['custom']['number']);
+    }
+    else {
+      $physical_address->setHouseNumber('');
+    }
+
+    // Zip and city.
+    if ($values['custom']['country'] == 'BE') {
+      $physical_address->setZip(substr($values['custom']['city'], 0, 4));
+      $physical_address->setCity(substr($values['custom']['city'], 5));
+    }
+    else {
+      $physical_address->setCity($values['custom']['city']);
+      if (empty($values['custom']['zip'])) {
+        $physical_address->setZip('0000');
+      }
+      else {
+        $physical_address->setZip($values['custom']['zip']);
+      }
+    }
+
+    // Country.
+    $physical_address->setCountry($values['custom']['country']);
+
+    $address->setLabel($values['custom']['title']);
+    $address->setPhysicalAddress($physical_address);
+
+    $cdb_location = new CultureFeed_Cdb_Data_Location($address);
+    $cdb_location->setLabel($values['custom']['title']);
+    $event->setLocation($cdb_location);
+
+  }
+
+  return $address;
+
+}
diff --git a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js b/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
deleted file mode 100644
index 000901db..00000000
--- a/culturefeed_entry_ui/js/bootstrap_autocomplete_override.js
+++ /dev/null
@@ -1,72 +0,0 @@
-
-(function ($) {
-/**
- * Fills the suggestion popup with any matches received.
- */
-    Drupal.jsAC.prototype.found = function (matches) {
-        // If no value in the textfield, do not show the popup.
-        if (!this.input.value.length) {
-            return false;
-        }
-
-        // Prepare matches.
-        var ul = $('<ul class="dropdown-menu"></ul>');
-        var ac = this;
-        ul.css({
-            display: 'block',
-            right: 0
-        });
-        for (key in matches) {
-
-            var value;
-            if (typeof(matches[key]) == "string") {
-                value = matches[key];
-                $('<li></li>')
-                    .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
-                    .mousedown(function () { ac.select(this); })
-                    .mouseover(function () { ac.highlight(this); })
-                    .mouseout(function () { ac.unhighlight(this); })
-                    .data('autocompleteValue', value)
-                    .appendTo(ul);
-            }
-            else if (typeof(matches[key]) == "object") {
-                value = matches[key].title;
-                $('<li></li>')
-                    .html($('<a href="#"></a>').html(value).click(function (e) { e.preventDefault(); }))
-                    .mousedown(function () { ac.select(this); })
-                    .mouseover(function () { ac.highlight(this); })
-                    .mouseout(function () { ac.unhighlight(this); })
-                    .data('autocompleteTitle', value)
-                    .data('autocompleteValue', matches[key].key)
-                    .appendTo(ul);
-            }
-        }
-
-        // Show popup with matches, if any.
-        if (this.popup) {
-            if (ul.children().length) {
-                $(this.popup).empty().append(ul).show();
-                $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                    $('#edit-organiser-add-new-actor').css({ display: 'none' });
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-                    $('#edit-location-new-add-new-location').css({ display: 'none' });
-                }
-            }
-            else {
-                $(this.popup).css({ visibility: 'hidden' });
-                this.hidePopup();
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                    $('#edit-organiser-add-new-actor').css({ display: 'block' });
-                    $('#organiser_actor_id').val('');
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-                    $('#edit-location-new-add-new-location').css({ display: 'block' });
-                    $('#location_actor_id').val('');
-                }
-            }
-        }
-    };
-
-})(jQuery);
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 34ccccc4..7637fe45 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -8,6 +8,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 (function ($) {
   
   Drupal.behaviors.price = {
+
     attach: function (context, settings) {
     
       $(window).bind('load', function() {
@@ -19,7 +20,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
           $('#edit-price-extra-extra-info').val('');
         }
         else {
-	      //$('#edit-price-amount').val('');
+          //$('#edit-price-amount').val('');
           $('#edit-price-amount').removeAttr('disabled');
           $('#edit-price-amount').css('color','#000');
           $('#edit-price-extra').css('display','block');  
@@ -27,7 +28,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
       });
       
       $('#edit-price-free').change(function () {
-	    if($("#edit-price-free").attr("checked")==true) {
+        if($("#edit-price-free").attr("checked")==true) {
           $('#edit-price-amount').val('0');
           $('#edit-price-amount').attr('disabled','disabled');
           $('#edit-price-amount').css('color','#ccc');
@@ -35,7 +36,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
           $('#edit-price-extra-extra-info').val('');
         }
         else {
-	      $('#edit-price-amount').val('');
+          $('#edit-price-amount').val('');
           $('#edit-price-amount').removeAttr('disabled');
           $('#edit-price-amount').css('color','#000');
           $('#edit-price-extra').css('display','block');  
@@ -43,162 +44,269 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
       });
       
       $('#edit-location-actor-location-actor-label').change(function() {
-        if($('#edit-location-actor-location-actor-label').val() == '') {
-	      $('#location_actor_id').val('');
+        if($("[name='location[location_control][asset][label]']").val() == '') {
+          $('#location_actor_id').val('');
         }
       });
       
       $('#edit-organiser-actor-organiser-actor-label').change(function() {
         if($('#edit-organiser-actor-organiser-actor-label').val() == '') {
-	      $('#organiser_actor_id').val('');
+          $('#organiser_actor_id').val('');
         }
       });
-      
-      $('.link-field').focusout(function() {
-        if($(this).val() != '') {
-          console.log(this);
-          if($(this).val().indexOf('http://') == -1 || $(this).val().indexOf('https://') == -1) {
-            if($(this).val().substring(0,7) != 'http://' && $(this).val().substring(0,8) != 'https://') {
-	          $(this).val('http://' + $(this).val());
-	        }
-	      }
-	    }
-      });
-	}
+
+    }
 
   };
 
-    /**
-     * Hides the autocomplete suggestions.
-     */
-    Drupal.jsAC.prototype.hidePopup = function (keycode) {
-
-        // Select item if the right key or mousebutton was pressed.
-        if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
-            if ($(this.selected).data('autocompleteTitle') != undefined) {
-
-                this.input.value = $(this.selected).data('autocompleteTitle');
-                
-                if (this.input.name == 'actor[location_actor_label]') {
-				  $('#location_actor_id').val($(this.selected).data('autocompleteValue'));
-				}
-		  
-				if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-				  $('#organiser_actor_id').val($(this.selected).data('autocompleteValue'));
-				}
-            }
-            else {
-                this.input.value = $(this.selected).data('autocompleteValue');
-            }
+  /**
+   * Maxlength
+   */
+  Drupal.behaviors.maxlength = {
 
-        }
+    attach: function (context, settings) {
+      $('#edit-description-sd-short-description').maxlength({
+        max: 400,
+        feedbackTarget: '#edit-description-sd .help-block, #edit-description-sd .description'
+      });
+    }
+
+  }
 
-        // Hide popup.
-        var popup = this.popup;
-        if (popup) {
-            this.popup = null;
-            $(popup).fadeOut('fast', function () {
-                $(popup).remove();
-            });
+  /**
+   * Fire the autocomplete on paste.
+   */
+  Drupal.behaviors.autocomplete_paste = {
+
+    attach: function () {
+      $('input.form-autocomplete, .form-autocomplete input.form-text').bind("input propertychange", function (event) {
+        $(this).trigger('keyup');
+      });
+    }
+
+  }
+
+  /**
+   * Hides the autocomplete suggestions.
+   */
+  Drupal.jsAC.prototype.hidePopup = function (keycode, op) {
+
+    // Select item if the right key or mousebutton was pressed.
+    if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
+
+      if ($(this.selected).data('autocompleteTitle') != undefined) {
+
+        this.input.value = $(this.selected).data('autocompleteTitle');
+
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_actor_id').val($(this.selected).data('autocompleteValue'));
+          $('#location_asset_remove').show();
+          $(this.input).attr('readonly', 'readonly');
         }
-        this.selected = false;
-        $(this.ariaLive).empty();
-    };
-
-    /**
-     * Fills the suggestion popup with any matches received.
-     */
-    Drupal.jsAC.prototype.found = function (matches) {
-        // If no value in the textfield, do not show the popup.
-        if (!this.input.value.length) {
-		    return false;
+
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#organiser_actor_id').val($(this.selected).data('autocompleteValue'));
         }
 
-        // Prepare matches.
-        var ul = $('<ul></ul>');
-        var ac = this;
-        for (key in matches) {
-            var row = matches[key];
-            if (typeof(row) == "string") {
-                $('<li></li>')
-                    .html($('<div></div>').html(matches[key]))
-                    .mousedown(function () {
-                        ac.select(this);
-                    })
-                    .mouseover(function () {
-                        ac.highlight(this);
-                    })
-                    .mouseout(function () {
-                        ac.unhighlight(this);
-                    })
-                    .data('autocompleteValue', key)
-                    .appendTo(ul);
-            }
-            else if (typeof(row) == "object") {
-                $('<li></li>')
-                    .html($('<div></div>').html(row.locationTitle))
-                    .mousedown(function () {
-                        ac.select(this);
-                    })
-                    .mouseover(function () {
-                        ac.highlight(this);
-                    })
-                    .mouseout(function () {
-                        ac.unhighlight(this);
-                    })
-                    .data('autocompleteTitle', row.title)
-                    //.data('autocompleteLocationTitle', 'TEST')
-                    .data('autocompleteValue', row.key)
-                    .appendTo(ul);
-            }
+      }
+
+      else {
+        this.input.value = $(this.selected).data('autocompleteValue');
+      }
+
+    }
+
+    // Hide popup.
+    var popup = this.popup;
+    if (popup) {
+
+      this.popup = null;
+      $(popup).fadeOut('fast', function () {
+        $(popup).remove();
+      });
+
+    }
+    this.selected = false;
+    $(this.ariaLive).empty();
+
+    // Workaround for bootstrap losing tabindex on autocomplete popup.
+    if ((!op || op != 'empty') && this.input.value) {
+
+      var inputs = $(this.input).closest('form').find(':input:visible');
+      var index = inputs.index($(this.input));
+      inputs.eq(index + 1).focus();
+
+    }
+
+  };
+
+  /**
+   * Fills the suggestion popup with any matches received.
+   */
+  Drupal.jsAC.prototype.found = function (matches) {
+
+    // If no value in the textfield, do not show the popup.
+    if (!this.input.value.length) {
+      return false;
+    }
+
+    // Prepare matches.
+    var ul = $('<ul></ul>');
+    var ac = this;
+    for (key in matches) {
+
+      var row = matches[key];
+
+      if (typeof(row) == "string") {
+
+        $('<li></li>')
+          .html($('<div></div>').html(matches[key]))
+          .mousedown(function () {
+            ac.select(this);
+          })
+          .mouseover(function () {
+            ac.highlight(this);
+          })
+          .mouseout(function () {
+            ac.unhighlight(this);
+          })
+          .data('autocompleteValue', key)
+          .appendTo(ul);
+
+      }
+
+      else if (typeof(row) == "object") {
+
+        $('<li></li>')
+          .html($('<div></div>').html(row.locationTitle))
+          .mousedown(function () {
+            ac.select(this);
+          })
+          .mouseover(function () {
+            ac.highlight(this);
+          })
+          .mouseout(function () {
+            ac.unhighlight(this);
+          })
+          .data('autocompleteTitle', row.title)
+          .data('autocompleteValue', row.key)
+          .appendTo(ul);
+
+      }
+
+    }
+
+    // Show popup with matches, if any.
+    if (this.popup) {
+
+      if (ul.children().length) {
+
+        $(this.popup).empty().append(ul).show();
+        $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
+
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#edit-organiser-add-new-actor').css({ display: 'none' });
         }
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_custom_add').hide();
+        }
+
+      }
+
+      else {
 
-        // Show popup with matches, if any.
-        if (this.popup) {
-            if (ul.children().length) {
-                $(this.popup).empty().append(ul).show();
-                $(this.ariaLive).html(Drupal.t('Autocomplete popup'));
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                  $('#edit-organiser-add-new-actor').css({ display: 'none' });
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-	              $('#edit-location-new-add-new-location').css({ display: 'none' });  
-                }
-            }
-            else {
-                $(this.popup).css({ visibility: 'hidden' });
-                this.hidePopup();
-                if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-                  $('#edit-organiser-add-new-actor').css({ display: 'block' });
-                  $('#organiser_actor_id').val('');
-                }
-                if (this.input.name == 'location[actor][location_actor_label]') {
-	              $('#edit-location-new-add-new-location').css({ display: 'block' });
-	              $('#location_actor_id').val('');  
-                }
-            }
+        $(this.popup).css({ visibility: 'hidden' });
+        this.hidePopup();
+
+        if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+          $('#edit-organiser-add-new-actor').css({ display: 'block' });
+          $('#organiser_actor_id').val('');
         }
-    };
-
-    /**
-     * Puts the currently highlighted suggestion into the autocomplete field.
-     */
-    Drupal.jsAC.prototype.select = function (node) {
-        if ($(node).data('autocompleteTitle') != undefined) {
-          this.input.value = $(node).data('autocompleteTitle');
-          
-          if (this.input.name == 'location[actor][location_actor_label]') {
-		    $('#location_actor_id').val($(node).data('autocompleteValue'));
-		  }
-		  
-		  if (this.input.name == 'organiser[actor][organiser_actor_label]') {
-		    $('#organiser_actor_id').val($(node).data('autocompleteValue'));
-		  }
-		  
+        if (this.input.name == 'location[location_control][asset][label]') {
+          $('#location_custom_add').show();
+          $('#location_actor_id').val('');
         }
-        else {
-            this.input.value = $(node).data('autocompleteValue');
+
+      }
+
+    }
+
+  };
+
+  /**
+   * Puts the currently highlighted suggestion into the autocomplete field.
+   */
+  Drupal.jsAC.prototype.select = function (node) {
+
+    if ($(node).data('autocompleteTitle') != undefined) {
+
+      this.input.value = $(node).data('autocompleteTitle');
+          
+      if (this.input.name == 'location[location_control][asset][label]') {
+        $('#location_actor_id').val($(node).data('autocompleteValue'));
+        $('#location_asset_remove').show();
+        $(this.input).attr('readonly', 'readonly');
+      }
+
+      if (this.input.name == 'organiser[actor][organiser_actor_label]') {
+        $('#organiser_actor_id').val($(node).data('autocompleteValue'));
+      }
+
+    }
+
+    else {
+      this.input.value = $(node).data('autocompleteValue');
+    }
+
+  };
+
+  /**
+   * Performs a cached and delayed search.
+   */
+  Drupal.ACDB.prototype.search = function (searchString) {
+    var db = this;
+    searchString = searchString.replace(/^\s+|\s+$/, '');
+    this.searchString = searchString;
+
+    // See if this string needs to be searched for anyway.
+    if (searchString.length <= 0 ||
+      searchString.charAt(searchString.length - 1) == ',') {
+      return;
+    }
+
+    // See if this key has been searched for before.
+    if (this.cache[searchString]) {
+      return this.owner.found(this.cache[searchString]);
+    }
+
+    // Initiate delayed search.
+    if (this.timer) {
+      clearTimeout(this.timer);
+    }
+    this.timer = setTimeout(function () {
+      db.owner.setStatus('begin');
+
+      // Ajax GET request for autocompletion. We use Drupal.encodePath instead of
+      // encodeURIComponent to allow autocomplete search terms to contain slashes.
+      $.ajax({
+        type: 'GET',
+        url: db.uri + '/' + Drupal.encodePath(searchString),
+        dataType: 'json',
+        success: function (matches) {
+          if (typeof matches.status == 'undefined' || matches.status != 0) {
+            db.cache[searchString] = matches;
+            // Verify if these are still the matches the user wants to see.
+            //if (db.searchString == searchString) {
+            db.owner.found(matches);
+            //}
+            db.owner.setStatus('found');
+          }
+        },
+        error: function (xmlhttp) {
+          alert(Drupal.ajaxError(xmlhttp, db.uri));
         }
-    };
+      });
+    }, this.delay);
+  };
 
 })(jQuery);
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js
new file mode 100644
index 00000000..e7cf26a3
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-fr.js
@@ -0,0 +1,12 @@
+/* http://keith-wood.name/maxlength.html
+   French initialisation for the jQuery Max Length extension
+   Written by Keith Wood (kbwood{at}iinet.com.au) April 2012. */
+(function($) { // hide the namespace
+
+$.maxlength.regionalOptions['fr'] = {
+	feedbackText: '{r} de caractères restants ({m} maximum)',
+	overflowText: '{o} de caractères trop ({m} maximum)'
+};
+$.maxlength.setDefaults($.maxlength.regionalOptions['fr']);
+
+})(jQuery);
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength.css b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.css
new file mode 100644
index 00000000..b4b3ed06
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.css
@@ -0,0 +1,14 @@
+/* Styles for Max Length plugin v2.0.0 */
+.maxlength-feedback {
+	margin-left: 0.5em;
+	font-size: 75%;
+}
+.maxlength-full {
+	background-color: #fee;
+}
+.maxlength-overflow {
+	background-color: #fcc;
+}
+.maxlength-disabled {
+	opacity: 0.5;
+}
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.js
new file mode 100644
index 00000000..71cd0da5
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.js
@@ -0,0 +1,230 @@
+/* http://keith-wood.name/maxlength.html
+   Textarea Max Length for jQuery v2.0.0.
+   Written by Keith Wood (kwood{at}iinet.com.au) May 2009.
+   Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
+   Please attribute the author if you use it. */
+
+(function($) { // hide the namespace
+
+	var pluginName = 'maxlength';
+
+	/** Create the maxlength plugin.
+		<p>Sets a textarea to limit the number of characters that may be entered.</p>
+		<p>Expects HTML like:</p>
+		<pre>&lt;textarea></textarea>
+		<p>Provide inline configuration like:</p>
+		<pre>&lt;textarea data-maxlength="name: 'value'">&lt;/textarea></pre>
+	 	@module MaxLength
+		@augments JQPlugin
+		@example $(selector).maxlength() */
+	$.JQPlugin.createPlugin({
+	
+		/** The name of the plugin. */
+		name: pluginName,
+			
+		/** Maxlength full callback.
+			Triggered when the text area is full or overflowing.
+			@callback fullCallback
+			@param overflowing {boolean} True if overflowing, false if not.
+			@example onFull: function(overflowing) {
+	$(this).addClass(overflowing ? 'overflow' : 'full');
+} */
+			
+		/** Default settings for the plugin.
+			@property [max=200] {number} Maximum length.
+			@property [truncate=true] {boolean} True to disallow further input, false to highlight only.
+			@property [showFeedback=true] {boolean} True to always show user feedback, 'active' for hover/focus only.
+			@property [feedbackTarget=null] {string|Element|jQuery|function} jQuery selector, element,
+				or jQuery object, or function for element to fill with feedback.
+			@property [onFull=null] {fullCallback} Callback when full or overflowing. */
+		defaultOptions: {
+			max: 200,
+			truncate: true,
+			showFeedback: true,
+			feedbackTarget: null,
+			onFull: null
+		},
+
+		/** Localisations for the plugin.
+			Entries are objects indexed by the language code ('' being the default US/English).
+			Each object has the following attributes.
+			@property [feedbackText='{r}&nbsp;characters&nbsp;remaining&nbsp;({m}&nbsp;maximum)'] {string}
+				Display text for feedback message, use {r} for remaining characters,
+				{c} for characters entered, {m} for maximum.
+			@property [overflowText='{o} characters too many ({m} maximum)'] {string}
+				Display text when past maximum, use substitutions above and {o} for characters past maximum. */
+		regionalOptions: { // Available regional settings, indexed by language/country code
+			'': { // Default regional settings - English/US
+				feedbackText: '{r} characters remaining ({m} maximum)',
+				overflowText: '{o} characters too many ({m} maximum)'
+			}
+		},
+		
+		/** Names of getter methods - those that can't be chained. */
+		_getters: ['curLength'],
+
+		_feedbackClass: pluginName + '-feedback', //Class name for the feedback section
+		_fullClass: pluginName + '-full', // Class name for indicating the textarea is full
+		_overflowClass: pluginName + '-overflow', // Class name for indicating the textarea is overflowing
+		_disabledClass: pluginName + '-disabled', // Class name for indicating the textarea is disabled
+
+		_instSettings: function(elem, options) {
+			return {feedbackTarget: $([])};
+		},
+
+		_postAttach: function(elem, inst) {
+			elem.on('keypress.' + inst.name, function(event) {
+					if (!inst.options.truncate) {
+						return true;
+					}
+					var ch = String.fromCharCode(
+						event.charCode == undefined ? event.keyCode : event.charCode);
+					return (event.ctrlKey || event.metaKey || ch == '\u0000' ||
+						$(this).val().length < inst.options.max);
+				}).
+				on('keyup.' + inst.name, function() { $.maxlength._checkLength(elem); });
+		},
+
+		_optionsChanged: function(elem, inst, options) {
+			$.extend(inst.options, options);
+			if (inst.feedbackTarget.length > 0) { // Remove old feedback element
+				if (inst.hadFeedbackTarget) {
+					inst.feedbackTarget.empty().val('').
+						removeClass(this._feedbackClass + ' ' + this._fullClass + ' ' + this._overflowClass);
+				}
+				else {
+					inst.feedbackTarget.remove();
+				}
+				inst.feedbackTarget = $([]);
+			}
+			if (inst.options.showFeedback) { // Add new feedback element
+				inst.hadFeedbackTarget = !!inst.options.feedbackTarget;
+				if ($.isFunction(inst.options.feedbackTarget)) {
+					inst.feedbackTarget = inst.options.feedbackTarget.apply(elem[0], []);
+				}
+				else if (inst.options.feedbackTarget) {
+					inst.feedbackTarget = $(inst.options.feedbackTarget);
+				}
+				else {
+					inst.feedbackTarget = $('<span></span>').insertAfter(elem);
+				}
+				inst.feedbackTarget.addClass(this._feedbackClass);
+			}
+			elem.off('mouseover.' + inst.name + ' focus.' + inst.name +
+				'mouseout.' + inst.name + ' blur.' + inst.name);
+			if (inst.options.showFeedback == 'active') { // Additional event handlers
+				elem.on('mouseover.' + inst.name, function() {
+						inst.feedbackTarget.css('visibility', 'visible');
+					}).on('mouseout.' + inst.name, function() {
+						if (!inst.focussed) {
+							inst.feedbackTarget.css('visibility', 'hidden');
+						}
+					}).on('focus.' + inst.name, function() {
+						inst.focussed = true;
+						inst.feedbackTarget.css('visibility', 'visible');
+					}).on('blur.' + inst.name, function() {
+						inst.focussed = false;
+						inst.feedbackTarget.css('visibility', 'hidden');
+					});
+				inst.feedbackTarget.css('visibility', 'hidden');
+			}
+			this._checkLength(elem);
+		},
+
+		/** Retrieve the counts of characters used and remaining.
+			@param elem {jQuery} The control to check.
+			@return {object} The current counts with attributes used and remaining.
+			@example var lengths = $(selector).maxlength('curLength'); */
+		curLength: function(elem) {
+			var inst = this._getInst(elem);
+			var value = elem.val();
+			var len = value.replace(/\r\n/g, '~~').replace(/\n/g, '~~').length;
+			return {used: len, remaining: inst.options.max - len};
+		},
+
+		/** Check the length of the text and notify accordingly.
+			@private
+			@param elem {jQuery} The control to check. */
+		_checkLength: function(elem) {
+			var inst = this._getInst(elem);
+			var value = elem.val();
+			var len = value.replace(/\r\n/g, '~~').replace(/\n/g, '~~').length;
+			elem.toggleClass(this._fullClass, len >= inst.options.max).
+			toggleClass(this._overflowClass, len > inst.options.max);
+			if (len > inst.options.max && inst.options.truncate) { // Truncation
+				var lines = elem.val().split(/\r\n|\n/);
+				value = '';
+				var i = 0;
+				while (value.length < inst.options.max && i < lines.length) {
+					value += lines[i].substring(0, inst.options.max - value.length) + '\r\n';
+					i++;
+				}
+				elem.val(value.substring(0, inst.options.max));
+				elem[0].scrollTop = elem[0].scrollHeight; // Scroll to bottom
+				len = inst.options.max;
+			}
+			inst.feedbackTarget.toggleClass(this._fullClass, len >= inst.options.max).
+				toggleClass(this._overflowClass, len > inst.options.max);
+			var feedback = (len > inst.options.max ? // Feedback
+				inst.options.overflowText : inst.options.feedbackText).
+					replace(/\{c\}/, len).replace(/\{m\}/, inst.options.max).
+					replace(/\{r\}/, inst.options.max - len).
+					replace(/\{o\}/, len - inst.options.max);
+			try {
+				inst.feedbackTarget.text(feedback);
+			}
+			catch(e) {
+				// Ignore
+			}
+			try {
+				inst.feedbackTarget.val(feedback);
+			}
+			catch(e) {
+				// Ignore
+			}
+			if (len >= inst.options.max && $.isFunction(inst.options.onFull)) {
+				inst.options.onFull.apply(elem, [len > inst.options.max]);
+			}
+		},
+
+		/** Enable the control.
+			@param elem {Element} The control to affect.
+			@example $(selector).maxlength('enable'); */
+		enable: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			var inst = this._getInst(elem);
+			elem.prop('disabled', false).removeClass(inst.name + '-disabled');
+			inst.feedbackTarget.removeClass(inst.name + '-disabled');
+		},
+
+		/** Disable the control.
+			@param elem {Element} The control to affect.
+			@example $(selector).maxlength('disable'); */
+		disable: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			var inst = this._getInst(elem);
+			elem.prop('disabled', true).addClass(inst.name + '-disabled');
+			inst.feedbackTarget.addClass(inst.name + '-disabled');
+		},
+
+		_preDestroy: function(elem, inst) {
+			if (inst.feedbackTarget.length > 0) {
+				if (inst.hadFeedbackTarget) {
+					inst.feedbackTarget.empty().val('').css('visibility', 'visible').
+						removeClass(this._feedbackClass + ' ' + this._fullClass + ' ' + this._overflowClass);
+				}
+				else {
+					inst.feedbackTarget.remove();
+				}
+			}
+			elem.removeClass(this._fullClass + ' ' + this._overflowClass).off('.' + inst.name);
+		}
+	});
+
+})(jQuery);
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js
new file mode 100644
index 00000000..584a87e6
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength.min.js
@@ -0,0 +1,6 @@
+/* http://keith-wood.name/maxlength.html
+   Textarea Max Length for jQuery v2.0.0.
+   Written by Keith Wood (kwood{at}iinet.com.au) May 2009.
+   Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
+   Please attribute the author if you use it. */
+(function($){var h='maxlength';$.JQPlugin.createPlugin({name:h,defaultOptions:{max:200,truncate:true,showFeedback:true,feedbackTarget:null,onFull:null},regionalOptions:{'':{feedbackText:'{r} characters remaining ({m} maximum)',overflowText:'{o} characters too many ({m} maximum)'}},_getters:['curLength'],_feedbackClass:h+'-feedback',_fullClass:h+'-full',_overflowClass:h+'-overflow',_disabledClass:h+'-disabled',_instSettings:function(a,b){return{feedbackTarget:$([])}},_postAttach:function(c,d){c.on('keypress.'+d.name,function(a){if(!d.options.truncate){return true}var b=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);return(a.ctrlKey||a.metaKey||b=='\u0000'||$(this).val().length<d.options.max)}).on('keyup.'+d.name,function(){$.maxlength._checkLength(c)})},_optionsChanged:function(a,b,c){$.extend(b.options,c);if(b.feedbackTarget.length>0){if(b.hadFeedbackTarget){b.feedbackTarget.empty().val('').removeClass(this._feedbackClass+' '+this._fullClass+' '+this._overflowClass)}else{b.feedbackTarget.remove()}b.feedbackTarget=$([])}if(b.options.showFeedback){b.hadFeedbackTarget=!!b.options.feedbackTarget;if($.isFunction(b.options.feedbackTarget)){b.feedbackTarget=b.options.feedbackTarget.apply(a[0],[])}else if(b.options.feedbackTarget){b.feedbackTarget=$(b.options.feedbackTarget)}else{b.feedbackTarget=$('<span></span>').insertAfter(a)}b.feedbackTarget.addClass(this._feedbackClass)}a.off('mouseover.'+b.name+' focus.'+b.name+'mouseout.'+b.name+' blur.'+b.name);if(b.options.showFeedback=='active'){a.on('mouseover.'+b.name,function(){b.feedbackTarget.css('visibility','visible')}).on('mouseout.'+b.name,function(){if(!b.focussed){b.feedbackTarget.css('visibility','hidden')}}).on('focus.'+b.name,function(){b.focussed=true;b.feedbackTarget.css('visibility','visible')}).on('blur.'+b.name,function(){b.focussed=false;b.feedbackTarget.css('visibility','hidden')});b.feedbackTarget.css('visibility','hidden')}this._checkLength(a)},curLength:function(a){var b=this._getInst(a);var c=a.val();var d=c.replace(/\r\n/g,'~~').replace(/\n/g,'~~').length;return{used:d,remaining:b.options.max-d}},_checkLength:function(a){var b=this._getInst(a);var c=a.val();var d=c.replace(/\r\n/g,'~~').replace(/\n/g,'~~').length;a.toggleClass(this._fullClass,d>=b.options.max).toggleClass(this._overflowClass,d>b.options.max);if(d>b.options.max&&b.options.truncate){var f=a.val().split(/\r\n|\n/);c='';var i=0;while(c.length<b.options.max&&i<f.length){c+=f[i].substring(0,b.options.max-c.length)+'\r\n';i++}a.val(c.substring(0,b.options.max));a[0].scrollTop=a[0].scrollHeight;d=b.options.max}b.feedbackTarget.toggleClass(this._fullClass,d>=b.options.max).toggleClass(this._overflowClass,d>b.options.max);var g=(d>b.options.max?b.options.overflowText:b.options.feedbackText).replace(/\{c\}/,d).replace(/\{m\}/,b.options.max).replace(/\{r\}/,b.options.max-d).replace(/\{o\}/,d-b.options.max);try{b.feedbackTarget.text(g)}catch(e){}try{b.feedbackTarget.val(g)}catch(e){}if(d>=b.options.max&&$.isFunction(b.options.onFull)){b.options.onFull.apply(a,[d>b.options.max])}},enable:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}var b=this._getInst(a);a.prop('disabled',false).removeClass(b.name+'-disabled');b.feedbackTarget.removeClass(b.name+'-disabled')},disable:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}var b=this._getInst(a);a.prop('disabled',true).addClass(b.name+'-disabled');b.feedbackTarget.addClass(b.name+'-disabled')},_preDestroy:function(a,b){if(b.feedbackTarget.length>0){if(b.hadFeedbackTarget){b.feedbackTarget.empty().val('').css('visibility','visible').removeClass(this._feedbackClass+' '+this._fullClass+' '+this._overflowClass)}else{b.feedbackTarget.remove()}}a.removeClass(this._fullClass+' '+this._overflowClass).off('.'+b.name)}})})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.plugin.js b/culturefeed_entry_ui/js/maxlength/jquery.plugin.js
new file mode 100644
index 00000000..71767a6b
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.plugin.js
@@ -0,0 +1,344 @@
+/* Simple JavaScript Inheritance
+ * By John Resig http://ejohn.org/
+ * MIT Licensed.
+ */
+// Inspired by base2 and Prototype
+(function(){
+	var initializing = false;
+
+	// The base JQClass implementation (does nothing)
+	window.JQClass = function(){};
+
+	// Collection of derived classes
+	JQClass.classes = {};
+ 
+	// Create a new JQClass that inherits from this class
+	JQClass.extend = function extender(prop) {
+		var base = this.prototype;
+
+		// Instantiate a base class (but only create the instance,
+		// don't run the init constructor)
+		initializing = true;
+		var prototype = new this();
+		initializing = false;
+
+		// Copy the properties over onto the new prototype
+		for (var name in prop) {
+			// Check if we're overwriting an existing function
+			prototype[name] = typeof prop[name] == 'function' &&
+				typeof base[name] == 'function' ?
+				(function(name, fn){
+					return function() {
+						var __super = this._super;
+
+						// Add a new ._super() method that is the same method
+						// but on the super-class
+						this._super = function(args) {
+							return base[name].apply(this, args || []);
+						};
+
+						var ret = fn.apply(this, arguments);				
+
+						// The method only need to be bound temporarily, so we
+						// remove it when we're done executing
+						this._super = __super;
+
+						return ret;
+					};
+				})(name, prop[name]) :
+				prop[name];
+		}
+
+		// The dummy class constructor
+		function JQClass() {
+			// All construction is actually done in the init method
+			if (!initializing && this._init) {
+				this._init.apply(this, arguments);
+			}
+		}
+
+		// Populate our constructed prototype object
+		JQClass.prototype = prototype;
+
+		// Enforce the constructor to be what we expect
+		JQClass.prototype.constructor = JQClass;
+
+		// And make this class extendable
+		JQClass.extend = extender;
+
+		return JQClass;
+	};
+})();
+
+(function($) { // Ensure $, encapsulate
+
+	/** Abstract base class for collection plugins v1.0.1.
+		Written by Keith Wood (kbwood{at}iinet.com.au) December 2013.
+		Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license.
+		@module $.JQPlugin
+		@abstract */
+	JQClass.classes.JQPlugin = JQClass.extend({
+
+		/** Name to identify this plugin.
+			@example name: 'tabs' */
+		name: 'plugin',
+
+		/** Default options for instances of this plugin (default: {}).
+			@example defaultOptions: {
+ 	selectedClass: 'selected',
+ 	triggers: 'click'
+ } */
+		defaultOptions: {},
+		
+		/** Options dependent on the locale.
+			Indexed by language and (optional) country code, with '' denoting the default language (English/US).
+			@example regionalOptions: {
+	'': {
+		greeting: 'Hi'
+	}
+ } */
+		regionalOptions: {},
+		
+		/** Names of getter methods - those that can't be chained (default: []).
+			@example _getters: ['activeTab'] */
+		_getters: [],
+
+		/** Retrieve a marker class for affected elements.
+			@private
+			@return {string} The marker class. */
+		_getMarker: function() {
+			return 'is-' + this.name;
+		},
+		
+		/** Initialise the plugin.
+			Create the jQuery bridge - plugin name <code>xyz</code>
+			produces <code>$.xyz</code> and <code>$.fn.xyz</code>. */
+		_init: function() {
+			// Apply default localisations
+			$.extend(this.defaultOptions, (this.regionalOptions && this.regionalOptions['']) || {});
+			// Camel-case the name
+			var jqName = camelCase(this.name);
+			// Expose jQuery singleton manager
+			$[jqName] = this;
+			// Expose jQuery collection plugin
+			$.fn[jqName] = function(options) {
+				var otherArgs = Array.prototype.slice.call(arguments, 1);
+				if ($[jqName]._isNotChained(options, otherArgs)) {
+					return $[jqName][options].apply($[jqName], [this[0]].concat(otherArgs));
+				}
+				return this.each(function() {
+					if (typeof options === 'string') {
+						if (options[0] === '_' || !$[jqName][options]) {
+							throw 'Unknown method: ' + options;
+						}
+						$[jqName][options].apply($[jqName], [this].concat(otherArgs));
+					}
+					else {
+						$[jqName]._attach(this, options);
+					}
+				});
+			};
+		},
+
+		/** Set default values for all subsequent instances.
+			@param options {object} The new default options.
+			@example $.plugin.setDefauls({name: value}) */
+		setDefaults: function(options) {
+			$.extend(this.defaultOptions, options || {});
+		},
+		
+		/** Determine whether a method is a getter and doesn't permit chaining.
+			@private
+			@param name {string} The method name.
+			@param otherArgs {any[]} Any other arguments for the method.
+			@return {boolean} True if this method is a getter, false otherwise. */
+		_isNotChained: function(name, otherArgs) {
+			if (name === 'option' && (otherArgs.length === 0 ||
+					(otherArgs.length === 1 && typeof otherArgs[0] === 'string'))) {
+				return true;
+			}
+			return $.inArray(name, this._getters) > -1;
+		},
+		
+		/** Initialise an element. Called internally only.
+			Adds an instance object as data named for the plugin.
+			@param elem {Element} The element to enhance.
+			@param options {object} Overriding settings. */
+		_attach: function(elem, options) {
+			elem = $(elem);
+			if (elem.hasClass(this._getMarker())) {
+				return;
+			}
+			elem.addClass(this._getMarker());
+			options = $.extend({}, this.defaultOptions, this._getMetadata(elem), options || {});
+			var inst = $.extend({name: this.name, elem: elem, options: options},
+				this._instSettings(elem, options));
+			elem.data(this.name, inst); // Save instance against element
+			this._postAttach(elem, inst);
+			this.option(elem, options);
+		},
+
+		/** Retrieve additional instance settings.
+			Override this in a sub-class to provide extra settings.
+			@param elem {jQuery} The current jQuery element.
+			@param options {object} The instance options.
+			@return {object} Any extra instance values.
+			@example _instSettings: function(elem, options) {
+ 	return {nav: elem.find(options.navSelector)};
+ } */
+		_instSettings: function(elem, options) {
+			return {};
+		},
+
+		/** Plugin specific post initialisation.
+			Override this in a sub-class to perform extra activities.
+			@param elem {jQuery} The current jQuery element.
+			@param inst {object} The instance settings.
+			@example _postAttach: function(elem, inst) {
+ 	elem.on('click.' + this.name, function() {
+ 		...
+ 	});
+ } */
+		_postAttach: function(elem, inst) {
+		},
+
+		/** Retrieve metadata configuration from the element.
+			Metadata is specified as an attribute:
+			<code>data-&lt;plugin name>="&lt;setting name>: '&lt;value>', ..."</code>.
+			Dates should be specified as strings in this format: 'new Date(y, m-1, d)'.
+			@private
+			@param elem {jQuery} The source element.
+			@return {object} The inline configuration or {}. */
+		_getMetadata: function(elem) {
+			try {
+				var data = elem.data(this.name.toLowerCase()) || '';
+				data = data.replace(/'/g, '"');
+				data = data.replace(/([a-zA-Z0-9]+):/g, function(match, group, i) { 
+					var count = data.substring(0, i).match(/"/g); // Handle embedded ':'
+					return (!count || count.length % 2 === 0 ? '"' + group + '":' : group + ':');
+				});
+				data = $.parseJSON('{' + data + '}');
+				for (var name in data) { // Convert dates
+					var value = data[name];
+					if (typeof value === 'string' && value.match(/^new Date\((.*)\)$/)) {
+						data[name] = eval(value);
+					}
+				}
+				return data;
+			}
+			catch (e) {
+				return {};
+			}
+		},
+
+		/** Retrieve the instance data for element.
+			@param elem {Element} The source element.
+			@return {object} The instance data or {}. */
+		_getInst: function(elem) {
+			return $(elem).data(this.name) || {};
+		},
+		
+		/** Retrieve or reconfigure the settings for a plugin.
+			@param elem {Element} The source element.
+			@param name {object|string} The collection of new option values or the name of a single option.
+			@param [value] {any} The value for a single named option.
+			@return {any|object} If retrieving a single value or all options.
+			@example $(selector).plugin('option', 'name', value)
+ $(selector).plugin('option', {name: value, ...})
+ var value = $(selector).plugin('option', 'name')
+ var options = $(selector).plugin('option') */
+		option: function(elem, name, value) {
+			elem = $(elem);
+			var inst = elem.data(this.name);
+			if  (!name || (typeof name === 'string' && value == null)) {
+				var options = (inst || {}).options;
+				return (options && name ? options[name] : options);
+			}
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			var options = name || {};
+			if (typeof name === 'string') {
+				options = {};
+				options[name] = value;
+			}
+			this._optionsChanged(elem, inst, options);
+			$.extend(inst.options, options);
+		},
+		
+		/** Plugin specific options processing.
+			Old value available in <code>inst.options[name]</code>, new value in <code>options[name]</code>.
+			Override this in a sub-class to perform extra activities.
+			@param elem {jQuery} The current jQuery element.
+			@param inst {object} The instance settings.
+			@param options {object} The new options.
+			@example _optionsChanged: function(elem, inst, options) {
+ 	if (options.name != inst.options.name) {
+ 		elem.removeClass(inst.options.name).addClass(options.name);
+ 	}
+ } */
+		_optionsChanged: function(elem, inst, options) {
+		},
+		
+		/** Remove all trace of the plugin.
+			Override <code>_preDestroy</code> for plugin-specific processing.
+			@param elem {Element} The source element.
+			@example $(selector).plugin('destroy') */
+		destroy: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
+				return;
+			}
+			this._preDestroy(elem, this._getInst(elem));
+			elem.removeData(this.name).removeClass(this._getMarker());
+		},
+
+		/** Plugin specific pre destruction.
+			Override this in a sub-class to perform extra activities and undo everything that was
+			done in the <code>_postAttach</code> or <code>_optionsChanged</code> functions.
+			@param elem {jQuery} The current jQuery element.
+			@param inst {object} The instance settings.
+			@example _preDestroy: function(elem, inst) {
+ 	elem.off('.' + this.name);
+ } */
+		_preDestroy: function(elem, inst) {
+		}
+	});
+	
+	/** Convert names from hyphenated to camel-case.
+		@private
+		@param value {string} The original hyphenated name.
+		@return {string} The camel-case version. */
+	function camelCase(name) {
+		return name.replace(/-([a-z])/g, function(match, group) {
+			return group.toUpperCase();
+		});
+	}
+	
+	/** Expose the plugin base.
+		@namespace "$.JQPlugin" */
+	$.JQPlugin = {
+	
+		/** Create a new collection plugin.
+			@memberof "$.JQPlugin"
+			@param [superClass='JQPlugin'] {string} The name of the parent class to inherit from.
+			@param overrides {object} The property/function overrides for the new class.
+			@example $.JQPlugin.createPlugin({
+ 	name: 'tabs',
+ 	defaultOptions: {selectedClass: 'selected'},
+ 	_initSettings: function(elem, options) { return {...}; },
+ 	_postAttach: function(elem, inst) { ... }
+ }); */
+		createPlugin: function(superClass, overrides) {
+			if (typeof superClass === 'object') {
+				overrides = superClass;
+				superClass = 'JQPlugin';
+			}
+			superClass = camelCase(superClass);
+			var className = camelCase(overrides.name);
+			JQClass.classes[className] = JQClass.classes[superClass].extend(overrides);
+			new JQClass.classes[className]();
+		}
+	};
+
+})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js b/culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js
new file mode 100644
index 00000000..2323e543
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.plugin.min.js
@@ -0,0 +1,4 @@
+/** Abstract base class for collection plugins v1.0.1.
+	Written by Keith Wood (kbwood{at}iinet.com.au) December 2013.
+	Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. */
+(function(){var j=false;window.JQClass=function(){};JQClass.classes={};JQClass.extend=function extender(f){var g=this.prototype;j=true;var h=new this();j=false;for(var i in f){h[i]=typeof f[i]=='function'&&typeof g[i]=='function'?(function(d,e){return function(){var b=this._super;this._super=function(a){return g[d].apply(this,a||[])};var c=e.apply(this,arguments);this._super=b;return c}})(i,f[i]):f[i]}function JQClass(){if(!j&&this._init){this._init.apply(this,arguments)}}JQClass.prototype=h;JQClass.prototype.constructor=JQClass;JQClass.extend=extender;return JQClass}})();(function($){JQClass.classes.JQPlugin=JQClass.extend({name:'plugin',defaultOptions:{},regionalOptions:{},_getters:[],_getMarker:function(){return'is-'+this.name},_init:function(){$.extend(this.defaultOptions,(this.regionalOptions&&this.regionalOptions[''])||{});var c=camelCase(this.name);$[c]=this;$.fn[c]=function(a){var b=Array.prototype.slice.call(arguments,1);if($[c]._isNotChained(a,b)){return $[c][a].apply($[c],[this[0]].concat(b))}return this.each(function(){if(typeof a==='string'){if(a[0]==='_'||!$[c][a]){throw'Unknown method: '+a;}$[c][a].apply($[c],[this].concat(b))}else{$[c]._attach(this,a)}})}},setDefaults:function(a){$.extend(this.defaultOptions,a||{})},_isNotChained:function(a,b){if(a==='option'&&(b.length===0||(b.length===1&&typeof b[0]==='string'))){return true}return $.inArray(a,this._getters)>-1},_attach:function(a,b){a=$(a);if(a.hasClass(this._getMarker())){return}a.addClass(this._getMarker());b=$.extend({},this.defaultOptions,this._getMetadata(a),b||{});var c=$.extend({name:this.name,elem:a,options:b},this._instSettings(a,b));a.data(this.name,c);this._postAttach(a,c);this.option(a,b)},_instSettings:function(a,b){return{}},_postAttach:function(a,b){},_getMetadata:function(d){try{var f=d.data(this.name.toLowerCase())||'';f=f.replace(/'/g,'"');f=f.replace(/([a-zA-Z0-9]+):/g,function(a,b,i){var c=f.substring(0,i).match(/"/g);return(!c||c.length%2===0?'"'+b+'":':b+':')});f=$.parseJSON('{'+f+'}');for(var g in f){var h=f[g];if(typeof h==='string'&&h.match(/^new Date\((.*)\)$/)){f[g]=eval(h)}}return f}catch(e){return{}}},_getInst:function(a){return $(a).data(this.name)||{}},option:function(a,b,c){a=$(a);var d=a.data(this.name);if(!b||(typeof b==='string'&&c==null)){var e=(d||{}).options;return(e&&b?e[b]:e)}if(!a.hasClass(this._getMarker())){return}var e=b||{};if(typeof b==='string'){e={};e[b]=c}this._optionsChanged(a,d,e);$.extend(d.options,e)},_optionsChanged:function(a,b,c){},destroy:function(a){a=$(a);if(!a.hasClass(this._getMarker())){return}this._preDestroy(a,this._getInst(a));a.removeData(this.name).removeClass(this._getMarker())},_preDestroy:function(a,b){}});function camelCase(c){return c.replace(/-([a-z])/g,function(a,b){return b.toUpperCase()})}$.JQPlugin={createPlugin:function(a,b){if(typeof a==='object'){b=a;a='JQPlugin'}a=camelCase(a);var c=camelCase(b.name);JQClass.classes[c]=JQClass.classes[a].extend(b);new JQClass.classes[c]()}}})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_entry_ui/js/maxlength/maxlengthBasic.html b/culturefeed_entry_ui/js/maxlength/maxlengthBasic.html
new file mode 100644
index 00000000..cef0ff94
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/maxlengthBasic.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+<title>jQuery Max Length Basics</title>
+<link rel="stylesheet" href="jquery.maxlength.css">
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+<script src="jquery.plugin.js"></script>
+<script src="jquery.maxlength.js"></script>
+<script>
+$(function() {
+	$('#maxLength').maxlength();
+});
+</script>
+</head>
+<body>
+<h1>jQuery Max Length Basics</h1>
+<p>This page demonstrates the very basics of the
+	<a href="http://keith-wood.name/maxlength.html">jQuery Max Length plugin</a>.
+	It contains the minimum requirements for using the plugin and
+	can be used as the basis for your own experimentation.</p>
+<p>For more detail see the <a href="http://keith-wood.name/maxlengthRef.html">documentation reference</a> page.</p>
+<p><span class="demoLabel">Default max length:</span>
+	<textarea id="maxLength" rows="5" cols="50"></textarea></p>
+</body>
+</html>
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index b50676bc..94583cf9 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -1,657 +1,815 @@
+# $Id$
+#
+# Dutch translation of Drupal (general)
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+# Generated from files:
+#  culturefeed_entry_ui.module: n/a
+#  views/culturefeed_entry_ui.views_default.inc: n/a
+#  includes/culturefeed_entry_ui.pages.inc: n/a
+#  views/handlers/views_handler_field_cdb_item_operations.inc: n/a
+#  views/handlers/views_handler_area_cdb_item_create.inc: n/a
+#  culturefeed_entry_ui.info: n/a
+#  culturefeed_date_control/culturefeed_date_control.info: n/a
+#  culturefeed_date_control/culturefeed_date_control.module: n/a
+#  culturefeed_date_control/form/date_control.inc: n/a
+#  culturefeed_date_control/form/hybrid.inc: n/a
+#  culturefeed_date_control/form/timestamps.inc: n/a
+#  culturefeed_date_control/form/opening_times.inc: n/a
+#  culturefeed_date_control/form/period.inc: n/a
+#  culturefeed_date_control/theme/theme.inc: n/a
+#  includes/culturefeed_entry_ui.admin.inc: n/a
+#  js/bootstrap_autocomplete_override.js: n/a
+#  js/culturefeed_entry_ui.js: n/a
+#  views/culturefeed_entry_ui.views.inc: n/a
+#
 msgid ""
 msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2015-02-10 12:25+0100\n"
+"PO-Revision-Date: 2015-02-10 15:54+0100\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: POEditor.com\n"
-"Project-Id-Version: CFK - translations\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Language: nl\n"
+"X-Generator: Poedit 1.7.4\n"
 
-#: 
+#: culturefeed_entry_ui.module:18
 msgid "Manage object tags"
 msgstr "Beheer object tags"
 
-#: 
+#: culturefeed_entry_ui.module:19
 msgid "Manage all the tags from the objects on culturefeed (events, actors, ...)."
 msgstr "Beheer alle tags van objecten op culture feed (activiteiten, actoren ...)."
 
-#: 
+#: culturefeed_entry_ui.module:22
 msgid "Manage custom tags"
 msgstr "Manage custom tags"
 
-#: 
+#: culturefeed_entry_ui.module:23
 msgid "Manage custom tags from the objects on culturefeed (events, actors, ...) managed on the admin section."
 msgstr ""
 
-#: 
+#: culturefeed_entry_ui.module:26
 msgid "Create events"
 msgstr "Events aanmaken"
 
-#: 
+#: culturefeed_entry_ui.module:27
 msgid "Create new events through the entity api."
 msgstr "Maak activiteiten aan via Entry API"
 
-#: 
+#: culturefeed_entry_ui.module:30 views/culturefeed_entry_ui.views_default.inc:131;171
 msgid "Edit events"
 msgstr "Events aanpassen"
 
-#: 
+#: culturefeed_entry_ui.module:31
 msgid "Edit events through the entity api."
 msgstr "Pas activiteiten aan via Entry API"
 
-#: 
+#: culturefeed_entry_ui.module:34
 msgid "Delete events"
 msgstr "Verwijder events"
 
-#: 
+#: culturefeed_entry_ui.module:35
 msgid "Delete events through the entity api."
 msgstr "Verwijder activiteiten via Entry API"
 
-#: 
+#: culturefeed_entry_ui.module:135;63 includes/culturefeed_entry_ui.pages.inc:761;2535 views/handlers/views_handler_field_cdb_item_operations.inc:54
 msgid "Tags"
 msgstr "Labels"
 
-#: 
+#: culturefeed_entry_ui.module:150 views/handlers/views_handler_field_cdb_item_operations.inc:27
 msgid "Edit"
 msgstr "Bewerken"
 
-#: 
+#: culturefeed_entry_ui.module:168
 msgid "View"
 msgstr "Weergeven"
 
-#: 
-msgid "ZIP Code"
-msgstr "Postcode"
+#: culturefeed_entry_ui.module:375 views/handlers/views_handler_area_cdb_item_create.inc:19
+msgid "Add event"
+msgstr "Voeg activiteit toe"
+
+#: culturefeed_entry_ui.module:401
+msgid "Some disallowed html tags will be removed in the %field_name field. The allowed tags are %allowed_tags"
+msgstr "Niet toegelaten html-tags zullen verwijderd worden in het veld %field_name. De toegelaten tags zijn %allowed_tags"
 
-#: 
+#: culturefeed_entry_ui.module:71
 msgid "New event"
 msgstr "Maak nieuwe activiteit aan"
 
-#: 
+#: culturefeed_entry_ui.module:79
 msgid "Edit event"
 msgstr "Pas activiteit aan"
 
-#: 
+#: culturefeed_entry_ui.module:87
 msgid "Delete event"
 msgstr "Verwijder activiteit"
 
-#: 
+#: culturefeed_entry_ui.module:95 culturefeed_entry_ui.info:0
 msgid "CultureFeed Entry UI"
 msgstr "CultureFeed Entry UI"
 
-#: 
+#: culturefeed_entry_ui.module:96
 msgid "All configurations to entry api for this site"
 msgstr ""
 
-#: 
+#: culturefeed_entry_ui.info:0
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
 msgstr "Meertalig invoerformulier om activiteiten aan te maken, aan te passen en verwijderen in UiTdatabank via Entry API"
 
-#: 
+#: culturefeed_entry_ui.info:0 culturefeed_date_control/culturefeed_date_control.info:0
 msgid "CultureFeed"
 msgstr "CultureFeed"
 
-#: 
-msgid "Preferred language"
-msgstr "Voorkeur taal"
-
-#: 
-msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
-msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
+#: culturefeed_date_control/culturefeed_date_control.module:253
+msgid "AHAH callback"
+msgstr "AHAH terugkoppeling"
 
-#: 
-msgid "Custom tags"
+#: culturefeed_date_control/culturefeed_date_control.info:0
+msgid "CultureFeed Entry UI Date control"
 msgstr ""
 
-#: 
-msgid "Custom tags specific for this site. Use a new line for each tag."
+#: culturefeed_date_control/culturefeed_date_control.info:0
+msgid "Form element to manage dates in the Entry UI."
 msgstr ""
 
-#: 
+#: culturefeed_date_control/form/date_control.inc:28 includes/culturefeed_entry_ui.pages.inc:677
+msgid "Dates"
+msgstr "Datums"
+
+#: culturefeed_date_control/form/date_control.inc:87 culturefeed_date_control/form/hybrid.inc:131
+msgid "Permanent"
+msgstr "Permanent"
+
+#: culturefeed_date_control/form/hybrid.inc:83;108 culturefeed_date_control/form/timestamps.inc:104
+msgid "Date"
+msgstr "Datum"
+
+#: culturefeed_date_control/form/hybrid.inc:98
+msgid "+ add end date or time"
+msgstr "+ voeg einddatum toe"
+
+#: culturefeed_date_control/form/hybrid.inc:124 culturefeed_date_control/form/timestamps.inc:143
+msgid "+ add date"
+msgstr "+ voeg datum toe"
+
+#: culturefeed_date_control/form/opening_times.inc:24
 msgid "mon"
 msgstr "ma"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:25
 msgid "tue"
 msgstr "di"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:26
 msgid "wed"
 msgstr "woe"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:27
 msgid "thu"
 msgstr "don"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:28
 msgid "fri"
 msgstr "vrij"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:29
 msgid "sat"
 msgstr "zat"
 
-#: 
+#: culturefeed_date_control/form/opening_times.inc:30
 msgid "sun"
 msgstr "zon"
 
-#: 
-msgid "Basic info"
-msgstr "Basisgegevens"
+#: culturefeed_date_control/form/opening_times.inc:36
+msgid "Yes"
+msgstr "Ja"
+
+#: culturefeed_date_control/form/opening_times.inc:36
+msgid "No"
+msgstr "Nee"
+
+#: culturefeed_date_control/form/opening_times.inc:37
+msgid "Open all day ?"
+msgstr "De hele dag geopend?"
+
+#: culturefeed_date_control/form/opening_times.inc:60;67
+msgid "Format"
+msgstr "Formaat"
+
+#: culturefeed_date_control/form/period.inc:82
+msgid "Start date"
+msgstr "Begindatum"
+
+#: culturefeed_date_control/form/period.inc:88
+msgid "+ add end date"
+msgstr "+ voeg einddatum toe"
+
+#: culturefeed_date_control/form/period.inc:99
+msgid "End date"
+msgstr "Einddatum"
+
+#: culturefeed_date_control/form/period.inc:106
+msgid "- remove end date"
+msgstr "- verwijder einddatum"
+
+#: culturefeed_date_control/form/timestamps.inc:92
+msgid "×"
+msgstr "x"
+
+#: culturefeed_date_control/form/timestamps.inc:131
+msgid "- remove end time"
+msgstr "- verwijder einduur"
 
-#: 
+#: culturefeed_date_control/form/timestamps.inc:136
+msgid "+ add end time"
+msgstr "+ voeg einduur toe"
+
+#: culturefeed_date_control/theme/theme.inc:64
+msgid "open"
+msgstr "open"
+
+#: culturefeed_date_control/theme/theme.inc:64
+msgid "from"
+msgstr "van"
+
+#: culturefeed_date_control/theme/theme.inc:64
+msgid "to"
+msgstr "tot"
+
+#: includes/culturefeed_entry_ui.admin.inc:21
+msgid "Preferred language"
+msgstr "Voorkeur taal"
+
+#: includes/culturefeed_entry_ui.admin.inc:23
+msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
+msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
+
+#: includes/culturefeed_entry_ui.admin.inc:30
+msgid "Custom options on the /tags page"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.admin.inc:32
+msgid "Custom tags specific for this site. Use a new line for each tag."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.admin.inc:37
+msgid "Custom tags to push to entry API"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.admin.inc:39
+msgid "Tags pushed under the hood to Entry API. Use a new line for each tag."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:380;1234;1265;1296;1327
 msgid "Event title"
 msgstr "Titel"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:428
 msgid "Concerts"
 msgstr "Concerten"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:449
 msgid "Dance"
 msgstr "Dansvoorstelling"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:470
 msgid "Film"
 msgstr "Film"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:494
 msgid "Theatre"
 msgstr "Theatervoorstelling"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:516
 msgid "Sport"
 msgstr "Sport"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:551
 msgid "Location"
 msgstr "Locatie"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:584
 msgid "Location not found, add location"
 msgstr "Locatie niet gevonden, voeg locatie toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:605
 msgid "Location Title"
 msgstr "Naam locatie"
 
-#: 
-msgid "Street"
-msgstr "Straat"
-
-#: 
-msgid "House Number"
-msgstr "Huisnummer"
-
-#: 
-msgid "City"
-msgstr "Stad of gemeente"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:620
 msgid "Country"
 msgstr "Land"
 
-#: 
-msgid "Dates"
-msgstr "Datums"
-
-#: 
-msgid "Permanent"
-msgstr "Permanent"
-
-#: 
-msgid "remove date"
-msgstr "datum verwijderen"
-
-#: 
-msgid "Date"
-msgstr "Begindatum"
-
-#: 
-msgid "+ add end date or time"
-msgstr "+ voeg einddatum toe"
-
-#: 
-msgid "End date"
-msgstr "Einddatum"
-
-#: 
-msgid "remove end date"
-msgstr "verwijder einddatum"
+#: includes/culturefeed_entry_ui.pages.inc:633
+msgid "ZIP Code"
+msgstr "Postcode"
 
-#: 
-msgid "+ add date"
-msgstr "+ voeg datum toe"
+#: includes/culturefeed_entry_ui.pages.inc:646
+msgid "City"
+msgstr "Stad of gemeente"
 
-#: 
-msgid "Open all day?"
-msgstr "Alle dagen open?"
+#: includes/culturefeed_entry_ui.pages.inc:655
+msgid "Street"
+msgstr "Straat"
 
-#: 
-msgid "Yes"
-msgstr "Ja"
+#: includes/culturefeed_entry_ui.pages.inc:655
+msgid "Street and House Number"
+msgstr "Straat en huisnummer"
 
-#: 
-msgid "No"
-msgstr "Nee"
+#: includes/culturefeed_entry_ui.pages.inc:663
+msgid "House Number"
+msgstr "Huisnummer"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:694
 msgid "Extra info"
 msgstr "Extra info"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:702;710;728
 msgid "Description"
 msgstr "Beschrijving"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:715;1240;1271;1302;1333
 msgid "Short description"
 msgstr "Korte omschrijving"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:718
+msgid "Maximum 400 characters"
+msgstr "Maximum 400 karakters"
+
+#: includes/culturefeed_entry_ui.pages.inc:736
 msgid "+ add long description"
 msgstr "+ voeg lange beschrijving toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:751;1247;1278;1309;1340
 msgid "Long description"
 msgstr "Lange beschrijving"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:762
 msgid "Add multiple tags seperated by a \";\""
 msgstr "Voeg meerdere trefwoorden toe, gescheiden met een \";\""
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:772
 msgid "Links"
 msgstr "Links"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:803
 msgid "+ add another link"
 msgstr "+ voeg een link toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:820
 msgid "Image"
 msgstr "Afbeelding"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:826
 msgid "Image upload"
 msgstr "Afbeelding opladen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:828
 msgid "Allowed extensions: gif png jpg jpeg"
 msgstr "Ondersteunde bestandsformaten: gif, png, jpg, jpeg"
 
-#: 
-msgid "I agree to the <a href="http://www.uitdatabank.be/uitportal/legal.aspx">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
-msgstr "Ik ga akkoord met de <a href="http://www.uitdatabank.be/uitportal/legal.aspx">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding te verspreiden."
+#: includes/culturefeed_entry_ui.pages.inc:853
+msgid "Copyright"
+msgstr "Copyright"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:854
+msgid "Name of the copyright owner of this image."
+msgstr "Naam van de copyright eigenaar van deze afbeelding"
+
+#: includes/culturefeed_entry_ui.pages.inc:861
+msgid "I agree to the <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
+msgstr ""
+"Ik ga akkoord met de <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding "
+"te verspreiden."
+
+#: includes/culturefeed_entry_ui.pages.inc:868;873;905
 msgid "Price"
 msgstr "Prijs"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:888
 msgid "Free event"
 msgstr "Gratis activiteit"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:912
 msgid "+ add conditions & discounts"
 msgstr "+ voeg voorwaarden en kortingen toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:939
 msgid "Price conditions & discounts"
 msgstr "Prijsvoorwaarden & kortingen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:968
 msgid "Organizer"
 msgstr "Organisator"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:992
 msgid "Organizer not found, add organizer"
 msgstr "Organisator niet gevonden, voeg organisator toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1009
 msgid "Name new organizer"
 msgstr "Naam nieuwe organisator"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1016
 msgid "Age"
 msgstr "Leeftijd"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1018
 msgid "For everyone"
 msgstr "Voor iedereen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1019
 msgid "For children (between 1 and 12 years)"
 msgstr "Voor kinderen (tussen 1 en 12 jaar)"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1020
 msgid "For youth (between 12 and 18 years)"
 msgstr "Voor jongeren (tussen 12 en 18 jaar)"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1021
 msgid "For adults (18+)"
 msgstr "Voor volwassenen (18+)"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1027
 msgid "Suitable for ages from"
 msgstr "Geschikt voor leeftijden vanaf"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1050
 msgid "Activities for children will get the 'Fly' label"
 msgstr "Activiteiten voor kinderen krijgen automatisch het 'Vlieg'-label"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1061;1507
 msgid "Contact"
-msgstr "Contactgegevens"
+msgstr "Contact"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1094
 msgid "+ add contact option"
 msgstr "+ voeg contactgegevens toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1108
 msgid "Performers"
 msgstr "Uitvoerders"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1143
 msgid "+ add another performer"
 msgstr "+ voeg nog een uitvoerder toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1157;1461
 msgid "Language"
 msgstr "Taal"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1190
 msgid "+ add more language info"
 msgstr "+ voeg meer taalinformatie toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1205
 msgid "Access"
 msgstr "Toegang"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1211
 msgid "Open for everyone"
 msgstr "Voor iedereen toegankelijk"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1211
 msgid "Only for members"
 msgstr "Enkel voor leden"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1218
 msgid "Translations"
 msgstr "Vertalingen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1226;1478
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1257;1476
 msgid "English"
 msgstr "Engels"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1288;1480
 msgid "French"
 msgstr "Frans"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1319;1479
 msgid "German"
 msgstr "Duits"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1348
 msgid "Publication date"
 msgstr "Publicatiedatum"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1372
 msgid "Save"
 msgstr "Opslaan"
 
-#: 
-msgid "Start time"
-msgstr "Starttijd"
-
-#: 
-msgid "End time"
-msgstr "Eindtijd"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1464
 msgid "Spoken"
 msgstr "Gesproken"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1465
 msgid "Dubbed"
 msgstr "Gedubd"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1466
 msgid "Subtitled"
 msgstr "Ondertiteld"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1473
 msgid "in"
 msgstr "in"
 
-#: 
-msgid "Contact"
-msgstr "Contact"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1516
 msgid "Input"
 msgstr "Invoer"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1532
 msgid "Performer"
 msgstr "Uitvoerder"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1540
 msgid "Role"
 msgstr "Rol"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1555
 msgid "Link"
 msgstr "Link"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1562
 msgid "for reservation"
 msgstr "voor reservatie"
 
-#: 
-msgid "Format"
-msgstr "Formaat"
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1578
 msgid "Please fill in correct age"
 msgstr "Geef de juiste leeftijd op"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1595;1625
 msgid "Please fill in correct date and time"
 msgstr "Geef de juiste datum en tijdstip op"
 
-#: 
-msgid "A date is required."
-msgstr "Een datum is verplicht."
-
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1602
 msgid "Date field is invalid. The end date is earlier than the beginning date."
 msgstr "Ingevoerde datum niet correct: einddatum valt voor de begindatum"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1632
 msgid "Date field is invalid. The end time is earlier than the beginning time."
 msgstr "Ingevoerde datum niet correct: einduur valt voor beginuur"
 
-#: 
-msgid "Please fill in correct date"
-msgstr "Voer correcte datum in"
+#: includes/culturefeed_entry_ui.pages.inc:1666;1673
+msgid "Please fill in correct time."
+msgstr "Geef de juiste datum en tijdstip op"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1688
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
 msgstr "Geef aan dat je akkoord gaat met de algemene voorwaarden van UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt om de afbeelding te verspreiden via UiTdatabank."
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1691
+msgid "Copyright field is required."
+msgstr "Het veld 'copyright' is verplicht."
+
+#: includes/culturefeed_entry_ui.pages.inc:1696
 msgid "A category is required."
 msgstr "Een categorie is verplicht"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1702
 msgid "A title is required for a custom location"
 msgstr "Een titel is verplicht voor een nieuwe locatie"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1706
 msgid "A zip code is required for a custom location"
 msgstr "Een postcode is verplicht voor een nieuwe locatie"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1710
 msgid "A city is required for a custom location"
 msgstr "Een stad is verplicht voor een nieuwe locatie"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1715
+msgid "A valid city is required for a custom location"
+msgstr "Een geldige stad/gemeente is verplicht voor een nieuwe locatie"
+
+#: includes/culturefeed_entry_ui.pages.inc:1723
 msgid "A location is required."
 msgstr "Een locatie is verplicht"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1728;1732
 msgid "We could not validate the location"
 msgstr "We kunnen de locatie niet bevestigen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1771
 msgid "Not a valid URL"
 msgstr "Geen geldige URL"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1783;1787
 msgid "We could not validate the organizer"
 msgstr "We kunnen de organisatie niet bevestigen"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1803
 msgid "Not a valid email address"
 msgstr "Geen geldig emailadres"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:1822
+msgid "If you translate something, you should also translate the title."
+msgstr "Als je een vertaling toevoegt, moet je ook de titel vertalen."
+
+#: includes/culturefeed_entry_ui.pages.inc:1962
 msgid "Order tickets"
 msgstr "Bestel tickets"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2340
 msgid "An error occurred while saving the event"
 msgstr "Er is een fout opgetreden tijdens het opslaan van de activiteit"
 
-#: 
-msgid "Event successfully updated"
-msgstr "Activiteit werd aangepast"
+#: includes/culturefeed_entry_ui.pages.inc:2441
+msgid "Saving the event"
+msgstr "Evenement aan het bewaren"
+
+#: includes/culturefeed_entry_ui.pages.inc:2448
+msgid "Initializing."
+msgstr "Aan het initialiseren."
 
-#: 
-msgid "Click here to update"
-msgstr "Klik hier om aan te passen"
+#: includes/culturefeed_entry_ui.pages.inc:2449
+msgid "Completed @current of @total."
+msgstr "@current van @total gereed."
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2467
 msgid "Are you sure you want to delete the event?"
 msgstr "Ben je zeker dat je de activiteit wil verwijderen?"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2469
 msgid "This action cannot be undone"
 msgstr "Deze actie kan niet ongedaan gemaakt worden"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2470 views/handlers/views_handler_field_cdb_item_operations.inc:31
 msgid "Delete"
 msgstr "Verwijder"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2471
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2483
 msgid "Event successfully deleted"
 msgstr "Activiteit werd verwijderd"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2487
 msgid "An error occurred while deleting the event"
 msgstr "Er is een fout opgetreden tijdens het verwijderen van de activiteit"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2528
+msgid "Custom tags"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:2537
 msgid "Seperate multiple tags by ;"
 msgstr "Scheid meerdere trefwoorden met ;"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2542
 msgid "Submit"
 msgstr "Voeg toe"
 
-#: 
+#: includes/culturefeed_entry_ui.pages.inc:2557
 msgid "Tag @tag is not permitted because it's already a custom tag."
 msgstr "Trefwoord @tag is niet toegelaten aangezien het al een bestaande marker is."
 
-#: 
-msgid "Autocomplete popup"
-msgstr "Popup voor automatisch aanvullen"
+#: includes/culturefeed_entry_ui.pages.inc:2604
+msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
+msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
 
-#: 
-msgid "open"
-msgstr "open"
+#: includes/culturefeed_entry_ui.pages.inc:2609
+msgid "You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to \"vragen@uitdatabank.be\"."
+msgstr "Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je hier vragen bij hebt, contacteer dan onze helpdesk via \"vragen@uitdatabank.be\"."
 
-#: 
-msgid "from"
-msgstr "van"
+#: includes/culturefeed_entry_ui.pages.inc:2612
+msgid "Error occured while saving the tags"
+msgstr "Er is een fout opgetreden tijdens het opslaan van de labels"
 
-#: 
-msgid "to"
-msgstr "tot"
+#: includes/culturefeed_entry_ui.pages.inc:2686
+msgid "The event %title has been created."
+msgstr "De activiteit %title werd aangemaakt."
+
+#: includes/culturefeed_entry_ui.pages.inc:2687
+msgid "The event %title has been updated."
+msgstr "Het event %title werd aangepast."
+
+#: includes/culturefeed_entry_ui.pages.inc:2328;2333
+msgid "culturefeed_entry_ui"
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:2328
+msgid "Event %eventid updated."
+msgstr ""
+
+#: includes/culturefeed_entry_ui.pages.inc:2333
+msgid "Event %eventid created."
+msgstr ""
+
+#: js/bootstrap_autocomplete_override.js:0 js/culturefeed_entry_ui.js:0
+msgid "Autocomplete popup"
+msgstr "Popup voor automatisch aanvullen"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:13
 msgid "Operations"
 msgstr "Bewerkingen"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:14
 msgid "Links to operations that can be performed"
 msgstr "Link naar mogelijke handelingen"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:20
 msgid "Create event"
 msgstr "Maak activiteit aan"
 
-#: 
+#: views/culturefeed_entry_ui.views.inc:21
 msgid "Link to create event"
 msgstr "Link om activiteit aan te maken"
 
-#: 
-msgid "Master"
-msgstr ""
-
-#: 
-msgid "Events created by me"
-msgstr "Mijn activiteiten"
-
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:25;159
 msgid "more"
 msgstr "meer"
 
-#: 
-msgid "Apply"
-msgstr "Pas toe"
+#: views/culturefeed_entry_ui.views_default.inc:31;160
+msgid "Select"
+msgstr "Selecteren"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:32;161
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
-#: 
-msgid "Sort by"
+#: views/culturefeed_entry_ui.views_default.inc:33;162
+msgid "Sort"
 msgstr "Sorteer op"
 
-#: 
-msgid "Asc"
-msgstr "Stijgend"
+#: views/culturefeed_entry_ui.views_default.inc:34;163
+msgid "Ascending"
+msgstr "Oplopend"
 
-#: 
-msgid "Desc"
-msgstr "Dalend"
+#: views/culturefeed_entry_ui.views_default.inc:35;164
+msgid "Descending"
+msgstr "Aflopend"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:48;165
 msgid "Notification that no results were found"
 msgstr "Melding dat er geen resultaten werden gevonden"
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:50;166
 msgid "Unable to find any events created by you."
 msgstr "Er werden geen activiteiten gevonden die door jou aangemaakt werden"
 
-#: 
-msgid "Last updated"
-msgstr "Laatst bijgewerkt"
+#: views/culturefeed_entry_ui.views_default.inc:121;168
+msgid "Created by current user"
+msgstr ""
 
-#: 
+#: views/culturefeed_entry_ui.views_default.inc:126;169
 msgid "Block"
 msgstr "Blok"
 
-#: 
-msgid "Add event"
-msgstr "Voeg activiteit toe"
+#: views/culturefeed_entry_ui.views_default.inc:129;170
+msgid "Page"
+msgstr "Pagina"
+
+#: views/culturefeed_entry_ui.views_default.inc:138;172
+msgid "Items on page"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:139;173
+msgid "- All -"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:140;174
+msgid "Start"
+msgstr "Start"
+
+#: views/culturefeed_entry_ui.views_default.inc:141;175
+msgid "« first"
+msgstr "« eerste"
+
+#: views/culturefeed_entry_ui.views_default.inc:142;176
+msgid "‹ previous"
+msgstr "‹ vorige"
+
+#: views/culturefeed_entry_ui.views_default.inc:143;177
+msgid "next ›"
+msgstr "volgende ›"
+
+#: views/culturefeed_entry_ui.views_default.inc:144;178
+msgid "last »"
+msgstr "laatste »"
+
+#: views/culturefeed_entry_ui.views_default.inc:157
+msgid "Master"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:158
+msgid "Events created by me"
+msgstr "Mijn activiteiten"
+
+#: views/culturefeed_entry_ui.views_default.inc:167
+msgid "Last updated"
+msgstr "Laatst bijgewerkt"
 
+#: views/handlers/views_handler_field_cdb_item_operations.inc:47
+msgid "No permission to edit event"
+msgstr "Geen toelating om event aan te passen"
diff --git a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
index 2461ffb2..546044fb 100644
--- a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
+++ b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
@@ -7,51 +7,56 @@
  * Implements hook_views_default_views().
  */
 function culturefeed_entry_ui_views_default_views() {
-  $views = array();
 
   $view = new view();
   $view->name = 'culturefeed_events_createdbycurrentuser';
   $view->description = '';
   $view->tag = 'default';
   $view->base_table = 'cdb_items';
-  $view->human_name = 'CultureFeed events created by current user';
+  $view->human_name = 'CultureFeed edit events';
   $view->core = 7;
   $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
+  
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Events created by me';
   $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['use_more_text'] = t('more');
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'create culturefeed events';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['exposed_form']['options']['submit_button'] = t('Select');
+  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = t('Reset');
+  $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = t('Sort');
+  $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = t('Ascending');
+  $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = t('Descending');
   $handler->display->display_options['pager']['type'] = 'none';
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'fields';
-  /* Header: UDB items: Create event */
-  $handler->display->display_options['header']['create']['id'] = 'create';
-  $handler->display->display_options['header']['create']['table'] = 'cdb_items';
-  $handler->display->display_options['header']['create']['field'] = 'create';
-  $handler->display->display_options['header']['create']['empty'] = TRUE;
-  /* No results behavior: Global: Text area */
+  /* Kop: Cdb items: Maak activiteit aan */
+  $handler->display->display_options['footer']['create']['id'] = 'create';
+  $handler->display->display_options['footer']['create']['table'] = 'cdb_items';
+  $handler->display->display_options['footer']['create']['field'] = 'create';
+  $handler->display->display_options['footer']['create']['empty'] = TRUE;
+  /* Gedrag bij ontbreken van resultaten: Algemeen: Tekstveld */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
-  $handler->display->display_options['empty']['area']['label'] = 'Notification that no results were found';
+  $handler->display->display_options['empty']['area']['label'] = t('Notification that no results were found');
   $handler->display->display_options['empty']['area']['empty'] = TRUE;
-  $handler->display->display_options['empty']['area']['content'] = 'Unable to find any events created by you.';
+  $handler->display->display_options['empty']['area']['content'] = t('Unable to find any events created by you.');
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  /* Field: UDB items: Titel */
+  /* Veld: Cdb items: Titel */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['title']['link'] = 1;
-  /* Field: UDB items: Afbeelding */
+  /* Veld: Cdb items: Afbeelding */
   $handler->display->display_options['fields']['picture']['id'] = 'picture';
   $handler->display->display_options['fields']['picture']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['picture']['field'] = 'picture';
@@ -60,13 +65,13 @@ function culturefeed_entry_ui_views_default_views() {
   $handler->display->display_options['fields']['picture']['width'] = '100';
   $handler->display->display_options['fields']['picture']['height'] = '100';
   $handler->display->display_options['fields']['picture']['link'] = 1;
-  /* Field: UDB items: Short Description */
+  /* Veld: Cdb items: Short Description */
   $handler->display->display_options['fields']['description']['id'] = 'description';
   $handler->display->display_options['fields']['description']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['description']['field'] = 'description';
   $handler->display->display_options['fields']['description']['label'] = '';
   $handler->display->display_options['fields']['description']['element_label_colon'] = FALSE;
-  /* Field: UDB items: Locatie */
+  /* Veld: Cdb items: Locatie */
   $handler->display->display_options['fields']['location']['id'] = 'location';
   $handler->display->display_options['fields']['location']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['location']['field'] = 'location';
@@ -77,29 +82,29 @@ function culturefeed_entry_ui_views_default_views() {
     'title' => 0,
     'address' => 0,
   );
-  /* Field: UDB items: Kalendersamenvatting */
+  /* Veld: Cdb items: Calendar summary */
   $handler->display->display_options['fields']['when']['id'] = 'when';
   $handler->display->display_options['fields']['when']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['when']['field'] = 'when';
   $handler->display->display_options['fields']['when']['label'] = '';
   $handler->display->display_options['fields']['when']['element_label_colon'] = FALSE;
-  /* Field: UDB items: Last updated */
+  /* Veld: Cdb items: Laatst bijgewerkt */
   $handler->display->display_options['fields']['lastupdated']['id'] = 'lastupdated';
   $handler->display->display_options['fields']['lastupdated']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['lastupdated']['field'] = 'lastupdated';
   $handler->display->display_options['fields']['lastupdated']['date_format'] = 'short';
-  /* Field: UDB items: Operations */
+  /* Veld: Cdb items: Bewerkingen */
   $handler->display->display_options['fields']['operations']['id'] = 'operations';
   $handler->display->display_options['fields']['operations']['table'] = 'cdb_items';
   $handler->display->display_options['fields']['operations']['field'] = 'operations';
   $handler->display->display_options['fields']['operations']['label'] = '';
   $handler->display->display_options['fields']['operations']['element_label_colon'] = FALSE;
-  /* Sort criterion: Cdb items: Last updated */
+  /* Sorteercriterium: Cdb items: Laatst bijgewerkt */
   $handler->display->display_options['sorts']['lastupdated']['id'] = 'lastupdated';
   $handler->display->display_options['sorts']['lastupdated']['table'] = 'cdb_items';
   $handler->display->display_options['sorts']['lastupdated']['field'] = 'lastupdated';
   $handler->display->display_options['sorts']['lastupdated']['order'] = 'DESC';
-  /* Filter criterion: UDB items: Type */
+  /* Filtercriterium: Cdb items: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $handler->display->display_options['filters']['type']['table'] = 'cdb_items';
   $handler->display->display_options['filters']['type']['field'] = 'type';
@@ -107,26 +112,70 @@ function culturefeed_entry_ui_views_default_views() {
     'event' => 'event',
   );
   $handler->display->display_options['filters']['type']['group'] = 1;
-  /* Filter criterion: UDB items: Created by current user */
+  /* Filtercriterium: Cdb items: Created by current user */
   $handler->display->display_options['filters']['createdbycurrentuser']['id'] = 'createdbycurrentuser';
   $handler->display->display_options['filters']['createdbycurrentuser']['table'] = 'cdb_items';
   $handler->display->display_options['filters']['createdbycurrentuser']['field'] = 'createdbycurrentuser';
-
+  $handler->display->display_options['filters']['createdbycurrentuser']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['operator_id'] = 'createdbycurrentuser_op';
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['label'] = t('Created by current user');
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['operator'] = 'createdbycurrentuser_op';
+  $handler->display->display_options['filters']['createdbycurrentuser']['expose']['identifier'] = 'createdbycurrentuser';
+  
   /* Display: Block */
-  $handler = $view->new_display('block', 'Block', 'block');
+  $handler = $view->new_display('block', t('Block'), 'block');
+  
+  /* Display: Pagina */
+  $handler = $view->new_display('page', t('Page'), 'page_1');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = t('Edit events');
+  $handler->display->display_options['defaults']['pager'] = FALSE;
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '10';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['quantity'] = '9';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = t('Items on page');
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = t('- All -');
+  $handler->display->display_options['pager']['options']['expose']['offset_label'] = t('Start');
+  $handler->display->display_options['pager']['options']['tags']['first'] = t('« first');
+  $handler->display->display_options['pager']['options']['tags']['previous'] = t('‹ previous');
+  $handler->display->display_options['pager']['options']['tags']['next'] = t('next ›');
+  $handler->display->display_options['pager']['options']['tags']['last'] = t('last »');
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filtercriterium: Cdb items: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'cdb_items';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'event' => 'event',
+  );
+  $handler->display->display_options['filters']['type']['group'] = 1;
+  $handler->display->display_options['path'] = 'agenda/edit';
   $translatables['culturefeed_events_createdbycurrentuser'] = array(
     t('Master'),
     t('Events created by me'),
     t('more'),
-    t('Apply'),
+    t('Select'),
     t('Reset'),
-    t('Sort by'),
-    t('Asc'),
-    t('Desc'),
+    t('Sort'),
+    t('Ascending'),
+    t('Descending'),
     t('Notification that no results were found'),
     t('Unable to find any events created by you.'),
     t('Last updated'),
+    t('Created by current user'),
     t('Block'),
+    t('Page'),
+    t('Edit events'),
+    t('Items on page'),
+    t('- All -'),
+    t('Start'),
+    t('« first'),
+    t('‹ previous'),
+    t('next ›'),
+    t('last »'),
   );
 
   $views[$view->name] = $view;
diff --git a/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc b/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
index c1100033..74b80372 100644
--- a/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
+++ b/culturefeed_entry_ui/views/handlers/views_handler_field_cdb_item_operations.inc
@@ -19,27 +19,48 @@ class views_handler_field_cdb_item_operations extends views_handler_field {
     $links = array();
 
     if ($extended_entity->getType() === 'event') {
+      
+      // Update and delete
       $ops = array(
         'edit' => array(
           'permission' => 'edit culturefeed events',
           'title' => t('Edit'),
         ),
-        'tags' => array(
-          'permission' => 'manage object tags',
-          'title' => t('Tags'),
-        ),
         'delete' => array(
           'permission' => 'delete culturefeed events',
           'title' => t('Delete'),
         )
       );
-
+      
+      $user = $cf_account = DrupalCultureFeed::getLoggedInUser();
+      $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($user->id, $user->mbox, array('ids' => $extended_entity->getId()));
+      
+      if ($ubd_permission[$extended_entity->getId()] == 'true') {
+        foreach ($ops as $op => $op_details) {
+          $path = culturefeed_entry_ui_entity_path($extended_entity, $op);
+          if ($path && user_access($op_details['permission'])) {
+            $links[$op] = l($op_details['title'], $path);
+          }
+        }
+      }
+      else {
+        $links[] = '<button class="btn btn-default disabled">' . t('No permission to edit event') . '</button>';
+      }
+      
+      // Collaboration
+      $ops = array(
+        'tags' => array(
+          'permission' => 'manage object tags',
+          'title' => t('Tags'),
+        )
+      );
       foreach ($ops as $op => $op_details) {
         $path = culturefeed_entry_ui_entity_path($extended_entity, $op);
         if ($path && user_access($op_details['permission'])) {
           $links[$op] = l($op_details['title'], $path);
         }
       }
+      
     }
 
     if (!empty($links)) {
diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 8eb51b7f..65bdfccd 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -42,16 +42,27 @@ function culturefeed_search_menu() {
   $items['autocomplete/culturefeed/suggestions'] = array(
     'title' => 'Culturefeed suggestions autocomplete',
     'page callback' => 'culturefeed_search_suggestions_autocomplete_page',
-    'page arguments' => array(3, FALSE, NULL),
+    'page arguments' => array(3, FALSE, NULL, FALSE),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/pages.inc',
   );
 
+  // Autocomplete path for actor
   $items['autocomplete/culturefeed/actor-suggestions'] = array(
     'title' => 'Culturefeed suggestions autocomplete',
     'page callback' => 'culturefeed_search_suggestions_autocomplete_page',
-    'page arguments' => array(3, FALSE, 'actor'),
+    'page arguments' => array(3, FALSE, 'actor', FALSE),
+    'access arguments' => array('access content'),
+    'type' => MENU_CALLBACK,
+    'file' => 'includes/pages.inc',
+  );
+  
+  // Autocomplete path for all actors from production (temporary workaround for PWK-213)
+  $items['autocomplete/culturefeed/actor-suggestions/all'] = array(
+    'title' => 'Culturefeed suggestions autocomplete',
+    'page callback' => 'culturefeed_search_suggestions_autocomplete_page',
+    'page arguments' => array(4, FALSE, 'actor', TRUE),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/pages.inc',
diff --git a/culturefeed_search/includes/helpers.inc b/culturefeed_search/includes/helpers.inc
index d6126cc1..e1fcf48b 100644
--- a/culturefeed_search/includes/helpers.inc
+++ b/culturefeed_search/includes/helpers.inc
@@ -609,7 +609,7 @@ function culturefeed_search_get_flandersregion_suggestions($search_string, $incl
   $query->condition('did', 'flandersregion');
   //$query->condition('language', culturefeed_search_get_preferred_language());
   $query->condition('language', 'und');
-  $query->condition('name', '%' . db_like($search_string) . '%', 'LIKE');
+	$query->condition('name', '%' . db_like($search_string) . '%', 'LIKE');
   $query->condition('name', '%(' . db_like($search_string) . '%)', 'NOT LIKE');
   if(!$include_regions) {
     $query->isNotNull('p1');
@@ -635,6 +635,14 @@ function culturefeed_search_get_flandersregion_suggestions($search_string, $incl
     $suggestions[$old_parts . $row->name] = $row->name;
   }
 
+	foreach ($suggestions as $key => $suggestion) {
+		if (strtolower($suggestion) == strtolower($search_string)) {
+			$val = $suggestion;
+			unset($suggestion);
+			$suggestions = array($key => $val) + $suggestions;
+		}
+	}
+
   return $suggestions;
 
 }
@@ -823,7 +831,7 @@ function culturefeed_search_get_term_translation($tid) {
   $terms = culturefeed_search_term_translations(array($tid), TRUE);
 
   if (!isset($terms[$tid])) {
-    return false;
+    return $tid;
   }
 
   if (isset($terms[$tid][culturefeed_search_get_preferred_language()])) {
@@ -863,7 +871,7 @@ function culturefeed_search_translate_facet(&$facet_items) {
     if ($facet_item->hasSubItems()) {
       $sub_items = $facet_item->getSubItems();
       foreach ($sub_items as $key => $sub_item) {
-        if (culturefeed_search_get_term_translation($sub_item->getValue())) {
+        if ($sub_item->getLabel() == culturefeed_search_get_term_translation($sub_item->getValue())) {
           $sub_item->setLabel(culturefeed_search_get_term_translation($sub_item->getValue()));
         }
         else {
diff --git a/culturefeed_search/includes/pages.inc b/culturefeed_search/includes/pages.inc
index 75bc9d74..a23e507a 100644
--- a/culturefeed_search/includes/pages.inc
+++ b/culturefeed_search/includes/pages.inc
@@ -5,11 +5,12 @@
  */
 
 use \Guzzle\Http\Exception;
+use \Guzzle\Http\Client;
 
 /**
  * Autcomplete callback for the suggestions on Cdb items.
  */
-function culturefeed_search_suggestions_autocomplete_page($search_string, $past = FALSE, $type = NULL) {
+function culturefeed_search_suggestions_autocomplete_page($search_string, $past = FALSE, $type = NULL, $all = FALSE) {
 
   $matches = array();
 
@@ -18,9 +19,10 @@ function culturefeed_search_suggestions_autocomplete_page($search_string, $past
     try {
 
       $types = !empty($type) ? array($type) : array();
-
+      $extra_parameters[] = !empty($all) ? new \CultuurNet\Search\Parameter\Parameter('admin','true') : array();
+      
       // Get the list of suggestions from service.
-      $suggestions = culturefeed_get_search_service()->searchSuggestions($search_string, $types, $past);
+      $suggestions = culturefeed_get_search_service()->searchSuggestions($search_string, $types, $past, $extra_parameters);
       if ($suggestions->hasSuggestions()) {
         foreach ($suggestions as $suggestion) {
           $title = $location_title = check_plain($suggestion->getTitle());
diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
index 2fe7f12b..79285f71 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
@@ -129,12 +129,12 @@ public function searchPages($parameters = array()) {
    */
   public function searchSuggestions($search_string, $types = array(), $past = FALSE, $extra_parameters = array()) {
 
-    $cid = sprintf('suggestions:%s', md5($search_string . implode('|', $types) . $past));
+    $cid = sprintf('suggestions:%s', md5($search_string . implode('|', $types) . $past . implode('|', $extra_parameters)));
     if ($cache = $this->cacheGet($cid)) {
       return $cache->data;
     }
 
-    $suggestions = $this->realSearchService->searchSuggestions($search_string, $types, $past);
+    $suggestions = $this->realSearchService->searchSuggestions($search_string, $types, $past, $extra_parameters);
     $this->cacheSet($cid, $suggestions, REQUEST_TIME + CULTUREFEED_SEARCH_CACHE_EXPIRES);
 
     return $suggestions;
diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 6c4d7427..8a8735aa 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -556,7 +556,7 @@ function culturefeed_search_ui_block_configure($delta) {
         'links' => t('As links'),
         'checkboxes' => t('As checkboxes with submit button'),
       ),
-      '#default_value' => variable_get($display_variable, 'links'),
+      '#default_value' => variable_get($display_variable, 'checkboxes'),
     );
     $form[$operator_label] = array(
       '#title' => t('How to apply filters on the query'),
@@ -566,7 +566,7 @@ function culturefeed_search_ui_block_configure($delta) {
         'and' => t('Use AND-operator'),
         'or' => t('Use OR-operator'),
       ),
-      '#default_value' => variable_get($operator_variable, 'or'),
+      '#default_value' => variable_get($operator_variable, 'and'),
     );
 
     $options = variable_get($config_variable, culturefeed_search_ui_default_filter_options());
@@ -602,7 +602,7 @@ function culturefeed_search_ui_block_configure($delta) {
       $form[$config_label][$i]['api-filter-query'] = array(
         '#title' => t('Filterquery for API'),
         '#type' => 'textfield',
-        '#default_value' => isset($options[$i]['api-filter-query']) ? $options[$i]['api-filter-query'] : '', 
+        '#default_value' => isset($options[$i]['api-filter-query']) ? $options[$i]['api-filter-query'] : '',
         '#maxlength' => 255
       );
     }
@@ -740,13 +740,14 @@ function culturefeed_search_ui_block_view($delta) {
       }
 
       $variable_name = 'culturefeed_search_filter_options' . (($delta == 'filter-form-2') ? '_2' : '');
-      $display_type = variable_get('culturefeed_search_filter_display_options' . (($delta == 'filter-form-2') ? '_2' : ''));
+      $display_type = variable_get('culturefeed_search_filter_display_options' . (($delta == 'filter-form-2') ? '_2' : ''), 'checkboxes');
       $filter_options = variable_get($variable_name, culturefeed_search_ui_default_filter_options());
       $filter_options = array_filter($filter_options, function($option) {
         return !isset($option['exposed']) || !empty($option['exposed']);
       });
       if (!empty($filter_options)) {
-        $block['content'] = culturefeed_search_ui_block_filter_block($filter_options, $display_type);
+        $form_id = $delta == 'filter-form-2' ? '2' : '';
+        $block['content'] = culturefeed_search_ui_block_filter_block($filter_options, $display_type, $form_id);
       }
       break;
 
@@ -808,20 +809,10 @@ function culturefeed_search_ui_culturefeed_search_page_query_alter(CultureFeedSe
     ),
   );
   foreach ($filter_blocks as $delta => $variables) {
-    // Only add the filters if the block is set.
-    if (culturefeed_search_ui_block_is_visible($delta)) {
-      culturefeed_search_ui_page_add_query_filters($culturefeedSearchPage,
-        variable_get($variables['filter-options'], culturefeed_search_ui_default_filter_options()),
-        variable_get($variables['operator'], 'and')
-      );
-    }
-  }
-
-  // Add filters from second filter block.
-  if (culturefeed_search_ui_block_is_visible('filter-form-2')) {
-    $operator = variable_get('culturefeed_search_filter_operator_2', 'and');
-    $filter_options = variable_get('culturefeed_search_filter_options_2', culturefeed_search_ui_default_filter_options());
-    culturefeed_search_ui_page_add_query_filters($culturefeedSearchPage, $filter_options, $operator);
+    culturefeed_search_ui_page_add_query_filters($culturefeedSearchPage,
+      variable_get($variables['filter-options'], culturefeed_search_ui_default_filter_options()),
+      variable_get($variables['operator'], 'and')
+    );
   }
 
   // If group = event_production exclude productions (already included in group)
@@ -900,6 +891,41 @@ function culturefeed_search_ui_page_alter(&$variables) {
 
 }
 
+/**
+ * Implements hook_metatag_page_cache_cid_parts_alter().
+ */
+function culturefeed_search_ui_metatag_page_cache_cid_parts_alter(&$cid_parts) {
+
+  // Add active facets to the metatag cid, this is needed for unique titels per active facet.
+  $culturefeedFacetingComponent = culturefeed_get_facet_component();
+  if (!$culturefeedFacetingComponent instanceof \CultuurNet\Search\Component\Facet\FacetComponent) {
+    return;
+  }
+
+  // Add the value of every active filter to the metadata cid.
+  $active_filters = module_invoke_all('culturefeed_search_ui_active_filters', $culturefeedFacetingComponent);
+  if (!empty($active_filters)) {
+
+    $values = array();
+    foreach ($active_filters as $key => $active_filter) {
+
+      if (!isset($active_filter['#label'])) {
+        foreach ($active_filter as $subkey => $subitem) {
+          $values[] = $key . ':' . $subkey;
+        }
+      }
+      else {
+        $values[] = $key;
+      }
+
+    }
+
+    $cid_parts['active_cf_filters'] = implode(',', $values);
+
+  }
+
+}
+
 /**
  * Implements hook_culturefeed_search_ui_active_filters().
  */
@@ -1040,7 +1066,10 @@ function culturefeed_search_ui_culturefeed_search_ui_active_filters($culturefeed
   }
 
   // Check if form filters are selected.
-  $filter_options = variable_get('culturefeed_search_filter_options', culturefeed_search_ui_default_filter_options());
+  $default_filter_options = culturefeed_search_ui_default_filter_options();
+  $filter_options = variable_get('culturefeed_search_filter_options', $default_filter_options);
+  $filter_options2 = variable_get('culturefeed_search_filter_options_2', $default_filter_options);
+  $filter_options = array_merge($filter_options, $filter_options2);
   foreach ($filter_options as $option) {
     if (!empty($query[$option['query-string']])) {
       $search_query = $query;
@@ -1104,7 +1133,7 @@ function culturefeed_search_ui_register_deletions() {
  * @param array $filter_options
  * @param string $operator
  */
-function culturefeed_search_ui_page_add_query_filters(CultureFeedSearchPageInterface &$culturefeedSearchPage, $filter_options, $operator) {
+function culturefeed_search_ui_page_add_query_filters(CultureFeedSearchPageInterface &$culturefeedSearchPage, $filter_options, $operator = 'and') {
 
   if ($operator == 'and') {
     foreach ($filter_options as $option) {
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index d4f9395c..1b4fe718 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -674,6 +674,39 @@ function culturefeed_search_ui_search_active_filters_block() {
 
 }
 
+/**
+ * Show the filter form for the search ui.
+ */
+function culturefeed_search_ui_block_filter_block($filter_options, $display_type, $form_id = '') {
+
+  if ($display_type == 'checkboxes') {
+    // Show filters as checkboxes with submit button.
+    return drupal_get_form('culturefeed_search_ui_block_filter_form' . $form_id, $filter_options);
+  }
+  elseif ($display_type == 'links') {
+    // Show filters as links.
+    $searches = culturefeed_get_searchable_types();
+    $path = isset($searches['path']) ? $searches['path'] : NULL;
+    $query = drupal_get_query_parameters(NULL, array('q', 'page'));
+
+    return  theme('culturefeed_search_block_filter_links',
+      array(
+        'filter_options' => $filter_options,
+        'query' => $query,
+        'path' => $path
+      )
+     );
+  }
+
+}
+
+/**
+ * Form to filter search queries by webmaster driven settings.
+ * @param type $form
+ * @param type $form_state
+ * @param type $filter_options
+ * @return string
+ */
 function culturefeed_search_ui_block_filter_form($form, $form_state, $filter_options) {
 
   $form = array();
@@ -696,29 +729,11 @@ function culturefeed_search_ui_block_filter_form($form, $form_state, $filter_opt
 }
 
 /**
- * Show the filter form for the search ui.
+ * Form alias with unique form_id for culturefeed_search_ui_block_filter_form().
+ * @see culturefeed_search_ui_block_filter_form().
  */
-function culturefeed_search_ui_block_filter_block($filter_options, $display_type) {
-
-  if ($display_type == 'checkboxes') {
-    // Show filters as checkboxes with submit button.
-    return drupal_get_form('culturefeed_search_ui_block_filter_form', $filter_options);
-  }
-  elseif ($display_type == 'links') {
-    // Show filters as links.
-    $searches = culturefeed_get_searchable_types();
-    $path = isset($searches['path']) ? $searches['path'] : NULL;
-    $query = drupal_get_query_parameters(NULL, array('q', 'page'));
-
-    return  theme('culturefeed_search_block_filter_links',
-      array(
-        'filter_options' => $filter_options,
-        'query' => $query,
-        'path' => $path
-      )
-     );
-  }
-
+function culturefeed_search_ui_block_filter_form2($form, $form_state, $filter_options) {
+  return culturefeed_search_ui_block_filter_form($form, $form_state, $filter_options);
 }
 
 /**
@@ -740,6 +755,13 @@ function culturefeed_search_ui_block_filter_form_submit($form, &$form_state) {
     array('query' => $query)
   );
 }
+/**
+ * Alias for the submit handler of culturefeed_search_ui_block_filter_form().
+ * @see culturefeed_search_ui_block_filter_form_submit().
+ */
+function culturefeed_search_ui_block_filter_form2_submit($form, &$form_state) {
+  culturefeed_search_ui_block_filter_form_submit($form, $form_state);
+}
 
 /**
  * Block callback for the city and actor search.
diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 2b991c86..2313f91e 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -398,28 +398,6 @@ function culturefeed_search_ui_get_sort_options_for_page($search_page) {
 
 }
 
-/**
- * Check if a block has been assigned to a region.
- *
- * @global type $theme
- * @param type $delta
- * @return type
- */
-function culturefeed_search_ui_block_is_visible($delta) {
-
-  global $theme;
-
-  $region = db_select('block', 'b')
-    ->condition('b.delta', $delta)
-    ->condition('b.theme', $theme)
-    ->fields('b', array('region'))
-    ->execute()
-    ->fetchField();
-
-  return ($region !== '-1');
-
-}
-
 /**
  * Add facebook JS share if an app id is configured.
  */
@@ -447,4 +425,4 @@ function culturefeed_search_ui_get_user_location_cookie() {
 
   return new stdClass();
 
-}
\ No newline at end of file
+}
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 9d32ff59..1faa2c56 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -435,6 +435,7 @@ protected function addFacetFilters($params) {
       
       if (isset($params['sort']) && $params['sort'] == 'geodist') {
         $this->parameters[] = new Parameter\Sort('geodist()', 'asc');
+        $this->parameters[] = new Parameter\FilterQuery('{!geofilt}');
       }
       
       $this->parameters[] = new Parameter\Spatial\Point($coordinates[0], $coordinates[1]);
diff --git a/culturefeed_search_ui/theme/culturefeed-search-block-filter-links-item.tpl.php b/culturefeed_search_ui/theme/culturefeed-search-block-filter-links-item.tpl.php
index f3c1e606..17a321a4 100644
--- a/culturefeed_search_ui/theme/culturefeed-search-block-filter-links-item.tpl.php
+++ b/culturefeed_search_ui/theme/culturefeed-search-block-filter-links-item.tpl.php
@@ -1,11 +1,7 @@
 <?php
 /**
  * @file
- * Template file for one culturefeed search facet.
- */
-
-/**
- * @var array $items
+ * Template file for one culturefeed search filter link as facet.
  */
 ?>
 
diff --git a/culturefeed_search_ui/theme/culturefeed-search-block-filter-links.tpl.php b/culturefeed_search_ui/theme/culturefeed-search-block-filter-links.tpl.php
index 9352bd87..235dcab4 100644
--- a/culturefeed_search_ui/theme/culturefeed-search-block-filter-links.tpl.php
+++ b/culturefeed_search_ui/theme/culturefeed-search-block-filter-links.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Template file for one culturefeed search facet.
+ * Template file for culturefeed search links as facet.
  */
 
 /**
diff --git a/culturefeed_search_views/culturefeed_search_views.info b/culturefeed_search_views/culturefeed_search_views.info
index ada64929..8af3e689 100644
--- a/culturefeed_search_views/culturefeed_search_views.info
+++ b/culturefeed_search_views/culturefeed_search_views.info
@@ -27,6 +27,7 @@ files[] = views/handlers/sort/views_handler_sort_culturefeed_search_recommends.i
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_comments.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_agefrom.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_lastupdated.inc
+files[] = views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_title.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_lastupdated.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_link.inc
@@ -35,6 +36,7 @@ files[] = views/handlers/field/views_handler_field_cdb_item_location.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_organiser.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_picture.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_short_description.inc
+files[] = views/handlers/field/views_handler_field_cdb_item_category.inc
 
 
 dependencies[] = culturefeed_search
diff --git a/culturefeed_search_views/views/culturefeed_search_views.views.inc b/culturefeed_search_views/views/culturefeed_search_views.views.inc
index 42789bce..f4223466 100644
--- a/culturefeed_search_views/views/culturefeed_search_views.views.inc
+++ b/culturefeed_search_views/views/culturefeed_search_views.views.inc
@@ -201,6 +201,15 @@ function culturefeed_search_views_data() {
     ),
   );
 
+	// Category.
+	$data['cdb_items']['category'] = array(
+		'title' => t('Category'),
+		'help' => t('Category of the cdb item'),
+		'field' => array(
+			'handler' => 'views_handler_field_cdb_item_category',
+		),
+	);
+
   // Organiser.
   $data['cdb_items']['organiser'] = array(
     'title' => t('Organiser'),
@@ -255,6 +264,14 @@ function culturefeed_search_views_data() {
     ),
   );
 
+	$data['cdb_items']['weight_sort'] = array(
+		'title' => t('Weight'),
+		'help' => t('Sort on weight.'),
+		'sort' => array(
+			'handler' => 'views_handler_sort_culturefeed_search_weight'
+		),
+	);
+
   return $data;
 
 }
diff --git a/culturefeed_search_views/views/culturefeed_search_views.views_default.inc b/culturefeed_search_views/views/culturefeed_search_views.views_default.inc
new file mode 100644
index 00000000..06ba7de5
--- /dev/null
+++ b/culturefeed_search_views/views/culturefeed_search_views.views_default.inc
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Implements hook_views_default_views().
+ **/
+function culturefeed_search_views_views_default_views() {
+  $files = file_scan_directory(drupal_get_path('module', 'culturefeed_search_views'). '/views/views', '/.inc/');
+  foreach ($files as $filepath => $file) {
+    require $filepath;
+    if (isset($view)) {
+      $views[$view->name] = $view;
+    }
+  }
+  if ($views) {
+    return $views;
+  }
+}
\ No newline at end of file
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
new file mode 100644
index 00000000..417feac1
--- /dev/null
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * A handler to provide proper displays for the categories of a cdb item.
+ */
+class views_handler_field_cdb_item_category extends views_handler_field {
+
+	/**
+	 * @see views_handler_field::option_definition()
+	 */
+	function option_definition() {
+		$options = parent::option_definition();
+
+		$options['link'] = array('default' => FALSE);
+
+		return $options;
+	}
+
+	/**
+	 * @see views_handler_field::options_form()
+	 */
+	function options_form(&$form, &$form_state) {
+
+		$form['link'] = array(
+			'#type' => 'checkbox',
+			'#title' => t('Link the category to the category result page'),
+			'#default_value' => isset($this->options['link']) ? $this->options['link'] : FALSE,
+		);
+
+		parent::options_form($form, $form_state);
+
+	}
+
+  /**
+   * @see views_handler_field::render()
+   */
+  function render($extended_entity) {
+
+    if (!method_exists($extended_entity->getEntity(), 'getCategories')) {
+      return;
+    }
+
+		$categories = culturefeed_agenda_get_category_list_of_item('eventtype', $extended_entity->getEntity());
+
+    if (!$categories) {
+      return;
+    }
+
+		$categories_names = array();
+
+		if ($this->options['link']) {
+			foreach ($categories['links'] as $category) {
+				$categories_names[] = $category;
+			}
+			$categories_names = implode(', ', $categories_names);
+		}
+		else {
+			foreach ($categories['text'] as $category) {
+				$categories_names[] = $category;
+			}
+			$categories_names = implode(', ', $categories_names);
+		}
+
+		return $categories_names;
+
+  }
+
+}
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index aa60b8c0..422ab3fc 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -11,8 +11,10 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
   function option_definition() {
     $options = parent::option_definition();
 
+    $options['override'] = array('default' => FALSE);
     $options['width'] = array('default' => 100);
     $options['height'] = array('default' => 100);
+    $options['format'] = array('default' => 'image');
     $options['link'] = array('default' => FALSE);
 
     return $options;
@@ -23,6 +25,13 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
    */
   function options_form(&$form, &$form_state) {
 
+    $form['override'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Override with collaboration data'),
+      '#description' => t('If collaboration data is provided content of this field will be overriden when this is checked.'),
+      '#default_value' => isset($this->options['override']) ? $this->options['override'] : FALSE,
+    );
+
     $form['width'] = array(
       '#type' => 'textfield',
       '#title' => t('Width'),
@@ -37,6 +46,16 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       '#required' => TRUE,
     );
 
+		$form['format'] = array(
+			'#type' => 'select',
+			'#title' => t('Format'),
+			'#options' => array(
+				'image' => t('image'),
+				'url' => t('url'),
+			),
+			'#default_value' => isset($this->options['format']) ? $this->options['format'] : 'image',
+		);
+
     $form['link'] = array(
       '#type' => 'checkbox',
       '#title' => t('Link the picture to the detail page'),
@@ -58,10 +77,16 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     }
 
     $main_picture = '';
-    $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
-    foreach ($pictures as $picture) {
-      if ($picture->isMain()) {
-        $main_picture = $picture->getHLink();
+
+    if ($this->options['override']) {
+      $main_picture = 'This picture is overriden';
+    }
+    else {
+      $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
+      foreach ($pictures as $picture) {
+        if ($picture->isMain()) {
+          $main_picture = $picture->getHLink();
+        }
       }
     }
 
@@ -72,7 +97,12 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     }
 
     if (!empty($main_picture)) {
-      $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+			if ($this->options['format'] == 'image') {
+				$image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+			}
+			else if ($this->options['format'] == 'url') {
+				$image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+			}
 
       if ($this->options['link']) {
         $path = culturefeed_search_detail_path($extended_entity->getType(), $extended_entity->getId(), $extended_entity->getTitle(culturefeed_search_get_preferred_language()));
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index 8f9d016d..460efaec 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -5,14 +5,47 @@
  */
 class views_handler_field_cdb_item_short_description extends views_handler_field {
 
+  /**
+   * @see views_handler_field::option_definition()
+   */
+  function option_definition() {
+    $options = parent::option_definition();
+
+    $options['override'] = array('default' => FALSE);
+
+    return $options;
+	}
+
+  /**
+   * @see views_handler_field::options_form()
+   */
+  function options_form(&$form, &$form_state) {
+
+    $form['override'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Override with collaboration data'),
+      '#description' => t('If collaboration data is provided content of this field will be overriden when this is checked.'),
+      '#default_value' => isset($this->options['override']) ? $this->options['override'] : FALSE,
+    );
+
+    parent::options_form($form, $form_state);
+	}
+
   /**
    * @see views_handler_field::render()
    */
   function render($extended_entity) {
-    $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
-    if ($details) {
-      return $details->getShortDescription();
+
+    if ($this->options['override']) {
+      $short_description = 'This short description is overriden';
+    }
+    else {
+      $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
+      if ($details) {
+        $short_description = $details->getShortDescription();
+      }
     }
+    return $short_description;
   }
 
 }
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index fc7c8fbe..e345a019 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -11,6 +11,7 @@ class views_handler_field_cdb_item_title extends views_handler_field {
   function option_definition() {
     $options = parent::option_definition();
 
+    $options['override'] = array('default' => FALSE);
     $options['link'] = array('default' => FALSE);
 
     return $options;
@@ -21,6 +22,13 @@ class views_handler_field_cdb_item_title extends views_handler_field {
    */
   function options_form(&$form, &$form_state) {
 
+    $form['override'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Override with collaboration data'),
+      '#description' => t('If collaboration data is provided content of this field will be overriden when this is checked.'),
+      '#default_value' => isset($this->options['override']) ? $this->options['override'] : FALSE,
+    );
+
     $form['link'] = array(
       '#type' => 'checkbox',
       '#title' => t('Link the title to the detail page'),
@@ -36,7 +44,12 @@ class views_handler_field_cdb_item_title extends views_handler_field {
    */
   function render($extended_entity) {
 
-    $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+    if ($this->options['override']) {
+      $title = 'This title is overriden';
+    }
+    else {
+      $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+    }
 
     if ($this->options['link']) {
       return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);
diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
index 93b21634..f1e8e29f 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_daterange.inc
@@ -5,16 +5,20 @@
  */
 class views_handler_filter_culturefeed_search_daterange extends views_handler_filter {
 
-  private $start_date;
+  private $option_absolute;
+	private $start_date;
   private $end_date;
+	private $relative_date;
 
   /**
    * @see views_handler_filter::init()
    */
   function init(&$view, &$options) {
     parent::init($view, $options);
+		$this->option_absolute = $this->options['option_absolute'];
     $this->start_date = $this->options['start_date'];
     $this->end_date = $this->options['end_date'];
+		$this->relative_date = $this->options['relative_date'];
   }
 
   /**
@@ -23,8 +27,10 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
   function option_definition() {
 
     $options = parent::option_definition();
+		$options['option_absolute'] = array('default' => 0);
     $options['start_date'] = array('default' => '');
     $options['end_date'] = array('default' => '');
+		$options['relative_date'] = array('default' => '');
 
     return $options;
 
@@ -34,13 +40,28 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    * @see views_handler_filter::value_form()
    */
   function value_form(&$form, &$form_state) {
+		$form['option_absolute'] = array(
+			'#type' => 'radios',
+			'#title' => t('Absolute or relative date'),
+			'#default_value' => $this->option_absolute,
+			'#options' => array(
+				0 => t('Absolute'),
+				1 => t('Relative')
+			),
+			'#description' => t('Do you want to use an absolute start date or a relative one?'),
+		);
     $form['start_date'] = array(
       '#type' => 'textfield',
       '#title' => t('Start date'),
       '#size' => 30,
       '#default_value' => $this->start_date,
       '#description' => t('Format: !date_format', array('!date_format' => date('d/m/Y'))),
-      '#required' => TRUE,
+      //'#required' => TRUE,
+			'#states' => array(
+				'visible' => array(
+					':input[name="options[option_absolute]"]' => array('value' => 0),
+				),
+			),
     );
     $form['end_date'] = array(
       '#type' => 'textfield',
@@ -48,7 +69,24 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
       '#size' => 30,
       '#default_value' => $this->end_date,
       '#description' => t('Format: !date_format', array('!date_format' => date('d/m/Y'))),
+			'#states' => array(
+				'visible' => array(
+					':input[name="options[option_absolute]"]' => array('value' => 0),
+				),
+			),
     );
+		$form['relative_date'] = array(
+			'#type' => 'textfield',
+			'#title' => t('Relative date'),
+			'#size' => 30,
+			'#default_value' => $this->relative_date,
+			'#description' => t('A relative date starting from now. For eg. +2 weeks, tomorrow.'),
+			'#states' => array(
+				'visible' => array(
+					':input[name="options[option_absolute]"]' => array('value' => 1),
+				),
+			),
+		);
   }
 
   /**
@@ -56,18 +94,34 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    */
   function value_validate($form, &$form_state) {
 
-    $startDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['start_date']);
-    if (!$startDate) {
-      form_set_error('start_date', t('The entered start date is not in the correct format'));
-    }
-
-    if (!empty($form_state['values']['options']['start_date'])) {
-      $endDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['start_date']);
-      if (!$endDate) {
-        form_set_error('start_date', t('The entered end date is not in the correct format'));
-      }
-    }
-
+		$optionAbsolute = $form_state['values']['options']['option_absolute'];
+
+		if ($optionAbsolute == 0) {
+			if (!empty($form_state['values']['options']['start_date'])) {
+				$startDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['start_date']);
+				if (!$startDate) {
+					form_set_error('start_date', t('The entered start date is not in the correct format'));
+				}
+			}
+
+			if (!empty($form_state['values']['options']['end_date'])) {
+				$endDate = DateTime::createFromFormat('d/m/Y', $form_state['values']['options']['end_date']);
+				if (!$endDate) {
+					form_set_error('start_date', t('The entered end date is not in the correct format'));
+				}
+			}
+		}
+		else if ($optionAbsolute == 1) {
+			if (!empty($form_state['values']['options']['relative_date'])) {
+				$now = new DateTime();
+				$rel_start_date = clone $now;
+				$rel_start_date->modify($this->relative_date);
+
+				if (!$rel_start_date) {
+					form_set_error('relative_date', t('The entered relative date is not in the correct format'));
+				}
+			}
+		}
   }
 
   /**
@@ -75,13 +129,28 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    */
   function admin_summary() {
 
-    if (!empty($this->end_date)) {
-      return check_plain(t('Between @start_date and @end_date', array('@start_date' => $this->start_date, '@end_date' => $this->end_date)));
-    }
-    else {
-      return check_plain($this->start_date);
-    }
-
+		if ($this->option_absolute == 0) {
+			if (!empty($this->end_date)) {
+				return check_plain(t('Between @start_date and @end_date', array(
+					'@start_date' => $this->start_date,
+					'@end_date' => $this->end_date
+				)));
+			}
+			else {
+				return check_plain($this->start_date);
+			}
+		}
+		else if ($this->option_absolute == 1) {
+			if (!empty($this->relative_date)) {
+				$now = new DateTime();
+				$rel_start_date = clone $now;
+				$rel_start_date->modify($this->relative_date);
+
+				return check_plain(t('Starting from @relative_start_date', array(
+					'@relative_start_date' => $rel_start_date->format('d/m/Y'),
+				)));
+			}
+		}
   }
 
   /**
@@ -89,21 +158,44 @@ class views_handler_filter_culturefeed_search_daterange extends views_handler_fi
    */
   function query() {
 
-    $startDate = DateTime::createFromFormat('d/m/Y', $this->start_date);
-    $endDate = $startDate;
-    if (!empty($this->end_date)) {
-      $endDate = DateTime::createFromFormat('d/m/Y', $this->end_date);
-    }
-
-    // Set start date time on beginning of the day.
-    $startDate->setTime(0, 0, 1);
-
-    // Set end date time to end of the day day, to it searches on full day.
-    $endDate->setTime(23, 59, 59);
-
-    $parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
-
-    $this->query->add_parameter($parameter);
+		if ($this->option_absolute == 0) {
+			$startDate = DateTime::createFromFormat('d/m/Y', $this->start_date);
+			$endDate = $startDate;
+			if (!empty($this->end_date)) {
+				$endDate = DateTime::createFromFormat('d/m/Y', $this->end_date);
+			}
+
+			// Set start date time on beginning of the day.
+			if (!empty($startDate)) {
+				$startDate->setTime(0, 0, 1);
+			}
+
+			// Set end date time to end of the day day, to it searches on full day.
+			if (!empty($endDate)) {
+				$endDate->setTime(23, 59, 59);
+			}
+
+			if (!empty($startDate) && !empty($endDate)) {
+				$parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
+			}
+
+			if (isset($parameter)) {
+				$this->query->add_parameter($parameter);
+			}
+		}
+		else if ($this->option_absolute == 1) {
+			$now = new DateTime();
+			$rel_start_date = clone $now;
+			$rel_start_date->modify($this->relative_date);
+			$rel_start_date->format('d/m/Y');
+
+			// Set start date time on beginning of the day.
+			$rel_start_date->setTime(0, 0, 1);
+
+			$parameter = new \CultuurNet\Search\Parameter\DateRangeFilterQuery('startdate', $rel_start_date->getTimestamp(), '*');
+
+			$this->query->add_parameter($parameter);
+		}
 
   }
 
diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
index 638f4d8d..9bc485f3 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
@@ -10,33 +10,133 @@ class views_handler_filter_culturefeed_search_tags extends views_handler_filter_
    */
   function init(&$view, &$options) {
     parent::init($view, $options);
-    $this->search_field = 'keywords';
+		$this->operator = $this->options['operator'];
+		for ($i = 0; $i < 10; $i++) {
+			$this->keyword[$i]['inverse'] = $this->options['keyword'][$i]['not'];
+			$this->keyword[$i]['value'] = $this->options['keyword'][$i]['value'];
+		}
   }
 
+	/**
+	 * @see views_handler_filter::option_definition()
+	 */
+	function option_definition() {
+
+		$options = parent::option_definition();
+		$options['operator'] = array('default' => 'or');
+		for ($i = 0; $i < 10; $i++) {
+			$options['keyword'][$i]['not'] = array('default' => FALSE);
+			$options['keyword'][$i]['value'] = array('default' => '');
+		}
+
+		return $options;
+
+	}
+
   /**
    * @see views_handler_filter::value_form()
    */
   function value_form(&$form, &$form_state) {
-    $form['value'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Keywords'),
-      '#size' => 30,
-      '#default_value' => $this->value,
-      '#description' => t('For OR use this syntax: Mijnkindopkamp OR UiTPAS Regio Aalst. AND not supplied yet.'),
-    );
+
+		$form['operator'] = array(
+			'#title' => t('How to apply filters on the query'),
+			'#description' => t('Select the operator for the search filters'),
+			'#type' => 'radios',
+			'#options' => array(
+				'and' => t('Use AND-operator'),
+				'or' => t('Use OR-operator'),
+			),
+			'#default_value' => $this->operator,
+		);
+
+		for ($i = 0; $i < 10; $i++) {
+
+				$form['keyword'][$i]['value'] = array(
+					'#title' => t('Keyword'),
+					'#type' => 'textfield',
+					'#default_value' => $this->keyword[$i]['value'],
+					'#maxlength' => 255,
+					'#attributes' => array(
+						'style' => 'float:left;'
+					),
+				);
+				$form['keyword'][$i]['not'] = array(
+					'#title' => t('Inverse'),
+					'#type' => 'checkbox',
+					'#default_value' => $this->keyword[$i]['inverse'],
+					'#attributes' => array(
+						'style' => 'float:left;'
+					),
+				);
+		}
   }
-  
+
   /**
    * @see views_handler_filter::query()
    */
   function query() {
 
-    $values = explode(' OR ', $this->getValue());
-    $keywords = array();
-    foreach ($values as $value) {
-      $keywords[] = '"' . str_replace('"', '\"', $value) . '"';
+		$operator = $this->operator;
+		$keywords = array();
+		$keywords_inverse = array();
+		for ($i = 0; $i < 10; $i++) {
+			if (!empty($this->keyword[$i]['value']) && $this->keyword[$i]['inverse'] == 1) {
+				$keywords_inverse[$i] = $this->keyword[$i]['value'];
+			}
+			else if (!empty($this->keyword[$i]['value'])) {
+				$keywords[$i] = $this->keyword[$i]['value'];
+			}
+		}
+
+		if ($operator == 'and') {
+			if (!empty($keywords)) {
+				$value_keywords = '(keywords:' . implode(' AND ', $keywords) . ')';
+				$value = $value_keywords;
+			}
+			if (!empty($keywords_inverse)) {
+				$value_inverse_keywords = '(!keywords:' . implode(' AND ', $keywords_inverse) . ')';
+				if (!empty($keywords)) {
+					$value .= ' AND ' . $value_inverse_keywords;
+				}
+				else {
+					$value = $value_inverse_keywords;
+				}
+			}
+		}
+		else if ($operator == 'or') {
+			if (!empty($keywords)) {
+				$value_keywords = '(keywords:' . implode(' OR ', $keywords) . ')';
+				$value = $value_keywords;
+			}
+			if (!empty($keywords_inverse)) {
+				$value_inverse_keywords = '(!keywords:' . implode(' OR ', $keywords_inverse) . ')';
+				if (!empty($keywords)) {
+					$value .= ' OR ' . $value_inverse_keywords;
+				}
+				else {
+					$value = $value_inverse_keywords;
+				}
+			}
+		}
+
+    if (isset($value)) {
+      $parameter = new \CultuurNet\Search\Parameter\FilterQuery($value);
+      $this->query->add_parameter($parameter);
     }
-    $this->query->add_where($this->options['group'], 'fq', $this->search_field . ':' . implode(' OR ', $keywords));
+
   }
 
+	/**
+	 * @see views_handler_filter::admin_summary()
+	 */
+	function admin_summary() {
+		$keywords = array();
+		foreach ($this->keyword as $keyword) {
+			if ($keyword['value'] != '') {
+				$keywords[] = $keyword['value'];
+			}
+		}
+		return implode(', ', $keywords);
+	}
+
 }
\ No newline at end of file
diff --git a/culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc b/culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
new file mode 100644
index 00000000..41aa969e
--- /dev/null
+++ b/culturefeed_search_views/views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @class
+ * Handler class for sorting on date.
+ */
+class views_handler_sort_culturefeed_search_weight extends views_handler_sort_culturefeed_search_base {
+
+  /**
+   * @see views_handler::init()
+   */
+  function init(&$view, &$options) {
+    parent::init($view, $options);
+    $this->sort_field = 'weight';
+  }
+
+}
\ No newline at end of file
diff --git a/culturefeed_search_views/views/views/upcoming.inc b/culturefeed_search_views/views/views/upcoming.inc
new file mode 100644
index 00000000..4acfbc4f
--- /dev/null
+++ b/culturefeed_search_views/views/views/upcoming.inc
@@ -0,0 +1,170 @@
+<?php
+
+$view = new view();
+$view->name = 'upcoming';
+$view->description = '';
+$view->tag = 'default';
+$view->base_table = 'cdb_items';
+$view->human_name = 'upcoming';
+$view->core = 7;
+$view->api_version = '3.0';
+$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+/* Display: Master */
+$handler = $view->new_display('default', 'Master', 'default');
+$handler->display->display_options['title'] = 'Binnenkort';
+$handler->display->display_options['use_more_always'] = FALSE;
+$handler->display->display_options['use_more_text'] = 'meer';
+$handler->display->display_options['access']['type'] = 'none';
+$handler->display->display_options['cache']['type'] = 'none';
+$handler->display->display_options['query']['type'] = 'views_query';
+$handler->display->display_options['exposed_form']['type'] = 'basic';
+$handler->display->display_options['exposed_form']['options']['submit_button'] = 'Pas toe';
+$handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Opnieuw instellen';
+$handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorteer op';
+$handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Stijgend';
+$handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Dalend';
+$handler->display->display_options['pager']['type'] = 'some';
+$handler->display->display_options['pager']['options']['items_per_page'] = '5';
+$handler->display->display_options['style_plugin'] = 'default';
+$handler->display->display_options['row_plugin'] = 'fields';
+/* Veld: UDB items: Afbeelding */
+$handler->display->display_options['fields']['picture']['id'] = 'picture';
+$handler->display->display_options['fields']['picture']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['picture']['field'] = 'picture';
+$handler->display->display_options['fields']['picture']['label'] = '';
+$handler->display->display_options['fields']['picture']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['picture']['override'] = 0;
+$handler->display->display_options['fields']['picture']['width'] = '300';
+$handler->display->display_options['fields']['picture']['height'] = '300';
+$handler->display->display_options['fields']['picture']['link'] = 0;
+/* Veld: UDB items: Titel */
+$handler->display->display_options['fields']['title']['id'] = 'title';
+$handler->display->display_options['fields']['title']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['title']['field'] = 'title';
+$handler->display->display_options['fields']['title']['label'] = '';
+$handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['title']['override'] = 0;
+$handler->display->display_options['fields']['title']['link'] = 1;
+/* Veld: UDB items: Short Description */
+$handler->display->display_options['fields']['description']['id'] = 'description';
+$handler->display->display_options['fields']['description']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['description']['field'] = 'description';
+$handler->display->display_options['fields']['description']['label'] = '';
+$handler->display->display_options['fields']['description']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['description']['override'] = 0;
+/* Veld: UDB items: Kalendersamenvatting */
+$handler->display->display_options['fields']['when']['id'] = 'when';
+$handler->display->display_options['fields']['when']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['when']['field'] = 'when';
+$handler->display->display_options['fields']['when']['label'] = 'Wanneer';
+$handler->display->display_options['fields']['when']['element_label_colon'] = FALSE;
+/* Veld: UDB items: Locatie */
+$handler->display->display_options['fields']['location']['id'] = 'location';
+$handler->display->display_options['fields']['location']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['location']['field'] = 'location';
+$handler->display->display_options['fields']['location']['label'] = 'Waar';
+$handler->display->display_options['fields']['location']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['location']['show'] = array(
+  'city' => 'city',
+  'title' => 0,
+  'address' => 0,
+);
+/* Veld: UDB items: Link */
+$handler->display->display_options['fields']['link']['id'] = 'link';
+$handler->display->display_options['fields']['link']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['link']['field'] = 'link';
+$handler->display->display_options['fields']['link']['label'] = '';
+$handler->display->display_options['fields']['link']['element_label_colon'] = FALSE;
+/* Veld: UDB items: Categorie */
+$handler->display->display_options['fields']['category']['id'] = 'category';
+$handler->display->display_options['fields']['category']['table'] = 'cdb_items';
+$handler->display->display_options['fields']['category']['field'] = 'category';
+$handler->display->display_options['fields']['category']['label'] = '';
+$handler->display->display_options['fields']['category']['element_label_colon'] = FALSE;
+$handler->display->display_options['fields']['category']['link'] = 1;
+/* Sort criterion: UDB items: Gewicht */
+$handler->display->display_options['sorts']['weight_sort']['id'] = 'weight_sort';
+$handler->display->display_options['sorts']['weight_sort']['table'] = 'cdb_items';
+$handler->display->display_options['sorts']['weight_sort']['field'] = 'weight_sort';
+$handler->display->display_options['sorts']['weight_sort']['order'] = 'DESC';
+/* Sort criterion: UDB items: Datum */
+$handler->display->display_options['sorts']['date']['id'] = 'date';
+$handler->display->display_options['sorts']['date']['table'] = 'cdb_items';
+$handler->display->display_options['sorts']['date']['field'] = 'date';
+$handler->display->display_options['sorts']['date']['order'] = 'ASC';
+/* Filter criterion: UDB items: Has Image */
+$handler->display->display_options['filters']['hasimage']['id'] = 'hasimage';
+$handler->display->display_options['filters']['hasimage']['table'] = 'cdb_items';
+$handler->display->display_options['filters']['hasimage']['field'] = 'hasimage';
+$handler->display->display_options['filters']['hasimage']['group'] = 1;
+/* Filter criterion: UDB items: Datum */
+$handler->display->display_options['filters']['date']['id'] = 'date';
+$handler->display->display_options['filters']['date']['table'] = 'cdb_items';
+$handler->display->display_options['filters']['date']['field'] = 'date';
+$handler->display->display_options['filters']['date']['group'] = 1;
+$handler->display->display_options['filters']['date']['option_absolute'] = '1';
+$handler->display->display_options['filters']['date']['relative_date'] = '+2 weeks';
+/* Filter criterion: UDB items: Labels */
+$handler->display->display_options['filters']['tags']['id'] = 'tags';
+$handler->display->display_options['filters']['tags']['table'] = 'cdb_items';
+$handler->display->display_options['filters']['tags']['field'] = 'tags';
+$handler->display->display_options['filters']['tags']['group'] = 1;
+$handler->display->display_options['filters']['tags']['keyword'] = array(
+  0 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  1 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  2 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  3 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  4 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  5 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  6 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  7 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  8 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+  9 => array(
+    'value' => '',
+    'not' => 0,
+  ),
+);
+
+/* Display: Block */
+$handler = $view->new_display('block', 'Block', 'block');
+$translatables['upcoming'] = array(
+  t('Master'),
+  t('Binnenkort'),
+  t('meer'),
+  t('Pas toe'),
+  t('Opnieuw instellen'),
+  t('Sorteer op'),
+  t('Stijgend'),
+  t('Dalend'),
+  t('Wanneer'),
+  t('Waar'),
+  t('Block'),
+);
diff --git a/culturefeed_ui/culturefeed_ui.module b/culturefeed_ui/culturefeed_ui.module
index 484d2f96..0c0b19f9 100644
--- a/culturefeed_ui/culturefeed_ui.module
+++ b/culturefeed_ui/culturefeed_ui.module
@@ -488,3 +488,23 @@ function culturefeed_ui_page_build() {
     culturefeed_ui_set_cookies_message();
   }
 }
+
+/**
+ * Implements hook_metatag_page_cache_cid_parts_alter().
+ */
+function culturefeed_ui_metatag_page_cache_cid_parts_alter(&$cid_parts) {
+
+  // Create unique cid for the cf profile edit screens.
+  $edit_screens = array(
+    'profile',
+    'account',
+    'emails',
+    'activities',
+    'searches',
+    'calendar'
+  );
+  if (arg(0) == 'culturefeed' && in_array(arg(1), $edit_screens)) {
+    $cid_parts['cf_uid'] = DrupalCultureFeed::getLoggedInUserId();
+  }
+
+}
\ No newline at end of file
diff --git a/culturefeed_uitpas/culturefeed_uitpas.blocks.inc b/culturefeed_uitpas/culturefeed_uitpas.blocks.inc
index fa54ac1a..c0c00cf6 100644
--- a/culturefeed_uitpas/culturefeed_uitpas.blocks.inc
+++ b/culturefeed_uitpas/culturefeed_uitpas.blocks.inc
@@ -113,11 +113,11 @@ function culturefeed_uitpas_block_view($delta = '') {
     case 'uitpas_event_details_advantages':
       module_load_include('inc', 'culturefeed_uitpas', 'includes/event_details_advantages');
       $content = culturefeed_uitpas_event_details_advantages_get();
+
       if ($content) {
 
         $block['subject'] = t("UiTPAS Advantages");
         $block['content'] = $content;
-
       }
       break;
 
diff --git a/culturefeed_uitpas/culturefeed_uitpas.theme.inc b/culturefeed_uitpas/culturefeed_uitpas.theme.inc
index 0e382a50..ad32d790 100644
--- a/culturefeed_uitpas/culturefeed_uitpas.theme.inc
+++ b/culturefeed_uitpas/culturefeed_uitpas.theme.inc
@@ -111,6 +111,14 @@ function culturefeed_uitpas_theme() {
       'file' => 'theme.inc',
       'template' => 'culturefeed-uitpas-profile-summary',
     ),
+		'culturefeed_uitpas_event_details_advantages' => array(
+			'variables' => array(
+        'items' => array(),
+      ),
+      'path' => drupal_get_path('module', 'culturefeed_uitpas') . '/theme',
+      'file' => 'theme.inc',
+      'template' => 'culturefeed-uitpas-event-details-advantages',
+		),
     'culturefeed_uitpas_promotion' => array(
       'variables' => array('promotion' => NULL),
       'path' => drupal_get_path('module', 'culturefeed_uitpas') . '/theme',
diff --git a/culturefeed_uitpas/includes/event_details_advantages.inc b/culturefeed_uitpas/includes/event_details_advantages.inc
index a7e78d38..542ecfba 100644
--- a/culturefeed_uitpas/includes/event_details_advantages.inc
+++ b/culturefeed_uitpas/includes/event_details_advantages.inc
@@ -63,17 +63,24 @@ function culturefeed_uitpas_event_details_advantages_get() {
       $query->unexpired = TRUE;
       $result = $cf->uitpas()->getPromotionPoints($query);
 
-      if ($result->total && $event->locationId) {
+      if ($result->total) {
 
-        $item_list['items'][] = array(
-          'data' => l(t('Show advantages at') . ' ' .  $event->locationName , 'agenda/a/' . culturefeed_search_slug($event->locationName) . '/' . $event->locationId),
-          'class' => array('uitpas_has_promotion'),
-        );
+				foreach ($result->objects as $object) {
+					$item_list['items'][] = array(
+						'data' => l($object->title , 'promotion/' . culturefeed_search_slug($object->title) . '/' . $object->id),
+						'class' => array('uitpas_has_promotion'),
+					);
+				}
 
       }
-      
+
+			if ($event->locationId) {
+				$item_list['items'][] = array(
+					'data' => l(t('Show advantages at') . ' ' .  $event->locationName , 'agenda/a/' . culturefeed_search_slug($event->locationName) . '/' . $event->locationId),
+					'class' => array('uitpas_has_promotion'),
+				);
+			}
       else {
-        
         $item_list['items'][] = array(
           'data' => l(t('Show advantages at') . ' ' .  $event->organiserName , 'agenda/a/' . culturefeed_search_slug($event->organiserName) . '/' . $event->organiserId),
           'class' => array('uitpas_has_promotion'),
@@ -86,7 +93,10 @@ function culturefeed_uitpas_event_details_advantages_get() {
     }
 
     if (count($item_list['items'])) {
-      return theme('item_list', $item_list);
+			return array(
+				'#theme' => 'culturefeed_uitpas_event_details_advantages',
+				'#items' => $item_list['items'],
+			);
     }
 
   }
diff --git a/culturefeed_uitpas/includes/profile_advantages.inc b/culturefeed_uitpas/includes/profile_advantages.inc
index 4035fbbb..957c052e 100644
--- a/culturefeed_uitpas/includes/profile_advantages.inc
+++ b/culturefeed_uitpas/includes/profile_advantages.inc
@@ -20,7 +20,7 @@ function culturefeed_uitpas_profile_advantages_get() {
   if ($uitpas_user->user && $uitpas_user->passholder) {
 
     $card_system_id = variable_get('culturefeed_uitpas_cardsystem_id');
-    $uitpas_number = 0;
+
     if ($card_system_id && isset($uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber)) {
       $uitpas_number = $uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber;
     }
@@ -49,7 +49,7 @@ function culturefeed_uitpas_profile_advantages_get() {
     drupal_set_title(format_plural($uitpas_user->passholder->points, $singular, $plural), PASS_THROUGH);
 
   }
-  
+
   // Solution csdco on from https://www.drupal.org/node/1049354
   $_GET['q'] = 'promotions';
 
diff --git a/culturefeed_uitpas/includes/profile_promotions.inc b/culturefeed_uitpas/includes/profile_promotions.inc
index 5515829a..3e9a5adb 100644
--- a/culturefeed_uitpas/includes/profile_promotions.inc
+++ b/culturefeed_uitpas/includes/profile_promotions.inc
@@ -20,7 +20,7 @@ function culturefeed_uitpas_profile_promotions_get($filter = NULL) {
   if ($uitpas_user->user && $uitpas_user->passholder) {
 
     $card_system_id = variable_get('culturefeed_uitpas_cardsystem_id');
-    $uitpas_number = 0;
+
     if ($card_system_id && isset($uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber)) {
       $uitpas_number = $uitpas_user->passholder->cardSystemSpecific[$card_system_id]->currentCard->uitpasNumber;
     }
@@ -64,7 +64,7 @@ function culturefeed_uitpas_profile_promotions_get($filter = NULL) {
   }
 
   // Solution csdco on from https://www.drupal.org/node/1049354
-  $_GET['q'] = 'promotions';
+  $_GET['q'] = 'culturefeed/profile/uitpas/promotions';
 
   return array(
     array(
@@ -127,14 +127,14 @@ function culturefeed_uitpas_profile_promotions_filter_sort($form, $form_state) {
     '#markup' => '<li><a href="/culturefeed/profile/uitpas/advantages">' . t('Welcome Advantages') . '</a></li>',
   );
 
-  $uitpas_user = culturefeed_uitpas_get_uitpas_user();
-
-  $card_systems = $uitpas_user->passholder->cardSystemSpecific;
+	$cf = DrupalCultureFeed::getConsumerInstance();
+	$kind_of_card_systems = 'permanent';
+	$card_systems = $cf->uitpas()->getCardSystems($kind_of_card_systems);
 
   $options = array();
-  foreach ($card_systems as $system) {
-    $options[$system->cardSystem->id] = $system->cardSystem->name;
-  }
+	foreach ($card_systems as $system) {
+		$options[$system->id] = $system->name;
+	}
 
   $id = drupal_html_id('profile-promotions-filter-sort');
   $form['profile_promotions']['#prefix'] = '<div id="' . $id . '">';
diff --git a/culturefeed_uitpas/includes/promotions.inc b/culturefeed_uitpas/includes/promotions.inc
index a44935e3..cd85e4c6 100644
--- a/culturefeed_uitpas/includes/promotions.inc
+++ b/culturefeed_uitpas/includes/promotions.inc
@@ -128,8 +128,8 @@ function culturefeed_uitpas_promotions_filter_sort($form, $form_state) {
   );
 
   $cf = DrupalCultureFeed::getConsumerInstance();
-
-  $card_systems = $cf->uitpas()->getCardSystems();
+	$kind_of_card_systems = 'permanent';
+  $card_systems = $cf->uitpas()->getCardSystems($kind_of_card_systems);
 
   $filter = isset($form_state['values']['filter']) ? $form_state['values']['filter'] : (isset($_GET['filter']) ? $_GET['filter'] : NULL);
 
diff --git a/culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php b/culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php
new file mode 100644
index 00000000..8b0d3a0e
--- /dev/null
+++ b/culturefeed_uitpas/theme/culturefeed-uitpas-event-details-advantages.tpl.php
@@ -0,0 +1,6 @@
+<ul>
+
+	<?php foreach ($items as $item): ?>
+		<li class="<?php print $item['class'][0]; ?>"><?php print $item['data']; ?></li>
+	<?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index 3e145b10..243c8ba2 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -230,5 +230,22 @@ public static function addTranslationToActor(CultureFeed_Cdb_Item_Actor $actor,
   public static function removeTranslationFromActor(CultureFeed_Cdb_Item_Actor $actor, $lang) {
     self::getLoggedInUserInstance()->removeTranslationFromActor($actor, $lang);
   }
+  
+  /**
+   * @see CultureFeed_EntryApi::checkPermission()
+   */
+  public static function checkPermission($userid, $email, $ids) {
+    $permissions = (array)self::getLoggedInUserInstance()->checkPermission($userid, $email, $ids);
+    $parsed_permissons = array();
+    if (is_array($permissions['event'])) {
+      foreach ($permissions['event'] as $permission) {
+        $parsed_permissons[$permission->cdbid->__toString()] = $permission->editable->__toString();
+      }
+    }
+    else {
+      $parsed_permissons[$permissions['event']->cdbid->__toString()] = $permissions['event']->editable->__toString();
+    }
+    return $parsed_permissons;
+  }
 
 }
\ No newline at end of file

From b10d5e6a8b3664773f44de9a9b2ede08724f1d55 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 22 Apr 2015 14:33:03 +0200
Subject: [PATCH 112/275] MSS-151 rename fix

---
 culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info   | 2 +-
 culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
index 77e9bf5b..1c783d38 100644
--- a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
+++ b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
@@ -1,4 +1,4 @@
-name = CultureFeed MSS 151
+name = CultureFeed Cdb Upgrade
 description = Temporary module to enable cdb v 3.3.
 package = CultureFeed
 version = VERSION
diff --git a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
index c4ef773f..effaed7a 100644
--- a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
+++ b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
@@ -8,7 +8,7 @@
 /**
  * Implements hook_culturefeed_search_service_created().
  */
-function culturefeed_mss_151_culturefeed_search_service_created($service) {
+function culturefeed_cdb_upgrade_culturefeed_search_service_created($service) {
 
   /** @var \CultuurNet\Search\Guzzle\Service $service */
   // Temporary workaround to set CDB to 3.3

From 7be16a0fcc7fae59f999609b2688f230bc54cb84 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 22 Apr 2015 15:27:10 +0200
Subject: [PATCH 113/275] fix bug found on caching actor suggestions when
 analysing UIV-1118

---
 .../lib/Drupal/DrupalCultureFeedSearchService_Cache.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
index 79285f71..d7eec71e 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService_Cache.php
@@ -129,7 +129,12 @@ public function searchPages($parameters = array()) {
    */
   public function searchSuggestions($search_string, $types = array(), $past = FALSE, $extra_parameters = array()) {
 
-    $cid = sprintf('suggestions:%s', md5($search_string . implode('|', $types) . $past . implode('|', $extra_parameters)));
+    $extra_parameters_string = '';
+    foreach ($extra_parameters as $extra_parameter) {
+      $extra_parameters_string = $extra_parameter->getValue() .'|';
+    }
+
+    $cid = sprintf('suggestions:%s', md5($search_string . implode('|', $types) . $past . $extra_parameters_string));
     if ($cache = $this->cacheGet($cid)) {
       return $cache->data;
     }

From 54d5bf9d5205ebeda00ccfd50604ab93b6421ca2 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 22 Apr 2015 16:42:46 +0200
Subject: [PATCH 114/275] only use chkperm when user hase permission to edit
 events and copypaste bug on default organiser

---
 culturefeed_entry_ui/culturefeed_entry_ui.module             | 2 +-
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index b9c90b8d..f7f1e6df 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -140,7 +140,7 @@ function culturefeed_entry_ui_menu_local_tasks_alter(&$data, $router_item, $root
   }
   
   $culturefeed_user = DrupalCultureFeed::getLoggedInUser();
-  if ($culturefeed_user) {
+  if ($culturefeed_user && user_access('edit culturefeed events')) {
     $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($culturefeed_user->id, $culturefeed_user->mbox, array('ids' => $event->getId()));
   }
   
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 56443c73..8151b575 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -86,7 +86,7 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     // Default organiser.
     if ($organiser = $event->getOrganiser()) {
       $default_organiser_label = $organiser->getLabel();
-      $default_organiser_id = $location->getCdbId();
+      $default_organiser_id = $organiser->getCdbId();
     }
 
     // Default calendar type, start / end date, weekscheme data.

From c07d4ea61bbb47176d456746c0ae02e5ab275c61 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Thu, 23 Apr 2015 11:08:10 +0200
Subject: [PATCH 115/275] remove noindex on keyword searches

---
 culturefeed_agenda/lib/Drupal/AgendaSearchPage.php |  5 +++++
 culturefeed_search_ui/includes/helpers.inc         | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/culturefeed_agenda/lib/Drupal/AgendaSearchPage.php b/culturefeed_agenda/lib/Drupal/AgendaSearchPage.php
index 8ae51110..42ecbe52 100644
--- a/culturefeed_agenda/lib/Drupal/AgendaSearchPage.php
+++ b/culturefeed_agenda/lib/Drupal/AgendaSearchPage.php
@@ -317,6 +317,11 @@ public function getPageDescription() {
         $message .= t(" with theme @theme", array('@theme' => $term));
       }
 
+      if (!empty($query['keyword'])) {
+        $keyword = $query['keyword'];
+        $message .= t(" with keyword @keyword", array('@keyword' => $keyword));
+      }
+
     }
 
     return $message;
diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 4a6b0953..85efa3e3 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -166,6 +166,18 @@ function culturefeed_search_ui_set_noindex_metatag() {
 
     }
 
+    // No index is FALSE, if user is filtering on keyword without additional facets.
+    elseif (isset($query['keyword'])) {
+
+      unset($query['keyword']);
+
+      // If keyword was the only filter set noindex to false.
+      if (count($query) == 0) {
+        $noindex = FALSE;
+      }
+
+    }
+
   }
 
   // Add the "noindex, follow" meta tag if needed.

From b0613a3ffc39f2a07c6be61fd5a4d244c4346f19 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Thu, 23 Apr 2015 11:46:36 +0200
Subject: [PATCH 116/275] update translations for culturefeed_agenda

---
 culturefeed_agenda/includes/blocks.inc        |   2 +-
 .../translations/culturefeed_agenda.nl.po     | 177 +++++++++---------
 2 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
index 82b9cee1..69b901e9 100644
--- a/culturefeed_agenda/includes/blocks.inc
+++ b/culturefeed_agenda/includes/blocks.inc
@@ -473,7 +473,7 @@ function culturefeed_agenda_block_actor_search_form($form, &$form_state) {
     '#size' => 28,
     '#title' => t('Search string'),
     '#title_display' => 'invisible',
-    '#attributes' => array('class' => array('auto-submit-field'), 'placeholder' => t('Plaats of naam')),
+    '#attributes' => array('class' => array('auto-submit-field'), 'placeholder' => t('Venue name or location')),
     '#autocomplete_path' => 'autocomplete/culturefeed/agenda/actor-search'
   );
 
diff --git a/culturefeed_agenda/translations/culturefeed_agenda.nl.po b/culturefeed_agenda/translations/culturefeed_agenda.nl.po
index 28924358..52d10021 100644
--- a/culturefeed_agenda/translations/culturefeed_agenda.nl.po
+++ b/culturefeed_agenda/translations/culturefeed_agenda.nl.po
@@ -25,12 +25,13 @@
 #  theme/culturefeed-agenda-actor-program.tpl.php: n/a
 #  theme/culturefeed-agenda-block-nearby-activities.tpl.php: n/a
 #  theme/culturefeed-agenda-nearby-activities-list.tpl.php: n/a
+#  theme/culturefeed-agenda-organiser-events.tpl.php: n/a
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2015-03-18 20:21+0100\n"
-"PO-Revision-Date: 2015-03-18 20:33+0100\n"
+"POT-Creation-Date: 2015-04-23 11:36+0200\n"
+"PO-Revision-Date: 2015-04-23 11:37+0100\n"
 "Last-Translator: Luk Dens <luk.dens@cultuurnet.be>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
@@ -39,76 +40,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: culturefeed_agenda.module:297
+#: culturefeed_agenda.module:304
 msgid "Agenda"
 msgstr "Agenda"
 
-#: culturefeed_agenda.module:298
+#: culturefeed_agenda.module:305
 msgid "Activities"
 msgstr "Activiteiten"
 
-#: culturefeed_agenda.module:303
+#: culturefeed_agenda.module:310
 msgid "Relevance"
 msgstr "Relevantie"
 
-#: culturefeed_agenda.module:310
+#: culturefeed_agenda.module:317
 msgid "Date"
 msgstr "Datum"
 
-#: culturefeed_agenda.module:316 theme/culturefeed-event.tpl.php:138
+#: culturefeed_agenda.module:323 theme/culturefeed-event.tpl.php:138
 msgid "Age"
 msgstr "Leeftijd"
 
-#: culturefeed_agenda.module:322
+#: culturefeed_agenda.module:329
 msgid "Popularity"
 msgstr "Waardering"
 
-#: culturefeed_agenda.module:328 theme/culturefeed-event.tpl.php:12
+#: culturefeed_agenda.module:335 theme/culturefeed-event.tpl.php:12
 #: theme/culturefeed-production.tpl.php:12
 msgid "Reactions"
 msgstr "Aantal reacties"
 
-#: culturefeed_agenda.module:334
+#: culturefeed_agenda.module:341
 msgid "Importance"
 msgstr "Relevantie"
 
-#: culturefeed_agenda.module:353
+#: culturefeed_agenda.module:360
 msgid "Culturefeed agenda: related activities"
 msgstr ""
 
-#: culturefeed_agenda.module:358
+#: culturefeed_agenda.module:365
 msgid "Culturefeed agenda: nearby activities"
 msgstr ""
 
-#: culturefeed_agenda.module:363
+#: culturefeed_agenda.module:370
 msgid "Culturefeed agenda: search events"
 msgstr ""
 
-#: culturefeed_agenda.module:368
+#: culturefeed_agenda.module:375
 msgid "Culturefeed agenda: actor program"
 msgstr ""
 
-#: culturefeed_agenda.module:373
+#: culturefeed_agenda.module:380
 msgid "Culturefeed agenda: production program"
 msgstr ""
 
-#: culturefeed_agenda.module:378
+#: culturefeed_agenda.module:385
 msgid "Culturefeed agenda: actor search"
 msgstr ""
 
-#: culturefeed_agenda.module:383
+#: culturefeed_agenda.module:390
 msgid "Culturefeed agenda: Event types"
 msgstr ""
 
-#: culturefeed_agenda.module:400;517
+#: culturefeed_agenda.module:395
+msgid "Culturefeed agenda: Organiser events"
+msgstr ""
+
+#: culturefeed_agenda.module:412;523
 msgid "None"
 msgstr "Geen"
 
-#: culturefeed_agenda.module:403
+#: culturefeed_agenda.module:415
 msgid "Category type to search related events"
 msgstr "Categorie om relevante gegevens op te zoeken"
 
-#: culturefeed_agenda.module:407
+#: culturefeed_agenda.module:419
 msgid ""
 "The category type to use for searching related activities. Leave empty if "
 "you only want to search on range."
@@ -116,11 +121,11 @@ msgstr ""
 "De categorie om relevantie activiteiten op te zoeken. Je kan dit veld ook "
 "leeg laten."
 
-#: culturefeed_agenda.module:411
+#: culturefeed_agenda.module:423
 msgid "Radius to search in km"
 msgstr "In een straal van"
 
-#: culturefeed_agenda.module:414
+#: culturefeed_agenda.module:426
 msgid ""
 "Search on the given radius. Leave empty to skip radius search. Radius search "
 "will only be done when viewing an event."
@@ -128,123 +133,113 @@ msgstr ""
 "Storteer op straal. Laat leeg om straal niet op te nemen in de zoekopdracht. "
 "Zoek op straal gebeurt enkel wanneer je een activiteit bekijkt. "
 
-#: culturefeed_agenda.module:418
+#: culturefeed_agenda.module:430
 msgid "Extra filter query for the result set"
 msgstr "Verfijn je zoekopdracht"
 
-#: culturefeed_agenda.module:421;455
+#: culturefeed_agenda.module:433;461
 msgid "Make sure this is a correct solr query. Example title:mytitle"
 msgstr "Zorg ervoor dat de solr query juist is. Bijvoorbeeld title:mytitle"
 
-#: culturefeed_agenda.module:425
+#: culturefeed_agenda.module:441
 msgid "Sort field"
 msgstr "Sorteer veld"
 
-#: culturefeed_agenda.module:428
-msgid "Field to sort on. Example startdate"
-msgstr "Te sorteren veld. Bijvoorbeeld startdatum"
-
-#: culturefeed_agenda.module:432
-msgid "Sort direction"
-msgstr "Volgorde"
-
-#: culturefeed_agenda.module:435
-msgid "Ascending"
-msgstr "Oplopend"
-
-#: culturefeed_agenda.module:436
-msgid "Descending"
-msgstr "Aflopend"
+#: culturefeed_agenda.module:444
+msgid ""
+"Field + direction to sort on. Example permanent asc, availableto asc, weight "
+"desc"
+msgstr ""
 
-#: culturefeed_agenda.module:442
+#: culturefeed_agenda.module:448
 msgid "Items to show"
 msgstr "Te tonen items"
 
-#: culturefeed_agenda.module:452
+#: culturefeed_agenda.module:458
 msgid "Extra filter query"
 msgstr ""
 
-#: culturefeed_agenda.module:458
+#: culturefeed_agenda.module:464
 msgid "Distance for search area"
 msgstr ""
 
-#: culturefeed_agenda.module:461
+#: culturefeed_agenda.module:467
 msgid "Enter the number of kilometers to determine search reach."
 msgstr ""
 
-#: culturefeed_agenda.module:464
+#: culturefeed_agenda.module:470
 msgid "Results sort option"
 msgstr ""
 
-#: culturefeed_agenda.module:467
+#: culturefeed_agenda.module:473
 msgid "Enter the solr sort option."
 msgstr ""
 
-#: culturefeed_agenda.module:470
+#: culturefeed_agenda.module:476;600
 msgid "Amount of results to show"
 msgstr ""
 
-#: culturefeed_agenda.module:473
+#: culturefeed_agenda.module:479;603
 msgid "Enter the number of results to show in the block."
 msgstr ""
 
-#: culturefeed_agenda.module:497 theme/theme.inc:963
+#: culturefeed_agenda.module:503 theme/theme.inc:965
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: culturefeed_agenda.module:521
+#: culturefeed_agenda.module:527
 msgid "Categories to show in the dropdown"
 msgstr "Te tonen categorieën in de keuzelijst"
 
-#: culturefeed_agenda.module:533
+#: culturefeed_agenda.module:539
 msgid "Text to be shown on the search button"
 msgstr ""
 
-#: culturefeed_agenda.module:545
+#: culturefeed_agenda.module:551
 msgid "Search following types."
 msgstr ""
 
-#: culturefeed_agenda.module:546
+#: culturefeed_agenda.module:552
 msgid "Select the types of that can be shown in the autocomplete."
 msgstr ""
 
-#: culturefeed_agenda.module:555
+#: culturefeed_agenda.module:561
 msgid "Visibility settings."
 msgstr ""
 
-#: culturefeed_agenda.module:556
+#: culturefeed_agenda.module:562
 msgid "Select the eventtypes where tis block may be visible."
 msgstr ""
 
-#: culturefeed_agenda.module:584
+#: culturefeed_agenda.module:590
 msgid "Event types as menu item."
 msgstr ""
 
-#: culturefeed_agenda.module:585
+#: culturefeed_agenda.module:591
 msgid "Select the eventtypes as main menu items."
 msgstr ""
 
-#: culturefeed_agenda.module:1006
+#: culturefeed_agenda.module:1028
 msgid "Set location"
 msgstr "Kies andere plaats"
 
-#: culturefeed_agenda.module:1010 includes/blocks.inc:183
+#: culturefeed_agenda.module:1032 includes/blocks.inc:182
 msgid "Zipcode or city"
 msgstr "Postcode of gemeente"
 
-#: culturefeed_agenda.module:1016
+#: culturefeed_agenda.module:1038
 msgid "Ok"
 msgstr "Ok"
 
-#: culturefeed_agenda.module:150
+#: culturefeed_agenda.module:157
 msgid "Permalink"
 msgstr "Permalink"
 
-#: culturefeed_agenda.module:230 culturefeed_agenda.info:0
+#: culturefeed_agenda.module:237 culturefeed_agenda.info:0
 msgid "CultureFeed Agenda"
 msgstr "CultureFeed Agenda"
 
-#: culturefeed_agenda.module:231
+#: culturefeed_agenda.module:238
 msgid "Change CultureFeed Agenda settings"
 msgstr ""
 
@@ -284,10 +279,6 @@ msgstr "Alle categorieën"
 msgid "What"
 msgstr "Wat"
 
-#: includes/blocks.inc:433
-msgid "Search string"
-msgstr "Zoekopdracht"
-
 #: includes/blocks.inc:163
 #: theme/culturefeed-agenda-production-program.tpl.php:21
 #: theme/culturefeed-event-summary.tpl.php:51
@@ -310,21 +301,25 @@ msgstr "Alle data"
 msgid "Where"
 msgstr "Waar"
 
-#: includes/blocks.inc:188
+#: includes/blocks.inc:186
 msgid "Use my current location"
 msgstr "Gebruik mijn huidige locatie"
 
-#: includes/blocks.inc:356
+#: includes/blocks.inc:397
 msgid "Program schedule"
 msgstr "Programmatie"
 
-#: includes/blocks.inc:400
+#: includes/blocks.inc:441
 msgid "Actor"
 msgstr ""
 
-#: includes/blocks.inc:435
-msgid "Plaats of naam"
-msgstr ""
+#: includes/blocks.inc:474
+msgid "Search string"
+msgstr "Zoekopdracht"
+
+#: includes/blocks.inc:476
+msgid "Venue name or location"
+msgstr "Plaats of naam van locatie"
 
 #: includes/helpers.inc:13
 msgctxt "culturefeed-facets"
@@ -373,6 +368,10 @@ msgstr " van het type @type"
 msgid " with theme @theme"
 msgstr " (@theme)"
 
+#: lib/Drupal/AgendaSearchPage.php:322
+msgid " with keyword @keyword"
+msgstr " met trefwoord @keyword"
+
 #: theme/culturefeed-actor-short-summary.tpl.php:17
 #: theme/culturefeed-actor-summary.tpl.php:36
 #: theme/culturefeed-event-short-summary.tpl.php:21
@@ -427,6 +426,10 @@ msgstr "In jouw buurt"
 msgid "No nearby activities found"
 msgstr "Er werden geen activiteiten in jouw buurt gevonden"
 
+#: theme/culturefeed-agenda-organiser-events.tpl.php:14
+msgid "More of "
+msgstr "Meer van "
+
 #: theme/culturefeed-agenda-production-program.tpl.php:26;29
 #: theme/culturefeed-event.tpl.php:59;64
 msgid " at "
@@ -518,58 +521,58 @@ msgstr "gratis"
 msgid "Buy tickets"
 msgstr "Bestel tickets"
 
-#: theme/theme.inc:513
+#: theme/theme.inc:515
 msgid "multiple locations"
 msgstr "meerdere locaties"
 
-#: theme/theme.inc:514
+#: theme/theme.inc:516
 msgid "multiple dates"
 msgstr "meerdere data"
 
-#: theme/theme.inc:551;566
+#: theme/theme.inc:553;568
 msgid "on location in"
 msgstr "op locatie in"
 
-#: theme/theme.inc:573
+#: theme/theme.inc:575
 msgid "by appointment"
 msgstr "op afspraak"
 
-#: theme/theme.inc:687
+#: theme/theme.inc:689
 msgid "Other"
 msgstr "Andere"
 
-#: theme/theme.inc:748
+#: theme/theme.inc:750
 msgid "Location: @location"
 msgstr "Plaats: @location"
 
-#: theme/theme.inc:751
+#: theme/theme.inc:753
 msgid "When: @when"
 msgstr "Wanneer: @when"
 
-#: theme/theme.inc:754
+#: theme/theme.inc:756
 msgid "Organisation: @organisation"
 msgstr "Organisatie: @organisation"
 
-#: theme/theme.inc:757
+#: theme/theme.inc:759
 msgid "Price: € @price"
 msgstr "Prijs: € @price"
 
-#: theme/theme.inc:760
+#: theme/theme.inc:762
 msgid "Order your tickets"
 msgstr "Bestel hier tickets"
 
-#: theme/theme.inc:797
+#: theme/theme.inc:799
 msgid "Address: @location"
 msgstr "Adres: @location"
 
-#: theme/theme.inc:800
+#: theme/theme.inc:802
 msgid "Phone number: @number"
 msgstr "Telefoon: @number"
 
-#: theme/theme.inc:964
+#: theme/theme.inc:966
 msgid "Filter"
 msgstr "Filter"
 
-#: theme/theme.inc:965
+#: theme/theme.inc:967
 msgid "Weight"
 msgstr "Gewicht"

From 47c72db63ab7af17cbc8aa6ab938d556b785fcf7 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Thu, 23 Apr 2015 14:02:56 +0200
Subject: [PATCH 117/275] UIV-1137 update translation for calendar

---
 culturefeed_calendar/translations/culturefeed_calendar.nl.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_calendar/translations/culturefeed_calendar.nl.po b/culturefeed_calendar/translations/culturefeed_calendar.nl.po
index e300022b..c5849de4 100644
--- a/culturefeed_calendar/translations/culturefeed_calendar.nl.po
+++ b/culturefeed_calendar/translations/culturefeed_calendar.nl.po
@@ -245,7 +245,7 @@ msgstr "Kalender bekijken"
 
 #: theme/culturefeed-calendar-page.tpl.php:9
 msgid "Calendar"
-msgstr "Agenda"
+msgstr "UiTkalender"
 
 #: theme/culturefeed-calendar-page.tpl.php:16
 msgid "This calendar has not been shared yet."

From aa8a538609a5cfcaa669571ddb79f0f5608ba9c9 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Thu, 23 Apr 2015 14:06:47 +0200
Subject: [PATCH 118/275] UIV-1137 remove translation conflict with calendar &
 agenda

---
 culturefeed_calendar/theme/culturefeed-calendar-page.tpl.php | 2 +-
 culturefeed_calendar/translations/culturefeed_calendar.nl.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_calendar/theme/culturefeed-calendar-page.tpl.php b/culturefeed_calendar/theme/culturefeed-calendar-page.tpl.php
index 95f59faa..4ea4f340 100644
--- a/culturefeed_calendar/theme/culturefeed-calendar-page.tpl.php
+++ b/culturefeed_calendar/theme/culturefeed-calendar-page.tpl.php
@@ -6,7 +6,7 @@
 ?>
 
 <div>
-  <h1><?php print t('Calendar') ?></h1>
+  <h1><?php print t('Personal calendar') ?></h1>
   <?php if (!empty($user_name)) : ?>
     <?php print $user_name ?>
   <?php endif; ?>
diff --git a/culturefeed_calendar/translations/culturefeed_calendar.nl.po b/culturefeed_calendar/translations/culturefeed_calendar.nl.po
index c5849de4..4674a5b1 100644
--- a/culturefeed_calendar/translations/culturefeed_calendar.nl.po
+++ b/culturefeed_calendar/translations/culturefeed_calendar.nl.po
@@ -244,7 +244,7 @@ msgid "View your calendar"
 msgstr "Kalender bekijken"
 
 #: theme/culturefeed-calendar-page.tpl.php:9
-msgid "Calendar"
+msgid "Personal calendar"
 msgstr "UiTkalender"
 
 #: theme/culturefeed-calendar-page.tpl.php:16

From 3ad57f7bea60961e6bcadc49496d808fe77d0d1a Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 23 Apr 2015 14:19:50 +0200
Subject: [PATCH 119/275] UIV-1225 group by event_production in
 culturefeed_search_views

---
 ...iews_handler_filter_culturefeed_search_group.inc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc
index 10f9c98d..a028d4b6 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc
@@ -11,10 +11,14 @@ class views_handler_filter_culturefeed_search_group extends views_handler_filter
    */
   function value_form(&$form, &$form_state) {
     $form['value'] = array(
-      '#type' => 'textfield',
+      '#type' => 'radios',
       '#title' => t('Group'),
-      '#size' => 30,
-      '#default_value' => $this->value,
+      '#options' => array(
+        'event' => 'event',
+        'event_production' => 'event_production',
+      ),
+      '#description' => t('If one or more events are related to a production, they can be grouped by production by choosing "event_produciton".'),
+      '#default_value' => isset($this->value) ? $this->value : 'event',
     );
   }
 
@@ -24,7 +28,8 @@ class views_handler_filter_culturefeed_search_group extends views_handler_filter
   function query() {
 
     $value = $this->getValue();
-    $value = '"' . str_replace('"', '\"', $value) . '"';
+    // Removed this line for UIV-1225.
+    //$value = '"' . str_replace('"', '\"', $value) . '"';
 
     $this->query->add_parameter(new \CultuurNet\Search\Parameter\Group($value));
   }

From 5f9d2cd23b691a05a8a6917db06f8ac08c50cc61 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 24 Apr 2015 08:52:07 +0200
Subject: [PATCH 120/275] fix typo

---
 .../filter/views_handler_filter_culturefeed_search_group.inc    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc
index a028d4b6..cfe945b8 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_group.inc
@@ -17,7 +17,7 @@ class views_handler_filter_culturefeed_search_group extends views_handler_filter
         'event' => 'event',
         'event_production' => 'event_production',
       ),
-      '#description' => t('If one or more events are related to a production, they can be grouped by production by choosing "event_produciton".'),
+      '#description' => t('If one or more events are related to a production, they can be grouped by production by choosing "event_production".'),
       '#default_value' => isset($this->value) ? $this->value : 'event',
     );
   }

From 63ae614bdd911b84e6e80c1764547167ef7beca1 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 24 Apr 2015 12:57:11 +0200
Subject: [PATCH 121/275] UIV-1232 use 00:00:00 as startdate instead of
 00:00:01

---
 culturefeed_agenda/translations/culturefeed_agenda.nl.po   | 2 +-
 culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_agenda/translations/culturefeed_agenda.nl.po b/culturefeed_agenda/translations/culturefeed_agenda.nl.po
index 28924358..eedc39be 100644
--- a/culturefeed_agenda/translations/culturefeed_agenda.nl.po
+++ b/culturefeed_agenda/translations/culturefeed_agenda.nl.po
@@ -125,7 +125,7 @@ msgid ""
 "Search on the given radius. Leave empty to skip radius search. Radius search "
 "will only be done when viewing an event."
 msgstr ""
-"Storteer op straal. Laat leeg om straal niet op te nemen in de zoekopdracht. "
+"Sorteer op straal. Laat leeg om straal niet op te nemen in de zoekopdracht. "
 "Zoek op straal gebeurt enkel wanneer je een activiteit bekijkt. "
 
 #: culturefeed_agenda.module:418
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 1faa2c56..053c29ec 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -412,7 +412,7 @@ protected function addFacetFilters($params) {
         }
 
         // Set start date time on beginning of the day.
-        $startDate->setTime(0, 0, 1);
+        $startDate->setTime(0, 0, 0);
 
         // Set end date time to end of the day day, to it searches on full day.
         $endDate->setTime(23, 59, 59);

From d6f77dabd647c49b0c5782a8df7f905da2117d4b Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Fri, 24 Apr 2015 16:02:33 +0200
Subject: [PATCH 122/275] MSS-153 initial form

---
 .../culturefeed_cdb_upgrade.module            | 13 +++
 .../includes/culturefeed_entry_ui.pages.inc   | 96 +++++++++++++------
 2 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
index effaed7a..d184b5d4 100644
--- a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
+++ b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
@@ -17,3 +17,16 @@ function culturefeed_cdb_upgrade_culturefeed_search_service_created($service) {
   $service->setHttpClientFactory($client_factory);
 
 }
+
+/**
+ * Returns the version number.
+ */
+function culturefeed_cdb_upgrade_get_schema_version_number() {
+
+  $schema_name = CultureFeed_Cdb_Default::CDB_SCHEME_URL;
+  $pattern = '/(http:\/\/www.cultuurdatabank.com\/XMLSchema\/CdbXSD\/)(.*)(\/FINAL)/';
+  $matches = array();
+  preg_match($pattern, $schema_name, $matches);
+  return $matches[2];
+
+}
\ No newline at end of file
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 56443c73..d46d2dcd 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2194,47 +2194,85 @@ function culturefeed_entry_ui_delete_event_form_submit($form, &$form_state) {
 function culturefeed_entry_ui_edit_tags_form($form, $form_state, $event) {
 
   $form = array();
+  /** @var \CultuurNet\Search\ActivityStatsExtendedEntity $event */
   $event = $event->getEntity();
-  $event_tags = $event->getKeywords();
-  $form['#old_tags'] = $event_tags;
 
-  $custom_tags = array();
+  // CDB Scheme < 3.3.
+  if (version_compare(culturefeed_cdb_upgrade_get_schema_version_number(), '3.3')) {
 
-  // Get options from variable.
-  if (variable_get('culturefeed_entry_ui_custom_tags')) {
-    $custom_options = explode("\n", variable_get('culturefeed_entry_ui_custom_tags'));
-  }
+    /** @var \CultureFeed_Cdb_Item_Event $event */
+    $event_tags = $event->getKeywords();
+    $form['#old_tags'] = $event_tags;
+    $custom_tags = array();
 
-  // Filter out custom tags.
-  if ($event_tags) {
-    foreach ($event_tags as $tag) {
-      if (isset($custom_options) && array_key_exists($tag, $custom_options)) {
-        unset($event_tags[$tag]);
-        $custom_tags[$tag] = $tag;
+    // Get options from variable.
+    if (variable_get('culturefeed_entry_ui_custom_tags')) {
+      $custom_options = explode("\n", variable_get('culturefeed_entry_ui_custom_tags'));
+    }
+
+    // Filter out custom tags.
+    if ($event_tags) {
+      foreach ($event_tags as $tag) {
+        if (isset($custom_options) && array_key_exists($tag, $custom_options)) {
+          unset($event_tags[$tag]);
+          $custom_tags[$tag] = $tag;
+        }
       }
     }
+    else {
+      $event_tags = array();
+    }
+
+    $form['#object_id'] = $event->getCdbId();
+
+    if (user_access('manage custom tags') && !empty($custom_options)) {
+      $form['custom_tags'] = array(
+        '#type' => 'checkboxes',
+        '#options' => $custom_options,
+        '#title' => t('Custom tags'),
+        '#default_value' => $custom_tags,
+      );
+    }
+
+    $form['tags'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Tags'),
+      '#default_value' => implode(';', $event_tags),
+      '#description' => t('Seperate multiple tags by ;'),
+    );
+
   }
+
+  // CDB Scheme >= 3.3.
   else {
-    $event_tags = array();
-  }
 
-  $form['#object_id'] = $event->getCdbId();
+    /** @var \CultureFeed_Cdb_Item_Event $event */
+    $event_tags = $event->getKeywords(TRUE);
+    /** @var \CultureFeed_Cdb_Data_Keyword[] $event_tags */
 
-  if (user_access('manage custom tags') && !empty($custom_options)) {
-    $form['custom_tags'] = array(
-      '#type' => 'checkboxes',
-      '#options' => $custom_options,
-      '#title' => t('Custom tags'),
-      '#default_value' => $custom_tags,
+    $form['#old_tags'] = $event_tags;
+
+    $form['tags'] = array(
+      '#type' => 'fieldset',
     );
-  }
 
-  $form['tags'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Tags'),
-    '#default_value' => implode(';', $event_tags),
-    '#description' => t('Seperate multiple tags by ;'),
-  );
+    foreach ($event_tags as $tag) {
+
+      $form['tags'][$tag->getValue()] = array(
+        '#type' => 'fieldset',
+        'value' => array(
+          '#type' => 'textfield',
+          '#default_value' => $tag->getValue(),
+        ),
+        'visible' => array(
+          '#type' => 'checkbox',
+          '#default_value' => $tag->isVisible(),
+        ),
+      );
+
+    }
+
+  }
 
   $form['submit'] = array(
     '#type' => 'submit',

From d553638c6ec6cef968099a2983aa726818df8b92 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Fri, 24 Apr 2015 16:13:20 +0200
Subject: [PATCH 123/275] UIV-1203 changed youtube embed modus to html5

---
 culturefeed_search_ui/includes/helpers.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 85efa3e3..1c507f9b 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -10,7 +10,7 @@
 function _culturefeed_search_ui_video_url_to_embed($url) {
 
   // Construct embed url.
-  $embed_url = str_replace('watch', 'v', $url);
+  $embed_url = str_replace('watch', 'embed', $url);
 
   $video_parts = explode('?v=', $embed_url);
 
@@ -240,12 +240,12 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     $new_date = date("d/m/Y", strtotime($date));
     $new_query['date_range'] = $new_date;
   }
-  
+
   // Headings are now a combination of facets.
   if (isset($_GET['heading'])) {
-    
+
     $mapping = culturefeed_search_ui_get_headings_mapping($_GET['heading']);
-    
+
     // Voor kinderen is not a facet
     if (isset($mapping['voor_kinderen'])) {
       $new_query['voor-kinderen'] = '1';

From f0c87c569dc72d9bb9a8d1aebb5cb56d78fe62c2 Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Tue, 28 Apr 2015 12:12:03 +0200
Subject: [PATCH 124/275] UIV-996 add activity_type as variable

---
 culturefeed_social/culturefeed_social.module | 7 ++++---
 culturefeed_social/includes/blocks.inc       | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/culturefeed_social/culturefeed_social.module b/culturefeed_social/culturefeed_social.module
index 4749d206..ba499016 100644
--- a/culturefeed_social/culturefeed_social.module
+++ b/culturefeed_social/culturefeed_social.module
@@ -350,6 +350,7 @@ function culturefeed_social_theme() {
       'variables' => array(
         'activities_total' => NULL,
         'activity_link' => NULL,
+        'activity_type' => NULL,
         'list' => NULL,
       ),
       'template' => 'culturefeed-social-user-list-block-for-activity',
@@ -899,9 +900,9 @@ function culturefeed_social_base_report_abuse_form($form, &$form_state, $activit
     '#value' => t('Submit'),
     '#attributes' => array('style' => array('float:left')),
   );
-  
+
   $destination = drupal_get_destination();
-  
+
   $form['cancel'] = array(
     '#type' => 'link',
     '#title' => t('Cancel'),
@@ -1001,4 +1002,4 @@ function culturefeed_social_activity_title($activity) {
   }
 
   return $title;
-}
\ No newline at end of file
+}
diff --git a/culturefeed_social/includes/blocks.inc b/culturefeed_social/includes/blocks.inc
index cedee266..3f8f7084 100644
--- a/culturefeed_social/includes/blocks.inc
+++ b/culturefeed_social/includes/blocks.inc
@@ -372,6 +372,7 @@ function culturefeed_social_user_list_block_for_activity($object, $activity_type
 
   $content = array();
   $content['#theme'] = 'culturefeed_social_user_list_block_for_activity';
+  $content['#activity_type'] = $activity_type;
 
   if ($activities->total > 0) {
 

From 6d9dadae4992c6164fe6b03c1127e2b5e66c7a9c Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 28 Apr 2015 15:25:11 +0200
Subject: [PATCH 125/275] UIV-1247 don't show sort options on no-result page

---
 culturefeed_search_ui/theme/theme.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 6bf3da4e..59783706 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -457,6 +457,11 @@ function culturefeed_search_ui_preprocess_culturefeed_search_sort_links(&$variab
     return;
   }
 
+  $search_result = culturefeed_get_search_result();
+  if ($search_result->getTotalCount() == 0) {
+    return;
+  }
+
   $sort_options = culturefeed_search_ui_get_sort_options_for_page($search_page);
   $current_sort = isset($_GET['sort']) ? $_GET['sort'] : $sort_options[$sort_options['default']]['value'];
 

From ddc825df485d7ce549ca63aea792417155e8c76b Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 28 Apr 2015 15:26:31 +0200
Subject: [PATCH 126/275] UIV-1106 make it available to change location on
 no-result pages

---
 culturefeed_search_ui/includes/blocks.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index 1b4fe718..ce192461 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -293,7 +293,7 @@ function culturefeed_search_ui_block_city_facet() {
   }
 
   if ($culturefeedSearchResult->getTotalCount() == 0) {
-    return;
+    $noresults = TRUE;
   }
 
   $build = array();
@@ -319,6 +319,7 @@ function culturefeed_search_ui_block_city_facet() {
       '#theme' => 'culturefeed_search_facet',
       '#facet' => $facet,
       '#items' => $items,
+      '#noresults' => $noresults,
     );
 
     // If a postal was given. We can add proximity search.

From fe98a3f22815ffb0ea34dcbffa5ce4b569c8690b Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 28 Apr 2015 16:22:13 +0200
Subject: [PATCH 127/275] UIV-1106 hide location selector for empty results
 only when no location was set

---
 culturefeed_search_ui/includes/blocks.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index ce192461..c8054b04 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -294,6 +294,10 @@ function culturefeed_search_ui_block_city_facet() {
 
   if ($culturefeedSearchResult->getTotalCount() == 0) {
     $noresults = TRUE;
+    // Hide location selector for empty results only when no location was set.
+    if (empty($_GET['location'])) {
+      return;
+    }
   }
 
   $build = array();

From 1788b3bac7ad3af5fddc0e51b32a696f3525b6b1 Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Wed, 29 Apr 2015 14:41:16 +0200
Subject: [PATCH 128/275] UIV-1003 added class 'facet-search' on ul-items for
 facets, class 'many-facets' for ul-items with more then 10 li's,
 data-size-attribute keeps the number of items

---
 culturefeed_search_ui/theme/theme.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 6bf3da4e..4956c61a 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -81,10 +81,13 @@ function theme_culturefeed_search_facet_with_depth_settings($variables) {
   drupal_alter('culturefeed_search_ui_' . $facet_key . '_facet_links', $facet_links);
 
   if (is_array($facet_links)) {
+    $count_facets = count($facet_links);
+    $classes[] = "facet-search";
+    $classes[] = ($count_facets > 10 ? "many-facets" : "");
     return theme('item_list', array(
       'items' => $facet_links,
       'type' => 'ul',
-    ));
+      'attributes' => array("class" => $classes, "data-size" => $count_facets)));
   }
 }
 

From dfcdd5b665a91ef3884cc98f46c49fb07a85e251 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 29 Apr 2015 14:41:52 +0200
Subject: [PATCH 129/275] MSS-153 Tag objects form

---
 .../css/edit_tag_objects_form.css             |  13 ++
 .../culturefeed_entry_ui.module               |  18 +-
 .../includes/culturefeed_entry_ui.pages.inc   |  96 +++------
 .../form/culturefeed_entry_ui.tag_objects.inc | 201 ++++++++++++++++++
 culturefeed_entry_ui/theme/theme.inc          |  39 ++++
 5 files changed, 299 insertions(+), 68 deletions(-)
 create mode 100644 culturefeed_entry_ui/css/edit_tag_objects_form.css
 create mode 100644 culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc

diff --git a/culturefeed_entry_ui/css/edit_tag_objects_form.css b/culturefeed_entry_ui/css/edit_tag_objects_form.css
new file mode 100644
index 00000000..f9ebc746
--- /dev/null
+++ b/culturefeed_entry_ui/css/edit_tag_objects_form.css
@@ -0,0 +1,13 @@
+.edit-tag-objects-form-table td.edit-tag-objects-form-cell {
+  vertical-align: middle;
+  border-top: none;
+}
+
+.edit-tag-objects-form-table td.edit-tag-objects-form-cell .form-group {
+  margin: 0px;
+}
+
+.edit-tag-objects-form-table input.form-checkbox {
+  max-width: inherit;
+  margin-right: 0;
+}
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index b9c90b8d..b482dbce 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -49,6 +49,11 @@ function culturefeed_entry_ui_theme() {
       'path' => drupal_get_path('module', 'culturefeed_entry_ui') . '/theme',
       'file' => 'theme.inc',
     ),
+    'culturefeed_entry_ui_edit_tag_objects_form_table' => array(
+      'render element' => 'form',
+      'path' => drupal_get_path('module', 'culturefeed_entry_ui') . '/theme',
+      'file' => 'theme.inc',
+    ),
   );
 }
 
@@ -59,12 +64,21 @@ function culturefeed_entry_ui_menu() {
 
   $items = array();
 
+  $tags_form = array(
+    'argument' => 'culturefeed_entry_ui_edit_tags_form',
+    'file' => 'includes/culturefeed_entry_ui.pages.inc',
+  );
+  if (!version_compare(culturefeed_cdb_upgrade_get_schema_version_number(), '3.3')) {
+    $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
+    $tags_form['file'] = 'includes/form/culturefeed_entry_ui.tag_objects.inc';
+  }
+
   $items['agenda/e/%/%culturefeed_agenda_event/tags'] = array(
     'title' => 'Tags',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('culturefeed_entry_ui_edit_tags_form', 3),
+    'page arguments' => array($tags_form['argument'], 3),
     'access callback' => 'culturefeed_entry_ui_manage_tags_access',
-    'file' => 'includes/culturefeed_entry_ui.pages.inc',
+    'file' => $tags_form['file'],
   );
 
   $items['agenda/e/add'] = array(
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index d46d2dcd..52615b72 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2193,86 +2193,50 @@ function culturefeed_entry_ui_delete_event_form_submit($form, &$form_state) {
  */
 function culturefeed_entry_ui_edit_tags_form($form, $form_state, $event) {
 
-  $form = array();
   /** @var \CultuurNet\Search\ActivityStatsExtendedEntity $event */
   $event = $event->getEntity();
 
-  // CDB Scheme < 3.3.
-  if (version_compare(culturefeed_cdb_upgrade_get_schema_version_number(), '3.3')) {
-
-    /** @var \CultureFeed_Cdb_Item_Event $event */
-    $event_tags = $event->getKeywords();
-    $form['#old_tags'] = $event_tags;
-    $custom_tags = array();
+  /** @var \CultureFeed_Cdb_Item_Event $event */
+  $event_tags = $event->getKeywords();
+  $form['#old_tags'] = $event_tags;
+  $custom_tags = array();
 
-    // Get options from variable.
-    if (variable_get('culturefeed_entry_ui_custom_tags')) {
-      $custom_options = explode("\n", variable_get('culturefeed_entry_ui_custom_tags'));
-    }
+  // Get options from variable.
+  if (variable_get('culturefeed_entry_ui_custom_tags')) {
+    $custom_options = explode("\n", variable_get('culturefeed_entry_ui_custom_tags'));
+  }
 
-    // Filter out custom tags.
-    if ($event_tags) {
-      foreach ($event_tags as $tag) {
-        if (isset($custom_options) && array_key_exists($tag, $custom_options)) {
-          unset($event_tags[$tag]);
-          $custom_tags[$tag] = $tag;
-        }
+  // Filter out custom tags.
+  if ($event_tags) {
+    foreach ($event_tags as $tag) {
+      if (isset($custom_options) && array_key_exists($tag, $custom_options)) {
+        unset($event_tags[$tag]);
+        $custom_tags[$tag] = $tag;
       }
     }
-    else {
-      $event_tags = array();
-    }
-
-    $form['#object_id'] = $event->getCdbId();
-
-    if (user_access('manage custom tags') && !empty($custom_options)) {
-      $form['custom_tags'] = array(
-        '#type' => 'checkboxes',
-        '#options' => $custom_options,
-        '#title' => t('Custom tags'),
-        '#default_value' => $custom_tags,
-      );
-    }
-
-    $form['tags'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Tags'),
-      '#default_value' => implode(';', $event_tags),
-      '#description' => t('Seperate multiple tags by ;'),
-    );
-
   }
-
-  // CDB Scheme >= 3.3.
   else {
+    $event_tags = array();
+  }
 
-    /** @var \CultureFeed_Cdb_Item_Event $event */
-    $event_tags = $event->getKeywords(TRUE);
-    /** @var \CultureFeed_Cdb_Data_Keyword[] $event_tags */
-
-    $form['#old_tags'] = $event_tags;
+  $form['#object_id'] = $event->getCdbId();
 
-    $form['tags'] = array(
-      '#type' => 'fieldset',
+  if (user_access('manage custom tags') && !empty($custom_options)) {
+    $form['custom_tags'] = array(
+      '#type' => 'checkboxes',
+      '#options' => $custom_options,
+      '#title' => t('Custom tags'),
+      '#default_value' => $custom_tags,
     );
+  }
 
-    foreach ($event_tags as $tag) {
-
-      $form['tags'][$tag->getValue()] = array(
-        '#type' => 'fieldset',
-        'value' => array(
-          '#type' => 'textfield',
-          '#default_value' => $tag->getValue(),
-        ),
-        'visible' => array(
-          '#type' => 'checkbox',
-          '#default_value' => $tag->isVisible(),
-        ),
-      );
-
-    }
+  $form['tags'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Tags'),
+    '#default_value' => implode(';', $event_tags),
+    '#description' => t('Seperate multiple tags by ;'),
+  );
 
-  }
 
   $form['submit'] = array(
     '#type' => 'submit',
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
new file mode 100644
index 00000000..4731d429
--- /dev/null
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_entry_ui.tag_objects.inc.
+ */
+
+/**
+ * Ajax callback for the edit tags form.
+ */
+function culturefeed_entry_ui_edit_tag_objects_ajax_callback($form, $form_state) {
+  return $form['wrapper'];
+}
+
+/**
+ * Form builder for the tags form for cdb 3.3 and above.
+ */
+function culturefeed_entry_ui_edit_tag_objects_form($form, &$form_state, $event) {
+
+  /* @var \CultuurNet\Search\ActivityStatsExtendedEntity $event */
+  $event = $event->getEntity();
+  /* @var \CultureFeed_Cdb_Item_Event $event */
+  /* @var \CultureFeed_Cdb_Data_Keyword[] $event_tags */
+  $event_tags = $event->getKeywords(TRUE);
+
+  // Tags.
+  $tags = array();
+  if (!isset($form_state['values']['tags'])) {
+
+    foreach ($event_tags as $tag) {
+      $tags[] = array(
+        'value' => $tag->getValue(),
+        'visible' => $tag->isVisible(),
+      );
+    }
+
+  }
+
+  else {
+    $tags = $form_state['values']['tags'];
+  }
+
+  // Set the form.
+  $html_id = 'tag-objects-wrapper';
+
+  $form['wrapper'] = array(
+    '#type' => 'container',
+    '#attributes' => array('id' => $html_id),
+  );
+
+  $form['wrapper']['tags'] = array(
+    '#attached' => array(
+      'css' => array(
+        drupal_get_path('module', 'culturefeed_entry_ui') . '/css/edit_tag_objects_form.css',
+      ),
+    ),
+    '#attributes' => array('class' => array('edit-tag-objects-form-table')),
+    '#theme' => 'culturefeed_entry_ui_edit_tag_objects_form_table',
+    '#tree' => TRUE,
+  );
+
+  foreach ($tags as $key => $tag) {
+
+    $tag_elements = array(
+      'value' => array(
+        '#default_value' => $tag['value'],
+        '#type' => 'textfield',
+      ),
+      'visible' => array(
+        '#default_value' => $tag['visible'],
+        '#title' => t('Hide tag'),
+        '#type' => 'checkbox',
+      ),
+    );
+
+    if (count($tags) > 1) {
+
+      $tag_elements['remove'] = array(
+        '#ajax' => array(
+          'callback' => 'culturefeed_entry_ui_edit_tag_objects_ajax_callback',
+          'wrapper' => $html_id,
+        ),
+        '#name' => 'remove_' . $key,
+        '#submit' => array('culturefeed_entry_ui_edit_tag_objects_form_process'),
+        '#type' => 'submit',
+        '#value' => t('Remove tag'),
+      );
+
+    }
+
+    $form['wrapper']['tags'][] = $tag_elements;
+
+  }
+
+  $form['add_tag'] = array(
+    '#ajax' => array(
+      'callback' => 'culturefeed_entry_ui_edit_tag_objects_ajax_callback',
+      'wrapper' => $html_id,
+    ),
+    '#submit' => array('culturefeed_entry_ui_edit_tag_objects_form_process'),
+    '#type' => 'submit',
+    '#value' => t('Add tag'),
+  );
+
+  $form['actions'] = array(
+    '#type' => 'actions',
+    'submit' => array(
+      '#type' => 'submit',
+      '#validate' => array('culturefeed_entry_ui_edit_tag_objects_form_submit_validate'),
+      '#value' => t('Submit'),
+    ),
+  );
+
+  return $form;
+
+}
+
+/**
+ * Submit handler for culturefeed_entry_ui_edit_tag_objects_form().
+ */
+function culturefeed_entry_ui_edit_tag_objects_form_process($form, &$form_state) {
+
+  // Triggering data.
+  $triggering_element = isset($form_state['triggering_element']) ? $form_state['triggering_element'] : '';
+  $triggering_parents = ($triggering_element) ? array_reverse($triggering_element['#parents']) : array();
+
+  // Check if a tag needs to be added.
+  if (isset($triggering_parents[0]) && $triggering_parents[0] == 'add_tag') {
+    $tag = array('value' => '', 'visible' => 0);
+    $form_state['values']['tags'][] = $tag;
+  }
+
+  // Check if a tag needs to be removed.  This is done here as renumbering
+  // needs to be ensured.
+  if (isset($triggering_parents[0]) && $triggering_parents[0] == 'remove') {
+
+    $key = $triggering_element['#parents'][1];
+    unset($form_state['values']['tags'][$key]);
+    $form_state['values']['tags'] = array_values($form_state['values']['tags']);
+    unset($form_state['input']['tags'][$key]);
+    $form_state['input']['tags'] = array_values($form_state['input']['tags']);
+
+  }
+
+  $form_state['rebuild'] = TRUE;
+
+}
+
+/**
+ * Submit handler for culturefeed_entry_ui_edit_tag_objects_form().
+ */
+function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state) {
+
+  // Merge custom tags into all tags.
+  $tags = $form_state['values']['tags'];
+  $tag_objects = array();
+  foreach ($tags as $tag) {
+    $tag_objects[] = new CultureFeed_Cdb_Data_Keyword($tag['value'], $tag['visible']);
+  }
+
+  $event = new CultureFeed_Cdb_Item_Event();
+  $event->setCdbId($form['#object_id']);
+
+  try {
+
+    // Add new tags.
+    if ($tags) {
+      Drupalculturefeed_EntryApi::addTagToEvent($event, $tag_objects);
+    }
+
+    drupal_set_message(t('The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the "View" tab'));
+
+  }
+
+  catch (Exception $e) {
+
+    if ($e->getCode() == CultureFeed_EntryApi::CODE_KEYWORD_PRIVATE) {
+      drupal_set_message(t('You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to "vragen@uitdatabank.be".'));
+    }
+    else {
+      drupal_set_message(t('Error occured while saving the tags'));
+    }
+
+    watchdog_exception(WATCHDOG_ERROR, $e);
+
+  }
+
+}
+
+/**
+ * Validation handler for culturefeed_entry_ui_edit_tag_objects_form().
+ */
+function culturefeed_entry_ui_edit_tag_objects_form_submit_validate($form, &$form_state) {
+
+  foreach ($form_state['values']['tags'] as $key => $tag) {
+    if (!$tag['value']) {
+      form_set_error('tags][' . $key . '][value', t('The tag should have a value.'));
+    }
+  }
+
+}
diff --git a/culturefeed_entry_ui/theme/theme.inc b/culturefeed_entry_ui/theme/theme.inc
index a9a52d8b..b09f0056 100644
--- a/culturefeed_entry_ui/theme/theme.inc
+++ b/culturefeed_entry_ui/theme/theme.inc
@@ -4,6 +4,45 @@
  * Theming functions for entry api ui.
  */
 
+/**
+ * Returns html for an edit tags form rendered as table.
+ */
+function theme_culturefeed_entry_ui_edit_tag_objects_form_table(&$vars) {
+
+  $form = $vars['form'];
+  $attributes = (isset($form['#attributes'])) ? $form['#attributes'] : array();
+  $attributes['class'][] = 'table-no-striping';
+
+  $header = array();
+  $rows = array();
+
+  foreach (element_children($form) as $row) {
+    $rows[] = array(
+      'data' => array(
+        array(
+          'data' => drupal_render($form[$row]['value']),
+          'class' => 'edit-tag-objects-form-cell',
+        ),
+        array(
+          'data' => drupal_render($form[$row]['visible']),
+          'class' => 'edit-tag-objects-form-cell',
+        ),
+        array(
+          'data' => drupal_render($form[$row]['remove']),
+          'class' => 'edit-tag-objects-form-cell',
+        ),
+      ),
+      'no_striping' => TRUE,
+    );
+  }
+
+  $output = theme('table', array('attributes' => $attributes, 'header' => $header, 'rows' => $rows));
+  $output .= drupal_render_children($form);
+  return $output;
+
+}
+
+
 /**
  * Preprocess function for the culturefeed_entry_ui_event_form.
  */

From cbc9ad25307ddeb2634e53029fd49b654905b479 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 29 Apr 2015 15:41:37 +0200
Subject: [PATCH 130/275] UIV-1003 update syntax

---
 culturefeed_search_ui/theme/theme.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 4956c61a..e2292703 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -82,12 +82,13 @@ function theme_culturefeed_search_facet_with_depth_settings($variables) {
 
   if (is_array($facet_links)) {
     $count_facets = count($facet_links);
-    $classes[] = "facet-search";
-    $classes[] = ($count_facets > 10 ? "many-facets" : "");
+    $classes[] = 'facet-search';
+    $classes[] = ($count_facets > 10 ? 'many-facets' : '');
     return theme('item_list', array(
       'items' => $facet_links,
       'type' => 'ul',
-      'attributes' => array("class" => $classes, "data-size" => $count_facets)));
+      'attributes' => array('class' => $classes, 'data-size' => $count_facets)
+    ));
   }
 }
 

From a5bcdeb2e5595dfe2ac97ba8ff4d17772dc25968 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 4 May 2015 13:08:01 +0200
Subject: [PATCH 131/275] add mobile detect helper function

---
 culturefeed.helpers.inc | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/culturefeed.helpers.inc b/culturefeed.helpers.inc
index 079a34fc..885f24a9 100644
--- a/culturefeed.helpers.inc
+++ b/culturefeed.helpers.inc
@@ -442,3 +442,29 @@ function culturefeed_ajax_command_goto($url) {
   );
 }
 
+/**
+ * Getter function to retrieve a Mobile_Detect() singleton.
+ * @return object
+ * Instance of Mobile_Detect(), NULL if failure.
+ */
+function culturefeed_mobile_detect_get_object() {
+  $detect = &drupal_static(__FUNCTION__);
+
+  if (!isset($detect)) {
+    if (class_exists('Mobile_Detect')) {
+      try {
+        $detect = new Mobile_Detect();
+      } catch (Exception $e) {
+        $detect = NULL;
+        watchdog('mobile_detect', 'Could not instantiate Mobile_Detect(): %message',
+          array('%message' => $e->getMessage()), WATCHDOG_ALERT);
+      }
+    } else {
+      $detect = NULL;
+      watchdog('mobile_detect', 'Mobile_Detect() class does not exist', array(), WATCHDOG_ALERT);
+    }
+  }
+
+  return $detect;
+}
+

From 49f947d6a812dd20340b0014c2f2f032e785a2f7 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 4 May 2015 13:29:17 +0200
Subject: [PATCH 132/275] adding mobile detect vars to theme

---
 culturefeed_agenda/theme/theme.inc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index ba38a67c..f95b47f6 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -328,6 +328,19 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $variables['forkids'] = TRUE;
     }
   }
+  
+  $detect = culturefeed_mobile_detect_get_object();
+
+  if ($detect) {
+    $device = ($detect->isMobile() ? ($detect->isTablet() ? 'tablet' : 'phone') : 'computer');
+    $variables['device'] = $device;
+
+    $is_ios = $detect->isiOS();
+    $variables['is_ios'] = $is_ios;
+
+    $is_android = $detect->isAndroidOS();
+    $variables['is_android'] = $is_android;
+  }
 
 }
 

From 39ece02c2357c8296c5c4429083b9b91d7ea65a7 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Mon, 4 May 2015 16:58:43 +0200
Subject: [PATCH 133/275] MSS-154 collaboration data in views

---
 .../views_handler_field_cdb_item_picture.inc  | 38 ++++++++++++++++++-
 ...ndler_field_cdb_item_short_description.inc | 30 ++++++++++++++-
 .../views_handler_field_cdb_item_title.inc    | 38 ++++++++++++++++++-
 .../culturefeed_search_views_query.inc        |  7 ++++
 4 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 422ab3fc..a15d1b7e 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -79,7 +79,43 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     $main_picture = '';
 
     if ($this->options['override']) {
-      $main_picture = 'This picture is overriden';
+      $media = $detail->getMedia();
+      $roadmaps = $media->byMediaType('roadmap');
+
+      $parameters = $this->query->getParameters();
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($parameters as $i => $parameter) {
+        $key = $parameter->getKey();
+        $value = $parameter->getValue();
+        if ($key != 'fq' || empty($value)) {
+          unset($parameters[$i]);
+        }
+      }
+
+      // If more filterquery's are defined, take first one.
+      $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+
+      foreach ($roadmaps as $roadmap) {
+        $subbrand = $roadmap->getSubbrand();
+        $collaboration_data = json_decode($roadmap->getDescription());
+        $collaboration_keyword = strtolower($collaboration_data->keyword);
+
+        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+          $picture = $collaboration_data->image;
+          if (isset($picture)) {
+            $main_picture = $picture;
+          }
+        }
+      }
+      if(empty($main_picture)) {
+        $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
+        foreach ($pictures as $picture) {
+          if ($picture->isMain()) {
+            $main_picture = $picture->getHLink();
+          }
+        }
+      }
     }
     else {
       $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index 460efaec..ba8f53e6 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -37,7 +37,35 @@ class views_handler_field_cdb_item_short_description extends views_handler_field
   function render($extended_entity) {
 
     if ($this->options['override']) {
-      $short_description = 'This short description is overriden';
+      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
+      $roadmaps = $media->byMediaType('roadmap');
+
+      $parameters = $this->query->getParameters();
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($parameters as $i => $parameter) {
+        $key = $parameter->getKey();
+        $value = $parameter->getValue();
+        if ($key != 'fq' || empty($value)) {
+          unset($parameters[$i]);
+        }
+      }
+
+      // If more filterquery's are defined, take first one.
+      $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+
+      foreach ($roadmaps as $roadmap) {
+        $subbrand = $roadmap->getSubbrand();
+        $collaboration_keyword = json_decode($roadmap->getDescription());
+        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
+
+        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+          $short_description = $roadmap->getPlainText();
+        }
+      }
+      if(!isset($short_description)) {
+        $short_description = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getShortDescription();
+      }
     }
     else {
       $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index e345a019..dad2ed1c 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -45,14 +45,48 @@ class views_handler_field_cdb_item_title extends views_handler_field {
   function render($extended_entity) {
 
     if ($this->options['override']) {
-      $title = 'This title is overriden';
+      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
+      $roadmaps = $media->byMediaType('roadmap');
+
+      $parameters = $this->query->getParameters();
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($parameters as $i => $parameter) {
+        $key = $parameter->getKey();
+        $value = $parameter->getValue();
+        if ($key != 'fq' || empty($value)) {
+          unset($parameters[$i]);
+        }
+      }
+
+      // If more filterquery's are defined, take first one.
+      $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+
+      foreach ($roadmaps as $roadmap) {
+        $subbrand = $roadmap->getSubbrand();
+        $collaboration_keyword = json_decode($roadmap->getDescription());
+        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
+
+        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+          $title = $roadmap->getTitle();
+          $original_title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+        }
+      }
+      if(!isset($title)) {
+        $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+      }
     }
     else {
       $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
     }
 
     if ($this->options['link']) {
-      return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);
+      if (isset($original_title)) {
+        return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $original_title, $title);
+      }
+      else {
+        return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);
+      }
     }
     else {
       return $title;
diff --git a/culturefeed_search_views/views/plugins/culturefeed_search_views_query.inc b/culturefeed_search_views/views/plugins/culturefeed_search_views_query.inc
index 91bdb8f2..4109641a 100644
--- a/culturefeed_search_views/views/plugins/culturefeed_search_views_query.inc
+++ b/culturefeed_search_views/views/plugins/culturefeed_search_views_query.inc
@@ -17,6 +17,13 @@ class culturefeed_search_views_query extends views_plugin_query {
 
   }
 
+  /*
+   * return $parameters
+   */
+  function getParameters() {
+    return $this->parameters;
+  }
+
   /**
    * @see views_plugin_query::build()
    */

From 2b0c77406abbd8f67dc2638dc267cda75993ee48 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 5 May 2015 10:20:35 +0200
Subject: [PATCH 134/275] MSS-154 removed crop function from url when image
 comes from collaboration service.

---
 .../views_handler_field_cdb_item_picture.inc  | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index a15d1b7e..76adcd6a 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -77,6 +77,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     }
 
     $main_picture = '';
+    $alt_pic = FALSE;
 
     if ($this->options['override']) {
       $media = $detail->getMedia();
@@ -104,6 +105,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
         if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
           $picture = $collaboration_data->image;
           if (isset($picture)) {
+            $alt_pic = TRUE;
             $main_picture = $picture;
           }
         }
@@ -134,10 +136,25 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
 
     if (!empty($main_picture)) {
 			if ($this->options['format'] == 'image') {
-				$image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+        if ($alt_pic) {
+          $image = theme('image', array(
+            'path' => $main_picture,
+            'width' => $this->options['width'],
+            'height' => $this->options['height'],
+            )
+          );
+        }
+        else {
+          $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+        }
 			}
 			else if ($this->options['format'] == 'url') {
-				$image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+        if ($alt_pic) {
+          $image = $main_picture;
+        }
+        else {
+          $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+        }
 			}
 
       if ($this->options['link']) {

From 4f403dc6f3b46a816caf772edc3e8f8e1eb560d7 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 5 May 2015 10:38:35 +0200
Subject: [PATCH 135/275] MSS-153 Change custom form to tags form element and
 update the other entry ui elements accordingly.

---
 .../culturefeed_date_control/README.txt       |   0
 .../css/culturefeed_date_control.css          |   0
 ...culturefeed_date_control_opening_times.css |   0
 .../culturefeed_date_control.info             |   1 +
 .../culturefeed_date_control.module           |  52 -----
 .../form/date_control.inc                     |   2 +-
 .../culturefeed_date_control/form/hybrid.inc  |   2 +-
 .../form/opening_times.inc                    |   0
 .../culturefeed_date_control/form/period.inc  |   2 +-
 .../form/timestamps.inc                       |   2 +-
 .../culturefeed_date_control_opening_times.js |   0
 .../culturefeed_date_control_time_select.js   |   0
 .../culturefeed_date_control/theme/theme.inc  |   0
 .../culturefeed_elements.info                 |   5 +
 .../culturefeed_elements.module               |  58 +++++
 .../culturefeed_location_control.info         |   1 +
 .../culturefeed_location_control.module       |  58 -----
 .../form/asset.inc                            |   4 +-
 .../form/custom.inc                           |   6 +-
 .../form/location_control.inc                 |   2 +-
 .../css/culturefeed_tags_element.css          |  21 ++
 .../culturefeed_tags_element.info             |   6 +
 .../culturefeed_tags_element.module           | 201 ++++++++++++++++++
 .../culturefeed_tags_element/theme/theme.inc  |  48 +++++
 .../culturefeed_entry_ui.info                 |   1 +
 .../culturefeed_entry_ui.module               |   5 -
 .../form/culturefeed_entry_ui.tag_objects.inc | 132 ++----------
 27 files changed, 368 insertions(+), 241 deletions(-)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/README.txt (100%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/css/culturefeed_date_control.css (100%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/css/culturefeed_date_control_opening_times.css (100%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/culturefeed_date_control.info (80%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/culturefeed_date_control.module (83%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/form/date_control.inc (99%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/form/hybrid.inc (98%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/form/opening_times.inc (100%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/form/period.inc (98%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/form/timestamps.inc (98%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/js/culturefeed_date_control_opening_times.js (100%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/js/culturefeed_date_control_time_select.js (100%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_date_control/theme/theme.inc (100%)
 create mode 100644 culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.info
 create mode 100644 culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_location_control/culturefeed_location_control.info (80%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_location_control/culturefeed_location_control.module (56%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_location_control/form/asset.inc (95%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_location_control/form/custom.inc (95%)
 rename culturefeed_entry_ui/{ => culturefeed_elements}/culturefeed_location_control/form/location_control.inc (98%)
 create mode 100644 culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css
 create mode 100644 culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info
 create mode 100644 culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module
 create mode 100644 culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc

diff --git a/culturefeed_entry_ui/culturefeed_date_control/README.txt b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/README.txt
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/README.txt
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/README.txt
diff --git a/culturefeed_entry_ui/culturefeed_date_control/css/culturefeed_date_control.css b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/css/culturefeed_date_control.css
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/css/culturefeed_date_control.css
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/css/culturefeed_date_control.css
diff --git a/culturefeed_entry_ui/culturefeed_date_control/css/culturefeed_date_control_opening_times.css b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/css/culturefeed_date_control_opening_times.css
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/css/culturefeed_date_control_opening_times.css
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/css/culturefeed_date_control_opening_times.css
diff --git a/culturefeed_entry_ui/culturefeed_date_control/culturefeed_date_control.info b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info
similarity index 80%
rename from culturefeed_entry_ui/culturefeed_date_control/culturefeed_date_control.info
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info
index b40b31fb..c76fdde5 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/culturefeed_date_control.info
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info
@@ -3,3 +3,4 @@ description = Form element to manage dates in the Entry UI.
 package = CultureFeed
 version = VERSION
 core = 7.x
+dependencies[] = culturefeed_elements
diff --git a/culturefeed_entry_ui/culturefeed_date_control/culturefeed_date_control.module b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/culturefeed_date_control.module
similarity index 83%
rename from culturefeed_entry_ui/culturefeed_date_control/culturefeed_date_control.module
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/culturefeed_date_control.module
index c56718f5..845a8e31 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/culturefeed_date_control.module
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/culturefeed_date_control.module
@@ -11,40 +11,6 @@ require_once 'form/opening_times.inc';
 require_once 'form/period.inc';
 require_once 'form/timestamps.inc';
 
-/**
- * Ajax callback for the date control element.
- */
-function culturefeed_date_control_ajax_callback() {
-
-  list($form, $form_state, $form_id, $form_build_id, $commands) = ajax_get_form();
-  drupal_process_form($form['#form_id'], $form, $form_state);
-  $parents = func_get_args();
-
-  $form = drupal_array_get_nested_value($form, $parents);
-  $output = drupal_render($form);
-  $result = array(
-    '#type' => 'ajax',
-    '#commands' => ajax_prepare_response($output),
-  );
-  return $result;
-
-}
-
-/**
- * Checks if the triggering element is part of the element.
- *
- * @param array $triggering_element
- *   The triggering element.
- * @param array $element
- *   The element.
- *
- * @return bool
- *   True or false.
- */
-function culturefeed_date_control_check_trigger_element(array $triggering_element, array $element) {
-  return array_intersect($triggering_element['#parents'], $element['#parents']) == $element['#parents'];
-}
-
 /**
  * Adds a span element for a calendar icon on date popup fields.
  *
@@ -243,24 +209,6 @@ function culturefeed_date_control_implode_time(array $time_array, $date_string)
 
 }
 
-/**
- * Implements hook_menu().
- */
-function culturefeed_date_control_menu() {
-
-  return array(
-    'culturefeed_elements/ajax' => array(
-      'title' => 'AHAH callback',
-      'page callback' => 'culturefeed_date_control_ajax_callback',
-      'delivery callback' => 'ajax_deliver',
-      'access callback' => TRUE,
-      'theme callback' => 'ajax_base_page_theme',
-      'type' => MENU_CALLBACK,
-    ),
-  );
-
-}
-
 /**
  * Implements hook_theme().
  */
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/date_control.inc
similarity index 99%
rename from culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/date_control.inc
index 610948be..31e81568 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/date_control.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/date_control.inc
@@ -141,7 +141,7 @@ function culturefeed_date_control_date_control_validate(array $element, array &$
   $values = drupal_array_get_nested_value($form_state['input'], $element['#parents']);
   $date_control = $values['date_control'];
 
-  if (culturefeed_date_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     $type = $date_control['type'];
 
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/hybrid.inc
similarity index 98%
rename from culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/hybrid.inc
index 6d8bd78f..8f87377b 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/hybrid.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/hybrid.inc
@@ -157,7 +157,7 @@ function culturefeed_date_control_hybrid_validate(array &$element, array &$form_
   $triggering_parent = array_pop($triggering_element['#parents']);
   $hybrid = $element['#value'];
 
-  if (culturefeed_date_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     switch ($triggering_parent) {
 
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/opening_times.inc
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/form/opening_times.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/opening_times.inc
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/period.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/period.inc
similarity index 98%
rename from culturefeed_entry_ui/culturefeed_date_control/form/period.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/period.inc
index 77eb2078..835e1582 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/period.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/period.inc
@@ -132,7 +132,7 @@ function culturefeed_date_control_period_validate(array $element, array &$form_s
   $triggering_parent = array_pop($triggering_element['#parents']);
   $dates = $element['#value'];
 
-  if (culturefeed_date_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     switch ($triggering_parent) {
 
diff --git a/culturefeed_entry_ui/culturefeed_date_control/form/timestamps.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/timestamps.inc
similarity index 98%
rename from culturefeed_entry_ui/culturefeed_date_control/form/timestamps.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/timestamps.inc
index 27d93afb..23595966 100644
--- a/culturefeed_entry_ui/culturefeed_date_control/form/timestamps.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/form/timestamps.inc
@@ -173,7 +173,7 @@ function culturefeed_date_control_timestamps_validate(array $element, array &$fo
   $triggering_parent = array_pop($triggering_element['#parents']);
   $timestamps = $element['#value'];
 
-  if (culturefeed_date_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     switch ($triggering_parent) {
 
diff --git a/culturefeed_entry_ui/culturefeed_date_control/js/culturefeed_date_control_opening_times.js b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/js/culturefeed_date_control_opening_times.js
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/js/culturefeed_date_control_opening_times.js
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/js/culturefeed_date_control_opening_times.js
diff --git a/culturefeed_entry_ui/culturefeed_date_control/js/culturefeed_date_control_time_select.js b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/js/culturefeed_date_control_time_select.js
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/js/culturefeed_date_control_time_select.js
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/js/culturefeed_date_control_time_select.js
diff --git a/culturefeed_entry_ui/culturefeed_date_control/theme/theme.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/theme/theme.inc
similarity index 100%
rename from culturefeed_entry_ui/culturefeed_date_control/theme/theme.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_date_control/theme/theme.inc
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.info b/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.info
new file mode 100644
index 00000000..ea789ace
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.info
@@ -0,0 +1,5 @@
+name = CultureFeed Elements
+description = Form elements for the Entry UI.
+package = CultureFeed
+version = VERSION
+core = 7.x
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module b/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module
new file mode 100644
index 00000000..38c636e5
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains the culturefeed elements module.
+ */
+
+/**
+ * Ajax callback for the date control element.
+ */
+function culturefeed_elements_ajax_callback() {
+
+  list($form, $form_state, $form_id, $form_build_id, $commands) = ajax_get_form();
+  drupal_process_form($form['#form_id'], $form, $form_state);
+  $parents = func_get_args();
+
+  $form = drupal_array_get_nested_value($form, $parents);
+  $output = drupal_render($form);
+  $result = array(
+    '#type' => 'ajax',
+    '#commands' => ajax_prepare_response($output),
+  );
+  return $result;
+
+}
+
+/**
+ * Checks if the triggering element is part of the element.
+ *
+ * @param array $triggering_element
+ *   The triggering element.
+ * @param array $element
+ *   The element.
+ *
+ * @return bool
+ *   True or false.
+ */
+function culturefeed_elements_check_trigger_element(array $triggering_element, array $element) {
+  return array_intersect($triggering_element['#parents'], $element['#parents']) == $element['#parents'];
+}
+
+/**
+ * Implements hook_menu().
+ */
+function culturefeed_elements_menu() {
+
+  return array(
+    'culturefeed_elements/ajax' => array(
+      'title' => 'AHAH callback',
+      'page callback' => 'culturefeed_elements_ajax_callback',
+      'delivery callback' => 'ajax_deliver',
+      'access callback' => TRUE,
+      'theme callback' => 'ajax_base_page_theme',
+      'type' => MENU_CALLBACK,
+    ),
+  );
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info
similarity index 80%
rename from culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info
index 00612f51..ace7982a 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.info
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info
@@ -3,3 +3,4 @@ description = Form element to manage locations in the Entry UI.
 package = CultureFeed
 version = VERSION
 core = 7.x
+dependencies[] = culturefeed_elements
diff --git a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/culturefeed_location_control.module
similarity index 56%
rename from culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/culturefeed_location_control.module
index 90cee499..23e628e5 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/culturefeed_location_control.module
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/culturefeed_location_control.module
@@ -9,44 +9,6 @@ require_once 'form/asset.inc';
 require_once 'form/custom.inc';
 require_once 'form/location_control.inc';
 
-/**
- * Ajax callback for the location control element.
- *
- * @todo move to a more general module, culturefeed date control does the same.
- */
-function culturefeed_location_control_ajax_callback() {
-
-  list($form, $form_state, $form_id, $form_build_id, $commands) = ajax_get_form();
-  drupal_process_form($form['#form_id'], $form, $form_state);
-  $parents = func_get_args();
-
-  $form = drupal_array_get_nested_value($form, $parents);
-  $output = drupal_render($form);
-  $result = array(
-    '#type' => 'ajax',
-    '#commands' => ajax_prepare_response($output),
-  );
-  return $result;
-
-}
-
-/**
- * Checks if the triggering element is part of the element.
- *
- * @todo move to a more general module, culturefeed date control does the same.
- *
- * @param array $triggering_element
- *   The triggering element.
- * @param array $element
- *   The element.
- *
- * @return bool
- *   True or false.
- */
-function culturefeed_location_control_check_trigger_element(array $triggering_element, array $element) {
-  return array_intersect($triggering_element['#parents'], $element['#parents']) == $element['#parents'];
-}
-
 /**
  * Implements hook_element_info().
  *
@@ -91,23 +53,3 @@ function culturefeed_location_control_element_info() {
   );
 
 }
-
-/**
- * Implements hook_menu().
- *
- * @todo move to a more general module, culturefeed date control does the same.
- */
-function culturefeed_location_control_menu() {
-
-  return array(
-    'culturefeed_elements/location/ajax' => array(
-      'title' => 'AHAH callback',
-      'page callback' => 'culturefeed_location_control_ajax_callback',
-      'delivery callback' => 'ajax_deliver',
-      'access callback' => TRUE,
-      'theme callback' => 'ajax_base_page_theme',
-      'type' => MENU_CALLBACK,
-    ),
-  );
-
-}
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/asset.inc
similarity index 95%
rename from culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/asset.inc
index 8f4ff745..fad7b5bf 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/form/asset.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/asset.inc
@@ -35,7 +35,7 @@ function culturefeed_location_control_asset_process(array $element, array &$form
 
   $ajax_settings = array(
     'effect' => 'none',
-    'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+    'path' => 'culturefeed_elements/ajax/' . implode('/', $array_parents),
     'progress' => array('type' => 'throbber'),
     'wrapper' => $element_id . '-ajax-wrapper',
   );
@@ -106,7 +106,7 @@ function culturefeed_location_control_asset_validate(array &$element, array &$fo
   $triggering_parent = array_pop($triggering_element['#parents']);
   $asset = $element['#value'];
 
-  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     switch ($triggering_parent) {
 
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/custom.inc
similarity index 95%
rename from culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/custom.inc
index 471649b4..3f7b5a2a 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/form/custom.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/custom.inc
@@ -55,7 +55,7 @@ function culturefeed_location_control_custom_process(array $element, array &$for
 
   $ajax_settings = array(
     'effect' => 'none',
-    'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+    'path' => 'culturefeed_elements/ajax/' . implode('/', $array_parents),
     'progress' => array('type' => 'throbber'),
     'wrapper' => $element_id . '-ajax-wrapper',
   );
@@ -125,7 +125,7 @@ function culturefeed_location_control_custom_process(array $element, array &$for
   $element['custom_remove'] = array(
     '#access' => TRUE,
     '#ajax' => array(
-      'path' => 'culturefeed_elements/location/ajax/' . implode('/', $array_parents),
+      'path' => 'culturefeed_elements/ajax/' . implode('/', $array_parents),
       'wrapper' => $element_id . '-ajax-wrapper',
     ) + $ajax_settings,
     '#attributes' => array('class' => array('add-more-link btn-link')),
@@ -154,7 +154,7 @@ function culturefeed_location_control_custom_validate(array &$element, array &$f
   $triggering_parent = array_pop($triggering_element['#parents']);
   $custom = $element['#value'];
 
-  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     switch ($triggering_parent) {
 
diff --git a/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/location_control.inc
similarity index 98%
rename from culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
rename to culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/location_control.inc
index e212373d..6d214282 100644
--- a/culturefeed_entry_ui/culturefeed_location_control/form/location_control.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_location_control/form/location_control.inc
@@ -114,7 +114,7 @@ function culturefeed_location_control_location_control_validate(array $element,
   $values = drupal_array_get_nested_value($form_state['input'], $element['#parents']);
   $location_control = $values['location_control'];
 
-  if (culturefeed_location_control_check_trigger_element($triggering_element, $element)) {
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
 
     $type = $location_control['type'];
 
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css
new file mode 100644
index 00000000..ddb4e247
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css
@@ -0,0 +1,21 @@
+table.edit-tags-form-table {
+  margin-bottom: 10px;
+}
+
+.edit-tags-form-table td.edit-tags-form-cell {
+  vertical-align: middle;
+  border-top: none;
+}
+
+.edit-tags-form-table td.edit-tags-form-cell .form-group {
+  margin: 0px;
+}
+
+.edit-tags-form-table input.form-checkbox {
+  max-width: inherit;
+  margin-right: 0;
+}
+
+button.edit-tags-add-tag {
+  margin: 0px 0px 10px 8px;
+}
\ No newline at end of file
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info
new file mode 100644
index 00000000..4075ffb7
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info
@@ -0,0 +1,6 @@
+name = CultureFeed Tags element
+description = Form element to manage keywords in the Entry UI.
+package = CultureFeed
+version = VERSION
+core = 7.x
+dependencies[] = culturefeed_elements
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module
new file mode 100644
index 00000000..fa542353
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @file
+ * Contains the CultureFeed Tags element module.
+ */
+
+/**
+ * Implements hook_element_info().
+ */
+function culturefeed_tags_element_element_info() {
+
+  return array(
+    'culturefeed_tags_element' => array(
+      '#element_validate' => array('culturefeed_tags_element_tags_element_validate'),
+      '#input' => TRUE,
+      '#process' => array('culturefeed_tags_element_tags_element_process', 'ajax_process_form'),
+      '#tree' => TRUE,
+      '#value_callback' => 'culturefeed_tags_element_tags_element_value_callback',
+    ),
+  );
+
+}
+
+/**
+ * Process function for the culturefeed keywords element.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ * @param array $form
+ *   The form.
+ *
+ * @return array
+ *   The processed element.
+ */
+function culturefeed_tags_element_tags_element_process(array $element, array &$form_state, array $form) {
+
+  $element_id = $element['#id'];
+  $array_parents = $element['#array_parents'];
+
+  $element['#prefix'] = "<div id=\"" . $element_id . "-ajax-wrapper\">";
+  $element['#suffix'] = "</div>";
+
+  // Tags.
+  $tags = $element['#value'];
+
+  $element['keywords'] = array(
+    '#attached' => array(
+      'css' => array(
+        drupal_get_path('module', 'culturefeed_tags_element') . '/css/culturefeed_tags_element.css',
+      ),
+    ),
+    '#attributes' => array('class' => array('edit-tags-form-table')),
+    '#theme' => 'culturefeed_tags_element_tags_element_form_table',
+  );
+
+  foreach ($tags['keywords'] as $key => $tag) {
+
+    $tag_elements = array(
+      'value' => array(
+        '#default_value' => $tag['value'],
+        '#type' => 'textfield',
+      ),
+      'visible' => array(
+        '#default_value' => isset($tag['visible']) ? $tag['visible'] : 0,
+        '#title' => t('Hide tag'),
+        '#type' => 'checkbox',
+      ),
+    );
+
+    if (count($tags['keywords']) > 1) {
+
+      $tag_elements['remove'] = array(
+        '#ajax' => array(
+          'path' => 'culturefeed_elements/ajax/' . implode('/', $array_parents),
+          'wrapper' => $element_id . '-ajax-wrapper',
+        ),
+        '#name' => 'remove_' . $key,
+        '#submit' => array('culturefeed_tags_element_tags_element_process_submit'),
+        '#type' => 'submit',
+        '#value' => t('Remove tag'),
+      );
+
+    }
+
+    $element['keywords'][$key] = $tag_elements;
+
+  }
+
+  $element['add_tag'] = array(
+    '#ajax' => array(
+      'path' => 'culturefeed_elements/ajax/' . implode('/', $array_parents),
+      'wrapper' => $element_id . '-ajax-wrapper',
+    ),
+    '#attributes' => array(
+      'class' => array('edit-tags-add-tag'),
+    ),
+    '#submit' => array('culturefeed_tags_element_tags_element_process_submit'),
+    '#type' => 'submit',
+    '#value' => t('Add tag'),
+  );
+
+  return $element;
+
+}
+
+/**
+ * Validation handler for the culturefeed keywords element.
+ *
+ * @param array $element
+ *   The element.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_tags_element_tags_element_validate(array &$element, array &$form_state) {
+
+  // Triggering data.
+  $triggering_element = (isset($form_state['triggering_element'])) ? $form_state['triggering_element'] : '';
+  $triggering_parent = array_pop($triggering_element['#array_parents']);
+  $tags = $element['#value'];
+
+  if (culturefeed_elements_check_trigger_element($triggering_element, $element)) {
+
+    // Check if a tag needs to be added.
+    if ($triggering_parent == 'add_tag') {
+      $tag = array('value' => '');
+      $tags['keywords'][] = $tag;
+    }
+
+    // Check if a tag needs to be removed.  This is done here as renumbering
+    // needs to be ensured.
+    if ($triggering_parent == 'remove') {
+
+      $index = array_pop($triggering_element['#array_parents']);
+      array_splice($tags['keywords'], $index, 1);
+
+    }
+
+  }
+
+  // Drop the keywords wrapper so clean tags are returned to the form.
+  drupal_array_set_nested_value($form_state['input'], $element['#parents'], $tags);
+  drupal_array_set_nested_value($form_state['values'], $element['#parents'], $tags['keywords']);
+
+}
+
+/**
+ * Submit handler for the culturefeed keywords element.
+ */
+function culturefeed_tags_element_tags_element_process_submit($form, &$form_state) {
+
+  $form_state['rebuild'] = TRUE;
+
+}
+
+/**
+ * Implements hook_theme().
+ */
+function culturefeed_tags_element_theme() {
+
+  return array(
+    'culturefeed_tags_element_tags_element_form_table' => array(
+      'render element' => 'form',
+      'path' => drupal_get_path('module', 'culturefeed_tags_element') . '/theme',
+      'file' => 'theme.inc',
+    ),
+  );
+}
+
+/**
+ * Value callback for the culturefeed date control timestamps element.
+ *
+ * @param array $element
+ *   The element.
+ * @param mixed $input
+ *   The input.
+ * @param array $form_state
+ *   The form state.
+ *
+ * @return mixed
+ *   The value.
+ */
+function culturefeed_tags_element_tags_element_value_callback(array $element, $input, array $form_state) {
+
+  if ($input) {
+    return $input;
+  }
+  else {
+
+    $value = array('keywords' => array());
+
+    if (isset($element['#default_value']) && $element['#default_value']) {
+      $value['keywords'] = $element['#default_value'];
+    }
+
+    return $value;
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc
new file mode 100644
index 00000000..b15427fb
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Theming functions for culturefeed tags element.
+ */
+
+/**
+ * Returns html for an edit tags form rendered as table.
+ */
+function theme_culturefeed_tags_element_tags_element_form_table(&$vars) {
+
+  $form = $vars['form'];
+  $attributes = (isset($form['#attributes'])) ? $form['#attributes'] : array();
+  $attributes['class'][] = 'table-no-striping';
+
+  $header = array();
+  $rows = array();
+
+  foreach (element_children($form) as $row) {
+    $rows[] = array(
+      'data' => array(
+        array(
+          'data' => drupal_render($form[$row]['value']),
+          'class' => 'edit-tags-form-cell',
+        ),
+        array(
+          'data' => drupal_render($form[$row]['visible']),
+          'class' => 'edit-tags-form-cell',
+        ),
+        array(
+          'data' => drupal_render($form[$row]['remove']),
+          'class' => 'edit-tags-form-cell',
+        ),
+      ),
+      'no_striping' => TRUE,
+    );
+  }
+
+  $output = theme('table', array(
+    'attributes' => $attributes,
+    'header' => $header,
+    'rows' => $rows,
+  ));
+  $output .= drupal_render_children($form);
+  return $output;
+
+}
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.info b/culturefeed_entry_ui/culturefeed_entry_ui.info
index 99ca5414..0b381a56 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.info
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.info
@@ -8,6 +8,7 @@ dependencies[] = culturefeed_search_views
 dependencies[] = culturefeed
 dependencies[] = culturefeed_date_control
 dependencies[] = culturefeed_location_control
+dependencies[] = culturefeed_tags_element
 dependencies[] = file
 dependencies[] = date
 dependencies[] = date_api
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index b482dbce..a3b45f37 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -49,11 +49,6 @@ function culturefeed_entry_ui_theme() {
       'path' => drupal_get_path('module', 'culturefeed_entry_ui') . '/theme',
       'file' => 'theme.inc',
     ),
-    'culturefeed_entry_ui_edit_tag_objects_form_table' => array(
-      'render element' => 'form',
-      'path' => drupal_get_path('module', 'culturefeed_entry_ui') . '/theme',
-      'file' => 'theme.inc',
-    ),
   );
 }
 
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
index 4731d429..e20ee3ea 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
@@ -5,13 +5,6 @@
  * Contains culturefeed_entry_ui.tag_objects.inc.
  */
 
-/**
- * Ajax callback for the edit tags form.
- */
-function culturefeed_entry_ui_edit_tag_objects_ajax_callback($form, $form_state) {
-  return $form['wrapper'];
-}
-
 /**
  * Form builder for the tags form for cdb 3.3 and above.
  */
@@ -23,83 +16,19 @@ function culturefeed_entry_ui_edit_tag_objects_form($form, &$form_state, $event)
   /* @var \CultureFeed_Cdb_Data_Keyword[] $event_tags */
   $event_tags = $event->getKeywords(TRUE);
 
-  // Tags.
   $tags = array();
-  if (!isset($form_state['values']['tags'])) {
-
-    foreach ($event_tags as $tag) {
-      $tags[] = array(
-        'value' => $tag->getValue(),
-        'visible' => $tag->isVisible(),
-      );
-    }
-
-  }
-
-  else {
-    $tags = $form_state['values']['tags'];
-  }
-
-  // Set the form.
-  $html_id = 'tag-objects-wrapper';
-
-  $form['wrapper'] = array(
-    '#type' => 'container',
-    '#attributes' => array('id' => $html_id),
-  );
-
-  $form['wrapper']['tags'] = array(
-    '#attached' => array(
-      'css' => array(
-        drupal_get_path('module', 'culturefeed_entry_ui') . '/css/edit_tag_objects_form.css',
-      ),
-    ),
-    '#attributes' => array('class' => array('edit-tag-objects-form-table')),
-    '#theme' => 'culturefeed_entry_ui_edit_tag_objects_form_table',
-    '#tree' => TRUE,
-  );
-
-  foreach ($tags as $key => $tag) {
-
-    $tag_elements = array(
-      'value' => array(
-        '#default_value' => $tag['value'],
-        '#type' => 'textfield',
-      ),
-      'visible' => array(
-        '#default_value' => $tag['visible'],
-        '#title' => t('Hide tag'),
-        '#type' => 'checkbox',
-      ),
+  foreach ($event_tags as $tag) {
+    $tags[] = array(
+      'value' => $tag->getValue(),
+      'visible' => $tag->isVisible(),
     );
-
-    if (count($tags) > 1) {
-
-      $tag_elements['remove'] = array(
-        '#ajax' => array(
-          'callback' => 'culturefeed_entry_ui_edit_tag_objects_ajax_callback',
-          'wrapper' => $html_id,
-        ),
-        '#name' => 'remove_' . $key,
-        '#submit' => array('culturefeed_entry_ui_edit_tag_objects_form_process'),
-        '#type' => 'submit',
-        '#value' => t('Remove tag'),
-      );
-
-    }
-
-    $form['wrapper']['tags'][] = $tag_elements;
-
   }
 
-  $form['add_tag'] = array(
-    '#ajax' => array(
-      'callback' => 'culturefeed_entry_ui_edit_tag_objects_ajax_callback',
-      'wrapper' => $html_id,
-    ),
-    '#submit' => array('culturefeed_entry_ui_edit_tag_objects_form_process'),
-    '#type' => 'submit',
-    '#value' => t('Add tag'),
+  $form['#object_id'] = $event->getCdbId();
+
+  $form['tags'] = array(
+    '#type' => 'culturefeed_tags_element',
+    '#default_value' => $tags,
   );
 
   $form['actions'] = array(
@@ -115,37 +44,6 @@ function culturefeed_entry_ui_edit_tag_objects_form($form, &$form_state, $event)
 
 }
 
-/**
- * Submit handler for culturefeed_entry_ui_edit_tag_objects_form().
- */
-function culturefeed_entry_ui_edit_tag_objects_form_process($form, &$form_state) {
-
-  // Triggering data.
-  $triggering_element = isset($form_state['triggering_element']) ? $form_state['triggering_element'] : '';
-  $triggering_parents = ($triggering_element) ? array_reverse($triggering_element['#parents']) : array();
-
-  // Check if a tag needs to be added.
-  if (isset($triggering_parents[0]) && $triggering_parents[0] == 'add_tag') {
-    $tag = array('value' => '', 'visible' => 0);
-    $form_state['values']['tags'][] = $tag;
-  }
-
-  // Check if a tag needs to be removed.  This is done here as renumbering
-  // needs to be ensured.
-  if (isset($triggering_parents[0]) && $triggering_parents[0] == 'remove') {
-
-    $key = $triggering_element['#parents'][1];
-    unset($form_state['values']['tags'][$key]);
-    $form_state['values']['tags'] = array_values($form_state['values']['tags']);
-    unset($form_state['input']['tags'][$key]);
-    $form_state['input']['tags'] = array_values($form_state['input']['tags']);
-
-  }
-
-  $form_state['rebuild'] = TRUE;
-
-}
-
 /**
  * Submit handler for culturefeed_entry_ui_edit_tag_objects_form().
  */
@@ -153,9 +51,11 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
 
   // Merge custom tags into all tags.
   $tags = $form_state['values']['tags'];
-  $tag_objects = array();
+  $keywords = array();
+  $visibles = array();
   foreach ($tags as $tag) {
-    $tag_objects[] = new CultureFeed_Cdb_Data_Keyword($tag['value'], $tag['visible']);
+    $keywords[] = $tag['value'];
+    $visibles[] = (isset($tag['visible']) && $tag['visible']) ? TRUE : FALSE;
   }
 
   $event = new CultureFeed_Cdb_Item_Event();
@@ -164,8 +64,8 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
   try {
 
     // Add new tags.
-    if ($tags) {
-      Drupalculturefeed_EntryApi::addTagToEvent($event, $tag_objects);
+    if ($keywords) {
+      Drupalculturefeed_EntryApi::addTagToEvent($event, $keywords, $visibles);
     }
 
     drupal_set_message(t('The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the "View" tab'));
@@ -194,7 +94,7 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit_validate($form, &$for
 
   foreach ($form_state['values']['tags'] as $key => $tag) {
     if (!$tag['value']) {
-      form_set_error('tags][' . $key . '][value', t('The tag should have a value.'));
+      form_set_error('tags][keywords][' . $key . '][value', t('The tag should have a value.'));
     }
   }
 

From 7a5db294deb133e86f388f5d08abae848923cdef Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 5 May 2015 10:41:49 +0200
Subject: [PATCH 136/275] MSS-154 some bug fixes

---
 .../handlers/field/views_handler_field_cdb_item_picture.inc | 6 ++++--
 .../views_handler_field_cdb_item_short_description.inc      | 6 ++++--
 .../handlers/field/views_handler_field_cdb_item_title.inc   | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 76adcd6a..69155f2c 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -89,13 +89,15 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       foreach ($parameters as $i => $parameter) {
         $key = $parameter->getKey();
         $value = $parameter->getValue();
-        if ($key != 'fq' || empty($value)) {
+        if ($key != 'fq' || empty($value) || 0 !== strpos($value, 'keyword')) {
           unset($parameters[$i]);
         }
       }
 
       // If more filterquery's are defined, take first one.
-      $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      if (count($parameters) > 0) {
+        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      }
 
       foreach ($roadmaps as $roadmap) {
         $subbrand = $roadmap->getSubbrand();
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index ba8f53e6..53445197 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -46,13 +46,15 @@ class views_handler_field_cdb_item_short_description extends views_handler_field
       foreach ($parameters as $i => $parameter) {
         $key = $parameter->getKey();
         $value = $parameter->getValue();
-        if ($key != 'fq' || empty($value)) {
+        if ($key != 'fq' || empty($value) || 0 !== strpos($value, 'keyword')) {
           unset($parameters[$i]);
         }
       }
 
       // If more filterquery's are defined, take first one.
-      $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      if (count($parameters) > 0) {
+        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      }
 
       foreach ($roadmaps as $roadmap) {
         $subbrand = $roadmap->getSubbrand();
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index dad2ed1c..ec26655e 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -54,13 +54,15 @@ class views_handler_field_cdb_item_title extends views_handler_field {
       foreach ($parameters as $i => $parameter) {
         $key = $parameter->getKey();
         $value = $parameter->getValue();
-        if ($key != 'fq' || empty($value)) {
+        if ($key != 'fq' || empty($value) || 0 !== strpos($value, 'keyword') ) {
           unset($parameters[$i]);
         }
       }
 
       // If more filterquery's are defined, take first one.
-      $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      if (count($parameters) > 0) {
+        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      }
 
       foreach ($roadmaps as $roadmap) {
         $subbrand = $roadmap->getSubbrand();

From ee6dd65711240bf1605a537224ec0a9c63a6438e Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 5 May 2015 11:14:54 +0200
Subject: [PATCH 137/275] MSS-151 move culturefeed_cdb_upgrade to a culturefeed
 search setting

---
 .../culturefeed_cdb_upgrade.info              |  7 ----
 .../culturefeed_cdb_upgrade.module            | 19 ----------
 culturefeed_search/culturefeed_search.info    |  2 +-
 culturefeed_search/culturefeed_search.module  | 36 +++++++++++++++++++
 culturefeed_search/includes/admin.inc         | 13 +++++++
 .../lib}/CdbEventSubscriber.php               |  0
 6 files changed, 50 insertions(+), 27 deletions(-)
 delete mode 100644 culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
 delete mode 100644 culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
 rename {culturefeed_cdb_upgrade => culturefeed_search/lib}/CdbEventSubscriber.php (100%)

diff --git a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
deleted file mode 100644
index 1c783d38..00000000
--- a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.info
+++ /dev/null
@@ -1,7 +0,0 @@
-name = CultureFeed Cdb Upgrade
-description = Temporary module to enable cdb v 3.3.
-package = CultureFeed
-version = VERSION
-core = 7.x
-
-files[] = CdbEventSubscriber.php
diff --git a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module b/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
deleted file mode 100644
index effaed7a..00000000
--- a/culturefeed_cdb_upgrade/culturefeed_cdb_upgrade.module
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains culturefeed_mss_151.module.
- */
-
-/**
- * Implements hook_culturefeed_search_service_created().
- */
-function culturefeed_cdb_upgrade_culturefeed_search_service_created($service) {
-
-  /** @var \CultuurNet\Search\Guzzle\Service $service */
-  // Temporary workaround to set CDB to 3.3
-  $client_factory = $service->getHttpClientFactory();
-  $client_factory->addSubscriber(new CdbEventSubscriber());
-  $service->setHttpClientFactory($client_factory);
-
-}
diff --git a/culturefeed_search/culturefeed_search.info b/culturefeed_search/culturefeed_search.info
index 45b8449f..d6e8a9ea 100644
--- a/culturefeed_search/culturefeed_search.info
+++ b/culturefeed_search/culturefeed_search.info
@@ -4,6 +4,7 @@ package = CultureFeed
 version = VERSION
 core = 7.x
 
+files[] = lib/CdbEventSubscriber.php
 files[] = lib/Drupal/Import/CultureFeedDomainImport.php
 files[] = lib/Drupal/Import/CultureFeedCityImport.php
 files[] = lib/Drupal/Import/CnapiHeadingImport.php
@@ -11,4 +12,3 @@ files[] = lib/Drupal/DrupalCultureFeedSearchService.php
 files[] = lib/Drupal/DrupalCultureFeedSearchService_Cache.php
 files[] = lib/Drupal/DrupalNodeExtendedEntity.php
 files[] = lib/Drupal/GenericContentExtendedEntity.php
-files[] = lib/Drupal/CdbEventSubscriber.php
\ No newline at end of file
diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 65bdfccd..1d9cc27e 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -13,6 +13,41 @@ define('CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE', 20);
 
 module_load_include('inc', 'culturefeed_search', 'includes/helpers');
 
+/**
+ * Implements hook_culturefeed_search_service_created().
+ *
+ * @param \CultuurNet\Search\Guzzle\Service $service
+ *   The service.
+ */
+function culturefeed_search_culturefeed_search_service_created($service) {
+
+  // Temporary workaround to set CDB to 3.3
+  $version = variable_get('culturefeed_search_cdb_version', '3.2');
+
+  // -1 if first version is lower as second.
+  if (version_compare($version, '3.3') !== -1) {
+
+    $client_factory = $service->getHttpClientFactory();
+    $client_factory->addSubscriber(new CdbEventSubscriber());
+    $service->setHttpClientFactory($client_factory);
+
+  }
+
+}
+
+/**
+ * Returns the cdb schema version number.
+ */
+function culturefeed_search_get_cdb_schema_version_number() {
+
+  $schema_name = CultureFeed_Cdb_Default::CDB_SCHEME_URL;
+  $pattern = '/(http:\/\/www.cultuurdatabank.com\/XMLSchema\/CdbXSD\/)(.*)(\/FINAL)/';
+  $matches = array();
+  preg_match($pattern, $schema_name, $matches);
+  return $matches[2];
+
+}
+
 /**
  * Implements hook_init().
  */
@@ -156,3 +191,4 @@ function culturefeed_search_cache_flush_submit($form, $form_state) {
   _culturefeed_search_flush_caches();
 
 }
+
diff --git a/culturefeed_search/includes/admin.inc b/culturefeed_search/includes/admin.inc
index 70d37618..125f8c5e 100644
--- a/culturefeed_search/includes/admin.inc
+++ b/culturefeed_search/includes/admin.inc
@@ -35,6 +35,19 @@ function culturefeed_search_admin_settings() {
     '#maxlength' => 40,
   );
 
+  $form['culturefeed_search_cdb_version'] = array(
+    '#default_value' => variable_get('culturefeed_search_cdb_version', '3.2'),
+    '#description' => t('The culturefeed cdb schema version.'),
+    '#title' => t('Cdb schema version'),
+    '#type' => 'select',
+    '#options' => array(
+      '3.0' => '3.0',
+      '3.1' => '3.1',
+      '3.2' => '3.2',
+      '3.3' => '3.3',
+    ),
+  );
+
   return system_settings_form($form);
 
 }
diff --git a/culturefeed_cdb_upgrade/CdbEventSubscriber.php b/culturefeed_search/lib/CdbEventSubscriber.php
similarity index 100%
rename from culturefeed_cdb_upgrade/CdbEventSubscriber.php
rename to culturefeed_search/lib/CdbEventSubscriber.php

From 15fa1c71574c312a4cb58d81982b7034cf607ccf Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 5 May 2015 11:39:05 +0200
Subject: [PATCH 138/275] UIV-1085 fix duplicate FB share dialog when calendar
 is enabled

---
 culturefeed_calendar/theme/theme.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/culturefeed_calendar/theme/theme.inc b/culturefeed_calendar/theme/theme.inc
index 39f19dbd..caf1267b 100644
--- a/culturefeed_calendar/theme/theme.inc
+++ b/culturefeed_calendar/theme/theme.inc
@@ -298,8 +298,6 @@ function culturefeed_calendar_preprocess_culturefeed_calendar_share_page(&$varia
     $variables['calendar_share_path'] = 'culturefeed/calendar/' . $cf_user->id;
     $variables['calendar_share_url'] = url($variables['calendar_share_path'], array('absolute' => TRUE));
 
-    culturefeed_search_ui_add_facebook_share();
-
     $variables['facebook']['url'] = 'https://www.facebook.com/sharer/sharer.php';
     $variables['facebook']['attr'] = array(
       'query' => array('u' => $variables['calendar_share_url']),

From e39d5fcd856355dbe1c3df2bc3e1ec2ef78fa7d4 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 5 May 2015 13:17:58 +0200
Subject: [PATCH 139/275] revert previous commit

---
 culturefeed_calendar/theme/theme.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/culturefeed_calendar/theme/theme.inc b/culturefeed_calendar/theme/theme.inc
index caf1267b..39f19dbd 100644
--- a/culturefeed_calendar/theme/theme.inc
+++ b/culturefeed_calendar/theme/theme.inc
@@ -298,6 +298,8 @@ function culturefeed_calendar_preprocess_culturefeed_calendar_share_page(&$varia
     $variables['calendar_share_path'] = 'culturefeed/calendar/' . $cf_user->id;
     $variables['calendar_share_url'] = url($variables['calendar_share_path'], array('absolute' => TRUE));
 
+    culturefeed_search_ui_add_facebook_share();
+
     $variables['facebook']['url'] = 'https://www.facebook.com/sharer/sharer.php';
     $variables['facebook']['attr'] = array(
       'query' => array('u' => $variables['calendar_share_url']),

From 592ae15ab6c52b59d3e6ade0a66fc0e2904fc5e5 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 5 May 2015 13:18:55 +0200
Subject: [PATCH 140/275] UIV-1085 change default language for share dialog in
 nl_BE

---
 js/facebook_share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/facebook_share.js b/js/facebook_share.js
index 5f79a48f..3e06c3c0 100644
--- a/js/facebook_share.js
+++ b/js/facebook_share.js
@@ -30,6 +30,6 @@ window.fbAsyncInit = function() {
   }
   js = d.createElement(s);
   js.id = id;
-  js.src = "//connect.facebook.net/en_US/sdk.js";
+  js.src = "//connect.facebook.net/nl_BE/sdk.js";
   fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));
\ No newline at end of file

From a44bd2abfbcd53b0ec9b3f101b46fbfaa1a048ee Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 5 May 2015 13:19:40 +0200
Subject: [PATCH 141/275] UIV-1085 fix notice

---
 culturefeed_agenda/theme/theme.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 195ebcb0..028cceef 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -399,6 +399,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     }
 
     // Prepare to push share activities to Culturefeed.
+    $track = FALSE;
     if (culturefeed_is_culturefeed_user()) {
       $track = TRUE;
       $content_type = culturefeed_get_content_type($item->getType());

From 25ace22a6054b02f6d3d581a6cc1793df4e0c97a Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 5 May 2015 15:30:51 +0200
Subject: [PATCH 142/275] MSS-153 Implement custom tags on tags tab

---
 .../css/culturefeed_tags_element.css          | 11 +--
 .../culturefeed_tags_element.module           | 84 ++++++++++++++-----
 .../culturefeed_tags_element/theme/theme.inc  |  8 +-
 .../culturefeed_entry_ui.module               |  4 +-
 .../includes/culturefeed_entry_ui.admin.inc   | 58 ++++++++++---
 .../form/culturefeed_entry_ui.tag_objects.inc | 60 +++++++++----
 6 files changed, 167 insertions(+), 58 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css
index ddb4e247..6a22dfa1 100644
--- a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/css/culturefeed_tags_element.css
@@ -1,21 +1,22 @@
-table.edit-tags-form-table {
+table.tags-element-form-table {
   margin-bottom: 10px;
+  width: auto;
 }
 
-.edit-tags-form-table td.edit-tags-form-cell {
+.tags-element-form-table td.tags-element-form-cell {
   vertical-align: middle;
   border-top: none;
 }
 
-.edit-tags-form-table td.edit-tags-form-cell .form-group {
+.tags-element-form-table td.tags-element-form-cell .form-group {
   margin: 0px;
 }
 
-.edit-tags-form-table input.form-checkbox {
+.tags-element-form-table input.form-checkbox {
   max-width: inherit;
   margin-right: 0;
 }
 
-button.edit-tags-add-tag {
+button.tags-element-add-tag {
   margin: 0px 0px 10px 8px;
 }
\ No newline at end of file
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module
index fa542353..3875f39f 100644
--- a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module
@@ -39,11 +39,29 @@ function culturefeed_tags_element_tags_element_process(array $element, array &$f
   $element_id = $element['#id'];
   $array_parents = $element['#array_parents'];
 
+  // Title.
+  if (isset($element['#title'])) {
+    $element['title'] = array(
+      '#markup' => theme('form_element_label', array('element' => $element)),
+    );
+  }
+
+  // Default visibility.
+  if (!isset($element['#visible_default'])) {
+    $element['#visible_default'] = TRUE;
+  }
+
+  // Ajax wrapper.
   $element['#prefix'] = "<div id=\"" . $element_id . "-ajax-wrapper\">";
   $element['#suffix'] = "</div>";
 
   // Tags.
   $tags = $element['#value'];
+  if (empty($tags['keywords'])) {
+    $tags['keywords'] = array(
+      array('value' => '', 'hidden' => !$element['#visible_default']),
+    );
+  }
 
   $element['keywords'] = array(
     '#attached' => array(
@@ -51,40 +69,33 @@ function culturefeed_tags_element_tags_element_process(array $element, array &$f
         drupal_get_path('module', 'culturefeed_tags_element') . '/css/culturefeed_tags_element.css',
       ),
     ),
-    '#attributes' => array('class' => array('edit-tags-form-table')),
+    '#attributes' => array('class' => array('tags-element-form-table')),
     '#theme' => 'culturefeed_tags_element_tags_element_form_table',
   );
 
   foreach ($tags['keywords'] as $key => $tag) {
 
-    $tag_elements = array(
+    $element['keywords'][$key] = array(
       'value' => array(
         '#default_value' => $tag['value'],
         '#type' => 'textfield',
       ),
-      'visible' => array(
-        '#default_value' => isset($tag['visible']) ? $tag['visible'] : 0,
+      'hidden' => array(
+        '#default_value' => isset($tag['hidden']) && $tag['hidden'] ? 1 : 0,
         '#title' => t('Hide tag'),
         '#type' => 'checkbox',
       ),
-    );
-
-    if (count($tags['keywords']) > 1) {
-
-      $tag_elements['remove'] = array(
+      'remove' => array(
         '#ajax' => array(
           'path' => 'culturefeed_elements/ajax/' . implode('/', $array_parents),
           'wrapper' => $element_id . '-ajax-wrapper',
         ),
-        '#name' => 'remove_' . $key,
+        '#name' => $element_id . '-remove-' . $key,
         '#submit' => array('culturefeed_tags_element_tags_element_process_submit'),
         '#type' => 'submit',
         '#value' => t('Remove tag'),
-      );
-
-    }
-
-    $element['keywords'][$key] = $tag_elements;
+      ),
+    );
 
   }
 
@@ -94,8 +105,9 @@ function culturefeed_tags_element_tags_element_process(array $element, array &$f
       'wrapper' => $element_id . '-ajax-wrapper',
     ),
     '#attributes' => array(
-      'class' => array('edit-tags-add-tag'),
+      'class' => array('tags-element-add-tag'),
     ),
+    '#name' => $element_id . '-add-tag',
     '#submit' => array('culturefeed_tags_element_tags_element_process_submit'),
     '#type' => 'submit',
     '#value' => t('Add tag'),
@@ -124,7 +136,7 @@ function culturefeed_tags_element_tags_element_validate(array &$element, array &
 
     // Check if a tag needs to be added.
     if ($triggering_parent == 'add_tag') {
-      $tag = array('value' => '');
+      $tag = array('value' => '', 'hidden' => !$element['#visible_default']);
       $tags['keywords'][] = $tag;
     }
 
@@ -139,9 +151,24 @@ function culturefeed_tags_element_tags_element_validate(array &$element, array &
 
   }
 
-  // Drop the keywords wrapper so clean tags are returned to the form.
+  // The form element works with $element['#value']
+  // (and thus $form_state['input']).
   drupal_array_set_nested_value($form_state['input'], $element['#parents'], $tags);
-  drupal_array_set_nested_value($form_state['values'], $element['#parents'], $tags['keywords']);
+
+  // The form works with $form_state['values'].  Drop the keywords wrapper so
+  // clean tags are returned to the form and set the hidden property as visible.
+  $values = array();
+  foreach ($tags['keywords'] as $tag) {
+
+    if (isset($tag['value']) && $tag['value']) {
+      $values[$tag['value']] = array(
+        'value' => $tag['value'],
+        'visible' => !(isset($tag['hidden']) && $tag['hidden']),
+      );
+    }
+  }
+
+  drupal_array_set_nested_value($form_state['values'], $element['#parents'], $values);
 
 }
 
@@ -186,12 +213,29 @@ function culturefeed_tags_element_tags_element_value_callback(array $element, $i
   if ($input) {
     return $input;
   }
+
   else {
 
     $value = array('keywords' => array());
 
     if (isset($element['#default_value']) && $element['#default_value']) {
-      $value['keywords'] = $element['#default_value'];
+
+      $keywords = array();
+      foreach ($element['#default_value'] as $tag) {
+
+        if (isset($tag['value']) && $tag['value']) {
+
+          $keywords[] = array(
+            'value' => $tag['value'],
+            'hidden' => (isset($tag['visible']) && !$tag['visible']) ? 1 : 0,
+          );
+
+        }
+
+      }
+
+      $value['keywords'] = $keywords;
+
     }
 
     return $value;
diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc
index b15427fb..0ccd1f7b 100644
--- a/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_tags_element/theme/theme.inc
@@ -22,15 +22,15 @@ function theme_culturefeed_tags_element_tags_element_form_table(&$vars) {
       'data' => array(
         array(
           'data' => drupal_render($form[$row]['value']),
-          'class' => 'edit-tags-form-cell',
+          'class' => 'tags-element-form-cell',
         ),
         array(
-          'data' => drupal_render($form[$row]['visible']),
-          'class' => 'edit-tags-form-cell',
+          'data' => drupal_render($form[$row]['hidden']),
+          'class' => 'tags-element-form-cell',
         ),
         array(
           'data' => drupal_render($form[$row]['remove']),
-          'class' => 'edit-tags-form-cell',
+          'class' => 'tags-element-form-cell',
         ),
       ),
       'no_striping' => TRUE,
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index a3b45f37..81c12e0c 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -63,7 +63,9 @@ function culturefeed_entry_ui_menu() {
     'argument' => 'culturefeed_entry_ui_edit_tags_form',
     'file' => 'includes/culturefeed_entry_ui.pages.inc',
   );
-  if (!version_compare(culturefeed_cdb_upgrade_get_schema_version_number(), '3.3')) {
+  $version = variable_get('culturefeed_search_cdb_version', '3.2');
+  // -1 if first version is lower as second.
+  if (version_compare($version, '3.3') !== -1) {
     $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
     $tags_form['file'] = 'includes/form/culturefeed_entry_ui.tag_objects.inc';
   }
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index be59a0ca..d018b537 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -17,6 +17,8 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     $language_options[$language->language] = $language->name;
   }
 
+  $cdb_version = variable_get('culturefeed_search_cdb_version', '3.2');
+
   $form['culturefeed_entry_ui_preferred_language'] = array(
     '#title' => t('Preferred language'),
     '#type' => 'select',
@@ -25,19 +27,51 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     '#default_value' => variable_get('culturefeed_entry_ui_preferred_language', ''),
   );
 
-  $form['culturefeed_entry_ui_custom_tags'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Custom options on the /tags page'),
-    '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
-    '#description' => t('Custom tags specific for this site. Use a new line for each tag.'),
-  );
+  // -1 if first version is lower as second.
+  if (version_compare($cdb_version, '3.3') !== -1) {
 
-  $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Custom tags to push to entry API'),
-    '#default_value' => variable_get('culturefeed_entry_ui_custom_entry_api_tags'),
-    '#description' => t('Tags pushed under the hood to Entry API. Use a new line for each tag.'),
-  );
+    $form['culturefeed_entry_ui_custom_tags'] = array(
+      '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
+      '#description' => t('Custom tags specific for this site.'),
+      '#title' => t('Custom options on the /tags page'),
+      '#type' => 'culturefeed_tags_element',
+      '#visible_default' => FALSE,
+    );
+
+  }
+  else {
+
+    $form['culturefeed_entry_ui_custom_tags'] = array(
+      '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
+      '#description' => t('Custom tags specific for this site. Use a new line for each tag.'),
+      '#title' => t('Custom options on the /tags page'),
+      '#type' => 'textarea',
+    );
+
+  }
+
+  // -1 if first version is lower as second.
+  if (version_compare($cdb_version, '3.3') !== -1) {
+
+    $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
+      '#default_value' => variable_get('culturefeed_entry_ui_custom_entry_api_tags'),
+      '#description' => t('Tags pushed under the hood to Entry API.'),
+      '#title' => t('Custom tags to push to entry API'),
+      '#type' => 'culturefeed_tags_element',
+      '#visible_default' => FALSE,
+    );
+
+  }
+  else {
+
+    $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
+      '#default_value' => variable_get('culturefeed_entry_ui_custom_entry_api_tags'),
+      '#description' => t('Tags pushed under the hood to Entry API. Use a new line for each tag.'),
+      '#title' => t('Custom tags to push to entry API'),
+      '#type' => 'textarea',
+    );
+
+  }
 
   $form['culturefeed_entry_ui_default_country'] = array(
     '#type' => 'select',
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
index e20ee3ea..911d108c 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
@@ -15,22 +15,44 @@ function culturefeed_entry_ui_edit_tag_objects_form($form, &$form_state, $event)
   /* @var \CultureFeed_Cdb_Item_Event $event */
   /* @var \CultureFeed_Cdb_Data_Keyword[] $event_tags */
   $event_tags = $event->getKeywords(TRUE);
+  $custom_tags = variable_get('culturefeed_entry_ui_custom_tags', array());
+  $form['#old_tags'] = $event_tags;
+  $form['#object_id'] = $event->getCdbId();
 
+  // Tags.
   $tags = array();
   foreach ($event_tags as $tag) {
-    $tags[] = array(
-      'value' => $tag->getValue(),
-      'visible' => $tag->isVisible(),
-    );
-  }
 
-  $form['#object_id'] = $event->getCdbId();
+    $value = $tag->getValue();
+
+    if (!in_array($value, array_keys($custom_tags))) {
+
+      $tags[] = array(
+        'value' => $tag->getValue(),
+        'visible' => $tag->isVisible(),
+      );
+
+    }
+
+  }
 
   $form['tags'] = array(
-    '#type' => 'culturefeed_tags_element',
     '#default_value' => $tags,
+    '#title' => t('Tags'),
+    '#type' => 'culturefeed_tags_element',
   );
 
+  if (user_access('manage custom tags') && !empty($custom_tags)) {
+
+    $form['custom_tags'] = array(
+      '#default_value' => array_intersect(array_keys($event_tags), array_keys($custom_tags)),
+      '#options' => array_combine(array_keys($custom_tags), array_keys($custom_tags)),
+      '#title' => t('Custom tags'),
+      '#type' => 'checkboxes',
+    );
+
+  }
+
   $form['actions'] = array(
     '#type' => 'actions',
     'submit' => array(
@@ -50,12 +72,15 @@ function culturefeed_entry_ui_edit_tag_objects_form($form, &$form_state, $event)
 function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state) {
 
   // Merge custom tags into all tags.
-  $tags = $form_state['values']['tags'];
   $keywords = array();
-  $visibles = array();
-  foreach ($tags as $tag) {
-    $keywords[] = $tag['value'];
-    $visibles[] = (isset($tag['visible']) && $tag['visible']) ? TRUE : FALSE;
+  foreach ($form_state['values']['tags'] as $tag) {
+    $keywords[] = new CultureFeed_Cdb_Data_Keyword($tag['value'], isset($tag['visible']) ? $tag['visible'] : TRUE);
+  }
+  $custom_tags = variable_get('culturefeed_entry_ui_custom_tags', array());
+  foreach ($form_state['values']['custom_tags'] as $tag) {
+    if (isset($custom_tags[$tag])) {
+      $keywords[] = new CultureFeed_Cdb_Data_Keyword($custom_tags[$tag]['value'], isset($custom_tags[$tag]['visible']) ? $custom_tags[$tag]['visible'] : TRUE);
+    }
   }
 
   $event = new CultureFeed_Cdb_Item_Event();
@@ -65,7 +90,7 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
 
     // Add new tags.
     if ($keywords) {
-      Drupalculturefeed_EntryApi::addTagToEvent($event, $keywords, $visibles);
+      Drupalculturefeed_EntryApi::addTagToEvent($event, $keywords);
     }
 
     drupal_set_message(t('The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the "View" tab'));
@@ -92,9 +117,12 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
  */
 function culturefeed_entry_ui_edit_tag_objects_form_submit_validate($form, &$form_state) {
 
-  foreach ($form_state['values']['tags'] as $key => $tag) {
-    if (!$tag['value']) {
-      form_set_error('tags][keywords][' . $key . '][value', t('The tag should have a value.'));
+  $tags = $form_state['values']['tags'];
+  $custom_tags = variable_get('culturefeed_entry_ui_custom_tags', array());
+
+  foreach (array_keys($tags) as $key => $tag) {
+    if (in_array($tag, array_keys($custom_tags))) {
+      form_set_error('tags][keywords][' . $key, t("Tag @tag is not permitted because it's already a custom tag.", array('@tag' => $tag)));
     }
   }
 

From f097eccc0356b29762eb5144606dfeb6a2ea3c53 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 5 May 2015 17:13:49 +0200
Subject: [PATCH 143/275] UIV-1125 fix change email link in saved searches form

---
 culturefeed_saved_searches/includes/pages.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_saved_searches/includes/pages.inc b/culturefeed_saved_searches/includes/pages.inc
index 1869117c..ce4e9292 100644
--- a/culturefeed_saved_searches/includes/pages.inc
+++ b/culturefeed_saved_searches/includes/pages.inc
@@ -45,7 +45,7 @@ function culturefeed_saved_searches_save_search_form() {
   $form['save_search_email']['email'] = array(
     '#type' => 'item',
     '#title' => $cf_account->mbox,
-    '#markup' => '<span>' . l('change', 'culturefeed/profile/edit') .'</span>',
+    '#markup' => '<span>' . l(t('Change'), 'culturefeed/account/edit') .'</span>',
   );
 
   $form['save_search_info'] = array(

From 1a9c5c18925fcc8eff37f5c1aab5b9dd232fe321 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 5 May 2015 17:25:05 +0200
Subject: [PATCH 144/275] UIV-1144 add format_plural on saved searches count

---
 .../theme/culturefeed-saved-searches-list.tpl.php             | 2 +-
 .../translations/culturefeed_saved_searches.nl.po             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/culturefeed_saved_searches/theme/culturefeed-saved-searches-list.tpl.php b/culturefeed_saved_searches/theme/culturefeed-saved-searches-list.tpl.php
index eb5e96a9..cdbe9615 100644
--- a/culturefeed_saved_searches/theme/culturefeed-saved-searches-list.tpl.php
+++ b/culturefeed_saved_searches/theme/culturefeed-saved-searches-list.tpl.php
@@ -7,7 +7,7 @@
 
 <div>
 
-  <?php print t('@total saved searches', array('@total' => $total_searches)); ?>
+  <?php print format_plural($total_searches, t('1 saved search'), t('@total saved searches', array('@total' => $total_searches))); ?>
 
   <?php foreach ($items as $item): ?>
   <div>
diff --git a/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po b/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po
index 59a196b7..ca6ec1ce 100644
--- a/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po
+++ b/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po
@@ -187,6 +187,10 @@ msgstr ""
 "Er ging iets fout bij het verwijderen van je zoekopdracht. Probeer het nog "
 "eens."
 
+#: theme/culturefeed-saved-searches-list.tpl.php:10
+msgid "1 saved search"
+msgstr "1 bewaarde zoekopdracht"
+
 #: theme/culturefeed-saved-searches-list.tpl.php:10
 msgid "@total saved searches"
 msgstr "@total bewaarde zoekopdrachten"

From 3c80e0a7aab5e8975268f9d3d58ba44733a05c2c Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 5 May 2015 19:47:21 +0200
Subject: [PATCH 145/275] MSS-153 remove tags and update event display

---
 culturefeed_agenda/theme/theme.inc            | 60 +++++++++++++++----
 .../form/culturefeed_entry_ui.tag_objects.inc | 34 +++++++++--
 2 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index ba38a67c..adb5c62e 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -311,21 +311,55 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
     }
   }
 
-  $keywords = $cdb_item->getKeywords();
-  $variables['keywords'] = '';
-
-  if ($keywords) {
-		$variables['raw_keywords'] = array();
-    $linked_keywords = array();
-    foreach ($keywords as $keyword) {
-			$variables['raw_keywords'][] = $keyword;
-      $linked_keywords[] = l($keyword, 'agenda/search', array('query' => array('keyword' => urlencode($keyword))));
+  $version = variable_get('culturefeed_search_cdb_version', '3.2');
+  // -1 if first version is lower as second.
+  if (version_compare($version, '3.3') !== -1) {
+
+    /* @var CultureFeed_Cdb_Data_Keyword[] $keywords */
+    $keywords = $cdb_item->getKeywords(TRUE);
+    $variables['keywords'] = '';
+
+    if ($keywords) {
+
+      $variables['raw_keywords'] = array();
+      $linked_keywords = array();
+
+      foreach ($keywords as $keyword) {
+
+        if ($keyword->isVisible()) {
+          $variables['raw_keywords'][] = $keyword->getValue();
+          $linked_keywords[] = l($keyword->getValue(), 'agenda/search', array('query' => array('keyword' => urlencode($keyword->getValue()))));
+        }
+
+        $variables['keywords'] = implode(', ', $linked_keywords);
+        // check if event is suitable for kids
+        if (array_key_exists('ook voor kinderen', $keywords)) {
+          $variables['forkids'] = TRUE;
+        }
+
+      }
+
     }
 
-    $variables['keywords'] = implode(', ', $linked_keywords);
-    // check if event is suitable for kids
-    if (array_key_exists('ook voor kinderen', $keywords)) {
-      $variables['forkids'] = TRUE;
+  }
+  else {
+
+    $keywords = $cdb_item->getKeywords();
+    $variables['keywords'] = '';
+
+    if ($keywords) {
+      $variables['raw_keywords'] = array();
+      $linked_keywords = array();
+      foreach ($keywords as $keyword) {
+        $variables['raw_keywords'][] = $keyword;
+        $linked_keywords[] = l($keyword, 'agenda/search', array('query' => array('keyword' => urlencode($keyword))));
+      }
+
+      $variables['keywords'] = implode(', ', $linked_keywords);
+      // check if event is suitable for kids
+      if (array_key_exists('ook voor kinderen', $keywords)) {
+        $variables['forkids'] = TRUE;
+      }
     }
   }
 
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
index 911d108c..a8f56eb6 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
@@ -58,7 +58,7 @@ function culturefeed_entry_ui_edit_tag_objects_form($form, &$form_state, $event)
     'submit' => array(
       '#type' => 'submit',
       '#validate' => array('culturefeed_entry_ui_edit_tag_objects_form_submit_validate'),
-      '#value' => t('Submit'),
+      '#value' => t('Save'),
     ),
   );
 
@@ -74,12 +74,27 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
   // Merge custom tags into all tags.
   $keywords = array();
   foreach ($form_state['values']['tags'] as $tag) {
-    $keywords[] = new CultureFeed_Cdb_Data_Keyword($tag['value'], isset($tag['visible']) ? $tag['visible'] : TRUE);
+    $keywords[$tag['value']] = new CultureFeed_Cdb_Data_Keyword($tag['value'], isset($tag['visible']) ? $tag['visible'] : TRUE);
   }
-  $custom_tags = variable_get('culturefeed_entry_ui_custom_tags', array());
-  foreach ($form_state['values']['custom_tags'] as $tag) {
-    if (isset($custom_tags[$tag])) {
-      $keywords[] = new CultureFeed_Cdb_Data_Keyword($custom_tags[$tag]['value'], isset($custom_tags[$tag]['visible']) ? $custom_tags[$tag]['visible'] : TRUE);
+
+  if (isset($form_state['values']['custom_tags'])) {
+
+    $custom_tags = variable_get('culturefeed_entry_ui_custom_tags', array());
+    foreach ($form_state['values']['custom_tags'] as $tag) {
+      if (isset($custom_tags[$tag])) {
+        $keywords[$custom_tags[$tag]['value']] = new CultureFeed_Cdb_Data_Keyword($custom_tags[$tag]['value'], isset($custom_tags[$tag]['visible']) ? $custom_tags[$tag]['visible'] : TRUE);
+      }
+    }
+
+  }
+
+  // Check what tags are removed.
+  $removed_tags = array();
+  if (!empty($form['#old_tags'])) {
+    foreach (array_keys($form['#old_tags']) as $tag) {
+      if (!in_array($tag, array_keys($keywords))) {
+        $removed_tags[] = $tag;
+      }
     }
   }
 
@@ -93,6 +108,13 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
       Drupalculturefeed_EntryApi::addTagToEvent($event, $keywords);
     }
 
+    // Remove old tags.
+    if ($removed_tags) {
+      foreach ($removed_tags as $removed_tag) {
+        Drupalculturefeed_EntryApi::removeTagFromEvent($event, $removed_tag);
+      }
+    }
+
     drupal_set_message(t('The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the "View" tab'));
 
   }

From 5fd36c3cb5b04394dadd799fda6d0a267c4828cc Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 5 May 2015 20:27:19 +0200
Subject: [PATCH 146/275] MSS-151 define default version

---
 culturefeed_search/culturefeed_search.module | 5 ++++-
 culturefeed_search/includes/admin.inc        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 1d9cc27e..5a72013f 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -8,6 +8,9 @@
 define('CULTUREFEED_SEARCH_API_LOCATION', 'http://acc.uitid.be/uitid/rest/searchv2/');
 define('CULTUREFEED_SEARCH_CACHE_EXPIRES', 3600);
 
+// Default cdb schema version.  Can be overridden in settings form.
+define('CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION', '3.2');
+
 // Default proximity search range.
 define('CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE', 20);
 
@@ -22,7 +25,7 @@ module_load_include('inc', 'culturefeed_search', 'includes/helpers');
 function culturefeed_search_culturefeed_search_service_created($service) {
 
   // Temporary workaround to set CDB to 3.3
-  $version = variable_get('culturefeed_search_cdb_version', '3.2');
+  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
 
   // -1 if first version is lower as second.
   if (version_compare($version, '3.3') !== -1) {
diff --git a/culturefeed_search/includes/admin.inc b/culturefeed_search/includes/admin.inc
index 125f8c5e..b0b73a6f 100644
--- a/culturefeed_search/includes/admin.inc
+++ b/culturefeed_search/includes/admin.inc
@@ -36,7 +36,7 @@ function culturefeed_search_admin_settings() {
   );
 
   $form['culturefeed_search_cdb_version'] = array(
-    '#default_value' => variable_get('culturefeed_search_cdb_version', '3.2'),
+    '#default_value' => variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION),
     '#description' => t('The culturefeed cdb schema version.'),
     '#title' => t('Cdb schema version'),
     '#type' => 'select',

From 3933333fc1716e682a60a55abd4b809eaf6e228b Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 5 May 2015 20:30:30 +0200
Subject: [PATCH 147/275] MSS-153 use defined cdb version as default

---
 culturefeed_agenda/theme/theme.inc                           | 2 +-
 culturefeed_entry_ui/culturefeed_entry_ui.module             | 2 +-
 culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index adb5c62e..7aec14d7 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -311,7 +311,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
     }
   }
 
-  $version = variable_get('culturefeed_search_cdb_version', '3.2');
+  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
   // -1 if first version is lower as second.
   if (version_compare($version, '3.3') !== -1) {
 
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 81c12e0c..d4683b4a 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -63,7 +63,7 @@ function culturefeed_entry_ui_menu() {
     'argument' => 'culturefeed_entry_ui_edit_tags_form',
     'file' => 'includes/culturefeed_entry_ui.pages.inc',
   );
-  $version = variable_get('culturefeed_search_cdb_version', '3.2');
+  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
   // -1 if first version is lower as second.
   if (version_compare($version, '3.3') !== -1) {
     $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index d018b537..d203ca39 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -17,7 +17,7 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     $language_options[$language->language] = $language->name;
   }
 
-  $cdb_version = variable_get('culturefeed_search_cdb_version', '3.2');
+  $cdb_version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
 
   $form['culturefeed_entry_ui_preferred_language'] = array(
     '#title' => t('Preferred language'),

From d920b79b01f871954202d2718f4464d58cd93534 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 6 May 2015 10:01:18 +0200
Subject: [PATCH 148/275] CEP-857 use redirect naar alle/city-slug when city is
 in query

---
 culturefeed_agenda/culturefeed_agenda.module | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 7e9031e9..c5b9629c 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -778,15 +778,20 @@ function culturefeed_agenda_url_outbound_alter(&$path, &$options, $original_path
       $city_parts = explode(' ', $location);
 
       // The search contains a zip code. Search city by zip + name.
-      if (is_numeric($city_parts[0])) {
+      if (is_numeric($city_parts[0]) && isset($city_parts[1])) {
 
+        // Search on city or city + (city)
         if (count($city_parts) == 2) {
-          // Static cache the result.
-          if (!isset($city_slugs[$city_parts[0]][$city_parts[1]])) {
-            $city_slugs[$city_parts[0]][$city_parts[1]] = db_query('SELECT slug FROM {culturefeed_search_cities} WHERE zip = :zip AND name = :name', array(':zip' => $city_parts[0], ':name' => $city_parts[1]))->fetchField();
-          }
-          $location_slug = $city_slugs[$city_parts[0]][$city_parts[1]];
+          $name = $city_parts[1];
+        }
+        else {
+          $name = $city_parts[1] . ' ' . $city_parts[2];
+        }
+        // Static cache the result.
+        if (!isset($city_slugs[$city_parts[0]][$city_parts[1]])) {
+          $city_slugs[$city_parts[0]][$city_parts[1]] = db_query('SELECT slug FROM {culturefeed_search_cities} WHERE zip = :zip AND name = :name', array(':zip' => $city_parts[0], ':name' => $name))->fetchField();
         }
+        $location_slug = $city_slugs[$city_parts[0]][$city_parts[1]];
       }
       // The search contains only a city / region name. Search on full name.
       else {

From ea0df538514fdd180e12f7a037952a74da81dbda Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 6 May 2015 10:48:24 +0200
Subject: [PATCH 149/275] UIV-1219 no vlieg-label for 12+

---
 culturefeed_agenda/theme/theme.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 195ebcb0..fad672e2 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -481,7 +481,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
   $event_detail = $event->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
 
   $variables['agefrom'] = check_plain($event->getAgeFrom());
-  if (is_numeric($event->getAgeFrom()) && ($event->getAgeFrom() <= 12)) {
+  if (is_numeric($event->getAgeFrom()) && ($event->getAgeFrom() < 12)) {
     $variables['forkids'] = TRUE;
   }
   $variables['location'] = culturefeed_agenda_get_location_of_event($event);

From 5d9ad9251eba9d5328a893632d801679140dfaed Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 6 May 2015 10:48:31 +0200
Subject: [PATCH 150/275] CEP-857 also add wregs in location param when
 provided

---
 .../lib/Drupal/CultureFeedSearchPage.php      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 053c29ec..f9b71bde 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -445,6 +445,9 @@ protected function addFacetFilters($params) {
     // Add the location facet. Only use the location if a distance is set.
     // all other cases will search for a category Id of the type flandersregion
     // or workingregion.
+    
+    echo '<pre>';print_r($params);echo '</pre>';
+    
     if (!empty($params['regId']) && !isset($params['distance'])) {
 
       $regFilter = array();
@@ -486,7 +489,24 @@ protected function addFacetFilters($params) {
       }
       else {
         $location = '"' . str_replace('"', '\"', $params['location']) . '"';
-        $this->parameters[] = new Parameter\FilterQuery('category_flandersregion_name' . ':' . $location);
+        
+        // Also here add wregs if in params
+        if (!empty($params['wregIds'])) {
+          $regFilter[] = array_shift($params['wregIds']);
+  
+          $wregFilters = array();
+          foreach ($params['wregIds'] as $wregId) {
+            $wregFilters[] = $wregId;
+          }
+        }
+  
+        $regFilterQuery = '(';
+        $regFilterQuery .= 'category_flandersregion_name' . ':' . $location;
+        if (!empty($wregFilters)) {
+          $regFilterQuery .= ' OR exact_category_id:(' . implode(' OR ', $wregFilters) . ')';
+        }
+        $regFilterQuery .= ')';
+        $this->parameters[] = new Parameter\FilterQuery($regFilterQuery);
       }
 
     }

From be0312f9ea000e92f5e2c71a3e12f3bfa50ef733 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 6 May 2015 10:51:01 +0200
Subject: [PATCH 151/275] CEP-857 remove debug

---
 culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index f9b71bde..35d4fd87 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -445,9 +445,6 @@ protected function addFacetFilters($params) {
     // Add the location facet. Only use the location if a distance is set.
     // all other cases will search for a category Id of the type flandersregion
     // or workingregion.
-    
-    echo '<pre>';print_r($params);echo '</pre>';
-    
     if (!empty($params['regId']) && !isset($params['distance'])) {
 
       $regFilter = array();

From 5e58c2a49d780cb30c2137c6b9803334d779ab86 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 6 May 2015 11:48:29 +0200
Subject: [PATCH 152/275] CEP-857 adding wregs params for pages

---
 culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 35d4fd87..3a3ff868 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -472,7 +472,7 @@ protected function addFacetFilters($params) {
 
       // Check if postal was present.
       $city_parts = explode(' ', $params['location']);
-      if (is_numeric($city_parts[0])) {
+      if (is_numeric($city_parts[0]) && empty($params['wregIds'])) {
         $distance = isset($params['distance']) ? $params['distance'] : FALSE;
 
         // If category_actortype_id we assume that we search on pages (on day we have to fix)
@@ -486,7 +486,7 @@ protected function addFacetFilters($params) {
       }
       else {
         $location = '"' . str_replace('"', '\"', $params['location']) . '"';
-        
+
         // Also here add wregs if in params
         if (!empty($params['wregIds'])) {
           $regFilter[] = array_shift($params['wregIds']);

From 3c5dcc151d40fce5fcb0020f6cb3c969538305fe Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 6 May 2015 13:24:02 +0200
Subject: [PATCH 153/275] UIV-1085 fix duplicate FB share dialog when related
 activities are enabled

---
 js/facebook_share.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/facebook_share.js b/js/facebook_share.js
index 3e06c3c0..c412c653 100644
--- a/js/facebook_share.js
+++ b/js/facebook_share.js
@@ -1,7 +1,7 @@
 (function($) {
   Drupal.behaviors.culturefeed_calendar_facebook_share = {
     attach: function(context, settings) {
-      $('a.facebook-share').bind('click', function(e) {
+      $('a.facebook-share', context).bind('click', function(e) {
         e.preventDefault();
         FB.ui(
          {
@@ -14,7 +14,6 @@
 
 })(jQuery);
 
-
 window.fbAsyncInit = function() {
   FB.init({
     appId: Drupal.settings.culturefeed.fbAppId,
@@ -32,4 +31,4 @@ window.fbAsyncInit = function() {
   js.id = id;
   js.src = "//connect.facebook.net/nl_BE/sdk.js";
   fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
\ No newline at end of file
+}(document, 'script', 'facebook-jssdk'));

From d12a6b0b976f2e04717d1dab6ef09f3bb82ef63a Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 6 May 2015 20:25:56 +0200
Subject: [PATCH 154/275] UIV-1085 add UTM parameters to share options

---
 culturefeed_agenda/theme/theme.inc | 82 +++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 24 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 028cceef..0ca55620 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -374,28 +374,62 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Absolute link to detail.
     $variables['share_url'] = url($variables['url'], array('absolute' => TRUE));
     
-    $variables['facebook'] = array();
-    $variables['googleplus'] = array();
-    $variables['twitter'] = array();
-    $variables['whatsapp'] = array();
+    $facebook = array();
+    $googleplus = array();
+    $twitter = array();
+    $whatsapp = array();
 
     // Set prefix for share URL's.
-    $variables['facebook']['prefix'] = 'https://www.facebook.com/sharer/sharer.php?u=';
-    $variables['googleplus']['prefix'] = 'https://plus.google.com/share?url=';
-    $variables['twitter']['prefix'] = 'https://twitter.com/intent/tweet?text=';
-    $variables['whatsapp']['prefix'] = 'whatsapp://send?text=';
+    $facebook['prefix'] = 'https://www.facebook.com/sharer/sharer.php?u=';
+    $googleplus['prefix'] = 'https://plus.google.com/share?url=';
+    $twitter['prefix'] = 'https://twitter.com/intent/tweet?text=';
+    $whatsapp['prefix'] = 'whatsapp://send?text=';
+
+    // Set UTM parameters for share URL's.
+    $utm['campaign'] = 'share';
+    $utm['medium'] = 'social';
+    
+    $facebook['utm'] = array (
+      'utm_campaign' => $utm['campaign'],
+      'utm_medium' => $utm['medium'],
+      'utm_source' => 'facebook.com',
+    );
+    
+    $googleplus['utm'] = array (
+      'utm_campaign' => $utm['campaign'],
+      'utm_medium' => $utm['medium'],
+      'utm_source' => 'plus.google.com',
+    );
+    
+    $twitter['utm'] = array (
+      'utm_campaign' => $utm['campaign'],
+      'utm_medium' => $utm['medium'],
+      'utm_source' => 'twitter.com',
+    );
+    
+    $whatsapp['utm'] = array (
+      'utm_campaign' => $utm['campaign'],
+      'utm_medium' => $utm['medium'],
+      'utm_source' => 'whatsapp',
+    );
+    
+    $mail['utm'] = array (
+      'utm_campaign' => $utm['campaign'],
+      'utm_medium' => 'email',
+      'utm_source' => 'forward-mail',
+    );
 
-    // Share URL's.      
-    $variables['facebook']['url'] = $variables['facebook']['prefix'] . $variables['share_url'];
-    $variables['googleplus']['url'] = $variables['googleplus']['prefix'] . $variables['share_url'];
-    $variables['twitter']['url'] = $variables['twitter']['prefix'] . $variables['share_url'];
-    $variables['whatsapp']['url'] = $variables['whatsapp']['prefix'] . $variables['share_url'];
+    // Build share URL's.      
+    $variables['facebook']['url'] = $facebook['prefix'] . urlencode(url($variables['share_url'], array('query' => $facebook['utm'])));
+    $variables['googleplus']['url'] = $googleplus['prefix'] . urlencode(url($variables['share_url'], array('query' => $googleplus['utm'])));
+    $variables['twitter']['url'] = $twitter['prefix'] . urlencode(url($variables['share_url'], array('query' => $twitter['utm'])));
+    $variables['whatsapp']['url'] = $whatsapp['prefix'] . urlencode(url($variables['share_url'], array('query' => $whatsapp['utm'])));
 
     if (module_exists('forward')) {
-      $variables['mail_url'] = url('forward', array('query' => array('path' => $variables['url'])));
+      $variables['mail_url'] = url('forward', array('query' => array('path' => $variables['url'], array('query' => $mail['utm']))));
     }
     else {
-      $variables['mail_url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . $variables['share_url']; 
+      $variables['mail_url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . $variables['share_url'], array('query' => $mail['utm']); 
     }
 
     // Prepare to push share activities to Culturefeed.
@@ -406,35 +440,35 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $id = $item->getId();
       $track_facebook = url('culturefeed/do/' . CultureFeed_Activity::TYPE_FACEBOOK .'/' . $content_type . '/' . urlencode($id) . '/ajax');
       $track_twitter = url('culturefeed/do/' . CultureFeed_Activity::TYPE_TWITTER .'/' . $content_type . '/' . urlencode($id) . '/ajax');
-    }
-    
+    }    
+
     // Add options.  
     $variables['facebook']['options'] = array(
       'attributes' => array(
-        'class' => array('share-link','facebook-share'),
-        'rel' => $track ? $track_facebook : '' ,
+        'class' => array('share-link', 'facebook-share'),
+        //'rel' => $track ? $track_facebook : '' ,
       ),
     );
     $variables['googleplus']['options'] = array(
       'attributes' => array(
-        'class' => array('share-link','googleplus-share'),
+        'class' => array('share-link', 'googleplus-share'),
       ),
     );
     $variables['twitter']['options'] = array(
       'attributes' => array(
-        'class' => array('share-link','twitter-share'),
-        'rel' => $track ? $track_twitter : '' ,
+        'class' => array('share-link', 'twitter-share'),
+        //'rel' => $track ? $track_twitter : '' ,
       ),
     );
     $variables['whatsapp']['options'] = array(
       'attributes' => array(
-        'class' => array('share-link','whatsapp-share'),
+        'class' => array('share-link', 'whatsapp-share'),
       ),
       'external' => TRUE,
     );
     $variables['mail']['options'] = array(
       'attributes' => array(
-        'class' => array('share-link','forward-mail'),
+        'class' => array('share-link', 'forward-mail'),
       ),
       'external' => TRUE,
     );

From e1491ea78f2bf500747d3ad75511b0e2f0d4f517 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 6 May 2015 22:01:50 +0200
Subject: [PATCH 155/275] UIV-1085 fix mail url

---
 culturefeed_agenda/theme/theme.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 0ca55620..68f0fe59 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -426,10 +426,10 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     $variables['whatsapp']['url'] = $whatsapp['prefix'] . urlencode(url($variables['share_url'], array('query' => $whatsapp['utm'])));
 
     if (module_exists('forward')) {
-      $variables['mail_url'] = url('forward', array('query' => array('path' => $variables['url'], array('query' => $mail['utm']))));
+      $variables['mail']['url'] = url('forward', array('query' => array('path' => url($variables['url'], array('query' => $mail['utm'])))));
     }
     else {
-      $variables['mail_url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . $variables['share_url'], array('query' => $mail['utm']); 
+      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm']))); 
     }
 
     // Prepare to push share activities to Culturefeed.
@@ -478,7 +478,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus']['url'], $variables['googleplus']['options']);
     $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter']['url'], $variables['twitter']['options']);
     $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp']['url'], $variables['whatsapp']['options']);
-    $variables['mail_link'] = l(t('Mail'), $variables['mail_url'], $variables['mail']['options']);
+    $variables['mail_link'] = l(t('Mail'), $variables['mail']['url'], $variables['mail']['options']);
     
     // Use dialog when Facebook app id is set.
     culturefeed_search_ui_add_facebook_share();

From 420e080df19796056f86b60865de4e7655d2b882 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 6 May 2015 22:34:20 +0200
Subject: [PATCH 156/275] UIV-1085 fix absolute link to detail

---
 culturefeed_agenda/theme/theme.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 68f0fe59..52144ad6 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -372,7 +372,8 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     }
 
     // Absolute link to detail.
-    $variables['share_url'] = url($variables['url'], array('absolute' => TRUE));
+    global $base_root;
+    $variables['share_url'] = $base_root . $variables['url'];
     
     $facebook = array();
     $googleplus = array();

From 6c65eb369c9e4439af999084ee94857195869032 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 7 May 2015 08:51:47 +0200
Subject: [PATCH 157/275] MSS-153 cleaner version comparison

---
 culturefeed_agenda/theme/theme.inc                          | 3 +--
 culturefeed_entry_ui/culturefeed_entry_ui.module            | 3 +--
 .../includes/culturefeed_entry_ui.admin.inc                 | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 7aec14d7..515f088e 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -312,8 +312,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
   }
 
   $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
-  // -1 if first version is lower as second.
-  if (version_compare($version, '3.3') !== -1) {
+  if (version_compare($version, '3.3', '>=')) {
 
     /* @var CultureFeed_Cdb_Data_Keyword[] $keywords */
     $keywords = $cdb_item->getKeywords(TRUE);
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index d4683b4a..0e0b0678 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -64,8 +64,7 @@ function culturefeed_entry_ui_menu() {
     'file' => 'includes/culturefeed_entry_ui.pages.inc',
   );
   $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
-  // -1 if first version is lower as second.
-  if (version_compare($version, '3.3') !== -1) {
+  if (version_compare($version, '3.3', '>=')) {
     $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
     $tags_form['file'] = 'includes/form/culturefeed_entry_ui.tag_objects.inc';
   }
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index d203ca39..7ce695e8 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -27,8 +27,7 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     '#default_value' => variable_get('culturefeed_entry_ui_preferred_language', ''),
   );
 
-  // -1 if first version is lower as second.
-  if (version_compare($cdb_version, '3.3') !== -1) {
+  if (version_compare($cdb_version, '3.3', '>=')) {
 
     $form['culturefeed_entry_ui_custom_tags'] = array(
       '#default_value' => variable_get('culturefeed_entry_ui_custom_tags'),
@@ -50,8 +49,7 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
 
   }
 
-  // -1 if first version is lower as second.
-  if (version_compare($cdb_version, '3.3') !== -1) {
+  if (version_compare($cdb_version, '3.3', '>=')) {
 
     $form['culturefeed_entry_ui_custom_entry_api_tags'] = array(
       '#default_value' => variable_get('culturefeed_entry_ui_custom_entry_api_tags'),

From ec34b464d86b5156ef31cbd6996082d96a917795 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 7 May 2015 08:53:51 +0200
Subject: [PATCH 158/275] MSS-151 cleaner version comparison

---
 culturefeed_search/culturefeed_search.module | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 5a72013f..2f8836f9 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -27,8 +27,7 @@ function culturefeed_search_culturefeed_search_service_created($service) {
   // Temporary workaround to set CDB to 3.3
   $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
 
-  // -1 if first version is lower as second.
-  if (version_compare($version, '3.3') !== -1) {
+  if (version_compare($version, '3.3', '>=')) {
 
     $client_factory = $service->getHttpClientFactory();
     $client_factory->addSubscriber(new CdbEventSubscriber());

From 5835ae75c32b653f00793a62dea7ceb78303f29d Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 7 May 2015 14:46:11 +0200
Subject: [PATCH 159/275] UIV-1107 actor type categories as variable in
 preprocessor of actor

---
 culturefeed_agenda/theme/theme.inc | 61 ++++++++++++++++--------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 78c98073..2614dc1d 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -328,7 +328,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $variables['forkids'] = TRUE;
     }
   }
-  
+
   $detect = culturefeed_mobile_detect_get_object();
 
   if ($detect) {
@@ -374,7 +374,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Absolute link to detail.
     global $base_root;
     $variables['share_url'] = $base_root . $variables['url'];
-    
+
     $facebook = array();
     $googleplus = array();
     $twitter = array();
@@ -389,38 +389,38 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Set UTM parameters for share URL's.
     $utm['campaign'] = 'share';
     $utm['medium'] = 'social';
-    
+
     $facebook['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'facebook.com',
     );
-    
+
     $googleplus['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'plus.google.com',
     );
-    
+
     $twitter['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'twitter.com',
     );
-    
+
     $whatsapp['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'whatsapp',
     );
-    
+
     $mail['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => 'email',
       'utm_source' => 'forward-mail',
     );
 
-    // Build share URL's.      
+    // Build share URL's.
     $variables['facebook']['url'] = $facebook['prefix'] . urlencode(url($variables['share_url'], array('query' => $facebook['utm'])));
     $variables['googleplus']['url'] = $googleplus['prefix'] . urlencode(url($variables['share_url'], array('query' => $googleplus['utm'])));
     $variables['twitter']['url'] = $twitter['prefix'] . urlencode(url($variables['share_url'], array('query' => $twitter['utm'])));
@@ -430,7 +430,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $variables['mail']['url'] = url('forward', array('query' => array('path' => url($variables['url'], array('query' => $mail['utm'])))));
     }
     else {
-      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm']))); 
+      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm'])));
     }
 
     // Prepare to push share activities to Culturefeed.
@@ -441,9 +441,9 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $id = $item->getId();
       $track_facebook = url('culturefeed/do/' . CultureFeed_Activity::TYPE_FACEBOOK .'/' . $content_type . '/' . urlencode($id) . '/ajax');
       $track_twitter = url('culturefeed/do/' . CultureFeed_Activity::TYPE_TWITTER .'/' . $content_type . '/' . urlencode($id) . '/ajax');
-    }    
+    }
 
-    // Add options.  
+    // Add options.
     $variables['facebook']['options'] = array(
       'attributes' => array(
         'class' => array('share-link', 'facebook-share'),
@@ -474,13 +474,13 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       'external' => TRUE,
     );
 
-    // Share Links.      
+    // Share Links.
     $variables['facebook_link'] = l(t('Share on Facebook'), $variables['facebook']['url'], $variables['facebook']['options']);
     $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus']['url'], $variables['googleplus']['options']);
     $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter']['url'], $variables['twitter']['options']);
     $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp']['url'], $variables['whatsapp']['options']);
     $variables['mail_link'] = l(t('Mail'), $variables['mail']['url'], $variables['mail']['options']);
-    
+
     // Use dialog when Facebook app id is set.
     culturefeed_search_ui_add_facebook_share();
 
@@ -609,18 +609,18 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
 
     // When.
     $variables['when'] = check_plain($event_detail->getCalendarSummary());
-    
+
     // Format Calendar details to readable & themable HTML.
     $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
-    
+
     // Large Calendar format (for detail pages).
     $variables['when_lg'] = '';
     try {
       $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
     }
     catch (Exception $e) {
-    } 
-    
+    }
+
     // Medium Calendar format (for event-summary on search result pages).
     $variables['when_md'] = '';
     try {
@@ -628,7 +628,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Small Calendar format (for mini-summary in event teasers).
     $variables['when_sm'] = '';
     try {
@@ -636,7 +636,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
     $variables['when_xs'] = '';
     try {
@@ -644,18 +644,18 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Format calendar to TXT
     $txt_formatter = culturefeed_agenda_get_plain_text_calendar_formatter();
-    
+
     // Large Calendar format (for detail pages).
     $variables['when_lg_txt'] = '';
     try {
       $variables['when_lg_txt'] = $txt_formatter->format($calendar, 'lg');
     }
     catch (Exception $e) {
-    } 
-    
+    }
+
     // Medium Calendar format (for event-summary on search result pages).
     $variables['when_md_txt'] = '';
     try {
@@ -663,7 +663,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Small Calendar format (for mini-summary in event teasers).
     $variables['when_sm_txt'] = '';
     try {
@@ -671,7 +671,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
     $variables['when_xs_txt'] = '';
     try {
@@ -721,24 +721,24 @@ function _culturefeed_agenda_preprocess_production(&$variables) {
       if ($event) {
         $event_detail = $event->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
         if ($event_detail) {
-        
+
           // Calendar.
           if ($calendar = $event->getEntity()->getCalendar()) {
             $variables['calendar'] = culturefeed_agenda_parse_calendar($calendar);
           }
 
           $variables['when'] = $event_detail->getCalendarSummary();
-        
+
           // Format Calendar details to readable & themable HTML.
           $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
-          
+
           // Large Calendar format (for detail pages).
           $variables['when_lg'] = '';
           try {
             $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
           }
           catch (Exception $e) {
-          } 
+          }
         }
 
         // Add location information from the event.
@@ -853,6 +853,9 @@ function _culturefeed_agenda_preprocess_actor(&$variables) {
 
   }
 
+  // Actor type.
+  $variables['actor_categories'] = $actor->getCategories()->getCategoriesByType('actortype');
+
   // Link to detail.
   $actor_detail = $actor->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
   if ($actor_detail) {

From a7950e77dab4bc37cf0c5323aa340748e1931dd8 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 7 May 2015 16:06:48 +0200
Subject: [PATCH 160/275] MSS-153 update event form

---
 .../culturefeed_elements.module               |   1 +
 .../includes/culturefeed_entry_ui.pages.inc   |  35 ++----
 .../form/culturefeed_entry_ui.location.inc    |   2 +-
 .../form/culturefeed_entry_ui.tags.inc        | 118 ++++++++++++++++++
 lib/Drupal/DrupalCultureFeed_EntryApi.php     |   8 +-
 5 files changed, 132 insertions(+), 32 deletions(-)
 create mode 100644 culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc

diff --git a/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module b/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module
index 38c636e5..0a2363d3 100644
--- a/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module
+++ b/culturefeed_entry_ui/culturefeed_elements/culturefeed_elements.module
@@ -36,6 +36,7 @@ function culturefeed_elements_ajax_callback() {
  *   True or false.
  */
 function culturefeed_elements_check_trigger_element(array $triggering_element, array $element) {
+  $test = array_intersect($triggering_element['#parents'], $element['#parents']);
   return array_intersect($triggering_element['#parents'], $element['#parents']) == $element['#parents'];
 }
 
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 52615b72..a40c4583 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -30,7 +30,6 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   $default_short_description = '';
   $default_long_description = '';
   $default_image = '';
-  $keywords = '';
   $default_links = array();
   $default_links_reservation = array();
   $phone_contacts = array();
@@ -161,12 +160,6 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
       $form_state['#ld_needed'] = TRUE;
     }
 
-    // Default keywords
-    if ($event->getKeywords()) {
-      $keywords = $event->getKeywords();
-      $keywords = implode(';', $keywords);
-    }
-
     // Default mails, phones, urls
     if ($info = $event->getContactInfo()) {
       foreach ($info->getUrls() as $default_link) {
@@ -581,12 +574,8 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   }
 
   // Tags
-  $form['extra']['keywords'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Tags'),
-    '#description' => t('Add multiple tags seperated by a ";"'),
-    '#default_value' => $keywords,
-  );
+  form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/form/culturefeed_entry_ui.tags');
+  culturefeed_entry_ui_tags_form($form, $form_state, $event);
 
   // Links
   $form['extra']['links'] = array(
@@ -1996,18 +1985,7 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   $event->setContactInfo($contact_object);
 
   // Keywords.
-  $keywords_form = array();
-  $custom_entry_api_tags = array();
-  if ($values['keywords']) {
-    $keywords_form = explode(';', $values['keywords']);
-  }
-  if (variable_get('culturefeed_entry_ui_custom_entry_api_tags')) {
-    $custom_entry_api_tags = explode("\n", variable_get('culturefeed_entry_ui_custom_entry_api_tags'));
-  }
-  $keywords = array_map('trim',array_unique(array_merge($keywords_form,$custom_entry_api_tags)));
-  foreach ($keywords as $keyword) {
-    $event->addKeyword($keyword);
-  }
+  culturefeed_entry_ui_tags_form_save($event, $form_state);
 
   // Members.
   if ($values['members']) {
@@ -2020,15 +1998,18 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   //}
 
   $form_state['submit_time'] = time();
+
   try {
+
+    $cdb_version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
     if ($update) {
-      Drupalculturefeed_EntryApi::updateEvent($event);
+      Drupalculturefeed_EntryApi::updateEvent($event, $cdb_version);
       $form_state['#event_id'] = $event->getCdbId();
       watchdog('culturefeed_entry_ui', 'Event %eventid updated.', array('%eventid' => $form_state['#event_id']));
       cache_clear_all('culturefeed:results:detail:event:' . $event->getCdbId(), 'cache_culturefeed_search');
     }
     else {
-      $form_state['#event_id'] = Drupalculturefeed_EntryApi::createEvent($event);
+      $form_state['#event_id'] = Drupalculturefeed_EntryApi::createEvent($event, $cdb_version);
       watchdog('culturefeed_entry_ui', 'Event %eventid created.', array('%eventid' => $form_state['#event_id']));
     }
 
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
index 474f3541..3d1f501a 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.location.inc
@@ -12,7 +12,7 @@
  * @param array $form_state
  *   The form state.
  * @param \CultureFeed_Cdb_Item_Event $event
- *   The extended event.
+ *   The event.
  */
 function culturefeed_entry_ui_location_form(array &$form, array &$form_state, \CultureFeed_Cdb_Item_Event $event = NULL) {
 
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
new file mode 100644
index 00000000..3129d7d1
--- /dev/null
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Contains culturefeed_entry_ui.location.inc.
+ */
+
+/**
+ * Adds the tags form element.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The event.
+ */
+function culturefeed_entry_ui_tags_form(array &$form, array &$form_state, \CultureFeed_Cdb_Item_Event $event = NULL) {
+
+  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
+  if (version_compare($version, '3.3', '>=')) {
+
+    // Default values.
+    $keywords = array();
+    if ($event && $event->getKeywords(TRUE)) {
+
+      /* @var \CultureFeed_Cdb_Data_Keyword $keyword */
+      foreach ($event->getKeywords(TRUE) as $keyword) {
+        $keywords[$keyword->getValue()] = array(
+          'value' => $keyword->getValue(),
+          'visible' => $keyword->isVisible(),
+        );
+      }
+
+    }
+
+    // Form element.
+    $form['extra']['tags'] = array(
+      '#type' => 'culturefeed_tags_element',
+      '#title' => t('Tags'),
+      '#description' => t('Add multiple tags'),
+      '#default_value' => $keywords,
+    );
+
+    $form['extra']['old_tags'] = array(
+      '#type' => 'value',
+      '#value' => $keywords,
+    );
+
+  }
+
+  else {
+
+    // Default values.
+    if ($event->getKeywords()) {
+      $keywords = $event->getKeywords();
+      $keywords = implode(';', $keywords);
+    }
+
+    // Form element.
+    $form['extra']['tags'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Tags'),
+      '#description' => t('Add multiple tags separated by a ";"'),
+      '#default_value' => $keywords,
+    );
+
+  }
+
+}
+
+/**
+ * Save handler for the tags.
+ *
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The event.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_entry_ui_tags_form_save(\CultureFeed_Cdb_Item_Event &$event, array $form_state) {
+
+  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
+  if (version_compare($version, '3.3', '>=')) {
+
+    $tags = $form_state['values']['tags'];
+    $old_tags = $form_state['values']['old_tags'];
+    $custom_entry_api_tags = variable_get('culturefeed_entry_ui_custom_entry_api_tags', array());
+    $keywords = array_unique(array_merge($tags, $custom_entry_api_tags), SORT_REGULAR);
+
+    foreach ($keywords as $keyword) {
+      $event->addKeyword(new CultureFeed_Cdb_Data_Keyword($keyword['value'], $keyword['visible']));
+    }
+
+    foreach ($old_tags as $tag => $keyword) {
+      if (!in_array($tag, array_keys($keywords))) {
+        $event->deleteKeyword(new CultureFeed_Cdb_Data_Keyword($keyword['value'], $keyword['visible']));
+      }
+    }
+
+  }
+
+  else {
+
+    $keywords_form = array();
+    $custom_entry_api_tags = array();
+    if ($form_state['values']['keywords']) {
+      $keywords_form = explode(';', $form_state['values']['tags']);
+    }
+    if (variable_get('culturefeed_entry_ui_custom_entry_api_tags')) {
+      $custom_entry_api_tags = explode("\n", variable_get('culturefeed_entry_ui_custom_entry_api_tags'));
+    }
+    $keywords = array_map('trim',array_unique(array_merge($keywords_form,$custom_entry_api_tags)));
+    foreach ($keywords as $keyword) {
+      $event->addKeyword($keyword);
+    }
+
+  }
+
+}
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index 243c8ba2..f4c579e2 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -45,8 +45,8 @@ public static function getProduction($id) {
   /**
    * @see CultureFeed_EntryApi::createEvent()
    */
-  public static function createEvent(CultureFeed_Cdb_Item_Event $event) {
-    return self::getLoggedInUserInstance()->createEvent($event);
+  public static function createEvent(CultureFeed_Cdb_Item_Event $event, $cdb_schema_version = NULL) {
+    return self::getLoggedInUserInstance()->createEvent($event, $cdb_schema_version);
   }
 
   /**
@@ -66,8 +66,8 @@ public static function createProduction(CultureFeed_Cdb_Item_Production $product
   /**
    * @see CultureFeed_EntryApi::updateEvent()
    */
-  public static function updateEvent(CultureFeed_Cdb_Item_Event $event) {
-    self::getLoggedInUserInstance()->updateEvent($event);
+  public static function updateEvent(CultureFeed_Cdb_Item_Event $event, $cdb_schema_version = NULL) {
+    self::getLoggedInUserInstance()->updateEvent($event, $cdb_schema_version);
   }
 
   /**

From 4052d135175d920928349e4bf9dfe4ba59dfaee1 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Thu, 7 May 2015 16:27:57 +0200
Subject: [PATCH 161/275] UIV-1266 fix notice when_md_txt

---
 culturefeed_agenda/theme/theme.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 2614dc1d..6ce7cd72 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -965,7 +965,7 @@ function _culturefeed_agenda_preprocess_event_production_metatags($variables) {
     $title_parts[] = $variables['location']['city'];
     $description_parts[] = t('Location: @location', array('@location' => $variables['location']['title'] . ', ' . $variables['location']['city']));
   }
-  if (!empty($variables['when'])) {
+  if (!empty($variables['when_md_txt'])) {
     $description_parts[] = t('When: @when', array('@when' => $variables['when_md_txt']));
   }
   if (!empty($variables['organiser'])) {

From eb7d27ee0844260c1b11aa47aaa636fc476c7ec1 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 7 May 2015 16:38:36 +0200
Subject: [PATCH 162/275] CEP-857 adding option to search only on wregs

---
 .../lib/Drupal/CultureFeedSearchPage.php        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 3a3ff868..351a4b8a 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -448,7 +448,6 @@ protected function addFacetFilters($params) {
     if (!empty($params['regId']) && !isset($params['distance'])) {
 
       $regFilter = array();
-      $regFilter[] = $params['regId'];
 
       if (!empty($params['wregIds'])) {
         $regFilter[] = array_shift($params['wregIds']);
@@ -458,6 +457,10 @@ protected function addFacetFilters($params) {
           $wregFilters[] = $wregId;
         }
       }
+      
+      if (!empty($_GET['only-wregs'])) {
+        $regFilter[] = $params['regId'];
+      }
 
       $regFilterQuery = '(';
       $regFilterQuery .= 'category_id:(' . implode(' OR ', $regFilter) .')';
@@ -498,7 +501,17 @@ protected function addFacetFilters($params) {
         }
   
         $regFilterQuery = '(';
-        $regFilterQuery .= 'category_flandersregion_name' . ':' . $location;
+        
+        if (empty($_GET['only-wregs'])) {
+          $regFilterQuery .= 'category_flandersregion_name' . ':' . $location;
+        }
+        else {
+          $working_region_id = key(culturefeed_search_get_workingregion_categories(array('name_like' => $params['location'])));
+          if ($working_region_id) {
+            $regFilterQuery .= 'category_id' . ':' . $working_region_id;
+          }
+        }
+        
         if (!empty($wregFilters)) {
           $regFilterQuery .= ' OR exact_category_id:(' . implode(' OR ', $wregFilters) . ')';
         }

From 79433373617afc5f6e4cd71e86f2c8c2a8d88c05 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 7 May 2015 19:58:11 +0200
Subject: [PATCH 163/275] CEP-857 fixin parameters logic

---
 culturefeed_search/includes/helpers.inc       | 22 +++++
 .../lib/Drupal/CultureFeedSearchPage.php      | 88 +++++++------------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/culturefeed_search/includes/helpers.inc b/culturefeed_search/includes/helpers.inc
index 6722e556..acfbc995 100644
--- a/culturefeed_search/includes/helpers.inc
+++ b/culturefeed_search/includes/helpers.inc
@@ -728,6 +728,28 @@ function culturefeed_search_get_category_by_slug($slug, $domain = '') {
 
 }
 
+/**
+ * Get a category by name.
+ */
+function culturefeed_search_get_category_by_name($name, $domain = '') {
+
+  $query = db_select('culturefeed_search_terms', 'ct');
+  $query->condition('name', $name);
+  $query->range(0, 1);
+  $query->addField('ct', 'tid');
+  $query->addField('ct', 'slug');
+  $query->addField('ct', 'p1');
+  $query->addField('ct', 'p2');
+  $query->addField('ct', 'p3');
+  $query->addField('ct', 'p4');
+  if (!empty($domain)) {
+    $query->condition('did', $domain);
+  }
+
+  return $query->execute()->fetchObject();
+
+}
+
 /**
  * Get a city by slug.
  */
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 351a4b8a..0705e52d 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -445,52 +445,17 @@ protected function addFacetFilters($params) {
     // Add the location facet. Only use the location if a distance is set.
     // all other cases will search for a category Id of the type flandersregion
     // or workingregion.
-    if (!empty($params['regId']) && !isset($params['distance'])) {
-
-      $regFilter = array();
-
-      if (!empty($params['wregIds'])) {
-        $regFilter[] = array_shift($params['wregIds']);
-
-        $wregFilters = array();
-        foreach ($params['wregIds'] as $wregId) {
-          $wregFilters[] = $wregId;
-        }
-      }
+    if (!empty($params['regId']) || !empty($params['location'])) {
       
-      if (!empty($_GET['only-wregs'])) {
-        $regFilter[] = $params['regId'];
-      }
-
-      $regFilterQuery = '(';
-      $regFilterQuery .= 'category_id:(' . implode(' OR ', $regFilter) .')';
-      if (!empty($wregFilters)) {
-        $regFilterQuery .= ' OR exact_category_id:(' . implode(' OR ', $wregFilters) . ')';
-      }
-      $regFilterQuery .= ')';
-      $this->parameters[] = new Parameter\FilterQuery($regFilterQuery);
-
-    }
-    elseif (!empty($params['location'])) {
-
-      // Check if postal was present.
-      $city_parts = explode(' ', $params['location']);
-      if (is_numeric($city_parts[0]) && empty($params['wregIds'])) {
-        $distance = isset($params['distance']) ? $params['distance'] : FALSE;
-
-        // If category_actortype_id we assume that we search on pages (on day we have to fix)
-        if (isset($params['facet']['category_actortype_id'])) {
-          $this->parameters[] = new Parameter\FilterQuery('zipcode' . ':' . $city_parts[0]);
-        }
-        else {
-          $this->parameters[] = new Parameter\Spatial\Zipcode($city_parts[0], $distance);
+      if (!isset($params['distance'])) {
+      
+        $regFilter = array();
+        
+        if (empty($params['regId']) && !empty($params['location'])) {
+          $location = culturefeed_search_get_category_by_name($params['location']);
+          $params['regId'] = $location->tid;
         }
-
-      }
-      else {
-        $location = '"' . str_replace('"', '\"', $params['location']) . '"';
-
-        // Also here add wregs if in params
+  
         if (!empty($params['wregIds'])) {
           $regFilter[] = array_shift($params['wregIds']);
   
@@ -499,26 +464,39 @@ protected function addFacetFilters($params) {
             $wregFilters[] = $wregId;
           }
         }
-  
-        $regFilterQuery = '(';
         
         if (empty($_GET['only-wregs'])) {
-          $regFilterQuery .= 'category_flandersregion_name' . ':' . $location;
-        }
-        else {
-          $working_region_id = key(culturefeed_search_get_workingregion_categories(array('name_like' => $params['location'])));
-          if ($working_region_id) {
-            $regFilterQuery .= 'category_id' . ':' . $working_region_id;
-          }
+          $regFilter[] = $params['regId'];
         }
-        
+  
+        $regFilterQuery = '(';
+        $regFilterQuery .= 'category_id:(' . implode(' OR ', $regFilter) .')';
         if (!empty($wregFilters)) {
           $regFilterQuery .= ' OR exact_category_id:(' . implode(' OR ', $wregFilters) . ')';
         }
         $regFilterQuery .= ')';
         $this->parameters[] = new Parameter\FilterQuery($regFilterQuery);
+  
       }
-
+      elseif (!empty($params['location'])) {
+  
+        // Check if postal was present.
+        $city_parts = explode(' ', $params['location']);
+        if (is_numeric($city_parts[0]) && empty($params['wregIds'])) {
+          $distance = isset($params['distance']) ? $params['distance'] : FALSE;
+  
+          // If category_actortype_id we assume that we search on pages (on day we have to fix)
+          if (isset($params['facet']['category_actortype_id'])) {
+            $this->parameters[] = new Parameter\FilterQuery('zipcode' . ':' . $city_parts[0]);
+          }
+          else {
+            $this->parameters[] = new Parameter\Spatial\Zipcode($city_parts[0], $distance);
+          }
+  
+        }
+        
+      }
+  
     }
 
     // Calculate actor if available.

From 83a8d8c773fe49d9875f771a5911328c55f2e1c2 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Fri, 8 May 2015 10:50:21 +0200
Subject: [PATCH 164/275] UIV-1034 remove datatype form saved search title

---
 .../includes/blocks.inc                       |  2 +-
 .../lib/Drupal/CultureFeedSearchPage.php      | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/culturefeed_saved_searches/includes/blocks.inc b/culturefeed_saved_searches/includes/blocks.inc
index 0248395c..23df7337 100644
--- a/culturefeed_saved_searches/includes/blocks.inc
+++ b/culturefeed_saved_searches/includes/blocks.inc
@@ -60,7 +60,7 @@ function culturefeed_saved_searches_get_cta_query() {
     }
 
     // Add page title.
-    $query['title'] = drupal_get_title();
+    $query['title'] = $page->getPageTitle(TRUE);
 
     // Add search parameters in string.
     $supported_parameters = array('fq', 'q', 'zipcode');
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 053c29ec..3a57a32c 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -249,7 +249,7 @@ public function addQueryTerm($term) {
     });
 
     $this->query[] = implode(' OR ', $query_parts);
-    
+
     return $this->query;
   }
 
@@ -432,12 +432,12 @@ protected function addFacetFilters($params) {
       else {
         $this->parameters[] = new Parameter\Spatial\Distance(CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE);
       }
-      
+
       if (isset($params['sort']) && $params['sort'] == 'geodist') {
         $this->parameters[] = new Parameter\Sort('geodist()', 'asc');
         $this->parameters[] = new Parameter\FilterQuery('{!geofilt}');
       }
-      
+
       $this->parameters[] = new Parameter\Spatial\Point($coordinates[0], $coordinates[1]);
       $this->parameters[] = new Parameter\Spatial\SpatialField('physical_gis');
     }
@@ -698,7 +698,7 @@ protected function build() {
    *   and the page number with the page parameter increased by one,
    *   surrounded by parentheses.
    */
-  public function getPageTitle() {
+  public function getPageTitle($ignore_datetype = FALSE) {
 
     // Return the title that has been explicitly set with $this->setTitle().
     if (!empty($this->title)) {
@@ -707,11 +707,19 @@ public function getPageTitle() {
 
     // Otherwise the framework version will be used.
     $active_filters = module_invoke_all('culturefeed_search_ui_active_filters', $this->facetComponent);
+
+    if ($ignore_datetype) {
+      foreach($active_filters as $key => $active_filter) {
+        if ($key == 'item_datetype') {
+          unset ($active_filters[$key]);
+        }
+      }
+    }
+
     if (!empty($active_filters)) {
 
       $labels = array();
       foreach ($active_filters as $active_filter) {
-
         if (!isset($active_filter['#label'])) {
           foreach ($active_filter as $subitem) {
             $labels[] = $subitem['#label'];
@@ -720,7 +728,6 @@ public function getPageTitle() {
         else {
           $labels[] = $active_filter['#label'];
         }
-
       }
 
     }

From b065fa96a1ade950ef8656c34b3d1eabae1d53c3 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 8 May 2015 12:07:14 +0200
Subject: [PATCH 165/275] CEP-838 adding validated var to membership in pages
 theme

---
 culturefeed_pages/theme/theme.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_pages/theme/theme.inc b/culturefeed_pages/theme/theme.inc
index 379ef179..6401432f 100644
--- a/culturefeed_pages/theme/theme.inc
+++ b/culturefeed_pages/theme/theme.inc
@@ -151,6 +151,7 @@ function culturefeed_pages_preprocess_culturefeed_page(&$variables) {
       $member['relation'] = check_plain($membership->relation);
       $member['role'] = check_plain($membership->role);
       $member['picture'] = check_plain($membership->user->depiction);
+      $member['validated'] = $membership->validated;
 
       $variables['members'][] = $member;
     }

From 8235ba0b3662bc8674a4a77f73566aacd7b3c2bc Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Fri, 8 May 2015 12:29:18 +0200
Subject: [PATCH 166/275] UIV-1173 fix the bug that users can save the same
 searches multiple times.

---
 culturefeed_saved_searches/includes/blocks.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/culturefeed_saved_searches/includes/blocks.inc b/culturefeed_saved_searches/includes/blocks.inc
index 23df7337..3aacce9f 100644
--- a/culturefeed_saved_searches/includes/blocks.inc
+++ b/culturefeed_saved_searches/includes/blocks.inc
@@ -92,7 +92,15 @@ function culturefeed_saved_searches_get_cta_query() {
     $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
     $exists = FALSE;
     foreach ($savedSearchList as $savedSearch) {
-      if ($savedSearch->query == $query['query']) {
+      $saved_query = explode('&', $savedSearch->query);
+      foreach ($saved_query as $key => $val) {
+        if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
+          unset($saved_query[$key]);
+        }
+      }
+      $saved_query = implode('&', $saved_query);
+
+      if ($saved_query == $query['query']) {
         $exists = TRUE;
       }
     }

From 10c50e67524683195d7babecb6cfaf40fafdafc8 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 8 May 2015 12:36:40 +0200
Subject: [PATCH 167/275] Revert "UIV-1107 actor type categories as variable in
 preprocessor of actor"

This reverts commit 5835ae75c32b653f00793a62dea7ceb78303f29d.
---
 culturefeed_agenda/theme/theme.inc | 61 ++++++++++++++----------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 6ce7cd72..86e3a86a 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -328,7 +328,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $variables['forkids'] = TRUE;
     }
   }
-
+  
   $detect = culturefeed_mobile_detect_get_object();
 
   if ($detect) {
@@ -374,7 +374,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Absolute link to detail.
     global $base_root;
     $variables['share_url'] = $base_root . $variables['url'];
-
+    
     $facebook = array();
     $googleplus = array();
     $twitter = array();
@@ -389,38 +389,38 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Set UTM parameters for share URL's.
     $utm['campaign'] = 'share';
     $utm['medium'] = 'social';
-
+    
     $facebook['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'facebook.com',
     );
-
+    
     $googleplus['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'plus.google.com',
     );
-
+    
     $twitter['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'twitter.com',
     );
-
+    
     $whatsapp['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'whatsapp',
     );
-
+    
     $mail['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => 'email',
       'utm_source' => 'forward-mail',
     );
 
-    // Build share URL's.
+    // Build share URL's.      
     $variables['facebook']['url'] = $facebook['prefix'] . urlencode(url($variables['share_url'], array('query' => $facebook['utm'])));
     $variables['googleplus']['url'] = $googleplus['prefix'] . urlencode(url($variables['share_url'], array('query' => $googleplus['utm'])));
     $variables['twitter']['url'] = $twitter['prefix'] . urlencode(url($variables['share_url'], array('query' => $twitter['utm'])));
@@ -430,7 +430,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $variables['mail']['url'] = url('forward', array('query' => array('path' => url($variables['url'], array('query' => $mail['utm'])))));
     }
     else {
-      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm'])));
+      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm']))); 
     }
 
     // Prepare to push share activities to Culturefeed.
@@ -441,9 +441,9 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $id = $item->getId();
       $track_facebook = url('culturefeed/do/' . CultureFeed_Activity::TYPE_FACEBOOK .'/' . $content_type . '/' . urlencode($id) . '/ajax');
       $track_twitter = url('culturefeed/do/' . CultureFeed_Activity::TYPE_TWITTER .'/' . $content_type . '/' . urlencode($id) . '/ajax');
-    }
+    }    
 
-    // Add options.
+    // Add options.  
     $variables['facebook']['options'] = array(
       'attributes' => array(
         'class' => array('share-link', 'facebook-share'),
@@ -474,13 +474,13 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       'external' => TRUE,
     );
 
-    // Share Links.
+    // Share Links.      
     $variables['facebook_link'] = l(t('Share on Facebook'), $variables['facebook']['url'], $variables['facebook']['options']);
     $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus']['url'], $variables['googleplus']['options']);
     $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter']['url'], $variables['twitter']['options']);
     $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp']['url'], $variables['whatsapp']['options']);
     $variables['mail_link'] = l(t('Mail'), $variables['mail']['url'], $variables['mail']['options']);
-
+    
     // Use dialog when Facebook app id is set.
     culturefeed_search_ui_add_facebook_share();
 
@@ -609,18 +609,18 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
 
     // When.
     $variables['when'] = check_plain($event_detail->getCalendarSummary());
-
+    
     // Format Calendar details to readable & themable HTML.
     $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
-
+    
     // Large Calendar format (for detail pages).
     $variables['when_lg'] = '';
     try {
       $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
     }
     catch (Exception $e) {
-    }
-
+    } 
+    
     // Medium Calendar format (for event-summary on search result pages).
     $variables['when_md'] = '';
     try {
@@ -628,7 +628,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-
+    
     // Small Calendar format (for mini-summary in event teasers).
     $variables['when_sm'] = '';
     try {
@@ -636,7 +636,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-
+    
     // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
     $variables['when_xs'] = '';
     try {
@@ -644,18 +644,18 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-
+    
     // Format calendar to TXT
     $txt_formatter = culturefeed_agenda_get_plain_text_calendar_formatter();
-
+    
     // Large Calendar format (for detail pages).
     $variables['when_lg_txt'] = '';
     try {
       $variables['when_lg_txt'] = $txt_formatter->format($calendar, 'lg');
     }
     catch (Exception $e) {
-    }
-
+    } 
+    
     // Medium Calendar format (for event-summary on search result pages).
     $variables['when_md_txt'] = '';
     try {
@@ -663,7 +663,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-
+    
     // Small Calendar format (for mini-summary in event teasers).
     $variables['when_sm_txt'] = '';
     try {
@@ -671,7 +671,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-
+    
     // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
     $variables['when_xs_txt'] = '';
     try {
@@ -721,24 +721,24 @@ function _culturefeed_agenda_preprocess_production(&$variables) {
       if ($event) {
         $event_detail = $event->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
         if ($event_detail) {
-
+        
           // Calendar.
           if ($calendar = $event->getEntity()->getCalendar()) {
             $variables['calendar'] = culturefeed_agenda_parse_calendar($calendar);
           }
 
           $variables['when'] = $event_detail->getCalendarSummary();
-
+        
           // Format Calendar details to readable & themable HTML.
           $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
-
+          
           // Large Calendar format (for detail pages).
           $variables['when_lg'] = '';
           try {
             $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
           }
           catch (Exception $e) {
-          }
+          } 
         }
 
         // Add location information from the event.
@@ -853,9 +853,6 @@ function _culturefeed_agenda_preprocess_actor(&$variables) {
 
   }
 
-  // Actor type.
-  $variables['actor_categories'] = $actor->getCategories()->getCategoriesByType('actortype');
-
   // Link to detail.
   $actor_detail = $actor->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
   if ($actor_detail) {

From 52ab78be3f5c21631a976234a8978ac58eb6e63d Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 8 May 2015 12:44:38 +0200
Subject: [PATCH 168/275] UIV-1107 pass actortypes variables to theme

---
 culturefeed_agenda/theme/theme.inc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 86e3a86a..a14a13cc 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -282,10 +282,15 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
   $variables['themes'] = $themes['text'];
   $variables['themes_links'] = $themes['links'];
 
-  // Types of this item (plain text and links).
-  $types = culturefeed_agenda_get_category_list_of_item(CultureFeed_Cdb_Data_Category::CATEGORY_TYPE_EVENT_TYPE, $cdb_item);
-  $variables['types'] = $types['text'];
-  $variables['types_links'] = $types['links'];
+  // Eventtypes of this item (plain text and links).
+  $eventtypes = culturefeed_agenda_get_category_list_of_item(CultureFeed_Cdb_Data_Category::CATEGORY_TYPE_EVENT_TYPE, $cdb_item);
+  $variables['types'] = $eventtypes['text'];
+  $variables['types_links'] = $eventtypes['links'];
+
+  // Actortypes of this item (plain text and links).
+  $actortypes = culturefeed_agenda_get_category_list_of_item(CultureFeed_Cdb_Data_Category::CATEGORY_TYPE_ACTOR_TYPE, $cdb_item);
+  $variables['actortypes'] = $actortypes['text'];
+  $variables['actortypes_links'] = $actortypes['links'];
 
   // Preprocess the organiser variables.
   if (method_exists($cdb_item, 'getOrganiser')) {

From e14c584030569ac5dbf007ad2c436d48acfeffb3 Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Fri, 8 May 2015 14:16:12 +0200
Subject: [PATCH 169/275] UIV-1242 Added role to performers

---
 culturefeed_agenda/theme/theme.inc | 68 ++++++++++++++++--------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 78c98073..7278fb4c 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -188,13 +188,17 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $performers = $detail->getPerformers();
       $variables['performers'] = '';
       if ($performers) {
-
         $performer_labels = array();
         foreach ($performers as $performer) {
-          $performer_labels[] = check_plain($performer->getLabel());
-        }
+          $performer_label = check_plain($performer->getLabel());
+          $performer_labels[] = $performer_label;
+          $performer_role = check_plain($performer->getRole());
+          $performer_roles[] = $performer_role;
+          $performers_list[] = array('label' => $performer_label,'role' => $performer_role);
+        };
 
         $variables['performers'] = implode(', ', $performer_labels);
+        $variables['performers_list'] = $performers_list;
       }
     }
 
@@ -328,7 +332,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $variables['forkids'] = TRUE;
     }
   }
-  
+
   $detect = culturefeed_mobile_detect_get_object();
 
   if ($detect) {
@@ -374,7 +378,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Absolute link to detail.
     global $base_root;
     $variables['share_url'] = $base_root . $variables['url'];
-    
+
     $facebook = array();
     $googleplus = array();
     $twitter = array();
@@ -389,38 +393,38 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     // Set UTM parameters for share URL's.
     $utm['campaign'] = 'share';
     $utm['medium'] = 'social';
-    
+
     $facebook['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'facebook.com',
     );
-    
+
     $googleplus['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'plus.google.com',
     );
-    
+
     $twitter['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'twitter.com',
     );
-    
+
     $whatsapp['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => $utm['medium'],
       'utm_source' => 'whatsapp',
     );
-    
+
     $mail['utm'] = array (
       'utm_campaign' => $utm['campaign'],
       'utm_medium' => 'email',
       'utm_source' => 'forward-mail',
     );
 
-    // Build share URL's.      
+    // Build share URL's.
     $variables['facebook']['url'] = $facebook['prefix'] . urlencode(url($variables['share_url'], array('query' => $facebook['utm'])));
     $variables['googleplus']['url'] = $googleplus['prefix'] . urlencode(url($variables['share_url'], array('query' => $googleplus['utm'])));
     $variables['twitter']['url'] = $twitter['prefix'] . urlencode(url($variables['share_url'], array('query' => $twitter['utm'])));
@@ -430,7 +434,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $variables['mail']['url'] = url('forward', array('query' => array('path' => url($variables['url'], array('query' => $mail['utm'])))));
     }
     else {
-      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm']))); 
+      $variables['mail']['url'] = 'mailto:?subject=' . $variables['title'] . '&body=' . urlencode(url($variables['share_url'], array('query' => $mail['utm'])));
     }
 
     // Prepare to push share activities to Culturefeed.
@@ -441,9 +445,9 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       $id = $item->getId();
       $track_facebook = url('culturefeed/do/' . CultureFeed_Activity::TYPE_FACEBOOK .'/' . $content_type . '/' . urlencode($id) . '/ajax');
       $track_twitter = url('culturefeed/do/' . CultureFeed_Activity::TYPE_TWITTER .'/' . $content_type . '/' . urlencode($id) . '/ajax');
-    }    
+    }
 
-    // Add options.  
+    // Add options.
     $variables['facebook']['options'] = array(
       'attributes' => array(
         'class' => array('share-link', 'facebook-share'),
@@ -474,13 +478,13 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
       'external' => TRUE,
     );
 
-    // Share Links.      
+    // Share Links.
     $variables['facebook_link'] = l(t('Share on Facebook'), $variables['facebook']['url'], $variables['facebook']['options']);
     $variables['googleplus_link'] = l(t('Share on Google+'), $variables['googleplus']['url'], $variables['googleplus']['options']);
     $variables['twitter_link'] = l(t('Share on Twitter'), $variables['twitter']['url'], $variables['twitter']['options']);
     $variables['whatsapp_link'] = l(t('Share on Whatsapp'), $variables['whatsapp']['url'], $variables['whatsapp']['options']);
     $variables['mail_link'] = l(t('Mail'), $variables['mail']['url'], $variables['mail']['options']);
-    
+
     // Use dialog when Facebook app id is set.
     culturefeed_search_ui_add_facebook_share();
 
@@ -609,18 +613,18 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
 
     // When.
     $variables['when'] = check_plain($event_detail->getCalendarSummary());
-    
+
     // Format Calendar details to readable & themable HTML.
     $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
-    
+
     // Large Calendar format (for detail pages).
     $variables['when_lg'] = '';
     try {
       $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
     }
     catch (Exception $e) {
-    } 
-    
+    }
+
     // Medium Calendar format (for event-summary on search result pages).
     $variables['when_md'] = '';
     try {
@@ -628,7 +632,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Small Calendar format (for mini-summary in event teasers).
     $variables['when_sm'] = '';
     try {
@@ -636,7 +640,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
     $variables['when_xs'] = '';
     try {
@@ -644,18 +648,18 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Format calendar to TXT
     $txt_formatter = culturefeed_agenda_get_plain_text_calendar_formatter();
-    
+
     // Large Calendar format (for detail pages).
     $variables['when_lg_txt'] = '';
     try {
       $variables['when_lg_txt'] = $txt_formatter->format($calendar, 'lg');
     }
     catch (Exception $e) {
-    } 
-    
+    }
+
     // Medium Calendar format (for event-summary on search result pages).
     $variables['when_md_txt'] = '';
     try {
@@ -663,7 +667,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Small Calendar format (for mini-summary in event teasers).
     $variables['when_sm_txt'] = '';
     try {
@@ -671,7 +675,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Extra Small Calendar format (for teasers that need specific "DD/MM" layout).
     $variables['when_xs_txt'] = '';
     try {
@@ -721,24 +725,24 @@ function _culturefeed_agenda_preprocess_production(&$variables) {
       if ($event) {
         $event_detail = $event->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
         if ($event_detail) {
-        
+
           // Calendar.
           if ($calendar = $event->getEntity()->getCalendar()) {
             $variables['calendar'] = culturefeed_agenda_parse_calendar($calendar);
           }
 
           $variables['when'] = $event_detail->getCalendarSummary();
-        
+
           // Format Calendar details to readable & themable HTML.
           $html_formatter = culturefeed_agenda_get_html_calendar_formatter();
-          
+
           // Large Calendar format (for detail pages).
           $variables['when_lg'] = '';
           try {
             $variables['when_lg'] = $html_formatter->format($calendar, 'lg');
           }
           catch (Exception $e) {
-          } 
+          }
         }
 
         // Add location information from the event.

From a333a8dac00bc5625c73ddba7de712ba2fee4c83 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Sat, 9 May 2015 09:14:05 +0200
Subject: [PATCH 170/275] UIV-968 show alert if geolocation was not found

---
 culturefeed_agenda/js/search_block.js |  1 +
 js/common.js                          | 56 +++++++++++++++------------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/culturefeed_agenda/js/search_block.js b/culturefeed_agenda/js/search_block.js
index 3e08f914..9315ce93 100644
--- a/culturefeed_agenda/js/search_block.js
+++ b/culturefeed_agenda/js/search_block.js
@@ -9,6 +9,7 @@
     if (navigator.geolocation) {
 
       $nearby_link.bind('click', function() {
+        $(this).unbind('click');
         $nearby_link.append(' <span id="current-location" class="loading-location throbber">Loading...</span>');
         Drupal.CultureFeed.geolocate(Drupal.CultureFeed.Agenda.setLocationAutocomplete);
      });
diff --git a/js/common.js b/js/common.js
index ae22b70e..224872f4 100644
--- a/js/common.js
+++ b/js/common.js
@@ -18,37 +18,45 @@
         var latlng = new google.maps.LatLng(lat, lng);
 
         // Execute the request and send the respons to addpostalcode function
-        geocoder.geocode({'latLng': latlng}, function(response) {
-
-          // Set the info also in a cookie.
-          var place = response[0];
-          for (i = 0; i < place.address_components.length; i++) {
-
-            if (place.address_components[i].types[0] == 'postal_code') {
-              current_postal = place.address_components[i].long_name;
+        geocoder.geocode({'latLng': latlng}, function(response, status) {
+
+          // Check if response status is OK
+          if (status == google.maps.GeocoderStatus.OK) {
+  
+            // Set the info also in a cookie.
+            var place = response[0];
+            for (i = 0; i < place.address_components.length; i++) {
+  
+              if (place.address_components[i].types[0] == 'postal_code') {
+                current_postal = place.address_components[i].long_name;
+              }
+              else if(place.address_components[i].types[0] == 'locality') {
+                current_city = place.address_components[i].long_name;
+              }
+  
             }
-            else if(place.address_components[i].types[0] == 'locality') {
-              current_city = place.address_components[i].long_name;
+  
+            var location = {
+              latitude : place.geometry.location.lat(),
+              longitude : place.geometry.location.lng(),
+              city : current_city,
+              postal : current_postal
             }
+            $.cookie('Drupal.visitor.uitid.userLocation', JSON.stringify(location), { path : '/' });
+  
+            // Call the response callback function.
+            if (response_callback) {
+              response_callback(response);
+            }
+          } 
 
-          }
-
-          var location = {
-            latitude : place.geometry.location.lat(),
-            longitude : place.geometry.location.lng(),
-            city : current_city,
-            postal : current_postal
-          }
-          $.cookie('Drupal.visitor.uitid.userLocation', JSON.stringify(location), { path : '/' });
-
-          // Call the response callback function.
-          if (response_callback) {
-            response_callback(response);
+          // Show alert if response is not available
+          else {
+            alert("Location not found for the following reason: " + status);
           }
 
         });
 
-
       });
 
     }

From 8abfcbf2997d87a82c4817e9ce4859cc615dca2b Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Sat, 9 May 2015 10:58:29 +0200
Subject: [PATCH 171/275] UIV-1103 add default radius when searching on current
 location

---
 culturefeed_agenda/includes/blocks.inc | 9 +++++++++
 culturefeed_agenda/js/search_block.js  | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
index 69b901e9..6d4ed405 100644
--- a/culturefeed_agenda/includes/blocks.inc
+++ b/culturefeed_agenda/includes/blocks.inc
@@ -182,6 +182,11 @@ function culturefeed_agenda_search_block_form($form, &$form_state) {
       '#attributes' => array('class' => array('location-search', 'jquery-ui-autocomplete'), 'placeholder' => t('Zipcode or city')),
     );
 
+    $form['location']['radius'] = array(
+      '#type' => 'hidden',
+      '#default_value' => isset($_GET['distance']) ? $_GET['distance'] : NULL,
+    );
+
     $form['location']['nearby'] = array(
       '#markup' => '<a href="#" class="search-find-location"><span>' . check_plain(t('Use my current location')) . '</span></a>',
     );
@@ -241,6 +246,10 @@ function culturefeed_agenda_search_block_form_submit($form, &$form_state) {
     if (!empty($form_state['values']['where'])) {
       $query['location'] = $form_state['values']['where'];
     }
+
+    if (!empty($form_state['values']['radius'])) {
+      $query['distance'] = $form_state['values']['radius'];
+    }
   }
 
   if (!empty($form_state['#domain_id'])) {
diff --git a/culturefeed_agenda/js/search_block.js b/culturefeed_agenda/js/search_block.js
index 9315ce93..bd390532 100644
--- a/culturefeed_agenda/js/search_block.js
+++ b/culturefeed_agenda/js/search_block.js
@@ -42,6 +42,11 @@
     }
 
     $('#culturefeed-agenda-search-block-form').find('input[name="where"]').val(postal + ' ' + city);
+    
+    // Add default radius when searching on current location
+    if ($('#culturefeed-agenda-search-block-form').find('input[name="radius"]').val() == '') {
+      $('#culturefeed-agenda-search-block-form').find('input[name="radius"]').val('10');
+    }
     $('#current-location').remove();
   }
 

From a803faeae65770f77600736af29c79bc967d2db4 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Sun, 10 May 2015 10:37:24 +0200
Subject: [PATCH 172/275] UIV-1214 set autofocus on city & location suggestions

---
 culturefeed_search_ui/js/location_autocomplete.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/culturefeed_search_ui/js/location_autocomplete.js b/culturefeed_search_ui/js/location_autocomplete.js
index 9c035d57..5a30cebc 100644
--- a/culturefeed_search_ui/js/location_autocomplete.js
+++ b/culturefeed_search_ui/js/location_autocomplete.js
@@ -25,6 +25,7 @@
           }
 
         },
+        autoFocus: true,
       });
 
       $("#edit-where").once('location-search-init').categorisedAutocomplete({
@@ -41,6 +42,7 @@
           }
 
         },
+        autoFocus: true,
       });
 
     }

From bf1ec9cd1dfc6641fb8a129903e24731f088a334 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Sun, 10 May 2015 10:49:21 +0200
Subject: [PATCH 173/275] fix notice noresults

---
 culturefeed_search_ui/includes/blocks.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index c8054b04..a4a75c98 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -292,6 +292,7 @@ function culturefeed_search_ui_block_city_facet() {
     return;
   }
 
+  $noresults = FALSE;
   if ($culturefeedSearchResult->getTotalCount() == 0) {
     $noresults = TRUE;
     // Hide location selector for empty results only when no location was set.

From 05a60f0f781c8295310082ff406c8c2d90f0edc1 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Mon, 11 May 2015 14:01:44 +0200
Subject: [PATCH 174/275] MSS-159 set up tabs

---
 .../culturefeed_entry_ui.collaboration.css    |  12 ++
 .../culturefeed_entry_ui.module               |  30 +++-
 .../includes/culturefeed_entry_ui.admin.inc   |  12 ++
 .../culturefeed_entry_ui.collaboration.inc    |  90 ----------
 .../includes/culturefeed_entry_ui.pages.inc   |   6 -
 .../culturefeed_entry_ui.collaboration.inc    | 169 ++++++++++++++++++
 .../culturefeed_entry_ui.collaboration.inc    |  56 ++++++
 lib/Drupal/DrupalCultureFeed_EntryApi.php     |  26 ++-
 8 files changed, 302 insertions(+), 99 deletions(-)
 create mode 100644 culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css
 delete mode 100644 culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc
 create mode 100644 culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
 create mode 100644 culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc

diff --git a/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css b/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css
new file mode 100644
index 00000000..fc5d9b48
--- /dev/null
+++ b/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css
@@ -0,0 +1,12 @@
+
+#culturefeed-entry-ui-edit-collaboration-data-form fieldset .panel-body {
+  padding-top: 0px;
+}
+
+#culturefeed-entry-ui-edit-collaboration-data-form fieldset .no-top-margin {
+  margin-top: 0px;
+}
+
+#culturefeed-entry-ui-edit-collaboration-data-form legend.panel-heading {
+  display: none;
+}
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 2fa5047d..cd787f50 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -81,6 +81,14 @@ function culturefeed_entry_ui_menu() {
     'file' => $tags_form['file'],
   );
 
+  $items['agenda/e/%/%culturefeed_agenda_event/collaboration'] = array(
+    'title' => 'Collaboration',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('culturefeed_entry_ui_edit_collaboration_data_form', 3),
+    'access callback' => 'culturefeed_entry_ui_manage_collaboration_access',
+    'file' => 'includes/form/culturefeed_entry_ui.collaboration.inc',
+  );
+
   $items['agenda/e/add'] = array(
     'title' => 'New event',
     'page callback' => 'drupal_get_form',
@@ -152,7 +160,20 @@ function culturefeed_entry_ui_menu_local_tasks_alter(&$data, $router_item, $root
     $tabs[] = array('#theme' => 'menu_local_action', '#link' => $link);
 
   }
-  
+
+  // Add tab for collaboration info.
+  if (culturefeed_entry_ui_manage_collaboration_access()) {
+
+    $link = array(
+      'href' => $path . '/collaboration',
+      'localized_options' => array(),
+      'title' => t('Collaboration'),
+    );
+
+    $tabs[] = array('#theme' => 'menu_local_action', '#link' => $link);
+
+  }
+
   $culturefeed_user = DrupalCultureFeed::getLoggedInUser();
   if ($culturefeed_user) {
     $ubd_permission = Drupalculturefeed_EntryApi::checkPermission($culturefeed_user->id, $culturefeed_user->mbox, array('ids' => $event->getId()));
@@ -229,6 +250,13 @@ function culturefeed_entry_ui_manage_tags_access() {
   return user_access('manage custom tags') || user_access('manage object tags');
 }
 
+/**
+ * Access callback, to check if a user has access to the manage collaboration screen.
+ */
+function culturefeed_entry_ui_manage_collaboration_access() {
+  return user_access('manage culturefeed collaborative info');
+}
+
 /**
  * Submit callback for the 'add more' buttons.
  */
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index 7ce695e8..78b80154 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -71,6 +71,18 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
 
   }
 
+  if (version_compare($cdb_version, '3.3', '>=')) {
+
+    $form['culturefeed_entry_ui_custom_collaboration_tags'] = array(
+      '#default_value' => variable_get('culturefeed_entry_ui_custom_collaboration_tags'),
+      '#description' => t('Tags used for the collaboration tab.'),
+      '#title' => t('Custom tags to use as collaboration data'),
+      '#type' => 'culturefeed_tags_element',
+      '#visible_default' => FALSE,
+    );
+
+  }
+
   $form['culturefeed_entry_ui_default_country'] = array(
     '#type' => 'select',
     '#options' => country_get_list(),
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc
deleted file mode 100644
index cc736de4..00000000
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.collaboration.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains culturefeed_entry_ui.collaboration.inc.
- */
-
-/**
- * Attaches the collaboration elements to the form.
- *
- * @param array $form
- *   The form.
- * @param array $form_state
- *   The form state.
- * @param Culturefeed_Cdb_Data_EventDetail $event_details
- *   The event details.
- */
-function culturefeed_entry_ui_attach_collaboration_elements(&$form, $form_state, Culturefeed_Cdb_Data_EventDetail $event_details = NULL) {
-
-  if ($event_details) {
-
-    $media_links = $event_details->getMedia()->byMediaTypes(array(CultureFeed_Cdb_Data_File::MEDIA_TYPE_WEBRESOURCE));
-    foreach ($media_links as $link) {
-
-      if ($link->getSubBrand()) {
-
-        $sub_brand = $link->getSubBrand();
-        $description = drupal_json_decode($link->getDescription());
-
-        if ($description['keyword']) {
-          culturefeed_entry_ui_attach_collaboration_element($form, $form_state, $sub_brand, $description);
-        }
-
-      }
-
-    }
-
-  }
-
-  // Add an empty element for new data.
-  culturefeed_entry_ui_attach_collaboration_element($form, $form_state);
-
-}
-
-/**
- * Attaches the collaboration element to the form.
- *
- * @param array $form
- *   The form.
- * @param array $form_state
- *   The form state.
- * @param string $sub_brand
- *   The collaborative sub brand.
- * @param array $description
- *   The collaborative description.
- */
-function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state, $sub_brand = NULL, $description = NULL) {
-
-  $sub_brand = ($sub_brand) ? $sub_brand : 'new_collaboration';
-
-  $form['extra'][$sub_brand] = array(
-    '#group' => 'vertical_tabs',
-    '#title' => isset($description['keyword']) ? $description['keyword'] : t('New collaboration data'),
-    '#type' => 'fieldset',
-  );
-
-  $form['extra'][$sub_brand]['sub_brand'] = array(
-    '#type' => 'value',
-    '#value' => $sub_brand,
-  );
-
-  $form['extra'][$sub_brand]['keyword'] = array(
-    '#default_value' => isset($description['keyword']) ? $description['keyword'] : '',
-    '#title' => t('Keyword'),
-    '#type' => 'textfield',
-  );
-
-  $form['extra'][$sub_brand]['title'] = array(
-    '#default_value' => isset($description['title']) ? $description['title'] : '',
-    '#title' => t('Title'),
-    '#type' => 'textfield',
-  );
-
-  $form['extra'][$sub_brand]['text'] = array(
-    '#default_value' => isset($description['text']) ? $description['text'] : '',
-    '#title' => t('Short description'),
-    '#type' => 'textarea',
-  );
-
-}
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 69e585b3..a40c4583 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1183,12 +1183,6 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
     '#title' => t('Public'),
   );*/
 
-  // Add collaboration data.
-  if (user_access('manage culturefeed collaborative info')) {
-    form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/culturefeed_entry_ui.collaboration');
-    culturefeed_entry_ui_attach_collaboration_elements($form, $form_state, (isset($event_details)) ? $event_details : NULL);
-  }
-
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
new file mode 100644
index 00000000..b928980d
--- /dev/null
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_entry_ui.collaboration.inc.
+ */
+
+/**
+ * Attaches the collaboration element to the form.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param array $info
+ *   The collaborative info.
+ */
+function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state, $info) {
+
+  $keyword = $info['keyword'];
+
+  $form['collaboration'][$keyword] = array(
+    '#group' => 'vertical_tabs',
+    '#title' => $keyword,
+    '#type' => 'fieldset',
+  );
+
+  $form['collaboration'][$keyword]['title'] = array(
+    '#default_value' => isset($info['title']) ? $info['title'] : '',
+    '#required' => TRUE,
+    '#title' => t('Title'),
+    '#type' => 'textfield',
+  );
+
+  $form['collaboration'][$keyword]['image'] = array(
+    '#default_value' => isset($info['description']['image']) ? $info['description']['image'] : '',
+    '#title' => t('Image'),
+    '#type' => 'textfield',
+  );
+
+  $form['collaboration'][$keyword]['article'] = array(
+    '#default_value' => isset($info['description']['article']) ? $info['description']['article'] : '',
+    '#title' => t('Article'),
+    '#type' => 'textfield',
+  );
+
+  $form['collaboration'][$keyword]['text'] = array(
+    '#default_value' => isset($info['description']['text']) ? $info['description']['text'] : '',
+    '#required' => TRUE,
+    '#title' => t('Short description'),
+    '#type' => 'textarea',
+  );
+
+}
+
+/**
+ * Form builder for the collaboration tab.
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ * @param \CultuurNet\Search\ActivityStatsExtendedEntity $event
+ *   The event.
+ *
+ * @return array
+ *   The form.
+ */
+function culturefeed_entry_ui_edit_collaboration_data_form($form, &$form_state, \CultuurNet\Search\ActivityStatsExtendedEntity $event) {
+
+  /* @var \CultuurNet\Search\ActivityStatsExtendedEntity $event */
+  $event = $event->getEntity();
+  /* @var \CultureFeed_Cdb_Item_Event $event */
+  $form['#event'] = $event;
+
+  $custom_tags = variable_get('culturefeed_entry_ui_custom_collaboration_tags', array());
+  if (!count($custom_tags)) {
+    $tag = variable_get('site_name') . ' selectie';
+    $custom_tags[] = array($tag => array('value' => $tag, 'visible' => FALSE));
+  }
+
+  // Start vertical tabs
+  $form['vertical_tabs'] = array(
+    '#type' => 'vertical_tabs',
+  );
+
+  $form['collaboration'] = array(
+    '#tree' => TRUE,
+  );
+
+  form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/helpers/culturefeed_entry_ui.collaboration');
+
+  foreach ($custom_tags as $tag) {
+
+    $info = culturefeed_entry_ui_collaboration_get_data_by_keyword($event, $tag['value']);
+    culturefeed_entry_ui_attach_collaboration_element($form, $form_state, $info);
+  }
+
+  $form['#attached'] = array(
+    'css' => array(
+      drupal_get_path('module', 'culturefeed_entry_ui') . '/css/culturefeed_entry_ui.collaboration.css',
+    ),
+  );
+
+  $form['actions'] = array(
+    '#type' => 'actions',
+    'submit' => array(
+      '#type' => 'submit',
+      '#value' => t('Save'),
+    ),
+  );
+
+  return $form;
+
+}
+
+/**
+ * Submit handler for culturefeed_entry_ui_edit_collaboration_data_form().
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_entry_ui_edit_collaboration_data_form_submit(&$form, &$form_state) {
+
+  $consumer_key = variable_get('culturefeed_api_application_key', '');
+  /* @var \CultureFeed_Cdb_Item_Event $event */
+  $event = $form['#event'];
+
+  if ($consumer_key && $event && isset($form_state['values']['collaboration'])) {
+
+    foreach ($form_state['values']['collaboration'] as $keyword => $collaboration) {
+
+      $title = $collaboration['title'];
+      $copyright = '';
+      $plain_text = $collaboration['text'];
+
+      $description = drupal_json_encode(array(
+        'keyword' => $keyword,
+        'text' => $plain_text,
+        'image' => $collaboration['image'],
+        'article' => $collaboration['article'],
+      ));
+
+
+      Drupalculturefeed_EntryApi::addLinkToEvent(
+        $event,
+        '',
+        CultureFeed_Cdb_Data_File::MEDIA_TYPE_ROADMAP,
+        culturefeed_get_preferred_language(),
+        $title,
+        $copyright,
+        $plain_text,
+        $consumer_key,
+        $description
+      );
+
+      // Also save the keyword directly as keyword.
+      $keywords = array(
+        $keyword => new CultureFeed_Cdb_Data_Keyword($keyword, FALSE),
+      );
+      Drupalculturefeed_EntryApi::addTagToEvent($event, $keywords);
+
+    }
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
new file mode 100644
index 00000000..00c8b575
--- /dev/null
+++ b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_entry_ui.collaboration.inc.
+ */
+
+/**
+ * Returns the collaboration data for a specific keyword.
+ *
+ * @param \CultureFeed_Cdb_Item_Event $event
+ *   The event.
+ * @param string $keyword
+ *   The keyword.
+ *
+ * @return array
+ *   The data.
+ */
+function culturefeed_entry_ui_collaboration_get_data_by_keyword(\CultureFeed_Cdb_Item_Event $event, $keyword) {
+
+  $info = array(
+    'keyword' => $keyword,
+  );
+
+  $consumer_key = variable_get('culturefeed_api_application_key', '');
+
+  /* @var \CultureFeed_Cdb_Data_EventDetail $event_details */
+  $event_details = $event->getDetails()->current();
+  $event->getDetails()->rewind();
+
+  if ($event_details) {
+
+    $media_links = $event_details->getMedia()->byMediaTypes(array(CultureFeed_Cdb_Data_File::MEDIA_TYPE_ROADMAP));
+    foreach ($media_links as $link) {
+
+      if ($link->getSubBrand() && $link->getSubBrand() == $consumer_key) {
+
+        $description = drupal_json_decode($link->getDescription());
+        $title = $link->getTitle();
+
+        if (isset($description['keyword']) && $description['keyword'] == $keyword) {
+
+          $info['description'] = $description;
+          $info['title'] = $title;
+
+        }
+
+      }
+
+    }
+
+  }
+
+  return $info;
+
+}
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index f4c579e2..fb69c632 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -122,8 +122,30 @@ public static function removeTagFromEvent(CultureFeed_Cdb_Item_Event $event, $ke
   /**
    * @see CultureFeed_EntryApi::addLinkToEvent()
    */
-  public static function addLinkToEvent(CultureFeed_Cdb_Item_Event $event, $link, $linktype = '', $lang = '') {
-    self::getLoggedInUserInstance()->addLinkToEvent($event, $link, $linktype, $lang);
+  public static function addLinkToEvent(
+    CultureFeed_Cdb_Item_Event $event,
+    $link = '',
+    $linktype = '',
+    $lang = '',
+    $title = '',
+    $copyright = '',
+    $plaintext = '',
+    $subbrand = '',
+    $description = ''
+  ) {
+
+    self::getLoggedInUserInstance()->addLinkToEvent(
+      $event,
+      $link,
+      $linktype,
+      $lang,
+      $title,
+      $copyright,
+      $plaintext,
+      $subbrand,
+      $description
+    );
+
   }
 
   /**

From 4f7b69db079cfdd9c09334c525c9db98a12b11fb Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Mon, 11 May 2015 14:48:59 +0200
Subject: [PATCH 175/275] UIV-1266 reduce notices of culturefeed_agenda

---
 culturefeed_agenda/includes/helpers.inc | 44 +++++++++++++++----------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index f4bea31f..abe8a723 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -622,24 +622,34 @@ function culturefeed_agenda_parse_timestamps($timestamps) {
 
 function culturefeed_agenda_group_timestamps(&$timestamps) {
 
-  for ($i=0; $i<count($timestamps); $i++) {
-    if (isset($timestamps[$i+1])) {
-      $this_timestamp = $timestamps[$i];
-      $next_timestamp = $timestamps[$i+1];
-
-      if ($this_timestamp['date'] == $next_timestamp['date']) {
-        if (!is_array($timestamps[$i]['begintime'])){
-          unset($timestamps[$i]['begintime']);
-          $timestamps[$i]['begintime'][0] = $this_timestamp['begintime'];
-          $timestamps[$i]['begintime'][1] = $next_timestamp['begintime'];
+  if (count($timestamps) > 1) {
+    for ($i = 0; $i < count($timestamps); $i++) {
+      if (isset($timestamps[$i + 1])) {
+        $this_timestamp = $timestamps[$i];
+        $next_timestamp = $timestamps[$i + 1];
+
+        if ($this_timestamp['date'] == $next_timestamp['date']) {
+          if (isset($timestamps[$i]['begintime']) && is_array($timestamps[$i]['begintime'])) {
+            unset($timestamps[$i]['begintime']);
+            if (isset($this_timestamp['begintime'])) {
+              $timestamps[$i]['begintime'][0] = $this_timestamp['begintime'];
+            }
+            if (isset($next_timestamp['begintime'])) {
+              $timestamps[$i]['begintime'][1] = $next_timestamp['begintime'];
+            }
+          }
+          else {
+            if (isset($next_timestamp['begintime'])) {
+              $timestamps[$i]['begintime'][] = $next_timestamp['begintime'];
+            }
+          }
+          if (isset($timestamps[$i]['begintime']) && is_array($timestamps[$i]['begintime'])) {
+            sort($timestamps[$i]['begintime']);
+          }
+          unset($timestamps[$i + 1]);
+          $timestamps = array_values($timestamps);
+          $i--;
         }
-        else {
-          $timestamps[$i]['begintime'][] = $next_timestamp['begintime'];
-        }
-        sort($timestamps[$i]['begintime']);
-        unset($timestamps[$i+1]);
-        $timestamps = array_values($timestamps);
-        $i--;
       }
     }
   }

From d20b524770c7d5d291132a081388625a03664eb9 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 11 May 2015 16:46:54 +0200
Subject: [PATCH 176/275] translate new datepicker

---
 .../translations/culturefeed_search_ui.nl.po  | 240 +++++++++++-------
 1 file changed, 152 insertions(+), 88 deletions(-)

diff --git a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
index c8cfe6c8..b4cedbda 100644
--- a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
+++ b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
@@ -9,9 +9,9 @@
 #  culturefeed_search_ui.info: n/a
 #  culturefeed_search_ui.install: n/a
 #  includes/blocks.inc: n/a
+#  js/search_ui.js: n/a
 #  includes/helpers.inc: n/a
 #  includes/pages.inc: n/a
-#  js/search_ui.js: n/a
 #  lib/Drupal/CultureFeedSearchPage.php: n/a
 #  theme/culturefeed-search-list.tpl.php: n/a
 #  theme/culturefeed-search-block-filter-links-item.tpl.php: n/a
@@ -22,8 +22,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2015-03-18 20:21+0100\n"
-"PO-Revision-Date: 2015-03-18 20:36+0100\n"
+"POT-Creation-Date: 2015-05-11 16:43+0200\n"
+"PO-Revision-Date: 2015-05-11 16:45+0100\n"
 "Last-Translator: Luk Dens <luk.dens@cultuurnet.be>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
@@ -46,165 +46,165 @@ msgstr ""
 msgid "Change CultureFeed Search UI sort settings."
 msgstr ""
 
-#: culturefeed_search_ui.module:354
+#: culturefeed_search_ui.module:367
 msgid "Culturefeed search: search events and pages"
 msgstr "Culturefeed search: zoek activiteiten en pagina's"
 
-#: culturefeed_search_ui.module:359
+#: culturefeed_search_ui.module:372
 msgid "Culturefeed search: sort order"
 msgstr "Culturefeed search: zoekresultaten sorteren"
 
-#: culturefeed_search_ui.module:364
+#: culturefeed_search_ui.module:377
 msgid "Culturefeed search: active filters"
 msgstr "Culturefeed search: actieve filters"
 
-#: culturefeed_search_ui.module:369
+#: culturefeed_search_ui.module:382
 msgid "Culturefeed search: facet entity type"
 msgstr ""
 
-#: culturefeed_search_ui.module:374
+#: culturefeed_search_ui.module:387
 msgid "Culturefeed search: facet when"
 msgstr "Culturefeed search: facet wanneer"
 
-#: culturefeed_search_ui.module:379
+#: culturefeed_search_ui.module:392
 msgid "Culturefeed search: facet where"
 msgstr "Culturefeed search: facet waar"
 
-#: culturefeed_search_ui.module:384
+#: culturefeed_search_ui.module:397
 msgid "Culturefeed search: facet where - search only on cities and zipcodes"
 msgstr ""
 
-#: culturefeed_search_ui.module:389
+#: culturefeed_search_ui.module:402
 msgid "Facet: Age range"
 msgstr ""
 
-#: culturefeed_search_ui.module:394
+#: culturefeed_search_ui.module:407
 msgid "Culturefeed search: Filter form"
 msgstr ""
 
-#: culturefeed_search_ui.module:400
+#: culturefeed_search_ui.module:413
 msgid "Culturefeed search: location search"
 msgstr ""
 
-#: culturefeed_search_ui.module:404
+#: culturefeed_search_ui.module:417
 msgid "Culturefeed search: Filter form 2"
 msgstr ""
 
-#: culturefeed_search_ui.module:412
+#: culturefeed_search_ui.module:425
 msgid "Culturefeed search: facet @label"
 msgstr ""
 
-#: culturefeed_search_ui.module:431
+#: culturefeed_search_ui.module:444
 msgid "Sort facet on"
 msgstr ""
 
-#: culturefeed_search_ui.module:433
+#: culturefeed_search_ui.module:446
 msgid "Default sorting"
 msgstr ""
 
-#: culturefeed_search_ui.module:434
+#: culturefeed_search_ui.module:447
 msgid "Alphabetically"
 msgstr ""
 
-#: culturefeed_search_ui.module:435
+#: culturefeed_search_ui.module:448
 msgid "Total results"
 msgstr ""
 
-#: culturefeed_search_ui.module:442
+#: culturefeed_search_ui.module:455
 msgid "Highest facet level"
 msgstr ""
 
-#: culturefeed_search_ui.module:444
+#: culturefeed_search_ui.module:457
 msgid "Level 1"
 msgstr ""
 
-#: culturefeed_search_ui.module:445
+#: culturefeed_search_ui.module:458
 msgid "Level 2"
 msgstr ""
 
-#: culturefeed_search_ui.module:446
+#: culturefeed_search_ui.module:459
 msgid "Level 3"
 msgstr ""
 
-#: culturefeed_search_ui.module:447
+#: culturefeed_search_ui.module:460
 msgid "Level 4"
 msgstr ""
 
-#: culturefeed_search_ui.module:449
+#: culturefeed_search_ui.module:462
 msgid ""
 "The highest level of facets to show. Should probably be level 1. If the "
 "highest level does not exist, the level above it will be used."
 msgstr ""
 
-#: culturefeed_search_ui.module:454
+#: culturefeed_search_ui.module:467
 msgid "Show subitems"
 msgstr ""
 
-#: culturefeed_search_ui.module:455
+#: culturefeed_search_ui.module:468
 msgid ""
 "Check this if the facets of lower levels should be shown when a facet option "
 "is selected."
 msgstr ""
 
-#: culturefeed_search_ui.module:469
+#: culturefeed_search_ui.module:482
 msgid "Show only selected options"
 msgstr ""
 
-#: culturefeed_search_ui.module:478
+#: culturefeed_search_ui.module:491
 msgid "Show the facet only when an eventtype is chosen"
 msgstr "Toon de facet enkel wanneer een eventtype is gekozen"
 
-#: culturefeed_search_ui.module:487
+#: culturefeed_search_ui.module:500
 msgid "Limit autocomplete options to selected parents"
 msgstr ""
 
-#: culturefeed_search_ui.module:538
+#: culturefeed_search_ui.module:551
 msgid "Available actortype categories."
 msgstr ""
 
-#: culturefeed_search_ui.module:539
+#: culturefeed_search_ui.module:552
 msgid ""
 "Select the actortype categories that can be shown in the autocomplete. If "
 "none selected, all actors will be searched."
 msgstr ""
 
-#: culturefeed_search_ui.module:555
+#: culturefeed_search_ui.module:568
 msgid "How to display the filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:556
+#: culturefeed_search_ui.module:569
 msgid "Select how to display the search filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:559
+#: culturefeed_search_ui.module:572
 msgid "As links"
 msgstr ""
 
-#: culturefeed_search_ui.module:560
+#: culturefeed_search_ui.module:573
 msgid "As checkboxes with submit button"
 msgstr ""
 
-#: culturefeed_search_ui.module:565
+#: culturefeed_search_ui.module:578
 msgid "How to apply filters on the query"
 msgstr ""
 
-#: culturefeed_search_ui.module:566
+#: culturefeed_search_ui.module:579
 msgid "Select the operator for the search filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:569
+#: culturefeed_search_ui.module:582
 msgid "Use AND-operator"
 msgstr ""
 
-#: culturefeed_search_ui.module:570
+#: culturefeed_search_ui.module:583
 msgid "Use OR-operator"
 msgstr ""
 
-#: culturefeed_search_ui.module:578
+#: culturefeed_search_ui.module:591
 msgid "Possible filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:580
+#: culturefeed_search_ui.module:593
 msgid ""
 "<p>\n"
 "        Define the different filter options you want. Filters that are not "
@@ -216,48 +216,48 @@ msgid ""
 "      </p>"
 msgstr ""
 
-#: culturefeed_search_ui.module:591 includes/admin.inc:122
+#: culturefeed_search_ui.module:604 includes/admin.inc:122
 #: theme/theme.inc:607;641
 msgid "Exposed"
 msgstr ""
 
-#: culturefeed_search_ui.module:596 theme/theme.inc:608
+#: culturefeed_search_ui.module:609 theme/theme.inc:608
 msgid "Human name"
 msgstr ""
 
-#: culturefeed_search_ui.module:601
+#: culturefeed_search_ui.module:614
 msgid "Querystring for url"
 msgstr ""
 
-#: culturefeed_search_ui.module:606 theme/theme.inc:610
+#: culturefeed_search_ui.module:619 theme/theme.inc:610
 msgid "Filterquery for API"
 msgstr ""
 
-#: culturefeed_search_ui.module:711
+#: culturefeed_search_ui.module:725
 msgid "You searched for:"
 msgstr "Je zocht op:"
 
-#: culturefeed_search_ui.module:988
+#: culturefeed_search_ui.module:1004
 msgid "Near"
 msgstr "In de buurt van"
 
-#: culturefeed_search_ui.module:1018
+#: culturefeed_search_ui.module:1034
 msgid "All ages"
 msgstr "Alle leeftijden"
 
-#: culturefeed_search_ui.module:1072;1093;1097
+#: culturefeed_search_ui.module:1088;1109;1113
 msgid "culturefeed_search_ui"
 msgstr ""
 
-#: culturefeed_search_ui.module:1072
+#: culturefeed_search_ui.module:1088
 msgid "Fetching deleted objects from API for cleanup."
 msgstr ""
 
-#: culturefeed_search_ui.module:1093
+#: culturefeed_search_ui.module:1109
 msgid "Finished registration of deleted objects."
 msgstr ""
 
-#: culturefeed_search_ui.module:1097
+#: culturefeed_search_ui.module:1113
 msgid "Failed registration of deleted objects. Retrying again on the next run."
 msgstr ""
 
@@ -428,55 +428,55 @@ msgstr "Zoeken"
 msgid "When"
 msgstr "Wanneer"
 
-#: includes/blocks.inc:218
-msgid "Choose a date"
-msgstr "Datum"
+#: includes/blocks.inc:218;221 js/search_ui.js:0
+msgid "Between"
+msgstr "Tussen"
+
+#: includes/blocks.inc:226;229 js/search_ui.js:0
+msgid "And"
+msgstr "En"
 
-#: includes/blocks.inc:221
-msgid "Or choose a custom date"
-msgstr "Of kies zelf een datum"
+#: includes/blocks.inc:232
+msgid "Specific dates"
+msgstr "Specifieke datum"
 
-#: includes/blocks.inc:226;376;593;818
+#: includes/blocks.inc:240;386;603;828
 msgid "Ok"
 msgstr "Ok"
 
-#: includes/blocks.inc:243
-msgid "till"
-msgstr "tot"
-
-#: includes/blocks.inc:247;252
+#: includes/blocks.inc:259
 msgid "Please enter a valid date"
 msgstr "Gelieve een geldige datum in te voeren"
 
-#: includes/blocks.inc:335;366;567;585;790;811
+#: includes/blocks.inc:345;376;577;595;800;821
 msgid "Where"
 msgstr "Waar"
 
-#: includes/blocks.inc:370;588;813
+#: includes/blocks.inc:380;598;823
 msgid "Zipcode or city"
 msgstr "Postcode of gemeente"
 
-#: includes/blocks.inc:430
+#: includes/blocks.inc:440
 msgid "Change radius"
 msgstr "Wijzig straal"
 
-#: includes/blocks.inc:433
+#: includes/blocks.inc:443
 msgid "Choose another location"
 msgstr "Kies andere plaats"
 
-#: includes/blocks.inc:512
+#: includes/blocks.inc:522
 msgid "Age"
 msgstr "Leeftijd"
 
-#: includes/blocks.inc:630
+#: includes/blocks.inc:640
 msgid "Type"
 msgstr "Type"
 
-#: includes/blocks.inc:650
+#: includes/blocks.inc:660
 msgid "Remove all filters"
 msgstr "Alle filters verwijderen"
 
-#: includes/blocks.inc:692
+#: includes/blocks.inc:702
 msgid "Filter"
 msgstr "Filter"
 
@@ -525,45 +525,109 @@ msgid "Show all locations in !city"
 msgstr "Toon alle locaties in !city"
 
 #: js/search_ui.js:0
-msgid "Specific date"
-msgstr "Specifieke datum"
+msgid "Cancel"
+msgstr "Annuleren"
 
 #: js/search_ui.js:0
-msgid "Period from/to"
-msgstr "van / tot"
+msgid "Apply"
+msgstr "Pas toe"
 
 #: js/search_ui.js:0
-msgid "Start date"
-msgstr "Begindatum"
+msgid "January"
+msgstr "januari"
 
 #: js/search_ui.js:0
-msgid "End date"
-msgstr "Einddatum"
+msgid "February"
+msgstr "februari"
 
 #: js/search_ui.js:0
-msgid "OK"
-msgstr "Ok"
+msgid "March"
+msgstr "maart"
+
+#: js/search_ui.js:0
+msgid "April"
+msgstr "april"
+
+#: js/search_ui.js:0
+msgid "May"
+msgstr "mei"
+
+#: js/search_ui.js:0
+msgid "June"
+msgstr "juni"
+
+#: js/search_ui.js:0
+msgid "July"
+msgstr "juli"
+
+#: js/search_ui.js:0
+msgid "August"
+msgstr "augustus"
+
+#: js/search_ui.js:0
+msgid "September"
+msgstr "september"
+
+#: js/search_ui.js:0
+msgid "October"
+msgstr "oktober"
+
+#: js/search_ui.js:0
+msgid "November"
+msgstr "november"
+
+#: js/search_ui.js:0
+msgid "December"
+msgstr "december"
+
+#: js/search_ui.js:0
+msgid "Sun"
+msgstr "zo"
+
+#: js/search_ui.js:0
+msgid "Mon"
+msgstr "ma"
+
+#: js/search_ui.js:0
+msgid "Tue"
+msgstr "di"
+
+#: js/search_ui.js:0
+msgid "Wed"
+msgstr "wo"
+
+#: js/search_ui.js:0
+msgid "Thu"
+msgstr "do"
+
+#: js/search_ui.js:0
+msgid "Fri"
+msgstr "vr"
+
+#: js/search_ui.js:0
+msgid "Sat"
+msgstr "za"
 
-#: lib/Drupal/CultureFeedSearchPage.php:651
+#: lib/Drupal/CultureFeedSearchPage.php:643
 msgid "More results"
 msgstr "Meer resultaten"
 
-#: lib/Drupal/CultureFeedSearchPage.php:662
+#: lib/Drupal/CultureFeedSearchPage.php:654
 #: theme/culturefeed-search-list.tpl.php:14
 msgid "perform a new search."
 msgstr "voer een nieuwe zoekopdracht uit."
 
-#: lib/Drupal/CultureFeedSearchPage.php:664
+#: lib/Drupal/CultureFeedSearchPage.php:656
 #: theme/culturefeed-search-list.tpl.php:19
 msgid "There are no more search results."
 msgstr "Er zijn geen zoekresultaten meer."
 
-#: lib/Drupal/CultureFeedSearchPage.php:665
+#: lib/Drupal/CultureFeedSearchPage.php:657
 #: theme/culturefeed-search-list.tpl.php:19
 msgid "Refine your search results or"
 msgstr "Verfijn jouw zoekopdracht of"
 
-#: lib/Drupal/CultureFeedSearchPage.php:728
+#: lib/Drupal/CultureFeedSearchPage.php:720
 msgid "page"
 msgstr "pagina"
 

From 05b9aaa20821a3db292ce50238b2192e0f5bd09c Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Mon, 11 May 2015 19:31:53 +0200
Subject: [PATCH 177/275] UIV-1266 fix Fatal error: [] operator not supported
 for strings

---
 culturefeed_agenda/includes/helpers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index abe8a723..96afd8e3 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -640,7 +640,7 @@ function culturefeed_agenda_group_timestamps(&$timestamps) {
           }
           else {
             if (isset($next_timestamp['begintime'])) {
-              $timestamps[$i]['begintime'][] = $next_timestamp['begintime'];
+              $timestamps[$i]['begintime'] = $next_timestamp['begintime'];
             }
           }
           if (isset($timestamps[$i]['begintime']) && is_array($timestamps[$i]['begintime'])) {

From 67e70c4ef88732dfd7a2ed1ed74a5fd7d416d350 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 12 May 2015 08:17:28 +0200
Subject: [PATCH 178/275] UIT-38 translate label

---
 .../translations/culturefeed_search_ui.nl.po                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
index b4cedbda..df979406 100644
--- a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
+++ b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "POT-Creation-Date: 2015-05-11 16:43+0200\n"
-"PO-Revision-Date: 2015-05-11 16:45+0100\n"
+"PO-Revision-Date: 2015-05-12 08:16+0100\n"
 "Last-Translator: Luk Dens <luk.dens@cultuurnet.be>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
@@ -530,7 +530,7 @@ msgstr "Annuleren"
 
 #: js/search_ui.js:0
 msgid "Apply"
-msgstr "Pas toe"
+msgstr "Toepassen"
 
 #: js/search_ui.js:0
 msgid "January"

From 82b9676ef05356a59dc1b2efd3ddd23c18cb7c9c Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 12 May 2015 10:30:13 +0200
Subject: [PATCH 179/275] UIV-1266 resolve notices in culturefeed_agenda

---
 culturefeed_agenda/includes/helpers.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index 96afd8e3..2a002072 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -640,7 +640,9 @@ function culturefeed_agenda_group_timestamps(&$timestamps) {
           }
           else {
             if (isset($next_timestamp['begintime'])) {
-              $timestamps[$i]['begintime'] = $next_timestamp['begintime'];
+              unset($timestamps[$i]['begintime']);
+              $timestamps[$i]['begintime'][] = $this_timestamp['begintime'];
+              $timestamps[$i]['begintime'][] = $next_timestamp['begintime'];
             }
           }
           if (isset($timestamps[$i]['begintime']) && is_array($timestamps[$i]['begintime'])) {

From ca93dc774df6bb091f2003af8b13cfb8f4652173 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 12 May 2015 10:50:01 +0200
Subject: [PATCH 180/275] UIV-1266 fix notices in culturefeed_agenda
 (finetuning)

---
 culturefeed_agenda/includes/helpers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index 2a002072..ce1660f1 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -639,7 +639,7 @@ function culturefeed_agenda_group_timestamps(&$timestamps) {
             }
           }
           else {
-            if (isset($next_timestamp['begintime'])) {
+            if (isset($next_timestamp['begintime']) && $this_timestamp['begintime'] != $next_timestamp['begintime']) {
               unset($timestamps[$i]['begintime']);
               $timestamps[$i]['begintime'][] = $this_timestamp['begintime'];
               $timestamps[$i]['begintime'][] = $next_timestamp['begintime'];

From 2a834c6d34b7ce7a5373ecffdabc9af878feed2b Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 12 May 2015 14:55:27 +0200
Subject: [PATCH 181/275] UIV-1085 don't use forward form on mobile devices

---
 culturefeed_agenda/theme/theme.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 78c98073..9bee31d0 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -328,7 +328,10 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $variables['forkids'] = TRUE;
     }
   }
-  
+
+  $variables['device'] = '(not set)';
+  $variables['is_ios'] = FALSE;
+  $variables['is_android'] = FALSE;  
   $detect = culturefeed_mobile_detect_get_object();
 
   if ($detect) {
@@ -426,7 +429,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     $variables['twitter']['url'] = $twitter['prefix'] . urlencode(url($variables['share_url'], array('query' => $twitter['utm'])));
     $variables['whatsapp']['url'] = $whatsapp['prefix'] . urlencode(url($variables['share_url'], array('query' => $whatsapp['utm'])));
 
-    if (module_exists('forward')) {
+    if (module_exists('forward') && ($device == 'computer')) {
       $variables['mail']['url'] = url('forward', array('query' => array('path' => url($variables['url'], array('query' => $mail['utm'])))));
     }
     else {

From f80406d898d52d299f5dc12687a1aa3a036b1e52 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 12 May 2015 15:31:35 +0200
Subject: [PATCH 182/275] UIV-1177 update title for mailing page

---
 .../culturefeed_mailing.module                |   2 +-
 .../translations/culturefeed_mailing.nl.po    | 484 ++++++++++++++----
 2 files changed, 398 insertions(+), 88 deletions(-)

diff --git a/culturefeed_mailing/culturefeed_mailing.module b/culturefeed_mailing/culturefeed_mailing.module
index 3ea70245..22154750 100644
--- a/culturefeed_mailing/culturefeed_mailing.module
+++ b/culturefeed_mailing/culturefeed_mailing.module
@@ -59,7 +59,7 @@ function culturefeed_mailing_menu() {
 
   $items['culturefeed/mailing'] = array(
     'title callback' => FALSE,
-    'title' => 'Emails',
+    'title' => 'Newsletters',
     'page callback' => 'culturefeed_mailing_page_my_newsletters',
     'access callback' => 'culturefeed_is_culturefeed_user',
     'type' => MENU_CALLBACK,
diff --git a/culturefeed_mailing/translations/culturefeed_mailing.nl.po b/culturefeed_mailing/translations/culturefeed_mailing.nl.po
index a150a95b..ea336b8a 100644
--- a/culturefeed_mailing/translations/culturefeed_mailing.nl.po
+++ b/culturefeed_mailing/translations/culturefeed_mailing.nl.po
@@ -13,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2013-07-23 17:41+0200\n"
-"PO-Revision-Date: 2013-07-24 13:05+0100\n"
-"Last-Translator: Frontend CultuurNet <frontend@cultuurnet.be>\n"
+"POT-Creation-Date: 2015-05-12 15:28+0200\n"
+"PO-Revision-Date: 2015-05-12 15:30+0100\n"
+"Last-Translator: Luk Dens <luk.dens@cultuurnet.be>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "None"
 msgstr "Geen"
 
-#: culturefeed_mailing.admin.inc:29 culturefeed_mailing.pages.inc:249
+#: culturefeed_mailing.admin.inc:29 culturefeed_mailing.pages.inc:265
 msgid "Mailing list"
 msgstr "Mailing list"
 
@@ -82,15 +82,15 @@ msgid "Unsubscribe"
 msgstr "Uitschrijven"
 
 #: culturefeed_mailing.helpers.inc:31 culturefeed_mailing.pages.inc:127
-#: culturefeed_mailing.module:240
+#: culturefeed_mailing.module:293
 msgid "Subscribe"
 msgstr "Inschrijven"
 
 #: culturefeed_mailing.pages.inc:48
 msgid "Error occurred"
-msgstr "Er is een fout opgetreden"
+msgstr "Er is een fout opgetreden."
 
-#: culturefeed_mailing.pages.inc:75
+#: culturefeed_mailing.pages.inc:75 culturefeed_mailing.module:286
 msgid "Email address"
 msgstr "E-mailadres"
 
@@ -120,125 +120,395 @@ msgstr ""
 msgid "You have successfully subscribed to our newsletter"
 msgstr "U bent succesvol ingeschreven voor onze nieuwsbrief."
 
-#: culturefeed_mailing.pages.inc:198
+#: culturefeed_mailing.pages.inc:204;589
 msgid "edit"
 msgstr "bewerken"
 
-#: culturefeed_mailing.pages.inc:205
-msgid "delete"
-msgstr "verwijder"
-
-#: culturefeed_mailing.pages.inc:212;491
+#: culturefeed_mailing.pages.inc:211
 msgid "send test mail"
 msgstr "Stuur testmail"
 
-#: culturefeed_mailing.pages.inc:249;315
-msgid "Subject"
-msgstr "Onderwerp"
+#: culturefeed_mailing.pages.inc:230
+msgid "activate"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:249;307
-msgid "From address"
-msgstr "Van adres"
+#: culturefeed_mailing.pages.inc:238
+msgid "deactivate"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:265;372;723
+msgid "Template"
+msgstr "Template"
+
+#: culturefeed_mailing.pages.inc:265
+msgid "Status"
+msgstr "Status"
 
-#: culturefeed_mailing.pages.inc:249
+#: culturefeed_mailing.pages.inc:265;623
 msgid "Actions"
 msgstr "Acties"
 
-#: culturefeed_mailing.pages.inc:251
+#: culturefeed_mailing.pages.inc:267;625
 msgid "No mailinglists yet"
 msgstr "Nog geen mailing list"
 
-#: culturefeed_mailing.pages.inc:267
+#: culturefeed_mailing.pages.inc:283;641
 msgid "Are you sure you want to delete %title?"
 msgstr "Weet u zeker dat u %title wilt verwijderen?"
 
-#: culturefeed_mailing.pages.inc:269
+#: culturefeed_mailing.pages.inc:285;643
 msgid "This action cannot be undone."
 msgstr "Deze actie kan niet ongedaan worden gemaakt."
 
-#: culturefeed_mailing.pages.inc:270
+#: culturefeed_mailing.pages.inc:286;391;644;1100
 msgid "Delete"
-msgstr "Verwijderen"
+msgstr "Verwijder"
 
-#: culturefeed_mailing.pages.inc:271
+#: culturefeed_mailing.pages.inc:287;645
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: culturefeed_mailing.pages.inc:286
+#: culturefeed_mailing.pages.inc:305
 msgid "Error occurred while deleting the mailing"
 msgstr "Er is een fout opgetreden tijdens het verwijderen van de mailing."
 
-#: culturefeed_mailing.pages.inc:299
+#: culturefeed_mailing.pages.inc:318;683
 msgid "Title"
 msgstr "Titel"
 
-#: culturefeed_mailing.pages.inc:331
-msgid "Frequency"
-msgstr "Frequentie"
-
-#: culturefeed_mailing.pages.inc:339
-msgid "Search Query"
-msgstr "Zoekopdracht"
+#: culturefeed_mailing.pages.inc:327
+msgid "Description"
+msgstr "Beschrijving"
 
-#: culturefeed_mailing.pages.inc:347
-msgid "Recommendation Query"
-msgstr "Aanbevolen zoekopdracht"
+#: culturefeed_mailing.pages.inc:353;623;710
+msgid "Channel"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:355
-msgid "Template"
-msgstr "Template"
+#: culturefeed_mailing.pages.inc:357;714
+msgid "The consumer key can only be changed from the UITid administrator."
+msgstr ""
 
 #: culturefeed_mailing.pages.inc:363
+msgid "- Select -"
+msgstr "- Selecteren -"
+
+#: culturefeed_mailing.pages.inc:385;1095
+msgid "Save"
+msgstr "Opslaan"
+
+#: culturefeed_mailing.pages.inc:420
+msgid "Mailing list updated"
+msgstr "Aanpassingen aan de mailing list zijn opgeslagen"
+
+#: culturefeed_mailing.pages.inc:424
+msgid "Could not update mailing"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:443
+msgid "New mailing created"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:447
+msgid "Could not save new mailing list"
+msgstr "Kon de aanpassingen aan de nieuwe mailing list niet opslaan."
+
+#: culturefeed_mailing.pages.inc:464
+msgid "A test mail was sent to !user_mail"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:475
+msgid "Mail could not be sent"
+msgstr "Mail kon niet worden verzonden. "
+
+#: culturefeed_mailing.pages.inc:496
+msgid "Activate mail"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:508
+msgid "This mailing is active and will be send on scheduled time"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:512
+msgid "Mailing could not be activated"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:527
+msgid "Deactivate scheduling"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:539
+msgid "Scheduling for this mailing is deactivated"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:543
+msgid "Mailing could not be deactivated"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:623
+msgid "Name"
+msgstr "Naam"
+
+#: culturefeed_mailing.pages.inc:623;748
+msgid "Subject"
+msgstr "Onderwerp"
+
+#: culturefeed_mailing.pages.inc:663
+msgid "Error occurred while deleting the template"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:676
+msgid "Basic settings"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:719
+msgid "Read documentation"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:727
+msgid "This template supports different variables. !link"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:732
+msgid "From address"
+msgstr "Van adres"
+
+#: culturefeed_mailing.pages.inc:741
+msgid "Content"
+msgstr "Inhoud"
+
+#: culturefeed_mailing.pages.inc:757
 msgid "Block 1"
 msgstr ""
 
-#: culturefeed_mailing.pages.inc:370
+#: culturefeed_mailing.pages.inc:764
 msgid "Block 2"
 msgstr ""
 
-#: culturefeed_mailing.pages.inc:377
+#: culturefeed_mailing.pages.inc:771
 msgid "Block 3"
 msgstr ""
 
-#: culturefeed_mailing.pages.inc:384
+#: culturefeed_mailing.pages.inc:778
 msgid "Block 4"
 msgstr ""
 
-#: culturefeed_mailing.pages.inc:391
+#: culturefeed_mailing.pages.inc:785
 msgid "Block 5"
 msgstr ""
 
-#: culturefeed_mailing.pages.inc:398
+#: culturefeed_mailing.pages.inc:792
 msgid "Block 6"
 msgstr ""
 
-#: culturefeed_mailing.pages.inc:410
-msgid "Submit"
-msgstr "Indienen"
+#: culturefeed_mailing.pages.inc:799
+msgid "Extra content & suggestions"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:440
-msgid "Mailing list updated"
-msgstr "Aanpassingen aan de mailing list zijn opgeslagen"
+#: culturefeed_mailing.pages.inc:805
+msgid "More info"
+msgstr "Meer info"
 
-#: culturefeed_mailing.pages.inc:444
-msgid "Could not update mailing list"
-msgstr "Aanpassingen aan de mailing list konden niet worden opgeslagen. "
+#: culturefeed_mailing.pages.inc:809
+msgid ""
+"You can enrich the content of the basic template with event suggestions "
+"based on a search query or the user's profile. !link"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:467
-msgid "New mailing list created"
-msgstr "Maak een nieuwe mailing list aan"
+#: culturefeed_mailing.pages.inc:814
+msgid "Use suggestions based on:"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:471
-msgid "Could not save new mailing list"
-msgstr "Kon de aanpassingen aan de nieuwe mailing list niet opslaan."
+#: culturefeed_mailing.pages.inc:819
+msgid "A search query"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:503
-msgid "Test mail sent"
-msgstr "Test mail is verstuurd."
+#: culturefeed_mailing.pages.inc:834
+msgid ""
+"Search API Query. Example: q=Concert&city=${city}&k=${lifestyleProfile}"
+"&sort=proximity"
+msgstr ""
 
-#: culturefeed_mailing.pages.inc:507
-msgid "Mail could not be sent"
-msgstr "Mail kon niet worden verzonden. "
+#: culturefeed_mailing.pages.inc:842;871
+msgid "Send mail even if there are no results"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:848
+msgid "Personal recommendations"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:863
+msgid "Recommendation Query. Example: uid=${uid}"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:877
+msgid "Dispatch"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:883
+msgid "Once"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:884
+msgid "Daily"
+msgstr "Dagelijks"
+
+#: culturefeed_mailing.pages.inc:885
+msgid "Weekly"
+msgstr "Wekelijks"
+
+#: culturefeed_mailing.pages.inc:886
+msgid "Biweekly"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:887
+msgid "Monthly"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:892
+msgid "Frequency"
+msgstr "Frequentie"
+
+#: culturefeed_mailing.pages.inc:919
+msgid "Start time"
+msgstr "Starttijd"
+
+#: culturefeed_mailing.pages.inc:926;957;995;1033;1071
+msgid "hh"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:939;970;1008;1046;1084
+msgid "mm"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:985;1023
+msgid "On day"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1061
+msgid "Day of the month"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1118
+msgid "You need to set a date when selecting \"once\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1121
+msgid "You need to set the hour when selecting \"once\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1124;1138;1155;1172;1189
+msgid ""
+"Invalid start hour: !hour. Start hour must be a value between 6 and 22 (both "
+"ends inclusive)"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1127
+msgid "You need to set the minutes when selecting \"once\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1130;1144;1161;1178;1195
+msgid ""
+"Invalid start minutes: !minutes. Start minutes must be a value between 0 and "
+"59 (both ends inclusive)"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1135
+msgid "You need to set the hour when selecting \"daily\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1141
+msgid "You need to set the minutes when selecting \"daily\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1149
+msgid "You need to set the day when selecting \"weekly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1152
+msgid "You need to set the hour when selecting \"weekly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1158
+msgid "You need to set the minutes when selecting \"weekly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1166
+msgid "You need to set the day when selecting \"biweekly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1169
+msgid "You need to set the hour when selecting \"biweekly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1175
+msgid "You need to set the minutes when selecting \"biweekly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1183
+msgid "You need to set the day when selecting \"monthly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1186
+msgid "You need to set the hour when selecting \"monthly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1192
+msgid "You need to set the minutes when selecting \"monthly\"."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1201
+msgid "When selecting a search query, you need to provide a search query."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1205
+msgid ""
+"When selecting a recommendation query, you need to provide a recommendation "
+"query."
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1269
+msgid "Template \"!template_name\" updated"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1273
+msgid "Could not update template \"!template_name\""
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1331
+msgid "New template \"!template_name\" created"
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1335
+msgid "Could not save new template \"!template_name\""
+msgstr ""
+
+#: culturefeed_mailing.pages.inc:1351
+msgid "Monday"
+msgstr "maandag"
+
+#: culturefeed_mailing.pages.inc:1352
+msgid "Tuesday"
+msgstr "dinsdag"
+
+#: culturefeed_mailing.pages.inc:1353
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: culturefeed_mailing.pages.inc:1354
+msgid "Thursday"
+msgstr "donderdag"
+
+#: culturefeed_mailing.pages.inc:1355
+msgid "Friday"
+msgstr "vrijdag"
+
+#: culturefeed_mailing.pages.inc:1356
+msgid "Saturday"
+msgstr "zaterdag"
+
+#: culturefeed_mailing.pages.inc:1357
+msgid "Sunday"
+msgstr "zondag"
 
 #: culturefeed_mailing.module:15
 msgid "Subscribe to mailings"
@@ -256,53 +526,93 @@ msgstr "Beheer mailing lists"
 msgid "Allows the user to manage mailing lists & templates"
 msgstr "Sta gebruiker toe om mailing lists & templates te beheren"
 
-#: culturefeed_mailing.module:39
+#: culturefeed_mailing.module:23
+msgid "Delete mail template"
+msgstr ""
+
+#: culturefeed_mailing.module:24
+msgid "Allows the user to delete mailing lists & templates"
+msgstr ""
+
+#: culturefeed_mailing.module:212
+msgid "Culturefeed mailings: Newsletter opt-in"
+msgstr ""
+
+#: culturefeed_mailing.module:217
+msgid "Culturefeed mailings: Newsletter form"
+msgstr ""
+
+#: culturefeed_mailing.module:254
+msgid "Manage newsletters you can subscribe to"
+msgstr "Beheer de nieuwsbrieven waarop je kan inschrijven"
+
+#: culturefeed_mailing.module:37
+msgid "Newsletter opt-in"
+msgstr ""
+
+#: culturefeed_mailing.module:46
 msgid "Subscribe to our newsletter"
 msgstr "Inschrijven op de nieuwsbrief"
 
-#: culturefeed_mailing.module:47
+#: culturefeed_mailing.module:54
 msgid "Subscribed to our newsletter"
 msgstr "Ingeschreven op de nieuwsbrief"
 
-#: culturefeed_mailing.module:55
-msgid "Emails"
-msgstr "E-mails"
+#: culturefeed_mailing.module:62
+msgid "Newsletters"
+msgstr "Nieuwsbrieven"
 
-#: culturefeed_mailing.module:64 culturefeed_mailing.info:0
+#: culturefeed_mailing.module:71 culturefeed_mailing.info:0
 msgid "CultureFeed Mailing"
 msgstr "CultureFeed Mailing"
 
-#: culturefeed_mailing.module:65
+#: culturefeed_mailing.module:72
 msgid "CultureFeed Mailing settings"
 msgstr "CultureFeed Mailing instellingen"
 
-#: culturefeed_mailing.module:75
+#: culturefeed_mailing.module:81
 msgid "Mailing lists"
 msgstr "Mailing lists"
 
-#: culturefeed_mailing.module:84;94;112
+#: culturefeed_mailing.module:89
 msgid "Add mailing list"
 msgstr "Voeg mailing list toe"
 
-#: culturefeed_mailing.module:103
+#: culturefeed_mailing.module:98
+msgid "Edit mailing list"
+msgstr ""
+
+#: culturefeed_mailing.module:106
 msgid "Test mailing list"
 msgstr "Test mailing list"
 
-#: culturefeed_mailing.module:159
-msgid "Culturefeed mailings: Newsletter opt-in"
+#: culturefeed_mailing.module:116
+msgid "Activate mailing list"
 msgstr ""
 
-#: culturefeed_mailing.module:164
-msgid "Culturefeed mailings: Newsletter form"
+#: culturefeed_mailing.module:124
+msgid "Disable scheduled sending"
 msgstr ""
 
-#: culturefeed_mailing.module:201
-msgid "Manage newsletters you can subscribe to"
-msgstr "Beheer de nieuwsbrieven waarop je kan inschrijven"
+#: culturefeed_mailing.module:132
+msgid "Delete mailing"
+msgstr ""
 
-#: culturefeed_mailing.module:233
-msgid "Email address"
-msgstr "E-mailadres"
+#: culturefeed_mailing.module:140
+msgid "Templates"
+msgstr ""
+
+#: culturefeed_mailing.module:148
+msgid "Add template"
+msgstr ""
+
+#: culturefeed_mailing.module:157
+msgid "Edit template"
+msgstr ""
+
+#: culturefeed_mailing.module:165
+msgid "Delete template"
+msgstr ""
 
 #: culturefeed_mailing.info:0
 msgid "Creates a tool to subscribe to and construct mailings on CultureFeed"

From 3efff682c0f57904ead1539cd3bee652be8b4b12 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 12 May 2015 15:33:16 +0200
Subject: [PATCH 183/275] MSS-159 image handling

---
 .../culturefeed_entry_ui.collaboration.css    |  20 ++-
 .../culturefeed_entry_ui.install              |  21 +++
 .../culturefeed_entry_ui.collaboration.inc    | 137 ++++++++++++++++--
 .../culturefeed_entry_ui.collaboration.inc    |   4 +-
 4 files changed, 168 insertions(+), 14 deletions(-)
 create mode 100644 culturefeed_entry_ui/culturefeed_entry_ui.install

diff --git a/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css b/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css
index fc5d9b48..10be0767 100644
--- a/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css
+++ b/culturefeed_entry_ui/css/culturefeed_entry_ui.collaboration.css
@@ -1,12 +1,26 @@
 
-#culturefeed-entry-ui-edit-collaboration-data-form fieldset .panel-body {
+.edit-collaboration-data fieldset .panel-body {
   padding-top: 0px;
 }
 
-#culturefeed-entry-ui-edit-collaboration-data-form fieldset .no-top-margin {
+.edit-collaboration-data fieldset .no-top-margin {
   margin-top: 0px;
 }
 
-#culturefeed-entry-ui-edit-collaboration-data-form legend.panel-heading {
+.edit-collaboration-data fieldset.vertical-tabs-pane > legend.panel-heading {
   display: none;
 }
+
+.edit-collaboration-data .form-item-image-upload > .row > .col-md-6 {
+  width: auto;
+}
+
+.edit-collaboration-data img {
+  max-width: 150px;
+  max-height: 150px;
+}
+
+.edit-collaboration-data .btn-danger {
+  margin-left: 15px;
+  margin-top: 5px;
+}
diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.install b/culturefeed_entry_ui/culturefeed_entry_ui.install
new file mode 100644
index 00000000..36200a94
--- /dev/null
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.install
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_entry_ui.install.
+ */
+
+/**
+ * Implements hook_install().
+ */
+function culturefeed_entry_ui_install() {
+
+  $site_name = variable_get('site_name') . ' selectie';
+  variable_set('culturefeed_entry_ui_custom_collaboration_tags', array(
+    $site_name => array(
+      'value' => $site_name,
+      'visible' => FALSE,
+    ),
+  ));
+
+}
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
index b928980d..7216ea9e 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
@@ -15,7 +15,7 @@
  * @param array $info
  *   The collaborative info.
  */
-function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state, $info) {
+function culturefeed_entry_ui_attach_collaboration_element(array &$form, array $form_state, array $info) {
 
   $keyword = $info['keyword'];
 
@@ -25,6 +25,7 @@ function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state,
     '#type' => 'fieldset',
   );
 
+  // Title.
   $form['collaboration'][$keyword]['title'] = array(
     '#default_value' => isset($info['title']) ? $info['title'] : '',
     '#required' => TRUE,
@@ -32,18 +33,79 @@ function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state,
     '#type' => 'textfield',
   );
 
+  // Image.
+  $default_image = '';
+  if (isset($info['description']['image']) && $info['description']['image']) {
+
+    // See if the image is stored on the local url.
+    $base_path = $GLOBALS['base_url'] . '/' . variable_get('file_public_path', conf_path() . '/files') . '/';
+    $parts = explode($base_path, $info['description']['image']);
+    if (count($parts) == 2 && $parts[1]) {
+
+      $files = entity_load('file', FALSE, array('uri' => 'public://' . $parts[1]));
+      if (!empty($files)) {
+        $default_image = reset($files);
+      }
+
+    }
+
+    // @codingStandardsIgnoreStart
+    // $default_image = system_retrieve_file($info['description']['image'], 'public://uploads/', TRUE);
+    // @codingStandardsIgnoreEnd
+
+  }
+
   $form['collaboration'][$keyword]['image'] = array(
-    '#default_value' => isset($info['description']['image']) ? $info['description']['image'] : '',
+    '#tree' => TRUE,
+    '#type' => 'fieldset',
     '#title' => t('Image'),
+  );
+
+  $form['collaboration'][$keyword]['image']['upload'] = array(
+    '#type' => 'managed_file',
+    '#name' => 'image_upload',
+    '#title' => t('Image upload'),
+    '#default_image' => isset($default_image->fid) ? $default_image : FALSE,
+    '#default_value' => isset($default_image->fid) ? $default_image->fid : FALSE,
+    '#description' => t('Allowed extensions: gif png jpg jpeg'),
+    '#upload_location' => 'public://uploads/',
+    '#upload_validators' => array(
+      'file_validate_extensions' => array('gif png jpg jpeg'),
+      // Pass the maximum file size in bytes.
+      'file_validate_size' => array(1024 * 1024 * 1024),
+    ),
+    '#after_build' => array('culturefeed_entry_ui_photo_after_build'),
+  );
+
+  if (isset($default_image->fid)) {
+    $form['collaboration'][$keyword]['image']['original_file'] = array(
+      '#type' => 'hidden',
+      '#value' => $default_image->fid,
+    );
+  }
+
+  $form['collaboration'][$keyword]['image']['copyright_text'] = array(
     '#type' => 'textfield',
+    '#title' => t('Copyright'),
+    '#description' => t('Name of the copyright owner of this image.'),
+    '#default_value' => isset($info['copyright']) ? $info['copyright'] : '',
+    '#size' => 30,
+  );
+
+  $form['collaboration'][$keyword]['image']['copyright'] = array(
+    '#type' => 'checkbox',
+    '#default_value' => isset($default_image->fid) ? 1 : 0,
+    '#title' => t('I agree to the <a href="http://www.uitdatabank.be/uitportal/legal.aspx">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image.'),
   );
 
+  // Article.
   $form['collaboration'][$keyword]['article'] = array(
     '#default_value' => isset($info['description']['article']) ? $info['description']['article'] : '',
     '#title' => t('Article'),
     '#type' => 'textfield',
   );
 
+  // Text.
   $form['collaboration'][$keyword]['text'] = array(
     '#default_value' => isset($info['description']['text']) ? $info['description']['text'] : '',
     '#required' => TRUE,
@@ -66,29 +128,34 @@ function culturefeed_entry_ui_attach_collaboration_element(&$form, $form_state,
  * @return array
  *   The form.
  */
-function culturefeed_entry_ui_edit_collaboration_data_form($form, &$form_state, \CultuurNet\Search\ActivityStatsExtendedEntity $event) {
+function culturefeed_entry_ui_edit_collaboration_data_form(array $form, array &$form_state, \CultuurNet\Search\ActivityStatsExtendedEntity $event) {
 
   /* @var \CultuurNet\Search\ActivityStatsExtendedEntity $event */
   $event = $event->getEntity();
   /* @var \CultureFeed_Cdb_Item_Event $event */
   $form['#event'] = $event;
+  $form['#attributes'] = array(
+    'class' => array('edit-collaboration-data'),
+  );
 
   $custom_tags = variable_get('culturefeed_entry_ui_custom_collaboration_tags', array());
   if (!count($custom_tags)) {
     $tag = variable_get('site_name') . ' selectie';
-    $custom_tags[] = array($tag => array('value' => $tag, 'visible' => FALSE));
+    $custom_tags[$tag] = array('value' => $tag, 'visible' => FALSE);
   }
 
-  // Start vertical tabs
+  // Start vertical tabs.
   $form['vertical_tabs'] = array(
     '#type' => 'vertical_tabs',
   );
 
   $form['collaboration'] = array(
     '#tree' => TRUE,
+    '#type' => 'container',
   );
 
   form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/helpers/culturefeed_entry_ui.collaboration');
+  form_load_include($form_state, 'inc', 'culturefeed_entry_ui', 'includes/culturefeed_entry_ui.pages');
 
   foreach ($custom_tags as $tag) {
 
@@ -98,6 +165,7 @@ function culturefeed_entry_ui_edit_collaboration_data_form($form, &$form_state,
 
   $form['#attached'] = array(
     'css' => array(
+      drupal_get_path('module', 'culturefeed_entry_ui') . '/css/culturefeed_entry_ui.css',
       drupal_get_path('module', 'culturefeed_entry_ui') . '/css/culturefeed_entry_ui.collaboration.css',
     ),
   );
@@ -122,7 +190,7 @@ function culturefeed_entry_ui_edit_collaboration_data_form($form, &$form_state,
  * @param array $form_state
  *   The form state.
  */
-function culturefeed_entry_ui_edit_collaboration_data_form_submit(&$form, &$form_state) {
+function culturefeed_entry_ui_edit_collaboration_data_form_submit(array &$form, array &$form_state) {
 
   $consumer_key = variable_get('culturefeed_api_application_key', '');
   /* @var \CultureFeed_Cdb_Item_Event $event */
@@ -133,17 +201,28 @@ function culturefeed_entry_ui_edit_collaboration_data_form_submit(&$form, &$form
     foreach ($form_state['values']['collaboration'] as $keyword => $collaboration) {
 
       $title = $collaboration['title'];
-      $copyright = '';
+      $copyright = isset($collaboration['image']['copyright_text']) ? $collaboration['image']['copyright_text'] : '';
       $plain_text = $collaboration['text'];
+      $image_file = '';
+      $image = '';
+
+      if ($collaboration['image']['upload']) {
+
+        $image_file = file_load($collaboration['image']['upload']);
+        $image_file->status = FILE_STATUS_PERMANENT;
+        file_save($image_file);
+        file_usage_add($image_file, 'culturefeed_entry_ui', 'event', $image_file->fid);
+        $image = file_create_url($image_file->uri);
+
+      }
 
       $description = drupal_json_encode(array(
         'keyword' => $keyword,
         'text' => $plain_text,
-        'image' => $collaboration['image'],
+        'image' => $image,
         'article' => $collaboration['article'],
       ));
 
-
       Drupalculturefeed_EntryApi::addLinkToEvent(
         $event,
         '',
@@ -156,6 +235,17 @@ function culturefeed_entry_ui_edit_collaboration_data_form_submit(&$form, &$form
         $description
       );
 
+      // @codingStandardsIgnoreStart
+      // Remove the file(s).
+      /*if ($image_file) {
+        file_delete($image_file);
+      }
+      if (isset($collaboration['image']['original_file'])) {
+        $file = file_load($collaboration['image']['original_file']);
+        file_delete($file);
+      }*/
+      // @codingStandardsIgnoreEnd
+
       // Also save the keyword directly as keyword.
       $keywords = array(
         $keyword => new CultureFeed_Cdb_Data_Keyword($keyword, FALSE),
@@ -167,3 +257,32 @@ function culturefeed_entry_ui_edit_collaboration_data_form_submit(&$form, &$form
   }
 
 }
+
+/**
+ * Validation handler for culturefeed_entry_ui_edit_collaboration_data_form().
+ *
+ * @param array $form
+ *   The form.
+ * @param array $form_state
+ *   The form state.
+ */
+function culturefeed_entry_ui_edit_collaboration_data_form_validate(array $form, array &$form_state) {
+
+  if (isset($form_state['values']['collaboration'])) {
+
+    $collaboration = $form_state['values']['collaboration'];
+    foreach ($collaboration as $tag => $info) {
+
+      $field = "collaboration][" . $tag . "][image][";
+      if (!empty($info['image']['upload']) && $info['image']['copyright'] != 1) {
+        form_set_error($field . "copyright", t('Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank.'));
+      }
+      if (!empty($info['image']['upload']) && empty($info['image']['copyright_text'])) {
+        form_set_error($field . "copyright_text", t('Copyright field is required.'));
+      }
+
+    }
+
+  }
+
+}
diff --git a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
index 00c8b575..0b40f0f5 100644
--- a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
@@ -36,12 +36,12 @@ function culturefeed_entry_ui_collaboration_get_data_by_keyword(\CultureFeed_Cdb
       if ($link->getSubBrand() && $link->getSubBrand() == $consumer_key) {
 
         $description = drupal_json_decode($link->getDescription());
-        $title = $link->getTitle();
 
         if (isset($description['keyword']) && $description['keyword'] == $keyword) {
 
+          $info['copyright'] = $link->getCopyright();
           $info['description'] = $description;
-          $info['title'] = $title;
+          $info['title'] = $link->getTitle();
 
         }
 

From dc5be461f7cbb10cdb9ff0596037457b176634b1 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 12 May 2015 15:35:24 +0200
Subject: [PATCH 184/275] UIV-1177 make title for mailing page translatable

---
 culturefeed_mailing/culturefeed_mailing.module | 1 -
 1 file changed, 1 deletion(-)

diff --git a/culturefeed_mailing/culturefeed_mailing.module b/culturefeed_mailing/culturefeed_mailing.module
index 22154750..16d59114 100644
--- a/culturefeed_mailing/culturefeed_mailing.module
+++ b/culturefeed_mailing/culturefeed_mailing.module
@@ -58,7 +58,6 @@ function culturefeed_mailing_menu() {
   );
 
   $items['culturefeed/mailing'] = array(
-    'title callback' => FALSE,
     'title' => 'Newsletters',
     'page callback' => 'culturefeed_mailing_page_my_newsletters',
     'access callback' => 'culturefeed_is_culturefeed_user',

From ec428bd02f10d66140043a4e16e93077a86d4e66 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 12 May 2015 15:39:27 +0200
Subject: [PATCH 185/275] MSS-159 small fix

---
 .../includes/form/culturefeed_entry_ui.collaboration.inc         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
index 7216ea9e..3d541864 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
@@ -142,6 +142,7 @@ function culturefeed_entry_ui_edit_collaboration_data_form(array $form, array &$
   if (!count($custom_tags)) {
     $tag = variable_get('site_name') . ' selectie';
     $custom_tags[$tag] = array('value' => $tag, 'visible' => FALSE);
+    variable_set('culturefeed_entry_ui_custom_collaboration_tags', $custom_tags);
   }
 
   // Start vertical tabs.

From c29f6f8ebe49f06b9c39e13e021bb439989c3af6 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 12 May 2015 22:22:04 +0200
Subject: [PATCH 186/275] MSS-157 Move keyword matching to helper function
 based on view filters

---
 .../views_handler_field_cdb_item_picture.inc  | 124 +++++++++---------
 ...ndler_field_cdb_item_short_description.inc |  41 ++----
 .../views_handler_field_cdb_item_title.inc    |  47 ++-----
 ...feed_search_views_helper_collaboration.inc |  78 +++++++++++
 4 files changed, 161 insertions(+), 129 deletions(-)
 create mode 100644 culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 69155f2c..4903287a 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -76,96 +76,96 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       return;
     }
 
+    $image = '';
     $main_picture = '';
+    $no_main_picture = '';
     $alt_pic = FALSE;
 
     if ($this->options['override']) {
-      $media = $detail->getMedia();
-      $roadmaps = $media->byMediaType('roadmap');
 
-      $parameters = $this->query->getParameters();
-      $consumer_id = variable_get('culturefeed_api_application_key');
-
-      foreach ($parameters as $i => $parameter) {
-        $key = $parameter->getKey();
-        $value = $parameter->getValue();
-        if ($key != 'fq' || empty($value) || 0 !== strpos($value, 'keyword')) {
-          unset($parameters[$i]);
-        }
+      module_load_include('inc', 'culturefeed_search_views', 'views/helpers/culturefeed_search_views_helper_collaboration');
+      $data = culturefeed_search_views_helper_collaboration_get_data($extended_entity, $this->view);
+      if ($data && isset($data['description']->image) && $data['description']->image) {
+        $main_picture = $data['description']->image;
+        $alt_pic = TRUE;
       }
 
-      // If more filterquery's are defined, take first one.
-      if (count($parameters) > 0) {
-        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
-      }
+    }
 
-      foreach ($roadmaps as $roadmap) {
-        $subbrand = $roadmap->getSubbrand();
-        $collaboration_data = json_decode($roadmap->getDescription());
-        $collaboration_keyword = strtolower($collaboration_data->keyword);
+    if (!$main_picture) {
 
-        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
-          $picture = $collaboration_data->image;
-          if (isset($picture)) {
-            $alt_pic = TRUE;
-            $main_picture = $picture;
-          }
-        }
-      }
-      if(empty($main_picture)) {
-        $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
-        foreach ($pictures as $picture) {
-          if ($picture->isMain()) {
-            $main_picture = $picture->getHLink();
-          }
-        }
-      }
-    }
-    else {
       $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
       foreach ($pictures as $picture) {
+
+        if (!$no_main_picture) {
+          $no_main_picture = $picture->getHLink();
+        }
         if ($picture->isMain()) {
           $main_picture = $picture->getHLink();
         }
+
+      }
+
+      if (!$main_picture && $no_main_picture) {
+        $main_picture = $no_main_picture;
       }
-    }
 
-    if (empty($main_picture) && $pictures && $pictures->count() > 0) {
-      $pictures->rewind();
-      $picture = $pictures->current();
-      $main_picture = $picture->getHLink();
     }
 
-    if (!empty($main_picture)) {
-			if ($this->options['format'] == 'image') {
+    // Render the main picture according the settings.
+    if ($main_picture) {
+
+      if ($this->options['format'] == 'image') {
+
         if ($alt_pic) {
-          $image = theme('image', array(
-            'path' => $main_picture,
-            'width' => $this->options['width'],
-            'height' => $this->options['height'],
-            )
-          );
+
+          if ($this->options['width'] >= $this->options['height']) {
+            $image = theme('image', array(
+              'path' => $main_picture,
+              'width' => $this->options['width'],
+            ));
+          }
+          else {
+            $image = theme('image', array(
+              'path' => $main_picture,
+              'height' => $this->options['height'],
+            ));
+          }
+
         }
         else {
           $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
         }
-			}
-			else if ($this->options['format'] == 'url') {
-        if ($alt_pic) {
-          $image = $main_picture;
+
+      }
+      else {
+
+        if ($this->options['format'] == 'url') {
+
+          if ($alt_pic) {
+            $image = $main_picture;
+          }
+          else {
+            $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+          }
+
+        }
+
+      }
+
+      // Return the image if set.
+      if ($image) {
+
+        if ($this->options['link']) {
+          $path = culturefeed_search_detail_path($extended_entity->getType(), $extended_entity->getId(), $extended_entity->getTitle(culturefeed_search_get_preferred_language()));
+          return l($image, $path, array('html' => TRUE,));
         }
         else {
-          $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+          return $image;
         }
-			}
 
-      if ($this->options['link']) {
-        $path = culturefeed_search_detail_path($extended_entity->getType(), $extended_entity->getId(), $extended_entity->getTitle(culturefeed_search_get_preferred_language()));
-        return l($image, $path, array('html' => TRUE, ));
-      }
-      else {
-        return $image;
       }
+
     }
 
   }
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index 53445197..4af171fc 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -36,46 +36,29 @@ class views_handler_field_cdb_item_short_description extends views_handler_field
    */
   function render($extended_entity) {
 
+    $short_description = '';
+
     if ($this->options['override']) {
-      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
-      $roadmaps = $media->byMediaType('roadmap');
-
-      $parameters = $this->query->getParameters();
-      $consumer_id = variable_get('culturefeed_api_application_key');
-
-      foreach ($parameters as $i => $parameter) {
-        $key = $parameter->getKey();
-        $value = $parameter->getValue();
-        if ($key != 'fq' || empty($value) || 0 !== strpos($value, 'keyword')) {
-          unset($parameters[$i]);
-        }
-      }
 
-      // If more filterquery's are defined, take first one.
-      if (count($parameters) > 0) {
-        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      module_load_include('inc', 'culturefeed_search_views', 'views/helpers/culturefeed_search_views_helper_collaboration');
+      $data = culturefeed_search_views_helper_collaboration_get_data($extended_entity, $this->view);
+      if ($data && isset($data['description']->text) && $data['description']->text) {
+        $short_description = $data['description']->text;
       }
 
-      foreach ($roadmaps as $roadmap) {
-        $subbrand = $roadmap->getSubbrand();
-        $collaboration_keyword = json_decode($roadmap->getDescription());
-        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
-
-        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
-          $short_description = $roadmap->getPlainText();
-        }
-      }
-      if(!isset($short_description)) {
-        $short_description = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getShortDescription();
-      }
     }
-    else {
+
+    if (!$short_description) {
+
       $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
       if ($details) {
         $short_description = $details->getShortDescription();
       }
+
     }
+
     return $short_description;
+
   }
 
 }
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index ec26655e..2973f411 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -44,51 +44,22 @@ class views_handler_field_cdb_item_title extends views_handler_field {
    */
   function render($extended_entity) {
 
+    /* @var \CultuurNet\Search\ActivityStatsExtendedEntity $extended_entity */
+    $original_title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+    $title = $original_title;
+
     if ($this->options['override']) {
-      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
-      $roadmaps = $media->byMediaType('roadmap');
-
-      $parameters = $this->query->getParameters();
-      $consumer_id = variable_get('culturefeed_api_application_key');
-
-      foreach ($parameters as $i => $parameter) {
-        $key = $parameter->getKey();
-        $value = $parameter->getValue();
-        if ($key != 'fq' || empty($value) || 0 !== strpos($value, 'keyword') ) {
-          unset($parameters[$i]);
-        }
-      }
 
-      // If more filterquery's are defined, take first one.
-      if (count($parameters) > 0) {
-        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      module_load_include('inc', 'culturefeed_search_views', 'views/helpers/culturefeed_search_views_helper_collaboration');
+      $data = culturefeed_search_views_helper_collaboration_get_data($extended_entity, $this->view);
+      if ($data && isset($data['title']) && $data['title']) {
+        $title = $data['title'];
       }
 
-      foreach ($roadmaps as $roadmap) {
-        $subbrand = $roadmap->getSubbrand();
-        $collaboration_keyword = json_decode($roadmap->getDescription());
-        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
-
-        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
-          $title = $roadmap->getTitle();
-          $original_title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
-        }
-      }
-      if(!isset($title)) {
-        $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
-      }
-    }
-    else {
-      $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
     }
 
     if ($this->options['link']) {
-      if (isset($original_title)) {
-        return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $original_title, $title);
-      }
-      else {
-        return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);
-      }
+      return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $original_title, $title);
     }
     else {
       return $title;
diff --git a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
new file mode 100644
index 00000000..d25f64d9
--- /dev/null
+++ b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains culturefeed_search_views_helper_collaboration.inc.
+ */
+
+/**
+ * Returns the collaboration data for an event.
+ *
+ * @param \CultuurNet\Search\ActivityStatsExtendedEntity $extended_entity
+ *   The extended entity.
+ * @param view $view
+ *   The view.
+ *
+ * @return array
+ *   The collaboration data.
+ */
+function culturefeed_search_views_helper_collaboration_get_data(
+  \CultuurNet\Search\ActivityStatsExtendedEntity $extended_entity,
+  view $view
+) {
+
+  // First check if there are any collaboration tags used in the view.
+  $collaboration_tags = array_keys(variable_get('culturefeed_entry_ui_custom_collaboration_tags', array()));
+  $keywords = array();
+  if (count($collaboration_tags)) {
+
+    $filters = $view->display_handler->get_option('filters');
+    foreach ($filters as $filter) {
+
+      if (
+        isset($filter['table']) && $filter['table'] == 'cdb_items' &&
+        isset($filter['field']) && $filter['field'] == 'tags' &&
+        isset($filter['keyword']) && is_array($filter['keyword'])
+      ) {
+
+        foreach ($filter['keyword'] as $keyword) {
+
+          if (in_array($keyword['value'], $collaboration_tags)) {
+            $keywords[] = $keyword['value'];
+          }
+
+        }
+
+      }
+
+    }
+
+    // Check the collaboration data for a match.
+    if (count($keywords)) {
+
+      // If there are multiple matches, we take the first one.
+      $keyword = $keywords[0];
+      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
+      $cdb_files = $media->byMediaType('roadmap');
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($cdb_files as $cdb_file) {
+
+        $sub_brand = $cdb_file->getSubbrand();
+        $description = json_decode($cdb_file->getDescription());
+
+        if ($consumer_id == $sub_brand && $keyword == $description->keyword) {
+
+          return array(
+            'copyright' => $cdb_file->getCopyright(),
+            'description' => $description,
+            'title' => $cdb_file->getTitle(),
+          );
+          break;
+
+        }
+
+      }
+    }
+  }
+}

From 4e625d95199d78caff333bd5742d800fe9b17936 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Tue, 12 May 2015 22:49:28 +0200
Subject: [PATCH 187/275] MSS-157 default views

---
 .../culturefeed_entry_ui.views_default.inc    | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)

diff --git a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
index 546044fb..946653fb 100644
--- a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
+++ b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
@@ -180,5 +180,169 @@ function culturefeed_entry_ui_views_default_views() {
 
   $views[$view->name] = $view;
 
+  $collaboration_tags = variable_get('culturefeed_entry_ui_custom_collaboration_tags', array());
+  foreach ($collaboration_tags as $tag) {
+
+    $tag_name = $tag['value'];
+    $tag_machine_name = str_replace(' ', '_', $tag['value']);
+
+    $view = new view();
+    $view->name = 'upcoming_collaboration_' . $tag_machine_name;
+    $view->description = '';
+    $view->tag = 'default';
+    $view->base_table = 'cdb_items';
+    $view->human_name = 'Upcoming collaboration ' . $tag_name;
+    $view->core = 7;
+    $view->api_version = '3.0';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+    /* Display: Master */
+    $handler = $view->new_display('default', 'Master', 'default');
+    $handler->display->display_options['title'] = 'Binnenkort';
+    $handler->display->display_options['use_more_always'] = FALSE;
+    $handler->display->display_options['use_more_text'] = 'meer';
+    $handler->display->display_options['access']['type'] = 'none';
+    $handler->display->display_options['cache']['type'] = 'none';
+    $handler->display->display_options['query']['type'] = 'views_query';
+    $handler->display->display_options['exposed_form']['type'] = 'basic';
+    $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Pas toe';
+    $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Opnieuw instellen';
+    $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorteer op';
+    $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Stijgend';
+    $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Dalend';
+    $handler->display->display_options['pager']['type'] = 'some';
+    $handler->display->display_options['pager']['options']['items_per_page'] = '5';
+    $handler->display->display_options['style_plugin'] = 'default';
+    $handler->display->display_options['row_plugin'] = 'fields';
+    /* Veld: UDB items: Afbeelding */
+    $handler->display->display_options['fields']['picture']['id'] = 'picture';
+    $handler->display->display_options['fields']['picture']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['picture']['field'] = 'picture';
+    $handler->display->display_options['fields']['picture']['label'] = '';
+    $handler->display->display_options['fields']['picture']['element_label_colon'] = FALSE;
+    $handler->display->display_options['fields']['picture']['override'] = 1;
+    $handler->display->display_options['fields']['picture']['width'] = '300';
+    $handler->display->display_options['fields']['picture']['height'] = '300';
+    $handler->display->display_options['fields']['picture']['link'] = 0;
+    /* Veld: UDB items: Titel */
+    $handler->display->display_options['fields']['title']['id'] = 'title';
+    $handler->display->display_options['fields']['title']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['title']['field'] = 'title';
+    $handler->display->display_options['fields']['title']['label'] = '';
+    $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+    $handler->display->display_options['fields']['title']['override'] = 1;
+    $handler->display->display_options['fields']['title']['link'] = 1;
+    /* Veld: UDB items: Short Description */
+    $handler->display->display_options['fields']['description']['id'] = 'description';
+    $handler->display->display_options['fields']['description']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['description']['field'] = 'description';
+    $handler->display->display_options['fields']['description']['label'] = '';
+    $handler->display->display_options['fields']['description']['element_label_colon'] = FALSE;
+    $handler->display->display_options['fields']['description']['override'] = 1;
+    /* Veld: UDB items: Kalendersamenvatting */
+    $handler->display->display_options['fields']['when']['id'] = 'when';
+    $handler->display->display_options['fields']['when']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['when']['field'] = 'when';
+    $handler->display->display_options['fields']['when']['label'] = 'Wanneer';
+    $handler->display->display_options['fields']['when']['element_label_colon'] = FALSE;
+    /* Veld: UDB items: Locatie */
+    $handler->display->display_options['fields']['location']['id'] = 'location';
+    $handler->display->display_options['fields']['location']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['location']['field'] = 'location';
+    $handler->display->display_options['fields']['location']['label'] = 'Waar';
+    $handler->display->display_options['fields']['location']['element_label_colon'] = FALSE;
+    $handler->display->display_options['fields']['location']['show'] = array(
+      'city' => 'city',
+      'title' => 0,
+      'address' => 0,
+    );
+    /* Veld: UDB items: Link */
+    $handler->display->display_options['fields']['link']['id'] = 'link';
+    $handler->display->display_options['fields']['link']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['link']['field'] = 'link';
+    $handler->display->display_options['fields']['link']['label'] = '';
+    $handler->display->display_options['fields']['link']['element_label_colon'] = FALSE;
+    /* Veld: UDB items: Categorie */
+    $handler->display->display_options['fields']['category']['id'] = 'category';
+    $handler->display->display_options['fields']['category']['table'] = 'cdb_items';
+    $handler->display->display_options['fields']['category']['field'] = 'category';
+    $handler->display->display_options['fields']['category']['label'] = '';
+    $handler->display->display_options['fields']['category']['element_label_colon'] = FALSE;
+    $handler->display->display_options['fields']['category']['link'] = 1;
+    /* Filter criterion: UDB items: Labels */
+    $handler->display->display_options['filters']['tags']['id'] = 'tags';
+    $handler->display->display_options['filters']['tags']['table'] = 'cdb_items';
+    $handler->display->display_options['filters']['tags']['field'] = 'tags';
+    $handler->display->display_options['filters']['tags']['operator'] = 'and';
+    $handler->display->display_options['filters']['tags']['group'] = 1;
+    $handler->display->display_options['filters']['tags']['keyword'] = array(
+      0 => array(
+        'value' => $tag_name,
+        'not' => 0,
+      ),
+      1 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      2 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      3 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      4 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      5 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      6 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      7 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      8 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+      9 => array(
+        'value' => '',
+        'not' => 0,
+      ),
+    );
+    /* Filter criterion: UDB items: Zoekopdracht */
+    $handler->display->display_options['filters']['q']['id'] = 'q';
+    $handler->display->display_options['filters']['q']['table'] = 'cdb_items';
+    $handler->display->display_options['filters']['q']['field'] = 'q';
+    $handler->display->display_options['filters']['q']['value'] = $tag_name;
+    $handler->display->display_options['filters']['q']['group'] = 1;
+
+    /* Display: Block */
+    $handler = $view->new_display('block', 'Block', 'block');
+    $translatables['upcoming_collaboration'] = array(
+      t('Master'),
+      t('Binnenkort'),
+      t('meer'),
+      t('Pas toe'),
+      t('Opnieuw instellen'),
+      t('Sorteer op'),
+      t('Stijgend'),
+      t('Dalend'),
+      t('Wanneer'),
+      t('Waar'),
+      t('Block'),
+    );
+
+    $views[$view->name] = $view;
+
+  }
+
   return $views;
 }

From f26ecb7817bafd7bcdcb6b746ee1c0c9b52e31f2 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 13 May 2015 13:03:29 +0200
Subject: [PATCH 188/275] MSS-154 bug fix in views fields for collaboration
 service

---
 .../views_handler_field_cdb_item_picture.inc  | 61 ++++++++++++++++++-
 ...ndler_field_cdb_item_short_description.inc | 32 +++++++++-
 .../views_handler_field_cdb_item_title.inc    | 40 +++++++++++-
 3 files changed, 127 insertions(+), 6 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 422ab3fc..5c6d4bff 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -77,9 +77,49 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     }
 
     $main_picture = '';
+    $alt_pic = FALSE;
 
     if ($this->options['override']) {
-      $main_picture = 'This picture is overriden';
+      $media = $detail->getMedia();
+      $roadmaps = $media->byMediaType('roadmap');
+
+      $parameters = $this->query->getParameters();
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($parameters as $i => $parameter) {
+        $key = $parameter->getKey();
+        $value = $parameter->getValue();
+        if ($key != 'fq' || empty($value) || false === strpos($value, 'keyword')) {
+          unset($parameters[$i]);
+        }
+      }
+
+      // If more filterquery's are defined, take first one.
+      if (count($parameters) > 0) {
+        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      }
+
+      foreach ($roadmaps as $roadmap) {
+        $subbrand = $roadmap->getSubbrand();
+        $collaboration_data = json_decode($roadmap->getDescription());
+        $collaboration_keyword = strtolower($collaboration_data->keyword);
+
+        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+          $picture = $collaboration_data->image;
+          if (isset($picture)) {
+            $alt_pic = TRUE;
+            $main_picture = $picture;
+          }
+        }
+      }
+      if(empty($main_picture)) {
+        $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
+        foreach ($pictures as $picture) {
+          if ($picture->isMain()) {
+            $main_picture = $picture->getHLink();
+          }
+        }
+      }
     }
     else {
       $pictures = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
@@ -98,10 +138,25 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
 
     if (!empty($main_picture)) {
 			if ($this->options['format'] == 'image') {
-				$image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+        if ($alt_pic) {
+          $image = theme('image', array(
+            'path' => $main_picture,
+            'width' => $this->options['width'],
+            'height' => $this->options['height'],
+            )
+          );
+        }
+        else {
+          $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+        }
 			}
 			else if ($this->options['format'] == 'url') {
-				$image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+        if ($alt_pic) {
+          $image = $main_picture;
+        }
+        else {
+          $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+        }
 			}
 
       if ($this->options['link']) {
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index 460efaec..ab78a0f9 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -37,7 +37,37 @@ class views_handler_field_cdb_item_short_description extends views_handler_field
   function render($extended_entity) {
 
     if ($this->options['override']) {
-      $short_description = 'This short description is overriden';
+      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
+      $roadmaps = $media->byMediaType('roadmap');
+
+      $parameters = $this->query->getParameters();
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($parameters as $i => $parameter) {
+        $key = $parameter->getKey();
+        $value = $parameter->getValue();
+        if ($key != 'fq' || empty($value) || false === strpos($value, 'keyword')) {
+          unset($parameters[$i]);
+        }
+      }
+
+      // If more filterquery's are defined, take first one.
+      if (count($parameters) > 0) {
+        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      }
+
+      foreach ($roadmaps as $roadmap) {
+        $subbrand = $roadmap->getSubbrand();
+        $collaboration_keyword = json_decode($roadmap->getDescription());
+        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
+
+        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+          $short_description = $roadmap->getPlainText();
+        }
+      }
+      if(!isset($short_description)) {
+        $short_description = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getShortDescription();
+      }
     }
     else {
       $details = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index e345a019..fa1f9a09 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -45,14 +45,50 @@ class views_handler_field_cdb_item_title extends views_handler_field {
   function render($extended_entity) {
 
     if ($this->options['override']) {
-      $title = 'This title is overriden';
+      $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
+      $roadmaps = $media->byMediaType('roadmap');
+
+      $parameters = $this->query->getParameters();
+      $consumer_id = variable_get('culturefeed_api_application_key');
+
+      foreach ($parameters as $i => $parameter) {
+        $key = $parameter->getKey();
+        $value = $parameter->getValue();
+        if ($key != 'fq' || empty($value) || false === strpos($value, 'keyword') ) {
+          unset($parameters[$i]);
+        }
+      }
+
+      // If more filterquery's are defined, take first one.
+      if (count($parameters) > 0) {
+        $parameter = substr(substr($parameters[0]->getValue(), 10), 0, -1);
+      }
+
+      foreach ($roadmaps as $roadmap) {
+        $subbrand = $roadmap->getSubbrand();
+        $collaboration_keyword = json_decode($roadmap->getDescription());
+        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
+
+        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+          $title = $roadmap->getTitle();
+          $original_title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+        }
+      }
+      if(!isset($title)) {
+        $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+      }
     }
     else {
       $title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
     }
 
     if ($this->options['link']) {
-      return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);
+      if (isset($original_title)) {
+        return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $original_title, $title);
+      }
+      else {
+        return culturefeed_search_detail_l($extended_entity->getType(), $extended_entity->getId(), $title, $title);
+      }
     }
     else {
       return $title;

From 8445cd845ef5cefc188cdaaaee6310f1d79554f2 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 13 May 2015 15:24:53 +0200
Subject: [PATCH 189/275] MSS-154 small bug fixes

---
 .../views_handler_field_cdb_item_picture.inc     | 16 +++++++++-------
 ..._handler_field_cdb_item_short_description.inc | 10 ++++++----
 .../field/views_handler_field_cdb_item_title.inc | 14 ++++++++------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 5c6d4bff..7e232883 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -102,13 +102,15 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       foreach ($roadmaps as $roadmap) {
         $subbrand = $roadmap->getSubbrand();
         $collaboration_data = json_decode($roadmap->getDescription());
-        $collaboration_keyword = strtolower($collaboration_data->keyword);
-
-        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
-          $picture = $collaboration_data->image;
-          if (isset($picture)) {
-            $alt_pic = TRUE;
-            $main_picture = $picture;
+        if (!empty($collaboration_data)) {
+          $collaboration_keyword = strtolower($collaboration_data->keyword);
+
+          if ($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+            $picture = $collaboration_data->image;
+            if (isset($picture)) {
+              $alt_pic = TRUE;
+              $main_picture = $picture;
+            }
           }
         }
       }
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
index ab78a0f9..bc2b7ae8 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_short_description.inc
@@ -58,11 +58,13 @@ class views_handler_field_cdb_item_short_description extends views_handler_field
 
       foreach ($roadmaps as $roadmap) {
         $subbrand = $roadmap->getSubbrand();
-        $collaboration_keyword = json_decode($roadmap->getDescription());
-        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
+        $collaboration_data = json_decode($roadmap->getDescription());
+        if (!empty($collaboration_data)) {
+          $collaboration_keyword = strtolower($collaboration_data->keyword);
 
-        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
-          $short_description = $roadmap->getPlainText();
+          if ($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+            $short_description = $roadmap->getPlainText();
+          }
         }
       }
       if(!isset($short_description)) {
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
index fa1f9a09..6f22ddc9 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_title.inc
@@ -66,12 +66,14 @@ class views_handler_field_cdb_item_title extends views_handler_field {
 
       foreach ($roadmaps as $roadmap) {
         $subbrand = $roadmap->getSubbrand();
-        $collaboration_keyword = json_decode($roadmap->getDescription());
-        $collaboration_keyword = strtolower($collaboration_keyword->keyword);
-
-        if($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
-          $title = $roadmap->getTitle();
-          $original_title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+        $collaboration_data = json_decode($roadmap->getDescription());
+        if (!empty($collaboration_data)) {
+          $collaboration_keyword = strtolower($collaboration_data->keyword);
+
+          if ($consumer_id == $subbrand && $collaboration_keyword == $parameter) {
+            $title = $roadmap->getTitle();
+            $original_title = $extended_entity->getTitle(culturefeed_search_get_preferred_language());
+          }
         }
       }
       if(!isset($title)) {

From 3ed6cbd997d313c001b02e0ef05c595d46a70e98 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 15 May 2015 12:44:58 +0200
Subject: [PATCH 190/275] UIV-1276 fix "Uncaught TypeError: Cannot read
 property 'fbAppId' of undefined"

---
 js/facebook_share.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/js/facebook_share.js b/js/facebook_share.js
index c412c653..b9635773 100644
--- a/js/facebook_share.js
+++ b/js/facebook_share.js
@@ -1,4 +1,13 @@
 (function($) {
+
+  window.fbAsyncInit = function() {
+    FB.init({
+      appId: Drupal.settings.culturefeed.fbAppId,
+      xfbml: true,
+      version: 'v2.1'
+    });
+  };
+
   Drupal.behaviors.culturefeed_calendar_facebook_share = {
     attach: function(context, settings) {
       $('a.facebook-share', context).bind('click', function(e) {
@@ -14,14 +23,6 @@
 
 })(jQuery);
 
-window.fbAsyncInit = function() {
-  FB.init({
-    appId: Drupal.settings.culturefeed.fbAppId,
-    xfbml: true,
-    version: 'v2.1'
-  });
-};
-
 (function(d, s, id) {
   var js, fjs = d.getElementsByTagName(s)[0];
   if (d.getElementById(id)) {

From a70d918e24e49e59fbefdcb5fe9e5f6e88812cbb Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 11:51:48 +0200
Subject: [PATCH 191/275] MSS-151: Pass on configured cdb xml version when
 instantiating search service

---
 .../Drupal/DrupalCultureFeedSearchService.php  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
index 2e9af806..b262a9a2 100644
--- a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
+++ b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
@@ -30,8 +30,22 @@ class DrupalCultureFeedSearchService implements ServiceInterface {
    */
   private function __construct(ConsumerCredentials $consumerCredentials) {
 
-    $endpoint = variable_get('culturefeed_search_api_location', CULTUREFEED_SEARCH_API_LOCATION);
-    $service = new \CultuurNet\Search\Guzzle\Service($endpoint, $consumerCredentials);
+    $endpoint = variable_get(
+      'culturefeed_search_api_location',
+      CULTUREFEED_SEARCH_API_LOCATION
+    );
+
+    $cdbXmlVersion = variable_get(
+      'culturefeed_search_cdb_version',
+      CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION
+    );
+
+    $service = new \CultuurNet\Search\Guzzle\Service(
+      $endpoint,
+      $consumerCredentials,
+      NULL,
+      $cdbXmlVersion
+    );
 
     module_invoke_all('culturefeed_search_service_created', $service);
 

From 45d1a3f92324ddd4da0632fdfa3568cd92b93868 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 11:55:27 +0200
Subject: [PATCH 192/275] MSS-151: Move version configuration field higher up
 in the form, next to the API url setting

---
 culturefeed_search/includes/admin.inc | 28 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/culturefeed_search/includes/admin.inc b/culturefeed_search/includes/admin.inc
index b0b73a6f..f8a94efb 100644
--- a/culturefeed_search/includes/admin.inc
+++ b/culturefeed_search/includes/admin.inc
@@ -17,6 +17,21 @@ function culturefeed_search_admin_settings() {
     '#default_value' => variable_get('culturefeed_search_api_location', CULTUREFEED_SEARCH_API_LOCATION),
   );
 
+  $cdb_xml_versions = array(
+    '3.0',
+    '3.1',
+    '3.2',
+    '3.3',
+  );
+
+  $form['culturefeed_search_cdb_version'] = array(
+    '#default_value' => variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION),
+    '#description' => t('The culturefeed cdb schema version used by the search API.'),
+    '#title' => t('Cdb schema version'),
+    '#type' => 'select',
+    '#options' => array_combine($cdb_xml_versions, $cdb_xml_versions)
+  );
+
   $form['culturefeed_search_api_application_key'] = array(
     '#type' => 'textfield',
     '#title' => t('Application key'),
@@ -35,19 +50,6 @@ function culturefeed_search_admin_settings() {
     '#maxlength' => 40,
   );
 
-  $form['culturefeed_search_cdb_version'] = array(
-    '#default_value' => variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION),
-    '#description' => t('The culturefeed cdb schema version.'),
-    '#title' => t('Cdb schema version'),
-    '#type' => 'select',
-    '#options' => array(
-      '3.0' => '3.0',
-      '3.1' => '3.1',
-      '3.2' => '3.2',
-      '3.3' => '3.3',
-    ),
-  );
-
   return system_settings_form($form);
 
 }

From 1ba2fccdde2542b0ef57031a73d61cb8f42a6126 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 12:14:38 +0200
Subject: [PATCH 193/275] MSS-151: Move handling of the version query parameter
 to Search library

---
 culturefeed_search/culturefeed_search.info    |  3 +-
 culturefeed_search/culturefeed_search.module  | 21 --------------
 culturefeed_search/lib/CdbEventSubscriber.php | 29 -------------------
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 culturefeed_search/lib/CdbEventSubscriber.php

diff --git a/culturefeed_search/culturefeed_search.info b/culturefeed_search/culturefeed_search.info
index d6e8a9ea..ceea3c2a 100644
--- a/culturefeed_search/culturefeed_search.info
+++ b/culturefeed_search/culturefeed_search.info
@@ -3,8 +3,7 @@ description = CultureFeed Search API
 package = CultureFeed
 version = VERSION
 core = 7.x
-
-files[] = lib/CdbEventSubscriber.php
+q
 files[] = lib/Drupal/Import/CultureFeedDomainImport.php
 files[] = lib/Drupal/Import/CultureFeedCityImport.php
 files[] = lib/Drupal/Import/CnapiHeadingImport.php
diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 2f8836f9..5f2c785d 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -16,27 +16,6 @@ define('CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE', 20);
 
 module_load_include('inc', 'culturefeed_search', 'includes/helpers');
 
-/**
- * Implements hook_culturefeed_search_service_created().
- *
- * @param \CultuurNet\Search\Guzzle\Service $service
- *   The service.
- */
-function culturefeed_search_culturefeed_search_service_created($service) {
-
-  // Temporary workaround to set CDB to 3.3
-  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
-
-  if (version_compare($version, '3.3', '>=')) {
-
-    $client_factory = $service->getHttpClientFactory();
-    $client_factory->addSubscriber(new CdbEventSubscriber());
-    $service->setHttpClientFactory($client_factory);
-
-  }
-
-}
-
 /**
  * Returns the cdb schema version number.
  */
diff --git a/culturefeed_search/lib/CdbEventSubscriber.php b/culturefeed_search/lib/CdbEventSubscriber.php
deleted file mode 100644
index f85d36f4..00000000
--- a/culturefeed_search/lib/CdbEventSubscriber.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-class CdbEventSubscriber implements EventSubscriberInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    return array(
-      'request.before_send' => array('onRequestBeforeSend', 255),
-    );
-  }
-
-  /**
-   * Called before a request is sent
-   *
-   * @param Event $event
-   */
-  public function onRequestBeforeSend(Event $event) {
-
-    $request = $event['request'];
-    $request->getQuery()->set('version', '3.3');
-
-  }
-
-}

From 38045cabd39a3cb9fe8f43b64320686e531f152e Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 12:18:03 +0200
Subject: [PATCH 194/275] MSS-151: Remove unused
 culturefeed_search_get_cdb_schema_version_number()

---
 culturefeed_search/culturefeed_search.module | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index 5f2c785d..3418a7d9 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -16,19 +16,6 @@ define('CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE', 20);
 
 module_load_include('inc', 'culturefeed_search', 'includes/helpers');
 
-/**
- * Returns the cdb schema version number.
- */
-function culturefeed_search_get_cdb_schema_version_number() {
-
-  $schema_name = CultureFeed_Cdb_Default::CDB_SCHEME_URL;
-  $pattern = '/(http:\/\/www.cultuurdatabank.com\/XMLSchema\/CdbXSD\/)(.*)(\/FINAL)/';
-  $matches = array();
-  preg_match($pattern, $schema_name, $matches);
-  return $matches[2];
-
-}
-
 /**
  * Implements hook_init().
  */

From 77b849185f9a09118d359c16c9ed6d1f4182c6d0 Mon Sep 17 00:00:00 2001
From: Sander Vleugels <sandervleugels@gmail.com>
Date: Tue, 19 May 2015 13:22:03 +0200
Subject: [PATCH 195/275] MSS-162: created empty module

---
 culturefeed_sitemap/culturefeed_sitemap.info   | 7 +++++++
 culturefeed_sitemap/culturefeed_sitemap.module | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 culturefeed_sitemap/culturefeed_sitemap.info
 create mode 100644 culturefeed_sitemap/culturefeed_sitemap.module

diff --git a/culturefeed_sitemap/culturefeed_sitemap.info b/culturefeed_sitemap/culturefeed_sitemap.info
new file mode 100644
index 00000000..45607d3a
--- /dev/null
+++ b/culturefeed_sitemap/culturefeed_sitemap.info
@@ -0,0 +1,7 @@
+name = CultureFeed Search Sitemap
+description = Creates a sitemap for the events, productions and actors.
+package = CultureFeed
+version = 7.x-1.0
+core = 7.x
+
+dependencies[] = culturefeed_search
diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
new file mode 100644
index 00000000..9a43ecc1
--- /dev/null
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -0,0 +1,5 @@
+<?php
+/**
+ * @file
+ * Creates a sitemap for the events, productions and actors.
+ */

From afaf53f564798f4611ef3647356dff65120f6e08 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 13:23:15 +0200
Subject: [PATCH 196/275] MSS-151: Add setting for main culturefeed cdb version
 (used by Entry API)

---
 culturefeed.admin.inc                 |  9 +++++++++
 culturefeed.helpers.inc               | 15 +++++++++++++++
 culturefeed.module                    |  2 ++
 culturefeed_search/includes/admin.inc | 10 ++--------
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/culturefeed.admin.inc b/culturefeed.admin.inc
index 7e5f6d08..de0913d6 100644
--- a/culturefeed.admin.inc
+++ b/culturefeed.admin.inc
@@ -41,6 +41,15 @@ function culturefeed_admin_settings() {
     '#default_value' => variable_get('culturefeed_entry_api_path', CULTUREFEED_ENTRY_API_PATH),
   );
 
+  $cdb_xml_versions = culturefeed_cdb_xml_versions();
+  $form['culturefeed_cdb_version'] = array(
+    '#default_value' => variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION),
+    '#description' => t('The culturefeed cdb schema version used by the entry API.'),
+    '#title' => t('Cdb schema version'),
+    '#type' => 'select',
+    '#options' => array_combine($cdb_xml_versions, $cdb_xml_versions),
+  );
+
   $form['culturefeed_http_client_timeout'] = array(
     '#type' => 'textfield',
     '#title' => t('HTTP client timeout'),
diff --git a/culturefeed.helpers.inc b/culturefeed.helpers.inc
index 079a34fc..ebf3c932 100644
--- a/culturefeed.helpers.inc
+++ b/culturefeed.helpers.inc
@@ -442,3 +442,18 @@ function culturefeed_ajax_command_goto($url) {
   );
 }
 
+/**
+ * Known versions of cdb xml.
+ *
+ * @return array
+ */
+function culturefeed_cdb_xml_versions() {
+  $cdb_xml_versions = array(
+    '3.0',
+    '3.1',
+    '3.2',
+    '3.3',
+  );
+
+  return $cdb_xml_versions;
+}
diff --git a/culturefeed.module b/culturefeed.module
index 1ddd3dee..8fefdf31 100644
--- a/culturefeed.module
+++ b/culturefeed.module
@@ -13,6 +13,8 @@ define('CULTUREFEED_GOOGLE_MAPS_JS_API', 'https://maps.googleapis.com/maps/api/j
 
 define('CULTUREFEED_IMAGES_MAX_SIZE', 2097152);
 
+define('CULTUREFEED_CDB_DEFAULT_VERSION', '3.2');
+
 /**
  * Implements hook_init().
  */
diff --git a/culturefeed_search/includes/admin.inc b/culturefeed_search/includes/admin.inc
index f8a94efb..cffe89cb 100644
--- a/culturefeed_search/includes/admin.inc
+++ b/culturefeed_search/includes/admin.inc
@@ -17,19 +17,13 @@ function culturefeed_search_admin_settings() {
     '#default_value' => variable_get('culturefeed_search_api_location', CULTUREFEED_SEARCH_API_LOCATION),
   );
 
-  $cdb_xml_versions = array(
-    '3.0',
-    '3.1',
-    '3.2',
-    '3.3',
-  );
-
+  $cdb_xml_versions = culturefeed_cdb_xml_versions();
   $form['culturefeed_search_cdb_version'] = array(
     '#default_value' => variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION),
     '#description' => t('The culturefeed cdb schema version used by the search API.'),
     '#title' => t('Cdb schema version'),
     '#type' => 'select',
-    '#options' => array_combine($cdb_xml_versions, $cdb_xml_versions)
+    '#options' => array_combine($cdb_xml_versions, $cdb_xml_versions),
   );
 
   $form['culturefeed_search_api_application_key'] = array(

From b99d5a2706680c9b56e94a643aef45e1ce440ae1 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 14:23:25 +0200
Subject: [PATCH 197/275] MSS-151: Pass cdb xml version to Entry

---
 composer.lock                             | 70 +++++++++++------------
 lib/Drupal/DrupalCultureFeed_EntryApi.php |  6 +-
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/composer.lock b/composer.lock
index 576742d8..18dde0af 100644
--- a/composer.lock
+++ b/composer.lock
@@ -92,16 +92,16 @@
         },
         {
             "name": "cultuurnet/culturefeed-php",
-            "version": "v1.4.0",
+            "version": "v1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/culturefeed-php.git",
-                "reference": "7e01319cf7f2f0f322852f9fc8fce4bb54aeb264"
+                "reference": "f7dba430982fb9538747a92eea4ee2dc35e038d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/culturefeed-php/zipball/7e01319cf7f2f0f322852f9fc8fce4bb54aeb264",
-                "reference": "7e01319cf7f2f0f322852f9fc8fce4bb54aeb264",
+                "url": "https://api.github.com/repos/cultuurnet/culturefeed-php/zipball/f7dba430982fb9538747a92eea4ee2dc35e038d8",
+                "reference": "f7dba430982fb9538747a92eea4ee2dc35e038d8",
                 "shasum": ""
             },
             "require": {
@@ -154,20 +154,20 @@
                 }
             ],
             "description": "Culturefeed PHP library",
-            "time": "2015-03-12 11:55:14"
+            "time": "2015-05-04 15:35:41"
         },
         {
             "name": "cultuurnet/search",
-            "version": "v1.1.0",
+            "version": "v1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/Search.git",
-                "reference": "773c8cbb26e358ad0f1a0e45e9d81957dc42d167"
+                "reference": "048ad13ac386c3676dd3236c064f4184a10c1d73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/Search/zipball/773c8cbb26e358ad0f1a0e45e9d81957dc42d167",
-                "reference": "773c8cbb26e358ad0f1a0e45e9d81957dc42d167",
+                "url": "https://api.github.com/repos/cultuurnet/Search/zipball/048ad13ac386c3676dd3236c064f4184a10c1d73",
+                "reference": "048ad13ac386c3676dd3236c064f4184a10c1d73",
                 "shasum": ""
             },
             "require": {
@@ -200,7 +200,7 @@
                 "Apache-2.0"
             ],
             "description": "CultuurNet search service",
-            "time": "2014-10-22 07:19:56"
+            "time": "2015-04-24 10:53:19"
         },
         {
             "name": "guzzle/common",
@@ -612,16 +612,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "1.3.7",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "87b54b460febed69726c781ab67462084e97a105"
+                "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105",
-                "reference": "87b54b460febed69726c781ab67462084e97a105",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2465fe486c864e30badaa4d005ebdf89dbc503f3",
+                "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3",
                 "shasum": ""
             },
             "require": {
@@ -674,21 +674,21 @@
                 "json",
                 "schema"
             ],
-            "time": "2014-08-25 02:48:14"
+            "time": "2015-03-27 16:41:39"
         },
         {
             "name": "symfony/console",
-            "version": "v2.6.5",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "53f86497ccd01677e22435cfb7262599450a90d1"
+                "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/53f86497ccd01677e22435cfb7262599450a90d1",
-                "reference": "53f86497ccd01677e22435cfb7262599450a90d1",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/ebc5679854aa24ed7d65062e9e3ab0b18a917272",
+                "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272",
                 "shasum": ""
             },
             "require": {
@@ -721,32 +721,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-03-13 17:37:22"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.6.5",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/EventDispatcher",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284"
+                "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/70f7c8478739ad21e3deef0d977b38c77f1fb284",
-                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02",
+                "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02",
                 "shasum": ""
             },
             "require": {
@@ -780,18 +780,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-03-13 17:37:22"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-02 15:18:45"
         }
     ],
     "packages-dev": [
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index 243c8ba2..a443fb3c 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -15,9 +15,11 @@ public static function getInstance($token, $secret, $application_key = NULL, $sh
     $endpoint = variable_get('culturefeed_api_location', CULTUREFEED_API_LOCATION);
     $endpoint .= variable_get('culturefeed_entry_api_path', CULTUREFEED_ENTRY_API_PATH);
 
+    $cdb_xml_version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);;
+
     $oauth_client = self::getOAuthClient($endpoint, $token, $secret, $application_key, $shared_secret);
 
-    return new CultureFeed_EntryApi($oauth_client);
+    return new CultureFeed_EntryApi($oauth_client, $cdb_xml_version);
 
   }
 
@@ -248,4 +250,4 @@ public static function checkPermission($userid, $email, $ids) {
     return $parsed_permissons;
   }
 
-}
\ No newline at end of file
+}

From c44e3a9a313e357f9c4283e73d250499bace418e Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 14:47:47 +0200
Subject: [PATCH 198/275] MSS-151: Move handling of the version query parameter
 to Search library

---
 culturefeed_search/culturefeed_search.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_search/culturefeed_search.info b/culturefeed_search/culturefeed_search.info
index ceea3c2a..f6fcbcc7 100644
--- a/culturefeed_search/culturefeed_search.info
+++ b/culturefeed_search/culturefeed_search.info
@@ -3,7 +3,7 @@ description = CultureFeed Search API
 package = CultureFeed
 version = VERSION
 core = 7.x
-q
+
 files[] = lib/Drupal/Import/CultureFeedDomainImport.php
 files[] = lib/Drupal/Import/CultureFeedCityImport.php
 files[] = lib/Drupal/Import/CnapiHeadingImport.php

From e605cbc2074ddc95e5d25e4db9ff0fb140bcecf4 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 19 May 2015 15:15:16 +0200
Subject: [PATCH 199/275] MSS-158 adding descriptions for fields

---
 culturefeed_content/culturefeed_content.module | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index 7a16f6e2..8ca84404 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -197,6 +197,7 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
     '#default_value' => $filter_query,
     '#required' => $element['#required'],
     '#title' => t('Filter query'),
+    '#description' => t('Please use SOLR filter query (fq). You can use advanced combinations with AND, OR, double quotes (exact match), and wildcards (*)'),
     '#type' => 'textfield',
   );
 
@@ -204,6 +205,7 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
     '#default_value' => $query_string,
     '#required' => $element['#required'],
     '#title' => t('Query string'),
+    '#description' => t('Free text search, used for the SOLR query (q) parameter'),
     '#type' => 'textfield',
   );
 
@@ -211,6 +213,7 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
     '#default_value' => $rows,
     '#required' => $element['#required'],
     '#title' => t('Rows'),
+    '#description' => t('Number of results to show, defaults on "50"'),
     '#type' => 'textfield',
   );
 
@@ -218,6 +221,7 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
     '#default_value' => $sort,
     '#required' => $element['#required'],
     '#title' => t('Sort'),
+    '#description' => t('How to sort the results, defaults on "permanent asc,availableto asc,weight desc"'),
     '#type' => 'textfield',
   );
 

From ef211dcb0d30501c1e057a55393304fcf39eee42 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 15:47:33 +0200
Subject: [PATCH 200/275] MSS-159: Bring back in line with MSS-151 changes

---
 culturefeed_entry_ui/culturefeed_entry_ui.module          | 2 +-
 .../includes/culturefeed_entry_ui.admin.inc               | 2 +-
 .../includes/culturefeed_entry_ui.pages.inc               | 6 ++----
 .../includes/form/culturefeed_entry_ui.tags.inc           | 4 ++--
 lib/Drupal/DrupalCultureFeed_EntryApi.php                 | 8 ++++----
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index ce86f07a..893f2928 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -67,7 +67,7 @@ function culturefeed_entry_ui_menu() {
     'argument' => 'culturefeed_entry_ui_edit_tags_form',
     'file' => 'includes/culturefeed_entry_ui.pages.inc',
   );
-  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
+  $version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
   if (version_compare($version, '3.3', '>=')) {
     $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
     $tags_form['file'] = 'includes/form/culturefeed_entry_ui.tag_objects.inc';
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
index 78b80154..be847f3a 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.admin.inc
@@ -17,7 +17,7 @@ function culturefeed_entry_ui_settings_form($form, &$form_state) {
     $language_options[$language->language] = $language->name;
   }
 
-  $cdb_version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
+  $cdb_version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
 
   $form['culturefeed_entry_ui_preferred_language'] = array(
     '#title' => t('Preferred language'),
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 5d8f6c61..137a184b 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2000,16 +2000,14 @@ function _culturefeed_entry_ui_ui_event_form_save_event($form, &$form_state, Cul
   $form_state['submit_time'] = time();
 
   try {
-
-    $cdb_version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
     if ($update) {
-      Drupalculturefeed_EntryApi::updateEvent($event, $cdb_version);
+      Drupalculturefeed_EntryApi::updateEvent($event);
       $form_state['#event_id'] = $event->getCdbId();
       watchdog('culturefeed_entry_ui', 'Event %eventid updated.', array('%eventid' => $form_state['#event_id']));
       cache_clear_all('culturefeed:results:detail:event:' . $event->getCdbId(), 'cache_culturefeed_search');
     }
     else {
-      $form_state['#event_id'] = Drupalculturefeed_EntryApi::createEvent($event, $cdb_version);
+      $form_state['#event_id'] = Drupalculturefeed_EntryApi::createEvent($event);
       watchdog('culturefeed_entry_ui', 'Event %eventid created.', array('%eventid' => $form_state['#event_id']));
     }
 
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
index 3129d7d1..fe78383d 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
@@ -16,7 +16,7 @@
  */
 function culturefeed_entry_ui_tags_form(array &$form, array &$form_state, \CultureFeed_Cdb_Item_Event $event = NULL) {
 
-  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
+  $version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
   if (version_compare($version, '3.3', '>=')) {
 
     // Default values.
@@ -78,7 +78,7 @@ function culturefeed_entry_ui_tags_form(array &$form, array &$form_state, \Cultu
  */
 function culturefeed_entry_ui_tags_form_save(\CultureFeed_Cdb_Item_Event &$event, array $form_state) {
 
-  $version = variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION);
+  $version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
   if (version_compare($version, '3.3', '>=')) {
 
     $tags = $form_state['values']['tags'];
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index 00dc76fd..d5ee2a63 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -47,8 +47,8 @@ public static function getProduction($id) {
   /**
    * @see CultureFeed_EntryApi::createEvent()
    */
-  public static function createEvent(CultureFeed_Cdb_Item_Event $event, $cdb_schema_version = NULL) {
-    return self::getLoggedInUserInstance()->createEvent($event, $cdb_schema_version);
+  public static function createEvent(CultureFeed_Cdb_Item_Event $event) {
+    return self::getLoggedInUserInstance()->createEvent($event);
   }
 
   /**
@@ -68,8 +68,8 @@ public static function createProduction(CultureFeed_Cdb_Item_Production $product
   /**
    * @see CultureFeed_EntryApi::updateEvent()
    */
-  public static function updateEvent(CultureFeed_Cdb_Item_Event $event, $cdb_schema_version = NULL) {
-    self::getLoggedInUserInstance()->updateEvent($event, $cdb_schema_version);
+  public static function updateEvent(CultureFeed_Cdb_Item_Event $event) {
+    self::getLoggedInUserInstance()->updateEvent($event);
   }
 
   /**

From a017ee68ca46db33f979ddd46148bab94b884b29 Mon Sep 17 00:00:00 2001
From: Sander Vleugels <sandervleugels@gmail.com>
Date: Tue, 19 May 2015 16:44:24 +0200
Subject: [PATCH 201/275] MSS-162: adding menu callbacks and page functions

---
 .../culturefeed_sitemap.module                | 170 ++++++++++++++++++
 1 file changed, 170 insertions(+)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 9a43ecc1..54ef2b9b 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -3,3 +3,173 @@
  * @file
  * Creates a sitemap for the events, productions and actors.
  */
+
+/**
+ * Implements hook_menu().
+ */
+function culturefeed_sitemap_menu() {
+  $items = array();
+
+  $sitemap_types = array('events', 'productions', 'actors');
+
+  $items['sitemap.xml'] = array(
+    'access callback' => TRUE,
+    'page callback' => 'culturefeed_sitemap_get_main_sitemap',
+    'page arguments' => array($sitemap_types),
+    'type' => MENU_CALLBACK,
+  );
+
+  foreach ($sitemap_types as $sitemap_type) {
+    $subtypes = culturefeed_sitemap_get_subtypes($sitemap_type);
+    $items['sitemap-' . $sitemap_type . '.xml'] = array(
+      'access callback' => TRUE,
+      'page callback' => 'culturefeed_sitemap_get_variable_sitemap',
+      'page arguments' => array($sitemap_type),
+      'type' => MENU_CALLBACK,
+    );
+    foreach ($subtypes as $subtype_id => $subtype_name) {
+      $subtype_name = drupal_html_class(strtolower($subtype_name));
+      $items['sitemap-' . $sitemap_type . '-' . $subtype_name . '.xml'] = array(
+        'access callback' => TRUE,
+        'page callback' => 'culturefeed_sitemap_get_variable_sitemap',
+        'page arguments' => array($sitemap_type, $subtype_id),
+        'type' => MENU_CALLBACK,
+      );
+    }
+  }
+
+  return $items;
+}
+
+function culturefeed_sitemap_get_subtypes($type) {
+  switch ($type) {
+    case 'events':
+      return culturefeed_search_get_eventtype_categories();
+      break;
+
+    case 'actors':
+      return culturefeed_search_get_actortype_categories();
+      break;
+
+    default:
+      return array();
+  }
+}
+
+function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
+  $sitemap_links = array();
+
+  foreach ($sitemap_types as $sitemap_type) {
+    $sitemap_links[] = array(
+      'loc' => url('sitemap-' . $sitemap_type . '.xml', array('absolute' => TRUE)),
+    );
+  }
+
+  return culturefeed_sitemap_get_sitemap_xml_from_links_array($sitemap_links);
+}
+
+function culturefeed_sitemap_get_variable_sitemap($type, $subtype = NULL) {
+  $sitemap_links = array();
+  dpm($subtype);
+
+  switch ($type) {
+    case 'events':
+      if ($subtype) {
+        $sitemap_links = culturefeed_sitemap_get_event_subtype_items($subtype);
+      }
+      else {
+        $sitemap_links = culturefeed_sitemap_get_subtype_links($type);
+      }
+      break;
+
+    case 'actors':
+      if ($subtype) {
+        $sitemap_links = culturefeed_sitemap_get_actor_subtype_items($subtype);
+      }
+      else {
+        $sitemap_links = culturefeed_sitemap_get_subtype_links($type);
+      }
+      break;
+
+    case 'productions':
+      $sitemap_links = array('get_production_links');
+      break;
+  }
+
+  return culturefeed_sitemap_get_sitemap_xml_from_links_array($sitemap_links);
+}
+
+function culturefeed_sitemap_get_subtype_links($type) {
+  $sitemap_links = array();
+
+  foreach (culturefeed_sitemap_get_subtypes($type) as $subtype_id => $subtype_name) {
+    $sitemap_links[] = array(
+      'loc' => url('sitemap-' . $type . '-' . drupal_html_class(strtolower($subtype_name)) . '.xml', array('absolute' => TRUE)),
+    );
+  }
+
+  return $sitemap_links;
+}
+
+function culturefeed_sitemap_get_sitemap_xml_from_links_array(array $links) {
+  return '<pre>' . print_r($links, TRUE) . '</pre>';
+}
+
+function culturefeed_sitemap_get_event_subtype_items($subtype) {
+  $parameters = array();
+  $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
+  $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
+  $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event');
+  $parameters[] = new \CultuurNet\Search\Parameter\Group('true');
+  $parameters[] = new \CultuurNet\Search\Parameter\Sort('creationdate', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
+
+  // Execute search.
+  $items = array();
+  $sitemap_links = array();
+
+  try {
+    $result = culturefeed_get_search_service()->search($parameters);
+    $items = $result->getItems();
+
+    foreach ($items as $item) {
+      $sitemap_links[] = array(
+        'loc' => culturefeed_search_detail_url($item->getType(), $item->getId(), $item->getTitle(culturefeed_search_get_preferred_language()), array('absolute' => TRUE)),
+      );
+    }
+
+    return $sitemap_links;
+  }
+  catch (Exception $e) {
+    watchdog_exception('Culturefeed Search Sitemap', $e);
+    return array();
+  }
+}
+
+function culturefeed_sitemap_get_actor_subtype_items($subtype) {
+  $parameters = array();
+  $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
+  $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
+  $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:actor');
+
+  dpm($subtype, 'actor with subtype');
+  // Execute search.
+  $items = array();
+  $sitemap_links = array();
+
+  try {
+    $result = culturefeed_get_search_service()->search($parameters);
+    $items = $result->getItems();
+
+    foreach ($items as $item) {
+      $sitemap_links[] = array(
+        'loc' => culturefeed_search_detail_url('actor', $item->getId(), $item->getTitle(culturefeed_search_get_preferred_language())),
+      );
+    }
+
+    return $sitemap_links;
+  }
+  catch (Exception $e) {
+    watchdog_exception('Culturefeed Search Sitemap', $e);
+    return array();
+  }
+}

From 2ae752dd7190b7b2fcfa7bff443b0e75474e65dd Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 16:54:32 +0200
Subject: [PATCH 202/275] MSS-159: Bring back in line with MSS-151

---
 .../form/culturefeed_entry_ui.collaboration.inc   | 13 +++++++------
 .../culturefeed_entry_ui.collaboration.inc        |  6 +++---
 lib/Drupal/DrupalCultureFeed_EntryApi.php         | 15 ++++++---------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
index 3d541864..40879332 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
@@ -224,14 +224,15 @@ function culturefeed_entry_ui_edit_collaboration_data_form_submit(array &$form,
         'article' => $collaboration['article'],
       ));
 
-      Drupalculturefeed_EntryApi::addLinkToEvent(
+      /** @var CultureFeed_EntryApi $entryApi */
+      $entryApi = Drupalculturefeed_EntryApi::getLoggedInUserInstance();
+
+      $entryApi->addCollaborationLinkToEvent(
         $event,
-        '',
-        CultureFeed_Cdb_Data_File::MEDIA_TYPE_ROADMAP,
-        culturefeed_get_preferred_language(),
+        culturefeed_entry_ui_get_preferred_language(),
+        $plain_text,
         $title,
         $copyright,
-        $plain_text,
         $consumer_key,
         $description
       );
@@ -251,7 +252,7 @@ function culturefeed_entry_ui_edit_collaboration_data_form_submit(array &$form,
       $keywords = array(
         $keyword => new CultureFeed_Cdb_Data_Keyword($keyword, FALSE),
       );
-      Drupalculturefeed_EntryApi::addTagToEvent($event, $keywords);
+      $entryApi->addTagToEvent($event, $keywords);
 
     }
 
diff --git a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
index 0b40f0f5..005ebe10 100644
--- a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
@@ -25,11 +25,11 @@ function culturefeed_entry_ui_collaboration_get_data_by_keyword(\CultureFeed_Cdb
   $consumer_key = variable_get('culturefeed_api_application_key', '');
 
   /* @var \CultureFeed_Cdb_Data_EventDetail $event_details */
-  $event_details = $event->getDetails()->current();
-  $event->getDetails()->rewind();
+  $event_details = $event->getDetails()->getDetailByLanguage(
+    culturefeed_entry_ui_get_preferred_language()
+  );
 
   if ($event_details) {
-
     $media_links = $event_details->getMedia()->byMediaTypes(array(CultureFeed_Cdb_Data_File::MEDIA_TYPE_ROADMAP));
     foreach ($media_links as $link) {
 
diff --git a/lib/Drupal/DrupalCultureFeed_EntryApi.php b/lib/Drupal/DrupalCultureFeed_EntryApi.php
index d5ee2a63..237d0ac4 100644
--- a/lib/Drupal/DrupalCultureFeed_EntryApi.php
+++ b/lib/Drupal/DrupalCultureFeed_EntryApi.php
@@ -55,7 +55,7 @@ public static function createEvent(CultureFeed_Cdb_Item_Event $event) {
    * @see CultureFeed_EntryApi::createActor()
    */
   public static function createActor(CultureFeed_Cdb_Item_Actor $actor) {
-    return self::getLoggedInUserInstance()->createActor($event);
+    return self::getLoggedInUserInstance()->createActor($actor);
   }
 
   /**
@@ -126,25 +126,22 @@ public static function removeTagFromEvent(CultureFeed_Cdb_Item_Event $event, $ke
    */
   public static function addLinkToEvent(
     CultureFeed_Cdb_Item_Event $event,
-    $link = '',
-    $linktype = '',
+    $link,
+    $linkType = '',
     $lang = '',
     $title = '',
     $copyright = '',
-    $plaintext = '',
-    $subbrand = '',
+    $subBrand = '',
     $description = ''
   ) {
-
     self::getLoggedInUserInstance()->addLinkToEvent(
       $event,
       $link,
-      $linktype,
+      $linkType,
       $lang,
       $title,
       $copyright,
-      $plaintext,
-      $subbrand,
+      $subBrand,
       $description
     );
 

From 1b137673373bdde18ea3a2fae41a354f3dd3910c Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 17:30:54 +0200
Subject: [PATCH 203/275] MSS-159: Also check cdb version used by search &
 entry api before allowing access to new tab

---
 .../culturefeed_entry_ui.module               | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index 893f2928..cb7c87ea 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -68,7 +68,7 @@ function culturefeed_entry_ui_menu() {
     'file' => 'includes/culturefeed_entry_ui.pages.inc',
   );
   $version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
-  if (version_compare($version, '3.3', '>=')) {
+  if (culturefeed_entry_ui_is_capable_of_cdbxml_version_3_3()) {
     $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
     $tags_form['file'] = 'includes/form/culturefeed_entry_ui.tag_objects.inc';
   }
@@ -252,9 +252,28 @@ function culturefeed_entry_ui_manage_tags_access() {
 
 /**
  * Access callback, to check if a user has access to the manage collaboration screen.
+ *
+ * The collaboration screen will only work properly if also the search module
+ * is configured to use cdb xml version 3.3.
  */
 function culturefeed_entry_ui_manage_collaboration_access() {
-  return user_access('manage culturefeed collaborative info');
+  return
+    culturefeed_entry_ui_is_capable_of_cdbxml_version_3_3() &&
+    user_access('manage culturefeed collaborative info');
+}
+
+function culturefeed_entry_ui_is_capable_of_cdbxml_version_3_3() {
+  return
+    version_compare(
+      variable_get('culturefeed_search_cdb_version', CULTUREFEED_SEARCH_CDB_DEFAULT_VERSION),
+      '3.3',
+      '>='
+    ) &&
+    version_compare(
+      variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION),
+      '3.3',
+      '>='
+    );
 }
 
 /**

From 9b54f31ed636d09ba3793549f020dccd176107f2 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 17:31:26 +0200
Subject: [PATCH 204/275] MSS-162: Added sitemap-xml library.

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1cf8bafd..e1cc20fb 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
       "cultuurnet/search": "~1.0",
       "cultuurnet/cdb": "~2.0",
       "cultuurnet/culturefeed-php": "~1.0",
-      "cultuurnet/calendar-summary": "~1.0"
+      "cultuurnet/calendar-summary": "~1.0",
+      "cultuurnet/sitemap-xml": "~0.1"
     },
     "require-dev": {
       "phing/phing": "~2.10"

From abe35528d6676a2181670d5426daa0673a8864e8 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Tue, 19 May 2015 17:42:22 +0200
Subject: [PATCH 205/275] UIV-1239 adding show_term to terms table and use it
 in culturefeed_agenda_block_event_types

---
 culturefeed_agenda/includes/blocks.inc             |  1 +
 culturefeed_search/culturefeed_search.install      | 14 ++++++++++++++
 .../lib/Drupal/Import/CultureFeedDomainImport.php  |  1 +
 3 files changed, 16 insertions(+)

diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
index 6d4ed405..50dd610d 100644
--- a/culturefeed_agenda/includes/blocks.inc
+++ b/culturefeed_agenda/includes/blocks.inc
@@ -504,6 +504,7 @@ function culturefeed_agenda_block_event_types() {
   $query = db_select('culturefeed_search_terms', 'cst');
   $query->fields('cst', array('tid', 'name', 'slug', 'p1'));
   $query->condition("cst.did", "eventtype");
+  $query->condition("cst.show_term", 1);
   $query->condition("cst.language", culturefeed_search_get_preferred_language());
   $db_or = db_or();
   $db_or->condition('cst.tid', $eventtypes, 'IN');
diff --git a/culturefeed_search/culturefeed_search.install b/culturefeed_search/culturefeed_search.install
index dad1ff83..a4b112c1 100644
--- a/culturefeed_search/culturefeed_search.install
+++ b/culturefeed_search/culturefeed_search.install
@@ -67,6 +67,12 @@ function culturefeed_search_schema() {
         'length' => 150,
         'default' => NULL
       ),
+      'show_term' => array(
+        'description' => 'False if the term is a system term',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 1
+      ),
       'slug' => array(
         'description' => 'Slug of the term name.',
         'type' => 'varchar',
@@ -184,6 +190,7 @@ function culturefeed_search_update_7001() {
   $schema = culturefeed_search_schema();
   db_drop_table('culturefeed_search_terms');
   db_create_table('culturefeed_search_terms', $schema['culturefeed_search_terms']);
+  drupal_set_message(t('Culturefeed terms Table reïnstalled. Please run the drush csit again'));
 }
 
 /**
@@ -221,3 +228,10 @@ function culturefeed_search_update_7007() {
   culturefeed_search_update_7003();
 }
 
+/**
+ * Re-creates the culturefeed_search_terms table so it contains the show column.
+ */
+function culturefeed_search_update_7008() {
+  culturefeed_search_update_7001();
+}
+
diff --git a/culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php b/culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php
index 8eb38e86..b8f6cdd1 100644
--- a/culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php
+++ b/culturefeed_search/lib/Drupal/Import/CultureFeedDomainImport.php
@@ -109,6 +109,7 @@ private function importTerms($TermsElement, $pids = array()) {
         'name' => (string) $termAttributes['label'],
         'did' => (string) $termAttributes['domain'],
         'parent' => empty($parentId) ? $parentId : NULL,
+        'show_term' => $termAttributes['show'] == 'true' ? 1 : 0,
         'slug' => culturefeed_search_slug((string) $termAttributes['label'], 128),
       );
 

From dd248f19b1f3f2646858cea4c466fa388c91fa65 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 17:52:53 +0200
Subject: [PATCH 206/275]  MSS-159: Also check cdb version used by search &
 entry api before allowing access to cdb xml 3.3 features of keywords

---
 culturefeed_entry_ui/culturefeed_entry_ui.module              | 2 +-
 .../includes/form/culturefeed_entry_ui.tags.inc               | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/culturefeed_entry_ui/culturefeed_entry_ui.module b/culturefeed_entry_ui/culturefeed_entry_ui.module
index cb7c87ea..91b9c229 100644
--- a/culturefeed_entry_ui/culturefeed_entry_ui.module
+++ b/culturefeed_entry_ui/culturefeed_entry_ui.module
@@ -67,7 +67,7 @@ function culturefeed_entry_ui_menu() {
     'argument' => 'culturefeed_entry_ui_edit_tags_form',
     'file' => 'includes/culturefeed_entry_ui.pages.inc',
   );
-  $version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
+
   if (culturefeed_entry_ui_is_capable_of_cdbxml_version_3_3()) {
     $tags_form['argument'] = 'culturefeed_entry_ui_edit_tag_objects_form';
     $tags_form['file'] = 'includes/form/culturefeed_entry_ui.tag_objects.inc';
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
index fe78383d..03bbca58 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
@@ -15,9 +15,7 @@
  *   The event.
  */
 function culturefeed_entry_ui_tags_form(array &$form, array &$form_state, \CultureFeed_Cdb_Item_Event $event = NULL) {
-
-  $version = variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION);
-  if (version_compare($version, '3.3', '>=')) {
+  if (culturefeed_entry_ui_is_capable_of_cdbxml_version_3_3()) {
 
     // Default values.
     $keywords = array();

From 57db59262b2c6365ee61bf98b310f5ffe7289784 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 17:55:58 +0200
Subject: [PATCH 207/275] MSS-162: Use SiteMapXmlWriter classes to print the
 actual sitemap xml.

---
 .../culturefeed_sitemap.module                | 59 +++++++++++++++++--
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 54ef2b9b..26d22f1e 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -4,6 +4,12 @@
  * Creates a sitemap for the events, productions and actors.
  */
 
+use CultuurNet\SiteMapXml\SiteMapIndexXmlWriter;
+use CultuurNet\SiteMapXml\SiteMapUrlSetXmlWriter;
+use CultuurNet\SiteMapXml\SiteMapXmlEntry;
+use CultuurNet\SiteMapXml\SiteMapXmlWriterInterface;
+use ValueObjects\Web\Url;
+
 /**
  * Implements hook_menu().
  */
@@ -65,7 +71,8 @@ function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
     );
   }
 
-  return culturefeed_sitemap_get_sitemap_xml_from_links_array($sitemap_links);
+  header("Content-Type:text/xml");
+  culturefeed_sitemap_index_xml($sitemap_links);
 }
 
 function culturefeed_sitemap_get_variable_sitemap($type, $subtype = NULL) {
@@ -96,7 +103,13 @@ function culturefeed_sitemap_get_variable_sitemap($type, $subtype = NULL) {
       break;
   }
 
-  return culturefeed_sitemap_get_sitemap_xml_from_links_array($sitemap_links);
+  header("Content-Type:text/xml");
+  if ($subtype) {
+    culturefeed_sitemap_urlset_xml($sitemap_links);
+  }
+  else {
+    culturefeed_sitemap_index_xml($sitemap_links);
+  }
 }
 
 function culturefeed_sitemap_get_subtype_links($type) {
@@ -111,10 +124,6 @@ function culturefeed_sitemap_get_subtype_links($type) {
   return $sitemap_links;
 }
 
-function culturefeed_sitemap_get_sitemap_xml_from_links_array(array $links) {
-  return '<pre>' . print_r($links, TRUE) . '</pre>';
-}
-
 function culturefeed_sitemap_get_event_subtype_items($subtype) {
   $parameters = array();
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
@@ -173,3 +182,41 @@ function culturefeed_sitemap_get_actor_subtype_items($subtype) {
     return array();
   }
 }
+
+/**
+ * Prints the XML for a urlset sitemap.
+ *
+ * @param array $links
+ */
+function culturefeed_sitemap_urlset_xml(array $links) {
+  $writer = new SiteMapUrlSetXmlWriter();
+  culturefeed_sitemap_xml($writer, $links);
+}
+
+/**
+ * Prints the XML for a sitemap index.
+ *
+ * @param array $links
+ */
+function culturefeed_sitemap_index_xml(array $links) {
+  $writer = new SiteMapIndexXmlWriter();
+  culturefeed_sitemap_xml($writer, $links);
+}
+
+/**
+ * Prints entries to sitemap XML.
+ *
+ * @param SiteMapXmlWriterInterface $writer
+ * @param $links
+ */
+function culturefeed_sitemap_xml(SiteMapXmlWriterInterface $writer, $links) {
+  $writer->open();
+
+  foreach ($links as $link) {
+    $location = Url::fromNative($link['loc']);
+    $entry = new SiteMapXmlEntry($location);
+    $writer->write($entry);
+  }
+
+  $writer->close();
+}

From 891c0a2e62d7e1db6654365dc95726396ce2bf23 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 17:58:07 +0200
Subject: [PATCH 208/275] MSS-162: Moved xml content-type header to the
 function that actually prints the xml.

---
 culturefeed_sitemap/culturefeed_sitemap.module | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 26d22f1e..a7cf77a0 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -71,7 +71,6 @@ function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
     );
   }
 
-  header("Content-Type:text/xml");
   culturefeed_sitemap_index_xml($sitemap_links);
 }
 
@@ -103,7 +102,6 @@ function culturefeed_sitemap_get_variable_sitemap($type, $subtype = NULL) {
       break;
   }
 
-  header("Content-Type:text/xml");
   if ($subtype) {
     culturefeed_sitemap_urlset_xml($sitemap_links);
   }
@@ -210,6 +208,7 @@ function culturefeed_sitemap_index_xml(array $links) {
  * @param $links
  */
 function culturefeed_sitemap_xml(SiteMapXmlWriterInterface $writer, $links) {
+  header("Content-Type:text/xml");
   $writer->open();
 
   foreach ($links as $link) {

From 6ea99a431c692a26b949f836314f03f1f9218c62 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 17:58:26 +0200
Subject: [PATCH 209/275] MSS-162: Removed dpm's.

---
 culturefeed_sitemap/culturefeed_sitemap.module | 2 --
 1 file changed, 2 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index a7cf77a0..6ba801be 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -76,7 +76,6 @@ function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
 
 function culturefeed_sitemap_get_variable_sitemap($type, $subtype = NULL) {
   $sitemap_links = array();
-  dpm($subtype);
 
   switch ($type) {
     case 'events':
@@ -158,7 +157,6 @@ function culturefeed_sitemap_get_actor_subtype_items($subtype) {
   $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
   $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:actor');
 
-  dpm($subtype, 'actor with subtype');
   // Execute search.
   $items = array();
   $sitemap_links = array();

From e88e91473c7b2bf1aa17968204e4af717f490560 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 18:35:55 +0200
Subject: [PATCH 210/275] MSS-162: Reorganized some functions so they're more
 readable.

---
 .../culturefeed_sitemap.module                | 56 +++++++------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 6ba801be..e8b65f88 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -26,18 +26,19 @@ function culturefeed_sitemap_menu() {
   );
 
   foreach ($sitemap_types as $sitemap_type) {
-    $subtypes = culturefeed_sitemap_get_subtypes($sitemap_type);
     $items['sitemap-' . $sitemap_type . '.xml'] = array(
       'access callback' => TRUE,
-      'page callback' => 'culturefeed_sitemap_get_variable_sitemap',
+      'page callback' => 'culturefeed_sitemap_get_subtypes_sitemap',
       'page arguments' => array($sitemap_type),
       'type' => MENU_CALLBACK,
     );
+
+    $subtypes = culturefeed_sitemap_get_subtypes($sitemap_type);
     foreach ($subtypes as $subtype_id => $subtype_name) {
       $subtype_name = drupal_html_class(strtolower($subtype_name));
       $items['sitemap-' . $sitemap_type . '-' . $subtype_name . '.xml'] = array(
         'access callback' => TRUE,
-        'page callback' => 'culturefeed_sitemap_get_variable_sitemap',
+        'page callback' => 'culturefeed_sitemap_get_entries_sitemap',
         'page arguments' => array($sitemap_type, $subtype_id),
         'type' => MENU_CALLBACK,
       );
@@ -74,51 +75,34 @@ function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
   culturefeed_sitemap_index_xml($sitemap_links);
 }
 
-function culturefeed_sitemap_get_variable_sitemap($type, $subtype = NULL) {
+function culturefeed_sitemap_get_subtypes_sitemap($type) {
+  $sitemap_links = array();
+
+  foreach (culturefeed_sitemap_get_subtypes($type) as $subtype_id => $subtype_name) {
+    $sitemap_links[] = array(
+      'loc' => url('sitemap-' . $type . '-' . drupal_html_class(strtolower($subtype_name)) . '.xml', array('absolute' => TRUE)),
+    );
+  }
+
+  culturefeed_sitemap_index_xml($sitemap_links);
+}
+
+function culturefeed_sitemap_get_entries_sitemap($type, $subtype) {
   $sitemap_links = array();
 
   switch ($type) {
     case 'events':
-      if ($subtype) {
-        $sitemap_links = culturefeed_sitemap_get_event_subtype_items($subtype);
-      }
-      else {
-        $sitemap_links = culturefeed_sitemap_get_subtype_links($type);
-      }
+      $sitemap_links = culturefeed_sitemap_get_event_subtype_items($subtype);
       break;
-
     case 'actors':
-      if ($subtype) {
-        $sitemap_links = culturefeed_sitemap_get_actor_subtype_items($subtype);
-      }
-      else {
-        $sitemap_links = culturefeed_sitemap_get_subtype_links($type);
-      }
+      $sitemap_links = culturefeed_sitemap_get_actor_subtype_items($subtype);
       break;
-
     case 'productions':
       $sitemap_links = array('get_production_links');
       break;
   }
 
-  if ($subtype) {
-    culturefeed_sitemap_urlset_xml($sitemap_links);
-  }
-  else {
-    culturefeed_sitemap_index_xml($sitemap_links);
-  }
-}
-
-function culturefeed_sitemap_get_subtype_links($type) {
-  $sitemap_links = array();
-
-  foreach (culturefeed_sitemap_get_subtypes($type) as $subtype_id => $subtype_name) {
-    $sitemap_links[] = array(
-      'loc' => url('sitemap-' . $type . '-' . drupal_html_class(strtolower($subtype_name)) . '.xml', array('absolute' => TRUE)),
-    );
-  }
-
-  return $sitemap_links;
+  culturefeed_sitemap_urlset_xml($sitemap_links);
 }
 
 function culturefeed_sitemap_get_event_subtype_items($subtype) {

From d6bb19f9764367c453cd1ce5c4eb69c01cf9e404 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 18:45:31 +0200
Subject: [PATCH 211/275] MSS-162: Refactored
 culturefeed_sitemap_get_event_subtype_items() and
 culturefeed_sitemap_get_actor_subtype_items() to reduce code duplication.

---
 .../culturefeed_sitemap.module                | 63 ++++++++-----------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index e8b65f88..cf055b91 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -92,10 +92,8 @@ function culturefeed_sitemap_get_entries_sitemap($type, $subtype) {
 
   switch ($type) {
     case 'events':
-      $sitemap_links = culturefeed_sitemap_get_event_subtype_items($subtype);
-      break;
     case 'actors':
-      $sitemap_links = culturefeed_sitemap_get_actor_subtype_items($subtype);
+      $sitemap_links = culturefeed_sitemap_get_subtype_entries($type, $subtype);
       break;
     case 'productions':
       $sitemap_links = array('get_production_links');
@@ -105,53 +103,46 @@ function culturefeed_sitemap_get_entries_sitemap($type, $subtype) {
   culturefeed_sitemap_urlset_xml($sitemap_links);
 }
 
-function culturefeed_sitemap_get_event_subtype_items($subtype) {
+function culturefeed_sitemap_get_subtype_entries($type, $subtype) {
+  // TODO: Filter by subtype, as it is unused?
+
+  // TODO: Use singular version everywhere so we don't need to convert from
+  // plural so singular.
+  $types = array(
+    'events' => 'event',
+    'actors' => 'actor',
+    'productions' => 'production',
+  );
+  $type = $types[$type];
+
   $parameters = array();
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
   $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
-  $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event');
-  $parameters[] = new \CultuurNet\Search\Parameter\Group('true');
+  $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:' . $type);
   $parameters[] = new \CultuurNet\Search\Parameter\Sort('creationdate', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
 
-  // Execute search.
-  $items = array();
-  $sitemap_links = array();
-
-  try {
-    $result = culturefeed_get_search_service()->search($parameters);
-    $items = $result->getItems();
-
-    foreach ($items as $item) {
-      $sitemap_links[] = array(
-        'loc' => culturefeed_search_detail_url($item->getType(), $item->getId(), $item->getTitle(culturefeed_search_get_preferred_language()), array('absolute' => TRUE)),
-      );
-    }
-
-    return $sitemap_links;
-  }
-  catch (Exception $e) {
-    watchdog_exception('Culturefeed Search Sitemap', $e);
-    return array();
+  if ($type == 'event') {
+    $parameters[] = new \CultuurNet\Search\Parameter\Group('true');
   }
-}
-
-function culturefeed_sitemap_get_actor_subtype_items($subtype) {
-  $parameters = array();
-  $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
-  $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
-  $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:actor');
 
   // Execute search.
-  $items = array();
-  $sitemap_links = array();
-
   try {
+    $sitemap_links = array();
     $result = culturefeed_get_search_service()->search($parameters);
     $items = $result->getItems();
 
     foreach ($items as $item) {
+      $type = $item->getType();
+      $id = $item->getId();
+      $title = $item->getTitle(culturefeed_search_get_preferred_language());
+      $options = array();
+
+      if ($type == 'event') {
+        $options['absolute'] = TRUE;
+      }
+
       $sitemap_links[] = array(
-        'loc' => culturefeed_search_detail_url('actor', $item->getId(), $item->getTitle(culturefeed_search_get_preferred_language())),
+        'loc' => culturefeed_search_detail_url($type, $id, $title, $options),
       );
     }
 

From e8dea70d9d8404744cc87e989ed8d438329c84b8 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Tue, 19 May 2015 19:06:17 +0200
Subject: [PATCH 212/275] MSS-162: Took the fact that productions don't have
 any subtypes into account by making the "secondary" sitemap dynamic so it
 either shows subtypes, or all entries.

---
 .../culturefeed_sitemap.module                | 145 ++++++++++++------
 1 file changed, 94 insertions(+), 51 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index cf055b91..df6bcee6 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -16,19 +16,17 @@ use ValueObjects\Web\Url;
 function culturefeed_sitemap_menu() {
   $items = array();
 
-  $sitemap_types = array('events', 'productions', 'actors');
-
   $items['sitemap.xml'] = array(
     'access callback' => TRUE,
-    'page callback' => 'culturefeed_sitemap_get_main_sitemap',
-    'page arguments' => array($sitemap_types),
+    'page callback' => 'culturefeed_sitemap_get_primary_sitemap',
     'type' => MENU_CALLBACK,
   );
 
+  $sitemap_types = culturefeed_sitemap_get_types();
   foreach ($sitemap_types as $sitemap_type) {
     $items['sitemap-' . $sitemap_type . '.xml'] = array(
       'access callback' => TRUE,
-      'page callback' => 'culturefeed_sitemap_get_subtypes_sitemap',
+      'page callback' => 'culturefeed_sitemap_get_secondary_sitemap',
       'page arguments' => array($sitemap_type),
       'type' => MENU_CALLBACK,
     );
@@ -48,6 +46,25 @@ function culturefeed_sitemap_menu() {
   return $items;
 }
 
+/**
+ * Returns the primary types of sitemaps.
+ *
+ * @return array
+ */
+function culturefeed_sitemap_get_types() {
+  return array(
+    'events',
+    'productions',
+    'actors',
+  );
+}
+
+/**
+ * Returns the subtypes (if any) of a specific type.
+ *
+ * @param $type
+ * @return array
+ */
 function culturefeed_sitemap_get_subtypes($type) {
   switch ($type) {
     case 'events':
@@ -63,7 +80,16 @@ function culturefeed_sitemap_get_subtypes($type) {
   }
 }
 
-function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
+/**
+ * Page callback for the primary sitemap.
+ *
+ * This sitemap contains links to the three secondary sitemaps:
+ *   - events
+ *   - actors
+ *   - productions
+ */
+function culturefeed_sitemap_get_primary_sitemap() {
+  $sitemap_types = culturefeed_sitemap_get_types();
   $sitemap_links = array();
 
   foreach ($sitemap_types as $sitemap_type) {
@@ -75,37 +101,39 @@ function culturefeed_sitemap_get_main_sitemap(array $sitemap_types) {
   culturefeed_sitemap_index_xml($sitemap_links);
 }
 
-function culturefeed_sitemap_get_subtypes_sitemap($type) {
-  $sitemap_links = array();
-
-  foreach (culturefeed_sitemap_get_subtypes($type) as $subtype_id => $subtype_name) {
-    $sitemap_links[] = array(
-      'loc' => url('sitemap-' . $type . '-' . drupal_html_class(strtolower($subtype_name)) . '.xml', array('absolute' => TRUE)),
-    );
-  }
-
-  culturefeed_sitemap_index_xml($sitemap_links);
-}
+/**
+ * Page callback for the secondary sitemaps.
+ *
+ * These are either links to sitemaps of subtypes if the type has any subtypes,
+ * or all entries of the type otherwise.
+ *
+ * @param string $type
+ */
+function culturefeed_sitemap_get_secondary_sitemap($type) {
+  $subtypes = culturefeed_sitemap_get_subtypes($type);
+  if (!empty($subtypes)) {
+    $sitemap_links = array();
 
-function culturefeed_sitemap_get_entries_sitemap($type, $subtype) {
-  $sitemap_links = array();
+    foreach ($subtypes as $subtype_id => $subtype_name) {
+      $sitemap_links[] = array(
+        'loc' => url('sitemap-' . $type . '-' . drupal_html_class(strtolower($subtype_name)) . '.xml', array('absolute' => TRUE)),
+      );
+    }
 
-  switch ($type) {
-    case 'events':
-    case 'actors':
-      $sitemap_links = culturefeed_sitemap_get_subtype_entries($type, $subtype);
-      break;
-    case 'productions':
-      $sitemap_links = array('get_production_links');
-      break;
+    culturefeed_sitemap_index_xml($sitemap_links);
+  }
+  else {
+    culturefeed_sitemap_get_entries_sitemap($type);
   }
-
-  culturefeed_sitemap_urlset_xml($sitemap_links);
 }
 
-function culturefeed_sitemap_get_subtype_entries($type, $subtype) {
-  // TODO: Filter by subtype, as it is unused?
-
+/**
+ * Prints a sitemap of entries for a specific type and optionally subtype.
+ *
+ * @param $type
+ * @param null $subtype
+ */
+function culturefeed_sitemap_get_entries_sitemap($type, $subtype = null) {
   // TODO: Use singular version everywhere so we don't need to convert from
   // plural so singular.
   $types = array(
@@ -115,6 +143,39 @@ function culturefeed_sitemap_get_subtype_entries($type, $subtype) {
   );
   $type = $types[$type];
 
+  $sitemap_links = culturefeed_sitemap_get_entries($type, $subtype);
+
+  foreach ($sitemap_links as $index => $sitemap_link) {
+    $linkType = $sitemap_link->getType();
+    $id = $sitemap_link->getId();
+    $title = $sitemap_link->getTitle(culturefeed_search_get_preferred_language());
+    $options = array();
+
+    if ($type == 'event') {
+      $options['absolute'] = TRUE;
+    }
+
+    $sitemap_links[$index] = array(
+      'loc' => culturefeed_search_detail_url($linkType, $id, $title, $options),
+    );
+  }
+
+  culturefeed_sitemap_urlset_xml($sitemap_links);
+}
+
+/**
+ * Returns the 100 latest created entries for an entry type.
+ *
+ * Optionally the entries can be filtered by subtype as well.
+ *
+ * @param string $type
+ * @param string $subtype
+ *
+ * @return CultuurNet\Search\ActivityStatsExtendedEntity[]
+ */
+function culturefeed_sitemap_get_entries($type, $subtype = null) {
+  // TODO: Filter by subtype if provided. (Not the case for productions.)
+
   $parameters = array();
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
   $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
@@ -127,26 +188,8 @@ function culturefeed_sitemap_get_subtype_entries($type, $subtype) {
 
   // Execute search.
   try {
-    $sitemap_links = array();
     $result = culturefeed_get_search_service()->search($parameters);
-    $items = $result->getItems();
-
-    foreach ($items as $item) {
-      $type = $item->getType();
-      $id = $item->getId();
-      $title = $item->getTitle(culturefeed_search_get_preferred_language());
-      $options = array();
-
-      if ($type == 'event') {
-        $options['absolute'] = TRUE;
-      }
-
-      $sitemap_links[] = array(
-        'loc' => culturefeed_search_detail_url($type, $id, $title, $options),
-      );
-    }
-
-    return $sitemap_links;
+    return $result->getItems();
   }
   catch (Exception $e) {
     watchdog_exception('Culturefeed Search Sitemap', $e);

From 6907bf8d339111b841f4ef7072ac0d0e586385a7 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Tue, 19 May 2015 21:20:10 +0200
Subject: [PATCH 213/275] Updating dependencies

---
 composer.json |  6 ++--
 composer.lock | 86 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/composer.json b/composer.json
index 1cf8bafd..f346aa7e 100644
--- a/composer.json
+++ b/composer.json
@@ -4,9 +4,9 @@
     "description": "CultuurNet culturefeed Drupal module",
     "license": "Apache-2.0",
     "require": {
-      "cultuurnet/search": "~1.0",
-      "cultuurnet/cdb": "~2.0",
-      "cultuurnet/culturefeed-php": "~1.0",
+      "cultuurnet/search": "~1.2",
+      "cultuurnet/cdb": "~2.1",
+      "cultuurnet/culturefeed-php": "~1.5",
       "cultuurnet/calendar-summary": "~1.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 18dde0af..1e90baed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a91117300bcda11ea380082e9652a754",
+    "hash": "7e73278254ab3e5ef75fbb23d6f7dc1c",
     "packages": [
         {
             "name": "cultuurnet/auth",
@@ -54,28 +54,67 @@
             "time": "2014-10-28 13:01:49"
         },
         {
-            "name": "cultuurnet/cdb",
-            "version": "v2.0.2",
+            "name": "cultuurnet/calendar-summary",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/cultuurnet/Cdb.git",
-                "reference": "1d0d67517444df548d8787835276b50a21c4eb34"
+                "url": "https://github.com/cultuurnet/calendar-summary.git",
+                "reference": "b91af20bf82e3fbc4fcd677c03df7020bd00e85c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/Cdb/zipball/1d0d67517444df548d8787835276b50a21c4eb34",
-                "reference": "1d0d67517444df548d8787835276b50a21c4eb34",
+                "url": "https://api.github.com/repos/cultuurnet/calendar-summary/zipball/b91af20bf82e3fbc4fcd677c03df7020bd00e85c",
+                "reference": "b91af20bf82e3fbc4fcd677c03df7020bd00e85c",
                 "shasum": ""
             },
+            "require": {
+                "ext-intl": "*"
+            },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "phing/phing": "~2.10",
+                "phpunit/phpunit": "~4.5",
+                "squizlabs/php_codesniffer": "~2.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-release/2.x": "2.x-dev"
+                    "dev-master": "1.0.x-dev",
+                    "dev-develop": "1.1.x-dev"
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "CultuurNet\\CalendarSummary\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "Library to convert a cdbXML input to a readable summary",
+            "time": "2015-05-08 14:46:28"
+        },
+        {
+            "name": "cultuurnet/cdb",
+            "version": "2.1.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cultuurnet/Cdb.git",
+                "reference": "0ad82c83c02bd52e1e0dcfc1176e6967df4d8715"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cultuurnet/Cdb/zipball/0ad82c83c02bd52e1e0dcfc1176e6967df4d8715",
+                "reference": "0ad82c83c02bd52e1e0dcfc1176e6967df4d8715",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.3",
+                "satooshi/php-coveralls": "~0.7"
+            },
+            "type": "library",
             "autoload": {
                 "psr-0": {
                     "CultureFeed_Cdb_": [
@@ -88,27 +127,28 @@
                 "Apache-2.0"
             ],
             "description": "PHP library for hydrating/manipulating CultuurNet's Cdb XML documents",
-            "time": "2015-01-16 15:17:03"
+            "time": "2015-05-19 11:04:57"
         },
         {
             "name": "cultuurnet/culturefeed-php",
-            "version": "v1.4.1",
+            "version": "1.5.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/culturefeed-php.git",
-                "reference": "f7dba430982fb9538747a92eea4ee2dc35e038d8"
+                "reference": "8b44c643afd66acd19bf01150811c51dd43d3364"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/culturefeed-php/zipball/f7dba430982fb9538747a92eea4ee2dc35e038d8",
-                "reference": "f7dba430982fb9538747a92eea4ee2dc35e038d8",
+                "url": "https://api.github.com/repos/cultuurnet/culturefeed-php/zipball/8b44c643afd66acd19bf01150811c51dd43d3364",
+                "reference": "8b44c643afd66acd19bf01150811c51dd43d3364",
                 "shasum": ""
             },
             "require": {
-                "cultuurnet/cdb": "~2.0"
+                "cultuurnet/cdb": "~2.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4.0"
+                "phpunit/phpunit": "~4.4.0",
+                "satooshi/php-coveralls": "~0.7"
             },
             "type": "library",
             "extra": {
@@ -154,11 +194,11 @@
                 }
             ],
             "description": "Culturefeed PHP library",
-            "time": "2015-05-04 15:35:41"
+            "time": "2015-05-19 18:46:34"
         },
         {
             "name": "cultuurnet/search",
-            "version": "v1.1.2",
+            "version": "1.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/Search.git",
@@ -244,7 +284,6 @@
                 "event",
                 "exception"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-08-11 04:32:36"
         },
         {
@@ -302,7 +341,6 @@
                 "http",
                 "http client"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-08-11 04:32:36"
         },
         {
@@ -355,7 +393,6 @@
                 "adapter",
                 "log"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-03-26 17:15:28"
         },
         {
@@ -400,7 +437,6 @@
                 "message",
                 "url"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-02-05 18:29:46"
         },
         {
@@ -450,7 +486,6 @@
                 "Guzzle",
                 "plugin"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-02-07 18:36:58"
         },
         {
@@ -502,7 +537,6 @@
                 "log",
                 "plugin"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-01-08 21:45:39"
         },
         {
@@ -553,7 +587,6 @@
                 "oauth",
                 "plugin"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-04-16 13:26:19"
         },
         {
@@ -607,7 +640,6 @@
                 "component",
                 "stream"
             ],
-            "abandoned": "guzzle/guzzle",
             "time": "2014-05-01 21:36:02"
         },
         {

From 52a76c3ab4be7643e6f0a890b9550ac31e2504cd Mon Sep 17 00:00:00 2001
From: Sander Vleugels <sandervleugels@gmail.com>
Date: Wed, 20 May 2015 10:14:42 +0200
Subject: [PATCH 214/275] MSS-162: filter by subtype and show modified date
 when available

---
 .../culturefeed_sitemap.module                | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index df6bcee6..59169877 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -9,6 +9,7 @@ use CultuurNet\SiteMapXml\SiteMapUrlSetXmlWriter;
 use CultuurNet\SiteMapXml\SiteMapXmlEntry;
 use CultuurNet\SiteMapXml\SiteMapXmlWriterInterface;
 use ValueObjects\Web\Url;
+use ValueObjects\DateTime\Date;
 
 /**
  * Implements hook_menu().
@@ -134,29 +135,19 @@ function culturefeed_sitemap_get_secondary_sitemap($type) {
  * @param null $subtype
  */
 function culturefeed_sitemap_get_entries_sitemap($type, $subtype = null) {
-  // TODO: Use singular version everywhere so we don't need to convert from
-  // plural so singular.
-  $types = array(
-    'events' => 'event',
-    'actors' => 'actor',
-    'productions' => 'production',
-  );
-  $type = $types[$type];
-
   $sitemap_links = culturefeed_sitemap_get_entries($type, $subtype);
 
   foreach ($sitemap_links as $index => $sitemap_link) {
     $linkType = $sitemap_link->getType();
     $id = $sitemap_link->getId();
     $title = $sitemap_link->getTitle(culturefeed_search_get_preferred_language());
-    $options = array();
-
-    if ($type == 'event') {
-      $options['absolute'] = TRUE;
-    }
+    $options = array(
+      'absolute' => TRUE,
+    );
 
     $sitemap_links[$index] = array(
       'loc' => culturefeed_search_detail_url($linkType, $id, $title, $options),
+      'lastmod' => $sitemap_link->getEntity()->getLastUpdated(),
     );
   }
 
@@ -174,13 +165,22 @@ function culturefeed_sitemap_get_entries_sitemap($type, $subtype = null) {
  * @return CultuurNet\Search\ActivityStatsExtendedEntity[]
  */
 function culturefeed_sitemap_get_entries($type, $subtype = null) {
-  // TODO: Filter by subtype if provided. (Not the case for productions.)
+  $types = array(
+    'events' => 'event',
+    'actors' => 'actor',
+    'productions' => 'production',
+  );
+  $type = $types[$type];
 
   $parameters = array();
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
   $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
   $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:' . $type);
-  $parameters[] = new \CultuurNet\Search\Parameter\Sort('creationdate', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
+  $parameters[] = new \CultuurNet\Search\Parameter\Sort('lastupdated', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
+
+  if ($subtype) {
+    $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('category_id' . ':(' . $subtype . ')');
+  }
 
   if ($type == 'event') {
     $parameters[] = new \CultuurNet\Search\Parameter\Group('true');
@@ -230,6 +230,13 @@ function culturefeed_sitemap_xml(SiteMapXmlWriterInterface $writer, $links) {
   foreach ($links as $link) {
     $location = Url::fromNative($link['loc']);
     $entry = new SiteMapXmlEntry($location);
+
+    if (isset($link['lastmod'])) {
+      $dateTime = new \DateTime($link['lastmod']);
+      $entryModified = Date::fromNativeDateTime($dateTime);
+      $entry->setLastModified($entryModified);
+    }
+
     $writer->write($entry);
   }
 

From 9be12e242d1630c29cdb9c9de792f4396dac24d9 Mon Sep 17 00:00:00 2001
From: Sander Vleugels <sandervleugels@gmail.com>
Date: Wed, 20 May 2015 10:16:07 +0200
Subject: [PATCH 215/275] MSS-162: adding module dependencies

---
 culturefeed_sitemap/culturefeed_sitemap.info | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.info b/culturefeed_sitemap/culturefeed_sitemap.info
index 45607d3a..5caa9392 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.info
+++ b/culturefeed_sitemap/culturefeed_sitemap.info
@@ -5,3 +5,4 @@ version = 7.x-1.0
 core = 7.x
 
 dependencies[] = culturefeed_search
+dependencies[] = culturefeed_agenda

From 80faeaecc48aca9e4fe4bbcd9888a26cc4c4f3b2 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Wed, 20 May 2015 11:16:40 +0200
Subject: [PATCH 216/275] MSS-162: Changed variable name from camelCase to use
 underscores.

---
 culturefeed_sitemap/culturefeed_sitemap.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 59169877..53a1d9fd 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -138,7 +138,7 @@ function culturefeed_sitemap_get_entries_sitemap($type, $subtype = null) {
   $sitemap_links = culturefeed_sitemap_get_entries($type, $subtype);
 
   foreach ($sitemap_links as $index => $sitemap_link) {
-    $linkType = $sitemap_link->getType();
+    $link_type = $sitemap_link->getType();
     $id = $sitemap_link->getId();
     $title = $sitemap_link->getTitle(culturefeed_search_get_preferred_language());
     $options = array(
@@ -146,7 +146,7 @@ function culturefeed_sitemap_get_entries_sitemap($type, $subtype = null) {
     );
 
     $sitemap_links[$index] = array(
-      'loc' => culturefeed_search_detail_url($linkType, $id, $title, $options),
+      'loc' => culturefeed_search_detail_url($link_type, $id, $title, $options),
       'lastmod' => $sitemap_link->getEntity()->getLastUpdated(),
     );
   }

From af02ccba769ab7764c351bca227eb145b0d3b316 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Wed, 20 May 2015 11:39:45 +0200
Subject: [PATCH 217/275] MSS-162: Changed default sorting to last created, but
 made it configurable as well.

---
 .../culturefeed_sitemap.module                | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 53a1d9fd..66b91fe5 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -172,11 +172,13 @@ function culturefeed_sitemap_get_entries($type, $subtype = null) {
   );
   $type = $types[$type];
 
+  $sort = culturefeed_sitemap_sort_config();
+
   $parameters = array();
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
   $parameters[] = new \CultuurNet\Search\Parameter\Rows(100);
   $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:' . $type);
-  $parameters[] = new \CultuurNet\Search\Parameter\Sort('lastupdated', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
+  $parameters[] = new \CultuurNet\Search\Parameter\Sort($sort['column'], $sort['direction']);
 
   if ($subtype) {
     $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('category_id' . ':(' . $subtype . ')');
@@ -197,6 +199,28 @@ function culturefeed_sitemap_get_entries($type, $subtype = null) {
   }
 }
 
+/**
+ * Returns sorting configuration.
+ *
+ * @return array
+ *   - column: column to sort
+ *   - direction: asc or desc
+ */
+function culturefeed_sitemap_sort_config() {
+  $column = variable_get('culturefeed_sitemap_sort_field', 'creationdate');
+  $direction = variable_get('culturefeed_sitemap_sort_direction', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
+
+  if ($direction != \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC &&
+      $direction != \CultuurNet\Search\Parameter\Sort::DIRECTION_ASC) {
+    $direction = \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC;
+  }
+
+  return array(
+    'column' => $column,
+    'direction' => $direction,
+  );
+}
+
 /**
  * Prints the XML for a urlset sitemap.
  *

From 32d37a31ec1ecf61a596c71193cd21ccd72d1b30 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Wed, 20 May 2015 11:41:01 +0200
Subject: [PATCH 218/275] MSS-162: Renamed variable for the sort column to be
 more consistent.

---
 culturefeed_sitemap/culturefeed_sitemap.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_sitemap/culturefeed_sitemap.module b/culturefeed_sitemap/culturefeed_sitemap.module
index 66b91fe5..7ed3b536 100644
--- a/culturefeed_sitemap/culturefeed_sitemap.module
+++ b/culturefeed_sitemap/culturefeed_sitemap.module
@@ -207,7 +207,7 @@ function culturefeed_sitemap_get_entries($type, $subtype = null) {
  *   - direction: asc or desc
  */
 function culturefeed_sitemap_sort_config() {
-  $column = variable_get('culturefeed_sitemap_sort_field', 'creationdate');
+  $column = variable_get('culturefeed_sitemap_sort_column', 'creationdate');
   $direction = variable_get('culturefeed_sitemap_sort_direction', \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC);
 
   if ($direction != \CultuurNet\Search\Parameter\Sort::DIRECTION_DESC &&

From 59ae8ecc21719cc726e3148104febc67b217e483 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Wed, 20 May 2015 11:48:48 +0200
Subject: [PATCH 219/275] MSS-162: Use stable 1.0 version of the sitemap-xml
 library instead of the alpha release.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 95bce422..4984d38a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
       "cultuurnet/cdb": "~2.1",
       "cultuurnet/culturefeed-php": "~1.5",
       "cultuurnet/calendar-summary": "~1.0",
-      "cultuurnet/sitemap-xml": "~0.1"
+      "cultuurnet/sitemap-xml": "~1.0"
     },
     "require-dev": {
       "phing/phing": "~2.10"

From c9181aa35928c9ea24065c203ba45e632ddade67 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 20 May 2015 15:06:59 +0200
Subject: [PATCH 220/275] MSS-157 beter image handling and keyword quotes

---
 .../culturefeed_entry_ui.collaboration.inc    | 12 +----
 .../culturefeed_entry_ui.collaboration.inc    | 25 ++++++++++
 .../culturefeed_entry_ui.views_default.inc    | 23 ++++++---
 .../views_handler_field_cdb_item_picture.inc  | 50 +++++++++++++++----
 ...handler_filter_culturefeed_search_tags.inc | 12 ++---
 5 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
index 40879332..675e3204 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.collaboration.inc
@@ -37,17 +37,7 @@ function culturefeed_entry_ui_attach_collaboration_element(array &$form, array $
   $default_image = '';
   if (isset($info['description']['image']) && $info['description']['image']) {
 
-    // See if the image is stored on the local url.
-    $base_path = $GLOBALS['base_url'] . '/' . variable_get('file_public_path', conf_path() . '/files') . '/';
-    $parts = explode($base_path, $info['description']['image']);
-    if (count($parts) == 2 && $parts[1]) {
-
-      $files = entity_load('file', FALSE, array('uri' => 'public://' . $parts[1]));
-      if (!empty($files)) {
-        $default_image = reset($files);
-      }
-
-    }
+    $default_image = culturefeed_entry_ui_collaboration_get_image_from_url($info['description']['image']);
 
     // @codingStandardsIgnoreStart
     // $default_image = system_retrieve_file($info['description']['image'], 'public://uploads/', TRUE);
diff --git a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
index 005ebe10..62909c7e 100644
--- a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
@@ -54,3 +54,28 @@ function culturefeed_entry_ui_collaboration_get_data_by_keyword(\CultureFeed_Cdb
   return $info;
 
 }
+
+/**
+ * Returns the uri for a full image url
+ *
+ * @param string $image
+ *   The image url.
+ *
+ * @return object
+ *   The file object.
+ */
+function culturefeed_entry_ui_collaboration_get_image_from_url($image) {
+
+  // See if the image is stored on the local url.
+  $base_path = $GLOBALS['base_url'] . '/' . variable_get('file_public_path', conf_path() . '/files') . '/';
+  $parts = explode($base_path, $image);
+  if (count($parts) == 2 && $parts[1]) {
+
+    $files = entity_load('file', FALSE, array('uri' => 'public://' . $parts[1]));
+    if (!empty($files)) {
+      return reset($files);
+    }
+
+  }
+
+}
\ No newline at end of file
diff --git a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
index 946653fb..70a270b7 100644
--- a/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
+++ b/culturefeed_entry_ui/views/culturefeed_entry_ui.views_default.inc
@@ -269,6 +269,23 @@ function culturefeed_entry_ui_views_default_views() {
     $handler->display->display_options['fields']['category']['label'] = '';
     $handler->display->display_options['fields']['category']['element_label_colon'] = FALSE;
     $handler->display->display_options['fields']['category']['link'] = 1;
+    /* Sort criterion: UDB items: Gewicht */
+    $handler->display->display_options['sorts']['weight_sort']['id'] = 'weight_sort';
+    $handler->display->display_options['sorts']['weight_sort']['table'] = 'cdb_items';
+    $handler->display->display_options['sorts']['weight_sort']['field'] = 'weight_sort';
+    $handler->display->display_options['sorts']['weight_sort']['order'] = 'DESC';
+    /* Sort criterion: UDB items: Datum */
+    $handler->display->display_options['sorts']['date']['id'] = 'date';
+    $handler->display->display_options['sorts']['date']['table'] = 'cdb_items';
+    $handler->display->display_options['sorts']['date']['field'] = 'date';
+    $handler->display->display_options['sorts']['date']['order'] = 'ASC';
+    /* Filter criterion: UDB items: Datum */
+    $handler->display->display_options['filters']['date']['id'] = 'date';
+    $handler->display->display_options['filters']['date']['table'] = 'cdb_items';
+    $handler->display->display_options['filters']['date']['field'] = 'date';
+    $handler->display->display_options['filters']['date']['group'] = 1;
+    $handler->display->display_options['filters']['date']['option_absolute'] = '1';
+    $handler->display->display_options['filters']['date']['relative_date'] = '+2 weeks';
     /* Filter criterion: UDB items: Labels */
     $handler->display->display_options['filters']['tags']['id'] = 'tags';
     $handler->display->display_options['filters']['tags']['table'] = 'cdb_items';
@@ -317,12 +334,6 @@ function culturefeed_entry_ui_views_default_views() {
         'not' => 0,
       ),
     );
-    /* Filter criterion: UDB items: Zoekopdracht */
-    $handler->display->display_options['filters']['q']['id'] = 'q';
-    $handler->display->display_options['filters']['q']['table'] = 'cdb_items';
-    $handler->display->display_options['filters']['q']['field'] = 'q';
-    $handler->display->display_options['filters']['q']['value'] = $tag_name;
-    $handler->display->display_options['filters']['q']['group'] = 1;
 
     /* Display: Block */
     $handler = $view->new_display('block', 'Block', 'block');
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 4903287a..36512d37 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -119,17 +119,49 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
 
         if ($alt_pic) {
 
-          if ($this->options['width'] >= $this->options['height']) {
-            $image = theme('image', array(
-              'path' => $main_picture,
-              'width' => $this->options['width'],
-            ));
+          if (module_exists('image')) {
+
+            module_load_include('inc', 'culturefeed_entry_ui', 'includes/helpers/culturefeed_entry_ui.collaboration');
+            $file = culturefeed_entry_ui_collaboration_get_image_from_url($main_picture);
+            if ($file) {
+
+              $style = array(
+                'effects' => array(
+                  array(
+                    'effect callback' => 'image_scale_effect',
+                    'data' => array(
+                      'width' => $this->options['width'],
+                      'height' => $this->options['height'],
+                    ),
+                  ),
+                ),
+              );
+              $main_picture = 'public://uploads/derivative_' . $file->filename;
+              file_unmanaged_delete($main_picture);
+              image_style_create_derivative($style, $file->uri, $main_picture);
+              $image = theme('image', array(
+                'path' => $main_picture,
+              ));
+
+            }
+
           }
+
           else {
-            $image = theme('image', array(
-              'path' => $main_picture,
-              'height' => $this->options['height'],
-            ));
+
+            if ($this->options['width'] >= $this->options['height']) {
+              $image = theme('image', array(
+                'path' => $main_picture,
+                'width' => $this->options['width'],
+              ));
+            }
+            else {
+              $image = theme('image', array(
+                'path' => $main_picture,
+                'height' => $this->options['height'],
+              ));
+            }
+
           }
 
         }
diff --git a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
index 9bc485f3..7383a4fe 100644
--- a/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
+++ b/culturefeed_search_views/views/handlers/filter/views_handler_filter_culturefeed_search_tags.inc
@@ -90,13 +90,13 @@ class views_handler_filter_culturefeed_search_tags extends views_handler_filter_
 
 		if ($operator == 'and') {
 			if (!empty($keywords)) {
-				$value_keywords = '(keywords:' . implode(' AND ', $keywords) . ')';
+				$value_keywords = '(keywords:"' . implode('" AND "', $keywords) . '")';
 				$value = $value_keywords;
 			}
 			if (!empty($keywords_inverse)) {
-				$value_inverse_keywords = '(!keywords:' . implode(' AND ', $keywords_inverse) . ')';
+				$value_inverse_keywords = '(!keywords:"' . implode('" AND "', $keywords_inverse) . '")';
 				if (!empty($keywords)) {
-					$value .= ' AND ' . $value_inverse_keywords;
+					$value .= '" AND "' . $value_inverse_keywords;
 				}
 				else {
 					$value = $value_inverse_keywords;
@@ -105,13 +105,13 @@ class views_handler_filter_culturefeed_search_tags extends views_handler_filter_
 		}
 		else if ($operator == 'or') {
 			if (!empty($keywords)) {
-				$value_keywords = '(keywords:' . implode(' OR ', $keywords) . ')';
+				$value_keywords = '(keywords:"' . implode('" OR "', $keywords) . '")';
 				$value = $value_keywords;
 			}
 			if (!empty($keywords_inverse)) {
-				$value_inverse_keywords = '(!keywords:' . implode(' OR ', $keywords_inverse) . ')';
+				$value_inverse_keywords = '(!keywords:"' . implode('" OR "', $keywords_inverse) . '")';
 				if (!empty($keywords)) {
-					$value .= ' OR ' . $value_inverse_keywords;
+					$value .= '" OR "' . $value_inverse_keywords;
 				}
 				else {
 					$value = $value_inverse_keywords;

From 2c8797bb493c109a8b7768c779224ac9cde364ea Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 20 May 2015 21:31:23 +0200
Subject: [PATCH 221/275] UIV-1239 return only show=true terms for
 culturefeed_search_get_categories_by_domain()

---
 culturefeed_search/includes/helpers.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_search/includes/helpers.inc b/culturefeed_search/includes/helpers.inc
index acfbc995..d921728e 100644
--- a/culturefeed_search/includes/helpers.inc
+++ b/culturefeed_search/includes/helpers.inc
@@ -433,6 +433,7 @@ function culturefeed_search_get_categories_by_domain($domain, $conditions = arra
   $query = db_select('culturefeed_search_terms', 'cst');
   $query->fields('cst', array('tid', 'name'));
   $query->condition('cst.did', $domain);
+  $query->condition('cst.show_term', 1);
 
   // Add parent condition.
   if (!empty($conditions['parent'])) {

From c8dcd7ff8a92c9a645b84f149747d86667bf7dd7 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Wed, 20 May 2015 22:28:54 +0200
Subject: [PATCH 222/275] MSS-157 reset original approach

---
 .../views_handler_field_cdb_item_picture.inc  | 60 +++++--------------
 1 file changed, 15 insertions(+), 45 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 36512d37..82f284ff 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -79,7 +79,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     $image = '';
     $main_picture = '';
     $no_main_picture = '';
-    $alt_pic = FALSE;
+    $override_picture = FALSE;
 
     if ($this->options['override']) {
 
@@ -87,7 +87,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       $data = culturefeed_search_views_helper_collaboration_get_data($extended_entity, $this->view);
       if ($data && isset($data['description']->image) && $data['description']->image) {
         $main_picture = $data['description']->image;
-        $alt_pic = TRUE;
+        $override_picture = TRUE;
       }
 
     }
@@ -117,54 +117,24 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
 
       if ($this->options['format'] == 'image') {
 
-        if ($alt_pic) {
-
-          if (module_exists('image')) {
-
-            module_load_include('inc', 'culturefeed_entry_ui', 'includes/helpers/culturefeed_entry_ui.collaboration');
-            $file = culturefeed_entry_ui_collaboration_get_image_from_url($main_picture);
-            if ($file) {
-
-              $style = array(
-                'effects' => array(
-                  array(
-                    'effect callback' => 'image_scale_effect',
-                    'data' => array(
-                      'width' => $this->options['width'],
-                      'height' => $this->options['height'],
-                    ),
-                  ),
-                ),
-              );
-              $main_picture = 'public://uploads/derivative_' . $file->filename;
-              file_unmanaged_delete($main_picture);
-              image_style_create_derivative($style, $file->uri, $main_picture);
-              $image = theme('image', array(
-                'path' => $main_picture,
-              ));
-
-            }
+        // In case of an override.
+        if ($override_picture) {
 
+          if ($this->options['width'] >= $this->options['height'])  {
+            $image = theme('image', array(
+              'path' => $main_picture,
+              'width' => $this->options['width'],
+            ));
           }
-
           else {
-
-            if ($this->options['width'] >= $this->options['height']) {
-              $image = theme('image', array(
-                'path' => $main_picture,
-                'width' => $this->options['width'],
-              ));
-            }
-            else {
-              $image = theme('image', array(
-                'path' => $main_picture,
-                'height' => $this->options['height'],
-              ));
-            }
-
+            $image = theme('image', array(
+              'path' => $main_picture,
+              'height' => $this->options['height'],
+            ));
           }
 
         }
+
         else {
           $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
         }
@@ -174,7 +144,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
 
         if ($this->options['format'] == 'url') {
 
-          if ($alt_pic) {
+          if ($override_picture) {
             $image = $main_picture;
           }
           else {

From a363879600a564c16e21664b271826da1e54a1ec Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Thu, 21 May 2015 10:04:25 +0200
Subject: [PATCH 223/275] Added support for flanders region clean url rewrites

---
 culturefeed_agenda/culturefeed_agenda.module | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index c5b9629c..8700858b 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -811,6 +811,21 @@ function culturefeed_agenda_url_outbound_alter(&$path, &$options, $original_path
       }
     }
 
+    // Rewrite facet on flanders region.
+    if (isset($facets['category_flandersregion_id']) && is_array($facets['category_flandersregion_id']) && isset($facets['category_flandersregion_id'][0])) {
+
+      if (!isset($term_slugs[$facets['category_flandersregion_id'][0]])) {
+        $term_slugs[$facets['category_flandersregion_id'][0]] = db_query('SELECT slug FROM {culturefeed_search_terms} WHERE tid = :tid AND language = :language', array(':tid' => $facets['category_flandersregion_id'][0], ':language' => culturefeed_search_get_preferred_language()))->fetchField();
+      }
+
+      $type = $type ? : 'alle';
+      $path = 'agenda/' . $type . '/' . $term_slugs[$facets['category_flandersregion_id'][0]];
+
+      // Remove the facet.
+      unset($options['query']['facet']['category_flandersregion_id']);
+
+    }
+
     // Rewrite facet on theme.
     if (isset($facets['category_theme_id']) && is_array($facets['category_theme_id']) && isset($facets['category_theme_id'][0])) {
 

From 9ddbeb371b6aff1ffe1668e04622c95a5182d977 Mon Sep 17 00:00:00 2001
From: Sander Vleugels <sandervleugels@gmail.com>
Date: Thu, 21 May 2015 11:01:15 +0200
Subject: [PATCH 224/275] MSS-167: Adding ' (+
 boroughs/deelgemeenten/arrondissments/Stadtgemeinden)' to certain
 autocomplete labels.

---
 culturefeed_search_ui/js/city_facet.js           |  9 +++++++++
 .../js/location_autocomplete.js                  | 16 +++++++++++++++-
 .../translations/culturefeed_search_ui.de.po     |  4 ++++
 .../translations/culturefeed_search_ui.fr.po     |  4 ++++
 .../translations/culturefeed_search_ui.nl.po     |  4 ++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/js/city_facet.js b/culturefeed_search_ui/js/city_facet.js
index f8d6db88..60eab977 100644
--- a/culturefeed_search_ui/js/city_facet.js
+++ b/culturefeed_search_ui/js/city_facet.js
@@ -13,6 +13,15 @@
               if (data.length === 0) {
                 widget.removeClass('throbbing');
               }
+              else {
+                $.each(data, function(index, element) {
+                  if (!(element.label.match(/^\d+/))) {
+                    if (!(element.label.match(/^Provinc|Regio+/))) {
+                      element.label += ' (+ ' + Drupal.t('boroughs') + ')';
+                    }
+                  }
+                });
+              }
               callback(data);
             },
             error: function () {
diff --git a/culturefeed_search_ui/js/location_autocomplete.js b/culturefeed_search_ui/js/location_autocomplete.js
index 5a30cebc..db76c535 100644
--- a/culturefeed_search_ui/js/location_autocomplete.js
+++ b/culturefeed_search_ui/js/location_autocomplete.js
@@ -38,11 +38,16 @@
           }
           // Trigger location search.
           else {
+            if (ui.item.value.indexOf(' (+ ') != -1) {
+              // Reset value and label to remove the boroughs text.
+              ui.item.value = ui.item.suggestion;
+              ui.item.label = ui.item.suggestion;
+            }
             $(this).val(ui.item.suggestion);
           }
 
         },
-        autoFocus: true,
+        autoFocus: true
       });
 
     }
@@ -59,6 +64,15 @@
         if (data.length === 0) {
           widget.removeClass('throbbing');
         }
+        else {
+          $.each(data, function(index, element) {
+            if (element.type == 'city' && !(element.label.match(/^\d+/))) {
+              if (!(element.label.match(/^Provinc|Regio+/))) {
+                element.label += ' (+ ' + Drupal.t('boroughs') + ')';
+              }
+            }
+          });
+        }
         callback(data);
       },
       error: function() {
diff --git a/culturefeed_search_ui/translations/culturefeed_search_ui.de.po b/culturefeed_search_ui/translations/culturefeed_search_ui.de.po
index 9de5c600..f9a9c4df 100644
--- a/culturefeed_search_ui/translations/culturefeed_search_ui.de.po
+++ b/culturefeed_search_ui/translations/culturefeed_search_ui.de.po
@@ -295,3 +295,7 @@ msgid "@range from @count result"
 msgid_plural "@range from @count results"
 msgstr[0] "@range van @count Ergebnis"
 msgstr[1] "@range van @count Ergebnisse"
+
+#: sites/all/modules/culturefeed/culturefeed_search_ui/js/location_autocomplete.js; sites/all/modules/culturefeed/culturefeed_search_ui/js/city_facet.js
+msgid "boroughs"
+msgstr "Stadtgemeinden"
diff --git a/culturefeed_search_ui/translations/culturefeed_search_ui.fr.po b/culturefeed_search_ui/translations/culturefeed_search_ui.fr.po
index 3aaec919..f15345e3 100644
--- a/culturefeed_search_ui/translations/culturefeed_search_ui.fr.po
+++ b/culturefeed_search_ui/translations/culturefeed_search_ui.fr.po
@@ -295,3 +295,7 @@ msgid "@range from @count result"
 msgid_plural "@range from @count results"
 msgstr[0] "résultat @range de @count"
 msgstr[1] "résultats @range de @count"
+
+#: sites/all/modules/culturefeed/culturefeed_search_ui/js/location_autocomplete.js; sites/all/modules/culturefeed/culturefeed_search_ui/js/city_facet.js
+msgid "boroughs"
+msgstr "arrondissements"
diff --git a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
index df979406..96e35081 100644
--- a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
+++ b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
@@ -655,3 +655,7 @@ msgid "@range from @count result"
 msgid_plural "@range from @count results"
 msgstr[0] "@range van @count resultaat"
 msgstr[1] "@range van @count resultaten"
+
+#: sites/all/modules/culturefeed/culturefeed_search_ui/js/location_autocomplete.js; sites/all/modules/culturefeed/culturefeed_search_ui/js/city_facet.js
+msgid "boroughs"
+msgstr "deelgemeenten"

From 42a2c8a41fbc32ca4d3ca32b980edb0aa2127667 Mon Sep 17 00:00:00 2001
From: HnLn <hans.langouche@gmail.com>
Date: Thu, 21 May 2015 11:34:38 +0200
Subject: [PATCH 225/275] MSS-156 rework sort to correspond with agenda search
 page

---
 culturefeed_content/culturefeed_content.info  |  1 +
 .../culturefeed_content.module                | 33 ++++++++++++++++---
 culturefeed_search/culturefeed_search.module  |  5 +++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/culturefeed_content/culturefeed_content.info b/culturefeed_content/culturefeed_content.info
index fb152120..bd1097e0 100644
--- a/culturefeed_content/culturefeed_content.info
+++ b/culturefeed_content/culturefeed_content.info
@@ -4,3 +4,4 @@ package = CultureFeed
 version = VERSION
 core = 7.x
 dependencies[] = culturefeed
+dependencies[] = culturefeed_agenda
diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index 8ca84404..485c2b30 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -6,7 +6,7 @@
  */
 
 define('CULTUREFEED_CONTENT_DEFAULT_ROWS', 50);
-define('CULTUREFEED_CONTENT_DEFAULT_SORT', 'permanent asc,availableto asc,weight desc');
+define('CULTUREFEED_CONTENT_DEFAULT_SORT', 'date');
 
 /**
  * Implements hook_field_create_instance().
@@ -85,7 +85,15 @@ function culturefeed_content_field_formatter_view($entity_type, $entity, $field,
           $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery($filter_query);
         }
 
-        $parameters[] = new \CultuurNet\Search\Parameter\Parameter('sort', $sort);
+        $search_type = culturefeed_get_searchable_type('activiteiten');
+        $sort_options = culturefeed_search_ui_get_sort_options_for_page($search_type);
+        foreach ($sort_options as $option) {
+          if ($option['value'] == $sort) {
+            $parameters[] = new \CultuurNet\Search\Parameter\Parameter('sort', $option['query']);
+            break;
+          }
+        }
+
         $parameters[] = new \CultuurNet\Search\Parameter\Rows($rows);
         $parameters[] = new \CultuurNet\Search\Parameter\FilterQuery('type:event OR type:production');
         $parameters[] = new \CultuurNet\Search\Parameter\Group();
@@ -113,11 +121,12 @@ function culturefeed_content_field_formatter_view($entity_type, $entity, $field,
             );
           }
 
-          if ($result->getTotalCount() > $rows && module_exists('culturefeed_agenda')) {
+          if ($result->getTotalCount() > $rows) {
 
             if (function_exists('culturefeed_search_get_search_url_query')) {
 
               $query = 'q=' . html_entity_decode($query_string) . ($filter_query ? '&fq=' . html_entity_decode($filter_query) : '');
+              $query .= '&sort=' . $sort;
 
               $build[] = array(
                 '#theme' => 'culturefeed_content_all_results_link',
@@ -217,12 +226,26 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
     '#type' => 'textfield',
   );
 
+  // Sort.
+  $search_type = culturefeed_get_searchable_type('activiteiten');
+  $sort_options = culturefeed_search_ui_get_sort_options_for_page($search_type);
+  $options = array();
+
+  foreach ($sort_options as $key => $option) {
+
+    if ($key === 'default' || !$option['exposed']) {
+      continue;
+    }
+    $options[$option['value']] = $option['label'];
+
+  }
+
   $element['wrapper']['sort'] = array(
     '#default_value' => $sort,
+    '#options' => $options,
     '#required' => $element['#required'],
     '#title' => t('Sort'),
-    '#description' => t('How to sort the results, defaults on "permanent asc,availableto asc,weight desc"'),
-    '#type' => 'textfield',
+    '#type' => 'radios',
   );
 
   $element['#element_validate'] = array('culturefeed_content_field_culturefeed_content_validate');
diff --git a/culturefeed_search/culturefeed_search.module b/culturefeed_search/culturefeed_search.module
index b260e618..78829330 100644
--- a/culturefeed_search/culturefeed_search.module
+++ b/culturefeed_search/culturefeed_search.module
@@ -187,6 +187,11 @@ function culturefeed_search_get_search_url_query($search_query) {
       continue;
     }
 
+    // Sort.
+    if ($param[0] == 'sort') {
+      $query['sort'] = $param[1];
+    }
+
     // Param q = the search
     if ($param[0] == 'q') {
       if ($param[1] == '*:*') {

From 416d630f3846eee600c9fc5003f19600dd34595d Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 21 May 2015 12:07:49 +0200
Subject: [PATCH 226/275] PWK-287 changed tags are saved confirmation message.

---
 culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc | 2 +-
 culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index 137a184b..b887cd74 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2281,7 +2281,7 @@ function culturefeed_entry_ui_edit_tags_form_submit($form, &$form_state) {
       }
     }
 
-    drupal_set_message(t('The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the "View" tab'));
+    drupal_set_message(t('The tags were adjusted.'));
 
   } catch (Exception $e) {
 
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index 94583cf9..b34a1502 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -678,6 +678,10 @@ msgstr "Trefwoord @tag is niet toegelaten aangezien het al een bestaande marker
 msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
 msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
 
+#: includes/culturefeed_entry_ui.pages.inc:2604
+msgid "The tags were adjusted."
+msgstr "De labels werden aangepast."
+
 #: includes/culturefeed_entry_ui.pages.inc:2609
 msgid "You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to \"vragen@uitdatabank.be\"."
 msgstr "Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je hier vragen bij hebt, contacteer dan onze helpdesk via \"vragen@uitdatabank.be\"."

From e6916d8c4cdcbdc041df93316b56160ad87677c4 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Thu, 21 May 2015 13:48:57 +0200
Subject: [PATCH 227/275] MSS-168: Reverted the new datepicker in the
 culturefeed_search_ui, as it should be in the culturefeed_bootstrap theme.

---
 .../css/daterangepicker-bs3.css               |  151 --
 .../css/ui.daterangepicker.css                |  104 ++
 .../culturefeed_search_ui.module              |   35 +-
 culturefeed_search_ui/includes/blocks.inc     |   50 +-
 .../js/daterangepicker.jQuery.compressed.js   |    1 +
 culturefeed_search_ui/js/daterangepicker.js   | 1283 -----------------
 culturefeed_search_ui/js/moment.min.js        |    6 -
 culturefeed_search_ui/js/search_ui.js         |   78 +-
 .../lib/Drupal/CultureFeedSearchPage.php      |   26 +-
 culturefeed_search_ui/theme/theme.inc         |    4 +-
 .../translations/culturefeed_search_ui.nl.po  |  240 ++-
 11 files changed, 258 insertions(+), 1720 deletions(-)
 delete mode 100644 culturefeed_search_ui/css/daterangepicker-bs3.css
 create mode 100755 culturefeed_search_ui/css/ui.daterangepicker.css
 create mode 100644 culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js
 delete mode 100644 culturefeed_search_ui/js/daterangepicker.js
 delete mode 100644 culturefeed_search_ui/js/moment.min.js

diff --git a/culturefeed_search_ui/css/daterangepicker-bs3.css b/culturefeed_search_ui/css/daterangepicker-bs3.css
deleted file mode 100644
index 6819a952..00000000
--- a/culturefeed_search_ui/css/daterangepicker-bs3.css
+++ /dev/null
@@ -1,151 +0,0 @@
-/* */
-/* */
-/*!
-* Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
-*
-* Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
-* Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
-*
-* Built for http://www.improvely.com
-*/
-.daterangepicker.dropdown-menu {
-  max-width: none;
-  z-index: 3000;
-}
-.daterangepicker .ranges .range_inputs .btn-block {
-  clear: both;
-  position: relative;
-}
-.daterangepicker .calendar {
-  display: none;
-}
-.daterangepicker.show-calendar .calendar {
-  display: block;
-}
-.daterangepicker .calendar.single .calendar-date {
-  border: none;
-}
-.daterangepicker .calendar th,
-.daterangepicker .calendar td {
-  white-space: nowrap;
-  text-align: center;
-  min-width: 32px;
-}
-.daterangepicker .ranges ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-.daterangepicker .ranges li {
-  font-size: 13px;
-  background: #f5f5f5;
-  border: 1px solid #f5f5f5;
-  color: #08c;
-  padding: 3px 12px;
-  margin-bottom: 8px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  cursor: pointer;
-}
-.daterangepicker .ranges li.active,
-.daterangepicker .ranges li:hover {
-  background: #08c;
-  border: 1px solid #08c;
-  color: #fff;
-}
-.daterangepicker .calendar-date {
-  border: 1px solid #ddd;
-  padding: 4px;
-  border-radius: 1px;
-  background: #fff;
-}
-.daterangepicker .calendar-time {
-  text-align: center;
-  margin: 8px auto 0 auto;
-  line-height: 30px;
-}
-.daterangepicker {
-  position: absolute;
-  top: 100px;
-  left: 20px;
-  padding: 15px;
-  margin-top: 1px;
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-  background-color: #F3F3F3;
-}
-.daterangepicker table {
-  width: 100%;
-  margin: 0;
-}
-.daterangepicker td,
-.daterangepicker th {
-  text-align: center;
-  width: 20px;
-  height: 20px;
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-  cursor: pointer;
-  white-space: nowrap;
-}
-.daterangepicker td.off {
-  color: #999;
-}
-.daterangepicker td.disabled,
-.daterangepicker option.disabled {
-  color: #999;
-}
-.daterangepicker td.available:hover,
-.daterangepicker th.available:hover {
-  background: #eee;
-}
-.daterangepicker td.in-range {
-  background: #c7e5ff;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.daterangepicker td.start-date.end-date {
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-}
-.daterangepicker td.active,
-.daterangepicker td.active:hover {
-  background-color: #004f94;
-  border-color: #3071a9;
-  color: #fff;
-}
-.daterangepicker td.week,
-.daterangepicker th.week {
-  font-size: 80%;
-  color: #ccc;
-}
-.daterangepicker select.monthselect,
-.daterangepicker select.yearselect {
-  font-size: 12px;
-  padding: 1px;
-  height: auto;
-  margin: 0;
-  cursor: default;
-}
-.daterangepicker select.monthselect {
-  margin-right: 2%;
-  width: 56%;
-}
-.daterangepicker select.yearselect {
-  width: 40%;
-}
-.daterangepicker select.hourselect,
-.daterangepicker select.minuteselect,
-.daterangepicker select.secondselect,
-.daterangepicker select.ampmselect {
-  width: 50px;
-  margin-bottom: 0;
-}
-.daterangepicker th.month {
-  width: auto;
-}
diff --git a/culturefeed_search_ui/css/ui.daterangepicker.css b/culturefeed_search_ui/css/ui.daterangepicker.css
new file mode 100755
index 00000000..18d40806
--- /dev/null
+++ b/culturefeed_search_ui/css/ui.daterangepicker.css
@@ -0,0 +1,104 @@
+/*styles for jquery ui daterangepicker plugin */
+
+.ui-daterangepickercontain {
+	z-index: 999;
+}
+.ui-daterangepickercontain .ui-daterangepicker {
+	float: left;
+	padding: 5px !important;
+	width: auto;
+	display: inline;
+	background-image: none !important;
+	clear: left;
+	position: absolute;
+	z-index: 9999;
+}
+.ui-daterangepicker ul, .ui-daterangepicker .ranges, .ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
+	float: left;
+	padding: 0;
+	margin: 0;
+}
+.ui-daterangepicker .ranges {
+	width: auto;
+	position: relative;
+	padding: 5px 5px 40px 0;
+	margin-left: 10px;
+}
+.ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
+	margin-left: 5px;
+}
+.ui-daterangepicker button.btnDone {
+	margin: 0 5px 5px 0;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	clear: both;
+	cursor: pointer;
+	font-size: 1.1em;
+}
+.ui-daterangepicker ul {
+	width: 17.6em;
+	background: none;
+	border: 0;
+}
+.ui-daterangepicker li {
+	list-style: none;
+	padding: 1px;
+	cursor: pointer;
+	margin: 1px 0;
+}
+.ui-daterangepicker li.ui-state-hover, .ui-daterangepicker li.ui-state-active {
+	padding: 0;
+}
+.ui-daterangepicker li.preset_0 {
+	margin-top: 1.5em !important;
+}
+.ui-daterangepicker .ui-widget-content a {
+	text-decoration: none !important;
+}
+.ui-daterangepicker li a {
+	font-weight: normal;
+	margin: .3em .5em;
+	display: block;
+}
+.ui-daterangepicker li span {
+	float: right;
+	margin: .3em .2em;
+}
+.ui-daterangepicker .title-start, .ui-daterangepicker .title-end {
+	display: block;
+	margin: 0 0 .2em;
+	font-size: 1em;
+	padding: 0 4px 2px;
+}
+.ui-daterangepicker .ui-datepicker-inline {
+	font-size: 1em;
+}
+.ui-daterangepicker-arrows {
+	padding: 2px;
+	width: 204px;
+	position: relative;
+}
+.ui-daterangepicker-arrows input.ui-rangepicker-input {
+	width: 158px;
+	margin: 0 2px 0 20px;
+	padding: 2px;
+	height: 1.1em;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev, .ui-daterangepicker-arrows .ui-daterangepicker-next {
+	position: absolute;
+	top: 2px; 
+	padding: 1px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev {
+	left: 2px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-next {
+	right: 2px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev:hover, 
+.ui-daterangepicker-arrows .ui-daterangepicker-next:hover,
+.ui-daterangepicker-arrows .ui-daterangepicker-prev:focus, 
+.ui-daterangepicker-arrows .ui-daterangepicker-next:focus {
+	padding: 0;
+}
diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 507326c0..8a8735aa 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -322,32 +322,19 @@ function culturefeed_search_ui_library() {
 
   $path = drupal_get_path('module', 'culturefeed_search_ui');
 
-  // Moment.js: Parse, validate, manipulate, and display dates in JavaScript.
-  $libraries['ui.moment'] = array(
-    'title' => 'Moment.js',
-    'website' => 'http://momentjs.com/',
-    'version' => '2.8.1',
-    'js' => array(
-      $path . '/js/moment.min.js' => array(),
-    ),
-  );
-
-  // Date Range Picker: A JavaScript widget for choosing date ranges.
+  // Date range picker
   $libraries['ui.daterangepicker'] = array(
-    'title' => 'Date Range Picker',
-    'website' => 'http://www.daterangepicker.com/',
-    'version' => '1.3.17',
+    'title' => 'Datejs',
+    'website' => 'http://filamentgroup.com/lab/date_range_picker_using_jquery_ui_16_and_jquery_ui_css_framework/',
+    'version' => '1',
     'js' => array(
-      $path . '/js/daterangepicker.js' => array(),
+      $path . '/js/daterangepicker.jQuery.compressed.js' => array(),
     ),
     'css' => array(
-      $path . '/css/daterangepicker-bs3.css' => array(
-        'weight' => 100,
-        'group' => CSS_THEME,
-      ),
+      $path . '/css/ui.daterangepicker.css' => array(),
     ),
     'dependencies' => array(
-      array('culturefeed_search_ui', 'ui.moment'),
+      array('system', 'ui.datepicker'),
     ),
   );
 
@@ -1003,15 +990,13 @@ function culturefeed_search_ui_culturefeed_search_ui_active_filters($culturefeed
   }
 
   // Check if user is filtering on date range.
-  if (!empty($query['date_from']) && !empty($query['date_to'])
-      && DateTime::createFromFormat('d/m/Y', $query['date_from'])
-      && DateTime::createFromFormat('d/m/Y', $query['date_to'])) {
+  if (!empty($query['date_range'])) {
     $search_query = $query;
-    unset($search_query['date_from'], $search_query['date_to']);
+    unset($search_query['date_range']);
     $url = url($path, array('query' => $search_query));
     $build['date_search'] =  array(
       '#theme' => 'culturefeed_search_active_filters_item',
-      '#label' => $query['date_from'] . ' - ' . $query['date_to'],
+      '#label' => $query['date_range'],
       '#url' => $url
     );
   }
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index 4a843705..a4a75c98 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -212,33 +212,18 @@ function culturefeed_search_ui_date_facet_form() {
 
   $form['#attributes']['class'][] = 'append-button';
 
-  $form['date_from'] = array(
-    '#type' => 'textfield',
-    '#size' => 28,
-    '#title' => t('Between'),
-    '#title_display' => 'invisible',
-    '#default_value' => isset($_GET['date_from']) ? $_GET['date_from'] : '',
-    '#attributes' => array('placeholder' => t('Between'), 'autocomplete' => 'off'),
-  );
-  $form['date_to'] = array(
+  $form['date_range'] = array(
     '#type' => 'textfield',
     '#size' => 28,
-    '#title' => t('And'),
+    '#title' => t('Choose a date'),
     '#title_display' => 'invisible',
-    '#default_value' => isset($_GET['date_to']) ? $_GET['date_to'] : '',
-    '#attributes' => array('placeholder' => t('And'), 'autocomplete' => 'off'),
-  );
-  $form['date_range'] = array(
-    '#markup' => l('<span>' . t('Specific dates') . '</span>', 'javascript:', array(
-      'html' => TRUE,
-      'external' => TRUE,
-      'attributes' => array('id' => 'specific-dates-range'),
-    )),
+    '#default_value' => isset($_GET['date_range']) ? $_GET['date_range'] : '',
+    '#attributes' => array('placeholder' => t('Or choose a custom date'), 'autocomplete' => 'off'),
   );
+
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Ok'),
-    '#attributes' => array('id' => 'submit-specific-dates'),
   );
 
   $form['#attached']['library'][] = array('culturefeed_search_ui', 'ui.daterangepicker');
@@ -253,14 +238,21 @@ function culturefeed_search_ui_date_facet_form() {
  */
 function culturefeed_search_ui_date_facet_form_validate($form, &$form_state) {
 
-  $error = FALSE;
-  foreach (array('date_from', 'date_to') as $key) {
-    if (!empty($form_state['values'][$key]) && !DateTime::createFromFormat('d/m/Y', $form_state['values'][$key])) {
-      form_set_error($key, !$error ? t('Please enter a valid date') : '');
-      $error = TRUE;
+  if (!empty($form_state['values']['date_range'])) {
+
+    $form_state['values']['date_range'] = str_replace(t('till'), '-', $form_state['values']['date_range']);
+    $dates = explode('-', $form_state['values']['date_range']);
+    $startDate = DateTime::createFromFormat('d/m/Y', trim($dates[0]));
+    if (!$startDate) {
+      form_set_error('date_range', t('Please enter a valid date'));
+    }
+    elseif (isset($dates[1])) {
+      $endDate = DateTime::createFromFormat('d/m/Y', trim($dates[1]));
+      if (!$endDate) {
+        form_set_error('date_range', t('Please enter a valid date'));
+      }
     }
   }
-
 }
 
 /**
@@ -275,10 +267,8 @@ function culturefeed_search_ui_date_facet_form_submit($form, &$form_state) {
     unset($query['facet']);
   }
 
-  foreach (array('date_from', 'date_to') as $key) {
-    if (!empty($form_state['values'][$key])) {
-      $query[$key] = $form_state['values'][$key];
-    }
+  if (!empty($form_state['values']['date_range'])) {
+    $query['date_range'] = $form_state['values']['date_range'];
   }
 
   $form_state['redirect'] = array(
diff --git a/culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js b/culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js
new file mode 100644
index 00000000..caa48ea2
--- /dev/null
+++ b/culturefeed_search_ui/js/daterangepicker.jQuery.compressed.js
@@ -0,0 +1 @@
+(function(a){a.fn.daterangepicker=function(s){var d=a(this);var e=a.extend({presetRanges:[{text:"Today",dateStart:"today",dateEnd:"today"},{text:"Last 7 days",dateStart:"today-7days",dateEnd:"today"},{text:"Month to date",dateStart:function(){return Date.parse("today").moveToFirstDayOfMonth()},dateEnd:"today"},{text:"Year to date",dateStart:function(){var w=Date.parse("today");w.setMonth(0);w.setDate(1);return w},dateEnd:"today"},{text:"The previous Month",dateStart:function(){return Date.parse("1 month ago").moveToFirstDayOfMonth()},dateEnd:function(){return Date.parse("1 month ago").moveToLastDayOfMonth()}}],presets:{specificDate:"Specific Date",allDatesBefore:"All Dates Before",allDatesAfter:"All Dates After",dateRange:"Date Range"},rangeStartTitle:"Start date",rangeEndTitle:"End date",nextLinkText:"Next",prevLinkText:"Prev",target:d,doneButtonText:"Done",earliestDate:Date.parse("-15years"),latestDate:Date.parse("+15years"),constrainDates:false,rangeSplitter:"-",dateFormat:"m/d/yy",closeOnSelect:true,arrows:false,appendTo:"body",onClose:function(){},onOpen:function(){},onChange:function(){},datepickerOptions:null},s);var g={onSelect:function(A,z){var y=j.find(".range-start");var B=j.find(".range-end");if(j.find(".ui-daterangepicker-specificDate").is(".ui-state-active")){B.datepicker("setDate",y.datepicker("getDate"))}a(this).trigger("constrainOtherPicker");var x=b(y.datepicker("getDate"));var w=b(B.datepicker("getDate"));if(d.length==2){d.eq(0).val(x);d.eq(1).val(w)}else{d.val((x!=w)?x+" "+e.rangeSplitter+" "+w:x)}if(e.closeOnSelect){if(!j.find("li.ui-state-active").is(".ui-daterangepicker-dateRange")&&!j.is(":animated")){k()}a(this).trigger("constrainOtherPicker");e.onChange()}},defaultDate:+0};d.bind("change",e.onChange);e.datepickerOptions=(s)?a.extend(g,s.datepickerOptions):g;var m,l=Date.parse("today");var o,i;if(d.size()==2){o=Date.parse(d.eq(0).val());i=Date.parse(d.eq(1).val());if(o==null){o=i}if(i==null){i=o}}else{o=Date.parse(d.val().split(e.rangeSplitter)[0]);i=Date.parse(d.val().split(e.rangeSplitter)[1]);if(i==null){i=o}}if(o!=null){m=o}if(i!=null){l=i}var j=a('<div class="ui-daterangepicker ui-widget ui-helper-clearfix ui-widget-content ui-corner-all"></div>');var u=(function(){var y=a('<ul class="ui-widget-content"></ul>').appendTo(j);a.each(e.presetRanges,function(){a('<li class="ui-daterangepicker-'+this.text.replace(/ /g,"")+' ui-corner-all"><a href="#">'+this.text+"</a></li>").data("dateStart",this.dateStart).data("dateEnd",this.dateEnd).appendTo(y)});var w=0;a.each(e.presets,function(x,z){a('<li class="ui-daterangepicker-'+x+" preset_"+w+' ui-helper-clearfix ui-corner-all"><span class="ui-icon ui-icon-triangle-1-e"></span><a href="#">'+z+"</a></li>").appendTo(y);w++});y.find("li").hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).click(function(){j.find(".ui-state-active").removeClass("ui-state-active");a(this).addClass("ui-state-active");q(a(this),j,n,f);return false});return y})();function b(y){if(!y.getDate()){return""}var x=y.getDate();var A=y.getMonth();var z=y.getFullYear();A++;var w=e.dateFormat;return a.datepicker.formatDate(w,y)}a.fn.restoreDateFromData=function(){if(a(this).data("saveDate")){a(this).datepicker("setDate",a(this).data("saveDate")).removeData("saveDate")}return this};a.fn.saveDateToData=function(){if(!a(this).data("saveDate")){a(this).data("saveDate",a(this).datepicker("getDate"))}return this};function t(){if(j.data("state")=="closed"){v();j.fadeIn(300).data("state","open");e.onOpen()}}function k(){if(j.data("state")=="open"){j.fadeOut(300).data("state","closed");e.onClose()}}function c(){if(j.data("state")=="open"){k()}else{t()}}function v(){var w=p||d;var A=w.offset(),y="left",z=A.left,x=a(window).width()-z-w.outerWidth();if(z>x){y="right",z=x}j.parent().css(y,z).css("top",A.top+w.outerHeight())}function q(z,y,A,w){if(z.is(".ui-daterangepicker-specificDate")){w.hide();A.show();y.find(".title-start").text(e.presets.specificDate);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").restoreDateFromData().css("opacity",0).hide(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-allDatesBefore")){w.hide();A.show();y.find(".title-end").text(e.presets.allDatesBefore);y.find(".range-start").saveDateToData().datepicker("setDate",e.earliestDate).css("opacity",0).hide(400);y.find(".range-end").restoreDateFromData().css("opacity",1).show(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-allDatesAfter")){w.hide();A.show();y.find(".title-start").text(e.presets.allDatesAfter);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").saveDateToData().datepicker("setDate",e.latestDate).css("opacity",0).hide(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-dateRange")){w.hide();A.show();y.find(".title-start").text(e.rangeStartTitle);y.find(".title-end").text(e.rangeEndTitle);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").restoreDateFromData().css("opacity",1).show(400);setTimeout(function(){w.fadeIn()},400)}else{w.hide();y.find(".range-start, .range-end").css("opacity",0).hide(400,function(){A.hide()});var B=(typeof z.data("dateStart")=="string")?Date.parse(z.data("dateStart")):z.data("dateStart")();var x=(typeof z.data("dateEnd")=="string")?Date.parse(z.data("dateEnd")):z.data("dateEnd")();y.find(".range-start").datepicker("setDate",B).find(".ui-datepicker-current-day").trigger("click");y.find(".range-end").datepicker("setDate",x).find(".ui-datepicker-current-day").trigger("click")}}}}return false}var n=a('<div class="ranges ui-widget-header ui-corner-all ui-helper-clearfix"><div class="range-start"><span class="title-start">Start Date</span></div><div class="range-end"><span class="title-end">End Date</span></div></div>').appendTo(j);n.find(".range-start, .range-end").datepicker(e.datepickerOptions);n.find(".range-start").datepicker("setDate",m);n.find(".range-end").datepicker("setDate",l);n.find(".range-start, .range-end").bind("constrainOtherPicker",function(){if(e.constrainDates){if(a(this).is(".range-start")){j.find(".range-end").datepicker("option","minDate",a(this).datepicker("getDate"))}else{j.find(".range-start").datepicker("option","maxDate",a(this).datepicker("getDate"))}}}).trigger("constrainOtherPicker");var f=a('<button class="btnDone ui-state-default ui-corner-all">'+e.doneButtonText+"</button>").click(function(){j.find(".ui-datepicker-current-day").trigger("click");k()}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).appendTo(n);a(this).click(function(){c();return false});n.hide().find(".range-start, .range-end, .btnDone").hide();j.data("state","closed");n.find(".ui-datepicker").css("display","block");a(e.appendTo).append(j);j.wrap('<div class="ui-daterangepickercontain"></div>');if(e.arrows&&d.size()==1){var h=a('<a href="#" class="ui-daterangepicker-prev ui-corner-all" title="'+e.prevLinkText+'"><span class="ui-icon ui-icon-circle-triangle-w">'+e.prevLinkText+"</span></a>");var r=a('<a href="#" class="ui-daterangepicker-next ui-corner-all" title="'+e.nextLinkText+'"><span class="ui-icon ui-icon-circle-triangle-e">'+e.nextLinkText+"</span></a>");a(this).addClass("ui-rangepicker-input ui-widget-content").wrap('<div class="ui-daterangepicker-arrows ui-widget ui-widget-header ui-helper-clearfix ui-corner-all"></div>').before(h).before(r).parent().find("a").click(function(){var x=n.find(".range-start").datepicker("getDate");var w=n.find(".range-end").datepicker("getDate");var y=Math.abs(new TimeSpan(x-w).getTotalMilliseconds())+86400000;if(a(this).is(".ui-daterangepicker-prev")){y=-y}n.find(".range-start, .range-end ").each(function(){var z=a(this).datepicker("getDate");if(z==null){return false}a(this).datepicker("setDate",z.add({milliseconds:y})).find(".ui-datepicker-current-day").trigger("click")});return false}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")});var p=d.parent()}a(document).click(function(){if(j.is(":visible")){k()}});j.click(function(){return false}).hide();return this}})(jQuery);
\ No newline at end of file
diff --git a/culturefeed_search_ui/js/daterangepicker.js b/culturefeed_search_ui/js/daterangepicker.js
deleted file mode 100644
index 7e11af3a..00000000
--- a/culturefeed_search_ui/js/daterangepicker.js
+++ /dev/null
@@ -1,1283 +0,0 @@
-/**
-* @version: 1.3.17
-* @author: Dan Grossman http://www.dangrossman.info/
-* @date: 2014-11-25
-* @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved.
-* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
-* @website: http://www.improvely.com/
-*/
-
-/* TEMPLATE */
-
-(function(root, factory) {
-
-  if (typeof define === 'function' && define.amd) {
-    define(['moment', 'jquery', 'exports'], function(momentjs, $, exports) {
-      root.daterangepicker = factory(root, exports, momentjs, $);
-    });
-
-  } else if (typeof exports !== 'undefined') {
-    var momentjs = require('moment');
-    var jQuery;
-    try {
-      jQuery = require('jquery');
-    } catch (err) {
-      jQuery = window.jQuery;
-      if (!jQuery) throw new Error('jQuery dependency not found');
-    }
-
-    factory(root, exports, momentjs, jQuery);
-
-  // Finally, as a browser global.
-  } else {
-    root.daterangepicker = factory(root, {}, root.moment, (root.jQuery || root.Zepto || root.ender || root.$));
-  }
-
-}(this, function(root, daterangepicker, moment, $) {
-
-    var DateRangePicker = function (element, options, cb) {
-
-        // by default, the daterangepicker element is placed at the bottom of HTML body
-        this.parentEl = 'body';
-
-        //element that triggered the date range picker
-        this.element = $(element);
-
-        //tracks visible state
-        this.isShowing = false;
-
-        //create the picker HTML object
-        var DRPTemplate = '';
-
-        //create the picker HTML object
-        DRPTemplate =
-              '<div class="daterangepicker dropdown-menu">' +
-              '<div class="row">' +
-                '<div class="col-sm-6 col-xs-12">'+
-                  '<div class="daterangepicker_start_input">' +
-                    '<label for="daterangepicker_start"></label>' +
-                  '</div>' +
-                  '<div class="form-group">' +
-                    '<div class="calendar first left"></div>'+
-                  '</div>'+
-                  '<div class="form-group">'+
-                  '<input class="form-control" type="text" name="daterangepicker_start" value="" />' +
-                  '</div>'+
-                '</div>' +
-                '<div class="col-sm-6 col-xs-12">' +
-                  '<div class="daterangepicker_end_input">' +
-                    '<label for="daterangepicker_end"></label>' +
-                  '</div>' +
-                  '<div class="form-group">' +
-                    '<div class="calendar second right"></div>'+
-                  '</div>'+
-                  '<div class="form-group">'+
-                  '<input class="form-control" type="text" name="daterangepicker_end" value="" />' +
-                  '</div>'+
-                '</div>' +
-              '</div>'+
-              '<div class="row">'+
-                '<div class="col-xs-12 ranges">' +
-                  '<button class="applyBtn" disabled="disabled"></button>' +
-                  ' ' +
-                  '<button class="cancelBtn"></button>' +
-                '</div>' +
-              '</div>' +
-              '</div>';
-
-        //custom options
-        if (typeof options !== 'object' || options === null)
-            options = {};
-
-        this.parentEl = (typeof options === 'object' && options.parentEl && $(options.parentEl).length) ? $(options.parentEl) : $(this.parentEl);
-        this.container = $(DRPTemplate).appendTo(this.parentEl);
-
-        this.setOptions(options, cb);
-
-        //apply CSS classes and labels to buttons
-        var c = this.container;
-        $.each(this.buttonClasses, function (idx, val) {
-            c.find('button').addClass(val);
-        });
-        this.container.find('.daterangepicker_start_input label').html(this.locale.fromLabel);
-        this.container.find('.daterangepicker_end_input label').html(this.locale.toLabel);
-        if (this.applyClass.length)
-            this.container.find('.applyBtn').addClass(this.applyClass);
-        if (this.cancelClass.length)
-            this.container.find('.cancelBtn').addClass(this.cancelClass);
-        this.container.find('.applyBtn').html(this.locale.applyLabel);
-        this.container.find('.cancelBtn').html(this.locale.cancelLabel);
-
-        //event listeners
-
-        this.container.find('.calendar')
-            .on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
-            .on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
-            .on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
-            .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.hoverDate, this))
-            .on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
-            .on('change.daterangepicker', 'select.yearselect', $.proxy(this.updateMonthYear, this))
-            .on('change.daterangepicker', 'select.monthselect', $.proxy(this.updateMonthYear, this))
-            .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.updateTime, this));
-
-        this.container.find('.ranges')
-            .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
-            .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
-            .on('click.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this))
-            .on('change.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.inputsChanged, this))
-            .on('keydown.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.inputsKeydown, this))
-            .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
-            .on('mouseenter.daterangepicker', 'li', $.proxy(this.enterRange, this))
-            .on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this));
-
-        if (this.element.is('input')) {
-            this.element.on({
-                'click.daterangepicker': $.proxy(this.show, this),
-                'focus.daterangepicker': $.proxy(this.show, this),
-                'keyup.daterangepicker': $.proxy(this.updateFromControl, this)
-            });
-        } else {
-            this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
-        }
-
-    };
-
-    DateRangePicker.prototype = {
-
-        constructor: DateRangePicker,
-
-        setOptions: function(options, callback) {
-
-            this.startDate = moment().startOf('day');
-            this.endDate = moment().endOf('day');
-            this.timeZone = moment().zone();
-            this.minDate = false;
-            this.maxDate = false;
-            this.dateLimit = false;
-
-            this.showDropdowns = false;
-            this.showWeekNumbers = false;
-            this.timePicker = false;
-            this.timePickerSeconds = false;
-            this.timePickerIncrement = 30;
-            this.timePicker12Hour = true;
-            this.singleDatePicker = false;
-            this.ranges = {};
-
-            this.opens = 'right';
-            if (this.element.hasClass('pull-right'))
-                this.opens = 'left';
-
-            this.buttonClasses = ['btn', ''];
-            this.applyClass = 'btn-success';
-            this.cancelClass = 'btn-default';
-
-            this.format = 'MM/DD/YYYY';
-            this.separator = ' - ';
-
-            this.locale = {
-                applyLabel: 'Apply',
-                cancelLabel: 'Cancel',
-                fromLabel: 'From',
-                toLabel: 'To',
-                weekLabel: 'W',
-                customRangeLabel: 'Custom Range',
-                daysOfWeek: moment.weekdaysMin(),
-                monthNames: moment.monthsShort(),
-                firstDay: moment.localeData()._week.dow
-            };
-
-            this.cb = function () { };
-
-            if (typeof options.format === 'string')
-                this.format = options.format;
-
-            if (typeof options.separator === 'string')
-                this.separator = options.separator;
-
-            if (typeof options.startDate === 'string')
-                this.startDate = moment(options.startDate, this.format);
-
-            if (typeof options.endDate === 'string')
-                this.endDate = moment(options.endDate, this.format);
-
-            if (typeof options.minDate === 'string')
-                this.minDate = moment(options.minDate, this.format);
-
-            if (typeof options.maxDate === 'string')
-                this.maxDate = moment(options.maxDate, this.format);
-
-            if (typeof options.startDate === 'object')
-                this.startDate = moment(options.startDate);
-
-            if (typeof options.endDate === 'object')
-                this.endDate = moment(options.endDate);
-
-            if (typeof options.minDate === 'object')
-                this.minDate = moment(options.minDate);
-
-            if (typeof options.maxDate === 'object')
-                this.maxDate = moment(options.maxDate);
-
-            if (typeof options.applyClass === 'string')
-                this.applyClass = options.applyClass;
-
-            if (typeof options.cancelClass === 'string')
-                this.cancelClass = options.cancelClass;
-
-            if (typeof options.dateLimit === 'object')
-                this.dateLimit = options.dateLimit;
-
-            if (typeof options.locale === 'object') {
-
-                if (typeof options.locale.daysOfWeek === 'object') {
-                    // Create a copy of daysOfWeek to avoid modification of original
-                    // options object for reusability in multiple daterangepicker instances
-                    this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
-                }
-
-                if (typeof options.locale.monthNames === 'object') {
-                  this.locale.monthNames = options.locale.monthNames.slice();
-                }
-
-                if (typeof options.locale.firstDay === 'number') {
-                  this.locale.firstDay = options.locale.firstDay;
-                }
-
-                if (typeof options.locale.applyLabel === 'string') {
-                  this.locale.applyLabel = options.locale.applyLabel;
-                }
-
-                if (typeof options.locale.cancelLabel === 'string') {
-                  this.locale.cancelLabel = options.locale.cancelLabel;
-                }
-
-                if (typeof options.locale.fromLabel === 'string') {
-                  this.locale.fromLabel = options.locale.fromLabel;
-                }
-
-                if (typeof options.locale.toLabel === 'string') {
-                  this.locale.toLabel = options.locale.toLabel;
-                }
-
-                if (typeof options.locale.weekLabel === 'string') {
-                  this.locale.weekLabel = options.locale.weekLabel;
-                }
-
-                if (typeof options.locale.customRangeLabel === 'string') {
-                  this.locale.customRangeLabel = options.locale.customRangeLabel;
-                }
-            }
-
-            if (typeof options.opens === 'string')
-                this.opens = options.opens;
-
-            if (typeof options.showWeekNumbers === 'boolean') {
-                this.showWeekNumbers = options.showWeekNumbers;
-            }
-
-            if (typeof options.buttonClasses === 'string') {
-                this.buttonClasses = [options.buttonClasses];
-            }
-
-            if (typeof options.buttonClasses === 'object') {
-                this.buttonClasses = options.buttonClasses;
-            }
-
-            if (typeof options.showDropdowns === 'boolean') {
-                this.showDropdowns = options.showDropdowns;
-            }
-
-            if (typeof options.singleDatePicker === 'boolean') {
-                this.singleDatePicker = options.singleDatePicker;
-                if (this.singleDatePicker) {
-                    this.endDate = this.startDate.clone();
-                }
-            }
-
-            if (typeof options.timePicker === 'boolean') {
-                this.timePicker = options.timePicker;
-            }
-
-            if (typeof options.timePickerSeconds === 'boolean') {
-                this.timePickerSeconds = options.timePickerSeconds;
-            }
-
-            if (typeof options.timePickerIncrement === 'number') {
-                this.timePickerIncrement = options.timePickerIncrement;
-            }
-
-            if (typeof options.timePicker12Hour === 'boolean') {
-                this.timePicker12Hour = options.timePicker12Hour;
-            }
-
-            // update day names order to firstDay
-            if (this.locale.firstDay != 0) {
-                var iterator = this.locale.firstDay;
-                while (iterator > 0) {
-                    this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift());
-                    iterator--;
-                }
-            }
-
-            var start, end, range;
-
-            //if no start/end dates set, check if an input element contains initial values
-            if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') {
-                if ($(this.element).is('input[type=text]')) {
-                    var val = $(this.element).val(),
-                        split = val.split(this.separator);
-
-                    start = end = null;
-
-                    if (split.length == 2) {
-                        start = moment(split[0], this.format);
-                        end = moment(split[1], this.format);
-                    } else if (this.singleDatePicker && val !== "") {
-                        start = moment(val, this.format);
-                        end = moment(val, this.format);
-                    }
-                    if (start !== null && end !== null) {
-                        this.startDate = start;
-                        this.endDate = end;
-                    }
-                }
-            }
-
-            // bind the time zone used to build the calendar to either the timeZone passed in through the options or the zone of the startDate (which will be the local time zone by default)
-            if (typeof options.timeZone === 'string' || typeof options.timeZone === 'number') {
-                this.timeZone = options.timeZone;
-                this.startDate.zone(this.timeZone);
-                this.endDate.zone(this.timeZone);
-            } else {
-                this.timeZone = moment(this.startDate).zone();
-            }
-
-            if (typeof options.ranges === 'object') {
-                for (range in options.ranges) {
-
-                    if (typeof options.ranges[range][0] === 'string')
-                        start = moment(options.ranges[range][0], this.format);
-                    else
-                        start = moment(options.ranges[range][0]);
-
-                    if (typeof options.ranges[range][1] === 'string')
-                        end = moment(options.ranges[range][1], this.format);
-                    else
-                        end = moment(options.ranges[range][1]);
-
-                    // If we have a min/max date set, bound this range
-                    // to it, but only if it would otherwise fall
-                    // outside of the min/max.
-                    if (this.minDate && start.isBefore(this.minDate))
-                        start = moment(this.minDate);
-
-                    if (this.maxDate && end.isAfter(this.maxDate))
-                        end = moment(this.maxDate);
-
-                    // If the end of the range is before the minimum (if min is set) OR
-                    // the start of the range is after the max (also if set) don't display this
-                    // range option.
-                    if ((this.minDate && end.isBefore(this.minDate)) || (this.maxDate && start.isAfter(this.maxDate))) {
-                        continue;
-                    }
-
-                    this.ranges[range] = [start, end];
-                }
-
-                var list = '<ul>';
-                for (range in this.ranges) {
-                    list += '<li>' + range + '</li>';
-                }
-                list += '<li>' + this.locale.customRangeLabel + '</li>';
-                list += '</ul>';
-                this.container.find('.ranges ul').remove();
-                this.container.find('.ranges').prepend(list);
-            }
-
-            if (typeof callback === 'function') {
-                this.cb = callback;
-            }
-
-            if (!this.timePicker) {
-                this.startDate = this.startDate.startOf('day');
-                this.endDate = this.endDate.endOf('day');
-            }
-
-            if (this.singleDatePicker) {
-                this.opens = 'right';
-                this.container.addClass('single');
-                this.container.find('.calendar.right').show();
-                this.container.find('.calendar.left').hide();
-                if (!this.timePicker) {
-                    this.container.find('.ranges').hide();
-                } else {
-                    this.container.find('.ranges .daterangepicker_start_input, .ranges .daterangepicker_end_input').hide();
-                }
-                if (!this.container.find('.calendar.right').hasClass('single'))
-                    this.container.find('.calendar.right').addClass('single');
-            } else {
-                this.container.removeClass('single');
-                this.container.find('.calendar.right').removeClass('single');
-                this.container.find('.ranges').show();
-            }
-
-            this.oldStartDate = this.startDate.clone();
-            this.oldEndDate = this.endDate.clone();
-            this.oldChosenLabel = this.chosenLabel;
-
-            this.leftCalendar = {
-                month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute(), this.startDate.second()]),
-                calendar: []
-            };
-
-            this.rightCalendar = {
-                month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute(), this.endDate.second()]),
-                calendar: []
-            };
-
-            if (this.opens == 'right' || this.opens == 'center') {
-
-                /*
-
-                //swap calendar positions
-                var first = this.container.find('.calendar.first');
-                var second = this.container.find('.calendar.second');
-
-                if (second.hasClass('single')) {
-                    second.removeClass('single');
-                    first.addClass('single');
-                }
-
-                first.removeClass('left').addClass('right');
-                second.removeClass('right').addClass('left');
-
-                if (this.singleDatePicker) {
-                    first.show();
-                    second.hide();
-                }
-
-                */
-            }
-
-            if (typeof options.ranges === 'undefined' && !this.singleDatePicker) {
-                this.container.addClass('show-calendar');
-            }
-
-            this.container.addClass('opens' + this.opens);
-
-            this.updateView();
-            this.updateCalendars();
-
-        },
-
-        setStartDate: function(startDate) {
-            if (typeof startDate === 'string')
-                this.startDate = moment(startDate, this.format).zone(this.timeZone);
-
-            if (typeof startDate === 'object')
-                this.startDate = moment(startDate);
-
-            if (!this.timePicker)
-                this.startDate = this.startDate.startOf('day');
-
-            this.oldStartDate = this.startDate.clone();
-
-            this.updateView();
-            this.updateCalendars();
-            this.updateInputText();
-        },
-
-        setEndDate: function(endDate) {
-            if (typeof endDate === 'string')
-                this.endDate = moment(endDate, this.format).zone(this.timeZone);
-
-            if (typeof endDate === 'object')
-                this.endDate = moment(endDate);
-
-            if (!this.timePicker)
-                this.endDate = this.endDate.endOf('day');
-
-            this.oldEndDate = this.endDate.clone();
-
-            this.updateView();
-            this.updateCalendars();
-            this.updateInputText();
-        },
-
-        updateView: function () {
-            this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
-            this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
-            this.updateFormInputs();
-        },
-
-        updateFormInputs: function () {
-            this.container.find('input[name=daterangepicker_start]').val(this.startDate.format(this.format));
-            this.container.find('input[name=daterangepicker_end]').val(this.endDate.format(this.format));
-
-            if (this.startDate.isSame(this.endDate) || this.startDate.isBefore(this.endDate)) {
-                this.container.find('button.applyBtn').removeAttr('disabled');
-            } else {
-                this.container.find('button.applyBtn').attr('disabled', 'disabled');
-            }
-        },
-
-        updateFromControl: function () {
-            if (!this.element.is('input')) return;
-            if (!this.element.val().length) return;
-
-            var dateString = this.element.val().split(this.separator),
-                start = null,
-                end = null;
-
-            if(dateString.length === 2) {
-                start = moment(dateString[0], this.format).zone(this.timeZone);
-                end = moment(dateString[1], this.format).zone(this.timeZone);
-            }
-
-            if (this.singleDatePicker || start === null || end === null) {
-                start = moment(this.element.val(), this.format).zone(this.timeZone);
-                end = start;
-            }
-
-            if (end.isBefore(start)) return;
-
-            this.oldStartDate = this.startDate.clone();
-            this.oldEndDate = this.endDate.clone();
-
-            this.startDate = start;
-            this.endDate = end;
-
-            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
-                this.notify();
-
-            this.updateCalendars();
-        },
-
-        notify: function () {
-            this.updateView();
-            this.cb(this.startDate, this.endDate, this.chosenLabel);
-        },
-
-        move: function () {
-            var parentOffset = { top: 0, left: 0 };
-            var parentRightEdge = $(window).width();
-            if (!this.parentEl.is('body')) {
-                parentOffset = {
-                    top: this.parentEl.offset().top - this.parentEl.scrollTop(),
-                    left: this.parentEl.offset().left - this.parentEl.scrollLeft()
-                };
-                parentRightEdge = this.parentEl[0].clientWidth + this.parentEl.offset().left;
-            }
-
-            if (this.opens == 'left') {
-                this.container.css({
-                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
-                    right: parentRightEdge - this.element.offset().left - this.element.outerWidth(),
-                    left: 'auto'
-                });
-                if (this.container.offset().left < 0) {
-                    this.container.css({
-                        right: 'auto',
-                        left: 9
-                    });
-                }
-            } else if (this.opens == 'center') {
-                this.container.css({
-                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
-                    left: this.element.offset().left - parentOffset.left + this.element.outerWidth() / 2
-                            - this.container.outerWidth() / 2,
-                    right: 'auto'
-                });
-                if (this.container.offset().left < 0) {
-                    this.container.css({
-                        right: 'auto',
-                        left: 9
-                    });
-                }
-            } else {
-                this.container.css({
-                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
-                    left: this.element.offset().left - parentOffset.left,
-                    right: 'auto'
-                });
-                if (this.container.offset().left + this.container.outerWidth() > $(window).width()) {
-                    this.container.css({
-                        left: 'auto',
-                        right: 0
-                    });
-                }
-            }
-        },
-
-        toggle: function (e) {
-            if (this.element.hasClass('active')) {
-                this.hide();
-            } else {
-                this.show();
-            }
-        },
-
-        show: function (e) {
-            if (this.isShowing) return;
-
-            this.element.addClass('active');
-            this.container.show();
-            this.move();
-
-            // Create a click proxy that is private to this instance of datepicker, for unbinding
-            this._outsideClickProxy = $.proxy(function (e) { this.outsideClick(e); }, this);
-            // Bind global datepicker mousedown for hiding and
-            $(document)
-              .on('mousedown.daterangepicker', this._outsideClickProxy)
-              // also support mobile devices
-              .on('touchend.daterangepicker', this._outsideClickProxy)
-              // also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
-              .on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy)
-              // and also close when focus changes to outside the picker (eg. tabbing between controls)
-              .on('focusin.daterangepicker', this._outsideClickProxy);
-
-            this.isShowing = true;
-            this.element.trigger('show.daterangepicker', this);
-        },
-
-        outsideClick: function (e) {
-            var target = $(e.target);
-            // if the page is clicked anywhere except within the daterangerpicker/button
-            // itself then call this.hide()
-            if (
-                // ie modal dialog fix
-                e.type == "focusin" ||
-                target.closest(this.element).length ||
-                target.closest(this.container).length ||
-                target.closest('.calendar-date').length
-                ) return;
-            this.hide();
-        },
-
-        hide: function (e) {
-            if (!this.isShowing) return;
-
-            $(document)
-              .off('.daterangepicker');
-
-            this.element.removeClass('active');
-            this.container.hide();
-
-            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
-                this.notify();
-
-            this.oldStartDate = this.startDate.clone();
-            this.oldEndDate = this.endDate.clone();
-
-            this.isShowing = false;
-            this.element.trigger('hide.daterangepicker', this);
-        },
-
-        enterRange: function (e) {
-            // mouse pointer has entered a range label
-            var label = e.target.innerHTML;
-            if (label == this.locale.customRangeLabel) {
-                this.updateView();
-            } else {
-                var dates = this.ranges[label];
-                this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.format));
-                this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.format));
-            }
-        },
-
-        showCalendars: function() {
-            this.container.addClass('show-calendar');
-            this.move();
-            this.element.trigger('showCalendar.daterangepicker', this);
-        },
-
-        hideCalendars: function() {
-            this.container.removeClass('show-calendar');
-            this.element.trigger('hideCalendar.daterangepicker', this);
-        },
-
-        // when a date is typed into the start to end date textboxes
-        inputsChanged: function (e) {
-            var el = $(e.target);
-            var date = moment(el.val(), this.format);
-            if (!date.isValid()) return;
-
-            var startDate, endDate;
-            if (el.attr('name') === 'daterangepicker_start') {
-                startDate = date;
-                endDate = this.endDate;
-            } else {
-                startDate = this.startDate;
-                endDate = date;
-            }
-            this.setCustomDates(startDate, endDate);
-        },
-
-        inputsKeydown: function(e) {
-            if (e.keyCode === 13) {
-                this.inputsChanged(e);
-                this.notify();
-            }
-        },
-
-        updateInputText: function() {
-            if (this.element.is('input') && !this.singleDatePicker) {
-                this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format));
-            } else if (this.element.is('input')) {
-                this.element.val(this.endDate.format(this.format));
-            }
-        },
-
-        clickRange: function (e) {
-            var label = e.target.innerHTML;
-            this.chosenLabel = label;
-            if (label == this.locale.customRangeLabel) {
-                this.showCalendars();
-            } else {
-                var dates = this.ranges[label];
-
-                this.startDate = dates[0];
-                this.endDate = dates[1];
-
-                if (!this.timePicker) {
-                    this.startDate.startOf('day');
-                    this.endDate.endOf('day');
-                }
-
-                this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
-                this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
-                this.updateCalendars();
-
-                this.updateInputText();
-
-                this.hideCalendars();
-                this.hide();
-                this.element.trigger('apply.daterangepicker', this);
-            }
-        },
-
-        clickPrev: function (e) {
-            var cal = $(e.target).parents('.calendar');
-            if (cal.hasClass('left')) {
-                this.leftCalendar.month.subtract(1, 'month');
-            } else {
-                this.rightCalendar.month.subtract(1, 'month');
-            }
-            this.updateCalendars();
-        },
-
-        clickNext: function (e) {
-            var cal = $(e.target).parents('.calendar');
-            if (cal.hasClass('left')) {
-                this.leftCalendar.month.add(1, 'month');
-            } else {
-                this.rightCalendar.month.add(1, 'month');
-            }
-            this.updateCalendars();
-        },
-
-        hoverDate: function (e) {
-            var title = $(e.target).attr('data-title');
-            var row = title.substr(1, 1);
-            var col = title.substr(3, 1);
-            var cal = $(e.target).parents('.calendar');
-
-            if (cal.hasClass('left')) {
-                this.container.find('input[name=daterangepicker_start]').val(this.leftCalendar.calendar[row][col].format(this.format));
-            } else {
-                this.container.find('input[name=daterangepicker_end]').val(this.rightCalendar.calendar[row][col].format(this.format));
-            }
-        },
-
-        setCustomDates: function(startDate, endDate) {
-            this.chosenLabel = this.locale.customRangeLabel;
-            if (startDate.isAfter(endDate)) {
-                var difference = this.endDate.diff(this.startDate);
-                endDate = moment(startDate).add(difference, 'ms');
-                if (this.maxDate && endDate.isAfter(this.maxDate)) {
-                  endDate = this.maxDate;
-                }
-            }
-            this.startDate = startDate;
-            this.endDate = endDate;
-
-            this.updateView();
-            this.updateCalendars();
-        },
-
-        clickDate: function (e) {
-            var title = $(e.target).attr('data-title');
-            var row = title.substr(1, 1);
-            var col = title.substr(3, 1);
-            var cal = $(e.target).parents('.calendar');
-
-            var startDate, endDate;
-            if (cal.hasClass('left')) {
-                startDate = this.leftCalendar.calendar[row][col];
-                endDate = this.endDate;
-                if (typeof this.dateLimit === 'object') {
-                    var maxDate = moment(startDate).add(this.dateLimit).startOf('day');
-                    if (endDate.isAfter(maxDate)) {
-                        endDate = maxDate;
-                    }
-                }
-            } else {
-                startDate = this.startDate;
-                endDate = this.rightCalendar.calendar[row][col];
-                if (typeof this.dateLimit === 'object') {
-                    var minDate = moment(endDate).subtract(this.dateLimit).startOf('day');
-                    if (startDate.isBefore(minDate)) {
-                        startDate = minDate;
-                    }
-                }
-            }
-
-            if (this.singleDatePicker && cal.hasClass('left')) {
-                endDate = startDate.clone();
-            } else if (this.singleDatePicker && cal.hasClass('right')) {
-                startDate = endDate.clone();
-            }
-
-            cal.find('td').removeClass('active');
-
-            $(e.target).addClass('active');
-
-            this.setCustomDates(startDate, endDate);
-
-            if (!this.timePicker)
-                endDate.endOf('day');
-
-            if (this.singleDatePicker && !this.timePicker)
-                this.clickApply();
-        },
-
-        clickApply: function (e) {
-            this.updateInputText();
-            this.hide();
-            this.element.trigger('apply.daterangepicker', this);
-        },
-
-        clickCancel: function (e) {
-            this.startDate = this.oldStartDate;
-            this.endDate = this.oldEndDate;
-            this.chosenLabel = this.oldChosenLabel;
-            this.updateView();
-            this.updateCalendars();
-            this.hide();
-            this.element.trigger('cancel.daterangepicker', this);
-        },
-
-        updateMonthYear: function (e) {
-            var isLeft = $(e.target).closest('.calendar').hasClass('left'),
-                leftOrRight = isLeft ? 'left' : 'right',
-                cal = this.container.find('.calendar.'+leftOrRight);
-
-            // Month must be Number for new moment versions
-            var month = parseInt(cal.find('.monthselect').val(), 10);
-            var year = cal.find('.yearselect').val();
-
-            this[leftOrRight+'Calendar'].month.month(month).year(year);
-            this.updateCalendars();
-        },
-
-        updateTime: function(e) {
-
-            var cal = $(e.target).closest('.calendar'),
-                isLeft = cal.hasClass('left');
-
-            var hour = parseInt(cal.find('.hourselect').val(), 10);
-            var minute = parseInt(cal.find('.minuteselect').val(), 10);
-            var second = 0;
-
-            if (this.timePickerSeconds) {
-                second = parseInt(cal.find('.secondselect').val(), 10);
-            }
-
-            if (this.timePicker12Hour) {
-                var ampm = cal.find('.ampmselect').val();
-                if (ampm === 'PM' && hour < 12)
-                    hour += 12;
-                if (ampm === 'AM' && hour === 12)
-                    hour = 0;
-            }
-
-            if (isLeft) {
-                var start = this.startDate.clone();
-                start.hour(hour);
-                start.minute(minute);
-                start.second(second);
-                this.startDate = start;
-                this.leftCalendar.month.hour(hour).minute(minute).second(second);
-                if (this.singleDatePicker)
-                    this.endDate = start.clone();
-            } else {
-                var end = this.endDate.clone();
-                end.hour(hour);
-                end.minute(minute);
-                end.second(second);
-                this.endDate = end;
-                if (this.singleDatePicker)
-                    this.startDate = end.clone();
-                this.rightCalendar.month.hour(hour).minute(minute).second(second);
-            }
-
-            this.updateView();
-            this.updateCalendars();
-        },
-
-        updateCalendars: function () {
-            this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), this.leftCalendar.month.second(), 'left');
-            this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), this.rightCalendar.month.second(), 'right');
-            this.container.find('.calendar.left').empty().html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate, 'left'));
-            this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.singleDatePicker ? this.minDate : this.startDate, this.maxDate, 'right'));
-
-            this.container.find('.ranges li').removeClass('active');
-            var customRange = true;
-            var i = 0;
-            for (var range in this.ranges) {
-                if (this.timePicker) {
-                    if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
-                        customRange = false;
-                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
-                            .addClass('active').html();
-                    }
-                } else {
-                    //ignore times when comparing dates if time picker is not enabled
-                    if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
-                        customRange = false;
-                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
-                            .addClass('active').html();
-                    }
-                }
-                i++;
-            }
-            if (customRange) {
-                this.chosenLabel = this.container.find('.ranges li:last').addClass('active').html();
-                this.showCalendars();
-            }
-        },
-
-        buildCalendar: function (month, year, hour, minute, second, side) {
-            var daysInMonth = moment([year, month]).daysInMonth();
-            var firstDay = moment([year, month, 1]);
-            var lastDay = moment([year, month, daysInMonth]);
-            var lastMonth = moment(firstDay).subtract(1, 'month').month();
-            var lastYear = moment(firstDay).subtract(1, 'month').year();
-
-            var daysInLastMonth = moment([lastYear, lastMonth]).daysInMonth();
-
-            var dayOfWeek = firstDay.day();
-
-            var i;
-
-            //initialize a 6 rows x 7 columns array for the calendar
-            var calendar = [];
-            calendar.firstDay = firstDay;
-            calendar.lastDay = lastDay;
-
-            for (i = 0; i < 6; i++) {
-                calendar[i] = [];
-            }
-
-            //populate the calendar with date objects
-            var startDay = daysInLastMonth - dayOfWeek + this.locale.firstDay + 1;
-            if (startDay > daysInLastMonth)
-                startDay -= 7;
-
-            if (dayOfWeek == this.locale.firstDay)
-                startDay = daysInLastMonth - 6;
-
-            var curDate = moment([lastYear, lastMonth, startDay, 12, minute, second]).zone(this.timeZone);
-
-            var col, row;
-            for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add(24, 'hour')) {
-                if (i > 0 && col % 7 === 0) {
-                    col = 0;
-                    row++;
-                }
-                calendar[row][col] = curDate.clone().hour(hour);
-                curDate.hour(12);
-
-                if (this.minDate && calendar[row][col].format('YYYY-MM-DD') == this.minDate.format('YYYY-MM-DD') && calendar[row][col].isBefore(this.minDate) && side == 'left') {
-                    calendar[row][col] = this.minDate.clone();
-                }
-
-                if (this.maxDate && calendar[row][col].format('YYYY-MM-DD') == this.maxDate.format('YYYY-MM-DD') && calendar[row][col].isAfter(this.maxDate) && side == 'right') {
-                    calendar[row][col] = this.maxDate.clone();
-                }
-
-            }
-
-            return calendar;
-        },
-
-        renderDropdowns: function (selected, minDate, maxDate) {
-            var currentMonth = selected.month();
-            var currentYear = selected.year();
-            var maxYear = (maxDate && maxDate.year()) || (currentYear + 5);
-            var minYear = (minDate && minDate.year()) || (currentYear - 50);
-
-            var monthHtml = '<select class="monthselect">';
-            var inMinYear = currentYear == minYear;
-            var inMaxYear = currentYear == maxYear;
-
-            for (var m = 0; m < 12; m++) {
-                if ((!inMinYear || m >= minDate.month()) && (!inMaxYear || m <= maxDate.month())) {
-                    monthHtml += "<option value='" + m + "'" +
-                        (m === currentMonth ? " selected='selected'" : "") +
-                        ">" + this.locale.monthNames[m] + "</option>";
-                }
-            }
-            monthHtml += "</select>";
-
-            var yearHtml = '<select class="yearselect">';
-
-            for (var y = minYear; y <= maxYear; y++) {
-                yearHtml += '<option value="' + y + '"' +
-                    (y === currentYear ? ' selected="selected"' : '') +
-                    '>' + y + '</option>';
-            }
-
-            yearHtml += '</select>';
-
-            return monthHtml + yearHtml;
-        },
-
-        renderCalendar: function (calendar, selected, minDate, maxDate, side) {
-
-            var html = '<div class="calendar-date">';
-            html += '<table class="table-condensed">';
-            html += '<thead>';
-            html += '<tr>';
-
-            // add empty cell for week number
-            if (this.showWeekNumbers)
-                html += '<th></th>';
-
-            if (!minDate || minDate.isBefore(calendar.firstDay)) {
-                html += '<th class="prev available"><i class="fa fa-arrow-left icon icon-arrow-left glyphicon glyphicon-arrow-left"></i></th>';
-            } else {
-                html += '<th></th>';
-            }
-
-            var dateHtml = this.locale.monthNames[calendar[1][1].month()] + calendar[1][1].format(" YYYY");
-
-            if (this.showDropdowns) {
-                dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate);
-            }
-
-            html += '<th colspan="5" class="month">' + dateHtml + '</th>';
-            if (!maxDate || maxDate.isAfter(calendar.lastDay)) {
-                html += '<th class="next available"><i class="fa fa-arrow-right icon icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>';
-            } else {
-                html += '<th></th>';
-            }
-
-            html += '</tr>';
-            html += '<tr>';
-
-            // add week number label
-            if (this.showWeekNumbers)
-                html += '<th class="week">' + this.locale.weekLabel + '</th>';
-
-            $.each(this.locale.daysOfWeek, function (index, dayOfWeek) {
-                html += '<th>' + dayOfWeek + '</th>';
-            });
-
-            html += '</tr>';
-            html += '</thead>';
-            html += '<tbody>';
-
-            for (var row = 0; row < 6; row++) {
-                html += '<tr>';
-
-                // add week number
-                if (this.showWeekNumbers)
-                    html += '<td class="week">' + calendar[row][0].week() + '</td>';
-
-                for (var col = 0; col < 7; col++) {
-                    var cname = 'available ';
-                    cname += (calendar[row][col].month() == calendar[1][1].month()) ? '' : 'off';
-
-                    if ((minDate && calendar[row][col].isBefore(minDate, 'day')) || (maxDate && calendar[row][col].isAfter(maxDate, 'day'))) {
-                        cname = ' off disabled ';
-                    } else if (calendar[row][col].format('YYYY-MM-DD') == selected.format('YYYY-MM-DD')) {
-                        cname += ' active ';
-                        if (calendar[row][col].format('YYYY-MM-DD') == this.startDate.format('YYYY-MM-DD')) {
-                            cname += ' start-date ';
-                        }
-                        if (calendar[row][col].format('YYYY-MM-DD') == this.endDate.format('YYYY-MM-DD')) {
-                            cname += ' end-date ';
-                        }
-                    } else if (calendar[row][col] >= this.startDate && calendar[row][col] <= this.endDate) {
-                        cname += ' in-range ';
-                        if (calendar[row][col].isSame(this.startDate)) { cname += ' start-date '; }
-                        if (calendar[row][col].isSame(this.endDate)) { cname += ' end-date '; }
-                    }
-
-                    var title = 'r' + row + 'c' + col;
-                    html += '<td class="' + cname.replace(/\s+/g, ' ').replace(/^\s?(.*?)\s?$/, '$1') + '" data-title="' + title + '">' + calendar[row][col].date() + '</td>';
-                }
-                html += '</tr>';
-            }
-
-            html += '</tbody>';
-            html += '</table>';
-            html += '</div>';
-
-            var i;
-            if (this.timePicker) {
-
-                html += '<div class="calendar-time">';
-                html += '<select class="hourselect">';
-
-                // Disallow selections before the minDate or after the maxDate
-                var min_hour = 0;
-                var max_hour = 23;
-
-                if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == minDate.format('YYYY-MM-DD')) {
-                    min_hour = minDate.hour();
-                    if (selected.hour() < min_hour)
-                        selected.hour(min_hour);
-                    if (this.timePicker12Hour && min_hour >= 12 && selected.hour() >= 12)
-                        min_hour -= 12;
-                    if (this.timePicker12Hour && min_hour == 12)
-                        min_hour = 1;
-                }
-
-                if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == maxDate.format('YYYY-MM-DD')) {
-                    max_hour = maxDate.hour();
-                    if (selected.hour() > max_hour)
-                        selected.hour(max_hour);
-                    if (this.timePicker12Hour && max_hour >= 12 && selected.hour() >= 12)
-                        max_hour -= 12;
-                }
-
-                var start = 0;
-                var end = 23;
-                var selected_hour = selected.hour();
-                if (this.timePicker12Hour) {
-                    start = 1;
-                    end = 12;
-                    if (selected_hour >= 12)
-                        selected_hour -= 12;
-                    if (selected_hour === 0)
-                        selected_hour = 12;
-                }
-
-                for (i = start; i <= end; i++) {
-
-                    if (i == selected_hour) {
-                        html += '<option value="' + i + '" selected="selected">' + i + '</option>';
-                    } else if (i < min_hour || i > max_hour) {
-                        html += '<option value="' + i + '" disabled="disabled" class="disabled">' + i + '</option>';
-                    } else {
-                        html += '<option value="' + i + '">' + i + '</option>';
-                    }
-                }
-
-                html += '</select> : ';
-
-                html += '<select class="minuteselect">';
-
-                // Disallow selections before the minDate or after the maxDate
-                var min_minute = 0;
-                var max_minute = 59;
-
-                if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD h A') == minDate.format('YYYY-MM-DD h A')) {
-                    min_minute = minDate.minute();
-                    if (selected.minute() < min_minute)
-                        selected.minute(min_minute);
-                }
-
-                if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD h A') == maxDate.format('YYYY-MM-DD h A')) {
-                    max_minute = maxDate.minute();
-                    if (selected.minute() > max_minute)
-                        selected.minute(max_minute);
-                }
-
-                for (i = 0; i < 60; i += this.timePickerIncrement) {
-                    var num = i;
-                    if (num < 10)
-                        num = '0' + num;
-                    if (i == selected.minute()) {
-                        html += '<option value="' + i + '" selected="selected">' + num + '</option>';
-                    } else if (i < min_minute || i > max_minute) {
-                        html += '<option value="' + i + '" disabled="disabled" class="disabled">' + num + '</option>';
-                    } else {
-                        html += '<option value="' + i + '">' + num + '</option>';
-                    }
-                }
-
-                html += '</select> ';
-
-                if (this.timePickerSeconds) {
-                    html += ': <select class="secondselect">';
-
-                    for (i = 0; i < 60; i += this.timePickerIncrement) {
-                        var num = i;
-                        if (num < 10)
-                            num = '0' + num;
-                        if (i == selected.second()) {
-                            html += '<option value="' + i + '" selected="selected">' + num + '</option>';
-                        } else {
-                            html += '<option value="' + i + '">' + num + '</option>';
-                        }
-                    }
-
-                    html += '</select>';
-                }
-
-                if (this.timePicker12Hour) {
-                    html += '<select class="ampmselect">';
-
-                    // Disallow selection before the minDate or after the maxDate
-                    var am_html = '';
-                    var pm_html = '';
-
-                    if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == minDate.format('YYYY-MM-DD') && minDate.hour() >= 12) {
-                        am_html = ' disabled="disabled" class="disabled"';
-                    }
-
-                    if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == maxDate.format('YYYY-MM-DD') && maxDate.hour() < 12) {
-                        pm_html = ' disabled="disabled" class="disabled"';
-                    }
-
-                    if (selected.hour() >= 12) {
-                        html += '<option value="AM"' + am_html + '>AM</option><option value="PM" selected="selected"' + pm_html + '>PM</option>';
-                    } else {
-                        html += '<option value="AM" selected="selected"' + am_html + '>AM</option><option value="PM"' + pm_html + '>PM</option>';
-                    }
-                    html += '</select>';
-                }
-
-                html += '</div>';
-
-            }
-
-            return html;
-
-        },
-
-        remove: function() {
-
-            this.container.remove();
-            this.element.off('.daterangepicker');
-            this.element.removeData('daterangepicker');
-
-        }
-
-    };
-
-    $.fn.daterangepicker = function (options, cb) {
-        this.each(function () {
-            var el = $(this);
-            if (el.data('daterangepicker'))
-                el.data('daterangepicker').remove();
-            el.data('daterangepicker', new DateRangePicker(el, options, cb));
-        });
-        return this;
-    };
-
-}));
diff --git a/culturefeed_search_ui/js/moment.min.js b/culturefeed_search_ui/js/moment.min.js
deleted file mode 100644
index c30bbff2..00000000
--- a/culturefeed_search_ui/js/moment.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//! moment.js
-//! version : 2.8.1
-//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
-//! license : MIT
-//! momentjs.com
-(function(a){function b(a,b,c){switch(arguments.length){case 2:return null!=a?a:b;case 3:return null!=a?a:null!=b?b:c;default:throw new Error("Implement me")}}function c(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function d(a){rb.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function e(a,b){var c=!0;return l(function(){return c&&(d(a),c=!1),b.apply(this,arguments)},b)}function f(a,b){nc[a]||(d(b),nc[a]=!0)}function g(a,b){return function(c){return o(a.call(this,c),b)}}function h(a,b){return function(c){return this.localeData().ordinal(a.call(this,c),b)}}function i(){}function j(a,b){b!==!1&&E(a),m(this,a),this._d=new Date(+a._d)}function k(a){var b=x(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=rb.localeData(),this._bubble()}function l(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return b.hasOwnProperty("toString")&&(a.toString=b.toString),b.hasOwnProperty("valueOf")&&(a.valueOf=b.valueOf),a}function m(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Fb.length>0)for(c in Fb)d=Fb[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function n(a){return 0>a?Math.ceil(a):Math.floor(a)}function o(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function p(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function q(a,b){var c;return b=J(b,a),a.isBefore(b)?c=p(a,b):(c=p(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function r(a,b){return function(c,d){var e,g;return null===d||isNaN(+d)||(f(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),g=c,c=d,d=g),c="string"==typeof c?+c:c,e=rb.duration(c,d),s(this,e,a),this}}function s(a,b,c,d){var e=b._milliseconds,f=b._days,g=b._months;d=null==d?!0:d,e&&a._d.setTime(+a._d+e*c),f&&lb(a,"Date",kb(a,"Date")+f*c),g&&jb(a,kb(a,"Month")+g*c),d&&rb.updateOffset(a,f||g)}function t(a){return"[object Array]"===Object.prototype.toString.call(a)}function u(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function v(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&z(a[d])!==z(b[d]))&&g++;return g+f}function w(a){if(a){var b=a.toLowerCase().replace(/(.)s$/,"$1");a=gc[a]||hc[b]||b}return a}function x(a){var b,c,d={};for(c in a)a.hasOwnProperty(c)&&(b=w(c),b&&(d[b]=a[c]));return d}function y(b){var c,d;if(0===b.indexOf("week"))c=7,d="day";else{if(0!==b.indexOf("month"))return;c=12,d="month"}rb[b]=function(e,f){var g,h,i=rb._locale[b],j=[];if("number"==typeof e&&(f=e,e=a),h=function(a){var b=rb().utc().set(d,a);return i.call(rb._locale,b,e||"")},null!=f)return h(f);for(g=0;c>g;g++)j.push(h(g));return j}}function z(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function A(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function B(a,b,c){return fb(rb([a,11,31+b-c]),b,c).week}function C(a){return D(a)?366:365}function D(a){return a%4===0&&a%100!==0||a%400===0}function E(a){var b;a._a&&-2===a._pf.overflow&&(b=a._a[yb]<0||a._a[yb]>11?yb:a._a[zb]<1||a._a[zb]>A(a._a[xb],a._a[yb])?zb:a._a[Ab]<0||a._a[Ab]>23?Ab:a._a[Bb]<0||a._a[Bb]>59?Bb:a._a[Cb]<0||a._a[Cb]>59?Cb:a._a[Db]<0||a._a[Db]>999?Db:-1,a._pf._overflowDayOfYear&&(xb>b||b>zb)&&(b=zb),a._pf.overflow=b)}function F(a){return null==a._isValid&&(a._isValid=!isNaN(a._d.getTime())&&a._pf.overflow<0&&!a._pf.empty&&!a._pf.invalidMonth&&!a._pf.nullInput&&!a._pf.invalidFormat&&!a._pf.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===a._pf.charsLeftOver&&0===a._pf.unusedTokens.length)),a._isValid}function G(a){return a?a.toLowerCase().replace("_","-"):a}function H(a){for(var b,c,d,e,f=0;f<a.length;){for(e=G(a[f]).split("-"),b=e.length,c=G(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=I(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&v(e,c,!0)>=b-1)break;b--}f++}return null}function I(a){var b=null;if(!Eb[a]&&Gb)try{b=rb.locale(),require("./locale/"+a),rb.locale(b)}catch(c){}return Eb[a]}function J(a,b){return b._isUTC?rb(a).zone(b._offset||0):rb(a).local()}function K(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function L(a){var b,c,d=a.match(Kb);for(b=0,c=d.length;c>b;b++)d[b]=mc[d[b]]?mc[d[b]]:K(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function M(a,b){return a.isValid()?(b=N(b,a.localeData()),ic[b]||(ic[b]=L(b)),ic[b](a)):a.localeData().invalidDate()}function N(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Lb.lastIndex=0;d>=0&&Lb.test(a);)a=a.replace(Lb,c),Lb.lastIndex=0,d-=1;return a}function O(a,b){var c,d=b._strict;switch(a){case"Q":return Wb;case"DDDD":return Yb;case"YYYY":case"GGGG":case"gggg":return d?Zb:Ob;case"Y":case"G":case"g":return _b;case"YYYYYY":case"YYYYY":case"GGGGG":case"ggggg":return d?$b:Pb;case"S":if(d)return Wb;case"SS":if(d)return Xb;case"SSS":if(d)return Yb;case"DDD":return Nb;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return Rb;case"a":case"A":return b._locale._meridiemParse;case"X":return Ub;case"Z":case"ZZ":return Sb;case"T":return Tb;case"SSSS":return Qb;case"MM":case"DD":case"YY":case"GG":case"gg":case"HH":case"hh":case"mm":case"ss":case"ww":case"WW":return d?Xb:Mb;case"M":case"D":case"d":case"H":case"h":case"m":case"s":case"w":case"W":case"e":case"E":return Mb;case"Do":return Vb;default:return c=new RegExp(X(W(a.replace("\\","")),"i"))}}function P(a){a=a||"";var b=a.match(Sb)||[],c=b[b.length-1]||[],d=(c+"").match(ec)||["-",0,0],e=+(60*d[1])+z(d[2]);return"+"===d[0]?-e:e}function Q(a,b,c){var d,e=c._a;switch(a){case"Q":null!=b&&(e[yb]=3*(z(b)-1));break;case"M":case"MM":null!=b&&(e[yb]=z(b)-1);break;case"MMM":case"MMMM":d=c._locale.monthsParse(b),null!=d?e[yb]=d:c._pf.invalidMonth=b;break;case"D":case"DD":null!=b&&(e[zb]=z(b));break;case"Do":null!=b&&(e[zb]=z(parseInt(b,10)));break;case"DDD":case"DDDD":null!=b&&(c._dayOfYear=z(b));break;case"YY":e[xb]=rb.parseTwoDigitYear(b);break;case"YYYY":case"YYYYY":case"YYYYYY":e[xb]=z(b);break;case"a":case"A":c._isPm=c._locale.isPM(b);break;case"H":case"HH":case"h":case"hh":e[Ab]=z(b);break;case"m":case"mm":e[Bb]=z(b);break;case"s":case"ss":e[Cb]=z(b);break;case"S":case"SS":case"SSS":case"SSSS":e[Db]=z(1e3*("0."+b));break;case"X":c._d=new Date(1e3*parseFloat(b));break;case"Z":case"ZZ":c._useUTC=!0,c._tzm=P(b);break;case"dd":case"ddd":case"dddd":d=c._locale.weekdaysParse(b),null!=d?(c._w=c._w||{},c._w.d=d):c._pf.invalidWeekday=b;break;case"w":case"ww":case"W":case"WW":case"d":case"e":case"E":a=a.substr(0,1);case"gggg":case"GGGG":case"GGGGG":a=a.substr(0,2),b&&(c._w=c._w||{},c._w[a]=z(b));break;case"gg":case"GG":c._w=c._w||{},c._w[a]=rb.parseTwoDigitYear(b)}}function R(a){var c,d,e,f,g,h,i;c=a._w,null!=c.GG||null!=c.W||null!=c.E?(g=1,h=4,d=b(c.GG,a._a[xb],fb(rb(),1,4).year),e=b(c.W,1),f=b(c.E,1)):(g=a._locale._week.dow,h=a._locale._week.doy,d=b(c.gg,a._a[xb],fb(rb(),g,h).year),e=b(c.w,1),null!=c.d?(f=c.d,g>f&&++e):f=null!=c.e?c.e+g:g),i=gb(d,e,f,h,g),a._a[xb]=i.year,a._dayOfYear=i.dayOfYear}function S(a){var c,d,e,f,g=[];if(!a._d){for(e=U(a),a._w&&null==a._a[zb]&&null==a._a[yb]&&R(a),a._dayOfYear&&(f=b(a._a[xb],e[xb]),a._dayOfYear>C(f)&&(a._pf._overflowDayOfYear=!0),d=bb(f,0,a._dayOfYear),a._a[yb]=d.getUTCMonth(),a._a[zb]=d.getUTCDate()),c=0;3>c&&null==a._a[c];++c)a._a[c]=g[c]=e[c];for(;7>c;c++)a._a[c]=g[c]=null==a._a[c]?2===c?1:0:a._a[c];a._d=(a._useUTC?bb:ab).apply(null,g),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()+a._tzm)}}function T(a){var b;a._d||(b=x(a._i),a._a=[b.year,b.month,b.day,b.hour,b.minute,b.second,b.millisecond],S(a))}function U(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function V(a){if(a._f===rb.ISO_8601)return void Z(a);a._a=[],a._pf.empty=!0;var b,c,d,e,f,g=""+a._i,h=g.length,i=0;for(d=N(a._f,a._locale).match(Kb)||[],b=0;b<d.length;b++)e=d[b],c=(g.match(O(e,a))||[])[0],c&&(f=g.substr(0,g.indexOf(c)),f.length>0&&a._pf.unusedInput.push(f),g=g.slice(g.indexOf(c)+c.length),i+=c.length),mc[e]?(c?a._pf.empty=!1:a._pf.unusedTokens.push(e),Q(e,c,a)):a._strict&&!c&&a._pf.unusedTokens.push(e);a._pf.charsLeftOver=h-i,g.length>0&&a._pf.unusedInput.push(g),a._isPm&&a._a[Ab]<12&&(a._a[Ab]+=12),a._isPm===!1&&12===a._a[Ab]&&(a._a[Ab]=0),S(a),E(a)}function W(a){return a.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e})}function X(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function Y(a){var b,d,e,f,g;if(0===a._f.length)return a._pf.invalidFormat=!0,void(a._d=new Date(0/0));for(f=0;f<a._f.length;f++)g=0,b=m({},a),b._pf=c(),b._f=a._f[f],V(b),F(b)&&(g+=b._pf.charsLeftOver,g+=10*b._pf.unusedTokens.length,b._pf.score=g,(null==e||e>g)&&(e=g,d=b));l(a,d||b)}function Z(a){var b,c,d=a._i,e=ac.exec(d);if(e){for(a._pf.iso=!0,b=0,c=cc.length;c>b;b++)if(cc[b][1].exec(d)){a._f=cc[b][0]+(e[6]||" ");break}for(b=0,c=dc.length;c>b;b++)if(dc[b][1].exec(d)){a._f+=dc[b][0];break}d.match(Sb)&&(a._f+="Z"),V(a)}else a._isValid=!1}function $(a){Z(a),a._isValid===!1&&(delete a._isValid,rb.createFromInputFallback(a))}function _(b){var c,d=b._i;d===a?b._d=new Date:u(d)?b._d=new Date(+d):null!==(c=Hb.exec(d))?b._d=new Date(+c[1]):"string"==typeof d?$(b):t(d)?(b._a=d.slice(0),S(b)):"object"==typeof d?T(b):"number"==typeof d?b._d=new Date(d):rb.createFromInputFallback(b)}function ab(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function bb(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function cb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function db(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function eb(a,b,c){var d=rb.duration(a).abs(),e=wb(d.as("s")),f=wb(d.as("m")),g=wb(d.as("h")),h=wb(d.as("d")),i=wb(d.as("M")),j=wb(d.as("y")),k=e<jc.s&&["s",e]||1===f&&["m"]||f<jc.m&&["mm",f]||1===g&&["h"]||g<jc.h&&["hh",g]||1===h&&["d"]||h<jc.d&&["dd",h]||1===i&&["M"]||i<jc.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,db.apply({},k)}function fb(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=rb(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function gb(a,b,c,d,e){var f,g,h=bb(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:C(a-1)+g}}function hb(b){var c=b._i,d=b._f;return b._locale=b._locale||rb.localeData(b._l),null===c||d===a&&""===c?rb.invalid({nullInput:!0}):("string"==typeof c&&(b._i=c=b._locale.preparse(c)),rb.isMoment(c)?new j(c,!0):(d?t(d)?Y(b):V(b):_(b),new j(b)))}function ib(a,b){var c,d;if(1===b.length&&t(b[0])&&(b=b[0]),!b.length)return rb();for(c=b[0],d=1;d<b.length;++d)b[d][a](c)&&(c=b[d]);return c}function jb(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),A(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function kb(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function lb(a,b,c){return"Month"===b?jb(a,c):a._d["set"+(a._isUTC?"UTC":"")+b](c)}function mb(a,b){return function(c){return null!=c?(lb(this,a,c),rb.updateOffset(this,b),this):kb(this,a)}}function nb(a){return 400*a/146097}function ob(a){return 146097*a/400}function pb(a){rb.duration.fn[a]=function(){return this._data[a]}}function qb(a){"undefined"==typeof ender&&(sb=vb.moment,vb.moment=a?e("Accessing Moment through the global scope is deprecated, and will be removed in an upcoming release.",rb):rb)}for(var rb,sb,tb,ub="2.8.1",vb="undefined"!=typeof global?global:this,wb=Math.round,xb=0,yb=1,zb=2,Ab=3,Bb=4,Cb=5,Db=6,Eb={},Fb=[],Gb="undefined"!=typeof module&&module.exports,Hb=/^\/?Date\((\-?\d+)/i,Ib=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,Jb=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,Kb=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g,Lb=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,Mb=/\d\d?/,Nb=/\d{1,3}/,Ob=/\d{1,4}/,Pb=/[+\-]?\d{1,6}/,Qb=/\d+/,Rb=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Sb=/Z|[\+\-]\d\d:?\d\d/gi,Tb=/T/i,Ub=/[\+\-]?\d+(\.\d{1,3})?/,Vb=/\d{1,2}/,Wb=/\d/,Xb=/\d\d/,Yb=/\d{3}/,Zb=/\d{4}/,$b=/[+-]?\d{6}/,_b=/[+-]?\d+/,ac=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,bc="YYYY-MM-DDTHH:mm:ssZ",cc=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],dc=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ec=/([\+\-]|\d\d)/gi,fc=("Date|Hours|Minutes|Seconds|Milliseconds".split("|"),{Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6}),gc={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",D:"date",w:"week",W:"isoWeek",M:"month",Q:"quarter",y:"year",DDD:"dayOfYear",e:"weekday",E:"isoWeekday",gg:"weekYear",GG:"isoWeekYear"},hc={dayofyear:"dayOfYear",isoweekday:"isoWeekday",isoweek:"isoWeek",weekyear:"weekYear",isoweekyear:"isoWeekYear"},ic={},jc={s:45,m:45,h:22,d:26,M:11},kc="DDD w W M D d".split(" "),lc="M D H h m s w W".split(" "),mc={M:function(){return this.month()+1},MMM:function(a){return this.localeData().monthsShort(this,a)},MMMM:function(a){return this.localeData().months(this,a)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(a){return this.localeData().weekdaysMin(this,a)},ddd:function(a){return this.localeData().weekdaysShort(this,a)},dddd:function(a){return this.localeData().weekdays(this,a)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return o(this.year()%100,2)},YYYY:function(){return o(this.year(),4)},YYYYY:function(){return o(this.year(),5)},YYYYYY:function(){var a=this.year(),b=a>=0?"+":"-";return b+o(Math.abs(a),6)},gg:function(){return o(this.weekYear()%100,2)},gggg:function(){return o(this.weekYear(),4)},ggggg:function(){return o(this.weekYear(),5)},GG:function(){return o(this.isoWeekYear()%100,2)},GGGG:function(){return o(this.isoWeekYear(),4)},GGGGG:function(){return o(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return z(this.milliseconds()/100)},SS:function(){return o(z(this.milliseconds()/10),2)},SSS:function(){return o(this.milliseconds(),3)},SSSS:function(){return o(this.milliseconds(),3)},Z:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+o(z(a/60),2)+":"+o(z(a)%60,2)},ZZ:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+o(z(a/60),2)+o(z(a)%60,2)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()},Q:function(){return this.quarter()}},nc={},oc=["months","monthsShort","weekdays","weekdaysShort","weekdaysMin"];kc.length;)tb=kc.pop(),mc[tb+"o"]=h(mc[tb],tb);for(;lc.length;)tb=lc.pop(),mc[tb+tb]=g(mc[tb],2);mc.DDDD=g(mc.DDD,3),l(i.prototype,{set:function(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(a){return this._months[a.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(a){return this._monthsShort[a.month()]},monthsParse:function(a){var b,c,d;for(this._monthsParse||(this._monthsParse=[]),b=0;12>b;b++)if(this._monthsParse[b]||(c=rb.utc([2e3,b]),d="^"+this.months(c,"")+"|^"+this.monthsShort(c,""),this._monthsParse[b]=new RegExp(d.replace(".",""),"i")),this._monthsParse[b].test(a))return b},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(a){return this._weekdays[a.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(a){return this._weekdaysShort[a.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(a){return this._weekdaysMin[a.day()]},weekdaysParse:function(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=rb([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},longDateFormat:function(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b},isPM:function(a){return"p"===(a+"").toLowerCase().charAt(0)},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(a,b){var c=this._calendar[a];return"function"==typeof c?c.apply(b):c},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)},pastFuture:function(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)},ordinal:function(a){return this._ordinal.replace("%d",a)},_ordinal:"%d",preparse:function(a){return a},postformat:function(a){return a},week:function(a){return fb(a,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6},_invalidDate:"Invalid date",invalidDate:function(){return this._invalidDate}}),rb=function(b,d,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._i=b,g._f=d,g._l=e,g._strict=f,g._isUTC=!1,g._pf=c(),hb(g)},rb.suppressDeprecationWarnings=!1,rb.createFromInputFallback=e("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i)}),rb.min=function(){var a=[].slice.call(arguments,0);return ib("isBefore",a)},rb.max=function(){var a=[].slice.call(arguments,0);return ib("isAfter",a)},rb.utc=function(b,d,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._useUTC=!0,g._isUTC=!0,g._l=e,g._i=b,g._f=d,g._strict=f,g._pf=c(),hb(g).utc()},rb.unix=function(a){return rb(1e3*a)},rb.duration=function(a,b){var c,d,e,f,g=a,h=null;return rb.isDuration(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=Ib.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:z(h[zb])*c,h:z(h[Ab])*c,m:z(h[Bb])*c,s:z(h[Cb])*c,ms:z(h[Db])*c}):(h=Jb.exec(a))?(c="-"===h[1]?-1:1,e=function(a){var b=a&&parseFloat(a.replace(",","."));return(isNaN(b)?0:b)*c},g={y:e(h[2]),M:e(h[3]),d:e(h[4]),h:e(h[5]),m:e(h[6]),s:e(h[7]),w:e(h[8])}):"object"==typeof g&&("from"in g||"to"in g)&&(f=q(rb(g.from),rb(g.to)),g={},g.ms=f.milliseconds,g.M=f.months),d=new k(g),rb.isDuration(a)&&a.hasOwnProperty("_locale")&&(d._locale=a._locale),d},rb.version=ub,rb.defaultFormat=bc,rb.ISO_8601=function(){},rb.momentProperties=Fb,rb.updateOffset=function(){},rb.relativeTimeThreshold=function(b,c){return jc[b]===a?!1:c===a?jc[b]:(jc[b]=c,!0)},rb.lang=e("moment.lang is deprecated. Use moment.locale instead.",function(a,b){return rb.locale(a,b)}),rb.locale=function(a,b){var c;return a&&(c="undefined"!=typeof b?rb.defineLocale(a,b):rb.localeData(a),c&&(rb.duration._locale=rb._locale=c)),rb._locale._abbr},rb.defineLocale=function(a,b){return null!==b?(b.abbr=a,Eb[a]||(Eb[a]=new i),Eb[a].set(b),rb.locale(a),Eb[a]):(delete Eb[a],null)},rb.langData=e("moment.langData is deprecated. Use moment.localeData instead.",function(a){return rb.localeData(a)}),rb.localeData=function(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return rb._locale;if(!t(a)){if(b=I(a))return b;a=[a]}return H(a)},rb.isMoment=function(a){return a instanceof j||null!=a&&a.hasOwnProperty("_isAMomentObject")},rb.isDuration=function(a){return a instanceof k};for(tb=oc.length-1;tb>=0;--tb)y(oc[tb]);rb.normalizeUnits=function(a){return w(a)},rb.invalid=function(a){var b=rb.utc(0/0);return null!=a?l(b._pf,a):b._pf.userInvalidated=!0,b},rb.parseZone=function(){return rb.apply(null,arguments).parseZone()},rb.parseTwoDigitYear=function(a){return z(a)+(z(a)>68?1900:2e3)},l(rb.fn=j.prototype,{clone:function(){return rb(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){var a=rb(this).utc();return 0<a.year()&&a.year()<=9999?M(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):M(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds()]},isValid:function(){return F(this)},isDSTShifted:function(){return this._a?this.isValid()&&v(this._a,(this._isUTC?rb.utc(this._a):rb(this._a)).toArray())>0:!1},parsingFlags:function(){return l({},this._pf)},invalidAt:function(){return this._pf.overflow},utc:function(a){return this.zone(0,a)},local:function(a){return this._isUTC&&(this.zone(0,a),this._isUTC=!1,a&&this.add(this._d.getTimezoneOffset(),"m")),this},format:function(a){var b=M(this,a||rb.defaultFormat);return this.localeData().postformat(b)},add:r(1,"add"),subtract:r(-1,"subtract"),diff:function(a,b,c){var d,e,f=J(a,this),g=6e4*(this.zone()-f.zone());return b=w(b),"year"===b||"month"===b?(d=432e5*(this.daysInMonth()+f.daysInMonth()),e=12*(this.year()-f.year())+(this.month()-f.month()),e+=(this-rb(this).startOf("month")-(f-rb(f).startOf("month")))/d,e-=6e4*(this.zone()-rb(this).startOf("month").zone()-(f.zone()-rb(f).startOf("month").zone()))/d,"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:n(e)},from:function(a,b){return rb.duration({to:this,from:a}).locale(this.locale()).humanize(!b)},fromNow:function(a){return this.from(rb(),a)},calendar:function(a){var b=a||rb(),c=J(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this))},isLeapYear:function(){return D(this.year())},isDST:function(){return this.zone()<this.clone().month(0).zone()||this.zone()<this.clone().month(5).zone()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=cb(a,this.localeData()),this.add(a-b,"d")):b},month:mb("Month",!0),startOf:function(a){switch(a=w(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a?this.weekday(0):"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this},endOf:function(a){return a=w(a),this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")},isAfter:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)>+rb(a).startOf(b)},isBefore:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)<+rb(a).startOf(b)},isSame:function(a,b){return b=b||"ms",+this.clone().startOf(b)===+J(a,this).startOf(b)},min:e("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(a){return a=rb.apply(null,arguments),this>a?this:a}),max:e("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(a){return a=rb.apply(null,arguments),a>this?this:a}),zone:function(a,b){var c,d=this._offset||0;return null==a?this._isUTC?d:this._d.getTimezoneOffset():("string"==typeof a&&(a=P(a)),Math.abs(a)<16&&(a=60*a),!this._isUTC&&b&&(c=this._d.getTimezoneOffset()),this._offset=a,this._isUTC=!0,null!=c&&this.subtract(c,"m"),d!==a&&(!b||this._changeInProgress?s(this,rb.duration(d-a,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,rb.updateOffset(this,!0),this._changeInProgress=null)),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},parseZone:function(){return this._tzm?this.zone(this._tzm):"string"==typeof this._i&&this.zone(this._i),this},hasAlignedHourOffset:function(a){return a=a?rb(a).zone():0,(this.zone()-a)%60===0},daysInMonth:function(){return A(this.year(),this.month())},dayOfYear:function(a){var b=wb((rb(this).startOf("day")-rb(this).startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")},quarter:function(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)},weekYear:function(a){var b=fb(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")},isoWeekYear:function(a){var b=fb(this,1,4).year;return null==a?b:this.add(a-b,"y")},week:function(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")},isoWeek:function(a){var b=fb(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")},weekday:function(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")},isoWeekday:function(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)},isoWeeksInYear:function(){return B(this.year(),1,4)},weeksInYear:function(){var a=this.localeData()._week;return B(this.year(),a.dow,a.doy)},get:function(a){return a=w(a),this[a]()},set:function(a,b){return a=w(a),"function"==typeof this[a]&&this[a](b),this},locale:function(b){return b===a?this._locale._abbr:(this._locale=rb.localeData(b),this)},lang:e("moment().lang() is deprecated. Use moment().localeData() instead.",function(b){return b===a?this.localeData():(this._locale=rb.localeData(b),this)}),localeData:function(){return this._locale}}),rb.fn.millisecond=rb.fn.milliseconds=mb("Milliseconds",!1),rb.fn.second=rb.fn.seconds=mb("Seconds",!1),rb.fn.minute=rb.fn.minutes=mb("Minutes",!1),rb.fn.hour=rb.fn.hours=mb("Hours",!0),rb.fn.date=mb("Date",!0),rb.fn.dates=e("dates accessor is deprecated. Use date instead.",mb("Date",!0)),rb.fn.year=mb("FullYear",!0),rb.fn.years=e("years accessor is deprecated. Use year instead.",mb("FullYear",!0)),rb.fn.days=rb.fn.day,rb.fn.months=rb.fn.month,rb.fn.weeks=rb.fn.week,rb.fn.isoWeeks=rb.fn.isoWeek,rb.fn.quarters=rb.fn.quarter,rb.fn.toJSON=rb.fn.toISOString,l(rb.duration.fn=k.prototype,{_bubble:function(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;g.milliseconds=d%1e3,a=n(d/1e3),g.seconds=a%60,b=n(a/60),g.minutes=b%60,c=n(b/60),g.hours=c%24,e+=n(c/24),h=n(nb(e)),e-=n(ob(h)),f+=n(e/30),e%=30,h+=n(f/12),f%=12,g.days=e,g.months=f,g.years=h},abs:function(){return this._milliseconds=Math.abs(this._milliseconds),this._days=Math.abs(this._days),this._months=Math.abs(this._months),this._data.milliseconds=Math.abs(this._data.milliseconds),this._data.seconds=Math.abs(this._data.seconds),this._data.minutes=Math.abs(this._data.minutes),this._data.hours=Math.abs(this._data.hours),this._data.months=Math.abs(this._data.months),this._data.years=Math.abs(this._data.years),this},weeks:function(){return n(this.days()/7)},valueOf:function(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*z(this._months/12)},humanize:function(a){var b=eb(this,!a,this.localeData());return a&&(b=this.localeData().pastFuture(+this,b)),this.localeData().postformat(b)},add:function(a,b){var c=rb.duration(a,b);return this._milliseconds+=c._milliseconds,this._days+=c._days,this._months+=c._months,this._bubble(),this},subtract:function(a,b){var c=rb.duration(a,b);return this._milliseconds-=c._milliseconds,this._days-=c._days,this._months-=c._months,this._bubble(),this},get:function(a){return a=w(a),this[a.toLowerCase()+"s"]()},as:function(a){var b,c;if(a=w(a),b=this._days+this._milliseconds/864e5,"month"===a||"year"===a)return c=this._months+12*nb(b),"month"===a?c:c/12;switch(b+=ob(this._months/12),a){case"week":return b/7;case"day":return b;case"hour":return 24*b;case"minute":return 24*b*60;case"second":return 24*b*60*60;case"millisecond":return 24*b*60*60*1e3;default:throw new Error("Unknown unit "+a)}},lang:rb.fn.lang,locale:rb.fn.locale,toIsoString:e("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",function(){return this.toISOString()}),toISOString:function(){var a=Math.abs(this.years()),b=Math.abs(this.months()),c=Math.abs(this.days()),d=Math.abs(this.hours()),e=Math.abs(this.minutes()),f=Math.abs(this.seconds()+this.milliseconds()/1e3);return this.asSeconds()?(this.asSeconds()<0?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"},localeData:function(){return this._locale}});for(tb in fc)fc.hasOwnProperty(tb)&&pb(tb.toLowerCase());rb.duration.fn.asMilliseconds=function(){return this.as("ms")},rb.duration.fn.asSeconds=function(){return this.as("s")},rb.duration.fn.asMinutes=function(){return this.as("m")},rb.duration.fn.asHours=function(){return this.as("h")},rb.duration.fn.asDays=function(){return this.as("d")},rb.duration.fn.asWeeks=function(){return this.as("weeks")},rb.duration.fn.asMonths=function(){return this.as("M")},rb.duration.fn.asYears=function(){return this.as("y")},rb.locale("en",{ordinal:function(a){var b=a%10,c=1===z(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),Gb?module.exports=rb:"function"==typeof define&&define.amd?(define("moment",function(a,b,c){return c.config&&c.config()&&c.config().noGlobal===!0&&(vb.moment=sb),rb}),qb(!0)):qb()}).call(this);
\ No newline at end of file
diff --git a/culturefeed_search_ui/js/search_ui.js b/culturefeed_search_ui/js/search_ui.js
index 8e861ef4..7c50fde6 100644
--- a/culturefeed_search_ui/js/search_ui.js
+++ b/culturefeed_search_ui/js/search_ui.js
@@ -13,7 +13,7 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {};
      if ($('#edit-sort').length > 0) {
        Drupal.CulturefeedSearch.bindSortDropdown();
      }
-     if ($('#specific-dates-range').length > 0) {
+     if ($('#edit-date-range').length > 0) {
        Drupal.CulturefeedSearch.bindDatePicker();
      }
 
@@ -26,69 +26,21 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {};
    * Bind the datepicker functionality.
    */
   Drupal.CulturefeedSearch.bindDatePicker = function() {
-    var format = 'DD/MM/YYYY';
-    var from = moment($('#edit-date-from').val(), format, true).isValid()
-      ? $('#edit-date-from').val() : null;
-    var to = moment($('#edit-date-to').val(), format, true).isValid()
-      ? $('#edit-date-to').val() : null;
-
-    $('#edit-date-from').hide();
-    $('#edit-date-to').hide();
-    $('#submit-specific-dates').hide();
-
-    if (from && to) {
-      $('#specific-dates-range span').html(from + ' - ' + to);
-    }
-
-    $('#specific-dates-range').daterangepicker({
-      format: format,
-      startDate: from ? from : moment(),
-      endDate: to ? to : moment(),
-      opens: 'right',
-      showWeekNumbers: false,
-      applyClass: "btn-primary",
-      cancelClass: "btn-link",
-      locale: {
-        cancelLabel: Drupal.t('Cancel'),
-        applyLabel: Drupal.t('Apply'),
-        fromLabel: Drupal.t('Between'),
-        toLabel: Drupal.t('And'),
-        monthNames: [
-          Drupal.t('January'),
-          Drupal.t('February'),
-          Drupal.t('March'),
-          Drupal.t('April'),
-          Drupal.t('May'),
-          Drupal.t('June'),
-          Drupal.t('July'),
-          Drupal.t('August'),
-          Drupal.t('September'),
-          Drupal.t('October'),
-          Drupal.t('November'),
-          Drupal.t('December')
-        ],
-        daysOfWeek: [
-          Drupal.t('Sun'),
-          Drupal.t('Mon'),
-          Drupal.t('Tue'),
-          Drupal.t('Wed'),
-          Drupal.t('Thu'),
-          Drupal.t('Fri'),
-          Drupal.t('Sat')
-        ],
-        firstDay: 1
-      }
-    }, function(start, end) {
-      var from = start.format(format);
-      var to = end.format(format);
-      $('#specific-dates-range span').html(from + ' - ' + to);
-      $('#edit-date-from').val(from);
-      $('#edit-date-to').val(to);
-      $('#specific-dates-range').closest('form').submit();
-    }).click(function (e) {
-      e.preventDefault();
+    $('#edit-date-range').daterangepicker({
+      presetRanges: [],
+      presets : {
+        specificDate: Drupal.t('Specific date'),
+        dateRange: Drupal.t('Period from/to')
+      },
+      rangeStartTitle: Drupal.t('Start date'),
+      rangeEndTitle: Drupal.t('End date'),
+      doneButtonText: Drupal.t('OK'),
+      dateFormat: 'd/m/yy',
+      earliestDate : Date.parse(),
+      constrainDates : true,
+      appendTo: '.form-item-date-range'
     });
-  };
+  }
 
   /**
    * Click listener on autosubmit fields.
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index d85bb043..eeac29b2 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -398,17 +398,27 @@ public function loadPage() {
   protected function addFacetFilters($params) {
 
     // Add the date range facet.
-    if (!empty($params['date_from']) && !empty($params['date_to'])
-        && ($startDate = DateTime::createFromFormat('d/m/Y', $params['date_from']))
-        && ($endDate = DateTime::createFromFormat('d/m/Y', $params['date_to']))) {
+    if (isset($params['date_range'])) {
+
+      $dates = explode('-', $params['date_range']);
+      $startDate = DateTime::createFromFormat('d/m/Y', trim($dates[0]));
+      if ($startDate) {
+        $endDate = clone $startDate;
+        if (isset($dates[1])) {
+          $endDateTime = DateTime::createFromFormat('d/m/Y', trim($dates[1]));
+          if ($endDateTime) {
+            $endDate = $endDateTime;
+          }
+        }
 
-      // Set start date time on beginning of the day.
-      $startDate->setTime(0, 0, 0);
+        // Set start date time on beginning of the day.
+        $startDate->setTime(0, 0, 0);
 
-      // Set end date time to end of the day day, to it searches on full day.
-      $endDate->setTime(23, 59, 59);
+        // Set end date time to end of the day day, to it searches on full day.
+        $endDate->setTime(23, 59, 59);
 
-      $this->parameters[] = new Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
+        $this->parameters[] = new Parameter\DateRangeFilterQuery('startdate', $startDate->getTimestamp(), $endDate->getTimestamp());
+      }
     }
 
     // Add search on coordinates.
diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 770eaf8d..30f13a43 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -410,8 +410,8 @@ function culturefeed_search_ui_preprocess_culturefeed_search_facet_item(&$variab
   }
 
   // When the facet is datetype, we don't want to keep a date range filter..
-  if ($facet_key == 'datetype') {
-    unset($query['date_from'], $query['date_to']);
+  if ($facet_key == 'datetype' && isset($query['date_range'])) {
+    unset($query['date_range']);
   }
 
   // Agefrom facet is active when min_age is given.
diff --git a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
index df979406..c8cfe6c8 100644
--- a/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
+++ b/culturefeed_search_ui/translations/culturefeed_search_ui.nl.po
@@ -9,9 +9,9 @@
 #  culturefeed_search_ui.info: n/a
 #  culturefeed_search_ui.install: n/a
 #  includes/blocks.inc: n/a
-#  js/search_ui.js: n/a
 #  includes/helpers.inc: n/a
 #  includes/pages.inc: n/a
+#  js/search_ui.js: n/a
 #  lib/Drupal/CultureFeedSearchPage.php: n/a
 #  theme/culturefeed-search-list.tpl.php: n/a
 #  theme/culturefeed-search-block-filter-links-item.tpl.php: n/a
@@ -22,8 +22,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2015-05-11 16:43+0200\n"
-"PO-Revision-Date: 2015-05-12 08:16+0100\n"
+"POT-Creation-Date: 2015-03-18 20:21+0100\n"
+"PO-Revision-Date: 2015-03-18 20:36+0100\n"
 "Last-Translator: Luk Dens <luk.dens@cultuurnet.be>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
@@ -46,165 +46,165 @@ msgstr ""
 msgid "Change CultureFeed Search UI sort settings."
 msgstr ""
 
-#: culturefeed_search_ui.module:367
+#: culturefeed_search_ui.module:354
 msgid "Culturefeed search: search events and pages"
 msgstr "Culturefeed search: zoek activiteiten en pagina's"
 
-#: culturefeed_search_ui.module:372
+#: culturefeed_search_ui.module:359
 msgid "Culturefeed search: sort order"
 msgstr "Culturefeed search: zoekresultaten sorteren"
 
-#: culturefeed_search_ui.module:377
+#: culturefeed_search_ui.module:364
 msgid "Culturefeed search: active filters"
 msgstr "Culturefeed search: actieve filters"
 
-#: culturefeed_search_ui.module:382
+#: culturefeed_search_ui.module:369
 msgid "Culturefeed search: facet entity type"
 msgstr ""
 
-#: culturefeed_search_ui.module:387
+#: culturefeed_search_ui.module:374
 msgid "Culturefeed search: facet when"
 msgstr "Culturefeed search: facet wanneer"
 
-#: culturefeed_search_ui.module:392
+#: culturefeed_search_ui.module:379
 msgid "Culturefeed search: facet where"
 msgstr "Culturefeed search: facet waar"
 
-#: culturefeed_search_ui.module:397
+#: culturefeed_search_ui.module:384
 msgid "Culturefeed search: facet where - search only on cities and zipcodes"
 msgstr ""
 
-#: culturefeed_search_ui.module:402
+#: culturefeed_search_ui.module:389
 msgid "Facet: Age range"
 msgstr ""
 
-#: culturefeed_search_ui.module:407
+#: culturefeed_search_ui.module:394
 msgid "Culturefeed search: Filter form"
 msgstr ""
 
-#: culturefeed_search_ui.module:413
+#: culturefeed_search_ui.module:400
 msgid "Culturefeed search: location search"
 msgstr ""
 
-#: culturefeed_search_ui.module:417
+#: culturefeed_search_ui.module:404
 msgid "Culturefeed search: Filter form 2"
 msgstr ""
 
-#: culturefeed_search_ui.module:425
+#: culturefeed_search_ui.module:412
 msgid "Culturefeed search: facet @label"
 msgstr ""
 
-#: culturefeed_search_ui.module:444
+#: culturefeed_search_ui.module:431
 msgid "Sort facet on"
 msgstr ""
 
-#: culturefeed_search_ui.module:446
+#: culturefeed_search_ui.module:433
 msgid "Default sorting"
 msgstr ""
 
-#: culturefeed_search_ui.module:447
+#: culturefeed_search_ui.module:434
 msgid "Alphabetically"
 msgstr ""
 
-#: culturefeed_search_ui.module:448
+#: culturefeed_search_ui.module:435
 msgid "Total results"
 msgstr ""
 
-#: culturefeed_search_ui.module:455
+#: culturefeed_search_ui.module:442
 msgid "Highest facet level"
 msgstr ""
 
-#: culturefeed_search_ui.module:457
+#: culturefeed_search_ui.module:444
 msgid "Level 1"
 msgstr ""
 
-#: culturefeed_search_ui.module:458
+#: culturefeed_search_ui.module:445
 msgid "Level 2"
 msgstr ""
 
-#: culturefeed_search_ui.module:459
+#: culturefeed_search_ui.module:446
 msgid "Level 3"
 msgstr ""
 
-#: culturefeed_search_ui.module:460
+#: culturefeed_search_ui.module:447
 msgid "Level 4"
 msgstr ""
 
-#: culturefeed_search_ui.module:462
+#: culturefeed_search_ui.module:449
 msgid ""
 "The highest level of facets to show. Should probably be level 1. If the "
 "highest level does not exist, the level above it will be used."
 msgstr ""
 
-#: culturefeed_search_ui.module:467
+#: culturefeed_search_ui.module:454
 msgid "Show subitems"
 msgstr ""
 
-#: culturefeed_search_ui.module:468
+#: culturefeed_search_ui.module:455
 msgid ""
 "Check this if the facets of lower levels should be shown when a facet option "
 "is selected."
 msgstr ""
 
-#: culturefeed_search_ui.module:482
+#: culturefeed_search_ui.module:469
 msgid "Show only selected options"
 msgstr ""
 
-#: culturefeed_search_ui.module:491
+#: culturefeed_search_ui.module:478
 msgid "Show the facet only when an eventtype is chosen"
 msgstr "Toon de facet enkel wanneer een eventtype is gekozen"
 
-#: culturefeed_search_ui.module:500
+#: culturefeed_search_ui.module:487
 msgid "Limit autocomplete options to selected parents"
 msgstr ""
 
-#: culturefeed_search_ui.module:551
+#: culturefeed_search_ui.module:538
 msgid "Available actortype categories."
 msgstr ""
 
-#: culturefeed_search_ui.module:552
+#: culturefeed_search_ui.module:539
 msgid ""
 "Select the actortype categories that can be shown in the autocomplete. If "
 "none selected, all actors will be searched."
 msgstr ""
 
-#: culturefeed_search_ui.module:568
+#: culturefeed_search_ui.module:555
 msgid "How to display the filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:569
+#: culturefeed_search_ui.module:556
 msgid "Select how to display the search filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:572
+#: culturefeed_search_ui.module:559
 msgid "As links"
 msgstr ""
 
-#: culturefeed_search_ui.module:573
+#: culturefeed_search_ui.module:560
 msgid "As checkboxes with submit button"
 msgstr ""
 
-#: culturefeed_search_ui.module:578
+#: culturefeed_search_ui.module:565
 msgid "How to apply filters on the query"
 msgstr ""
 
-#: culturefeed_search_ui.module:579
+#: culturefeed_search_ui.module:566
 msgid "Select the operator for the search filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:582
+#: culturefeed_search_ui.module:569
 msgid "Use AND-operator"
 msgstr ""
 
-#: culturefeed_search_ui.module:583
+#: culturefeed_search_ui.module:570
 msgid "Use OR-operator"
 msgstr ""
 
-#: culturefeed_search_ui.module:591
+#: culturefeed_search_ui.module:578
 msgid "Possible filters"
 msgstr ""
 
-#: culturefeed_search_ui.module:593
+#: culturefeed_search_ui.module:580
 msgid ""
 "<p>\n"
 "        Define the different filter options you want. Filters that are not "
@@ -216,48 +216,48 @@ msgid ""
 "      </p>"
 msgstr ""
 
-#: culturefeed_search_ui.module:604 includes/admin.inc:122
+#: culturefeed_search_ui.module:591 includes/admin.inc:122
 #: theme/theme.inc:607;641
 msgid "Exposed"
 msgstr ""
 
-#: culturefeed_search_ui.module:609 theme/theme.inc:608
+#: culturefeed_search_ui.module:596 theme/theme.inc:608
 msgid "Human name"
 msgstr ""
 
-#: culturefeed_search_ui.module:614
+#: culturefeed_search_ui.module:601
 msgid "Querystring for url"
 msgstr ""
 
-#: culturefeed_search_ui.module:619 theme/theme.inc:610
+#: culturefeed_search_ui.module:606 theme/theme.inc:610
 msgid "Filterquery for API"
 msgstr ""
 
-#: culturefeed_search_ui.module:725
+#: culturefeed_search_ui.module:711
 msgid "You searched for:"
 msgstr "Je zocht op:"
 
-#: culturefeed_search_ui.module:1004
+#: culturefeed_search_ui.module:988
 msgid "Near"
 msgstr "In de buurt van"
 
-#: culturefeed_search_ui.module:1034
+#: culturefeed_search_ui.module:1018
 msgid "All ages"
 msgstr "Alle leeftijden"
 
-#: culturefeed_search_ui.module:1088;1109;1113
+#: culturefeed_search_ui.module:1072;1093;1097
 msgid "culturefeed_search_ui"
 msgstr ""
 
-#: culturefeed_search_ui.module:1088
+#: culturefeed_search_ui.module:1072
 msgid "Fetching deleted objects from API for cleanup."
 msgstr ""
 
-#: culturefeed_search_ui.module:1109
+#: culturefeed_search_ui.module:1093
 msgid "Finished registration of deleted objects."
 msgstr ""
 
-#: culturefeed_search_ui.module:1113
+#: culturefeed_search_ui.module:1097
 msgid "Failed registration of deleted objects. Retrying again on the next run."
 msgstr ""
 
@@ -428,55 +428,55 @@ msgstr "Zoeken"
 msgid "When"
 msgstr "Wanneer"
 
-#: includes/blocks.inc:218;221 js/search_ui.js:0
-msgid "Between"
-msgstr "Tussen"
-
-#: includes/blocks.inc:226;229 js/search_ui.js:0
-msgid "And"
-msgstr "En"
+#: includes/blocks.inc:218
+msgid "Choose a date"
+msgstr "Datum"
 
-#: includes/blocks.inc:232
-msgid "Specific dates"
-msgstr "Specifieke datum"
+#: includes/blocks.inc:221
+msgid "Or choose a custom date"
+msgstr "Of kies zelf een datum"
 
-#: includes/blocks.inc:240;386;603;828
+#: includes/blocks.inc:226;376;593;818
 msgid "Ok"
 msgstr "Ok"
 
-#: includes/blocks.inc:259
+#: includes/blocks.inc:243
+msgid "till"
+msgstr "tot"
+
+#: includes/blocks.inc:247;252
 msgid "Please enter a valid date"
 msgstr "Gelieve een geldige datum in te voeren"
 
-#: includes/blocks.inc:345;376;577;595;800;821
+#: includes/blocks.inc:335;366;567;585;790;811
 msgid "Where"
 msgstr "Waar"
 
-#: includes/blocks.inc:380;598;823
+#: includes/blocks.inc:370;588;813
 msgid "Zipcode or city"
 msgstr "Postcode of gemeente"
 
-#: includes/blocks.inc:440
+#: includes/blocks.inc:430
 msgid "Change radius"
 msgstr "Wijzig straal"
 
-#: includes/blocks.inc:443
+#: includes/blocks.inc:433
 msgid "Choose another location"
 msgstr "Kies andere plaats"
 
-#: includes/blocks.inc:522
+#: includes/blocks.inc:512
 msgid "Age"
 msgstr "Leeftijd"
 
-#: includes/blocks.inc:640
+#: includes/blocks.inc:630
 msgid "Type"
 msgstr "Type"
 
-#: includes/blocks.inc:660
+#: includes/blocks.inc:650
 msgid "Remove all filters"
 msgstr "Alle filters verwijderen"
 
-#: includes/blocks.inc:702
+#: includes/blocks.inc:692
 msgid "Filter"
 msgstr "Filter"
 
@@ -525,109 +525,45 @@ msgid "Show all locations in !city"
 msgstr "Toon alle locaties in !city"
 
 #: js/search_ui.js:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: js/search_ui.js:0
-msgid "Apply"
-msgstr "Toepassen"
-
-#: js/search_ui.js:0
-msgid "January"
-msgstr "januari"
-
-#: js/search_ui.js:0
-msgid "February"
-msgstr "februari"
-
-#: js/search_ui.js:0
-msgid "March"
-msgstr "maart"
-
-#: js/search_ui.js:0
-msgid "April"
-msgstr "april"
-
-#: js/search_ui.js:0
-msgid "May"
-msgstr "mei"
-
-#: js/search_ui.js:0
-msgid "June"
-msgstr "juni"
-
-#: js/search_ui.js:0
-msgid "July"
-msgstr "juli"
-
-#: js/search_ui.js:0
-msgid "August"
-msgstr "augustus"
-
-#: js/search_ui.js:0
-msgid "September"
-msgstr "september"
-
-#: js/search_ui.js:0
-msgid "October"
-msgstr "oktober"
-
-#: js/search_ui.js:0
-msgid "November"
-msgstr "november"
-
-#: js/search_ui.js:0
-msgid "December"
-msgstr "december"
-
-#: js/search_ui.js:0
-msgid "Sun"
-msgstr "zo"
-
-#: js/search_ui.js:0
-msgid "Mon"
-msgstr "ma"
-
-#: js/search_ui.js:0
-msgid "Tue"
-msgstr "di"
+msgid "Specific date"
+msgstr "Specifieke datum"
 
 #: js/search_ui.js:0
-msgid "Wed"
-msgstr "wo"
+msgid "Period from/to"
+msgstr "van / tot"
 
 #: js/search_ui.js:0
-msgid "Thu"
-msgstr "do"
+msgid "Start date"
+msgstr "Begindatum"
 
 #: js/search_ui.js:0
-msgid "Fri"
-msgstr "vr"
+msgid "End date"
+msgstr "Einddatum"
 
 #: js/search_ui.js:0
-msgid "Sat"
-msgstr "za"
+msgid "OK"
+msgstr "Ok"
 
-#: lib/Drupal/CultureFeedSearchPage.php:643
+#: lib/Drupal/CultureFeedSearchPage.php:651
 msgid "More results"
 msgstr "Meer resultaten"
 
-#: lib/Drupal/CultureFeedSearchPage.php:654
+#: lib/Drupal/CultureFeedSearchPage.php:662
 #: theme/culturefeed-search-list.tpl.php:14
 msgid "perform a new search."
 msgstr "voer een nieuwe zoekopdracht uit."
 
-#: lib/Drupal/CultureFeedSearchPage.php:656
+#: lib/Drupal/CultureFeedSearchPage.php:664
 #: theme/culturefeed-search-list.tpl.php:19
 msgid "There are no more search results."
 msgstr "Er zijn geen zoekresultaten meer."
 
-#: lib/Drupal/CultureFeedSearchPage.php:657
+#: lib/Drupal/CultureFeedSearchPage.php:665
 #: theme/culturefeed-search-list.tpl.php:19
 msgid "Refine your search results or"
 msgstr "Verfijn jouw zoekopdracht of"
 
-#: lib/Drupal/CultureFeedSearchPage.php:720
+#: lib/Drupal/CultureFeedSearchPage.php:728
 msgid "page"
 msgstr "pagina"
 

From 3a6f22c008d102c6595ab0f70a8c663489809428 Mon Sep 17 00:00:00 2001
From: Sander Vleugels <sandervleugels@gmail.com>
Date: Thu, 21 May 2015 14:12:57 +0200
Subject: [PATCH 228/275] MSS-167: Disable search form submission after
 selecting an actor item from the autocomplete.

---
 culturefeed_search_ui/js/location_autocomplete.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/culturefeed_search_ui/js/location_autocomplete.js b/culturefeed_search_ui/js/location_autocomplete.js
index db76c535..3968a7dd 100644
--- a/culturefeed_search_ui/js/location_autocomplete.js
+++ b/culturefeed_search_ui/js/location_autocomplete.js
@@ -34,7 +34,10 @@
 
           // Actors are direct links.
           if (ui.item.type == 'actor') {
+            // Go to the actor page aftoer selecting an actor.
             window.location.href = ui.item.suggestion;
+            // Disable form submission after selection of an actor item.
+            $(this).parents('form').find('button').attr('disabled', true);
           }
           // Trigger location search.
           else {

From 6ebd9c2f8a4e912914cce5eda0f96c9630553e7e Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 21 May 2015 13:07:14 +0000
Subject: [PATCH 229/275] PWK-287 make tags not case sensitive

---
 .../culturefeed_search_views_helper_collaboration.inc        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
index d25f64d9..e9b29b5e 100644
--- a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
+++ b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
@@ -23,6 +23,7 @@ function culturefeed_search_views_helper_collaboration_get_data(
 
   // First check if there are any collaboration tags used in the view.
   $collaboration_tags = array_keys(variable_get('culturefeed_entry_ui_custom_collaboration_tags', array()));
+  $collaboration_tags = array_map('strtolower', $collaboration_tags);
   $keywords = array();
   if (count($collaboration_tags)) {
 
@@ -37,7 +38,7 @@ function culturefeed_search_views_helper_collaboration_get_data(
 
         foreach ($filter['keyword'] as $keyword) {
 
-          if (in_array($keyword['value'], $collaboration_tags)) {
+          if (in_array(strtolower($keyword['value']), $collaboration_tags)) {
             $keywords[] = $keyword['value'];
           }
 
@@ -61,7 +62,7 @@ function culturefeed_search_views_helper_collaboration_get_data(
         $sub_brand = $cdb_file->getSubbrand();
         $description = json_decode($cdb_file->getDescription());
 
-        if ($consumer_id == $sub_brand && $keyword == $description->keyword) {
+        if ($consumer_id == $sub_brand && $keyword == strtolower($description->keyword)) {
 
           return array(
             'copyright' => $cdb_file->getCopyright(),

From d9e4879a97d01c602592f8698333c07ae0d382c1 Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Thu, 21 May 2015 16:35:09 +0200
Subject: [PATCH 230/275] UIV-1291 Fix for too big saved-search-button

---
 culturefeed_saved_searches/includes/blocks.inc            | 4 ++--
 .../translations/culturefeed_saved_searches.nl.po         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/culturefeed_saved_searches/includes/blocks.inc b/culturefeed_saved_searches/includes/blocks.inc
index 3aacce9f..3ad6eb9a 100644
--- a/culturefeed_saved_searches/includes/blocks.inc
+++ b/culturefeed_saved_searches/includes/blocks.inc
@@ -10,7 +10,7 @@
 function culturefeed_saved_searches_block_cta() {
 
   if ($query = culturefeed_saved_searches_get_cta_query()) {
-    return theme('culturefeed_saved_searches_cta', array('text' => t('and receive an email when there are new results'), 'query' => $query));
+    return theme('culturefeed_saved_searches_cta', array('text' => t('Receive an email when there are new results'), 'query' => $query));
   }
 
 }
@@ -24,7 +24,7 @@ function culturefeed_saved_searches_block_cta_bottom() {
 
   if ($results && $results->getCurrentCount() > 0) {
     if ($query = culturefeed_saved_searches_get_cta_query()) {
-      return theme('culturefeed_saved_searches_cta', array('text' => t('to search faster next time'), 'query' => $query));
+      return theme('culturefeed_saved_searches_cta', array('text' => t('Search faster next time'), 'query' => $query));
     }
   }
 
diff --git a/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po b/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po
index ca6ec1ce..330d7bfc 100644
--- a/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po
+++ b/culturefeed_saved_searches/translations/culturefeed_saved_searches.nl.po
@@ -93,12 +93,12 @@ msgid "CultureFeed"
 msgstr "CultureFeed"
 
 #: includes/blocks.inc:13
-msgid "and receive an email when there are new results"
-msgstr "en ontvang een e-mail als er nieuwe resultaten zijn"
+msgid "Receive an email when there are new results"
+msgstr "Ontvang een e-mail als er nieuwe resultaten zijn"
 
 #: includes/blocks.inc:27
-msgid "to search faster next time"
-msgstr "om sneller te kunnen zoeken"
+msgid "Search faster next time"
+msgstr "Zoek sneller volgende keer"
 
 #: includes/blocks.inc:132 includes/pages.inc:133
 msgid "A problem occurred while loading your searches. Please try again later."

From 06fda0a1cdff6c8fb60ab54a1c6216f6bc99ef07 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Fri, 22 May 2015 11:11:27 +0200
Subject: [PATCH 231/275] PWK-284: Use media type collaboration instead of
 roadmap

---
 .../includes/helpers/culturefeed_entry_ui.collaboration.inc   | 4 ++--
 .../helpers/culturefeed_search_views_helper_collaboration.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
index 62909c7e..6224358c 100644
--- a/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
+++ b/culturefeed_entry_ui/includes/helpers/culturefeed_entry_ui.collaboration.inc
@@ -30,7 +30,7 @@ function culturefeed_entry_ui_collaboration_get_data_by_keyword(\CultureFeed_Cdb
   );
 
   if ($event_details) {
-    $media_links = $event_details->getMedia()->byMediaTypes(array(CultureFeed_Cdb_Data_File::MEDIA_TYPE_ROADMAP));
+    $media_links = $event_details->getMedia()->byMediaTypes(array(CultureFeed_Cdb_Data_File::MEDIA_TYPE_COLLABORATION));
     foreach ($media_links as $link) {
 
       if ($link->getSubBrand() && $link->getSubBrand() == $consumer_key) {
@@ -78,4 +78,4 @@ function culturefeed_entry_ui_collaboration_get_image_from_url($image) {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
index e9b29b5e..53346c9e 100644
--- a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
+++ b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
@@ -54,7 +54,7 @@ function culturefeed_search_views_helper_collaboration_get_data(
       // If there are multiple matches, we take the first one.
       $keyword = $keywords[0];
       $media = $extended_entity->getEntity()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getMedia();
-      $cdb_files = $media->byMediaType('roadmap');
+      $cdb_files = $media->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_COLLABORATION);
       $consumer_id = variable_get('culturefeed_api_application_key');
 
       foreach ($cdb_files as $cdb_file) {

From 3e722248be36cfea4816513ed601111693022345 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Fri, 22 May 2015 11:14:32 +0200
Subject: [PATCH 232/275] Update dependencies

---
 composer.lock | 56 +++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1e90baed..2ebc4678 100644
--- a/composer.lock
+++ b/composer.lock
@@ -102,12 +102,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/Cdb.git",
-                "reference": "0ad82c83c02bd52e1e0dcfc1176e6967df4d8715"
+                "reference": "1273c561d60a5d548260f3184312f0c7bbe81ea4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/Cdb/zipball/0ad82c83c02bd52e1e0dcfc1176e6967df4d8715",
-                "reference": "0ad82c83c02bd52e1e0dcfc1176e6967df4d8715",
+                "url": "https://api.github.com/repos/cultuurnet/Cdb/zipball/1273c561d60a5d548260f3184312f0c7bbe81ea4",
+                "reference": "1273c561d60a5d548260f3184312f0c7bbe81ea4",
                 "shasum": ""
             },
             "require-dev": {
@@ -127,7 +127,7 @@
                 "Apache-2.0"
             ],
             "description": "PHP library for hydrating/manipulating CultuurNet's Cdb XML documents",
-            "time": "2015-05-19 11:04:57"
+            "time": "2015-05-22 08:48:28"
         },
         {
             "name": "cultuurnet/culturefeed-php",
@@ -135,12 +135,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/culturefeed-php.git",
-                "reference": "8b44c643afd66acd19bf01150811c51dd43d3364"
+                "reference": "30d031f18a518737ce2ade78216d6b77f188acde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/culturefeed-php/zipball/8b44c643afd66acd19bf01150811c51dd43d3364",
-                "reference": "8b44c643afd66acd19bf01150811c51dd43d3364",
+                "url": "https://api.github.com/repos/cultuurnet/culturefeed-php/zipball/30d031f18a518737ce2ade78216d6b77f188acde",
+                "reference": "30d031f18a518737ce2ade78216d6b77f188acde",
                 "shasum": ""
             },
             "require": {
@@ -194,7 +194,7 @@
                 }
             ],
             "description": "Culturefeed PHP library",
-            "time": "2015-05-19 18:46:34"
+            "time": "2015-05-22 08:54:51"
         },
         {
             "name": "cultuurnet/search",
@@ -202,17 +202,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/cultuurnet/Search.git",
-                "reference": "048ad13ac386c3676dd3236c064f4184a10c1d73"
+                "reference": "fa5c1037f53542f81ee28ade0bf86c5afed3b800"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cultuurnet/Search/zipball/048ad13ac386c3676dd3236c064f4184a10c1d73",
-                "reference": "048ad13ac386c3676dd3236c064f4184a10c1d73",
+                "url": "https://api.github.com/repos/cultuurnet/Search/zipball/fa5c1037f53542f81ee28ade0bf86c5afed3b800",
+                "reference": "fa5c1037f53542f81ee28ade0bf86c5afed3b800",
                 "shasum": ""
             },
             "require": {
                 "cultuurnet/auth": "~1.1",
-                "cultuurnet/cdb": "~2.0",
+                "cultuurnet/cdb": "~2.1",
                 "php": ">=5.3.0",
                 "symfony/console": "~2.5"
             },
@@ -240,7 +240,7 @@
                 "Apache-2.0"
             ],
             "description": "CultuurNet search service",
-            "time": "2015-04-24 10:53:19"
+            "time": "2015-05-22 09:05:22"
         },
         {
             "name": "guzzle/common",
@@ -284,6 +284,7 @@
                 "event",
                 "exception"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-08-11 04:32:36"
         },
         {
@@ -341,6 +342,7 @@
                 "http",
                 "http client"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-08-11 04:32:36"
         },
         {
@@ -393,6 +395,7 @@
                 "adapter",
                 "log"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-03-26 17:15:28"
         },
         {
@@ -437,6 +440,7 @@
                 "message",
                 "url"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-02-05 18:29:46"
         },
         {
@@ -486,6 +490,7 @@
                 "Guzzle",
                 "plugin"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-02-07 18:36:58"
         },
         {
@@ -537,6 +542,7 @@
                 "log",
                 "plugin"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-01-08 21:45:39"
         },
         {
@@ -587,6 +593,7 @@
                 "oauth",
                 "plugin"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-04-16 13:26:19"
         },
         {
@@ -640,6 +647,7 @@
                 "component",
                 "stream"
             ],
+            "abandoned": "guzzle/guzzle",
             "time": "2014-05-01 21:36:02"
         },
         {
@@ -829,16 +837,16 @@
     "packages-dev": [
         {
             "name": "phing/phing",
-            "version": "2.10.1",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phingofficial/phing.git",
-                "reference": "f6c25373cbce5e042dddd9b951a3d5638bb78f67"
+                "reference": "a185fef6df7241e540466b67486a4c4b552260e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/f6c25373cbce5e042dddd9b951a3d5638bb78f67",
-                "reference": "f6c25373cbce5e042dddd9b951a3d5638bb78f67",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/a185fef6df7241e540466b67486a4c4b552260e1",
+                "reference": "a185fef6df7241e540466b67486a4c4b552260e1",
                 "shasum": ""
             },
             "require": {
@@ -882,7 +890,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev"
+                    "dev-master": "2.11.x-dev"
                 }
             },
             "autoload": {
@@ -898,24 +906,24 @@
                 "LGPL-3.0"
             ],
             "authors": [
-                {
-                    "name": "Phing Community",
-                    "homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
-                },
                 {
                     "name": "Michiel Rook",
                     "email": "mrook@php.net"
+                },
+                {
+                    "name": "Phing Community",
+                    "homepage": "https://www.phing.info/trac/wiki/Development/Contributors"
                 }
             ],
             "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
-            "homepage": "http://www.phing.info/",
+            "homepage": "https://www.phing.info/",
             "keywords": [
                 "build",
                 "phing",
                 "task",
                 "tool"
             ],
-            "time": "2015-02-19 15:49:46"
+            "time": "2015-05-20 13:04:38"
         }
     ],
     "aliases": [],

From 5efbb339faf23e4e9da63e52f60dbe781eff3834 Mon Sep 17 00:00:00 2001
From: Bert Ramakers <bertramakers@me.com>
Date: Fri, 22 May 2015 12:05:24 +0200
Subject: [PATCH 233/275] MSS-168: Fix JS warnings.

---
 culturefeed_search_ui/js/search_ui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/js/search_ui.js b/culturefeed_search_ui/js/search_ui.js
index 7c50fde6..820c7921 100644
--- a/culturefeed_search_ui/js/search_ui.js
+++ b/culturefeed_search_ui/js/search_ui.js
@@ -40,13 +40,13 @@ Drupal.CulturefeedSearch = Drupal.CulturefeedSearch || {};
       constrainDates : true,
       appendTo: '.form-item-date-range'
     });
-  }
+  };
 
   /**
    * Click listener on autosubmit fields.
    */
   Drupal.CulturefeedSearch.autoSubmit = function() {
     $(this).parents('form').submit();
-  }
+  };
 
 })(jQuery);

From 4540fdfccc042fd6eb74efdef929ee39c17a6549 Mon Sep 17 00:00:00 2001
From: Kristof Coomans <kristof@coomans.eu>
Date: Fri, 22 May 2015 15:20:15 +0200
Subject: [PATCH 234/275] MSS-151: Fix fatal error on agenda/e/add when using
 cdbxml 3.2

---
 .../includes/form/culturefeed_entry_ui.tags.inc              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
index 03bbca58..bc774ade 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
@@ -49,10 +49,13 @@ function culturefeed_entry_ui_tags_form(array &$form, array &$form_state, \Cultu
   else {
 
     // Default values.
-    if ($event->getKeywords()) {
+    if ($event && $event->getKeywords()) {
       $keywords = $event->getKeywords();
       $keywords = implode(';', $keywords);
     }
+    else {
+      $keywords = '';
+    }
 
     // Form element.
     $form['extra']['tags'] = array(

From eb92f4b47b852e70008f3ebbcf80ada9305c4e03 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Tue, 26 May 2015 16:29:07 +0200
Subject: [PATCH 235/275] UIV-1117 set nearby actor rows to 15

---
 culturefeed_agenda/includes/pages.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/includes/pages.inc b/culturefeed_agenda/includes/pages.inc
index 01179b5a..9a7fa71f 100644
--- a/culturefeed_agenda/includes/pages.inc
+++ b/culturefeed_agenda/includes/pages.inc
@@ -285,7 +285,7 @@ function culturefeed_agenda_page_ajax_actor_suggest() {
     $parameters[] = new \CultuurNet\Search\Parameter\Sort('geodist()', \CultuurNet\Search\Parameter\Sort::DIRECTION_ASC);
   }
 
-  $parameters[] = new \CultuurNet\Search\Parameter\Rows(5);
+  $parameters[] = new \CultuurNet\Search\Parameter\Rows(15);
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
 
   $all_categories = culturefeed_search_get_actortype_categories();

From 8c6d8bedaf82184a78ca5b990183d294675b25c0 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 27 May 2015 11:22:43 +0200
Subject: [PATCH 236/275] UIV-1152 use also unexposed sorts to sort in
 culturefeed_content

---
 culturefeed_content/culturefeed_content.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index 485c2b30..1c6fa5f5 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -233,7 +233,7 @@ function culturefeed_content_field_widget_form(&$form, &$form_state, $field, $in
 
   foreach ($sort_options as $key => $option) {
 
-    if ($key === 'default' || !$option['exposed']) {
+    if ($key === 'default') {
       continue;
     }
     $options[$option['value']] = $option['label'];

From 95b2562adb81eab3139157a1689b06edd2a04e22 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Wed, 27 May 2015 12:53:23 +0200
Subject: [PATCH 237/275] UIV-1299 fix device notice

---
 culturefeed_agenda/theme/theme.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 8d4eaa5e..d981966b 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -471,7 +471,7 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
     $variables['twitter']['url'] = $twitter['prefix'] . urlencode(url($variables['share_url'], array('query' => $twitter['utm'])));
     $variables['whatsapp']['url'] = $whatsapp['prefix'] . urlencode(url($variables['share_url'], array('query' => $whatsapp['utm'])));
 
-    if (module_exists('forward') && ($device == 'computer')) {
+    if (module_exists('forward') && (isset($variables['device']) && $variables['device'] == 'computer')) {
       $variables['mail']['url'] = url('forward', array('query' => array('path' => url($variables['url'], array('query' => $mail['utm'])))));
     }
     else {

From 660d7081aa36d2802a2383e08697cf08b9e653d6 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 27 May 2015 16:11:59 +0200
Subject: [PATCH 238/275] PWK-287 translations entry_ui

---
 .../translations/culturefeed_entry_ui.nl.po               | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index b34a1502..0cd2d4e9 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -817,3 +817,11 @@ msgstr "Laatst bijgewerkt"
 #: views/handlers/views_handler_field_cdb_item_operations.inc:47
 msgid "No permission to edit event"
 msgstr "Geen toelating om event aan te passen"
+
+#: culturefeed_elements/culturefeed_location_control/form/asset.inc:78
+msgid "Remove address"
+msgstr "Adres verwijderen"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
+msgid "Remove address"
+msgstr "Adres verwijderen"
\ No newline at end of file

From 07ffa95f4474f5005f8c5c857a3563203ebacb6e Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 27 May 2015 16:14:44 +0200
Subject: [PATCH 239/275] PWK-287 french and german translation entry_ui

---
 .../translations/culturefeed_entry_ui.de.po   | 331 +++++++++---------
 .../translations/culturefeed_entry_ui.fr.po   | 331 +++++++++---------
 2 files changed, 338 insertions(+), 324 deletions(-)

diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po
index 9ba2346f..41adfb0d 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po
@@ -7,651 +7,658 @@ msgstr ""
 "Project-Id-Version: CFK - translations\n"
 "Language: de\n"
 
-#: 
+#:
 msgid "Manage object tags"
 msgstr "Objekt-Tags verwalten"
 
-#: 
+#:
 msgid "Manage all the tags from the objects on culturefeed (events, actors, ...)."
 msgstr "Alle Tags der Objekte auf CultureFeed verwalten (Events, Akteure usw.)"
 
-#: 
+#:
 msgid "Manage custom tags"
 msgstr "Benutzerdefinierte Tags verwalten"
 
-#: 
+#:
 msgid "Manage custom tags from the objects on culturefeed (events, actors, ...) managed on the admin section."
 msgstr "Alle benutzerdefinierten Tags der Objekte auf CultureFeed verwalten (Events, Akteure usw.), die im Admin-Bereich verwaltet werden"
 
-#: 
+#:
 msgid "Create events"
 msgstr "Events anlegen"
 
-#: 
+#:
 msgid "Create new events through the entity api."
 msgstr "Neue Events über die Entity API anlegen."
 
-#: 
+#:
 msgid "Edit events"
 msgstr "Events bearbeiten"
 
-#: 
+#:
 msgid "Edit events through the entity api."
 msgstr "Events über die Entity API bearbeiten."
 
-#: 
+#:
 msgid "Delete events"
 msgstr "Events löschen"
 
-#: 
+#:
 msgid "Delete events through the entity api."
 msgstr "Events über die Entity API löschen."
 
-#: 
+#:
 msgid "Tags"
 msgstr "Tags"
 
-#: 
+#:
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: 
+#:
 msgid "View"
 msgstr "Ansehen"
 
-#: 
+#:
 msgid "ZIP Code"
 msgstr "Postleitzahl"
 
-#: 
+#:
 msgid "New event"
 msgstr "Neue Aktivität"
 
-#: 
+#:
 msgid "Edit event"
 msgstr "Aktivität bearbeiten"
 
-#: 
+#:
 msgid "Delete event"
 msgstr "Aktivität löschen"
 
-#: 
+#:
 msgid "CultureFeed Entry UI"
 msgstr "CultureFeed Eingabe-UI"
 
-#: 
+#:
 msgid "All configurations to entry api for this site"
 msgstr "Alle Konfigurationen für Eingabe-API auf dieser Webseite"
 
-#: 
+#:
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
 msgstr "Mehrsprachige Formulare, um Events an die UiTDatenbank-Eingabe-API zu senden, sie zu aktualisieren und zu löschen"
 
-#: 
+#:
 msgid "CultureFeed"
 msgstr "CultureFeed"
 
-#: 
+#:
 msgid "Preferred language"
 msgstr "Sprachpräferenz"
 
-#: 
+#:
 msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
 msgstr "Die bevorzugte Sprache des UiTID-Users verwenden, wobei notfalls auf die Drupal-UI-Sprache zurückgegriffen wird"
 
-#: 
+#:
 msgid "Custom tags"
 msgstr "Benutzerdefinierte Tags"
 
-#: 
+#:
 msgid "Custom tags specific for this site. Use a new line for each tag."
 msgstr "Benutzerdefinierte Tags speziell für diese Webseite. Neue Zeile für jedes Tag verwenden."
 
-#: 
+#:
 msgid "mon"
 msgstr "Mo"
 
-#: 
+#:
 msgid "tue"
 msgstr "Di"
 
-#: 
+#:
 msgid "wed"
 msgstr "Mi"
 
-#: 
+#:
 msgid "thu"
 msgstr "Do"
 
-#: 
+#:
 msgid "fri"
 msgstr "Fr"
 
-#: 
+#:
 msgid "sat"
 msgstr "Sa"
 
-#: 
+#:
 msgid "sun"
 msgstr "So"
 
-#: 
+#:
 msgid "Basic info"
 msgstr "Grundlegende Infos"
 
-#: 
+#:
 msgid "Event title"
 msgstr "Titel"
 
-#: 
+#:
 msgid "Concerts"
 msgstr "Konzerte"
 
-#: 
+#:
 msgid "Dance"
 msgstr "Tanz"
 
-#: 
+#:
 msgid "Film"
 msgstr "Film"
 
-#: 
+#:
 msgid "Theatre"
 msgstr "Theater"
 
-#: 
+#:
 msgid "Sport"
 msgstr "Sport"
 
-#: 
+#:
 msgid "Location"
 msgstr "Standort"
 
-#: 
+#:
 msgid "Location not found, add location"
 msgstr "Veranstaltungsort nicht gefunden, Veranstaltungsort hinzufügen"
 
-#: 
+#:
 msgid "Location Title"
 msgstr "Bezeichnung Veranstaltungsort"
 
-#: 
+#:
 msgid "Street"
 msgstr "Straße"
 
-#: 
+#:
 msgid "House Number"
 msgstr "Hausnummer"
 
-#: 
+#:
 msgid "City"
 msgstr "Stadt oder Ort"
 
-#: 
+#:
 msgid "Country"
 msgstr "Land"
 
-#: 
+#:
 msgid "Dates"
 msgstr "Daten"
 
-#: 
+#:
 msgid "Permanent"
 msgstr "Dauerhaft"
 
-#: 
+#:
 msgid "remove date"
 msgstr "datum entfernen"
 
-#: 
+#:
 msgid "Date"
 msgstr "Anfangsdatum"
 
-#: 
+#:
 msgid "+ add end date or time"
 msgstr "+ Ende hinzufügen"
 
-#: 
+#:
 msgid "End date"
 msgstr "Enddatum"
 
-#: 
+#:
 msgid "remove end date"
 msgstr "Ende entfernen"
 
-#: 
+#:
 msgid "+ add date"
 msgstr "+ Datum hinzufügen"
 
-#: 
+#:
 msgid "Open all day?"
 msgstr "Ganztägig geöffnet?"
 
-#: 
+#:
 msgid "Yes"
 msgstr "Ja"
 
-#: 
+#:
 msgid "No"
 msgstr "Nein"
 
-#: 
+#:
 msgid "Extra info"
 msgstr "Zusatzinfo"
 
-#: 
+#:
 msgid "Description"
 msgstr "Beschreibung"
 
-#: 
+#:
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
-#: 
+#:
 msgid "+ add long description"
 msgstr "+ ausführliche Beschreibung hinzufügen"
 
-#: 
+#:
 msgid "Long description"
 msgstr "Ausführliche Beschreibung"
 
-#: 
+#:
 msgid "Add multiple tags seperated by a \";\""
 msgstr "Mehrere Tags getrennt durch ein Semikolon (;) hinzufügen"
 
-#: 
+#:
 msgid "Links"
 msgstr "Links"
 
-#: 
+#:
 msgid "+ add another link"
 msgstr "+ weiteren Link hinzufügen"
 
-#: 
+#:
 msgid "Image"
 msgstr "Bild"
 
-#: 
+#:
 msgid "Image upload"
 msgstr "Bild hinaufladen"
 
-#: 
+#:
 msgid "Allowed extensions: gif png jpg jpeg"
 msgstr "Zugelassene Dateierweiterungen: gif png jpg jpeg"
 
-#: 
+#:
 msgid "I agree to the <a href="http://www.uitdatabank.be/uitportal/legal.aspx">terms & conditions of UiTdatabank</a> and I declare that I have the necessary rights or permissions to distribute the image."
 msgstr "Ich stimme den <a href="http://www.uitdatabank.be/uitportal/legal.aspx">Allgemeinen Bedingungen</a> zu und erkläre, dass ich über die erforderlichen Rechte oder Genehmigungen verfüge, um das Bild verbreiten zu dürfen."
 
-#: 
+#:
 msgid "Price"
 msgstr "Preis"
 
-#: 
+#:
 msgid "Free event"
 msgstr "Gratis-Aktivität"
 
-#: 
+#:
 msgid "+ add conditions & discounts"
 msgstr "+ Bedingungen & Rabatte hinzufügen"
 
-#: 
+#:
 msgid "Price conditions & discounts"
 msgstr "Preis Bedingungen & Rabatte"
 
-#: 
+#:
 msgid "Organizer"
 msgstr "Organisator"
 
-#: 
+#:
 msgid "Organizer not found, add organizer"
 msgstr "Organisator nicht gefunden, Organisator hinzufügen"
 
-#: 
+#:
 msgid "Name new organizer"
 msgstr "Neuen Organisator benennen"
 
-#: 
+#:
 msgid "Age"
 msgstr "Alter"
 
-#: 
+#:
 msgid "For everyone"
 msgstr "Für jedermann"
 
-#: 
+#:
 msgid "For children (between 1 and 12 years)"
 msgstr "Für Kinder (zwischen 1 und 12 Jahren)"
 
-#: 
+#:
 msgid "For youth (between 12 and 18 years)"
 msgstr "Für Jugendliche (zwischen 12 und 18 Jahren)"
 
-#: 
+#:
 msgid "For adults (18+)"
 msgstr "Für Erwachsene (ab 18)"
 
-#: 
+#:
 msgid "Suitable for ages from"
 msgstr "Geeignet für Alter ab"
 
-#: 
+#:
 msgid "Activities for children will get the 'Fly' label"
 msgstr "Aktivitäten für Kinder erhalten das „Fly“-Zeichen"
 
-#: 
+#:
 msgid "Contact"
 msgstr "Ansprechpartner"
 
-#: 
+#:
 msgid "+ add contact option"
 msgstr "+ Kontaktmöglichkeit hinzufügen"
 
-#: 
+#:
 msgid "Performers"
 msgstr "Künstler"
 
-#: 
+#:
 msgid "+ add another performer"
 msgstr "+ weiteren Künstler hinzufügen"
 
-#: 
+#:
 msgid "Language"
 msgstr "Sprache"
 
-#: 
+#:
 msgid "+ add more language info"
 msgstr "+ mehr Sprachinformationen hinzufügen"
 
-#: 
+#:
 msgid "Access"
 msgstr "Zugriff"
 
-#: 
+#:
 msgid "Open for everyone"
 msgstr "Zugänglich für alle"
 
-#: 
+#:
 msgid "Only for members"
 msgstr "Nur für Mitglieder"
 
-#: 
+#:
 msgid "Translations"
 msgstr "Übersetzungen"
 
-#: 
+#:
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: 
+#:
 msgid "English"
 msgstr "Englisch"
 
-#: 
+#:
 msgid "French"
 msgstr "Französisch"
 
-#: 
+#:
 msgid "German"
 msgstr "Deutsch"
 
-#: 
+#:
 msgid "Publication date"
 msgstr "Veröffentlichungsdatum"
 
-#: 
+#:
 msgid "Save"
 msgstr "Speichern"
 
-#: 
+#:
 msgid "Start time"
 msgstr "Uhrzeit Anfang"
 
-#: 
+#:
 msgid "End time"
 msgstr "Uhrzeit Ende"
 
-#: 
+#:
 msgid "Spoken"
 msgstr "Originalton"
 
-#: 
+#:
 msgid "Dubbed"
 msgstr "Synchronisiert"
 
-#: 
+#:
 msgid "Subtitled"
 msgstr "Untertitelt"
 
-#: 
+#:
 msgid "in"
 msgstr "in"
 
-#: 
+#:
 msgid "Contact"
 msgstr "Kontakt"
 
-#: 
+#:
 msgid "Input"
 msgstr "Input"
 
-#: 
+#:
 msgid "Performer"
 msgstr "Künstler"
 
-#: 
+#:
 msgid "Role"
 msgstr "Rolle"
 
-#: 
+#:
 msgid "Link"
 msgstr "Link"
 
-#: 
+#:
 msgid "for reservation"
 msgstr "Reservierung erforderlich"
 
-#: 
+#:
 msgid "Format"
 msgstr "Format"
 
-#: 
+#:
 msgid "Please fill in correct age"
 msgstr "Bitte das richtige Alter eingeben"
 
-#: 
+#:
 msgid "Please fill in correct date and time"
 msgstr "Bitte das richtige Datum und die richtige Uhrzeit eingeben"
 
-#: 
+#:
 msgid "A date is required."
 msgstr "Ein Datum ist erforderlich."
 
-#: 
+#:
 msgid "Date field is invalid. The end date is earlier than the beginning date."
 msgstr "Datumsfeld ungültig. Das Enddatum liegt vor dem Anfangsdatum."
 
-#: 
+#:
 msgid "Date field is invalid. The end time is earlier than the beginning time."
 msgstr "Datumsfeld ungültig. Die Uhrzeit des Endes liegt vor der Uhrzeit des Anfangs."
 
-#: 
+#:
 msgid "Please fill in correct date"
 msgstr "Bitte das richtige Datum eingeben."
 
-#: 
+#:
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
 msgstr "Bitte stimmen Sie sich mit den Allgemeinen Bedingungen der UiTDatenbank einverstanden und erklären Sie, dass Sie über die erforderlichen Rechte oder Genehmigungen verfügen, um das Bild über die UiTDatenbank verbreiten zu dürfen."
 
-#: 
+#:
 msgid "A category is required."
 msgstr "Eine Kategorie ist erforderlich."
 
-#: 
+#:
 msgid "A title is required for a custom location"
 msgstr "Für einen benutzerdefinierten Veranstaltungsort ist ein Titel erforderlich"
 
-#: 
+#:
 msgid "A zip code is required for a custom location"
 msgstr "Für einen benutzerdefinierten Veranstaltungsort ist eine Postleitzahl erforderlich"
 
-#: 
+#:
 msgid "A city is required for a custom location"
 msgstr "Für einen benutzerdefinierten Veranstaltungsort ist eine Stadt/ein Ort erforderlich"
 
-#: 
+#:
 msgid "A location is required."
 msgstr "Ein Veranstaltungsort ist erforderlich."
 
-#: 
+#:
 msgid "We could not validate the location"
 msgstr "Wir konnten den Veranstaltungsort nicht validieren"
 
-#: 
+#:
 msgid "Not a valid URL"
 msgstr "Keine gültige URL"
 
-#: 
+#:
 msgid "We could not validate the organizer"
 msgstr "Wir konnten die Organisator nicht validieren"
 
-#: 
+#:
 msgid "Not a valid email address"
 msgstr "Keine gültige E-Mail-Adresse"
 
-#: 
+#:
 msgid "Order tickets"
 msgstr "Karten bestellen"
 
-#: 
+#:
 msgid "An error occurred while saving the event"
 msgstr "Beim Speichern des Events ist ein Fehler aufgetreten"
 
-#: 
+#:
 msgid "Event successfully updated"
 msgstr "Event erfolgreich aktualisiert"
 
-#: 
+#:
 msgid "Click here to update"
 msgstr "Zum Aktualisieren hier klicken"
 
-#: 
+#:
 msgid "Are you sure you want to delete the event?"
 msgstr "Sind Sie sicher, dass Sie das Event löschen möchten?"
 
-#: 
+#:
 msgid "This action cannot be undone"
 msgstr "Dieser Befehl kann nicht rückgängig gemacht werden."
 
-#: 
+#:
 msgid "Delete"
 msgstr "Löschen"
 
-#: 
+#:
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: 
+#:
 msgid "Event successfully deleted"
 msgstr "Event erfolgreich gelöscht"
 
-#: 
+#:
 msgid "An error occurred while deleting the event"
 msgstr "Beim Löschen des Events ist ein Fehler aufgetreten"
 
-#: 
+#:
 msgid "Seperate multiple tags by ;"
 msgstr "Mehrere Tags durch ein Semikolon (;) trennen"
 
-#: 
+#:
 msgid "Submit"
 msgstr "Hinzufügen"
 
-#: 
+#:
 msgid "Tag @tag is not permitted because it's already a custom tag."
 msgstr "Das Tag @tag ist unzulässig, weil es bereits ein benutzerdefiniertes Tag ist."
 
-#: 
+#:
 msgid "Autocomplete popup"
 msgstr "Pop-up-Menü zum automatischen Ausfüllen"
 
-#: 
+#:
 msgid "open"
 msgstr "geöffnet"
 
-#: 
+#:
 msgid "from"
 msgstr "von"
 
-#: 
+#:
 msgid "to"
 msgstr "bis"
 
-#: 
+#:
 msgid "Operations"
 msgstr "Tätigkeiten"
 
-#: 
+#:
 msgid "Links to operations that can be performed"
 msgstr "Links zu Tätigkeiten, die ausgeführt werden können"
 
-#: 
+#:
 msgid "Create event"
 msgstr "Event anlegen"
 
-#: 
+#:
 msgid "Link to create event"
 msgstr "Link zum Anlegen eines Events"
 
-#: 
+#:
 msgid "Master"
 msgstr "Master"
 
-#: 
+#:
 msgid "Events created by me"
 msgstr "Von mir angelegte Events"
 
-#: 
+#:
 msgid "more"
 msgstr "mehr"
 
-#: 
+#:
 msgid "Apply"
 msgstr "Anwenden"
 
-#: 
+#:
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: 
+#:
 msgid "Sort by"
 msgstr "Sortieren nach"
 
-#: 
+#:
 msgid "Asc"
 msgstr "Aufsteigend"
 
-#: 
+#:
 msgid "Desc"
 msgstr "Absteigend"
 
-#: 
+#:
 msgid "Notification that no results were found"
 msgstr "Hinweis, das kein Ergebnis gefunden wurde"
 
-#: 
+#:
 msgid "Unable to find any events created by you."
 msgstr "Es konnte kein von Ihnen angelegtes Event gefunden werden."
 
-#: 
+#:
 msgid "Last updated"
 msgstr "Letzte Aktualisierung"
 
-#: 
+#:
 msgid "Block"
 msgstr "Sperren"
 
-#: 
+#:
 msgid "Add event"
 msgstr "Event hinzufügen"
 
+#: culturefeed_elements/culturefeed_location_control/form/asset.inc:78
+msgid "Remove address"
+msgstr "Entfernen Adresse"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
+msgid "Remove address"
+msgstr "Entfernen Adresse"
\ No newline at end of file
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po
index 8dc9f2d1..b7808d41 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po
@@ -7,651 +7,658 @@ msgstr ""
 "Project-Id-Version: CFK - translations\n"
 "Language: fr-be\n"
 
-#: 
+#:
 msgid "Manage object tags"
 msgstr "Gérer les tags  objet"
 
-#: 
+#:
 msgid "Manage all the tags from the objects on culturefeed (events, actors, ...)."
 msgstr "Gérer tous les tags des objets sur culturefeed (événements, acteurs…)"
 
-#: 
+#:
 msgid "Manage custom tags"
 msgstr "Gérer les tags personnalisés"
 
-#: 
+#:
 msgid "Manage custom tags from the objects on culturefeed (events, actors, ...) managed on the admin section."
 msgstr "Gérer les tags personnalisés des objets sur culturefeed (événements, acteurs...) gérés dans la section admin."
 
-#: 
+#:
 msgid "Create events"
 msgstr "Créer des événements"
 
-#: 
+#:
 msgid "Create new events through the entity api."
 msgstr "Créer de nouveaux événements via l'Entity API"
 
-#: 
+#:
 msgid "Edit events"
 msgstr "Modifier les événements"
 
-#: 
+#:
 msgid "Edit events through the entity api."
 msgstr "Modifier des événements via l'Entity API"
 
-#: 
+#:
 msgid "Delete events"
 msgstr "Supprimer des événements"
 
-#: 
+#:
 msgid "Delete events through the entity api."
 msgstr "Supprimer des événements via l'Entity API"
 
-#: 
+#:
 msgid "Tags"
 msgstr "Tags"
 
-#: 
+#:
 msgid "Edit"
 msgstr "Modifier"
 
-#: 
+#:
 msgid "View"
 msgstr "Voir"
 
-#: 
+#:
 msgid "ZIP Code"
 msgstr "Code postal"
 
-#: 
+#:
 msgid "New event"
 msgstr "Nouvelle activité"
 
-#: 
+#:
 msgid "Edit event"
 msgstr "Modifier activité"
 
-#: 
+#:
 msgid "Delete event"
 msgstr "Supprimer activité"
 
-#: 
+#:
 msgid "CultureFeed Entry UI"
 msgstr "Entrée UI CultureFeed"
 
-#: 
+#:
 msgid "All configurations to entry api for this site"
 msgstr "Toutes les configurations pour l'entrée API concernant ce site"
 
-#: 
+#:
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
 msgstr "Formulaires multilingues permettant de poster, mettre à jour et supprimer des événements de l'entrée UiTDatabank de l'API"
 
-#: 
+#:
 msgid "CultureFeed"
 msgstr "CultureFeed"
 
-#: 
+#:
 msgid "Preferred language"
 msgstr "Préférence linguistique"
 
-#: 
+#:
 msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
 msgstr "Utiliser la préférence linguistique de l'utilisateur UiTID et la langue UI Drupal comme alternative"
 
-#: 
+#:
 msgid "Custom tags"
 msgstr "Tags personnalisés"
 
-#: 
+#:
 msgid "Custom tags specific for this site. Use a new line for each tag."
 msgstr "Tags personnalisés propres à ce site. Utiliser une nouvelle ligne pour chaque tag."
 
-#: 
+#:
 msgid "mon"
 msgstr "lun"
 
-#: 
+#:
 msgid "tue"
 msgstr "mar"
 
-#: 
+#:
 msgid "wed"
 msgstr "mer"
 
-#: 
+#:
 msgid "thu"
 msgstr "jeu"
 
-#: 
+#:
 msgid "fri"
 msgstr "ven"
 
-#: 
+#:
 msgid "sat"
 msgstr "sam"
 
-#: 
+#:
 msgid "sun"
 msgstr "dim"
 
-#: 
+#:
 msgid "Basic info"
 msgstr "Information de base"
 
-#: 
+#:
 msgid "Event title"
 msgstr "Titre"
 
-#: 
+#:
 msgid "Concerts"
 msgstr "Concerts"
 
-#: 
+#:
 msgid "Dance"
 msgstr "Danse"
 
-#: 
+#:
 msgid "Film"
 msgstr "Cinéma"
 
-#: 
+#:
 msgid "Theatre"
 msgstr "Théâtre"
 
-#: 
+#:
 msgid "Sport"
 msgstr "Sport"
 
-#: 
+#:
 msgid "Location"
 msgstr "Emplacement"
 
-#: 
+#:
 msgid "Location not found, add location"
 msgstr "L'emplacement n'a pas pu être trouvé. Veuillez ajouter un emplacement."
 
-#: 
+#:
 msgid "Location Title"
 msgstr "Titre de l'emplacement"
 
-#: 
+#:
 msgid "Street"
 msgstr "Rue"
 
-#: 
+#:
 msgid "House Number"
 msgstr "Numéro"
 
-#: 
+#:
 msgid "City"
 msgstr "Ville ou commune"
 
-#: 
+#:
 msgid "Country"
 msgstr "Pays"
 
-#: 
+#:
 msgid "Dates"
 msgstr "Dates"
 
-#: 
+#:
 msgid "Permanent"
 msgstr "Permanent"
 
-#: 
+#:
 msgid "remove date"
 msgstr "retirer date"
 
-#: 
+#:
 msgid "Date"
 msgstr "Date de début"
 
-#: 
+#:
 msgid "+ add end date or time"
 msgstr "+ ajouter fin"
 
-#: 
+#:
 msgid "End date"
 msgstr "Date de fin"
 
-#: 
+#:
 msgid "remove end date"
 msgstr "retirer fin"
 
-#: 
+#:
 msgid "+ add date"
 msgstr "+ ajouter date"
 
-#: 
+#:
 msgid "Open all day?"
 msgstr "Ouvert toute la journée ?"
 
-#: 
+#:
 msgid "Yes"
 msgstr "Oui"
 
-#: 
+#:
 msgid "No"
 msgstr "Non"
 
-#: 
+#:
 msgid "Extra info"
 msgstr "Informations complémentaires"
 
-#: 
+#:
 msgid "Description"
 msgstr "Description"
 
-#: 
+#:
 msgid "Short description"
 msgstr "Brève description"
 
-#: 
+#:
 msgid "+ add long description"
 msgstr "+ ajouter longue description"
 
-#: 
+#:
 msgid "Long description"
 msgstr "Longue description"
 
-#: 
+#:
 msgid "Add multiple tags seperated by a \";\""
 msgstr "Ajouter plusieurs tags séparés par un \";\""
 
-#: 
+#:
 msgid "Links"
 msgstr "Liens"
 
-#: 
+#:
 msgid "+ add another link"
 msgstr "+ ajouter un autre lien"
 
-#: 
+#:
 msgid "Image"
 msgstr "Image"
 
-#: 
+#:
 msgid "Image upload"
 msgstr "Télécharger une image"
 
-#: 
+#:
 msgid "Allowed extensions: gif png jpg jpeg"
 msgstr "Extensions autorisées : gif png jpg jpeg"
 
-#: 
+#:
 msgid "I agree to the <a href="http://www.uitdatabank.be/uitportal/legal.aspx">terms & conditions of UiTdatabank</a> and I declare that I have the necessary rights or permissions to distribute the image."
 msgstr "Je marque mon accord avec les <a href="http://www.uitdatabank.be/uitportal/legal.aspx">conditions générales</a> et déclare détenir les droits ou autorisations nécessaires pour diffuser l'image."
 
-#: 
+#:
 msgid "Price"
 msgstr "Prix"
 
-#: 
+#:
 msgid "Free event"
 msgstr "Événement gratuit"
 
-#: 
+#:
 msgid "+ add conditions & discounts"
 msgstr "+ ajouter tarifs et réductions"
 
-#: 
+#:
 msgid "Price conditions & discounts"
 msgstr "Tarifs spéciaux et réductions"
 
-#: 
+#:
 msgid "Organizer"
 msgstr "Organisateur"
 
-#: 
+#:
 msgid "Organizer not found, add organizer"
 msgstr "L'organisateur n'a pu être trouvée. Ajouter une organisateur"
 
-#: 
+#:
 msgid "Name new organizer"
 msgstr "Nom nouvel organisateur"
 
-#: 
+#:
 msgid "Age"
 msgstr "Âge"
 
-#: 
+#:
 msgid "For everyone"
 msgstr "Tous âges"
 
-#: 
+#:
 msgid "For children (between 1 and 12 years)"
 msgstr "Pour les enfants (entre 1 et 12 ans)"
 
-#: 
+#:
 msgid "For youth (between 12 and 18 years)"
 msgstr "Pour les adolescents (entre 12 et 18 ans)"
 
-#: 
+#:
 msgid "For adults (18+)"
 msgstr "Pour les adultes (+ de 18 ans)"
 
-#: 
+#:
 msgid "Suitable for ages from"
 msgstr "Convient aux âges dès"
 
-#: 
+#:
 msgid "Activities for children will get the 'Fly' label"
 msgstr "Les activités pour les enfants recevront le label \"Fly\""
 
-#: 
+#:
 msgid "Contact"
 msgstr "Coordonnées"
 
-#: 
+#:
 msgid "+ add contact option"
 msgstr "+ ajouter des coordonnées"
 
-#: 
+#:
 msgid "Performers"
 msgstr "Artistes"
 
-#: 
+#:
 msgid "+ add another performer"
 msgstr "+ ajouter un autre artiste"
 
-#: 
+#:
 msgid "Language"
 msgstr "Langue"
 
-#: 
+#:
 msgid "+ add more language info"
 msgstr "+ ajouter plus d'informations linguistiques"
 
-#: 
+#:
 msgid "Access"
 msgstr "Accès"
 
-#: 
+#:
 msgid "Open for everyone"
 msgstr "Accessible à tous"
 
-#: 
+#:
 msgid "Only for members"
 msgstr "Réservé aux membres"
 
-#: 
+#:
 msgid "Translations"
 msgstr "Traductions"
 
-#: 
+#:
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: 
+#:
 msgid "English"
 msgstr "Anglais"
 
-#: 
+#:
 msgid "French"
 msgstr "Français"
 
-#: 
+#:
 msgid "German"
 msgstr "Allemand"
 
-#: 
+#:
 msgid "Publication date"
 msgstr "Date de publication"
 
-#: 
+#:
 msgid "Save"
 msgstr "Enregistrer"
 
-#: 
+#:
 msgid "Start time"
 msgstr "Heure de début"
 
-#: 
+#:
 msgid "End time"
 msgstr "Heure de fin"
 
-#: 
+#:
 msgid "Spoken"
 msgstr "Parlé"
 
-#: 
+#:
 msgid "Dubbed"
 msgstr "Doublé"
 
-#: 
+#:
 msgid "Subtitled"
 msgstr "Sous-titré"
 
-#: 
+#:
 msgid "in"
 msgstr "en"
 
-#: 
+#:
 msgid "Contact"
 msgstr "Contact"
 
-#: 
+#:
 msgid "Input"
 msgstr "Input"
 
-#: 
+#:
 msgid "Performer"
 msgstr "Artiste"
 
-#: 
+#:
 msgid "Role"
 msgstr "Rôle"
 
-#: 
+#:
 msgid "Link"
 msgstr "Lien"
 
-#: 
+#:
 msgid "for reservation"
 msgstr "pour la réservation"
 
-#: 
+#:
 msgid "Format"
 msgstr "Format"
 
-#: 
+#:
 msgid "Please fill in correct age"
 msgstr "Veuillez indiquer l'âge correct"
 
-#: 
+#:
 msgid "Please fill in correct date and time"
 msgstr "Veuillez indiquer la date et l'heure correctes"
 
-#: 
+#:
 msgid "A date is required."
 msgstr "Veuillez indiquer une date."
 
-#: 
+#:
 msgid "Date field is invalid. The end date is earlier than the beginning date."
 msgstr "Cette date n'est pas correcte. La date de fin est antérieure à la date de début."
 
-#: 
+#:
 msgid "Date field is invalid. The end time is earlier than the beginning time."
 msgstr "Cette date n'est pas correcte. L'heure de fin est antérieure à l'heure de début."
 
-#: 
+#:
 msgid "Please fill in correct date"
 msgstr "Veuillez indiquer la date correcte"
 
-#: 
+#:
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
 msgstr "Veuillez marquer votre accord avec les conditions générales de UiTdatabank et déclarer que vous détenez les droits ou autorisations nécessaires pour diffuser l'image via UiTdatabank."
 
-#: 
+#:
 msgid "A category is required."
 msgstr "Veuillez indiquer une catégorie."
 
-#: 
+#:
 msgid "A title is required for a custom location"
 msgstr "Veuillez indiquer un titre pour un emplacement personnalisé"
 
-#: 
+#:
 msgid "A zip code is required for a custom location"
 msgstr "Veuillez indiquer un code postal pour un emplacement personnalisé"
 
-#: 
+#:
 msgid "A city is required for a custom location"
 msgstr "Veuillez indiquer une ville pour un emplacement personnalisé"
 
-#: 
+#:
 msgid "A location is required."
 msgstr "Veuillez indiquer un emplacement."
 
-#: 
+#:
 msgid "We could not validate the location"
 msgstr "Cet emplacement n'a pas pu être validé"
 
-#: 
+#:
 msgid "Not a valid URL"
 msgstr "Cette URL n'est pas valide"
 
-#: 
+#:
 msgid "We could not validate the organizer"
 msgstr "L'organisateur n'a pas pu être validée"
 
-#: 
+#:
 msgid "Not a valid email address"
 msgstr "Cette adresse électronique n'est pas valide"
 
-#: 
+#:
 msgid "Order tickets"
 msgstr "Commander des billets"
 
-#: 
+#:
 msgid "An error occurred while saving the event"
 msgstr "Une erreur s'est produite lors de l'enregistrement de l'événement"
 
-#: 
+#:
 msgid "Event successfully updated"
 msgstr "L'événement a été correctement mis à jour"
 
-#: 
+#:
 msgid "Click here to update"
 msgstr "Cliquez ici pour mettre à jour"
 
-#: 
+#:
 msgid "Are you sure you want to delete the event?"
 msgstr "Êtes-vous sûr de vouloir supprimer l'événement ?"
 
-#: 
+#:
 msgid "This action cannot be undone"
 msgstr "Cette action ne peut être annulée"
 
-#: 
+#:
 msgid "Delete"
 msgstr "Supprimer"
 
-#: 
+#:
 msgid "Cancel"
 msgstr "Annuler"
 
-#: 
+#:
 msgid "Event successfully deleted"
 msgstr "Cet événement a été correctement supprimé"
 
-#: 
+#:
 msgid "An error occurred while deleting the event"
 msgstr "Une erreur s'est produite lors de la suppression de l'événement"
 
-#: 
+#:
 msgid "Seperate multiple tags by ;"
 msgstr "Insérez un ; entre plusieurs tags"
 
-#: 
+#:
 msgid "Submit"
 msgstr "Ajouter"
 
-#: 
+#:
 msgid "Tag @tag is not permitted because it's already a custom tag."
 msgstr "Le tag @tag n'est pas autorisé car ce tag est déjà personnalisé."
 
-#: 
+#:
 msgid "Autocomplete popup"
 msgstr "Pop-up automatique"
 
-#: 
+#:
 msgid "open"
 msgstr "ouvert"
 
-#: 
+#:
 msgid "from"
 msgstr "de"
 
-#: 
+#:
 msgid "to"
 msgstr "à"
 
-#: 
+#:
 msgid "Operations"
 msgstr "Opérations"
 
-#: 
+#:
 msgid "Links to operations that can be performed"
 msgstr "Liens vers les opérations pouvant être accomplies"
 
-#: 
+#:
 msgid "Create event"
 msgstr "Créer un événement"
 
-#: 
+#:
 msgid "Link to create event"
 msgstr "Lien vers la création d'un événement"
 
-#: 
+#:
 msgid "Master"
 msgstr "Master"
 
-#: 
+#:
 msgid "Events created by me"
 msgstr "Mes événements créés"
 
-#: 
+#:
 msgid "more"
 msgstr "plus"
 
-#: 
+#:
 msgid "Apply"
 msgstr "Appliquer"
 
-#: 
+#:
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: 
+#:
 msgid "Sort by"
 msgstr "Trier par"
 
-#: 
+#:
 msgid "Asc"
 msgstr "Ordre croissant"
 
-#: 
+#:
 msgid "Desc"
 msgstr "Ordre décroissant"
 
-#: 
+#:
 msgid "Notification that no results were found"
 msgstr "Notification d'absence de résultats"
 
-#: 
+#:
 msgid "Unable to find any events created by you."
 msgstr "Aucun événement créé par vous n'a pu être trouvé"
 
-#: 
+#:
 msgid "Last updated"
 msgstr "Dernière mise à jour"
 
-#: 
+#:
 msgid "Block"
 msgstr "Bloquer"
 
-#: 
+#:
 msgid "Add event"
 msgstr "Ajouter événement"
 
+#: culturefeed_elements/culturefeed_location_control/form/asset.inc:78
+msgid "Remove address"
+msgstr "Retrait adresse"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
+msgid "Remove address"
+msgstr "Retrait adresse"
\ No newline at end of file

From 8cc68c11c588e61a841b01377e13213c112cfd3b Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 27 May 2015 16:23:05 +0200
Subject: [PATCH 240/275] PWK-287 entry_ui translations

---
 .../translations/culturefeed_entry_ui.de.po        | 14 +++++++++++++-
 .../translations/culturefeed_entry_ui.fr.po        | 14 +++++++++++++-
 .../translations/culturefeed_entry_ui.nl.po        | 14 +++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po
index 41adfb0d..766c298f 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.de.po
@@ -661,4 +661,16 @@ msgstr "Entfernen Adresse"
 
 #: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
 msgid "Remove address"
-msgstr "Entfernen Adresse"
\ No newline at end of file
+msgstr "Entfernen Adresse"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:85
+msgid "Hide tag"
+msgstr "Tag ausblenden"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:96
+msgid "Remove tag"
+msgstr "Remove tag"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:113
+msgid "Add tag"
+msgstr "Tags hinzufügen"
\ No newline at end of file
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po
index b7808d41..b3414e26 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.fr.po
@@ -661,4 +661,16 @@ msgstr "Retrait adresse"
 
 #: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
 msgid "Remove address"
-msgstr "Retrait adresse"
\ No newline at end of file
+msgstr "Retrait adresse"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:85
+msgid "Hide tag"
+msgstr "Masquer tag"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:96
+msgid "Remove tag"
+msgstr "Retirer tag"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:113
+msgid "Add tag"
+msgstr "Ajouter un tag"
\ No newline at end of file
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index 0cd2d4e9..577ece36 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -824,4 +824,16 @@ msgstr "Adres verwijderen"
 
 #: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
 msgid "Remove address"
-msgstr "Adres verwijderen"
\ No newline at end of file
+msgstr "Adres verwijderen"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:85
+msgid "Hide tag"
+msgstr "Label verbergen"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:96
+msgid "Remove tag"
+msgstr "Label verwijderen"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:113
+msgid "Add tag"
+msgstr "Label toevoegen"
\ No newline at end of file

From 982a13d53955d85af2e3fdf9dbd57fa72d91a25d Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Wed, 27 May 2015 16:40:04 +0200
Subject: [PATCH 241/275] UIV-921 Added copyright-information

---
 culturefeed_agenda/theme/theme.inc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index d981966b..f0fe5ff1 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -204,13 +204,17 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
 
     // Pictures
     $main_picture = '';
+    $main_picture_cr = '';
     $pictures = array();
+    $copyrights = array();
 
     $photos = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_PHOTO);
     foreach ($photos as $photo) {
       $pictures[] = $photo->getHLink();
+      $copyrights[] = $photo->getCopyright();
       if ($photo->isMain()) {
         $main_picture = $photo->getHLink();
+        $main_picture_cr = $photo->getCopyright();
       }
     }
 
@@ -220,6 +224,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $pictures[] = $image->getHLink();
       if ($image->isMain() && empty($main_picture)) {
         $main_picture = $image->getHLink();
+        $main_picture_cr = $image->getCopyright();
       }
     }
 
@@ -233,6 +238,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
           $pictures[] = $photo->getHLink();
           if ($photo->isMain()) {
             $main_picture = $photo->getHLink();
+            $main_picture_cr = $photo->getCopyright();
           }
         }
 
@@ -242,6 +248,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
           $pictures[] = $image->getHLink();
           if ($image->isMain() && empty($main_picture)) {
             $main_picture = $image->getHLink();
+            $main_picture_cr = $photo->getCopyright();
           }
         }
       }
@@ -250,15 +257,19 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
     // If no main picture is set we use first picture
     if (empty($main_picture) && count($pictures) > 0) {
       $main_picture = $pictures[0];
+      $main_picture_cr = $copyrights[0];
     }
 
     // we don't want the main picture to show twice
     if (!empty($main_picture)) {
       unset($pictures[0]);
+      unset($copyrights[0]);
     }
 
     $variables['main_picture'] = $main_picture;
+    $variables['main_picture_cr'] = $main_picture_cr;
     $variables['pictures'] = $pictures;
+    $variables['copyrights'] = $copyrights;
 
     // Make sure usage of thumbnail is backwards compatible
     $variables['thumbnail'] = $variables['main_picture'];
@@ -373,7 +384,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
 
   $variables['device'] = '(not set)';
   $variables['is_ios'] = FALSE;
-  $variables['is_android'] = FALSE;  
+  $variables['is_android'] = FALSE;
   $detect = culturefeed_mobile_detect_get_object();
 
   if ($detect) {

From 6a0bca102112d958764749a4482fde62ca5a7548 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 27 May 2015 16:45:14 +0200
Subject: [PATCH 242/275] BH-83 theme nearby actor suggestions

---
 .../theme/culturefeed-agenda-actors-nearby.tpl.php          | 6 +++++-
 culturefeed_agenda/theme/theme.inc                          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/culturefeed_agenda/theme/culturefeed-agenda-actors-nearby.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-actors-nearby.tpl.php
index 8b6b28ee..4a6d15da 100644
--- a/culturefeed_agenda/theme/culturefeed-agenda-actors-nearby.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-agenda-actors-nearby.tpl.php
@@ -6,5 +6,9 @@
 ?>
 
 <?php if (!empty($links)): ?>
-    <?php print $links ?>
+  <ul>
+    <?php foreach ($links as $link): ?>
+      <li><?php print $link ?></li>
+    <?php endforeach; ?>
+  </ul>   
 <?php endif; ?>
diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index f0fe5ff1..2199ccfa 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -1202,7 +1202,7 @@ function culturefeed_agenda_preprocess_culturefeed_agenda_actors_nearby(&$variab
     $actors[] = l($title, $GLOBALS['base_url'] . $url);
   }
 
-  $variables['links'] = implode(', ', $actors);
+  $variables['links'] = $actors;
 
 }
 

From a7cf571fe5dbb2c898f7e19a324e2806ca09681c Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Fri, 29 May 2015 12:21:37 +0200
Subject: [PATCH 243/275] UIT-42: Added support for active facet on facet block
 + location block when location search is used

---
 culturefeed_agenda/culturefeed_agenda.module  | 18 ++-----
 .../includes/blocks.inc                       | 27 ++++++----
 culturefeed_search_ui/includes/blocks.inc     | 52 ++++++++++++++-----
 culturefeed_search_ui/theme/theme.inc         |  2 +-
 4 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 8700858b..abbf1aa0 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -432,7 +432,7 @@ function culturefeed_agenda_block_configure($delta) {
       '#default_value' => variable_get('agenda_related_activities_extra_query'),
       '#description' => t('Make sure this is a correct solr query. Example title:mytitle'),
     );
-    
+
     // sort_direction is no longer a seperate field. Add it to the sort field if variable exists.
     $sort_direction = variable_get('agenda_related_activities_sort_direction', '');
     $default_sort = variable_get('agenda_related_activities_sort') . ' ' . $sort_direction;
@@ -970,22 +970,12 @@ function culturefeed_agenda_url_inbound_alter(&$path, $original_path, $path_lang
       else {
         $flanders_region = culturefeed_search_get_category_by_slug($city_slug, 'flandersregion');
         if ($flanders_region) {
-          $location = $flanders_region->name;
+          $_GET['facet']['category_flandersregion_id'][] = $flanders_region->tid;
+          $_REQUEST['facet']['category_flandersregion_id'][] = $flanders_region->tid;
+          $rewrite = TRUE;
         }
       }
 
-      if (!empty($location)) {
-        $_GET['location'] = $location;
-        $_REQUEST['location'] = $location;
-        $rewrite = TRUE;
-      }
-
-      if (!empty($regId)) {
-        $_GET['regId'] = $regId;
-        $_REQUEST['regId'] = $regId;
-        $rewrite = TRUE;
-      }
-
     }
 
     // When rewrite flag is set, change the path.
diff --git a/culturefeed_saved_searches/includes/blocks.inc b/culturefeed_saved_searches/includes/blocks.inc
index 3aacce9f..7090cbf0 100644
--- a/culturefeed_saved_searches/includes/blocks.inc
+++ b/culturefeed_saved_searches/includes/blocks.inc
@@ -89,20 +89,27 @@ function culturefeed_saved_searches_get_cta_query() {
     }
 
     // We need to fetch the whole list of saved searches since we don't have ID.
-    $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
     $exists = FALSE;
-    foreach ($savedSearchList as $savedSearch) {
-      $saved_query = explode('&', $savedSearch->query);
-      foreach ($saved_query as $key => $val) {
-        if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
-          unset($saved_query[$key]);
+    try {
+
+      $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
+      foreach ($savedSearchList as $savedSearch) {
+        $saved_query = explode('&', $savedSearch->query);
+        foreach ($saved_query as $key => $val) {
+          if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
+            unset($saved_query[$key]);
+          }
         }
-      }
-      $saved_query = implode('&', $saved_query);
+        $saved_query = implode('&', $saved_query);
 
-      if ($saved_query == $query['query']) {
-        $exists = TRUE;
+        if ($saved_query == $query['query']) {
+          $exists = TRUE;
+        }
       }
+
+    }
+    catch (Exception $e) {
+      watchdog_exception('culturefeed_saved_searches', $e);
     }
 
     if (!$exists) {
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index 4a843705..8d370713 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -302,11 +302,22 @@ function culturefeed_search_ui_block_city_facet() {
     return;
   }
 
+  $location = '';
+  if (!empty($_GET['facet']['category_flandersregion_id'])) {
+    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
+    $location = $flanders_region->name;
+  }
+
+  // Show facet layout for location.
+  elseif (!empty($_GET['location'])) {
+    $location = $_GET['location'];
+  }
+
   $noresults = FALSE;
   if ($culturefeedSearchResult->getTotalCount() == 0) {
     $noresults = TRUE;
     // Hide location selector for empty results only when no location was set.
-    if (empty($_GET['location'])) {
+    if (empty($location)) {
       return;
     }
   }
@@ -314,19 +325,18 @@ function culturefeed_search_ui_block_city_facet() {
   $build = array();
 
   // Show facet layout for location.
-  if (!empty($_GET['location'])) {
+  if (!empty($location)) {
 
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
-    $label = $_GET['location'];
     if (isset($_GET['distance'])) {
-      $label .= ' + ' . $_GET['distance'] . ' km';
+      $location .= ' + ' . $_GET['distance'] . ' km';
     }
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
     );
 
     $build = array();
@@ -404,7 +414,7 @@ function culturefeed_search_ui_city_facet_form() {
 function culturefeed_search_ui_city_facet_form_submit($form, &$form_state) {
 
   $query = drupal_get_query_parameters(NULL, array('q', 'page', 'location', 'nearby', 'coordinates'));
-  
+
   // Remove the region filter so choosing a city has results.
   if (isset($query['facet']['category_flandersregion_id'])) {
     unset($query['facet']['category_flandersregion_id']);
@@ -556,16 +566,26 @@ function culturefeed_search_ui_block_city_only_facet() {
   $build = array();
 
   // Show facet layout for location.
-  if (!empty($_GET['location'])) {
+  $location = '';
+  if (!empty($_GET['facet']['category_flandersregion_id'])) {
+    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
+    $location = $flanders_region->name;
+  }
+
+  // Show facet layout for location.
+  elseif (!empty($_GET['location'])) {
+    $location = $_GET['location'];
+  }
+
+  if (!empty($location)) {
 
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
-    $label = $_GET['location'];
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
     );
 
     $build = array();
@@ -800,17 +820,25 @@ function culturefeed_search_ui_block_location_search() {
 
   $build = array();
 
+  $location = '';
+  if (!empty($_GET['facet']['category_flandersregion_id'])) {
+    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
+    $location = $flanders_region->name;
+  }
+
   // Show facet layout for location.
-  if (!empty($_GET['location'])) {
+  elseif (!empty($_GET['location'])) {
+    $location = $_GET['location'];
+  }
 
+  if (!empty($location)) {
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
-    $label = $_GET['location'];
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
     );
 
     $build = array();
diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 770eaf8d..2ff70b39 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -419,7 +419,7 @@ function culturefeed_search_ui_preprocess_culturefeed_search_facet_item(&$variab
     $variables['active'] = TRUE;
   }
 
-  if ($facet_key == 'location' && isset($_GET['location'])) {
+  if ($facet_key == 'location' && (isset($_GET['location']) || isset($_GET['facet']['category_flandersregion_id']))) {
     // Location facet items are always active when location is in query string.
     $variables['active'] = TRUE;
     // When the facet is location, we don't need location/distance in the query.

From 3794f96059f410d6ec2e9d29798e7762bacda9a9 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 3 Jun 2015 14:56:05 +0200
Subject: [PATCH 244/275] PWK-290 add cdbid as a field in views

---
 .../culturefeed_search_views.info             |  1 +
 .../views/culturefeed_search_views.views.inc  | 12 +++++++++++
 .../views_handler_field_cdb_item_cdbid.inc    | 20 +++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_cdbid.inc

diff --git a/culturefeed_search_views/culturefeed_search_views.info b/culturefeed_search_views/culturefeed_search_views.info
index 8af3e689..840634a3 100644
--- a/culturefeed_search_views/culturefeed_search_views.info
+++ b/culturefeed_search_views/culturefeed_search_views.info
@@ -28,6 +28,7 @@ files[] = views/handlers/sort/views_handler_sort_culturefeed_search_comments.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_agefrom.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_lastupdated.inc
 files[] = views/handlers/sort/views_handler_sort_culturefeed_search_weight.inc
+files[] = views/handlers/field/views_handler_field_cdb_item_cdbid.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_title.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_lastupdated.inc
 files[] = views/handlers/field/views_handler_field_cdb_item_link.inc
diff --git a/culturefeed_search_views/views/culturefeed_search_views.views.inc b/culturefeed_search_views/views/culturefeed_search_views.views.inc
index f4223466..299495cd 100644
--- a/culturefeed_search_views/views/culturefeed_search_views.views.inc
+++ b/culturefeed_search_views/views/culturefeed_search_views.views.inc
@@ -65,6 +65,18 @@ function culturefeed_search_views_data() {
     ),
   );
 
+  // Cdbid field
+  $data['cdb_items']['cdbid'] = array(
+    'title' => t('Cdbid'),
+    'help' => t('Cdbid of the cdb item'),
+    'field' => array(
+      'handler' => 'views_handler_field_cdb_item_cdbid',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_culturefeed_search_filter_query',
+    ),
+  );
+
   // Title field
   $data['cdb_items']['title'] = array(
     'title' => t('Title'),
diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_cdbid.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_cdbid.inc
new file mode 100644
index 00000000..3c711978
--- /dev/null
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_cdbid.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * A handler to provide proper displays for titles of a cdb item.
+ */
+class views_handler_field_cdb_item_cdbid extends views_handler_field {
+
+  /**
+   * @see views_handler_field::render()
+   */
+  function render($extended_entity) {
+
+    /* @var \CultuurNet\Search\ActivityStatsExtendedEntity $extended_entity */
+    $cdbid = $extended_entity->getId();
+
+    return $cdbid;
+
+  }
+
+}

From 9d8d014354f5f52f0ae5d4f7032c3c24367aa470 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Thu, 4 Jun 2015 21:17:48 +0200
Subject: [PATCH 245/275] UIV-1326 fixing bugs in actor and production program
 blocks

---
 culturefeed_agenda/includes/blocks.inc |  4 +++-
 culturefeed_agenda/theme/theme.inc     | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
index 50dd610d..3a9400ec 100644
--- a/culturefeed_agenda/includes/blocks.inc
+++ b/culturefeed_agenda/includes/blocks.inc
@@ -390,7 +390,9 @@ function culturefeed_agenda_block_production_program() {
   $preferred_language = culturefeed_search_get_preferred_language();
   $query = db_select('culturefeed_search_terms', 't');
   $query->innerJoin('culturefeed_search_terms', 'province', 'province.tid = t.p1');
-  $query->condition('t.tid', $region_ids);
+  if ($region_ids) {
+    $query->condition('t.tid', $region_ids);
+  }
   $query->condition('t.language', $preferred_language);
   $query->condition('province.language', $preferred_language);
   $query->addField('province', 'name', 'province_name');
diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 2199ccfa..4f97d4ba 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -941,7 +941,18 @@ function culturefeed_agenda_preprocess_culturefeed_agenda_actor_program(&$variab
  * Preprocess the agenda actor program.
  */
 function culturefeed_agenda_preprocess_culturefeed_agenda_actor_program_item(&$variables) {
-  culturefeed_agenda_preprocess_culturefeed_event_summary($variables);
+
+  switch ($variables['item']->getType()) {
+
+    case 'event':
+      culturefeed_agenda_preprocess_culturefeed_event_summary($variables);
+      break;
+
+    case 'production':
+      culturefeed_agenda_preprocess_culturefeed_production_summary($variables);
+      break;
+  }
+  
 }
 
 /**

From 1228312e23c2324df271e74c491e33a393428375 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Fri, 5 Jun 2015 11:48:49 +0200
Subject: [PATCH 246/275] CF-416 translations for entry ui

---
 .../includes/culturefeed_entry_ui.pages.inc   |   9 +
 .../form/culturefeed_entry_ui.tags.inc        |   2 +-
 .../js/culturefeed_entry_ui.js                |  16 +-
 .../js/maxlength/jquery.maxlength-de.js       |  11 +
 .../js/maxlength/jquery.maxlength-nl.js       |  11 +
 .../translations/culturefeed_entry_ui.nl.po   | 646 +++++++++++-------
 6 files changed, 427 insertions(+), 268 deletions(-)
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength-de.js
 create mode 100644 culturefeed_entry_ui/js/maxlength/jquery.maxlength-nl.js

diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
index b887cd74..bb3ac8cf 100644
--- a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
+++ b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -1193,6 +1193,15 @@ function culturefeed_entry_ui_event_form($form, &$form_state, $event = NULL) {
   $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/culturefeed_entry_ui.js';
   $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.plugin.js';
   $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength.js';
+  if (culturefeed_search_get_preferred_language() == 'nl') {
+    $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength-nl.js';
+  }
+  elseif (culturefeed_search_get_preferred_language() == 'fr') {
+    $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength-fr.js';
+  }
+  elseif (culturefeed_search_get_preferred_language() == 'de') {
+    $form['#attached']['js'][] = drupal_get_path('module', 'culturefeed_entry_ui') . '/js/maxlength/jquery.maxlength-de.js';
+  }
   return $form;
 
 }
diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
index bc774ade..9b64e00a 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tags.inc
@@ -35,7 +35,7 @@ function culturefeed_entry_ui_tags_form(array &$form, array &$form_state, \Cultu
     $form['extra']['tags'] = array(
       '#type' => 'culturefeed_tags_element',
       '#title' => t('Tags'),
-      '#description' => t('Add multiple tags'),
+      '#description' => t('Add Add tags'),
       '#default_value' => $keywords,
     );
 
diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
index 7637fe45..2a59a1fb 100644
--- a/culturefeed_entry_ui/js/culturefeed_entry_ui.js
+++ b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -6,11 +6,11 @@
 Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 
 (function ($) {
-  
+
   Drupal.behaviors.price = {
 
     attach: function (context, settings) {
-    
+
       $(window).bind('load', function() {
         if($("#edit-price-free").attr("checked")==true) {
           $('#edit-price-amount').val('0');
@@ -23,10 +23,10 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
           //$('#edit-price-amount').val('');
           $('#edit-price-amount').removeAttr('disabled');
           $('#edit-price-amount').css('color','#000');
-          $('#edit-price-extra').css('display','block');  
+          $('#edit-price-extra').css('display','block');
         }
       });
-      
+
       $('#edit-price-free').change(function () {
         if($("#edit-price-free").attr("checked")==true) {
           $('#edit-price-amount').val('0');
@@ -39,16 +39,16 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
           $('#edit-price-amount').val('');
           $('#edit-price-amount').removeAttr('disabled');
           $('#edit-price-amount').css('color','#000');
-          $('#edit-price-extra').css('display','block');  
+          $('#edit-price-extra').css('display','block');
         }
       });
-      
+
       $('#edit-location-actor-location-actor-label').change(function() {
         if($("[name='location[location_control][asset][label]']").val() == '') {
           $('#location_actor_id').val('');
         }
       });
-      
+
       $('#edit-organiser-actor-organiser-actor-label').change(function() {
         if($('#edit-organiser-actor-organiser-actor-label').val() == '') {
           $('#organiser_actor_id').val('');
@@ -241,7 +241,7 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
     if ($(node).data('autocompleteTitle') != undefined) {
 
       this.input.value = $(node).data('autocompleteTitle');
-          
+
       if (this.input.name == 'location[location_control][asset][label]') {
         $('#location_actor_id').val($(node).data('autocompleteValue'));
         $('#location_asset_remove').show();
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength-de.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-de.js
new file mode 100644
index 00000000..1b0f3e3c
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-de.js
@@ -0,0 +1,11 @@
+/* http://keith-wood.name/maxlength.html
+   German initialisation for the jQuery Max Length extension */
+(function($) { // hide the namespace
+
+$.maxlength.regionalOptions['de'] = {
+	feedbackText: '{r} verbleibende Zeichen ({m} maximum)',
+	overflowText: '{o} Zeichen Überschuss ({m} maximum)'
+};
+$.maxlength.setDefaults($.maxlength.regionalOptions['de']);
+
+})(jQuery);
diff --git a/culturefeed_entry_ui/js/maxlength/jquery.maxlength-nl.js b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-nl.js
new file mode 100644
index 00000000..5a879d76
--- /dev/null
+++ b/culturefeed_entry_ui/js/maxlength/jquery.maxlength-nl.js
@@ -0,0 +1,11 @@
+/* http://keith-wood.name/maxlength.html
+   Dutch initialisation for the jQuery Max Length extension */
+(function($) { // hide the namespace
+
+$.maxlength.regionalOptions['nl'] = {
+	feedbackText: '{r} karakters resterend ({m} maximum)',
+	overflowText: '{o} karakters teveel ({m} maximum)'
+};
+$.maxlength.setDefaults($.maxlength.regionalOptions['nl']);
+
+})(jQuery);
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index 577ece36..afd6331c 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -6,27 +6,36 @@
 #  culturefeed_entry_ui.module: n/a
 #  views/culturefeed_entry_ui.views_default.inc: n/a
 #  includes/culturefeed_entry_ui.pages.inc: n/a
+#  includes/form/culturefeed_entry_ui.tag_objects.inc: n/a
+#  includes/form/culturefeed_entry_ui.tags.inc: n/a
 #  views/handlers/views_handler_field_cdb_item_operations.inc: n/a
 #  views/handlers/views_handler_area_cdb_item_create.inc: n/a
 #  culturefeed_entry_ui.info: n/a
-#  culturefeed_date_control/culturefeed_date_control.info: n/a
-#  culturefeed_date_control/culturefeed_date_control.module: n/a
-#  culturefeed_date_control/form/date_control.inc: n/a
-#  culturefeed_date_control/form/hybrid.inc: n/a
-#  culturefeed_date_control/form/timestamps.inc: n/a
-#  culturefeed_date_control/form/opening_times.inc: n/a
-#  culturefeed_date_control/form/period.inc: n/a
-#  culturefeed_date_control/theme/theme.inc: n/a
+#  culturefeed_elements/culturefeed_elements.info: n/a
+#  culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info: n/a
+#  culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info: n/a
+#  culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info: n/a
+#  culturefeed_elements/culturefeed_elements.module: n/a
+#  culturefeed_elements/culturefeed_date_control/form/date_control.inc: n/a
+#  culturefeed_elements/culturefeed_date_control/form/hybrid.inc: n/a
+#  culturefeed_elements/culturefeed_date_control/form/timestamps.inc: n/a
+#  culturefeed_elements/culturefeed_date_control/form/opening_times.inc: n/a
+#  culturefeed_elements/culturefeed_date_control/form/period.inc: n/a
+#  culturefeed_elements/culturefeed_date_control/theme/theme.inc: n/a
+#  culturefeed_elements/culturefeed_location_control/form/asset.inc: n/a
+#  culturefeed_elements/culturefeed_location_control/form/custom.inc: n/a
+#  culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module: n/a
 #  includes/culturefeed_entry_ui.admin.inc: n/a
-#  js/bootstrap_autocomplete_override.js: n/a
+#  includes/form/culturefeed_entry_ui.collaboration.inc: n/a
+#  includes/form/culturefeed_entry_ui.location.inc: n/a
 #  js/culturefeed_entry_ui.js: n/a
 #  views/culturefeed_entry_ui.views.inc: n/a
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2015-02-10 12:25+0100\n"
-"PO-Revision-Date: 2015-02-10 15:54+0100\n"
+"POT-Creation-Date: 2015-06-05 11:22+0200\n"
+"PO-Revision-Date: 2015-06-05 11:44+0100\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +43,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Language: nl\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Poedit 1.8.1\n"
 
 #: culturefeed_entry_ui.module:18
 msgid "Manage object tags"
@@ -50,7 +59,7 @@ msgstr "Manage custom tags"
 
 #: culturefeed_entry_ui.module:23
 msgid "Manage custom tags from the objects on culturefeed (events, actors, ...) managed on the admin section."
-msgstr ""
+msgstr "Beheer aangepaste labels van de objecten in culturefeed (evenementen, actors, ...) beheerd op de adminsectie."
 
 #: culturefeed_entry_ui.module:26
 msgid "Create events"
@@ -76,641 +85,744 @@ msgstr "Verwijder events"
 msgid "Delete events through the entity api."
 msgstr "Verwijder activiteiten via Entry API"
 
-#: culturefeed_entry_ui.module:135;63 includes/culturefeed_entry_ui.pages.inc:761;2535 views/handlers/views_handler_field_cdb_item_operations.inc:54
+#: culturefeed_entry_ui.module:38
+msgid "Manage culturefeed collaborative info"
+msgstr "Beheer culturefeed collaborative info"
+
+#: culturefeed_entry_ui.module:39
+msgid "Manage culturefeed collaborative info through the entity api."
+msgstr "Beheer culturefeed collaborative info via de entity api."
+
+#: culturefeed_entry_ui.module:157;77 includes/culturefeed_entry_ui.pages.inc:2223 includes/form/culturefeed_entry_ui.tag_objects.inc:41 includes/form/culturefeed_entry_ui.tags.inc:37;63 views/handlers/views_handler_field_cdb_item_operations.inc:54
 msgid "Tags"
 msgstr "Labels"
 
-#: culturefeed_entry_ui.module:150 views/handlers/views_handler_field_cdb_item_operations.inc:27
+#: culturefeed_entry_ui.module:170;85
+msgid "Collaboration"
+msgstr "Samenwerking"
+
+#: culturefeed_entry_ui.module:188 views/handlers/views_handler_field_cdb_item_operations.inc:27
 msgid "Edit"
 msgstr "Bewerken"
 
-#: culturefeed_entry_ui.module:168
+#: culturefeed_entry_ui.module:206
 msgid "View"
 msgstr "Weergeven"
 
-#: culturefeed_entry_ui.module:375 views/handlers/views_handler_area_cdb_item_create.inc:19
+#: culturefeed_entry_ui.module:428 views/handlers/views_handler_area_cdb_item_create.inc:19
 msgid "Add event"
 msgstr "Voeg activiteit toe"
 
-#: culturefeed_entry_ui.module:401
+#: culturefeed_entry_ui.module:454
 msgid "Some disallowed html tags will be removed in the %field_name field. The allowed tags are %allowed_tags"
 msgstr "Niet toegelaten html-tags zullen verwijderd worden in het veld %field_name. De toegelaten tags zijn %allowed_tags"
 
-#: culturefeed_entry_ui.module:71
+#: culturefeed_entry_ui.module:93
 msgid "New event"
 msgstr "Maak nieuwe activiteit aan"
 
-#: culturefeed_entry_ui.module:79
+#: culturefeed_entry_ui.module:101
 msgid "Edit event"
 msgstr "Pas activiteit aan"
 
-#: culturefeed_entry_ui.module:87
+#: culturefeed_entry_ui.module:109
 msgid "Delete event"
 msgstr "Verwijder activiteit"
 
-#: culturefeed_entry_ui.module:95 culturefeed_entry_ui.info:0
+#: culturefeed_entry_ui.module:117 culturefeed_entry_ui.info:0
 msgid "CultureFeed Entry UI"
 msgstr "CultureFeed Entry UI"
 
-#: culturefeed_entry_ui.module:96
+#: culturefeed_entry_ui.module:118
 msgid "All configurations to entry api for this site"
-msgstr ""
+msgstr "Alle configuraties voor entry api voor deze website"
 
 #: culturefeed_entry_ui.info:0
 msgid "Multilingual forms to post, update and delete events to UiTDatabank Entry API"
 msgstr "Meertalig invoerformulier om activiteiten aan te maken, aan te passen en verwijderen in UiTdatabank via Entry API"
 
-#: culturefeed_entry_ui.info:0 culturefeed_date_control/culturefeed_date_control.info:0
+#: culturefeed_entry_ui.info:0 culturefeed_elements/culturefeed_elements.info:0 culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info:0 culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info:0
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info:0
 msgid "CultureFeed"
 msgstr "CultureFeed"
 
-#: culturefeed_date_control/culturefeed_date_control.module:253
+#: culturefeed_elements/culturefeed_elements.module:50
 msgid "AHAH callback"
 msgstr "AHAH terugkoppeling"
 
-#: culturefeed_date_control/culturefeed_date_control.info:0
+#: culturefeed_elements/culturefeed_elements.info:0
+msgid "CultureFeed Elements"
+msgstr ""
+
+#: culturefeed_elements/culturefeed_elements.info:0
+msgid "Form elements for the Entry UI."
+msgstr "Formulier elementen voor de Entry UI."
+
+#: culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info:0
 msgid "CultureFeed Entry UI Date control"
 msgstr ""
 
-#: culturefeed_date_control/culturefeed_date_control.info:0
+#: culturefeed_elements/culturefeed_date_control/culturefeed_date_control.info:0
 msgid "Form element to manage dates in the Entry UI."
-msgstr ""
+msgstr "Formulier lement voor het beheren van datums in de Entry UI."
 
-#: culturefeed_date_control/form/date_control.inc:28 includes/culturefeed_entry_ui.pages.inc:677
+#: culturefeed_elements/culturefeed_date_control/form/date_control.inc:28 includes/culturefeed_entry_ui.pages.inc:495
 msgid "Dates"
 msgstr "Datums"
 
-#: culturefeed_date_control/form/date_control.inc:87 culturefeed_date_control/form/hybrid.inc:131
+#: culturefeed_elements/culturefeed_date_control/form/date_control.inc:87 culturefeed_elements/culturefeed_date_control/form/hybrid.inc:131
 msgid "Permanent"
 msgstr "Permanent"
 
-#: culturefeed_date_control/form/hybrid.inc:83;108 culturefeed_date_control/form/timestamps.inc:104
+#: culturefeed_elements/culturefeed_date_control/form/hybrid.inc:83;108 culturefeed_elements/culturefeed_date_control/form/timestamps.inc:104
 msgid "Date"
 msgstr "Datum"
 
-#: culturefeed_date_control/form/hybrid.inc:98
+#: culturefeed_elements/culturefeed_date_control/form/hybrid.inc:98
 msgid "+ add end date or time"
 msgstr "+ voeg einddatum toe"
 
-#: culturefeed_date_control/form/hybrid.inc:124 culturefeed_date_control/form/timestamps.inc:143
+#: culturefeed_elements/culturefeed_date_control/form/hybrid.inc:124 culturefeed_elements/culturefeed_date_control/form/timestamps.inc:143
 msgid "+ add date"
 msgstr "+ voeg datum toe"
 
-#: culturefeed_date_control/form/opening_times.inc:24
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:24
 msgid "mon"
 msgstr "ma"
 
-#: culturefeed_date_control/form/opening_times.inc:25
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:25
 msgid "tue"
 msgstr "di"
 
-#: culturefeed_date_control/form/opening_times.inc:26
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:26
 msgid "wed"
 msgstr "woe"
 
-#: culturefeed_date_control/form/opening_times.inc:27
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:27
 msgid "thu"
 msgstr "don"
 
-#: culturefeed_date_control/form/opening_times.inc:28
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:28
 msgid "fri"
 msgstr "vrij"
 
-#: culturefeed_date_control/form/opening_times.inc:29
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:29
 msgid "sat"
 msgstr "zat"
 
-#: culturefeed_date_control/form/opening_times.inc:30
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:30
 msgid "sun"
 msgstr "zon"
 
-#: culturefeed_date_control/form/opening_times.inc:36
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:36
 msgid "Yes"
 msgstr "Ja"
 
-#: culturefeed_date_control/form/opening_times.inc:36
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:36
 msgid "No"
 msgstr "Nee"
 
-#: culturefeed_date_control/form/opening_times.inc:37
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:37
 msgid "Open all day ?"
 msgstr "De hele dag geopend?"
 
-#: culturefeed_date_control/form/opening_times.inc:60;67
+#: culturefeed_elements/culturefeed_date_control/form/opening_times.inc:60;67
 msgid "Format"
 msgstr "Formaat"
 
-#: culturefeed_date_control/form/period.inc:82
+#: culturefeed_elements/culturefeed_date_control/form/period.inc:82
 msgid "Start date"
 msgstr "Begindatum"
 
-#: culturefeed_date_control/form/period.inc:88
+#: culturefeed_elements/culturefeed_date_control/form/period.inc:88
 msgid "+ add end date"
 msgstr "+ voeg einddatum toe"
 
-#: culturefeed_date_control/form/period.inc:99
+#: culturefeed_elements/culturefeed_date_control/form/period.inc:99
 msgid "End date"
 msgstr "Einddatum"
 
-#: culturefeed_date_control/form/period.inc:106
+#: culturefeed_elements/culturefeed_date_control/form/period.inc:106
 msgid "- remove end date"
 msgstr "- verwijder einddatum"
 
-#: culturefeed_date_control/form/timestamps.inc:92
+#: culturefeed_elements/culturefeed_date_control/form/timestamps.inc:92
 msgid "×"
 msgstr "x"
 
-#: culturefeed_date_control/form/timestamps.inc:131
+#: culturefeed_elements/culturefeed_date_control/form/timestamps.inc:131
 msgid "- remove end time"
 msgstr "- verwijder einduur"
 
-#: culturefeed_date_control/form/timestamps.inc:136
+#: culturefeed_elements/culturefeed_date_control/form/timestamps.inc:136
 msgid "+ add end time"
 msgstr "+ voeg einduur toe"
 
-#: culturefeed_date_control/theme/theme.inc:64
+#: culturefeed_elements/culturefeed_date_control/theme/theme.inc:64
 msgid "open"
 msgstr "open"
 
-#: culturefeed_date_control/theme/theme.inc:64
+#: culturefeed_elements/culturefeed_date_control/theme/theme.inc:64
 msgid "from"
 msgstr "van"
 
-#: culturefeed_date_control/theme/theme.inc:64
+#: culturefeed_elements/culturefeed_date_control/theme/theme.inc:64
 msgid "to"
 msgstr "tot"
 
-#: includes/culturefeed_entry_ui.admin.inc:21
+#: culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info:0
+msgid "CultureFeed Entry UI Location control"
+msgstr ""
+
+#: culturefeed_elements/culturefeed_location_control/culturefeed_location_control.info:0
+msgid "Form element to manage locations in the Entry UI."
+msgstr "Formulier element voor het beheren van locaties in de Entry UI."
+
+#: culturefeed_elements/culturefeed_location_control/form/asset.inc:59
+msgid "Location"
+msgstr "Locatie"
+
+#: culturefeed_elements/culturefeed_location_control/form/asset.inc:78 culturefeed_elements/culturefeed_location_control/form/custom.inc:136
+msgid "Remove address"
+msgstr "Adres verwijderen"
+
+#: culturefeed_elements/culturefeed_location_control/form/asset.inc:87
+msgid "Location not found, add location"
+msgstr "Locatie niet gevonden, voeg locatie toe"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:67
+msgid "Location Title"
+msgstr "Naam locatie"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:77
+msgid "Country"
+msgstr "Land"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:90
+msgid "ZIP Code"
+msgstr "Postcode"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:99
+msgid "City"
+msgstr "Stad of gemeente"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:107
+msgid "Street"
+msgstr "Straat"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:107
+msgid "Street and House Number"
+msgstr "Straat en huisnummer"
+
+#: culturefeed_elements/culturefeed_location_control/form/custom.inc:116
+msgid "House Number"
+msgstr "Huisnummer"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:85
+msgid "Hide tag"
+msgstr "Label verbergen"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:96
+msgid "Remove tag"
+msgstr "Label verwijderen"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:113
+msgid "Add tag"
+msgstr "Label toevoegen"
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info:0
+msgid "CultureFeed Tags element"
+msgstr ""
+
+#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.info:0
+msgid "Form element to manage keywords in the Entry UI."
+msgstr "Formulier element voor het beheren van labels in de Entry UI."
+
+#: includes/culturefeed_entry_ui.admin.inc:23
 msgid "Preferred language"
 msgstr "Voorkeur taal"
 
-#: includes/culturefeed_entry_ui.admin.inc:23
+#: includes/culturefeed_entry_ui.admin.inc:25
 msgid "Use the preferred language of the UiTID user, with the Drupal UI language as fallback"
 msgstr "Gebruik de voorkeurstaal van de UiTiD gebruiker, met de Drupal UI taal als backup"
 
-#: includes/culturefeed_entry_ui.admin.inc:30
+#: includes/culturefeed_entry_ui.admin.inc:34
+msgid "Custom tags specific for this site."
+msgstr "Aangepaste labels specifiek voor deze website."
+
+#: includes/culturefeed_entry_ui.admin.inc:35;46
 msgid "Custom options on the /tags page"
-msgstr ""
+msgstr "Aangepaste opties voor de /tags pagina"
 
-#: includes/culturefeed_entry_ui.admin.inc:32
+#: includes/culturefeed_entry_ui.admin.inc:45
 msgid "Custom tags specific for this site. Use a new line for each tag."
-msgstr ""
+msgstr "Aangepaste labels specifiek voor deze website. Gebruik een nieuwe regel voor elk label."
+
+#: includes/culturefeed_entry_ui.admin.inc:56
+msgid "Tags pushed under the hood to Entry API."
+msgstr "Labels die onder de motorkap worden doorgestuurd naar Entry API."
 
-#: includes/culturefeed_entry_ui.admin.inc:37
+#: includes/culturefeed_entry_ui.admin.inc:57;68
 msgid "Custom tags to push to entry API"
-msgstr ""
+msgstr "Aangepaste labels die worden doorgestuurd naar entry API"
 
-#: includes/culturefeed_entry_ui.admin.inc:39
+#: includes/culturefeed_entry_ui.admin.inc:67
 msgid "Tags pushed under the hood to Entry API. Use a new line for each tag."
-msgstr ""
+msgstr "Labels die onder de motorkap worden doorgestuurd naar Entry API. Gebruik een nieuwe regel voor elk label."
+
+#: includes/culturefeed_entry_ui.admin.inc:78
+msgid "Tags used for the collaboration tab."
+msgstr "Labels die gebruikt worden voor het collaboration tabblad."
+
+#: includes/culturefeed_entry_ui.admin.inc:79
+msgid "Custom tags to use as collaboration data"
+msgstr "Aangepaste labels die gebruikt worden als collaboration data"
 
-#: includes/culturefeed_entry_ui.pages.inc:380;1234;1265;1296;1327
+#: includes/culturefeed_entry_ui.admin.inc:89
+msgid "Default country"
+msgstr "Standaardland"
+
+#: includes/culturefeed_entry_ui.admin.inc:91
+msgid "Select the default country for the entry form."
+msgstr "Selecteer het standaard land voor het entry formulier"
+
+#: includes/culturefeed_entry_ui.pages.inc:335;1050;1081;1112;1143
 msgid "Event title"
 msgstr "Titel"
 
-#: includes/culturefeed_entry_ui.pages.inc:428
+#: includes/culturefeed_entry_ui.pages.inc:383
 msgid "Concerts"
 msgstr "Concerten"
 
-#: includes/culturefeed_entry_ui.pages.inc:449
+#: includes/culturefeed_entry_ui.pages.inc:404
 msgid "Dance"
 msgstr "Dansvoorstelling"
 
-#: includes/culturefeed_entry_ui.pages.inc:470
+#: includes/culturefeed_entry_ui.pages.inc:425
 msgid "Film"
 msgstr "Film"
 
-#: includes/culturefeed_entry_ui.pages.inc:494
+#: includes/culturefeed_entry_ui.pages.inc:449
 msgid "Theatre"
 msgstr "Theatervoorstelling"
 
-#: includes/culturefeed_entry_ui.pages.inc:516
+#: includes/culturefeed_entry_ui.pages.inc:471
 msgid "Sport"
 msgstr "Sport"
 
-#: includes/culturefeed_entry_ui.pages.inc:551
-msgid "Location"
-msgstr "Locatie"
-
-#: includes/culturefeed_entry_ui.pages.inc:584
-msgid "Location not found, add location"
-msgstr "Locatie niet gevonden, voeg locatie toe"
-
-#: includes/culturefeed_entry_ui.pages.inc:605
-msgid "Location Title"
-msgstr "Naam locatie"
-
-#: includes/culturefeed_entry_ui.pages.inc:620
-msgid "Country"
-msgstr "Land"
-
-#: includes/culturefeed_entry_ui.pages.inc:633
-msgid "ZIP Code"
-msgstr "Postcode"
-
-#: includes/culturefeed_entry_ui.pages.inc:646
-msgid "City"
-msgstr "Stad of gemeente"
-
-#: includes/culturefeed_entry_ui.pages.inc:655
-msgid "Street"
-msgstr "Straat"
-
-#: includes/culturefeed_entry_ui.pages.inc:655
-msgid "Street and House Number"
-msgstr "Straat en huisnummer"
-
-#: includes/culturefeed_entry_ui.pages.inc:663
-msgid "House Number"
-msgstr "Huisnummer"
-
-#: includes/culturefeed_entry_ui.pages.inc:694
+#: includes/culturefeed_entry_ui.pages.inc:512
 msgid "Extra info"
 msgstr "Extra info"
 
-#: includes/culturefeed_entry_ui.pages.inc:702;710;728
+#: includes/culturefeed_entry_ui.pages.inc:520;528;546
 msgid "Description"
 msgstr "Beschrijving"
 
-#: includes/culturefeed_entry_ui.pages.inc:715;1240;1271;1302;1333
+#: includes/culturefeed_entry_ui.pages.inc:533;1056;1087;1118;1149 includes/form/culturefeed_entry_ui.collaboration.inc:102
 msgid "Short description"
 msgstr "Korte omschrijving"
 
-#: includes/culturefeed_entry_ui.pages.inc:718
+#: includes/culturefeed_entry_ui.pages.inc:536
 msgid "Maximum 400 characters"
 msgstr "Maximum 400 karakters"
 
-#: includes/culturefeed_entry_ui.pages.inc:736
+#: includes/culturefeed_entry_ui.pages.inc:554
 msgid "+ add long description"
 msgstr "+ voeg lange beschrijving toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:751;1247;1278;1309;1340
+#: includes/culturefeed_entry_ui.pages.inc:569;1063;1094;1125;1156
 msgid "Long description"
 msgstr "Lange beschrijving"
 
-#: includes/culturefeed_entry_ui.pages.inc:762
-msgid "Add multiple tags seperated by a \";\""
-msgstr "Voeg meerdere trefwoorden toe, gescheiden met een \";\""
-
-#: includes/culturefeed_entry_ui.pages.inc:772
+#: includes/culturefeed_entry_ui.pages.inc:586
 msgid "Links"
 msgstr "Links"
 
-#: includes/culturefeed_entry_ui.pages.inc:803
+#: includes/culturefeed_entry_ui.pages.inc:617
 msgid "+ add another link"
 msgstr "+ voeg een link toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:820
+#: includes/culturefeed_entry_ui.pages.inc:634 includes/form/culturefeed_entry_ui.collaboration.inc:51
 msgid "Image"
 msgstr "Afbeelding"
 
-#: includes/culturefeed_entry_ui.pages.inc:826
+#: includes/culturefeed_entry_ui.pages.inc:640 includes/form/culturefeed_entry_ui.collaboration.inc:57
 msgid "Image upload"
 msgstr "Afbeelding opladen"
 
-#: includes/culturefeed_entry_ui.pages.inc:828
+#: includes/culturefeed_entry_ui.pages.inc:642 includes/form/culturefeed_entry_ui.collaboration.inc:60
 msgid "Allowed extensions: gif png jpg jpeg"
 msgstr "Ondersteunde bestandsformaten: gif, png, jpg, jpeg"
 
-#: includes/culturefeed_entry_ui.pages.inc:853
+#: includes/culturefeed_entry_ui.pages.inc:667 includes/form/culturefeed_entry_ui.collaboration.inc:79
 msgid "Copyright"
 msgstr "Copyright"
 
-#: includes/culturefeed_entry_ui.pages.inc:854
+#: includes/culturefeed_entry_ui.pages.inc:668 includes/form/culturefeed_entry_ui.collaboration.inc:80
 msgid "Name of the copyright owner of this image."
 msgstr "Naam van de copyright eigenaar van deze afbeelding"
 
-#: includes/culturefeed_entry_ui.pages.inc:861
+#: includes/culturefeed_entry_ui.pages.inc:675 includes/form/culturefeed_entry_ui.collaboration.inc:88
 msgid "I agree to the <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">terms & conditions</a> and I declare that I have the necessary rights or permissions to distribute the image."
-msgstr ""
-"Ik ga akkoord met de <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding "
-"te verspreiden."
+msgstr "Ik ga akkoord met de <a href=\"http://www.uitdatabank.be/uitportal/legal.aspx\">algemene voorwaarden van UiTdatabank</a> en verklaar dat ik over de nodige rechten beschik om de afbeelding te verspreiden."
 
-#: includes/culturefeed_entry_ui.pages.inc:868;873;905
+#: includes/culturefeed_entry_ui.pages.inc:682;687;719
 msgid "Price"
 msgstr "Prijs"
 
-#: includes/culturefeed_entry_ui.pages.inc:888
+#: includes/culturefeed_entry_ui.pages.inc:702
 msgid "Free event"
 msgstr "Gratis activiteit"
 
-#: includes/culturefeed_entry_ui.pages.inc:912
+#: includes/culturefeed_entry_ui.pages.inc:726
 msgid "+ add conditions & discounts"
 msgstr "+ voeg voorwaarden en kortingen toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:939
+#: includes/culturefeed_entry_ui.pages.inc:753
 msgid "Price conditions & discounts"
 msgstr "Prijsvoorwaarden & kortingen"
 
-#: includes/culturefeed_entry_ui.pages.inc:968
+#: includes/culturefeed_entry_ui.pages.inc:782
 msgid "Organizer"
 msgstr "Organisator"
 
-#: includes/culturefeed_entry_ui.pages.inc:992
+#: includes/culturefeed_entry_ui.pages.inc:806
 msgid "Organizer not found, add organizer"
 msgstr "Organisator niet gevonden, voeg organisator toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1009
+#: includes/culturefeed_entry_ui.pages.inc:824
 msgid "Name new organizer"
 msgstr "Naam nieuwe organisator"
 
-#: includes/culturefeed_entry_ui.pages.inc:1016
+#: includes/culturefeed_entry_ui.pages.inc:832
 msgid "Age"
 msgstr "Leeftijd"
 
-#: includes/culturefeed_entry_ui.pages.inc:1018
+#: includes/culturefeed_entry_ui.pages.inc:834
 msgid "For everyone"
 msgstr "Voor iedereen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1019
+#: includes/culturefeed_entry_ui.pages.inc:835
 msgid "For children (between 1 and 12 years)"
 msgstr "Voor kinderen (tussen 1 en 12 jaar)"
 
-#: includes/culturefeed_entry_ui.pages.inc:1020
+#: includes/culturefeed_entry_ui.pages.inc:836
 msgid "For youth (between 12 and 18 years)"
 msgstr "Voor jongeren (tussen 12 en 18 jaar)"
 
-#: includes/culturefeed_entry_ui.pages.inc:1021
+#: includes/culturefeed_entry_ui.pages.inc:837
 msgid "For adults (18+)"
 msgstr "Voor volwassenen (18+)"
 
-#: includes/culturefeed_entry_ui.pages.inc:1027
+#: includes/culturefeed_entry_ui.pages.inc:843
 msgid "Suitable for ages from"
 msgstr "Geschikt voor leeftijden vanaf"
 
-#: includes/culturefeed_entry_ui.pages.inc:1050
+#: includes/culturefeed_entry_ui.pages.inc:866
 msgid "Activities for children will get the 'Fly' label"
 msgstr "Activiteiten voor kinderen krijgen automatisch het 'Vlieg'-label"
 
-#: includes/culturefeed_entry_ui.pages.inc:1061;1507
+#: includes/culturefeed_entry_ui.pages.inc:877;1313
 msgid "Contact"
 msgstr "Contact"
 
-#: includes/culturefeed_entry_ui.pages.inc:1094
+#: includes/culturefeed_entry_ui.pages.inc:910
 msgid "+ add contact option"
 msgstr "+ voeg contactgegevens toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1108
+#: includes/culturefeed_entry_ui.pages.inc:924
 msgid "Performers"
 msgstr "Uitvoerders"
 
-#: includes/culturefeed_entry_ui.pages.inc:1143
+#: includes/culturefeed_entry_ui.pages.inc:959
 msgid "+ add another performer"
 msgstr "+ voeg nog een uitvoerder toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1157;1461
+#: includes/culturefeed_entry_ui.pages.inc:973;1267
 msgid "Language"
 msgstr "Taal"
 
-#: includes/culturefeed_entry_ui.pages.inc:1190
+#: includes/culturefeed_entry_ui.pages.inc:1006
 msgid "+ add more language info"
 msgstr "+ voeg meer taalinformatie toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:1205
+#: includes/culturefeed_entry_ui.pages.inc:1021
 msgid "Access"
 msgstr "Toegang"
 
-#: includes/culturefeed_entry_ui.pages.inc:1211
+#: includes/culturefeed_entry_ui.pages.inc:1027
 msgid "Open for everyone"
 msgstr "Voor iedereen toegankelijk"
 
-#: includes/culturefeed_entry_ui.pages.inc:1211
+#: includes/culturefeed_entry_ui.pages.inc:1027
 msgid "Only for members"
 msgstr "Enkel voor leden"
 
-#: includes/culturefeed_entry_ui.pages.inc:1218
+#: includes/culturefeed_entry_ui.pages.inc:1034
 msgid "Translations"
 msgstr "Vertalingen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1226;1478
+#: includes/culturefeed_entry_ui.pages.inc:1042;1284
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: includes/culturefeed_entry_ui.pages.inc:1257;1476
+#: includes/culturefeed_entry_ui.pages.inc:1073;1282
 msgid "English"
 msgstr "Engels"
 
-#: includes/culturefeed_entry_ui.pages.inc:1288;1480
+#: includes/culturefeed_entry_ui.pages.inc:1104;1286
 msgid "French"
 msgstr "Frans"
 
-#: includes/culturefeed_entry_ui.pages.inc:1319;1479
+#: includes/culturefeed_entry_ui.pages.inc:1135;1285
 msgid "German"
 msgstr "Duits"
 
-#: includes/culturefeed_entry_ui.pages.inc:1348
+#: includes/culturefeed_entry_ui.pages.inc:1164
 msgid "Publication date"
 msgstr "Publicatiedatum"
 
-#: includes/culturefeed_entry_ui.pages.inc:1372
+#: includes/culturefeed_entry_ui.pages.inc:1188 includes/form/culturefeed_entry_ui.collaboration.inc:168 includes/form/culturefeed_entry_ui.tag_objects.inc:61
 msgid "Save"
 msgstr "Opslaan"
 
-#: includes/culturefeed_entry_ui.pages.inc:1464
+#: includes/culturefeed_entry_ui.pages.inc:1270
 msgid "Spoken"
 msgstr "Gesproken"
 
-#: includes/culturefeed_entry_ui.pages.inc:1465
+#: includes/culturefeed_entry_ui.pages.inc:1271
 msgid "Dubbed"
 msgstr "Gedubd"
 
-#: includes/culturefeed_entry_ui.pages.inc:1466
+#: includes/culturefeed_entry_ui.pages.inc:1272
 msgid "Subtitled"
 msgstr "Ondertiteld"
 
-#: includes/culturefeed_entry_ui.pages.inc:1473
+#: includes/culturefeed_entry_ui.pages.inc:1279
 msgid "in"
 msgstr "in"
 
-#: includes/culturefeed_entry_ui.pages.inc:1516
+#: includes/culturefeed_entry_ui.pages.inc:1298
+msgid "Phone"
+msgstr "Telefoon"
+
+#: includes/culturefeed_entry_ui.pages.inc:1298
+msgid "E-mail"
+msgstr "E-mailadres"
+
+#: includes/culturefeed_entry_ui.pages.inc:1322
 msgid "Input"
 msgstr "Invoer"
 
-#: includes/culturefeed_entry_ui.pages.inc:1532
+#: includes/culturefeed_entry_ui.pages.inc:1338
 msgid "Performer"
 msgstr "Uitvoerder"
 
-#: includes/culturefeed_entry_ui.pages.inc:1540
+#: includes/culturefeed_entry_ui.pages.inc:1346
 msgid "Role"
 msgstr "Rol"
 
-#: includes/culturefeed_entry_ui.pages.inc:1555
+#: includes/culturefeed_entry_ui.pages.inc:1361
 msgid "Link"
 msgstr "Link"
 
-#: includes/culturefeed_entry_ui.pages.inc:1562
+#: includes/culturefeed_entry_ui.pages.inc:1368
 msgid "for reservation"
 msgstr "voor reservatie"
 
-#: includes/culturefeed_entry_ui.pages.inc:1578
+#: includes/culturefeed_entry_ui.pages.inc:1384
 msgid "Please fill in correct age"
 msgstr "Geef de juiste leeftijd op"
 
-#: includes/culturefeed_entry_ui.pages.inc:1595;1625
+#: includes/culturefeed_entry_ui.pages.inc:1401;1431
 msgid "Please fill in correct date and time"
 msgstr "Geef de juiste datum en tijdstip op"
 
-#: includes/culturefeed_entry_ui.pages.inc:1602
+#: includes/culturefeed_entry_ui.pages.inc:1408
 msgid "Date field is invalid. The end date is earlier than the beginning date."
 msgstr "Ingevoerde datum niet correct: einddatum valt voor de begindatum"
 
-#: includes/culturefeed_entry_ui.pages.inc:1632
+#: includes/culturefeed_entry_ui.pages.inc:1438
 msgid "Date field is invalid. The end time is earlier than the beginning time."
 msgstr "Ingevoerde datum niet correct: einduur valt voor beginuur"
 
-#: includes/culturefeed_entry_ui.pages.inc:1666;1673
+#: includes/culturefeed_entry_ui.pages.inc:1472;1479
 msgid "Please fill in correct time."
 msgstr "Geef de juiste datum en tijdstip op"
 
-#: includes/culturefeed_entry_ui.pages.inc:1688
+#: includes/culturefeed_entry_ui.pages.inc:1494 includes/form/culturefeed_entry_ui.collaboration.inc:270
 msgid "Please agree to the general conditions of UiTdatabank and declare that you have the necessary rights or permissions to distribute the image through UiTdatabank."
 msgstr "Geef aan dat je akkoord gaat met de algemene voorwaarden van UiTdatabank en dat je over de nodige rechten of toestemmingen beschikt om de afbeelding te verspreiden via UiTdatabank."
 
-#: includes/culturefeed_entry_ui.pages.inc:1691
+#: includes/culturefeed_entry_ui.pages.inc:1497 includes/form/culturefeed_entry_ui.collaboration.inc:273
 msgid "Copyright field is required."
 msgstr "Het veld 'copyright' is verplicht."
 
-#: includes/culturefeed_entry_ui.pages.inc:1696
+#: includes/culturefeed_entry_ui.pages.inc:1502
 msgid "A category is required."
 msgstr "Een categorie is verplicht"
 
-#: includes/culturefeed_entry_ui.pages.inc:1702
-msgid "A title is required for a custom location"
-msgstr "Een titel is verplicht voor een nieuwe locatie"
-
-#: includes/culturefeed_entry_ui.pages.inc:1706
-msgid "A zip code is required for a custom location"
-msgstr "Een postcode is verplicht voor een nieuwe locatie"
-
-#: includes/culturefeed_entry_ui.pages.inc:1710
-msgid "A city is required for a custom location"
-msgstr "Een stad is verplicht voor een nieuwe locatie"
-
-#: includes/culturefeed_entry_ui.pages.inc:1715
-msgid "A valid city is required for a custom location"
-msgstr "Een geldige stad/gemeente is verplicht voor een nieuwe locatie"
-
-#: includes/culturefeed_entry_ui.pages.inc:1723
-msgid "A location is required."
-msgstr "Een locatie is verplicht"
-
-#: includes/culturefeed_entry_ui.pages.inc:1728;1732
-msgid "We could not validate the location"
-msgstr "We kunnen de locatie niet bevestigen"
-
-#: includes/culturefeed_entry_ui.pages.inc:1771
+#: includes/culturefeed_entry_ui.pages.inc:1516
 msgid "Not a valid URL"
 msgstr "Geen geldige URL"
 
-#: includes/culturefeed_entry_ui.pages.inc:1783;1787
+#: includes/culturefeed_entry_ui.pages.inc:1528;1532
 msgid "We could not validate the organizer"
 msgstr "We kunnen de organisatie niet bevestigen"
 
-#: includes/culturefeed_entry_ui.pages.inc:1803
+#: includes/culturefeed_entry_ui.pages.inc:1548
 msgid "Not a valid email address"
 msgstr "Geen geldig emailadres"
 
-#: includes/culturefeed_entry_ui.pages.inc:1822
+#: includes/culturefeed_entry_ui.pages.inc:1567
 msgid "If you translate something, you should also translate the title."
 msgstr "Als je een vertaling toevoegt, moet je ook de titel vertalen."
 
-#: includes/culturefeed_entry_ui.pages.inc:1962
+#: includes/culturefeed_entry_ui.pages.inc:1707
 msgid "Order tickets"
 msgstr "Bestel tickets"
 
-#: includes/culturefeed_entry_ui.pages.inc:2340
+#: includes/culturefeed_entry_ui.pages.inc:2027
 msgid "An error occurred while saving the event"
 msgstr "Er is een fout opgetreden tijdens het opslaan van de activiteit"
 
-#: includes/culturefeed_entry_ui.pages.inc:2441
+#: includes/culturefeed_entry_ui.pages.inc:2128
 msgid "Saving the event"
 msgstr "Evenement aan het bewaren"
 
-#: includes/culturefeed_entry_ui.pages.inc:2448
+#: includes/culturefeed_entry_ui.pages.inc:2135
 msgid "Initializing."
 msgstr "Aan het initialiseren."
 
-#: includes/culturefeed_entry_ui.pages.inc:2449
+#: includes/culturefeed_entry_ui.pages.inc:2136
 msgid "Completed @current of @total."
 msgstr "@current van @total gereed."
 
-#: includes/culturefeed_entry_ui.pages.inc:2467
+#: includes/culturefeed_entry_ui.pages.inc:2154
 msgid "Are you sure you want to delete the event?"
 msgstr "Ben je zeker dat je de activiteit wil verwijderen?"
 
-#: includes/culturefeed_entry_ui.pages.inc:2469
+#: includes/culturefeed_entry_ui.pages.inc:2156
 msgid "This action cannot be undone"
 msgstr "Deze actie kan niet ongedaan gemaakt worden"
 
-#: includes/culturefeed_entry_ui.pages.inc:2470 views/handlers/views_handler_field_cdb_item_operations.inc:31
+#: includes/culturefeed_entry_ui.pages.inc:2157 views/handlers/views_handler_field_cdb_item_operations.inc:31
 msgid "Delete"
 msgstr "Verwijder"
 
-#: includes/culturefeed_entry_ui.pages.inc:2471
+#: includes/culturefeed_entry_ui.pages.inc:2158
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: includes/culturefeed_entry_ui.pages.inc:2483
+#: includes/culturefeed_entry_ui.pages.inc:2170
 msgid "Event successfully deleted"
 msgstr "Activiteit werd verwijderd"
 
-#: includes/culturefeed_entry_ui.pages.inc:2487
+#: includes/culturefeed_entry_ui.pages.inc:2174
 msgid "An error occurred while deleting the event"
 msgstr "Er is een fout opgetreden tijdens het verwijderen van de activiteit"
 
-#: includes/culturefeed_entry_ui.pages.inc:2528
+#: includes/culturefeed_entry_ui.pages.inc:2216 includes/form/culturefeed_entry_ui.tag_objects.inc:50
 msgid "Custom tags"
-msgstr ""
+msgstr "Aangepaste labels"
 
-#: includes/culturefeed_entry_ui.pages.inc:2537
+#: includes/culturefeed_entry_ui.pages.inc:2225
 msgid "Seperate multiple tags by ;"
 msgstr "Scheid meerdere trefwoorden met ;"
 
-#: includes/culturefeed_entry_ui.pages.inc:2542
+#: includes/culturefeed_entry_ui.pages.inc:2231
 msgid "Submit"
 msgstr "Voeg toe"
 
-#: includes/culturefeed_entry_ui.pages.inc:2557
+#: includes/culturefeed_entry_ui.pages.inc:2246 includes/form/culturefeed_entry_ui.tag_objects.inc:147
 msgid "Tag @tag is not permitted because it's already a custom tag."
 msgstr "Trefwoord @tag is niet toegelaten aangezien het al een bestaande marker is."
 
-#: includes/culturefeed_entry_ui.pages.inc:2604
-msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
-msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
-
-#: includes/culturefeed_entry_ui.pages.inc:2604
+#: includes/culturefeed_entry_ui.pages.inc:2293
 msgid "The tags were adjusted."
-msgstr "De labels werden aangepast."
+msgstr "De labels werden toegevoegd."
 
-#: includes/culturefeed_entry_ui.pages.inc:2609
+#: includes/culturefeed_entry_ui.pages.inc:2298 includes/form/culturefeed_entry_ui.tag_objects.inc:125
 msgid "You tried to add a tag that should not be added by anyone. If you still wish to add this or have other questions about this, please email to \"vragen@uitdatabank.be\"."
 msgstr "Je hebt niet de juiste rechten om dit trefwoord toe te voegen. Als je hier vragen bij hebt, contacteer dan onze helpdesk via \"vragen@uitdatabank.be\"."
 
-#: includes/culturefeed_entry_ui.pages.inc:2612
+#: includes/culturefeed_entry_ui.pages.inc:2301 includes/form/culturefeed_entry_ui.tag_objects.inc:128
 msgid "Error occured while saving the tags"
 msgstr "Er is een fout opgetreden tijdens het opslaan van de labels"
 
-#: includes/culturefeed_entry_ui.pages.inc:2686
+#: includes/culturefeed_entry_ui.pages.inc:2375
 msgid "The event %title has been created."
 msgstr "De activiteit %title werd aangemaakt."
 
-#: includes/culturefeed_entry_ui.pages.inc:2687
+#: includes/culturefeed_entry_ui.pages.inc:2376
 msgid "The event %title has been updated."
 msgstr "Het event %title werd aangepast."
 
-#: includes/culturefeed_entry_ui.pages.inc:2328;2333
+#: includes/culturefeed_entry_ui.pages.inc:2015;2020
 msgid "culturefeed_entry_ui"
 msgstr ""
 
-#: includes/culturefeed_entry_ui.pages.inc:2328
+#: includes/culturefeed_entry_ui.pages.inc:2015
 msgid "Event %eventid updated."
-msgstr ""
+msgstr "Evenement %eventid geupdate."
 
-#: includes/culturefeed_entry_ui.pages.inc:2333
+#: includes/culturefeed_entry_ui.pages.inc:2020
 msgid "Event %eventid created."
-msgstr ""
+msgstr "Evenement %eventid aangemaakt."
+
+#: includes/form/culturefeed_entry_ui.collaboration.inc:32
+msgid "Title"
+msgstr "Titel"
+
+#: includes/form/culturefeed_entry_ui.collaboration.inc:94
+msgid "Article"
+msgstr "Artikel"
+
+#: includes/form/culturefeed_entry_ui.location.inc:110
+msgid "A title is required for a custom location"
+msgstr "Een titel is verplicht voor een nieuwe locatie"
+
+#: includes/form/culturefeed_entry_ui.location.inc:115
+msgid "A zip code is required for a custom location"
+msgstr "Een postcode is verplicht voor een nieuwe locatie"
+
+#: includes/form/culturefeed_entry_ui.location.inc:119
+msgid "A zip code has minimum 4 characters"
+msgstr "Een postcode heeft minimaal 4 tekens"
+
+#: includes/form/culturefeed_entry_ui.location.inc:123
+msgid "A city is required for a custom location"
+msgstr "Een stad is verplicht voor een nieuwe locatie"
+
+#: includes/form/culturefeed_entry_ui.location.inc:132
+msgid "A valid city is required for a custom location."
+msgstr "Een geldige stad is nodig voor een aangepaste locatie."
 
-#: js/bootstrap_autocomplete_override.js:0 js/culturefeed_entry_ui.js:0
+#: includes/form/culturefeed_entry_ui.location.inc:145
+msgid "Please select a city from the list."
+msgstr "Selecteer een stad uit de lijst."
+
+#: includes/form/culturefeed_entry_ui.location.inc:159
+msgid "A location is required."
+msgstr "Een locatie is verplicht"
+
+#: includes/form/culturefeed_entry_ui.location.inc:164;171
+msgid "We could not validate the location"
+msgstr "We kunnen de locatie niet bevestigen"
+
+#: includes/form/culturefeed_entry_ui.tag_objects.inc:118
+msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
+msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
+
+#: includes/form/culturefeed_entry_ui.tags.inc:38
+msgid "Add Add tags"
+msgstr "Labels toevoegen"
+
+#: includes/form/culturefeed_entry_ui.tags.inc:64
+msgid "Add multiple tags separated by a \";\""
+msgstr "Voeg meerdere labels toe gescheiden door “;”"
+
+#: js/culturefeed_entry_ui.js:0
 msgid "Autocomplete popup"
 msgstr "Popup voor automatisch aanvullen"
 
@@ -764,9 +876,9 @@ msgstr "Er werden geen activiteiten gevonden die door jou aangemaakt werden"
 
 #: views/culturefeed_entry_ui.views_default.inc:121;168
 msgid "Created by current user"
-msgstr ""
+msgstr "Aangemaakt door de huidige gebruiker"
 
-#: views/culturefeed_entry_ui.views_default.inc:126;169
+#: views/culturefeed_entry_ui.views_default.inc:126;169;351
 msgid "Block"
 msgstr "Blok"
 
@@ -776,11 +888,11 @@ msgstr "Pagina"
 
 #: views/culturefeed_entry_ui.views_default.inc:138;172
 msgid "Items on page"
-msgstr ""
+msgstr "Items op pagina"
 
 #: views/culturefeed_entry_ui.views_default.inc:139;173
 msgid "- All -"
-msgstr ""
+msgstr "- Alle -"
 
 #: views/culturefeed_entry_ui.views_default.inc:140;174
 msgid "Start"
@@ -802,9 +914,9 @@ msgstr "volgende ›"
 msgid "last »"
 msgstr "laatste »"
 
-#: views/culturefeed_entry_ui.views_default.inc:157
+#: views/culturefeed_entry_ui.views_default.inc:157;341
 msgid "Master"
-msgstr ""
+msgstr "Hoofd"
 
 #: views/culturefeed_entry_ui.views_default.inc:158
 msgid "Events created by me"
@@ -814,26 +926,42 @@ msgstr "Mijn activiteiten"
 msgid "Last updated"
 msgstr "Laatst bijgewerkt"
 
-#: views/handlers/views_handler_field_cdb_item_operations.inc:47
-msgid "No permission to edit event"
-msgstr "Geen toelating om event aan te passen"
+#: views/culturefeed_entry_ui.views_default.inc:342
+msgid "Binnenkort"
+msgstr ""
 
-#: culturefeed_elements/culturefeed_location_control/form/asset.inc:78
-msgid "Remove address"
-msgstr "Adres verwijderen"
+#: views/culturefeed_entry_ui.views_default.inc:343
+msgid "meer"
+msgstr ""
 
-#: culturefeed_elements/culturefeed_location_control/form/custom.inc:136
-msgid "Remove address"
-msgstr "Adres verwijderen"
+#: views/culturefeed_entry_ui.views_default.inc:344
+msgid "Pas toe"
+msgstr ""
 
-#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:85
-msgid "Hide tag"
-msgstr "Label verbergen"
+#: views/culturefeed_entry_ui.views_default.inc:345
+msgid "Opnieuw instellen"
+msgstr ""
 
-#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:96
-msgid "Remove tag"
-msgstr "Label verwijderen"
+#: views/culturefeed_entry_ui.views_default.inc:346
+msgid "Sorteer op"
+msgstr ""
 
-#: culturefeed_elements/culturefeed_tags_element/culturefeed_tags_element.module:113
-msgid "Add tag"
-msgstr "Label toevoegen"
\ No newline at end of file
+#: views/culturefeed_entry_ui.views_default.inc:347
+msgid "Stijgend"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:348
+msgid "Dalend"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:349
+msgid "Wanneer"
+msgstr ""
+
+#: views/culturefeed_entry_ui.views_default.inc:350
+msgid "Waar"
+msgstr ""
+
+#: views/handlers/views_handler_field_cdb_item_operations.inc:47
+msgid "No permission to edit event"
+msgstr "Geen toelating om event aan te passen"

From f77bb51f3af44a3ae00969c65c7341c859f3fe96 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 5 Jun 2015 11:49:28 +0200
Subject: [PATCH 247/275] UIV-1283 fix & translate delete activity modal

---
 culturefeed_social/includes/pages.inc         |   6 +-
 .../translations/culturefeed_social.nl.po     | 485 ++++++++----------
 2 files changed, 205 insertions(+), 286 deletions(-)

diff --git a/culturefeed_social/includes/pages.inc b/culturefeed_social/includes/pages.inc
index d81172ec..b4f85787 100644
--- a/culturefeed_social/includes/pages.inc
+++ b/culturefeed_social/includes/pages.inc
@@ -133,7 +133,7 @@ function culturefeed_social_page_activities($type = NULL) {
 
     $delete = array(
       '#type' => 'link',
-      '#title' => t('Remove'),
+      '#title' => t('Remove activity'),
       '#href' => $remove_path . '/nojs',
       '#attributes' => $attributes,
       '#options' => array('query' => drupal_get_destination()),
@@ -154,9 +154,7 @@ function culturefeed_social_page_activities($type = NULL) {
     $data = l($activity->nodeTitle, $url);
 
     $wrapper = '
-      <div id="delete-wrapper-' . $activity->id . '" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-        <div class="modal-body outer"></div>
-      </div>';
+      <div id="delete-wrapper-' . $activity->id . '" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"></div>';
     $rows[] = array(
       'id' => 'activity-' . $activity->id,
       'data' => array(
diff --git a/culturefeed_social/translations/culturefeed_social.nl.po b/culturefeed_social/translations/culturefeed_social.nl.po
index 1a71ee4d..d664bfa8 100644
--- a/culturefeed_social/translations/culturefeed_social.nl.po
+++ b/culturefeed_social/translations/culturefeed_social.nl.po
@@ -4,13 +4,13 @@
 # Copyright YEAR NAME <EMAIL@ADDRESS>
 # Generated from files:
 #  culturefeed_social.module: n/a
+#  includes/pages.inc: n/a
 #  culturefeed_social.info: n/a
 #  includes/blocks.inc: n/a
 #  includes/admin.inc: n/a
-#  includes/pages.inc: n/a
+#  lib/Drupal/CultureFeedActivityConfigBase.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigComment.php: n/a
 #  theme/culturefeed-social-comment-list.tpl.php: n/a
-#  theme/theme.inc: n/a
 #  lib/Drupal/CultureFeedActivityConfigDetail.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigView.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigFacebook.php: n/a
@@ -20,24 +20,28 @@
 #  lib/Drupal/CultureFeedActivityConfigRecommend.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigReview.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigTwitter.php: n/a
-#  theme/culturefeed-social-activity-summary.tpl.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigFollow.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigGo.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigLike.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigMediaPhoto.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigMediaVideo.php: n/a
+#  lib/Drupal/CultureFeedActivityConfigNews.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigPageAdmin.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigPageCreated.php: n/a
 #  lib/Drupal/CultureFeedActivityConfigPageMember.php: n/a
+#  theme/culturefeed-social-activity-summary.tpl.php: n/a
+#  theme/culturefeed-social-page-activity-summary.tpl.php: n/a
 #  theme/culturefeed-social-comment-list-item.tpl.php: n/a
+#  theme/culturefeed-social-news-detail.tpl.php: n/a
 #  theme/culturefeed-social-user-notifications-page.tpl.php: n/a
+#  theme/theme.inc: n/a
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-01-30 14:19+0100\n"
-"PO-Revision-Date: 2014-01-30 14:32+0100\n"
-"Last-Translator: NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-06-05 11:38+0200\n"
+"PO-Revision-Date: 2015-06-05 11:39+0100\n"
+"Last-Translator: Luk Dens <luk.dens@cultuurnet.be>\n"
 "Language-Team: Dutch <EMAIL@ADDRESS>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -45,63 +49,75 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: culturefeed_social.module:294
+#: culturefeed_social.module:408
 msgid "Culturefeed social: recent site activities"
 msgstr "Culturefeed social: recente gebeurtenissen"
 
-#: culturefeed_social.module:299
+#: culturefeed_social.module:413
 msgid "Culturefeed social: user activities"
 msgstr "Culturefeed social: gebruikersacties"
 
-#: culturefeed_social.module:304
-msgid "Culturefeed social: recommended by"
-msgstr "Culturefeed social: aangeraden door"
+#: culturefeed_social.module:418
+msgid "Culturefeed social: Users who recommended this"
+msgstr ""
+
+#: culturefeed_social.module:423
+msgid "Culturefeed social: Users who liked this"
+msgstr ""
+
+#: culturefeed_social.module:428
+msgid "Culturefeed social: Users who will attend this"
+msgstr ""
 
-#: culturefeed_social.module:309
+#: culturefeed_social.module:433
 msgid "Culturefeed social: comments"
 msgstr "Culturefeed social: reacties"
 
-#: culturefeed_social.module:315
+#: culturefeed_social.module:439
 msgid "Culturefeed social: my notifications (on user profile)"
 msgstr "Culturefeed social: mijn meldingen (gebruikersprofiel)"
 
-#: culturefeed_social.module:321
+#: culturefeed_social.module:445
 msgid "Culturefeed social: summary of my activities (on user profile)"
 msgstr "Culturefeed social: overzicht van mijn meldingen (gebruikersprofiel)"
 
-#: culturefeed_social.module:326
+#: culturefeed_social.module:450
 msgid "Culturefeed social: summary of loggedin users activities"
 msgstr "Culturefeed social: overzicht van gebruikersacties"
 
-#: culturefeed_social.module:381
+#: culturefeed_social.module:455
+msgid "Culturefeed social: summary of page activities"
+msgstr ""
+
+#: culturefeed_social.module:472
+msgid "Items to show"
+msgstr "Te tonen items"
+
+#: culturefeed_social.module:557
 msgid "Actions"
 msgstr "Acties"
 
-#: culturefeed_social.module:383
+#: culturefeed_social.module:559
 msgid "Set which user actions are visible to others on your profile page."
 msgstr "Bekijk je acties en bepaal wat zichtbaar is voor anderen"
 
-#: culturefeed_social.module:408
-msgid "new notifications"
-msgstr "nieuwe meldingen"
-
-#: culturefeed_social.module:459
+#: culturefeed_social.module:620
 msgid "Everything"
 msgstr "Alles"
 
-#: culturefeed_social.module:467
+#: culturefeed_social.module:628
 msgid "Filter events on"
 msgstr "Filter activiteiten op"
 
-#: culturefeed_social.module:485
+#: culturefeed_social.module:646
 msgid "Filter"
 msgstr "Filter"
 
-#: culturefeed_social.module:551
+#: culturefeed_social.module:712
 msgid "Remove from list"
 msgstr "Schrijf je uit"
 
-#: culturefeed_social.module:552
+#: culturefeed_social.module:713
 msgid ""
 "You're currently receiving updates of new comments. <br/>!link to get no "
 "more posts."
@@ -109,15 +125,15 @@ msgstr ""
 "Je ontvangt momenteel updates van nieuwe reacties.<br />!link om geen "
 "berichten meer te ontvangen."
 
-#: culturefeed_social.module:563
+#: culturefeed_social.module:724
 msgid "Receive email about new comments"
 msgstr "Blijf via e-mail op de hoogte van nieuwe reacties"
 
-#: culturefeed_social.module:580;739
+#: culturefeed_social.module:741;900
 msgid "Submit"
 msgstr "Voeg toe"
 
-#: culturefeed_social.module:623
+#: culturefeed_social.module:784
 msgid ""
 "Due to technical problems it is currently not possible to send your message. "
 "Do not hesitate to directly contact via @site"
@@ -126,31 +142,35 @@ msgstr ""
 "te versturen. Aarzel niet om rechtstreeks met ons contact op te nemen via "
 "@site"
 
-#: culturefeed_social.module:626
+#: culturefeed_social.module:787
 msgid "Your response should not exceed 1000 characters."
 msgstr "Jouw reactie mag maximaal 1000 karakters bevatten."
 
-#: culturefeed_social.module:652
+#: culturefeed_social.module:813
 msgid "Your !comment has been sent."
 msgstr "Jouw !comment is verzonden."
 
-#: culturefeed_social.module:707
+#: culturefeed_social.module:868
 msgid "Inappropriate response"
 msgstr "Ongepaste reactie"
 
-#: culturefeed_social.module:708
+#: culturefeed_social.module:869
 msgid "Please tell us why you think this is an inappropriate response"
 msgstr "Geef aan waarom dit volgens jou een ongepaste reactie is"
 
-#: culturefeed_social.module:724
+#: culturefeed_social.module:885
 msgid "Send message as"
 msgstr "Verzend bericht als"
 
-#: culturefeed_social.module:784
+#: culturefeed_social.module:908 includes/pages.inc:267
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: culturefeed_social.module:954
 msgid "Something went wrong while sending"
 msgstr "Er is een onverwachte fout opgetreden"
 
-#: culturefeed_social.module:798
+#: culturefeed_social.module:968
 msgid "Message sent"
 msgstr "Het bericht werd verstuurd"
 
@@ -162,39 +182,43 @@ msgstr "CultureFeed Social"
 msgid "Change CultureFeed Social settings"
 msgstr "Wijzig instellingen CulturFeed Social"
 
-#: culturefeed_social.module:43
+#: culturefeed_social.module:42
 msgid "Administer actions"
 msgstr "Acties beheren"
 
-#: culturefeed_social.module:52
+#: culturefeed_social.module:50;123;132;141
 msgid "Undo action"
 msgstr "Ongedaan maken"
 
-#: culturefeed_social.module:62
+#: culturefeed_social.module:59
 msgid "Leave your comment"
 msgstr "Plaats jouw reactie"
 
-#: culturefeed_social.module:72
+#: culturefeed_social.module:68
 msgid "Abuse form"
 msgstr "Meldformulier voor ongepaste reacties"
 
-#: culturefeed_social.module:82
+#: culturefeed_social.module:77
 msgid "Edit privacy settings"
 msgstr "Wijzig privacy"
 
-#: culturefeed_social.module:92
+#: culturefeed_social.module:86
 msgid "Unfollow node"
 msgstr "Niet meer volgen"
 
-#: culturefeed_social.module:103
+#: culturefeed_social.module:96
 msgid "Perform action"
 msgstr "Voer actie uit"
 
-#: culturefeed_social.module:173 includes/blocks.inc:271
+#: culturefeed_social.module:105;114
+msgid "Do action"
+msgstr ""
+
+#: culturefeed_social.module:171 includes/blocks.inc:186
 msgid "My notifications"
 msgstr "Mijn meldingen"
 
-#: culturefeed_social.module:183
+#: culturefeed_social.module:180
 msgid "Notifications"
 msgstr "Meldingen"
 
@@ -239,7 +263,7 @@ msgstr ""
 msgid "All actions"
 msgstr "Alle acties"
 
-#: includes/blocks.inc:38;120
+#: includes/blocks.inc:38;123
 msgid "Recent actions"
 msgstr "Recente gebeurtenissen"
 
@@ -251,19 +275,19 @@ msgstr "Deze gebruiker heeft nog geen acties uitgevoerd"
 msgid "Manage your actions"
 msgstr "Beheer jouw acties"
 
-#: includes/blocks.inc:115
+#: includes/blocks.inc:118
 msgid "Read previous messages"
 msgstr "Lees eerdere berichten"
 
-#: includes/blocks.inc:254
+#: includes/blocks.inc:169
 msgid "Comments"
 msgstr "Reacties"
 
-#: includes/blocks.inc:272
+#: includes/blocks.inc:187
 msgid "You have no notifications"
 msgstr "Je hebt geen nieuwe meldingen"
 
-#: includes/blocks.inc:288
+#: includes/blocks.inc:203
 msgid "View all notifications"
 msgstr "Bekijk alle meldingen"
 
@@ -275,85 +299,89 @@ msgstr "Geen activiteiten gevonden"
 msgid "View profile"
 msgstr "Bekijk profiel"
 
-#: includes/pages.inc:136;247;250;275
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: includes/pages.inc:250
-msgid "Remove action"
-msgstr "Actie verwijderen"
+#: includes/pages.inc:136
+msgid "Remove activity"
+msgstr "Verwijder actie"
 
-#: includes/pages.inc:144;441
+#: includes/pages.inc:144;423
 msgid "Private"
 msgstr "Privé"
 
-#: includes/pages.inc:144;441
+#: includes/pages.inc:144;423
 msgid "Public"
 msgstr "Publiek"
 
-#: includes/pages.inc:146;443
+#: includes/pages.inc:146;425
 msgid "Make public"
 msgstr "Maak publiek"
 
-#: includes/pages.inc:146;443
+#: includes/pages.inc:146;425
 msgid "Make private"
 msgstr "Maak onzichtbaar"
 
-#: includes/pages.inc:165
+#: includes/pages.inc:163
 msgid "ago <br />on"
 msgstr "geleden <br />op"
 
-#: includes/pages.inc:174
+#: includes/pages.inc:172
 msgid "Page"
 msgstr "Pagina"
 
-#: includes/pages.inc:174
+#: includes/pages.inc:172
 msgid "Action"
 msgstr "Actie"
 
-#: includes/pages.inc:174
+#: includes/pages.inc:172
 msgid "Time and publication channel"
 msgstr "Tijdstip en publicatiekanaal"
 
-#: includes/pages.inc:174
+#: includes/pages.inc:172
 msgid "Status"
 msgstr "Status"
 
-#: includes/pages.inc:176
+#: includes/pages.inc:174
 msgid "You didn't perform any actions yet."
 msgstr "Je hebt nog geen acties uitgevoerd"
 
-#: includes/pages.inc:264
+#: includes/pages.inc:244;247;261
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: includes/pages.inc:247
+msgid "Remove action"
+msgstr "Actie verwijderen"
+
+#: includes/pages.inc:256
 msgid "Are you sure you want to delete your @action permanently"
 msgstr "Ben je zeker dat je jouw @action definitief wil verwijderen"
 
-#: includes/pages.inc:264
+#: includes/pages.inc:256
 msgid "Are you sure you want to delete this action permanently"
 msgstr "Ben je zeker dat je deze actie definitief wil verwijderen"
 
-#: includes/pages.inc:281
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: includes/pages.inc:338;377;479
+#: includes/pages.inc:320;359;461
 msgid "An unexpected error has occurred."
 msgstr "Er is iets foutgelopen."
 
-#: includes/pages.inc:409;415
+#: includes/pages.inc:391;397
 msgid "You will no longer receive updates of new comments"
 msgstr "Je ontvangt geen updates meer van nieuwe reacties"
 
-#: includes/pages.inc:577
+#: includes/pages.inc:559
 msgid "Action could not be undone."
 msgstr "Actie kon niet ongedaan gemaakt worden."
 
-#: includes/pages.inc:708
+#: includes/pages.inc:690
 msgid "No activities found."
 msgstr "Geen activiteiten gevonden."
 
+#: lib/Drupal/CultureFeedActivityConfigBase.php:43
+msgid "logged in"
+msgstr ""
+
 #: lib/Drupal/CultureFeedActivityConfigComment.php:22
 msgid "Reply by"
-msgstr "Geplaatst door"
+msgstr "Beantwoorden door"
 
 #: lib/Drupal/CultureFeedActivityConfigComment.php:23
 msgid "Undo"
@@ -362,44 +390,44 @@ msgstr "Ongedaan maken"
 #: lib/Drupal/CultureFeedActivityConfigComment.php:24
 #: theme/culturefeed-social-comment-list.tpl.php:11
 msgid "Post a comment"
-msgstr "Reageer"
+msgstr "Post een reactie"
 
 #: lib/Drupal/CultureFeedActivityConfigComment.php:25
 msgid "Be the first to post a comment"
-msgstr "Reageer als eerste"
+msgstr "Post als eerste een reactie"
 
 #: lib/Drupal/CultureFeedActivityConfigComment.php:26
 msgid "Show all users who posted a comment"
-msgstr "Toon iedereen die reageerde"
+msgstr "Laat all gebruikers zien die een reactie geplaatst hebben"
 
 #: lib/Drupal/CultureFeedActivityConfigComment.php:29
 msgid "has replied to"
-msgstr "heeft gereageerd op"
+msgstr "heeft geantwoord op"
 
 #: lib/Drupal/CultureFeedActivityConfigComment.php:31
 msgid "Comment"
 msgstr "Reactie"
 
-#: lib/Drupal/CultureFeedActivityConfigComment.php:32 theme/theme.inc:217
-msgid "Reply"
-msgstr "Reageer"
+#: lib/Drupal/CultureFeedActivityConfigComment.php:32
+msgid "comment"
+msgstr "reactie"
 
 #: lib/Drupal/CultureFeedActivityConfigComment.php:33
-msgid "You must be logged in to post a comment"
-msgstr "Je moet aangemeld zijn om te reageren"
+msgid "You must be !sign_in_link to post a comment"
+msgstr ""
 
-#: lib/Drupal/CultureFeedActivityConfigComment.php:34
+#: lib/Drupal/CultureFeedActivityConfigComment.php:36
 msgid "Reply as"
-msgstr "Reageer als"
+msgstr "Antwoord als"
 
-#: lib/Drupal/CultureFeedActivityConfigComment.php:35
+#: lib/Drupal/CultureFeedActivityConfigComment.php:37
 msgid "Posted a comment on"
-msgstr "Heeft een reactie gepost op"
+msgstr "Heeft een reactie geplaatst op"
 
 #: lib/Drupal/CultureFeedActivityConfigDetail.php:21
 #: lib/Drupal/CultureFeedActivityConfigView.php:22
 msgid "Viewed by"
-msgstr "Bekeken door"
+msgstr "Gezien door"
 
 #: lib/Drupal/CultureFeedActivityConfigDetail.php:22
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:26
@@ -425,7 +453,7 @@ msgstr "Bekeken"
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:23;24
 #: lib/Drupal/CultureFeedActivityConfigTwitter.php:23;24
 msgid "Share"
-msgstr "Deel"
+msgstr "Delen"
 
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:25
 #: lib/Drupal/CultureFeedActivityConfigTwitter.php:25
@@ -434,21 +462,20 @@ msgstr "Gedeeld door"
 
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:27;31
 msgid "shared on Facebook"
-msgstr "via Facebook gedeeld"
+msgstr "gedeeld op Facebook"
 
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:28
 msgid "Share on Facebook"
-msgstr "Delen via Facebook"
+msgstr "Delen op Facebook"
 
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:29
 #: lib/Drupal/CultureFeedActivityConfigTwitter.php:29
 msgid "Successfully shared"
-msgstr "Succesvol gedeeld"
+msgstr "Met succes gedeeld"
 
 #: lib/Drupal/CultureFeedActivityConfigFacebook.php:30
-#: theme/culturefeed-social-activity-summary.tpl.php:37
-msgid "comments"
-msgstr "Reacties"
+msgid "share"
+msgstr "delen"
 
 #: lib/Drupal/CultureFeedActivityConfigFollow.php:17
 msgid "Follow this page"
@@ -464,11 +491,11 @@ msgstr "Ik volg deze pagina"
 
 #: lib/Drupal/CultureFeedActivityConfigFollow.php:20
 msgid "Be the first to follow this page"
-msgstr "Volg deze pagina als eerste"
+msgstr "Word de eerste die deze pagina volgt"
 
 #: lib/Drupal/CultureFeedActivityConfigFollow.php:21
 msgid "Show all users who follow this page"
-msgstr "Toon alle volgers"
+msgstr "Laat alle gebruikers zien die deze pagina volgen"
 
 #: lib/Drupal/CultureFeedActivityConfigFollow.php:24
 msgid "follows"
@@ -479,28 +506,32 @@ msgid "Follow"
 msgstr "Volg"
 
 #: lib/Drupal/CultureFeedActivityConfigFollow.php:26
-msgid "You must be logged in to follow a page"
-msgstr "U moet ingelogd zijn om een pagina te volgen"
+msgid "You must be !sign_in_link to follow a page"
+msgstr ""
+
+#: lib/Drupal/CultureFeedActivityConfigGo.php:18
+msgid "Attend this"
+msgstr ""
 
-#: lib/Drupal/CultureFeedActivityConfigGo.php:18;19
+#: lib/Drupal/CultureFeedActivityConfigGo.php:19;20
 msgid "Attend"
 msgstr "Ik ga hier naartoe"
 
-#: lib/Drupal/CultureFeedActivityConfigGo.php:20
+#: lib/Drupal/CultureFeedActivityConfigGo.php:21
 msgid "Not attending"
-msgstr "Ik ga niet"
+msgstr "Ik ga hier niet naartoe"
 
-#: lib/Drupal/CultureFeedActivityConfigGo.php:21
+#: lib/Drupal/CultureFeedActivityConfigGo.php:22
 msgid "will be attending"
 msgstr "gaat naar"
 
-#: lib/Drupal/CultureFeedActivityConfigGo.php:22;24
+#: lib/Drupal/CultureFeedActivityConfigGo.php:23;27
 msgid "Will be attending"
-msgstr "Ik ga naar"
+msgstr "Gaat naar"
 
-#: lib/Drupal/CultureFeedActivityConfigGo.php:23
-msgid "You must be logged in to indicate that you will be  attending"
-msgstr "Je moet aangemeld zijn om aan te duiden dat je gaat"
+#: lib/Drupal/CultureFeedActivityConfigGo.php:24
+msgid "You must be !sign_in_link to indicate that you will be attending"
+msgstr ""
 
 #: lib/Drupal/CultureFeedActivityConfigLike.php:23
 msgid "Like this"
@@ -535,10 +566,10 @@ msgid "this"
 msgstr "leuk"
 
 #: lib/Drupal/CultureFeedActivityConfigLike.php:34
-msgid "You must be logged in to like this item"
-msgstr "Je moet aangemeld zijn om dit leuk te vinden"
+msgid "You must be !sign_in_link to like this item"
+msgstr ""
 
-#: lib/Drupal/CultureFeedActivityConfigLike.php:35
+#: lib/Drupal/CultureFeedActivityConfigLike.php:37
 msgid "liked"
 msgstr "vind leuk"
 
@@ -594,6 +625,18 @@ msgstr "Video toegevoegd"
 msgid "added"
 msgstr "toegevoegd"
 
+#: lib/Drupal/CultureFeedActivityConfigNews.php:17
+msgid "news"
+msgstr ""
+
+#: lib/Drupal/CultureFeedActivityConfigNews.php:18
+msgid "has created a news message"
+msgstr ""
+
+#: lib/Drupal/CultureFeedActivityConfigNews.php:19
+msgid "News created"
+msgstr ""
+
 #: lib/Drupal/CultureFeedActivityConfigPageAdmin.php:17
 msgid "became administrator of"
 msgstr "is beheerder geworden van "
@@ -658,7 +701,7 @@ msgstr "Raad als eerste aan"
 msgid "View all users who recommend this"
 msgstr "Toon iedereen die dit aanraadt"
 
-#: lib/Drupal/CultureFeedActivityConfigRecommend.php:32;35
+#: lib/Drupal/CultureFeedActivityConfigRecommend.php:32;37
 msgid "recommended"
 msgstr "aangeraden"
 
@@ -667,8 +710,8 @@ msgid "Recommend"
 msgstr "Aanraden"
 
 #: lib/Drupal/CultureFeedActivityConfigRecommend.php:34
-msgid "You must be logged in to recommend this item"
-msgstr "Je moet aangemeld zijn om dit aan te raden"
+msgid "You must be !sign_in_link to recommend this item"
+msgstr ""
 
 #: lib/Drupal/CultureFeedActivityConfigReview.php:19
 msgid "wrote a review"
@@ -718,6 +761,11 @@ msgstr "aangeraden boeken"
 msgid "pages I follow"
 msgstr "pagina's die ik volg"
 
+#: theme/culturefeed-social-activity-summary.tpl.php:37
+#: theme/culturefeed-social-page-activity-summary.tpl.php:38
+msgid "comments"
+msgstr "Reacties"
+
 #: theme/culturefeed-social-comment-list-item.tpl.php:17
 msgid "Posted by"
 msgstr "Geplaatst door"
@@ -726,6 +774,26 @@ msgstr "Geplaatst door"
 msgid "on"
 msgstr "op"
 
+#: theme/culturefeed-social-news-detail.tpl.php:10
+msgid "Delete news item"
+msgstr "Verwijder nieuwsbericht"
+
+#: theme/culturefeed-social-page-activity-summary.tpl.php:34
+msgid "followers"
+msgstr ""
+
+#: theme/culturefeed-social-page-activity-summary.tpl.php:35
+msgid "members"
+msgstr "leden"
+
+#: theme/culturefeed-social-page-activity-summary.tpl.php:36
+msgid "admins"
+msgstr "beheerders"
+
+#: theme/culturefeed-social-page-activity-summary.tpl.php:37
+msgid "recommends"
+msgstr "aanbevelingen"
+
 #: theme/culturefeed-social-user-notifications-page.tpl.php:7
 msgid "You have no new notifications"
 msgstr "Je hebt geen nieuwe meldingen"
@@ -735,199 +803,52 @@ msgid "Previously read messages"
 msgstr "Eerder gelezen meldingen"
 
 #: theme/culturefeed-social-user-notifications-page.tpl.php:4
+#: theme/theme.inc:713
 msgid "@count new notification"
 msgid_plural "@count new notifications"
 msgstr[0] "@count nieuwe melding"
 msgstr[1] "@count nieuwe meldingen"
 
-#: theme/theme.inc:52
+#: theme/theme.inc:52;640
 msgid "ago"
 msgstr "geleden"
 
-#: theme/theme.inc:57
+#: theme/theme.inc:57;645
 msgid "Today at"
 msgstr "Vandaag om"
 
-#: theme/theme.inc:57;60;63
+#: theme/theme.inc:57;60;63;645;648;651
 msgid "hour"
 msgstr "uur"
 
-#: theme/theme.inc:60
+#: theme/theme.inc:60;648
 msgid "Yesterday at"
 msgstr "Gisteren om"
 
-#: theme/theme.inc:95;159
+#: theme/theme.inc:108;376;626
 msgid "from"
 msgstr "van"
 
-#: theme/theme.inc:202
+#: theme/theme.inc:271;420;446
 msgid "Delete"
 msgstr "Verwijder"
 
-#: theme/theme.inc:246
+#: theme/theme.inc:286;435
+msgid "Reply"
+msgstr "Reageer"
+
+#: theme/theme.inc:308;467
 msgid "Report as inappropriate"
 msgstr "Meld als ongepast"
 
-#: theme/theme.inc:331
+#: theme/theme.inc:552
 msgid "My activities"
 msgstr "Mijn activiteiten"
 
-#: theme/theme.inc:334
+#: theme/theme.inc:555
 msgid "Activities of @username"
 msgstr "Activiteiten van @username"
 
-#: lib/Drupal/CultureFeedActivityConfigComment.php:22
-msgid "Reply by"
-msgstr "Beantwoorden door"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:23
-msgid "Undo"
-msgstr "Ongedaan maken"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:24
-msgid "Post a comment"
-msgstr "Post een reactie"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:25
-msgid "Be the first to post a comment"
-msgstr "Post als eerste een reactie"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:26
-msgid "Show all users who posted a comment"
-msgstr "Laat all gebruikers zien die een reactie geplaatst hebben"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:29
-msgid "has replied to"
-msgstr "heeft geantwoord op"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:31
-msgid "Comment"
-msgstr "Reactie"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:32
-msgid "comment"
-msgstr "reactie"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:33
-msgid "You must be logged in to post a comment"
-msgstr "Je moet ingelogd zijn om een reactie te plaatsen"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:34
-msgid "Reply as"
-msgstr "Antwoord als"
-
-#: lib/Drupal/CultureFeedActivityConfigComment.php:35
-msgid "Posted a comment on"
-msgstr "Heeft een reactie geplaatst op"
-
-#: lib/Drupal/CultureFeedActivityConfigDetail.php:21
-msgid "Viewed by"
-msgstr "Gezien door"
-
-#: lib/Drupal/CultureFeedActivityConfigDetail.php:22
-msgid "has"
-msgstr "heeft"
-
-#: lib/Drupal/CultureFeedActivityConfigDetail.php:23
-msgid "seen"
-msgstr "gezien"
-
-#: lib/Drupal/CultureFeedActivityConfigDetail.php:24
-msgid "Viewed"
-msgstr "Bekeken"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:23
-msgid "Share"
-msgstr "Delen"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:24
-msgid "Share"
-msgstr "Delen"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:25
-msgid "Shared by"
-msgstr "Gedeeld door"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:26
-msgid "has"
-msgstr "heeft"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:27
-msgid "shared on Facebook"
-msgstr "gedeeld op Facebook"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:28
-msgid "Share on Facebook"
-msgstr "Delen op Facebook"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:29
-msgid "Successfully shared"
-msgstr "Met succes gedeeld"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:30
-msgid "share"
-msgstr "delen"
-
-#: lib/Drupal/CultureFeedActivityConfigFacebook.php:31
-msgid "shared on Facebook"
-msgstr "gedeeld op Facebook"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:17
-msgid "Follow this page"
-msgstr "Volg deze pagina"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:18
-msgid "Unfollow"
-msgstr "Niet meer volgen"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:19
-msgid "I follow this page"
-msgstr "Ik volg deze pagina"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:20
-msgid "Be the first to follow this page"
-msgstr "Word de eerste die deze pagina volgt"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:21
-msgid "Show all users who follow this page"
-msgstr "Laat alle gebruikers zien die deze pagina volgen"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:24
-msgid "follows"
-msgstr "volgt"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:25
-msgid "Follow"
-msgstr "Volg"
-
-#: lib/Drupal/CultureFeedActivityConfigFollow.php:26
-msgid "You must be logged in to follow a page"
-msgstr "Je moet ingelogd zijn om een pagina te kunnen volgen"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:18
-msgid "Attend"
-msgstr "Ik ga hier naartoe"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:19
-msgid "Attend"
-msgstr "Ik ga hier naartoe"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:20
-msgid "Not attending"
-msgstr "Ik ga hier niet naartoe"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:21
-msgid "will be attending"
-msgstr "gaat naar"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:22
-msgid "Will be attending"
-msgstr "Gaat naar"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:23
-msgid "You must be logged in to indicate that you will be  attending"
-msgstr "Je moet ingelogd zijn om aan te geven of je gaat"
-
-#: lib/Drupal/CultureFeedActivityConfigGo.php:24
-msgid "Will be attending"
-msgstr "Gaat naar"
\ No newline at end of file
+#: theme/theme.inc:606
+msgid "Activities"
+msgstr "Activiteiten"

From 02a72ab28d4a97d1895d28f54018adc860dfd4d0 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 5 Jun 2015 14:20:18 +0200
Subject: [PATCH 248/275] UIV-141 add variable to theme if event is finished

---
 culturefeed_agenda/theme/theme.inc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 4f97d4ba..e84081d8 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -735,6 +735,29 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
+    
+    $event_is_passed = FALSE;
+    if ($event instanceof CultureFeed_Cdb_Item_Event) {
+      $objDateTime = new DateTime('NOW');
+      $calendar = $event->getCalendar();
+      if ($calendar instanceof CultureFeed_Cdb_Data_Calendar_TimestampList || $calendar instanceof CultureFeed_Cdb_Data_Calendar_PeriodList) {
+
+        // Check if 1 of the items is still in the future.
+        $event_is_passed = TRUE;
+        foreach ($calendar as $calendar_item) {
+          if ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Period && DateTime::createFromFormat('Y-m-d', $calendar_item->getDateTo())->getTimestamp() > $objDateTime->getTimestamp()) {
+            $event_is_passed = FALSE;
+            break;
+          }
+          elseif ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Timestamp && DateTime::createFromFormat('Y-m-d', $calendar_item->getDate())->getTimestamp() > $objDateTime->getTimestamp()) {
+            $event_is_passed = FALSE;
+            break;
+          }
+        }
+
+      }
+    }
+    $variables['event_is_passed'] = $event_is_passed;
 
   }
 

From bad66718139c1afe223c70f6ce95944c7ca1f92e Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 5 Jun 2015 14:31:12 +0200
Subject: [PATCH 249/275] UIV-141 add comment

---
 culturefeed_agenda/theme/theme.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index e84081d8..4a70cbb6 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -736,6 +736,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     catch (Exception $e) {
     }
     
+    // Check if event has finished or not.
     $event_is_passed = FALSE;
     if ($event instanceof CultureFeed_Cdb_Item_Event) {
       $objDateTime = new DateTime('NOW');

From 521ec82b99bb33af2f5abad49a59cb3b1f198134 Mon Sep 17 00:00:00 2001
From: Nicolas Leroy <nicolas.leroy@gmail.com>
Date: Fri, 5 Jun 2015 15:32:47 +0200
Subject: [PATCH 250/275] CEP-702: Fix title on recent activities page

---
 culturefeed_social/culturefeed_social.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_social/culturefeed_social.module b/culturefeed_social/culturefeed_social.module
index ba499016..3e29e397 100644
--- a/culturefeed_social/culturefeed_social.module
+++ b/culturefeed_social/culturefeed_social.module
@@ -147,7 +147,7 @@ function culturefeed_social_menu() {
   );
 
   $items['culturefeed/activities/recent'] = array(
-    'title arguments' => array('Most recent actions'),
+    'title' => 'Most recent actions',
     'page callback' => 'culturefeed_social_page_recent_activities',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,

From 0b56867467537dbc94728aa4d0ef11c4f4f1f66e Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 5 Jun 2015 15:33:31 +0200
Subject: [PATCH 251/275] UIV-141 don't show today events as finished

---
 culturefeed_agenda/theme/theme.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 4a70cbb6..9d4ca143 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -746,11 +746,11 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
         // Check if 1 of the items is still in the future.
         $event_is_passed = TRUE;
         foreach ($calendar as $calendar_item) {
-          if ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Period && DateTime::createFromFormat('Y-m-d', $calendar_item->getDateTo())->getTimestamp() > $objDateTime->getTimestamp()) {
+          if ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Period && DateTime::createFromFormat('Y-m-d', $calendar_item->getDateTo())->getTimestamp() >= $objDateTime->getTimestamp()) {
             $event_is_passed = FALSE;
             break;
           }
-          elseif ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Timestamp && DateTime::createFromFormat('Y-m-d', $calendar_item->getDate())->getTimestamp() > $objDateTime->getTimestamp()) {
+          elseif ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Timestamp && DateTime::createFromFormat('Y-m-d', $calendar_item->getDate())->getTimestamp() >= $objDateTime->getTimestamp()) {
             $event_is_passed = FALSE;
             break;
           }

From 2482e72868a18bc3e14acc8b938ec941011f83de Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 5 Jun 2015 15:43:03 +0200
Subject: [PATCH 252/275] UIV-1204 events today are not finished yet

---
 culturefeed_calendar/includes/helpers.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_calendar/includes/helpers.inc b/culturefeed_calendar/includes/helpers.inc
index 1823a71b..dd4a5d52 100644
--- a/culturefeed_calendar/includes/helpers.inc
+++ b/culturefeed_calendar/includes/helpers.inc
@@ -201,11 +201,11 @@ function culturefeed_calendar_render_calendar_buttons($item) {
         // Check if 1 of the items is still in the future.
         $event_is_passed = TRUE;
         foreach ($calendar as $calendar_item) {
-          if ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Period && DateTime::createFromFormat('Y-m-d', $calendar_item->getDateTo())->getTimestamp() > $objDateTime->getTimestamp()) {
+          if ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Period && DateTime::createFromFormat('Y-m-d', $calendar_item->getDateTo())->getTimestamp() >= $objDateTime->getTimestamp()) {
             $event_is_passed = FALSE;
             break;
           }
-          elseif ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Timestamp && DateTime::createFromFormat('Y-m-d', $calendar_item->getDate())->getTimestamp() > $objDateTime->getTimestamp()) {
+          elseif ($calendar_item instanceof CultureFeed_Cdb_Data_Calendar_Timestamp && DateTime::createFromFormat('Y-m-d', $calendar_item->getDate())->getTimestamp() >= $objDateTime->getTimestamp()) {
             $event_is_passed = FALSE;
             break;
           }

From 762eec23d152f3516cb4eb4bcfb65ecbed1112ff Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Sat, 6 Jun 2015 14:59:25 +0200
Subject: [PATCH 253/275] revert merge of feature/UIT

---
 culturefeed_agenda/culturefeed_agenda.module  | 18 +++++--
 .../culturefeed-agenda-event-types.tpl.php    | 16 ------
 .../includes/blocks.inc                       | 27 ++++------
 culturefeed_search_ui/includes/blocks.inc     | 52 +++++--------------
 culturefeed_search_ui/theme/theme.inc         |  2 +-
 5 files changed, 37 insertions(+), 78 deletions(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index abbf1aa0..8700858b 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -432,7 +432,7 @@ function culturefeed_agenda_block_configure($delta) {
       '#default_value' => variable_get('agenda_related_activities_extra_query'),
       '#description' => t('Make sure this is a correct solr query. Example title:mytitle'),
     );
-
+    
     // sort_direction is no longer a seperate field. Add it to the sort field if variable exists.
     $sort_direction = variable_get('agenda_related_activities_sort_direction', '');
     $default_sort = variable_get('agenda_related_activities_sort') . ' ' . $sort_direction;
@@ -970,12 +970,22 @@ function culturefeed_agenda_url_inbound_alter(&$path, $original_path, $path_lang
       else {
         $flanders_region = culturefeed_search_get_category_by_slug($city_slug, 'flandersregion');
         if ($flanders_region) {
-          $_GET['facet']['category_flandersregion_id'][] = $flanders_region->tid;
-          $_REQUEST['facet']['category_flandersregion_id'][] = $flanders_region->tid;
-          $rewrite = TRUE;
+          $location = $flanders_region->name;
         }
       }
 
+      if (!empty($location)) {
+        $_GET['location'] = $location;
+        $_REQUEST['location'] = $location;
+        $rewrite = TRUE;
+      }
+
+      if (!empty($regId)) {
+        $_GET['regId'] = $regId;
+        $_REQUEST['regId'] = $regId;
+        $rewrite = TRUE;
+      }
+
     }
 
     // When rewrite flag is set, change the path.
diff --git a/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php b/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php
index 837c637a..e9414c3d 100644
--- a/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php
+++ b/culturefeed_agenda/theme/culturefeed-agenda-event-types.tpl.php
@@ -6,21 +6,6 @@
  */
 
 ?>
-<<<<<<< HEAD
-
-<?php foreach ($items as $tid => $item) : ?>
-
-  <h2><?php print $item['item']->name; ?></h2>
-  <?php if (!empty($item['children'])): ?>
-  <ul>
-  <?php foreach ($item['children'] as $child_tid => $child_item) : ?>
-  <li><?php print l($child_item['item']->name, 'agenda/search', array('query' => array('facet' => array('category_eventtype_id' => array($child_item['item']->tid))))); ?></li>
-  <?php endforeach; ?>
-  </ul>
-  <?php endif; ?>
-
-<?php endforeach; ?>
-=======
 <div>
 <?php foreach ($items as $tid => $item) : ?>
 
@@ -37,4 +22,3 @@
 
 <?php endforeach; ?>
 </div>
->>>>>>> feature/UIT-42
diff --git a/culturefeed_saved_searches/includes/blocks.inc b/culturefeed_saved_searches/includes/blocks.inc
index a2251b4f..3ad6eb9a 100644
--- a/culturefeed_saved_searches/includes/blocks.inc
+++ b/culturefeed_saved_searches/includes/blocks.inc
@@ -89,27 +89,20 @@ function culturefeed_saved_searches_get_cta_query() {
     }
 
     // We need to fetch the whole list of saved searches since we don't have ID.
+    $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
     $exists = FALSE;
-    try {
-
-      $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
-      foreach ($savedSearchList as $savedSearch) {
-        $saved_query = explode('&', $savedSearch->query);
-        foreach ($saved_query as $key => $val) {
-          if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
-            unset($saved_query[$key]);
-          }
-        }
-        $saved_query = implode('&', $saved_query);
-
-        if ($saved_query == $query['query']) {
-          $exists = TRUE;
+    foreach ($savedSearchList as $savedSearch) {
+      $saved_query = explode('&', $savedSearch->query);
+      foreach ($saved_query as $key => $val) {
+        if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
+          unset($saved_query[$key]);
         }
       }
+      $saved_query = implode('&', $saved_query);
 
-    }
-    catch (Exception $e) {
-      watchdog_exception('culturefeed_saved_searches', $e);
+      if ($saved_query == $query['query']) {
+        $exists = TRUE;
+      }
     }
 
     if (!$exists) {
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index be8b8378..a4a75c98 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -292,22 +292,11 @@ function culturefeed_search_ui_block_city_facet() {
     return;
   }
 
-  $location = '';
-  if (!empty($_GET['facet']['category_flandersregion_id'])) {
-    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
-    $location = $flanders_region->name;
-  }
-
-  // Show facet layout for location.
-  elseif (!empty($_GET['location'])) {
-    $location = $_GET['location'];
-  }
-
   $noresults = FALSE;
   if ($culturefeedSearchResult->getTotalCount() == 0) {
     $noresults = TRUE;
     // Hide location selector for empty results only when no location was set.
-    if (empty($location)) {
+    if (empty($_GET['location'])) {
       return;
     }
   }
@@ -315,18 +304,19 @@ function culturefeed_search_ui_block_city_facet() {
   $build = array();
 
   // Show facet layout for location.
-  if (!empty($location)) {
+  if (!empty($_GET['location'])) {
 
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
+    $label = $_GET['location'];
     if (isset($_GET['distance'])) {
-      $location .= ' + ' . $_GET['distance'] . ' km';
+      $label .= ' + ' . $_GET['distance'] . ' km';
     }
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
     );
 
     $build = array();
@@ -404,7 +394,7 @@ function culturefeed_search_ui_city_facet_form() {
 function culturefeed_search_ui_city_facet_form_submit($form, &$form_state) {
 
   $query = drupal_get_query_parameters(NULL, array('q', 'page', 'location', 'nearby', 'coordinates'));
-
+  
   // Remove the region filter so choosing a city has results.
   if (isset($query['facet']['category_flandersregion_id'])) {
     unset($query['facet']['category_flandersregion_id']);
@@ -556,26 +546,16 @@ function culturefeed_search_ui_block_city_only_facet() {
   $build = array();
 
   // Show facet layout for location.
-  $location = '';
-  if (!empty($_GET['facet']['category_flandersregion_id'])) {
-    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
-    $location = $flanders_region->name;
-  }
-
-  // Show facet layout for location.
-  elseif (!empty($_GET['location'])) {
-    $location = $_GET['location'];
-  }
-
-  if (!empty($location)) {
+  if (!empty($_GET['location'])) {
 
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
+    $label = $_GET['location'];
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
     );
 
     $build = array();
@@ -810,25 +790,17 @@ function culturefeed_search_ui_block_location_search() {
 
   $build = array();
 
-  $location = '';
-  if (!empty($_GET['facet']['category_flandersregion_id'])) {
-    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
-    $location = $flanders_region->name;
-  }
-
   // Show facet layout for location.
-  elseif (!empty($_GET['location'])) {
-    $location = $_GET['location'];
-  }
+  if (!empty($_GET['location'])) {
 
-  if (!empty($location)) {
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
+    $label = $_GET['location'];
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
     );
 
     $build = array();
diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index a55e7372..30f13a43 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -419,7 +419,7 @@ function culturefeed_search_ui_preprocess_culturefeed_search_facet_item(&$variab
     $variables['active'] = TRUE;
   }
 
-  if ($facet_key == 'location' && (isset($_GET['location']) || isset($_GET['facet']['category_flandersregion_id']))) {
+  if ($facet_key == 'location' && isset($_GET['location'])) {
     // Location facet items are always active when location is in query string.
     $variables['active'] = TRUE;
     // When the facet is location, we don't need location/distance in the query.

From be0c0bca1bdcb0fd1620b69c00981d9e0749fc59 Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Mon, 8 Jun 2015 09:10:35 +0200
Subject: [PATCH 254/275] UIV-921 Make Id of the youtube-video available as
 variable

---
 culturefeed_agenda/theme/theme.inc         |  5 ++++-
 culturefeed_search_ui/includes/helpers.inc | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index 2199ccfa..92c9614a 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -414,17 +414,20 @@ function _culturefeed_agenda_preprocess_agenda_detail(&$variables) {
 
   $item = $variables['item'];
   $cdb_item = $item->getEntity();
-  $detail = $cdb_item->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
+  $detail= $cdb_item->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
 
   if ($detail) {
 
     // Add videos.
     $variables['videos'] = array();
+    $variables['videos_id'] = array();
+
     $videos = $detail->getMedia()->byMediaType(CultureFeed_Cdb_Data_File::MEDIA_TYPE_VIDEO);
     foreach ($videos as $video) {
       if ($video_embed = _culturefeed_search_ui_video_url_to_embed($video->getHLink())) {
         $variables['videos'][] = $video_embed;
       }
+      $variables['videos_id'][] = _culturefeed_search_ui_video_url_to_id($video->getHLink());
     }
 
     // Absolute link to detail.
diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 1c507f9b..617432e0 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -29,6 +29,25 @@ function _culturefeed_search_ui_video_url_to_embed($url) {
 
 }
 
+/**
+ * Strips a given url to a youtube id.
+ */
+
+function _culturefeed_search_ui_video_url_to_id($url) {
+
+  // Construct embed url.
+  $embed_url = str_replace('watch', 'embed', $url);
+
+  $video_parts = explode('?v=', $embed_url);
+
+  if (count($video_parts) < 2) {
+    return FALSE;
+  }
+
+  return  $video_parts[1];
+
+}
+
 /**
  * Get the key value from the currently active search page.
  */

From b6752f6aa9d56cb9eb03df734e1d10e1b066457e Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Mon, 8 Jun 2015 09:26:12 +0200
Subject: [PATCH 255/275] UIT-42: Also make sure that the old postal search
 keeps working

---
 culturefeed_agenda/culturefeed_agenda.module | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index abbf1aa0..1dfbe4f1 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -954,6 +954,7 @@ function culturefeed_agenda_url_inbound_alter(&$path, $original_path, $path_lang
     if (!empty($city_slug)) {
 
       $city_parts = explode('-', $city_slug);
+      $flanders_region = NULL;
       // Slug contains postal. Search city.
       if (is_numeric($city_parts[0])) {
         /*$city = culturefeed_search_get_city_by_slug($city_slug);
@@ -962,18 +963,18 @@ function culturefeed_agenda_url_inbound_alter(&$path, $original_path, $path_lang
         }*/
         $flanders_region = culturefeed_search_get_category_by_slug($city_slug, 'flandersregion');
         if ($flanders_region) {
-          $location = $flanders_region->name;
-          $regId = $flanders_region->tid;
+          $rewrite = TRUE;
         }
       }
       // No postal, search flanders region.
       else {
         $flanders_region = culturefeed_search_get_category_by_slug($city_slug, 'flandersregion');
-        if ($flanders_region) {
-          $_GET['facet']['category_flandersregion_id'][] = $flanders_region->tid;
-          $_REQUEST['facet']['category_flandersregion_id'][] = $flanders_region->tid;
-          $rewrite = TRUE;
-        }
+      }
+
+      if ($flanders_region) {
+        $_GET['facet']['category_flandersregion_id'][] = $flanders_region->tid;
+        $_REQUEST['facet']['category_flandersregion_id'][] = $flanders_region->tid;
+        $rewrite = TRUE;
       }
 
     }

From 796191a53ec94533169ba6d19910162b2546c65d Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Mon, 8 Jun 2015 11:03:26 +0200
Subject: [PATCH 256/275] UIT-42: Added backwards compatibility for users
 without rewriting

---
 .../culturefeed_search_ui.module              |  7 +-
 culturefeed_search_ui/includes/blocks.inc     |  2 +-
 .../lib/Drupal/CultureFeedSearchPage.php      | 66 +++++++++++--------
 3 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/culturefeed_search_ui/culturefeed_search_ui.module b/culturefeed_search_ui/culturefeed_search_ui.module
index 507326c0..a6e54e3f 100644
--- a/culturefeed_search_ui/culturefeed_search_ui.module
+++ b/culturefeed_search_ui/culturefeed_search_ui.module
@@ -992,6 +992,11 @@ function culturefeed_search_ui_culturefeed_search_ui_active_filters($culturefeed
           // Get translated label from terms.
           $label = culturefeed_search_get_term_translation($selected_value[$key]);
 
+          if ($active_facet_name == 'category_flandersregion_id' && !empty($query['distance'])) {
+            $label .= ' + ' . check_plain($query['distance']) . ' km';
+            unset($search_query['distance']);
+          }
+
           $build['item_' . $active_facet_name][$value] = array(
             '#theme' => 'culturefeed_search_active_filters_item',
             '#label' => isset($human_names[$active_facet_name][$label]) ? $human_names[$active_facet_name][$label] : $label,
@@ -1030,7 +1035,7 @@ function culturefeed_search_ui_culturefeed_search_ui_active_filters($culturefeed
   }
 
   // Check if user is searching on a location.
-  if (!empty($query['location'])) {
+  if (!empty($query['location']) && !isset($query['facet']['category_flandersregion_id'])) {
     $search_query = $query;
     unset($search_query['location']);
     $url = url($path, array('query' => $search_query));
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index 8d370713..f5e79f66 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -348,7 +348,7 @@ function culturefeed_search_ui_block_city_facet() {
     );
 
     // If a postal was given. We can add proximity search.
-    $city_parts = explode(' ', $_GET['location']);
+    $city_parts = explode(' ', $location);
     if (is_numeric($city_parts[0])) {
       $build['distance-form'] = drupal_get_form('culturefeed_search_ui_proximity_distance_form');
     }
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index d85bb043..c2b68d8b 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -432,33 +432,37 @@ protected function addFacetFilters($params) {
       $this->parameters[] = new Parameter\Spatial\SpatialField('physical_gis');
     }
 
+    // Backwards compatiblity for sites without clean urls: make sure location is mapped to flandersregion.
+    if (empty($params['facet']['category_flandersregion_id'][0]) && !empty($params['location'])) {
+      $flanders_region = culturefeed_search_get_category_by_slug($params['location'], 'flandersregion');
+      if ($flanders_region) {
+        $params['facet']['category_flandersregion_id'][0] = $flanders_region->tid;
+      }
+    }
+
     // Add the location facet. Only use the location if a distance is set.
     // all other cases will search for a category Id of the type flandersregion
     // or workingregion.
-    if (!empty($params['regId']) || !empty($params['location'])) {
-      
+    if (!empty($params['facet']['category_flandersregion_id'][0])) {
+
       if (!isset($params['distance'])) {
-      
+
         $regFilter = array();
-        
-        if (empty($params['regId']) && !empty($params['location'])) {
-          $location = culturefeed_search_get_category_by_name($params['location']);
-          $params['regId'] = $location->tid;
-        }
-  
+        $params['regId'] = $params['facet']['category_flandersregion_id'][0];
+
         if (!empty($params['wregIds'])) {
           $regFilter[] = array_shift($params['wregIds']);
-  
+
           $wregFilters = array();
           foreach ($params['wregIds'] as $wregId) {
             $wregFilters[] = $wregId;
           }
         }
-        
+
         if (empty($_GET['only-wregs'])) {
           $regFilter[] = $params['regId'];
         }
-  
+
         $regFilterQuery = '(';
         $regFilterQuery .= 'category_id:(' . implode(' OR ', $regFilter) .')';
         if (!empty($wregFilters)) {
@@ -466,27 +470,33 @@ protected function addFacetFilters($params) {
         }
         $regFilterQuery .= ')';
         $this->parameters[] = new Parameter\FilterQuery($regFilterQuery);
-  
+
       }
-      elseif (!empty($params['location'])) {
-  
+      else {
+
+        $location = culturefeed_search_get_term_by_id($params['facet']['category_flandersregion_id'][0]);
+
         // Check if postal was present.
-        $city_parts = explode(' ', $params['location']);
-        if (is_numeric($city_parts[0]) && empty($params['wregIds'])) {
-          $distance = isset($params['distance']) ? $params['distance'] : FALSE;
-  
-          // If category_actortype_id we assume that we search on pages (on day we have to fix)
-          if (isset($params['facet']['category_actortype_id'])) {
-            $this->parameters[] = new Parameter\FilterQuery('zipcode' . ':' . $city_parts[0]);
-          }
-          else {
-            $this->parameters[] = new Parameter\Spatial\Zipcode($city_parts[0], $distance);
+        if ($location) {
+          $city_parts = explode(' ', $location->name);
+          if (is_numeric($city_parts[0]) && empty($params['wregIds'])) {
+            $distance = isset($params['distance']) ? $params['distance'] : FALSE;
+
+            // If category_actortype_id we assume that we search on pages (on day we have to fix)
+            if (isset($params['facet']['category_actortype_id'])) {
+              $this->parameters[] = new Parameter\FilterQuery('zipcode' . ':' . $city_parts[0]);
+            }
+            else {
+              $this->parameters[] = new Parameter\Spatial\Zipcode($city_parts[0], $distance);
+            }
+
           }
-  
         }
-        
+
       }
-  
+
+      unset($params['facet']['category_flandersregion_id']);
+
     }
 
     // Calculate actor if available.

From 34b608096e82dd85172aa53058edca007e6e01d5 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Mon, 8 Jun 2015 15:57:19 +0200
Subject: [PATCH 257/275] UIV-1313 fix for notices caused by date array in
 production program

---
 culturefeed_agenda/includes/helpers.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
index ce1660f1..28558090 100644
--- a/culturefeed_agenda/includes/helpers.inc
+++ b/culturefeed_agenda/includes/helpers.inc
@@ -630,13 +630,14 @@ function culturefeed_agenda_group_timestamps(&$timestamps) {
 
         if ($this_timestamp['date'] == $next_timestamp['date']) {
           if (isset($timestamps[$i]['begintime']) && is_array($timestamps[$i]['begintime'])) {
-            unset($timestamps[$i]['begintime']);
-            if (isset($this_timestamp['begintime'])) {
+            //unset($timestamps[$i]['begintime']);
+            $timestamps[$i]['begintime'][] = $next_timestamp['begintime'];
+            /*if (isset($this_timestamp['begintime'])) {
               $timestamps[$i]['begintime'][0] = $this_timestamp['begintime'];
             }
             if (isset($next_timestamp['begintime'])) {
               $timestamps[$i]['begintime'][1] = $next_timestamp['begintime'];
-            }
+            }*/
           }
           else {
             if (isset($next_timestamp['begintime']) && $this_timestamp['begintime'] != $next_timestamp['begintime']) {

From 156e4dd5410bb8a7d7bf316296f28287bc363eae Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 10 Jun 2015 18:27:54 +0200
Subject: [PATCH 258/275] PWK-297 fix for notice on views when using
 collaboration data.

---
 ...efeed_search_views_helper_collaboration.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
index 53346c9e..623e5243 100644
--- a/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
+++ b/culturefeed_search_views/views/helpers/culturefeed_search_views_helper_collaboration.inc
@@ -62,15 +62,15 @@ function culturefeed_search_views_helper_collaboration_get_data(
         $sub_brand = $cdb_file->getSubbrand();
         $description = json_decode($cdb_file->getDescription());
 
-        if ($consumer_id == $sub_brand && $keyword == strtolower($description->keyword)) {
-
-          return array(
-            'copyright' => $cdb_file->getCopyright(),
-            'description' => $description,
-            'title' => $cdb_file->getTitle(),
-          );
-          break;
-
+        if ($consumer_id == $sub_brand && !is_null($description)) {
+          if ($keyword == strtolower($description->keyword)) {
+            return array(
+              'copyright' => $cdb_file->getCopyright(),
+              'description' => $description,
+              'title' => $cdb_file->getTitle(),
+            );
+            break;
+          }
         }
 
       }

From 82d4ece58f3bf77aff7400edb349c16a7bb5e9bc Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Fri, 29 May 2015 12:21:37 +0200
Subject: [PATCH 259/275] recover first changes from UIT-42 that were lost by
 revert commit 762eec2

---
 .../includes/blocks.inc                       | 27 ++++++----
 culturefeed_search_ui/includes/blocks.inc     | 52 ++++++++++++++-----
 culturefeed_search_ui/theme/theme.inc         |  2 +-
 3 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/culturefeed_saved_searches/includes/blocks.inc b/culturefeed_saved_searches/includes/blocks.inc
index 3ad6eb9a..a2251b4f 100644
--- a/culturefeed_saved_searches/includes/blocks.inc
+++ b/culturefeed_saved_searches/includes/blocks.inc
@@ -89,20 +89,27 @@ function culturefeed_saved_searches_get_cta_query() {
     }
 
     // We need to fetch the whole list of saved searches since we don't have ID.
-    $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
     $exists = FALSE;
-    foreach ($savedSearchList as $savedSearch) {
-      $saved_query = explode('&', $savedSearch->query);
-      foreach ($saved_query as $key => $val) {
-        if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
-          unset($saved_query[$key]);
+    try {
+
+      $savedSearchList = DrupalCultureFeed::getLoggedInUserInstance()->savedSearches()->getList();
+      foreach ($savedSearchList as $savedSearch) {
+        $saved_query = explode('&', $savedSearch->query);
+        foreach ($saved_query as $key => $val) {
+          if (strpos($val,'group') !== FALSE || strpos($val,'rows') !== FALSE || strpos($val,'sort') !== FALSE) {
+            unset($saved_query[$key]);
+          }
         }
-      }
-      $saved_query = implode('&', $saved_query);
+        $saved_query = implode('&', $saved_query);
 
-      if ($saved_query == $query['query']) {
-        $exists = TRUE;
+        if ($saved_query == $query['query']) {
+          $exists = TRUE;
+        }
       }
+
+    }
+    catch (Exception $e) {
+      watchdog_exception('culturefeed_saved_searches', $e);
     }
 
     if (!$exists) {
diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
index 581e68b3..2bf21b1a 100644
--- a/culturefeed_search_ui/includes/blocks.inc
+++ b/culturefeed_search_ui/includes/blocks.inc
@@ -292,11 +292,22 @@ function culturefeed_search_ui_block_city_facet() {
     return;
   }
 
+  $location = '';
+  if (!empty($_GET['facet']['category_flandersregion_id'])) {
+    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
+    $location = $flanders_region->name;
+  }
+
+  // Show facet layout for location.
+  elseif (!empty($_GET['location'])) {
+    $location = $_GET['location'];
+  }
+
   $noresults = FALSE;
   if ($culturefeedSearchResult->getTotalCount() == 0) {
     $noresults = TRUE;
     // Hide location selector for empty results only when no location was set.
-    if (empty($_GET['location'])) {
+    if (empty($location)) {
       return;
     }
   }
@@ -304,19 +315,18 @@ function culturefeed_search_ui_block_city_facet() {
   $build = array();
 
   // Show facet layout for location.
-  if (!empty($_GET['location'])) {
+  if (!empty($location)) {
 
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
-    $label = $_GET['location'];
     if (isset($_GET['distance'])) {
-      $label .= ' + ' . $_GET['distance'] . ' km';
+      $location .= ' + ' . $_GET['distance'] . ' km';
     }
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
     );
 
     $build = array();
@@ -394,7 +404,7 @@ function culturefeed_search_ui_city_facet_form() {
 function culturefeed_search_ui_city_facet_form_submit($form, &$form_state) {
 
   $query = drupal_get_query_parameters(NULL, array('q', 'page', 'location', 'nearby', 'coordinates'));
-  
+
   // Remove the region filter so choosing a city has results.
   if (isset($query['facet']['category_flandersregion_id'])) {
     unset($query['facet']['category_flandersregion_id']);
@@ -546,16 +556,26 @@ function culturefeed_search_ui_block_city_only_facet() {
   $build = array();
 
   // Show facet layout for location.
-  if (!empty($_GET['location'])) {
+  $location = '';
+  if (!empty($_GET['facet']['category_flandersregion_id'])) {
+    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
+    $location = $flanders_region->name;
+  }
+
+  // Show facet layout for location.
+  elseif (!empty($_GET['location'])) {
+    $location = $_GET['location'];
+  }
+
+  if (!empty($location)) {
 
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
-    $label = $_GET['location'];
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
     );
 
     $build = array();
@@ -790,17 +810,25 @@ function culturefeed_search_ui_block_location_search() {
 
   $build = array();
 
+  $location = '';
+  if (!empty($_GET['facet']['category_flandersregion_id'])) {
+    $flanders_region = culturefeed_search_get_term_by_id($_GET['facet']['category_flandersregion_id'][0]);
+    $location = $flanders_region->name;
+  }
+
   // Show facet layout for location.
-  if (!empty($_GET['location'])) {
+  elseif (!empty($_GET['location'])) {
+    $location = $_GET['location'];
+  }
 
+  if (!empty($location)) {
     // Build facet for location.
     $facet = new \CultuurNet\Search\Component\Facet\Facet('location', new \CultuurNet\Search\Parameter\FacetField('location'));
-    $label = $_GET['location'];
 
     // Make a result item for location search.
     global $pager_total_items;
     $items = array(
-      new \CultuurNet\Search\Component\Facet\FacetResultItem($label, $label, $pager_total_items[0]),
+      new \CultuurNet\Search\Component\Facet\FacetResultItem($location, $location, $pager_total_items[0]),
     );
 
     $build = array();
diff --git a/culturefeed_search_ui/theme/theme.inc b/culturefeed_search_ui/theme/theme.inc
index 30f13a43..a55e7372 100644
--- a/culturefeed_search_ui/theme/theme.inc
+++ b/culturefeed_search_ui/theme/theme.inc
@@ -419,7 +419,7 @@ function culturefeed_search_ui_preprocess_culturefeed_search_facet_item(&$variab
     $variables['active'] = TRUE;
   }
 
-  if ($facet_key == 'location' && isset($_GET['location'])) {
+  if ($facet_key == 'location' && (isset($_GET['location']) || isset($_GET['facet']['category_flandersregion_id']))) {
     // Location facet items are always active when location is in query string.
     $variables['active'] = TRUE;
     // When the facet is location, we don't need location/distance in the query.

From c1ca90aeb929557f41f2b86b34bb1f452c00d80d Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Wed, 17 Jun 2015 13:05:59 +0200
Subject: [PATCH 260/275] CF-424 add scale parameter to image field

---
 .../views_handler_field_cdb_item_picture.inc  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
index 82f284ff..7afbee67 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_picture.inc
@@ -14,6 +14,7 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
     $options['override'] = array('default' => FALSE);
     $options['width'] = array('default' => 100);
     $options['height'] = array('default' => 100);
+    $options['scale'] = array('default' => 'none');
     $options['format'] = array('default' => 'image');
     $options['link'] = array('default' => FALSE);
 
@@ -46,6 +47,19 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
       '#required' => TRUE,
     );
 
+    $form['scale'] = array(
+      '#type' => 'radios',
+      '#title' => t('Scale'),
+      '#options' => array(
+        'none' => t('None'),
+        'downscaleonly' => t('Downscale only'),
+        'upscaleonly' => t('Upscale only'),
+        'both' => t('Both'),
+        'upscalecanvas' => t('Upscale canvas'),
+      ),
+      '#default_value' => isset($this->options['scale']) ? $this->options['scale'] : 'none',
+    );
+
 		$form['format'] = array(
 			'#type' => 'select',
 			'#title' => t('Format'),
@@ -136,7 +150,12 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
         }
 
         else {
-          $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+          if ($this->options['scale'] != 'none') {
+            $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'] . '&scale=' . $this->options['scale']));
+          }
+          else {
+            $image = theme('image', array('path' => $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height']));
+          }
         }
 
       }
@@ -148,7 +167,12 @@ class views_handler_field_cdb_item_picture extends views_handler_field {
             $image = $main_picture;
           }
           else {
-            $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+            if ($this->options['scale'] != 'none') {
+              $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'] . '&scale=' . $this->options['scale'];
+            }
+            else {
+              $image = $main_picture . '?crop=auto&width=' . $this->options['width'] . '&height=' . $this->options['height'];
+            }
           }
 
         }

From 0de13bdc3e5f0248031111f0547fe6f75a6164f4 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Thu, 18 Jun 2015 13:41:59 +0200
Subject: [PATCH 261/275] UIV-1344 fix for weird signs in autocomplete list of
 location search

---
 culturefeed_search_ui/includes/pages.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_search_ui/includes/pages.inc b/culturefeed_search_ui/includes/pages.inc
index aec1b3c7..aac32b79 100644
--- a/culturefeed_search_ui/includes/pages.inc
+++ b/culturefeed_search_ui/includes/pages.inc
@@ -149,7 +149,7 @@ function culturefeed_search_ui_city_actor_suggestion_autocomplete($search_string
       $city_suggestions = array_slice($city_suggestions, 0, 5);
       foreach ($city_suggestions as $city_suggestion) {
         $matches[] = array(
-          'label' => check_plain($city_suggestion),
+          'label' => str_replace("&#039;","'",check_plain($city_suggestion)),
           'category' => '',
           'suggestion' => $city_suggestion,
           'type' => 'city',

From bc18819677850a687b856e27c0c3ae8c611e21ae Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 19 Jun 2015 11:16:39 +0200
Subject: [PATCH 262/275] UIV-1356 fix search paths when location parameter is
 not a slug

---
 .../lib/Drupal/CultureFeedSearchPage.php            | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 9bfc4a03..841caab9 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -442,11 +442,14 @@ protected function addFacetFilters($params) {
       $this->parameters[] = new Parameter\Spatial\SpatialField('physical_gis');
     }
 
-    // Backwards compatiblity for sites without clean urls: make sure location is mapped to flandersregion.
     if (empty($params['facet']['category_flandersregion_id'][0]) && !empty($params['location'])) {
-      $flanders_region = culturefeed_search_get_category_by_slug($params['location'], 'flandersregion');
+      $flanders_region = culturefeed_search_get_category_by_slug($params['location'], 'flandersregion')->tid;
+      // Backwards compatiblity for sites without clean urls: make sure location is mapped to flandersregion.
+      if (empty($flanders_region)) {
+        $flanders_region = key(culturefeed_search_get_categories_by_domain('flandersregion', array('name_like' => $params['location'])));
+      }
       if ($flanders_region) {
-        $params['facet']['category_flandersregion_id'][0] = $flanders_region->tid;
+        $params['facet']['category_flandersregion_id'][0] = $flanders_region;
       }
     }
 
@@ -454,7 +457,9 @@ protected function addFacetFilters($params) {
     // all other cases will search for a category Id of the type flandersregion
     // or workingregion.
     if (!empty($params['facet']['category_flandersregion_id'][0])) {
-
+    
+      echo '<pre>';print_r($params['facet']['category_flandersregion_id'][0]);echo '</pre>';
+      
       if (!isset($params['distance'])) {
 
         $regFilter = array();

From d797b4eba21299c942f6ec20cbfcf5c5b3389a09 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 19 Jun 2015 12:04:11 +0200
Subject: [PATCH 263/275] UIV-1355 fix Facebook share URL when fbAppId is set

---
 culturefeed_calendar/theme/theme.inc |  6 +++---
 js/facebook_share.js                 | 27 ++++++++++++++++++---------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/culturefeed_calendar/theme/theme.inc b/culturefeed_calendar/theme/theme.inc
index 39f19dbd..71c7c00b 100644
--- a/culturefeed_calendar/theme/theme.inc
+++ b/culturefeed_calendar/theme/theme.inc
@@ -306,9 +306,9 @@ function culturefeed_calendar_preprocess_culturefeed_calendar_share_page(&$varia
       'attributes' => array('class' => 'facebook-share'),
       );
 
-    $variables['facebook_url'] = 'https://www.facebook.com/sharer/sharer.php?u=' . $variables['calendar_share_url'];
-    $variables['googleplus_url'] = 'https://plus.google.com/share?url=' . $variables['calendar_share_url'];
-    $variables['twitter_url'] = 'https://twitter.com/intent/tweet?text=' . $variables['calendar_share_url'];
+    $variables['facebook_url'] = 'https://www.facebook.com/sharer/sharer.php?u=' . urlencode($variables['calendar_share_url']);
+    $variables['googleplus_url'] = 'https://plus.google.com/share?url=' . urlencode($variables['calendar_share_url']);
+    $variables['twitter_url'] = 'https://twitter.com/intent/tweet?text=' . urlencode($variables['calendar_share_url']);
 
     if (module_exists('forward')) {
       $variables['mail_url'] = url('forward', array('query' => array('path' => $variables['calendar_share_path'])));
diff --git a/js/facebook_share.js b/js/facebook_share.js
index b9635773..02a5108d 100644
--- a/js/facebook_share.js
+++ b/js/facebook_share.js
@@ -1,21 +1,21 @@
 (function($) {
 
-  window.fbAsyncInit = function() {
-    FB.init({
-      appId: Drupal.settings.culturefeed.fbAppId,
-      xfbml: true,
-      version: 'v2.1'
-    });
-  };
-
   Drupal.behaviors.culturefeed_calendar_facebook_share = {
     attach: function(context, settings) {
       $('a.facebook-share', context).bind('click', function(e) {
         e.preventDefault();
+
+        // Get default (legacy) sharer url
+        var default_share_url = this.href;
+
+        // Remove the "https://www.facebook.com/sharer/sharer.php?u="
+        var dialog_share_url = default_share_url.replace('https://www.facebook.com/sharer/sharer.php?u=','');
+        var dialog_share_url = decodeURIComponent(dialog_share_url);             
+
         FB.ui(
          {
           method: 'share',
-          href: this.href,
+          href: dialog_share_url,
         }, function(response){});
       });
     }
@@ -23,6 +23,15 @@
 
 })(jQuery);
 
+  window.fbAsyncInit = function() {
+    console.log('timeout finished');
+    FB.init({
+      appId: Drupal.settings.culturefeed.fbAppId,
+      xfbml: true,
+      version: 'v2.1'
+    });
+  };
+
 (function(d, s, id) {
   var js, fjs = d.getElementsByTagName(s)[0];
   if (d.getElementById(id)) {

From 615e048ce2592678246a4792a8fae4f361e6b500 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Fri, 19 Jun 2015 12:45:41 +0200
Subject: [PATCH 264/275] UIV-1356 remove debug code from Cav

---
 culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 841caab9..57498bd3 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -457,9 +457,7 @@ protected function addFacetFilters($params) {
     // all other cases will search for a category Id of the type flandersregion
     // or workingregion.
     if (!empty($params['facet']['category_flandersregion_id'][0])) {
-    
-      echo '<pre>';print_r($params['facet']['category_flandersregion_id'][0]);echo '</pre>';
-      
+
       if (!isset($params['distance'])) {
 
         $regFilter = array();

From 52f62c32f884ef614761d289c0d7b37e8914d4de Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Mon, 22 Jun 2015 12:54:28 +0200
Subject: [PATCH 265/275] UIV-1117 fix spatial query for movie theaters.

---
 culturefeed_agenda/includes/pages.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/culturefeed_agenda/includes/pages.inc b/culturefeed_agenda/includes/pages.inc
index 9a7fa71f..96867a1f 100644
--- a/culturefeed_agenda/includes/pages.inc
+++ b/culturefeed_agenda/includes/pages.inc
@@ -278,14 +278,14 @@ function culturefeed_agenda_page_ajax_actor_suggest() {
 
   $user_location = culturefeed_search_ui_get_user_location_cookie();
   if (isset($user_location->latitude) && isset($user_location->longitude)) {
-    $parameters[] = new \CultuurNet\Search\Parameter\Spatial\Point($user_location->latitude, $user_location->longitude);
-    $parameters[] = new \CultuurNet\Search\Parameter\Spatial\SpatialField('contactinfo_physical_gis');
-    $parameters[] = new \CultuurNet\Search\Parameter\Spatial\Distance(CULTUREFEED_SEARCH_DEFAULT_PROXIMITY_RANGE);
-//    $parameters[] = new \CultuurNet\Search\Parameter\Spatial\GeoFilterQuery($point, $distance, $field);
-    $parameters[] = new \CultuurNet\Search\Parameter\Sort('geodist()', \CultuurNet\Search\Parameter\Sort::DIRECTION_ASC);
+    $point = new \CultuurNet\Search\Parameter\Spatial\Point($user_location->latitude, $user_location->longitude);
+    $field = new \CultuurNet\Search\Parameter\Spatial\SpatialField('contactinfo_physical_gis');
+    $distance = new \CultuurNet\Search\Parameter\Spatial\Distance(10);
+    $parameters[] = new \CultuurNet\Search\Parameter\Spatial\GeoFilterQuery($point, $distance, $field);
+    //$parameters[] = new \CultuurNet\Search\Parameter\Sort('geodist()', \CultuurNet\Search\Parameter\Sort::DIRECTION_ASC);
   }
 
-  $parameters[] = new \CultuurNet\Search\Parameter\Rows(15);
+  $parameters[] = new \CultuurNet\Search\Parameter\Rows(20);
   $parameters[] = new \CultuurNet\Search\Parameter\Query('*:*');
 
   $all_categories = culturefeed_search_get_actortype_categories();

From df41d8a844fd165dfc1c0ff2603845b98162080b Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Mon, 22 Jun 2015 14:31:54 +0200
Subject: [PATCH 266/275] UIV-1285 Fix for navigation in IE8

---
 culturefeed_ui/culturefeed_ui.preprocess.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_ui/culturefeed_ui.preprocess.inc b/culturefeed_ui/culturefeed_ui.preprocess.inc
index 056bdc62..74edb63f 100644
--- a/culturefeed_ui/culturefeed_ui.preprocess.inc
+++ b/culturefeed_ui/culturefeed_ui.preprocess.inc
@@ -145,7 +145,7 @@ function template_preprocess_culturefeed_ui_user_summary(&$variables) {
  */
 function template_preprocess_culturefeed_ui_anonymous_profile_box(&$variables) {
 
-  $variables['link_login'] = l(t('Log in'), 'culturefeed/oauth/connect', array('attributes' => array('class' => array('culturefeedconnect'), 'rel' => 'nofollow'), 'query' => drupal_get_destination()));
+  $variables['link_login'] = l('<span>'.t('Log in').'</span>', 'culturefeed/oauth/connect', array('html' => TRUE,'attributes' => array('class' => array('culturefeedconnect'), 'rel' => 'nofollow'), 'query' => drupal_get_destination()));
   $variables['link_register'] = l(t('Sign up'), 'culturefeed/oauth/connect/register', array('attributes' => array('class' => array('culturefeedconnect'), 'rel' => 'nofollow'), 'query' => drupal_get_destination()));
   $query = drupal_get_destination();
   $query['via'] = 'facebook';

From c4f45ead4acd5fdb7e1335d9e3ff1cd8caf292ac Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Mon, 22 Jun 2015 21:32:24 +0200
Subject: [PATCH 267/275] adding github wiki links

---
 culturefeed_agenda/culturefeed_agenda.module | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 1dfbe4f1..632e5ffe 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -355,37 +355,44 @@ function culturefeed_agenda_culturefeed_search_page_info() {
 function culturefeed_agenda_block_info() {
 
   $blocks = array();
-
+  
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Related-activities
   $blocks['agenda-related-activities'] = array(
     'info' => t('Culturefeed agenda: related activities'),
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
 
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Nearby-activities
   $blocks['agenda-nearby-activities'] = array(
     'info' => t('Culturefeed agenda: nearby activities'),
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
 
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Search-events
   $blocks['agenda-search-block'] = array(
     'info' => t('Culturefeed agenda: search events'),
     'cache' => DRUPAL_NO_CACHE,
   );
 
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Actor-program
   $blocks['actor-program'] = array(
     'info' => t('Culturefeed agenda: actor program'),
     'cache' => DRUPAL_NO_CACHE,
   );
-
+  
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Production-program
   $blocks['production-program'] = array(
     'info' => t('Culturefeed agenda: production program'),
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
 
+  // More https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Actor-search
   $blocks['agenda-actor-search'] = array(
     'info' => t('Culturefeed agenda: actor search'),
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
 
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Event-types
   $blocks['agenda-event-types'] = array(
     'info' => t('Culturefeed agenda: Event types'),
     'cache' => DRUPAL_CACHE_PER_PAGE,

From 89b537b2ae6f1caf8ab7de697b7f5b26cc644022 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Mon, 22 Jun 2015 21:56:11 +0200
Subject: [PATCH 268/275] adding github wiki links

---
 culturefeed_agenda/culturefeed_agenda.module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/culturefeed_agenda/culturefeed_agenda.module b/culturefeed_agenda/culturefeed_agenda.module
index 632e5ffe..22e6291a 100644
--- a/culturefeed_agenda/culturefeed_agenda.module
+++ b/culturefeed_agenda/culturefeed_agenda.module
@@ -397,7 +397,8 @@ function culturefeed_agenda_block_info() {
     'info' => t('Culturefeed agenda: Event types'),
     'cache' => DRUPAL_CACHE_PER_PAGE,
   );
-
+  
+  // More info https://github.com/cultuurnet/culturefeed/wiki/Culturefeed-Agenda-Block-Organiser-Events
 	$blocks['agenda-organiser-events'] = array(
 		'info' => t('Culturefeed agenda: Organiser events'),
 		'cache' => DRUPAL_CACHE_PER_PAGE,

From f1a47a3912968c649665e0f81b6b786d6ab81625 Mon Sep 17 00:00:00 2001
From: Luk Dens <luk.dens@cultuurnet.be>
Date: Wed, 24 Jun 2015 13:44:50 +0200
Subject: [PATCH 269/275] map city parameter from cnapi to location

---
 culturefeed_search_ui/includes/helpers.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index 617432e0..0ba629e6 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -235,6 +235,12 @@ function culturefeed_search_ui_redirect_cnapi_urls() {
     }
   }
 
+  // City can be mapped to location.
+  if (isset($_GET['city'])) {
+    $query = $_GET['city'];
+    $new_query['location'] = $query;
+  }
+
   // Query is now search.
   if (isset($_GET['query'])) {
     $query = $_GET['query'];

From ae43e4b83a2f04cb3220b02670b67bdd716a9f51 Mon Sep 17 00:00:00 2001
From: Reinout Bossuyt <reinout@cultuurnet.be>
Date: Wed, 24 Jun 2015 14:19:59 +0200
Subject: [PATCH 270/275] UIV-919 Hide reservation-url if it's the same as
 ticket-link

---
 culturefeed_agenda/theme/theme.inc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/culturefeed_agenda/theme/theme.inc b/culturefeed_agenda/theme/theme.inc
index bb418026..645b9e84 100644
--- a/culturefeed_agenda/theme/theme.inc
+++ b/culturefeed_agenda/theme/theme.inc
@@ -171,6 +171,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
 
     $variables['tickets'] = array();
     $variables['ticket_buttons'] = array();
+    $variables['ticket_links'] = array();
 
     foreach ($ticket_links as $link) {
       $variables['tickets'][] = l(t('Buy tickets'), $link->getHLink(), array('attributes' => array('class' => 'reservation-link', 'id' => 'cf-ticket')));
@@ -181,6 +182,7 @@ function _culturefeed_agenda_preprocess_agenda(&$variables) {
       $button['link'] = $link->getHLink();
       $button['options'] = array('attributes' => array('class' => 'reservation-link button', 'id' => 'cf-ticket'));
       $variables['ticket_buttons'][] = $button;
+      $variables['ticket_links'][] = $link->getHLink();
     }
 
     // Performers
@@ -633,10 +635,12 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
       // Reservation url
       if (isset($reservation_info['url'])) {
         foreach ($reservation_info['url'] as $url) {
-          // clean up link text
-          $url_text = str_replace('http://', '', $url);
-          $url_text = str_replace('https://', '', $url_text);
-          $reservation_urls[] = l(truncate_utf8($url_text, 40, FALSE, TRUE), $url, array('attributes' => array('id' => 'cf-reservation')));
+          if(!in_array($url, $variables['ticket_links'])){
+            // clean up link text
+            $url_text = str_replace('http://', '', $url);
+            $url_text = str_replace('https://', '', $url_text);
+            $reservation_urls[] = l(truncate_utf8($url_text, 40, FALSE, TRUE), $url, array('attributes' => array('id' => 'cf-reservation')));
+          }
         }
         $variables['reservation']['url'] = implode(', ', $reservation_urls);
       }
@@ -738,7 +742,7 @@ function _culturefeed_agenda_preprocess_event(&$variables) {
     }
     catch (Exception $e) {
     }
-    
+
     // Check if event has finished or not.
     $event_is_passed = FALSE;
     if ($event instanceof CultureFeed_Cdb_Item_Event) {
@@ -979,7 +983,7 @@ function culturefeed_agenda_preprocess_culturefeed_agenda_actor_program_item(&$v
       culturefeed_agenda_preprocess_culturefeed_production_summary($variables);
       break;
   }
-  
+
 }
 
 /**

From 83b370399eb04850c87d3b480bf5d1c714259e52 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 30 Jun 2015 14:12:40 +0200
Subject: [PATCH 271/275] UIV-1316 fix notice of 'value' in
 culturefeed_content_field_formatter_view.

---
 culturefeed_content/culturefeed_content.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index 1c6fa5f5..4452d9dd 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -88,7 +88,7 @@ function culturefeed_content_field_formatter_view($entity_type, $entity, $field,
         $search_type = culturefeed_get_searchable_type('activiteiten');
         $sort_options = culturefeed_search_ui_get_sort_options_for_page($search_type);
         foreach ($sort_options as $option) {
-          if ($option['value'] == $sort) {
+          if (isset($option['value']) == $sort) {
             $parameters[] = new \CultuurNet\Search\Parameter\Parameter('sort', $option['query']);
             break;
           }

From 07f27d4c7a1bdb10d4ad6d19478dcbb46e3b9730 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Tue, 30 Jun 2015 14:32:45 +0200
Subject: [PATCH 272/275] UIV-1316 new fix for
 culturefeed_content_field_formatter_view

---
 culturefeed_content/culturefeed_content.module | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/culturefeed_content/culturefeed_content.module b/culturefeed_content/culturefeed_content.module
index 4452d9dd..1db26f40 100644
--- a/culturefeed_content/culturefeed_content.module
+++ b/culturefeed_content/culturefeed_content.module
@@ -88,9 +88,11 @@ function culturefeed_content_field_formatter_view($entity_type, $entity, $field,
         $search_type = culturefeed_get_searchable_type('activiteiten');
         $sort_options = culturefeed_search_ui_get_sort_options_for_page($search_type);
         foreach ($sort_options as $option) {
-          if (isset($option['value']) == $sort) {
-            $parameters[] = new \CultuurNet\Search\Parameter\Parameter('sort', $option['query']);
-            break;
+          if (isset($option['value'])) {
+            if ($option['value'] == $sort) {
+              $parameters[] = new \CultuurNet\Search\Parameter\Parameter('sort', $option['query']);
+              break;
+            }
           }
         }
 

From 4e6c211eef16e1480f9eb2ea244ef13a9ad98014 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 3 Jul 2015 11:52:27 +0200
Subject: [PATCH 273/275] UIV-1041 replacing adding tags set_message

---
 .../includes/form/culturefeed_entry_ui.tag_objects.inc        | 2 +-
 culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
index a8f56eb6..2c8c176b 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
@@ -115,7 +115,7 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
       }
     }
 
-    drupal_set_message(t('The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the "View" tab'));
+    drupal_set_message(t('The tags were adjusted and will be available under the "View" tab.'));
 
   }
 
diff --git a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
index afd6331c..2022f08f 100644
--- a/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
+++ b/culturefeed_entry_ui/translations/culturefeed_entry_ui.nl.po
@@ -811,8 +811,8 @@ msgid "We could not validate the location"
 msgstr "We kunnen de locatie niet bevestigen"
 
 #: includes/form/culturefeed_entry_ui.tag_objects.inc:118
-msgid "The tags were adjusted. However, it takes half an hour before these changes on all channels (including Uitinvlaanderen) will be. Available under the \"View\" tab"
-msgstr "De labels werden aangepast. Het kan echter een half uur duren vooraleer deze wijzigingen op alle kanalen (waaronder UiTinVlaanderen) zichtbaar zijn."
+msgid "The tags were adjusted and will be available under the \"View\" tab."
+msgstr "De labels werden aangepast en zijn te bekijken onder de 'Weergeven' tab."
 
 #: includes/form/culturefeed_entry_ui.tags.inc:38
 msgid "Add Add tags"

From fce792990d0c5e1f41d329b0a63ec40d18772d88 Mon Sep 17 00:00:00 2001
From: Sven Houtmeyers <sven@cultuurnet.be>
Date: Fri, 3 Jul 2015 12:18:39 +0200
Subject: [PATCH 274/275] UIV-1041 adding drupal_goto

---
 .../includes/form/culturefeed_entry_ui.tag_objects.inc           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
index 2c8c176b..2e7c735a 100644
--- a/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
+++ b/culturefeed_entry_ui/includes/form/culturefeed_entry_ui.tag_objects.inc
@@ -116,6 +116,7 @@ function culturefeed_entry_ui_edit_tag_objects_form_submit($form, &$form_state)
     }
 
     drupal_set_message(t('The tags were adjusted and will be available under the "View" tab.'));
+    drupal_goto(culturefeed_search_detail_path('event', $event->getId(), $event->getTitle(culturefeed_get_preferred_language())));
 
   }
 

From 3cc3c5858392cbaaa6de231ec1b8bab3ee158629 Mon Sep 17 00:00:00 2001
From: Stijn Swaanen <swaanenstijn@gmail.com>
Date: Fri, 3 Jul 2015 13:58:51 +0200
Subject: [PATCH 275/275] PWK-241 expand category field with different options
 in CF search views

---
 .../views_handler_field_cdb_item_category.inc | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
index 417feac1..8cfaa4b6 100644
--- a/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
+++ b/culturefeed_search_views/views/handlers/field/views_handler_field_cdb_item_category.inc
@@ -11,6 +11,7 @@ class views_handler_field_cdb_item_category extends views_handler_field {
 	function option_definition() {
 		$options = parent::option_definition();
 
+    $options['type'] = array('default' => 'eventtype');
 		$options['link'] = array('default' => FALSE);
 
 		return $options;
@@ -21,6 +22,24 @@ class views_handler_field_cdb_item_category extends views_handler_field {
 	 */
 	function options_form(&$form, &$form_state) {
 
+    $form['type'] = array(
+      '#type' => 'radios',
+      '#title' => t('Type'),
+      '#description' => t('What kind of categories do you want to show?'),
+      '#options' => array(
+        'theme' => t('Theme'),
+        'publicscope' => t('Public scope'),
+        'targetaudience' => t('Target audience'),
+        'eventtype' => t('Event type'),
+        'actortype' => t('Actor type'),
+        'educationfield' => t('Education field'),
+        'educationlevel' => t('Education Level'),
+        'facility' => t('Facility'),
+        'flandersregion' => t('Flanders region'),
+      ),
+      '#default_value' => isset($this->options['format']) ? $this->options['format'] : 'image',
+    );
+
 		$form['link'] = array(
 			'#type' => 'checkbox',
 			'#title' => t('Link the category to the category result page'),
@@ -40,7 +59,7 @@ class views_handler_field_cdb_item_category extends views_handler_field {
       return;
     }
 
-		$categories = culturefeed_agenda_get_category_list_of_item('eventtype', $extended_entity->getEntity());
+		$categories = culturefeed_agenda_get_category_list_of_item($this->options['type'], $extended_entity->getEntity());
 
     if (!$categories) {
       return;