diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 290: Convert "guest" menu to direct link, add a sign-in hint, make menus more readable

Message ID 20111129093713.13982.82499.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki Nov. 29, 2011, 9:37 a.m. UTC 
------------------------------------------------------------
revno: 290
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: lava-server
timestamp: Thu 2011-11-10 13:26:47 +0100
message:
  Convert "guest" menu to direct link, add a sign-in hint, make menus more readable
modified:
  lava_server/htdocs/css/default.css
  lava_server/templates/layouts/content.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/htdocs/css/default.css'
--- lava_server/htdocs/css/default.css	2011-11-09 19:19:14 +0000
+++ lava_server/htdocs/css/default.css	2011-11-10 12:26:47 +0000
@@ -148,35 +148,35 @@ 
 
 #lava-panel ul.lava-panel-menu li {
   margin: 0;
+  padding: 0;
+  text-align: center;
+
+  font-size: 9pt;
+  font-weight: normal;
+}
+
+#lava-panel ul.lava-panel-menu li a {
+  display: block;
   padding: 2pt 1ex;
-  text-align: center;
 }
 
 #lava-panel ul.lava-panel-menu li a:hover {
-  color: #fff;
-  text-decoration: underline;
+  background-color: #a1cd41;
+  color: #000;
 }
 
 /* User indicator */
 
-#lava-user-indicator span.username {
-  font-weight: bold;
+#lava-user-indicator {
+  text-align: center;
 }
 
 #lava-user-indicator img {
   vertical-align: top;
 }
 
-#lava-user-indicator a {
-  text-decoration: underline;
-}
-
-#lava-user-indicator .sign-in,
-#lava-user-indicator .sign-out, 
-#lava-user-indicator .admin-site { 
-  font-size: smaller;
-  position: relative;
-  top: -1pt;
+#lava-user-indicator .sign-in-hint {
+  font-size: 8pt;
 }
 
 /* AJAX indicator */

=== modified file 'lava_server/templates/layouts/content.html'
--- lava_server/templates/layouts/content.html	2011-11-09 19:31:19 +0000
+++ lava_server/templates/layouts/content.html	2011-11-10 12:26:47 +0000
@@ -54,32 +54,28 @@ 
     <!-- !ajax indicator -->
 
     <!-- user indicator -->
-    <div class="lava-indicator lava-panel-element has-menu" id="lava-user-indicator">
+    <div class="lava-indicator lava-panel-element {% if user.is_authenticated %}has-menu{% endif %}" id="lava-user-indicator">
       <img 
       src="{{ STATIC_URL }}lava-server/images/avatar-default-symbolic.svg"
       width="18" height="18"/>
       {% if user.is_authenticated %}
-      <a href="{% url lava.me %}" class="username">{{user.get_full_name|default:user.username}}</a>
+      <a href="{% url lava.me %}" class="username">{{user.get_full_name|default:user.username}} &#x25BE;</a>
       {% else %}
       <a href="{% url django.contrib.auth.views.login %}" class="username"
         >{% trans "Guest" %}</a>
+      <br/>
+      <span class="sign-in-hint">Click to sign-in</span>
       {% endif %}
     </div>
+    {% if user.is_authenticated %}
     <ul class="lava-panel-menu">
-      {% if user.is_authenticated %}
-      <li><a class="sign-out"
-        href="{% url django.contrib.auth.views.logout %}"
-        >{% trans "Sign out" %}</a></li>
-      {% else %}
-      <li><a class="sign-in"
-        href="{% url django.contrib.auth.views.login %}"
-        >{% trans "Sign in" %}</a></li>
-      {% endif %}
+      <li><a href="{% url lava.me %}">My profile</a></li>
       {% if user.is_staff %}
-      <li><a class="admin-site" href="{% url admin:index %}"
-        >{% trans "Administration" %}</a></li>
+      <li><a href="{% url admin:index %}">Administration</a></li>
       {% endif %}
+      <li><a href="{% url django.contrib.auth.views.logout %}">Sign out</a></li>
     </ul>
+    {% endif %}
     <!-- !user indicator -->
 
   </div>