Merge pull request #1003 from okfn/develop

[Deployment to PRD] Sitemap, language chooser, smal UI fixes
okfn · Nov 9, 2023 · b9a12be · b9a12be
2 parents 301399a + 538cb8a
commit b9a12be
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git a/foundation/organisation/templates/organisation/member.html b/foundation/organisation/templates/organisation/member.html
@@ -10,7 +10,7 @@
             </div>
             <div class="content">
                 <h2 class="name">{{ person.name }}</h2>
-                <div class="font-mono">
+                <div class="font-mono block-txt">
                     <span class="position">{{ member.title }}</span>
                     {% if person.url %}
                         <a href="{{ person.url }}" class="flex items-center gap-2 mb-3">
@@ -25,9 +25,9 @@ <h2 class="name">{{ person.name }}</h2>
                         </a>
                     {% endif %}
                     {% if person.twitter %}
-                        <a href="https://twitter.com/{{ person.twitter }}" class="flex items-center gap-2"> 
+                        <a href="https://twitter.com/{{ person.twitter }}" class="flex items-center gap-2">
                             <img src="{% static '/images/icons/twitter.svg' %}">
-                            {{ person.twitter }} 
+                            @{{ person.twitter }}
                         </a>
                     {% endif %}
                 </div>

diff --git a/static/css/styles.css b/static/css/styles.css
diff --git a/templates/general.html b/templates/general.html
@@ -52,17 +52,7 @@
                         </div>
                       </form>
                     </li>
-                    <!-- <li class="main-nav__item -language" data-current-language="English">
-                      <label class="icon">
-                        <span></span>
-                      </label>
-                      <ul class="submenu -simple">
-                        <li><a href="">English</a></li>
-                        <li><a href="">Español</a></li>
-                        <li><a href="">Português (Brasil)</a></li>
-                        <li><a href="">Français</a></li>
-                      </ul>
-                    </li> -->
+                    {% language_chooser %}
                   </ul>
                 </li>
               </ul>

diff --git a/templates/menu/language_chooser.html b/templates/menu/language_chooser.html
@@ -0,0 +1,16 @@
+{% load i18n menu_tags static %}
+
+{% if languages|length > 1 %}
+<li class="main-nav__item -has-submenu has-children">
+  <label>
+    <img src="{% static '/img/icons/header-globe.svg' %}" class="max-w-none" alt="Language">
+  </label>
+  <ul class="submenu">
+    <li>
+      <a href="{% page_language_url 'en' %}">English</a>
+    </li>
+    <li>
+      <a href="{% page_language_url 'es' %}">Español</a>
+    </li>
+  </ul>
+{% endif %}
diff --git a/templates/menu/menu_sitemap.html b/templates/menu/menu_sitemap.html
@@ -1,12 +1,12 @@
 {% load menu_tags %}
 {% for child in children %}
 <li>
-  <a
+  <a class="font-bold"
     href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
     {{ child.get_menu_title }}
   </a>
   {% if child.children %}
-  <ul>
+  <ul class="submenu">
     {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
   </ul>
   {% endif %}

diff --git a/templates/sitemap.html b/templates/sitemap.html
@@ -7,8 +7,8 @@
 {% endblock %}
 
 {% block body %}
-<div class='row'>
-  <div class='main col-md-12'>
+<div class='row site-map sect -tighten-3'>
+  <div class=''>
     <ul>
       {% show_menu 0 100 100 100 "menu/menu_sitemap.html" %}
     </ul>

diff --git a/templates/styles/components/_site-map.css b/templates/styles/components/_site-map.css
@@ -0,0 +1,5 @@
+.site-map { 
+    .submenu {
+        @apply ml-5;
+    }
+}
diff --git a/templates/styles/main.css b/templates/styles/main.css
@@ -43,6 +43,7 @@
 @import './components/_card-person.css';
 @import './components/_list.css';
 @import './components/_page-closing.css';
+@import './components/_site-map.css';
 @import './components/_search.css';