Merge pull request #56 from SmdhMdep/Dataset-Item-test

UI fixes
SmdhMdep · Apr 24, 2024 · d474c17 · d474c17
2 parents 201ce6d + c38bf45
commit d474c17
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 14 deletions.
diff --git a/ckanext/smdh/assets/css/smdh.css b/ckanext/smdh/assets/css/smdh.css
@@ -117,6 +117,7 @@ button.navbar-toggle {
 .masthead {
   background: #ffffff;
   box-shadow: 0px 4px 3px 1px rgb(11 10 10 / 27%);
+  padding: 0px;
 }
 
 .masthead .navigation .nav-pills li a {

diff --git a/ckanext/smdh/templates/header.html b/ckanext/smdh/templates/header.html
@@ -3,42 +3,58 @@
 {% block header_site_navigation_tabs %}
 <li><a href="https://smdh.uk/datahub">DataHub</a></li>
 {{ h.build_nav_main(
-	('dataset.search', _('Datasets')),
-	('organization.index', _('Organizations')),
-	('home.about', _('About')) ) 
+		('dataset.search', _('Datasets')),
+		('organization.index', _('Organizations')),
+	)
+}}
+
+<li><a href="/organization/smdh">Guides</a></li>
+
+{{
+	h.build_nav_main(
+		('home.about', _('About')),
+	) 
 }}
 {% endblock %}
 
 {% block header_account_logged %} 
 {% if c.userobj.sysadmin %}
-  <li>
+  <li style="margin: 0px;">
     <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
-      <i class="fa fa-gavel" aria-hidden="true"></i>
+      <i class="fa fa-gavel fa-lg" aria-hidden="true"></i>
       <span class="text">{{ _('Admin') }}</span>
     </a>
   </li>
   {% endif %}
-  <li>
+  <li style="margin: 0px;">
     <a href="{{ h.url_for('user.read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
             {{ h.user_image((c.user if c and c.user else ''), size=22) }}
             <span class="username">{{ c.userobj.display_name }}</span>
           </a>
   </li>
+
+  <li style="margin: 0px;">
+    <a href="{{ h.url_for('dashboard.organizations') }}" title="{{ _('Profile settings') }}">
+      <i class="fa fa-home fa-lg" aria-hidden="true"></i>
+      <span class="text">{{ _('Profile settings') }}</span>
+    </a>
+  </li>
+
   {% set new_activities = h.new_activities() %}
-  <li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
+  <li style="margin: 0px;" class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
     {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities)
     %}
     <a href="{{ h.url_for('dashboard.index') }}" title="{{ notifications_tooltip }}">
       <div style="position: relative;">
 
-  <i class="fa fa-bell" aria-hidden="true"></i>
+  <i class="fa fa-bell fa-lg" aria-hidden="true"></i>
   <span class="text">{{ _('Dashboard') }}</span>
 
   {% if new_activities != 0 %}
     <span style="
       position: absolute;
-      top: 5px;
-      right: -1px;
+      top: 6px;
+      right: 1px;
       width: 7px;
       height: 7px;
       background: red;
@@ -54,16 +70,16 @@
     </a>
   </li>
   {% block header_account_settings_link %}
-  <li>
+  <li style="margin: 0px;">
     <a href="{{ h.url_for('user.edit', id=c.userobj.name) }}" title="{{ _('Profile settings') }}">
-      <i class="fa fa-cog" aria-hidden="true"></i>
+      <i class="fa fa-cog fa-lg" aria-hidden="true"></i>
       <span class="text">{{ _('Profile settings') }}</span>
     </a>
   </li>
   {% endblock %} {% block header_account_log_out_link %}
-  <li>
+  <li style="margin: 0px;">
     <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
-      <i class="fa fa-sign-out" aria-hidden="true"></i>
+      <i class="fa fa-sign-out fa-lg" aria-hidden="true"></i>
       <span class="text">{{ _('Log out') }}</span>
     </a>
   </li>

diff --git a/ckanext/smdh/templates/snippets/home_breadcrumb_item.html b/ckanext/smdh/templates/snippets/home_breadcrumb_item.html
@@ -0,0 +1,2 @@
+{# Used to insert the home icon into a breadcrumb #}
+<li class="home"><a href="{{ h.url_for('home.index') }}" aria-label="{{ _('Home') }}"><p style="font-weight: bold;"> {{ _('Home') }}</p><span> {{ _('Home') }}</span></a></li>