From 8f0551ae91f5056e796ebd2bcbc8a5cfd16c1502 Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@intertwingly.net>
Date: Sat, 10 Mar 2007 22:19:47 -0500
Subject: [PATCH] Cosmetic improvements

---
 filters/detitle.xslt        | 25 +++++++++++++++++++++++++
 filters/h1title.xslt        | 30 ++++++++++++++++++++++++++++++
 themes/asf/default.css      | 23 ++++++++++++++++++++---
 themes/asf/index.html.xslt  |  3 ++-
 themes/asf/personalize.js   | 30 ++++++++++++++++++++----------
 themes/common/atom.xml.xslt |  7 +++++--
 6 files changed, 102 insertions(+), 16 deletions(-)
 create mode 100644 filters/detitle.xslt
 create mode 100644 filters/h1title.xslt

diff --git a/filters/detitle.xslt b/filters/detitle.xslt
new file mode 100644
index 0000000..1dc7265
--- /dev/null
+++ b/filters/detitle.xslt
@@ -0,0 +1,25 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:atom="http://www.w3.org/2005/Atom"
+                xmlns="http://www.w3.org/1999/xhtml">
+
+  <!-- only retain titles that don't duplicate summary or content -->
+  <xsl:template match="atom:title">
+    <xsl:if test="string-length(.) &lt; 30 or
+                  ( substring(.,1,string-length(.)-3) !=
+                    substring(../atom:content,1,string-length(.)-3) and
+                    substring(.,1,string-length(.)-3) !=
+                    substring(../atom:summary,1,string-length(.)-3) )">
+      <xsl:copy>
+        <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- pass through everything else -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/filters/h1title.xslt b/filters/h1title.xslt
new file mode 100644
index 0000000..3f419dd
--- /dev/null
+++ b/filters/h1title.xslt
@@ -0,0 +1,30 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:atom="http://www.w3.org/2005/Atom"
+                xmlns:xhtml="http://www.w3.org/1999/xhtml">
+
+  <!-- Replace title with value of h1, if present -->
+  <xsl:template match="atom:title">
+    <xsl:apply-templates select="@*"/>
+    <xsl:copy>
+      <xsl:choose>
+        <xsl:when test="count(//xhtml:h1) = 1">
+          <xsl:value-of select="normalize-space(//xhtml:h1)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="node()"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Remove all h1s -->
+  <xsl:template match="xhtml:h1"/>
+
+  <!-- pass through everything else -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/themes/asf/default.css b/themes/asf/default.css
index 10f4b98..0c8c0ef 100644
--- a/themes/asf/default.css
+++ b/themes/asf/default.css
@@ -30,11 +30,15 @@ a:active {
 a:focus {
 }
 
-a.active {
+a.inactive {
+	color: #558;
+}
+
+a.rising {
 	font-weight: bold;
 }
 
-h1 {
+body > h1 {
 	font-size: x-large;
 	text-transform: uppercase;
 	letter-spacing: 0.25em;
@@ -74,6 +78,11 @@ h1 {
 	border-bottom: 1px solid #ccc;
 }
 
+#sidebar h2 a img {
+        margin-bottom: 2px;
+        vertical-align: middle;
+}
+
 #sidebar p {
 	font-size: x-small;
 	padding-left: 20px;
@@ -163,6 +172,10 @@ h1 {
 	text-decoration: none !important;
 }
 
+#sidebar input[name=q] {
+        margin: 4px 0 0 24px;
+}
+
 /* ---------------------------- Footer --------------------------- */
 
 #footer ul {
@@ -177,6 +190,10 @@ h1 {
 	display: inline;
 }
 
+#footer ul li ul {
+	display: none;
+}
+
 #footer img {
 	display: none;
 }
@@ -419,7 +436,7 @@ math[display=block] {
 	overflow: auto;
 }
 
-.eqno {
+.numberedEq span, .eqno {
 	float: right;
 }
 
diff --git a/themes/asf/index.html.xslt b/themes/asf/index.html.xslt
index 68e377c..f4ff71e 100644
--- a/themes/asf/index.html.xslt
+++ b/themes/asf/index.html.xslt
@@ -40,7 +40,7 @@
           <xsl:text>&#10;&#10;</xsl:text>
         </div>
 
-        <h1>Subscriptions </h1>
+        <h1>Footnotes</h1>
         <xsl:text>&#10;&#10;</xsl:text>
 
         <div id="sidebar">
@@ -80,6 +80,7 @@
 
         <xsl:text>&#10;&#10;</xsl:text>
         <div id="footer">
+          <h2>Subscriptions</h2>
           <ul>
             <xsl:for-each select="planet:source">
               <xsl:sort select="planet:name"/>
diff --git a/themes/asf/personalize.js b/themes/asf/personalize.js
index 0d6beeb..2aa1dc8 100644
--- a/themes/asf/personalize.js
+++ b/themes/asf/personalize.js
@@ -45,11 +45,14 @@ function navkey(event) {
   if (!checkbox || !checkbox.checked) return;
 
   if (!event) event=window.event;
-  key=event.keyCode;
+  if (event.originalTarget &&
+    event.originalTarget.nodeName.toLowerCase() == 'input' &&
+    event.originalTarget.id != 'navkeys') return;
 
   if (!document.documentElement) return;
   if (!entries[0].anchor || !entries[0].anchor.offsetTop) return;
 
+  key=event.keyCode;
   if (key == 'J'.charCodeAt(0)) nextArticle(event);
   if (key == 'K'.charCodeAt(0)) prevArticle(event);
 }
@@ -215,14 +218,12 @@ function moveSidebar() {
 
   var h1 = sidebar.previousSibling;
   while (h1.nodeType != 1) h1=h1.previousSibling;
-  h1.parentNode.removeChild(h1);
+  if (h1.nodeName.toLowerCase() == 'h1') h1.parentNode.removeChild(h1);
+
   var footer = document.getElementById('footer');
-  var ul = footer.firstChild;
-  while (ul.nodeType != 1) ul=ul.nextSibling;
-  footer.removeChild(ul);
-  sidebar.insertBefore(ul, sidebar.firstChild);
-  var h2 = document.createElement('h2');
-  h2.appendChild(h1.firstChild);
+  var ul = footer.lastChild;
+  while (ul.nodeType != 1) ul=ul.previousSibling;
+
   var twisty = document.createElement('a');
   twisty.appendChild(document.createTextNode('\u25bc'));
   twisty.title = 'hide';
@@ -239,10 +240,19 @@ function moveSidebar() {
     ul.style.display = display;
     createCookie("subscriptions", display, 365);
   }
+
   var cookie = readCookie("subscriptions");
   if (cookie && cookie == 'none') twisty.onclick();
-  h2.appendChild(twisty);
-  sidebar.insertBefore(h2, sidebar.firstChild);
+
+  for (var node=footer.lastChild; node; node=footer.lastChild) {
+    if (twisty && node.nodeType == 1 && node.nodeName.toLowerCase() == 'h2') {
+      node.appendChild(twisty);
+      twisty = null;
+    }
+    footer.removeChild(node);
+    sidebar.insertBefore(node, sidebar.firstChild);
+  }
+
   var body = document.getElementById('body');
   sidebar.parentNode.removeChild(sidebar);
   body.parentNode.insertBefore(sidebar, body);
diff --git a/themes/common/atom.xml.xslt b/themes/common/atom.xml.xslt
index 83e5cfa..2339665 100644
--- a/themes/common/atom.xml.xslt
+++ b/themes/common/atom.xml.xslt
@@ -1,4 +1,5 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:access="http://www.bloglines.com/about/specs/fac-1.0"
                 xmlns:atom="http://www.w3.org/2005/Atom"
                 xmlns:indexing="urn:atom-extension:indexing"
                 xmlns:planet="http://planet.intertwingly.net/"
@@ -20,11 +21,13 @@
   <!-- Strip site meter -->
   <xsl:template match="xhtml:div[comment()[. = ' Site Meter ']]"/>
 
-  <!-- add Google/LiveJournal-esque noindex directive -->
+  <!-- add Google/LiveJournal-esque and Bloglines noindex directive -->
   <xsl:template match="atom:feed">
     <xsl:copy>
       <xsl:attribute name="indexing:index">no</xsl:attribute>
-      <xsl:apply-templates select="@*|node()"/>
+      <xsl:apply-templates select="@*"/>
+      <access:restriction relationship="allow"/>
+      <xsl:apply-templates select="node()"/>
       <xsl:text>&#10;</xsl:text>
     </xsl:copy>
   </xsl:template>