aboutsummaryrefslogtreecommitdiff
path: root/source/99_result
diff options
context:
space:
mode:
Diffstat (limited to 'source/99_result')
-rw-r--r--source/99_result/main.css7
-rw-r--r--source/99_result/overview.xsl54
2 files changed, 48 insertions, 13 deletions
diff --git a/source/99_result/main.css b/source/99_result/main.css
index 882204f..5f473a7 100644
--- a/source/99_result/main.css
+++ b/source/99_result/main.css
@@ -3,11 +3,12 @@ body{font:1em Droid Sans,sans-serif,Verdana,Arial,FreeSans;color:#272828}
h1{width:100%;border-bottom:0.2em solid #e3e8e8}
a{text-decoration:underline;color:#272828}
a:hover{color:black}
-h2{font-size:1.5em;color:#F80;margin:.5em 0 .5em 0}
+h2{font-size:1.3em;text-decoration:none;color:#272828;font-weight:bold}
h2 a{text-decoration:none}
-h2 span{font-size:0.9em;text-decoration:none;color:#272828;font-weight:normal}
-h3{font-size:1.05em;font-weight:normal;margin-bottom:.2em;border-bottom:.1em solid #e3e8e8}
+h3{font-size:1.2em;color:#F80;font-weight:bold;margin-bottom:.2em;border-bottom:.1em solid #e3e8e8}
+h3 span{font-size:0.9em;color:#272828;font-weight:normal}
h3 a{text-decoration:none}
+p{margin:0 0 .5em 0;text-align:justify}
ul{margin:0;text-align:justify}
ul li{list-style-type:circle}
dt {float:left;clear:left;width:7em}
diff --git a/source/99_result/overview.xsl b/source/99_result/overview.xsl
index 918a9dd..d16906e 100644
--- a/source/99_result/overview.xsl
+++ b/source/99_result/overview.xsl
@@ -18,10 +18,11 @@
<xsl:include href="[utility/date-time.xsl]"/>
<xsl:variable name="meta">
- <datasource type="main" mode="full" source="03_merge/timeline.xml" target="timeline"/>
+ <datasource type="main" mode="full" source="00_content/meta.xml" target="meta"/>
+ <datasource type="support" mode="full" source="02_augment/articles.xml" target="articles"/>
+ <datasource type="support" mode="full" source="03_merge/timeline.xml" target="timeline"/>
<datasource type="support" mode="full" source="02_augment/commits.xml" target="commits"/>
<datasource type="support" mode="full" source="00_content/repositories.xml" target="repositories"/>
- <datasource type="support" mode="full" source="00_content/meta.xml" target="meta"/>
<target mode="plain" value="index.html"/>
</xsl:variable>
@@ -43,9 +44,11 @@
<h3>
<xsl:text>» </xsl:text>
- <a href="{$commit/link}">
- <xsl:value-of select="$commit/title"/>
- </a>
+ <span>
+ <a href="{$commit/link}">
+ <xsl:value-of select="$commit/title"/>
+ </a>
+ </span>
</h3>
<span class="info">
@@ -63,6 +66,8 @@
<a href="{$commit/link}">
<xsl:value-of select="$commit/@hash"/>
</a>
+ <xsl:text> | </xsl:text>
+ <xsl:value-of select="$commit/author"/>
</span>
<xsl:apply-templates select="$commit/message/*" mode="xhtml"/>
@@ -75,6 +80,28 @@
</xsl:call-template>
</xsl:template>
+<xsl:template match="articles/entry">
+ <h3>
+ <xsl:text>» </xsl:text>
+ <span>
+ <a href="{link}">
+ <xsl:value-of select="title"/>
+ </a>
+ </span>
+ </h3>
+
+ <span class="info">
+ <xsl:call-template name="format-date">
+ <xsl:with-param name="date" select="date"/>
+ <xsl:with-param name="format" select="'M x, Y'"/>
+ </xsl:call-template>
+ <xsl:text> | </xsl:text>
+ <xsl:value-of select="author"/>
+ </span>
+
+ <xsl:apply-templates select="content/*" mode="xhtml"/>
+</xsl:template>
+
<xsl:template match="datasource">
<html>
<head>
@@ -92,11 +119,18 @@
<xsl:value-of select="$root/meta/title"/>
</h1>
- <h2>» <span>
- <a href="{$root/meta/url}/timeline.xml">
- <xsl:text>Latest commits</xsl:text>
- </a>
- </span>
+ <h2>
+ <a href="http://blog.kummerlaender.eu">
+ <xsl:text>Latest articles</xsl:text>
+ </a>
+ </h2>
+
+ <xsl:apply-templates select="articles/entry"/>
+
+ <h2>
+ <a href="{$root/meta/url}/timeline.xml">
+ <xsl:text>Latest commits</xsl:text>
+ </a>
</h2>
<xsl:apply-templates select="timeline/commit[position() &lt;= 5]"/>