Make the hader according to IAEA's style guide

keitaroinc · Feb 29, 2024 · aea607f · aea607f
1 parent 2134c2e
commit aea607f
Showing 1 changed file with 41 additions and 48 deletions.
diff --git a/ckanext/iaea/templates/header.html b/ckanext/iaea/templates/header.html
@@ -110,47 +110,19 @@
   {% endif %} {% endblock %}
 
   <div class="container">
-    <div class="navbar-right">
-      <button
-        data-target="#main-navigation-toggle"
-        data-toggle="collapse"
-        class="navbar-toggle collapsed"
-        type="button"
-        aria-label="expand or collapse"
-        aria-expanded="false"
-      >
-        <span class="sr-only">{{ _('Toggle navigation') }}</span>
-        <span class="fa fa-bars"></span>
-      </button>
-    </div>
-    <hgroup class="{{ g.header_class }} navbar-left">
-      {% block header_logo %} {% if g.site_logo %}
-      <a class="logo" href="{{ h.url_for('home.index') }}"
-        ><img
-          src="{{ h.url_for_static_or_external(g.site_logo) }}"
-          alt="{{ g.site_title }}"
-          title="{{ g.site_title }}"
-      /></a>
-      {% else %}
-      <h1>
-        <a href="{{ h.url_for('home.index') }}">{{ g.site_title }}</a>
-      </h1>
-      {% if g.site_description %}
-      <h2>{{ g.site_description }}</h2>
-      {% endif %} {% endif %} {% endblock %}
-    </hgroup>
-
-    <div class="collapse navbar-collapse" id="main-navigation-toggle">
-      {% block header_site_navigation %}
-      <nav class="section navigation">
-        <ul class="nav nav-pills">
-          {% block header_site_navigation_tabs %} {{ h.build_nav_main(
-          ('dataset.search', _('Datasets')), ('organization.index',
-          _('Organizations')), ('group.index', _('Groups')), ('home.about',
-          _('About')) ) }} {% endblock %}
-        </ul>
-      </nav>
-      {% endblock %} {% block header_site_search %}
+    <div class="main">
+      <hgroup class="{{ g.header_class }} navbar-left">
+        {% block header_logo %} {% if g.site_logo %}
+        <a class="logo" href="{{ h.url_for('home.index') }}"
+          ><img
+            src="{{ h.url_for_static_or_external(g.site_logo) }}"
+            alt="{{ g.site_title }}"
+            title="{{ g.site_title }}"
+          />
+        </a>
+        {% endif %} {% endblock %}
+      </hgroup>
+      {% block header_site_search %}
       <form
         class="section site-search simple-input"
         action="{% url_for 'dataset.search' %}"
@@ -167,19 +139,40 @@ <h2>{{ g.site_description }}</h2>
             class="form-control"
             name="q"
             placeholder="{{ _('Search') }}"
-            aria-label="{{ _('Search datasets') }}"
           />
+          <button type="submit"><i class="fa fa-search"></i></button>
+        </div>
+      </form>
+      {% endblock %}
+    </div>
+  </div>
+
+  {% block header_man_nave%}
+  <div class="navbar navbar-default">
+    <div class="container">
+      <div class="collapse navbar-collapse" id="main-navigation-toggle">
+        {% block header_site_navigation %}
+        <nav class="section navigation">
+          <ul class="nav nav-pills">
+            {% block header_site_navigation_tabs %} {{ h.build_nav_main(
+            ('dataset.search', _('Datasets')), ('organization.index',
+            _('Topics'))) }} {% endblock %}
+          </ul>
+        </nav>
+        <div class="navbar-right">
           <button
-            class="btn-search"
-            type="submit"
-            aria-label="{{ _('Submit') }}"
+            data-target="#main-navigation-toggle"
+            data-toggle="collapse"
+            class="navbar-toggle collapsed"
+            type="button"
           >
-            <i class="fa fa-search"></i>
+            <span class="fa fa-bars"></span>
           </button>
         </div>
-      </form>
-      {% endblock %}
+        {% endblock %}
+      </div>
     </div>
   </div>
+  {% endblock %}
 </header>
 {% endblock %}