Skip to content
Browse files

Basic styling is completed but there are still some issues to work ou…

…t. 1. It can't parse the cartesianfaith wordpress feed because it doesn't end with a .xml extension. 2. Something is wrong with the way the template generates its own feed link dynamically. It keeps giving me the atom feed and it links to a 404. Right now I've switched it to hard-link to the rss2.0 version
  • Loading branch information...
1 parent 367f849 commit 63057e68d3ee0de9daca0bc2bd10681cc3b3b0fb @jgnewman jgnewman committed Nov 7, 2011
View
BIN examples/cache/basho.com,blog,technical,feed.xml
Binary file not shown.
View
BIN examples/cache/cartesianfaith.wordpress.com,feed
Binary file not shown.
View
BIN examples/cache/recap.basho.com,feed,index.xml
Binary file not shown.
View
240 riak/output/css/styles.css
@@ -0,0 +1,240 @@
+/* Fonts Section */
+
+@font-face {
+ font-family: 'league';
+ src: url('../fonts/leaguegothic.eot');
+ src: local('League Gothic'), url('../fonts/leaguegothic.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+@font-face {
+ font-family: 'crimson';
+ src: url('../fonts/crimsonroman.eot');
+ src: local('Crimson'), url('../fonts/crimsonroman.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+@font-face {
+ font-family: 'crimson';
+ src: url('../fonts/crimsonbold.eot');
+ src: local('Crimson'), url('../fonts/crimsonbold.ttf') format('truetype');
+ font-weight: bold;
+ font-style: normal;
+}
+@font-face {
+ font-family: 'crimson';
+ src: url('../fonts/crimsonitalic.eot');
+ src: local('Crimson'), url('../fonts/crimsonitalic.ttf') format('truetype');
+ font-weight: normal;
+ font-style: italic;
+}
+@font-face {
+ font-family: 'crimson';
+ src: url('../fonts/crimsonbolditalic.eot');
+ src: local('Crimson'), url('../fonts/crimsonbolditalic.ttf') format('truetype');
+ font-weight: bold;
+ font-style: italic;
+}
+
+
+/* Reset Section */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+body {
+ line-height: 1;
+}
+ol, ul {
+ list-style: none;
+ padding: 5px 0 0 18px;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: ;
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+
+/* Real Styles*/
+
+body {
+ font-family: 'crimson', georgia, serif;
+ text-align: center;
+ color: #2d2d2d;
+ font-size: 18px;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-family: 'league', 'helvetica', arial, sans-serif;
+ color: #2d2d2d;
+ text-transform: uppercase;
+ display: block;
+ line-height: 1;
+}
+
+h1 {
+ font-size: 42px;
+ margin: 17px 0 0 0;
+}
+
+ul {
+ list-style-type: square;
+ line-height: 1.3;
+}
+
+strong {
+ font-family: 'league', georgia, serif;
+ text-transform: uppercase;
+ font-size: 110%;
+}
+
+.header {
+ margin: 0 auto;
+ width: 960px;
+ border-bottom: 3px solid #2d2d2d;
+}
+
+.subscribe-bg {
+ background: url('../images/subscribe-bg.png') right top no-repeat transparent;
+ width: 106px;
+ height: 18px;
+ cursor: pointer;
+ margin: 66px 0 0 0;
+}
+
+.subscribe-bg:hover {
+ background-position: right bottom;
+}
+
+.subscribe {
+ width: 106px;
+ height: 18px;
+ background: url('../images/subscribe.png') left top no-repeat transparent;
+}
+
+.titleimg {
+ background: url('../images/logo.jpg') left bottom no-repeat transparent;
+ height: 53px;
+ width: 310px;
+ padding: 31px 0 0 0;
+}
+
+.wrapper {
+ width: 960px;
+ margin: 25px auto 0;
+ background: #fff;
+}
+
+.leftColumn {
+ width: 657px;
+ height: auto;
+ padding: 0 18px 0 0;
+ background: #fff;
+ text-align: left;
+}
+
+.rightColumn {
+ width: 266px;
+ border-left: 1px dashed #878787;
+ height: auto;
+ padding: 0 0 40px 18px;
+ background: #fff;
+ text-align: left;
+}
+
+.rightColumn a {
+ color: #2d2d2d;
+ text-decoration: none;
+}
+
+.rightColumn a:hover {
+ color: #66A19D;
+}
+
+.rightColumn ul {
+ padding: 10px 0 20px 18px;
+}
+
+.post {
+ line-height: 1.2;
+ border-bottom: 1px dashed #878787;
+ padding-bottom: 30px;
+}
+
+.post a {
+ color: #66a19d;
+ text-decoration: none;
+}
+
+.post a:hover {
+ text-decoration: underline;
+}
+
+.post a.title {
+ color: #2d2d2d;
+}
+
+.post a.title:hover {
+ color: #66a19d;
+ text-decoration: none;
+}
+
+.post p {
+ margin: 0 0 20px;
+}
+
+.post p.postMeta {
+ margin: 0;
+ line-height: 1;
+}
+
+.content ol {
+ list-style-type: decimal;
+}
+
+.content li {
+ padding: 10px 0 0;
+}
+
+
+
+
+
+
+
+.block {display: block;}
+.floatLeft {float: left;}
+.floatRight {float: right;}
+.clear {clear:both;}
+.bold {font-weight: bold;}
+
View
BIN riak/output/fonts/crimsonbold.eot
Binary file not shown.
View
BIN riak/output/fonts/crimsonbold.ttf
Binary file not shown.
View
BIN riak/output/fonts/crimsonbolditalic.eot
Binary file not shown.
View
BIN riak/output/fonts/crimsonbolditalic.ttf
Binary file not shown.
View
BIN riak/output/fonts/crimsonitalic.eot
Binary file not shown.
View
BIN riak/output/fonts/crimsonitalic.ttf
Binary file not shown.
View
BIN riak/output/fonts/crimsonroman.eot
Binary file not shown.
View
BIN riak/output/fonts/crimsonroman.ttf
Binary file not shown.
View
BIN riak/output/fonts/leaguegothic.eot
Binary file not shown.
View
BIN riak/output/fonts/leaguegothic.ttf
Binary file not shown.
View
BIN riak/output/images/logo.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN riak/output/images/subscribe-bg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN riak/output/images/subscribe.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 riak/riak/config.ini
@@ -52,7 +52,7 @@ encoding = utf-8
# Provide no more than 7 days articles on the front page
[riak/riak/index.html.tmpl]
-days_per_page = 7
+days_per_page = 30
# If non-zero, all feeds which have not been updated in the indicated
# number of days will be marked as inactive
@@ -105,7 +105,7 @@ face = thom.png
# pick up the default faceheight only
facewidth = 59
-[http://cartesianfaith.wordpress.com/feed/index.xml]
+[http://cartesianfaith.wordpress.com/feed/]
name = Cartesian Faith
face = edd.png
facewidth = 62
View
223 riak/riak/index.html.tmpl
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
<html>
### Fancy Planet HTML template.
@@ -12,114 +12,125 @@
### examples/config.ini and examples/index.html.tmpl in the Planet source.
<head>
-<title><TMPL_VAR name></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="generator" content="<TMPL_VAR generator ESCAPE="HTML">">
-<link rel="stylesheet" href="planet.css" type="text/css">
-<TMPL_IF feedtype>
-<link rel="alternate" href="<TMPL_VAR feed ESCAPE="HTML">" title="<TMPL_VAR channel_title_plain ESCAPE="HTML">" type="application/<TMPL_VAR feedtype>+xml">
-</TMPL_IF>
+ <title><TMPL_VAR name></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <meta name="generator" content="<TMPL_VAR generator ESCAPE="HTML">">
+ <!-- <link rel="stylesheet" href="planet.css" type="text/css" media="all"> -->
+ <link rel="stylesheet" href="css/styles.css" type="text/css" media="all">
+ <TMPL_IF feedtype>
+ <!--<link rel="alternate" href='<TMPL_VAR feed ESCAPE="HTML">' title="<TMPL_VAR channel_title_plain ESCAPE="HTML">" type="application/<TMPL_VAR feedtype>+xml">-->
+ <link rel="alternate" href='rss20.xml' type="application/xml">
+ </TMPL_IF>
</head>
<body>
-<h1><TMPL_VAR name></h1>
-
-<TMPL_LOOP Items>
-<TMPL_IF new_date>
-<TMPL_UNLESS __FIRST__>
-### End <div class="channelgroup">
-</div>
-### End <div class="daygroup">
-</div>
-</TMPL_UNLESS>
-<div class="daygroup">
-<h2><TMPL_VAR new_date></h2>
-</TMPL_IF>
-
-<TMPL_IF new_channel>
-<TMPL_UNLESS new_date>
-### End <div class="channelgroup">
-</div>
-</TMPL_UNLESS>
-<div class="channelgroup">
-
-### Planet provides template variables for *all* configuration options for
-### the channel (and defaults), even if it doesn't know about them. We
-### exploit this here to add hackergotchi faces to our channels. Planet
-### doesn't know about the "face", "facewidth" and "faceheight" configuration
-### variables, but makes them available to us anyway.
-
-<h3><a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title_plain ESCAPE="HTML">"><TMPL_VAR channel_name></a></h3>
-<TMPL_IF channel_face>
-<img class="face" src="images/<TMPL_VAR channel_face ESCAPE="HTML">" width="<TMPL_VAR channel_facewidth ESCAPE="HTML">" height="<TMPL_VAR channel_faceheight ESCAPE="HTML">" alt="">
-</TMPL_IF>
-</TMPL_IF>
-
-
-<div class="entrygroup" id="<TMPL_VAR id>"<TMPL_IF channel_language> lang="<TMPL_VAR channel_language>"</TMPL_IF>>
-<TMPL_IF title>
-<h4<TMPL_IF title_language> lang="<TMPL_VAR title_language>"</TMPL_IF>><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h4>
-</TMPL_IF>
-<div class="entry">
-<div class="content"<TMPL_IF content_language> lang="<TMPL_VAR content_language>"</TMPL_IF>>
-<TMPL_VAR content>
-</div>
-
-### Planet also makes available all of the information from the feed
-### that it can. Use the 'planet-cache' tool on the cache file for
-### a particular feed to find out what additional keys it supports.
-### Comment extra fields are 'author' and 'category' which we
-### demonstrate below.
-
-<p class="date">
-<a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF author>by <TMPL_VAR author> at </TMPL_IF><TMPL_VAR date><TMPL_IF category> under <TMPL_VAR category></TMPL_IF></a>
-</p>
-</div>
-</div>
-
-<TMPL_IF __LAST__>
-### End <div class="channelgroup">
-</div>
-### End <div class="daygroup">
-</div>
-</TMPL_IF>
-</TMPL_LOOP>
-
-
-<div class="sidebar">
-<img src="images/logo.png" width="136" height="136" alt="">
-
-<h2>Subscriptions</h2>
-<ul>
-<TMPL_LOOP Channels>
-<li>
-<a href="<TMPL_VAR url ESCAPE="HTML">" title="subscribe"><img src="images/feed-icon-10x10.png" alt="(feed)"></a> <a <TMPL_IF link>href="<TMPL_VAR link ESCAPE="HTML">" </TMPL_IF><TMPL_IF message>class="message" title="<TMPL_VAR message ESCAPE="HTML">"</TMPL_IF><TMPL_UNLESS message>title="<TMPL_VAR title_plain ESCAPE="HTML">"</TMPL_UNLESS>><TMPL_VAR name></a>
-</li>
-</TMPL_LOOP>
-</ul>
-
-<p>
-<strong>Last updated:</strong><br>
-<TMPL_VAR date><br>
-<em>All times are UTC.</em><br>
-<br>
-Powered by:<br>
-<a href="http://www.planetplanet.org/"><img src="images/planet.png" width="80" height="15" alt="Planet" border="0"></a>
-</p>
-
-<p>
-<h2>Planetarium:</h2>
-<ul>
-<li><a href="http://www.planetapache.org/">Planet Apache</a></li>
-<li><a href="http://planet.debian.net/">Planet Debian</a></li>
-<li><a href="http://planet.freedesktop.org/">Planet freedesktop.org</a></li>
-<li><a href="http://planet.gnome.org/">Planet GNOME</a></li>
-<li><a href="http://planetsun.org/">Planet Sun</a></li>
-<li><a href="http://fedora.linux.duke.edu/fedorapeople/">Fedora People</a></li>
-<li><a href="http://www.planetplanet.org/">more...</a></li>
-</ul>
-</p>
-</div>
+ <div class="header">
+ <!--<a class="block floatRight subscribe-bg" href='<TMPL_VAR feed ESCAPE="HTML">'><span class="block subscribe"></span></a>-->
+ <a class="block floatRight subscribe-bg" href='rss20.xml'><span class="block subscribe"></span></a>
+ <div class="titleimg"></div>
+ </div>
+
+ <div class="wrapper">
+ <div class="leftColumn floatLeft">
+ <!--<h1 class="tmplvarname"><TMPL_VAR name></h1>-->
+
+ <TMPL_LOOP Items>
+ <!--
+ <TMPL_IF new_date>
+ <TMPL_UNLESS __FIRST__>
+ ### End
+ <div class="channelgroup"></div>
+ ### End
+ <div class="daygroup"></div>
+ </TMPL_UNLESS>
+ <div class="daygroup">
+ <h2><TMPL_VAR new_date></h2>
+ </div>
+ </TMPL_IF>
+
+ <TMPL_IF new_channel>
+ <TMPL_UNLESS new_date>
+ ### End
+ <div class="channelgroup"></div>
+ </TMPL_UNLESS>
+ <div class="channelgroup">
+
+ ### Planet provides template variables for *all* configuration options for
+ ### the channel (and defaults), even if it doesn't know about them. We
+ ### exploit this here to add hackergotchi faces to our channels. Planet
+ ### doesn't know about the "face", "facewidth" and "faceheight" configuration
+ ### variables, but makes them available to us anyway.
+
+
+ <h3><a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title_plain ESCAPE="HTML">"><TMPL_VAR channel_name></a></h3>
+ <TMPL_IF channel_face>
+ <img class="face" src="images/<TMPL_VAR channel_face ESCAPE="HTML">" width="<TMPL_VAR channel_facewidth ESCAPE="HTML">" height="<TMPL_VAR channel_faceheight ESCAPE="HTML">" alt="">
+ </TMPL_IF>
+
+ </div>
+ </TMPL_IF>
+ -->
+
+ <div class="post" id="<TMPL_VAR id>"<TMPL_IF channel_language> lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+ <TMPL_IF title>
+ <h1<TMPL_IF title_language> lang="<TMPL_VAR title_language>"</TMPL_IF>><a class="title" href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h1>
+ </TMPL_IF>
+ ### Planet also makes available all of the information from the feed
+ ### that it can. Use the 'planet-cache' tool on the cache file for
+ ### a particular feed to find out what additional keys it supports.
+ ### Comment extra fields are 'author' and 'category' which we
+ ### demonstrate below.
+
+ <p class="date">
+ <TMPL_IF author>by <TMPL_VAR author> on </TMPL_IF>
+ <a href="<TMPL_VAR link ESCAPE="HTML">">
+ <TMPL_VAR date>
+ <!--<TMPL_IF category> under <TMPL_VAR category></TMPL_IF>-->
+ </a>
+ </p>
+ <div class="entry">
+ <div class="content"<TMPL_IF content_language> lang="<TMPL_VAR content_language>"</TMPL_IF>>
+ <TMPL_VAR content>
+ </div>
+ </div>
+ </div>
+
+ <TMPL_IF __LAST__>
+ ### End
+ <div class="channelgroup"></div>
+ ### End
+ <div class="daygroup"></div>
+ </TMPL_IF>
+
+ </TMPL_LOOP>
+ </div> <!-- .leftColumn -->
+
+
+ <div class="rightColumn floatLeft">
+ <h1>Sites</h1>
+ <ul>
+ <TMPL_LOOP Channels>
+ <li>
+ <a <TMPL_IF link>href="<TMPL_VAR link ESCAPE="HTML">" </TMPL_IF><TMPL_IF message>class="message" title="<TMPL_VAR message ESCAPE="HTML">"</TMPL_IF><TMPL_UNLESS message>title="<TMPL_VAR title_plain ESCAPE="HTML">"</TMPL_UNLESS>><TMPL_VAR name></a>
+ </li>
+ </TMPL_LOOP>
+ </ul>
+ <a class="bold" href="mailto:mark@basho.com?subject=Add my site to Planet Riak&body=Title: %0A%0aFeed: %0A%0AAuthor Name: %0A%0ASite Url:%0A%0A">Add your site?</a>
+
+ <!--
+ <p>
+ <strong>Last updated:</strong><br>
+ <TMPL_VAR date><br>
+ <em>All times are UTC.</em><br>
+ <br>
+ Powered by:<br>
+ <a href="http://www.planetplanet.org/"><img src="images/planet.png" width="80" height="15" alt="Planet" ></a>
+ </p>
+ -->
+ </div> <!-- .rightColumn -->
+
+ <div class="clear"></div>
+ </div> <!-- .wrapper -->
</body>
</html>

0 comments on commit 63057e6

Please sign in to comment.
Something went wrong with that request. Please try again.