# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1196535276 -3600
# Node ID e2e73930b7527cdd116518923ad841f7562be9be
# Parent  5ca0048811789e7c49d166edbdbd6befdb302a83
Made the editing controls visible, with a special username display and reduced
controls for unauthenticated users.
Tidied up the pagetrail and credits.

diff -r 5ca004881178 -r e2e73930b752 themes/ep2008/css/screen.css
--- a/themes/ep2008/css/screen.css	Sat Dec 01 01:03:05 2007 +0100
+++ b/themes/ep2008/css/screen.css	Sat Dec 01 19:54:36 2007 +0100
@@ -135,17 +135,12 @@
 }
 
 #pagetrail {
-    clear: right;
-    display: inline;
+    clear: both;
     margin: 5px 12px;
     padding: 0;
     font-size: 0.88em;
 }
 
-*[dir="rtl"] #pagetrail {
-    clear: left;
-}
-
 #interwiki {
     margin: 5px 12px;
     display: inline;
@@ -230,8 +225,6 @@
     color: white;
 }
 
-#navibar a, #navibar a:visited {color: white;}
-
 #navibar li {
     float: left;
     display: inline;
@@ -249,8 +242,8 @@
 }
 
 #navibar a, #navibar a:visited {
-    /* color: black; */
-    text-decoration: none;    
+    text-decoration: none;
+    color: white;
 }
 
 #navibar li.current a {
@@ -282,6 +275,7 @@
 #contribute {
     position: relative;
     float: right;
+    white-space: nowrap;
 }
 
 .contribute-hidden {
@@ -299,14 +293,50 @@
     display: block;
 }
 
-.editbar {
-    clear: both;
-    display: block;
+.username {
+    background-color: #b21212;
+}
+
+.no-username {
+    background-color: #073683;
+}
+
+.username, .no-username {
+    color: white;
+    padding: 2px 0.5em;
+    white-space: nowrap;
+}
+
+#contribute .username, #contribute .no-username {
+    display: inline;
     margin: 0;
-    padding: 0 8px;
+    font-size: 0.88em;
+}
+
+.username a, .username a:visited, .username a:link, .no-username a, .no-username a:visited, .no-username a:link {
+    text-decoration: none;
+    color: white;
+}
+
+.editbar {
+    display: inline;
+    margin: 0;
+    padding: 0;
+    background-color: #aaa7c0; /* #b21212; */
+    font-size: 0.88em;
+}
+
+ul.editbar {
+    list-style-type: none;
+}
+
+.editbar li {
+    display: inline;
+    background-color: #aaa7c0; /* #b21212; */
+    color: black;
+    padding: 2px 0.5em;
+    margin: 0;
     white-space: nowrap;
-    background: white;
-    font-size: 0.8em;
 }
 
 .editbar form, .editbar form div {
@@ -314,14 +344,8 @@
     margin: 0;
 }
 
-.editbar li {
-    display: inline;
-    padding: 0;
-    margin: 4px 6px;
-}
-
-*[dir="rtl"] .editbar li {
-    float: right;
+.editbar form label, .editbar form select {
+    font-size: 0.77em;
 }
 
 #header .editbar {
@@ -333,7 +357,15 @@
     border-bottom: 1px solid #9C9C9C;
 }
 
-.editbar a, .editbar a:visited { color: #0044B3; }
+.editbar a, .editbar a:visited, .editbar a:link {
+    text-decoration: none;
+    color: black;
+}
+
+.editbar li:hover {
+    background-color: #8886a0; /* #e54545; */
+    color: black;
+}
 
 #message {
     clear: both;
@@ -450,6 +482,7 @@
 #contact {
     padding: 2px;
     margin-top: 10px;
+    margin-bottom: 10px;
     text-align: right;
     background-color: #2b64a8;
     color: white;
@@ -457,14 +490,17 @@
 
 #contact a, #contact a:visited {color: white;}
 
-#credits, #version, #timings{
-    margin: 5px 10px;
+#credits, #version, #timings {
+    clear: both;
+    margin: 10px 10px;
     padding: 0;
     text-align: center;
     font-size: 0.88em;
     color: #6C7680;
 }
 
+#credits a, #credits a:visited {color: black;}
+
 #credits li, #timings li {
     display: inline;
     padding: 0 2px;
diff -r 5ca004881178 -r e2e73930b752 themes/ep2008/ep2008.py
--- a/themes/ep2008/ep2008.py	Sat Dec 01 01:03:05 2007 +0100
+++ b/themes/ep2008/ep2008.py	Sat Dec 01 19:54:36 2007 +0100
@@ -97,17 +97,18 @@
             # Footer
             u'<div id="footer">',
             self.cfg.contact_string,
+            u'<div id="contribute">',
+            #self.cfg.contribute_string,
+            #u'<div class="contribute-hidden">',
+            #self.username(d),
+            #u'<div id="locationline">',
+            #self.interwiki(d),
+            #self.title(d),
+            #u'</div>',
+            self.specialUsername(d),
+            self.editbar(d),
             self.trail(d),
-            u'<div id="contribute">',
-            self.cfg.contribute_string,
-            u'<div class="contribute-hidden">',
-            self.username(d),
-            u'<div id="locationline">',
-            self.interwiki(d),
-            self.title(d),
-            u'</div>',
-            self.editbar(d),
-            u'</div>',
+            #u'</div>',
             u'</div>',
             self.credits(d),
             self.showversion(d, **keywords),
@@ -118,6 +119,40 @@
             ]
         return u'\n'.join(html)
 
+    def editbarItems(self, page):
+        """ Return list of items to show on the editbar
+
+        This is separate method to make it easy to customize the
+        editbar in sub classes.
+        """
+
+        request = self.request
+
+        items = [self.editorLink(page),
+                self.infoLink(page),
+                self.subscribeLink(page),
+                self.quicklinkLink(page),]
+
+        if page.isWritable() and request.user.valid and request.user.may.write(page.page_name):
+            items.append(self.attachmentsLink(page))
+
+        if request.user.valid:
+            items.append(self.actionsMenu(page))
+
+        return items
+
+    def specialUsername(self, d):
+        request = self.request
+        _ = request.getText
+
+        if request.user.valid and request.user.name:
+            return u'<div class="username">%s</div>' % request.formatter.text(request.user.name)
+        else:
+            # NOTE: Using the contribute string!
+            return u'<div class="no-username">%s</div>' % \
+                d['page'].link_to(request, text=self.cfg.contribute_string,
+                                  querystr={'action': 'login'}, id="login")
+
 def execute(request):
     """
     Generate and return a theme object