diff mbox

[Branch,~linaro-validation/lava-dashboard/trunk] Rev 250: Merge slight theme variation that removes the double navigation bar

Message ID 20110726094420.2941.91876.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki July 26, 2011, 9:44 a.m. UTC 
Merge authors:
  Zygmunt Krynicki (zkrynicki)
Related merge proposals:
  https://code.launchpad.net/~zkrynicki/lava-dashboard/theme/+merge/69181
  proposed by: Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 250 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Tue 2011-07-26 11:41:42 +0200
message:
  Merge slight theme variation that removes the double navigation bar
modified:
  dashboard_app/templates/dashboard_app/_content.html
  dashboard_app/templates/dashboard_app/_content_with_sidebar.html
  dashboard_app/templates/dashboard_app/_extension_navigation.html


--
lp:lava-dashboard
https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk

You are subscribed to branch lp:lava-dashboard.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'dashboard_app/templates/dashboard_app/_content.html'
--- dashboard_app/templates/dashboard_app/_content.html	2011-07-12 02:34:12 +0000
+++ dashboard_app/templates/dashboard_app/_content.html	2011-07-25 23:19:44 +0000
@@ -17,6 +17,6 @@ 
 {% endblock %}
 
 
-{% block extension_navigation %}
+{% block navigation %}
 {% include "dashboard_app/_extension_navigation.html" %}
 {% endblock %}

=== modified file 'dashboard_app/templates/dashboard_app/_content_with_sidebar.html'
--- dashboard_app/templates/dashboard_app/_content_with_sidebar.html	2011-07-12 02:34:12 +0000
+++ dashboard_app/templates/dashboard_app/_content_with_sidebar.html	2011-07-25 23:19:44 +0000
@@ -17,6 +17,6 @@ 
 {% endblock %}
 
 
-{% block extension_navigation %}
+{% block navigation %}
 {% include "dashboard_app/_extension_navigation.html" %}
 {% endblock %}

=== modified file 'dashboard_app/templates/dashboard_app/_extension_navigation.html'
--- dashboard_app/templates/dashboard_app/_extension_navigation.html	2011-07-22 00:57:44 +0000
+++ dashboard_app/templates/dashboard_app/_extension_navigation.html	2011-07-25 23:19:44 +0000
@@ -1,6 +1,8 @@ 
 {% load i18n %}
-<div id="lava-server-extension-navigation" class="lava-server-sub-toolbar">
+<div id="lava-server-extension-navigation">
   <ul>
+    <li><a class="lava-back" href="{% url lava.home %}"
+      >{% trans "Back to LAVA" %}</a></li>
     <li><a href="{% url dashboard_app.views.image_status_list %}"
       >{% trans "Image Status" %}</a></li>
     <li><a href="{% url dashboard_app.views.bundle_stream_list %}"