diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 199: Tweak <title/> tag content

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

Commit Message

Zygmunt Krynicki July 12, 2011, 2:40 a.m. UTC 
------------------------------------------------------------
revno: 199
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Sat 2011-07-09 16:25:11 +0200
message:
  Tweak <title/> tag content
modified:
  lava_server/templates/layouts/base.html
  lava_server/templates/layouts/content.html
  lava_server/templates/registration/base.html


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

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

Patch

=== modified file 'lava_server/templates/layouts/base.html'
--- lava_server/templates/layouts/base.html	2011-07-08 02:56:22 +0000
+++ lava_server/templates/layouts/base.html	2011-07-09 14:25:11 +0000
@@ -3,21 +3,18 @@ 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>{% block title %}{% endblock %}</title>
+    <title>{% block title %}LAVA{% endblock %}</title>
     {% block scripts_and_styles %}
     <script type="text/javascript" src="{{ STATIC_URL }}lava/js/jquery-1.5.1.min.js"></script> 
     <script type="text/javascript" src="{{ STATIC_URL }}lava/js/jquery-ui-1.8.12.custom.min.js"></script> 
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lava/css/Aristo/jquery-ui-1.8.7.custom.css"/>
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}lava/css/default.css"/>
     {% endblock %}
-    <!--
-    <link href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'/>
-    -->
     {% block extrahead %}{% endblock %}
   </head>
   <body>
     {% block ajax_notification %}
-    <div id="ajax_notification">
+    <div id="ajax_notification" style="display:hidden">
       <img src="{{ STATIC_URL }}lava/images/ajax-progress.gif"/>
       {% trans "AJAX request is in progress..." %}
     </div>

=== modified file 'lava_server/templates/layouts/content.html'
--- lava_server/templates/layouts/content.html	2011-07-08 02:56:22 +0000
+++ lava_server/templates/layouts/content.html	2011-07-09 14:25:11 +0000
@@ -2,11 +2,6 @@ 
 {% load i18n %}
 
 
-{% block title %}
-{% trans "LAVA" %}
-{% endblock %}
-
-
 {% block body %}
 <table id="master_container">
   <tr>

=== modified file 'lava_server/templates/registration/base.html'
--- lava_server/templates/registration/base.html	2011-07-08 02:56:22 +0000
+++ lava_server/templates/registration/base.html	2011-07-09 14:25:11 +0000
@@ -2,7 +2,7 @@ 
 {% load i18n %}
 
 
-{% block title %}{% trans "Account management" %}{% endblock %}
+{% block title %}{{ block.super }} | {% trans "Account management" %}{% endblock %}
 
 
 {% block scripts_and_styles %}