From e92126d98ffd0d0837089c4331d287fef5485192 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Sun, 6 Oct 2013 10:51:34 -0700
Subject: UI cleanup, second round.

---
 lurker/imgs/chrono.png | Bin 1183 -> 828 bytes
 lurker/imgs/thread.png | Bin 0 -> 2579 bytes
 lurker/ui/common.xsl   |  42 ++++++++++++++++++++++++++++++++++----
 lurker/ui/default.css  |  54 +++++++++++++++++++++++++------------------------
 lurker/ui/en.xml       |   3 ++-
 lurker/ui/lang.xsl     |   1 +
 lurker/ui/mindex.xsl   |  12 -----------
 lurker/ui/thread.xsl   |   4 +---
 8 files changed, 70 insertions(+), 46 deletions(-)
 create mode 100644 lurker/imgs/thread.png

diff --git a/lurker/imgs/chrono.png b/lurker/imgs/chrono.png
index 465a2bc..e4a578e 100644
Binary files a/lurker/imgs/chrono.png and b/lurker/imgs/chrono.png differ
diff --git a/lurker/imgs/thread.png b/lurker/imgs/thread.png
new file mode 100644
index 0000000..31f2dc7
Binary files /dev/null and b/lurker/imgs/thread.png differ
diff --git a/lurker/ui/common.xsl b/lurker/ui/common.xsl
index 24c2690..b0421e2 100644
--- a/lurker/ui/common.xsl
+++ b/lurker/ui/common.xsl
@@ -246,7 +246,7 @@ timezone(<xsl:value-of select="timestamp"/>);//</xsl:comment></script>
  </select>
  <select name="year">
   <xsl:call-template name="option-range">
-   <xsl:with-param name="start">1990</xsl:with-param>
+   <xsl:with-param name="start">2012</xsl:with-param>
    <xsl:with-param name="last"><xsl:value-of select="/*/server/eoa-year"/></xsl:with-param>
    <xsl:with-param name="select" select="substring($date,1,4)"/>
   </xsl:call-template>
@@ -269,7 +269,10 @@ timezone(<xsl:value-of select="timestamp"/>);//</xsl:comment></script>
     <xsl:text> (</xsl:text>
     <xsl:value-of select="$version"/>
     <xsl:value-of select="server/version"/>
-    <xsl:text>)</xsl:text>
+    <xsl:text>, substantialy hacked by Kaz). </xsl:text>
+    <xsl:text>Icon artwork from </xsl:text>
+    <a href="http://www.visualpharm.com/">VisualPharm</a>
+    <xsl:text>.</xsl:text>
    </td>
   </tr>
  </table>
@@ -394,6 +397,16 @@ timezone(<xsl:value-of select="timestamp"/>);//</xsl:comment></script>
  </xsl:if>
 </xsl:template>
 
+<xsl:template name="jump-to-near-from-thread" match="thread">
+ <xsl:if test="list/id">
+  <xsl:text>&#160;</xsl:text>
+  <a class="root" href="../mindex/{list/id}@{row[position()=1]/summary/id}.{$ext}">
+
+   <img src="../imgs/near.png" alt="new" title="{$near-message}"/>
+  </a>
+ </xsl:if>
+</xsl:template>
+
 <xsl:template name="post-new" match="mbox">
  <xsl:if test="list/email/@address">
   <xsl:text>&#160;</xsl:text>
@@ -403,7 +416,7 @@ timezone(<xsl:value-of select="timestamp"/>);//</xsl:comment></script>
  </xsl:if>
 </xsl:template>
 
-<xsl:template name="post-new-from-message" match="message">
+<xsl:template name="post-new-from-msg" match="message">
  <xsl:if test="mbox/list/email/@address">
   <xsl:text>&#160;</xsl:text>
   <a class="root" href="mailto:{mbox/list/email/@address}">
@@ -419,6 +432,24 @@ timezone(<xsl:value-of select="timestamp"/>);//</xsl:comment></script>
  </xsl:if>
 </xsl:template>
 
+<xsl:template name="jump-to-overview-from-thread" match="thread">
+ <xsl:if test="list/id">
+  <xsl:text>&#160;</xsl:text>
+  <a class="root" href="../list/{list/id}.{$ext}">
+   <img src="../imgs/thread.png" alt="list" title="{$list-overview}"/>
+  </a>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template name="jump-to-overview-from-msg" match="message">
+ <xsl:if test="mbox/list/id">
+  <xsl:text>&#160;</xsl:text>
+  <a class="root" href="../list/{mbox/list/id}.{$ext}">
+   <img src="../imgs/thread.png" alt="list" title="{$list-overview}"/>
+  </a>
+ </xsl:if>
+</xsl:template>
+
 <xsl:template name="link-to-list" match="mbox">
  <xsl:if test="list/link">
   <xsl:text>&#160;</xsl:text>
@@ -464,8 +495,11 @@ timezone(<xsl:value-of select="timestamp"/>);//</xsl:comment></script>
     <xsl:call-template name="jump-to-new"/>
     <xsl:call-template name="jump-to-new-from-msg"/>
     <xsl:call-template name="jump-to-near"/>
+    <xsl:call-template name="jump-to-near-from-thread"/>
+    <xsl:call-template name="jump-to-overview-from-msg"/>
+    <xsl:call-template name="jump-to-overview-from-thread"/>
     <xsl:call-template name="post-new"/>
-    <xsl:call-template name="post-new-from-message"/>
+    <xsl:call-template name="post-new-from-msg"/>
     <xsl:call-template name="reply-to-message"/>
     <xsl:call-template name="link-to-list"/>
     <xsl:call-template name="link-to-top"/>
diff --git a/lurker/ui/default.css b/lurker/ui/default.css
index ae4197b..0f54507 100644
--- a/lurker/ui/default.css
+++ b/lurker/ui/default.css
@@ -1,9 +1,13 @@
 body {
   padding: 0px;
   margin: 0px;
-  background-color: #BBF;
+  background-color: #9BF;
   color: black;
-  font-family: serif;
+}
+
+html * {
+  font-family: verdana;
+  font-size: 10pt;
 }
 
 form {
@@ -11,27 +15,26 @@ form {
 }
 
 div.header {
-  background-color: #BBF;
+  background-color: #9BF;
   padding: 4px 0.25em 0.25em 0.25em;
   border-bottom: 1px solid #434399;
 }
 
 div.footer {
-  background-color: #BBF;
+  background-color: #9BF;
   padding: 0.25em 0.25em 1px 0.25em;
   border-top: 1px solid #434399;
 }
 
 h1 {
-  font-family: sans-serif;
-  font-size: 120%;
+  font-size: 150%;
   font-weight: bold;
   margin-bottom: 0.25em;
   margin-top: 0.25em;
 }
 
 h2 {
-  font-size: 120%;
+  font-size: 150%;
   font-weight: normal;
   margin-bottom: 0.25em;
   margin-top: 0em;
@@ -59,8 +62,10 @@ div.mini {
 
 a:link    { color:#11F }
 a:visited { color:#00B }
-a:hover   { color:#F00 }
-a:active  { color:#A00 }
+a:hover   { color:#44F }
+a:active  { color:#22F }
+tr.rowover a:hover   { color:#CCF }
+tr.rowover a:active  { color:#BBF }
 h1 a:visited { color:#11F }
 
 dt a { font-weight: normal }
@@ -76,17 +81,17 @@ img { border: 0; margin: 0; padding: 0; }
 
 h2 img { vertical-align:middle; padding-top:1px }
 table.navigation td img { vertical-align:middle }
-.selected { background-color:#AAF }  /* Mark the thread segment as selected */
+.selected { background-color:#8AF }  /* Mark the thread segment as selected */
 .normal   { }                        /* Mark the thread segment as normal */
 
 /* image links at the top */
 a.root img { background-color: transparent }
 
 /* The following are used to induce highlighting effects on thread message icons */
-a img.selected { background-color:#77F }
+a img.selected { background-color:#57F }
 a:visited img { background-color:#BBB }
-a:visited img.selected { background-color:#77F }
-a img:hover { background-color:#55F }
+a:visited img.selected { background-color:#57F }
+a img:hover { background-color:#57F }
 
 table {
   border-collapse: collapse;
@@ -96,11 +101,11 @@ table {
 }
 
 table.index tr {
-  font-family: Arial, sans-serif;
+  font-family: verdana;
 }
 
 table.navigation tr {
-  font-family: Arial, sans-serif;
+  font-family: verdana;
 }
 
 tr { 
@@ -110,10 +115,10 @@ tr {
 }
 
 .thRow { background-color:#DDF }   /* header row for mindex/thread/search tables */
-tr.lit  { background-color:#77F }  /* even rows in mindex/thread/search tables */
+tr.lit  { background-color:#57F }  /* even rows in mindex/thread/search tables */
 tr.row1 { background-color:#DDD }  /* even rows in mindex/thread/search tables */
 tr.row2 { background-color:#EEE }  /* odd rows in mindex/thread/search tables  */
-tr.rowover { background-color:#CAC } /* active (= mouseOver) rows in mindex/thread/search tables */
+tr.rowover { background-color:#57F } /* active (= mouseOver) rows in mindex/thread/search tables */
 
 div.body {
   padding: 1em;
@@ -126,12 +131,12 @@ div.messageBody {
 }
 
 div.messageBody i.quote {
-  font-size: 95%;
+  font-size: 100%;
 }
 
 div.messageBody pre {
   font-family: monospace;
-  font-size: 125%;
+  font-size: 100%;
 }
 
 /* opsbar = row of them */
@@ -139,6 +144,7 @@ table.opsbar {
   width: 100%;
   border: none;
 }
+
 table.opsbar td {
   padding: 0 0 0 0;
   margin: 0 0 0 0;
@@ -170,7 +176,6 @@ table.attachments th {
 
 table.navigation {
   width: 100%;
-  font-size: 80%;
   background-color: #e8e8e8;
 
 /* disabled until mozilla fixes the progressive render bug with images
@@ -182,26 +187,23 @@ table.navigation {
 }
 
 table.navigation th {
-  font-size: 100%;
   background-color: #969696;
   padding: 3px;
 }
 
 table.navigation td {
   background-color: white;
-  vertical-align: middle;
+  vertical-align: top;
 }
 
 td.padded {
-  padding-top: 0.25em;
-  padding-bottom: 0.25em;
-  vertical-align: middle;
+  padding-right: 1em;
+  vertical-align: top;
 }
 
 table.appears {
   border: 1px solid #969696;
   background-color: white;
-  font-size: 75%;
 }
 
 table.appears td {
diff --git a/lurker/ui/en.xml b/lurker/ui/en.xml
index 1e68116..f464bd0 100644
--- a/lurker/ui/en.xml
+++ b/lurker/ui/en.xml
@@ -22,7 +22,8 @@
  full-tree="The complete thread tree sorted by date"
  mail-appears-in="This message was posted to the following mailing lists:"
  thread-appears-in="This thread has appeared on the following mailing lists:"
- list-info="Mailing list lnfo"
+ list-info="Mailing list info"
+ list-overview="List overview with active threads"
  near-message="Nearby messages"
  old-topics="Old topics"
  new-topics="New topics"
diff --git a/lurker/ui/lang.xsl b/lurker/ui/lang.xsl
index d61c5ca..db2f5a4 100644
--- a/lurker/ui/lang.xsl
+++ b/lurker/ui/lang.xsl
@@ -35,6 +35,7 @@
 <xsl:variable name="mail-appears-in" select="document($langfile)/text/@mail-appears-in"/>
 <xsl:variable name="thread-appears-in" select="document($langfile)/text/@thread-appears-in"/>
 <xsl:variable name="list-info" select="document($langfile)/text/@list-info"/>
+<xsl:variable name="list-overview" select="document($langfile)/text/@list-overview"/>
 <xsl:variable name="near-message" select="document($langfile)/text/@near-message"/>
 <xsl:variable name="old-topics" select="document($langfile)/text/@old-topics"/>
 <xsl:variable name="new-topics" select="document($langfile)/text/@new-topics"/>
diff --git a/lurker/ui/mindex.xsl b/lurker/ui/mindex.xsl
index 64b41b3..e2bdf8b 100644
--- a/lurker/ui/mindex.xsl
+++ b/lurker/ui/mindex.xsl
@@ -97,18 +97,6 @@
        </xsl:choose>
       </td>
      </tr>
-     <tr>
-      <td colspan="3" align="center">
-       [ <a href="../list/{list/id}.{$ext}"><xsl:value-of select="$list-info"/></a> ]
-       [ <a href="../splash/index.{$ext}#{list/group}"><xsl:value-of select="$jump-group"/></a> ]
-       <xsl:if test="list/email/@address">
-        [ <a href="mailto:{list/email/@address}"><xsl:value-of select="$post-new"/></a> ]
-       </xsl:if>
-       <xsl:if test="list/link">
-        [ <a href="{list/link}"><xsl:value-of select="$subscribe"/></a> ]
-       </xsl:if>
-      </td>
-     </tr>
     </table>
    </div>
    
diff --git a/lurker/ui/thread.xsl b/lurker/ui/thread.xsl
index 9d3f6e5..b7bddd5 100644
--- a/lurker/ui/thread.xsl
+++ b/lurker/ui/thread.xsl
@@ -7,9 +7,7 @@
 <xsl:template mode="appear-in" match="list">
  <tr>
   <td nowrap="NOWRAP" class="padded">
-   <b><xsl:value-of select="email/@name"/></b><br/>
-   <a href="../list/{id}.{$ext}"><xsl:value-of select="$list-info"/></a> |
-   <a href="../mindex/{id}@{../row[position()=1]/summary/id}.{$ext}"><xsl:value-of select="$near-message"/></a>
+   <b><xsl:value-of select="email/@name"/></b>
   </td>
   <td><xsl:value-of select="description"/></td>
  </tr>
-- 
cgit v1.2.3