reorder program section elements (grid first)

diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html
index 05c331cbc0a6a6d7d57d7bb6694cee36d3a2970d..4711632a8ffe10dcc76687195b84af05d7e825a5 100644 (file)
--- a/panikweb_templates/templates/emissions/nav.html
+++ b/panikweb_templates/templates/emissions/nav.html
@@ -2,17 +2,17 @@
 <div class="wrapper">
        <nav>
                <ul class="inline padded">
-                       <li><a href="{% url 'emissions' %}" class="{% if class != "program" and class != "grid" and class != "archives" %}active{% endif %}">
-                               <span class="icon-microphone" ></span>
-                               <span class="iconLabel">Émissions</span>
+                       <li><a href="{% url 'grid' %}" class="{% if class = "grid" %}active{% endif %}">
+                               <span class="icon-th-large" ></span>
+                               <span class="iconLabel">La grille</span>
                        </a></li>
                        <li><a href="{% url 'program' %}" class="{% if class = "program" %}active{% endif %}">
                                <span class="icon-calendar" ></span>
-                               <span class="iconLabel">Cette semaine</span>
+                               <span class="iconLabel">Par semaine</span>
                        </a></li>
-                       <li><a href="{% url 'grid' %}" class="{% if class = "grid" %}active{% endif %}">
-                               <span class="icon-th-large" ></span>
-                               <span class="iconLabel">La grille</span>
+                       <li><a href="{% url 'emissions' %}" class="{% if class != "program" and class != "grid" and class != "archives" %}active{% endif %}">
+                               <span class="icon-microphone" ></span>
+                               <span class="iconLabel">Émissions</span>
                        </a></li>
                        <li><a href="{% url 'emissionsArchives' %}" class="{% if class = "archives" %}active{% endif %}">
                                <span class="icon-archive" ></span>

diff --git a/panikweb_templates/templates/includes/metaNav.html b/panikweb_templates/templates/includes/metaNav.html
index 24e1eff73adfcf617bbbc6b2d8a224ddef270d0e..8c8d2edc99abdaa4521bd92f627e42269309e17e 100644 (file)
--- a/panikweb_templates/templates/includes/metaNav.html
+++ b/panikweb_templates/templates/includes/metaNav.html
@@ -14,7 +14,7 @@
                                <span class="icon-headphones" ></span>
                                <span class="iconLabel">{% trans 'Listen' %}</span>
                        </a></li>
-                       <li class="{% if sectionName = "Emissions" %}active{% endif %}"><a title="Les émissions, le programme de la semaine, la grille" href="{% url 'emissions' %}">
+                       <li class="{% if sectionName = "Emissions" %}active{% endif %}"><a title="Les émissions, le programme de la semaine, la grille" href="{% url 'grid' %}">
                                <span class="icon-calendar" ></span>
                                <span class="iconLabel">{% trans 'Program' %}</span>
                        </a></li>