Bringing in changes from gh-pages branch

uol-library · Feb 21, 2023 · f5ffc87 · f5ffc87
1 parent 7e79494
commit f5ffc87
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/_config.yml b/_config.yml
@@ -25,9 +25,11 @@ dc:
 terms:
   url: ""
   text: ""
+  shorttext: ""
 foi:
   url: ""
   text: ""
+  shorttext: ""
 sass:
   style: compressed
 plugins:

diff --git a/_includes/foot.html b/_includes/foot.html
@@ -4,13 +4,25 @@
             <li><button type="button" class="modal-trigger icon-info-circled button-icon" data-dialoghash="about" data-dialogid="about-page" aria-label="About this site"><span class="button-text">About</span></button></li>
             <li><button type="button" class="modal-trigger icon-universal-access button-icon" data-dialoghash="accessibility" data-dialogid="accessibility-page" aria-label="Accessibility page"><span class="button-text">Accessibility</span></button></li>
             <li><button type="button" class="modal-trigger" data-dialoghash="privacy" data-dialogid="privacy-page" aria-label="Privacy page">Privacy</button></li>
-            {%- if site.terms.url and site.terms.text -%}
-            <li><a target="external" href="{{ site.terms.url }}">{{ site.terms.text }}</span></a></li>
+            {%- if site.terms.url != "" and site.terms.text != "" -%}
+                {%- if site.terms.shorttext != "" -%}
+                    {%- capture termstext -%}<span class="hide-med">{{ site.terms.text }}</span><span class="show-med">{{ site.terms.shorttext }}</span>{%- endcapture -%}
+                {%- else -%}
+                    {%- assign termstext = site.terms.text -%}
+                {%- endif -%}
+            <li><a target="external" href="{{ site.terms.url }}">{{ termstext }}</a></li>
             {%- endif -%}
-            {%- if site.foi.url and site.foi.text -%}
-            <li><a target="external" href="{{ site.foi.url }}">{{ site.foi.text }}</a></li>
+            {%- if site.foi.url != "" and site.foi.text != "" -%}
+                {%- if site.foi.shorttext != "" -%}
+                    {%- capture foitext -%}<span class="hide-med">{{ site.foi.text }}</span><span class="show-med">{{ site.foi.shorttext }}</span>{%- endcapture -%}
+                {%- else -%}
+                    {%- assign foitext = site.foitext -%}
+                {%- endif -%}
+            <li><a target="external" href="{{ site.foi.url }}">{{ foitext }}</a></li>
             {%- endif -%}
-            <li><button type="button" class="modal-trigger" data-dialoghash="about" data-dialogid="about-page" aria-label="Copyright {{ 'now' | date: '%Y' }} University of Leeds">&copy;<span class="hide-med"> {{ "now" | date: "%Y" }}</span><span class="hide-small"> University of Leeds</span></button></li>
+			{%- if site.copyright != "" -%}
+            <li><button type="button" class="modal-trigger" data-dialoghash="about" data-dialogid="about-page" aria-label="Copyright {{ 'now' | date: '%Y' }} {{ site.copyright }}">&copy;<span class="hide-med"> {{ "now" | date: "%Y" }}</span><span class="hide-small"> {{ site.copyright }}</span></button></li>
+			{%- endif -%}
         </ul>
     </nav>
 </footer>

diff --git a/_includes/javascript/config.js b/_includes/javascript/config.js
@@ -39,11 +39,11 @@ const spacefinder = {
     /* space related config */
     spaces: [],
     spacesLoaded: false,
-    spacesurl: '{{ site.url }}/spaces.json',
-    imageBaseURL: '{{ site.url }}',
+    spacesurl: '{{ site.url }}{{ site.baseurl }}/spaces.json',
+    imageBaseURL: '{{ site.url }}{{ site.baseurl }}',
 
     /* filter related config */
     filters: [],
     filtersLoaded: false,
-    filtersurl: '{{ site.url }}/filters.json'
+    filtersurl: '{{ site.url }}{{ site.baseurl }}/filters.json'
 };