From 6bcf3e51cba6bc4211e6e64bc6e0ec03e90eed8a Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Tue, 24 Feb 2015 01:16:24 +0100
Subject: Work on top menu bar style

---
 templates/chimere/base.html           |  1 +
 templates/chimere/blocks/actions.html | 39 +++++++++--------------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

(limited to 'templates')

diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index 2468571..9089251 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -8,6 +8,7 @@
 {% if MOBILE %}
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css" />
 <script src="{{ STATIC_URL }}chimere/js/mobile.chimere.js" type="text/javascript"></script>{%endif%}
+<link rel="stylesheet" href="{{ STATIC_URL }}font-awesome/css/font-awesome.min.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/form-compat.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/extra-styles.css" />
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index 04fee47..4c4865f 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -6,13 +6,16 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">{{PROJECT_NAME}}</a>
+      <a class="navbar-brand" href="#"><span class='fa fa-globe'></span></a>
     </div>
     <div class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
     {% for action, subactions in actions %}
         <li{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>
-          <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>{{ action.label }}</a>
+          <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>
+            <span class='fa fa-chimere-action fa-chimere-{{action.id}}'></span>
+            <span class='lbl'>{{ action.label }}</span>
+          </a>
         </li>
     {% endfor %}
       </ul>
@@ -20,16 +23,16 @@
       <ul class="nav nav-pills">
         {% if is_map %}
         {% if areas_visible %}
-        <li>{% display_areas %}</li>
-        <li id='permalink'></li>
+        <li><span class='fa fa-chimere-action fa-chimere-maps'></span>{% display_areas %}</li>
+        <li id='permalink-lnk'><span class='fa fa-chimere-action fa-bookmark'></span><span id='permalink'></span></li>
         <li>{% routing %}</li>
         <li>{% display_welcome %}</li>
         <li>{% display_news news_visible %}</li>
-        <li><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'>{% trans "Simple map" %}</a></li>
+        <li id="simple_button-lnk"><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'><span class='fa fa-chimere-action fa-simplybuilt'></span> {% trans "Simple map" %}</a></li>
         {% endif %}
-        <li{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'>{% trans "Categories "%}</a></li>
+        <li id='categories-lnk'{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action fa-check-circle-o'></span> {% trans "Categories "%}</a></li>
         {% if has_search %}
-        <li class='active'><a href='#search-box' data-toggle='panel'>{% trans "Search" %}</a></li>
+        <li id='search-lnk' class='active'><a href='#search-box' data-toggle='panel'><span class="glyphicon glyphicon-search"></span> {% trans "Search" %}</a></li>
         {% endif %}
         {% endif %}
     {% for action, subactions in actions %}
@@ -48,25 +51,3 @@
 </div>
 
 
-<!--
-<div id="topbar">
-    <ul id='action' class='action'>
-        {% for action, subactions in actions %}
-        <li class='ui-widget ui-button ui-state-default ui-corner-all {% ifequal action.id action_selected.0 %} ui-state-active{% endifequal %}'>
-            <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>{{ action.label }}</a>
-        </li>
-        {% endfor %}
-    </ul>
-    <ul id='action-2' class='action'>
-    {% for action, subactions in actions %}
-        {% ifequal action.id action_selected.0 %}{% if subactions %}
-        {% for subaction in subactions %}
-            <li class='ui-widget ui-button ui-state-default ui-corner-all{% ifequal subaction.id action_selected.1 %} ui-state-active{% endifequal %}'>
-                <a href='{{ subaction.url }}' onclick='saveExtent();'>{{ subaction.label }}</a>
-            </li>
-        {% endfor %}
-        {% endif %}{% endifequal %}
-    {% endfor %}
-    </ul>
-</div>
-!-->
-- 
cgit v1.2.3