Merge branch 'release-easyopac'

Author: OIOIOOOI

.platform.app.yaml

@@ -111,7 +111,9 @@ hooks:
     set -e
     cd public
     drush -y updatedb
+    drush secure-permissions-rebuild
     drush css-generate
+    drush pm-enable ding_config_import
     drush cc all
 
   # The configuration of scheduled execution.

ding2.info

@@ -4,7 +4,7 @@ description = Install a Ding based library site.
 core = 7.x
 distribution_name = "Ding 2"
 exclusive = TRUE
-version = 7.x-6.2.1+easy
+version = 7.x-6.3.2+easy
 
 ; Core modules.
 dependencies[] = block
@@ -22,6 +22,7 @@ dependencies[] = field_ui
 ; Helper modules.
 dependencies[] = module_filter
 dependencies[] = menu_position
+dependencies[] = i18n_string
 dependencies[] = i18n_variable
 dependencies[] = eu_cookie_compliance
 dependencies[] = view_unpublished

ding2.install

@@ -1002,24 +1002,7 @@ function ding2_update_7086() {
  * Remove Webtrends specific info from cookie page.
  */
 function ding2_update_7087() {
-  // If we can find the old cookie information page make a backup, so we don't
-  // lose any information added by administrative users.
-  if ($nid = ding2_get_cookie_node_nid()) {
-    $node = node_load($nid);
-    $node->title .= ' (BACKUP)';
-    node_save($node);
-    // Delete "cookies" alias.
-    $path = path_load([
-      'source' => 'node/' . $node->nid,
-      'alias' => 'cookies',
-    ]);
-    if ($path) {
-      path_delete($path['pid']);
-    }
-  }
-  // Set a new generic cookie information page. This time without any specific
-  // information about which analytics tool we use.
-  ding2_set_cookie_page();
+  ding2_update_cookie_page();
 }
 
 /**
@@ -1079,3 +1062,24 @@ function ding2_update_7092() {
 function ding2_update_7093() {
   ding2_translation_update();
 }
+
+/**
+ * Update default text on cookie page. A backup of existing will be created.
+ */
+function ding2_update_7094() {
+  ding2_update_cookie_page();
+}
+
+/**
+ * Update translations.
+ */
+function ding2_update_7095() {
+  ding2_translation_update();
+}
+
+/**
+ * Update translations.
+ */
+function ding2_update_7096() {
+  ding2_translation_update();
+}

ding2.profile

@@ -748,7 +748,7 @@ function ding2_set_cookie_page() {
     <p><strong>Funktionelle cookies</strong></p>
     <p>Visse stedet bruger vi cookies til at forbedre funktionalitet som f.eks. at huske dine valg, så du ikke skal trykke på samme knap om og om igen. Når du afviser cookies vil disse ikke blive indstillet, og det kan dermed betyde foringelse af brugeroplevelsen.</p>
     <p><strong>Statistik cookies</strong></p>
-    <p>Vi bruger cookies til at føre statistik over trafikken på hjemmesiden. Al indsamlet statistik gemmes anonymiseret. Vi bruger dette statistik til at undersøge brugsadfærd med det formål at forbedre kvaliteten af indhold og brugeroplevelsen på hjemmesiden. Afviser du cookies vil denne tracking blive blokeret.</p>';
+    <p>Vi bruger cookies til at forbedre den statistik, vi fører over trafikken på hjemmesiden. Al indsamlet statistik gemmes anonymiseret. Vi bruger denne statistik til at undersøge brugsadfærd med det formål at forbedre kvaliteten af indhold og brugeroplevelsen på hjemmesiden.</p>';
 
   $page_lead = 'Vi vil gerne tilbyde vores brugere en overskuelig og brugervenlig hjemmeside. For at sikre os, at indholdet på siden er relevant og til at finde rundt i, benytter vi os af cookies. Cookies giver os vigtige informationer om, hvordan vores side bliver brugt, hvilke sider der bliver set mest, hvor længe vores brugere bliver på siderne osv.';
 
@@ -788,6 +788,29 @@ function ding2_set_cookie_page() {
   // administer EU Cookie Compliance popup: administrators, local administrator
 }
 
+/**
+ * Updates cookie page and make backup of existing.
+ */
+function ding2_update_cookie_page() {
+  // If we can find the old cookie information page make a backup, so we don't
+  // lose any information added by administrative users.
+  if ($nid = ding2_get_cookie_node_nid()) {
+    $node = node_load($nid);
+    $node->title .= ' (BACKUP)';
+    node_save($node);
+    // Delete "cookies" alias.
+    $path = path_load([
+      'source' => 'node/' . $node->nid,
+      'alias' => 'cookies',
+    ]);
+    if ($path) {
+      path_delete($path['pid']);
+    }
+  }
+  // Set the new cookie page.
+  ding2_set_cookie_page();
+}
+
 /**
  * Get the nid of the current node used as cookie page.
  *

easyopac.make

@@ -9,21 +9,14 @@ projects[bibdk_subject_hierarchy][type]             = "module"
 projects[bibdk_subject_hierarchy][subdir]           = ""
 projects[bibdk_subject_hierarchy][download][type]   = "git"
 projects[bibdk_subject_hierarchy][download][url]    = "git@github.com:easySuite/bibdk_subject_hierarchy.git"
-projects[bibdk_subject_hierarchy][download][tag]    = "7.x-5.0.2"
+projects[bibdk_subject_hierarchy][download][tag]    = "7.x-6.2.1"
 ;projects[bibdk_subject_hierarchy][download][branch] = "development"
 
-projects[bibliofil_lists][type]             = "module"
-projects[bibliofil_lists][subdir]           = ""
-projects[bibliofil_lists][download][type]   = "git"
-projects[bibliofil_lists][download][url]    = "git@github.com:easySuite/bibliofil_lists.git"
-projects[bibliofil_lists][download][tag]    = "7.x-6.2.1"
-;projects[bibliofil_lists][download][branch] = "development"
-
 projects[ding_billetexpressen_import][type]             = "module"
 projects[ding_billetexpressen_import][subdir]           = ""
 projects[ding_billetexpressen_import][download][type]   = "git"
 projects[ding_billetexpressen_import][download][url]    = "git@github.com:easySuite/ding_billetexpressen_import.git"
-projects[ding_billetexpressen_import][download][tag]    = "7.x-5.0.0"
+projects[ding_billetexpressen_import][download][tag]    = "7.x-6.2.1"
 ;projects[ding_billetexpressen_import][download][branch] = "development"
 
 projects[ding_billettendk_import][type]             = "module"
@@ -72,7 +65,7 @@ projects[ding_collection_reservation][type]             = "module"
 projects[ding_collection_reservation][subdir]           = ""
 projects[ding_collection_reservation][download][type]   = "git"
 projects[ding_collection_reservation][download][url]    = "git@github.com:easySuite/ding_collection_reservation.git"
-projects[ding_collection_reservation][download][tag]    = "7.x-6.2.1"
+projects[ding_collection_reservation][download][tag]    = "7.x-6.2.2"
 ;projects[ding_collection_reservation][download][branch] = "development"
 
 projects[ding_context_search][type]             = "module"
@@ -142,7 +135,7 @@ projects[ding_item_list][type]             = "module"
 projects[ding_item_list][subdir]           = ""
 projects[ding_item_list][download][type]   = "git"
 projects[ding_item_list][download][url]    = "git@github.com:easySuite/ding_item_list.git"
-projects[ding_item_list][download][tag]    = "7.x-6.0.1"
+projects[ding_item_list][download][tag]    = "7.x-6.3.2"
 ;projects[ding_item_list][download][branch] = "development"
 
 projects[ding_kultunaut_import][type]             = "module"
@@ -156,7 +149,7 @@ projects[ding_language][type]             = "module"
 projects[ding_language][subdir]           = ""
 projects[ding_language][download][type]   = "git"
 projects[ding_language][download][url]    = "git@github.com:easySuite/ding_language.git"
-projects[ding_language][download][tag]    = "7.x-6.1.1"
+projects[ding_language][download][tag]    = "7.x-6.2.1"
 ;projects[ding_language][download][branch] = "development"
 
 projects[ding_library_opening_hours][type]             = "module"
@@ -261,7 +254,7 @@ projects[ding_video][type]             = "module"
 projects[ding_video][subdir]           = ""
 projects[ding_video][download][type]   = "git"
 projects[ding_video][download][url]    = "git@github.com:easySuite/ding_video.git"
-projects[ding_video][download][tag]    = "7.x-6.2.1"
+projects[ding_video][download][tag]    = "7.x-6.2.2"
 ;projects[ding_video][download][branch] = "development"
 
 projects[easyddb_facebookshare][type]             = "module"
@@ -303,7 +296,7 @@ projects[easyddb_frontend_layout][type]             = "module"
 projects[easyddb_frontend_layout][subdir]           = ""
 projects[easyddb_frontend_layout][download][type]   = "git"
 projects[easyddb_frontend_layout][download][url]    = "git@github.com:easySuite/easyddb_frontend_layout.git"
-projects[easyddb_frontend_layout][download][tag]    = "7.x-6.1.1"
+projects[easyddb_frontend_layout][download][tag]    = "7.x-6.2.1"
 ;projects[easyddb_frontend_layout][download][branch] = "development"
 
 projects[easyddb_legend][type]             = "module"
@@ -317,7 +310,7 @@ projects[easyddb_search_holdings][type]             = "module"
 projects[easyddb_search_holdings][subdir]           = ""
 projects[easyddb_search_holdings][download][type]   = "git"
 projects[easyddb_search_holdings][download][url]    = "git@github.com:easySuite/easyddb_search_holdings.git"
-projects[easyddb_search_holdings][download][tag]    = "7.x-6.2.1"
+projects[easyddb_search_holdings][download][tag]    = "7.x-6.2.2"
 ;projects[easyddb_search_holdings][download][branch] = "development"
 
 projects[easyddb_search_radios][type]             = "module"
@@ -345,7 +338,7 @@ projects[easyddb_wayfinder][type]             = "module"
 projects[easyddb_wayfinder][subdir]           = ""
 projects[easyddb_wayfinder][download][type]   = "git"
 projects[easyddb_wayfinder][download][url]    = "git@github.com:easySuite/easyddb_wayfinder.git"
-projects[easyddb_wayfinder][download][tag]    = "7.x-6.2.1"
+projects[easyddb_wayfinder][download][tag]    = "7.x-6.2.2"
 ;projects[easyddb_wayfinder][download][branch] = "development"
 
 projects[easyddb_zerohit_redirect][type]             = "module"
@@ -366,7 +359,7 @@ projects[easyopac_external_videos][type]             = "module"
 projects[easyopac_external_videos][subdir]           = ""
 projects[easyopac_external_videos][download][type]   = "git"
 projects[easyopac_external_videos][download][url]    = "git@github.com:easySuite/easyopac_external_videos.git"
-projects[easyopac_external_videos][download][tag]    = "7.x-6.1.0"
+projects[easyopac_external_videos][download][tag]    = "7.x-6.2.1"
 ;projects[easyopac_external_videos][download][branch] = "development"
 
 projects[easyopac_abstracts_override][type]             = "module"
@@ -380,7 +373,7 @@ projects[easyddb_event_status][type]             = "module"
 projects[easyddb_event_status][subdir]           = ""
 projects[easyddb_event_status][download][type]   = "git"
 projects[easyddb_event_status][download][url]    = "git@github.com:easySuite/easyddb_event_status.git"
-projects[easyddb_event_status][download][tag]    = "7.x-6.1.0"
+projects[easyddb_event_status][download][tag]    = "7.x-6.2.1"
 ;projects[easyddb_event_status][download][branch] = "development"
 
 projects[easyopac_facets][type]             = "module"
@@ -415,7 +408,7 @@ projects[emailkanon][type]             = "module"
 projects[emailkanon][subdir]           = ""
 projects[emailkanon][download][type]   = "git"
 projects[emailkanon][download][url]    = "git@github.com:easySuite/emailkanon.git"
-projects[emailkanon][download][branch] = "master"
+projects[emailkanon][download][tag]    = "7.x-6.2.1"
 ;projects[emailkanon][download][branch] = "development"
 
 projects[kultunaut_events][type]             = "module"
@@ -478,7 +471,7 @@ projects[ting_recommender][type]              = "module"
 projects[ting_recommender][subdir]            = ""
 projects[ting_recommender][download][type]    = "git"
 projects[ting_recommender][download][url]     = "git@github.com:easySuite/ting_recommender.git"
-projects[ting_recommender][download][tag]     = "7.x-6.1.0"
+projects[ting_recommender][download][tag]     = "7.x-6.2.1"
 ;projects[ting_recommender][download][branch]  = "development"
 
 projects[ting_reference_advanced][type]              = "module"
@@ -555,32 +548,3 @@ projects[easyddb_search_expand][download][type]   = "git"
 projects[easyddb_search_expand][download][url]    = "git@github.com:easySuite/easyddb_search_expand.git"
 projects[easyddb_search_expand][download][tag]    = "7.x-4.6.1"
 ;projects[easyddb_search_expand][download][branch] = "development"
-
-; Bibliofil
-projects[bibliofil-subtheme][type]             = "theme"
-projects[bibliofil-subtheme][subdir]           = ""
-projects[bibliofil-subtheme][download][type]   = "git"
-projects[bibliofil-subtheme][download][url]    = "git@github.com:easySuite/bibliofil-subtheme.git"
-projects[bibliofil-subtheme][download][tag]    = "7.x-6.2.1"
-;projects[bibliofil-subtheme][download][branch] = "development"
-
-projects[lms][type]             = "module"
-projects[lms][subdir]           = ""
-projects[lms][download][type]   = "git"
-projects[lms][download][url]    = "git@github.com:easySuite/lms.git"
-projects[lms][download][tag]    = "7.x-6.1.0"
-;projects[lms][download][branch] = "development"
-
-projects[easyopac_nodereferences][type]             = "module"
-projects[easyopac_nodereferences][subdir]           = ""
-projects[easyopac_nodereferences][download][type]   = "git"
-projects[easyopac_nodereferences][download][url]    = "git@github.com:easySuite/easyopac_nodereferences.git"
-projects[easyopac_nodereferences][download][tag]    = "7.x-6.0.2"
-;projects[easyopac_nodereferences][download][branch] = "development"
-
-projects[easyopac_redirect][type]             = "module"
-projects[easyopac_redirect][subdir]           = ""
-projects[easyopac_redirect][download][type]   = "git"
-projects[easyopac_redirect][download][url]    = "git@github.com:easySuite/easyopac_redirect.git"
-projects[easyopac_redirect][download][tag]    = "7.x-6.1.1"
-;projects[easyopac_redirect][download][branch] = "development"

modules/ding_adhl_frontend/templates/ding_adhl_frontend_recommendation_list_entry.tpl.php

@@ -18,7 +18,7 @@
  */
 ?>
 <li class="<?php print $zebra; ?>">
-  <a href="<?php print $link['uri']; ?>" title="<?php print $link['title']; ?>">
+  <a href="<?php print $link['uri']; ?>" title="<?php print $link['title']; ?>" aria-label="<?php print $link['title']; ?>">
     <span class="title"><?php print $item->title; ?></span>
     <?php if ($creators) : ?>
       <span class="creators"><?php print $creators; ?></span>