move test site to example/ folder, add site name to tpl data

mna · Jul 11, 2013 · 5845dd8 · 5845dd8
1 parent a0d58be
commit 5845dd8
Show file tree

Hide file tree

Showing 27 changed files with 61 additions and 8 deletions.
diff --git a/posts/002-meta-billet.md → example/posts/002-meta-billet.md b/posts/002-meta-billet.md → example/posts/002-meta-billet.md
diff --git a/posts/003-dependances.md → example/posts/003-dependances.md b/posts/003-dependances.md → example/posts/003-dependances.md
diff --git a/posts/004-npm-packages.md → example/posts/004-npm-packages.md b/posts/004-npm-packages.md → example/posts/004-npm-packages.md
diff --git a/posts/005-structurer-express.md → example/posts/005-structurer-express.md b/posts/005-structurer-express.md → example/posts/005-structurer-express.md
diff --git a/posts/006-dependency-injection.md → example/posts/006-dependency-injection.md b/posts/006-dependency-injection.md → example/posts/006-dependency-injection.md
diff --git a/posts/007-implement.js.md → example/posts/007-implement.js.md b/posts/007-implement.js.md → example/posts/007-implement.js.md
diff --git a/posts/008-backbone-computed-properties.md → ...posts/008-backbone-computed-properties.md b/posts/008-backbone-computed-properties.md → ...posts/008-backbone-computed-properties.md
diff --git a/posts/009-je-men-vais.md → example/posts/009-je-men-vais.md b/posts/009-je-men-vais.md → example/posts/009-je-men-vais.md
diff --git a/posts/010-demenagement.md → example/posts/010-demenagement.md b/posts/010-demenagement.md → example/posts/010-demenagement.md
diff --git a/posts/j-42-preparation.md → example/posts/j-42-preparation.md b/posts/j-42-preparation.md → example/posts/j-42-preparation.md
diff --git a/public/002-meta-billet → example/public/002-meta-billet b/public/002-meta-billet → example/public/002-meta-billet
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-02-29
 Title: Méta-billet: un mot sur le Calepin

diff --git a/public/003-dependances → example/public/003-dependances b/public/003-dependances → example/public/003-dependances
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-03-05
 Title: npm: la base essentielle pour débuter avec node.js

diff --git a/public/004-npm-packages → example/public/004-npm-packages b/public/004-npm-packages → example/public/004-npm-packages
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-03-12
 Title: npm shrinkwrap: Comment contrôler ses dépendances

diff --git a/public/005-structurer-express → example/public/005-structurer-express b/public/005-structurer-express → example/public/005-structurer-express
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-03-19
 Title: Structurer une application Web avec Express et Node.js

diff --git a/public/006-dependency-injection → example/public/006-dependency-injection b/public/006-dependency-injection → example/public/006-dependency-injection
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-03-27
 Title: Expérimentations sur l&rsquo;injection de dépendance avec node.js

diff --git a/public/007-implement-js → example/public/007-implement-js b/public/007-implement-js → example/public/007-implement-js
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-04-02
 Title: implement.js: typage fort et Javascript

diff --git a/public/008-backbone-computed-properties → ...e/public/008-backbone-computed-properties b/public/008-backbone-computed-properties → ...e/public/008-backbone-computed-properties
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-04-13
 Title: Propriétés calculées avec Backbone

diff --git a/public/009-je-men-vais → example/public/009-je-men-vais b/public/009-je-men-vais → example/public/009-je-men-vais
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-04-23
 Title: Je suis venu te dire que je m&rsquo;en vais

diff --git a/public/010-demenagement → example/public/010-demenagement b/public/010-demenagement → example/public/010-demenagement
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-04-30
 Title: Ce blogue a déménagé sur GitHub

diff --git a/public/css/main.css → example/public/css/main.css b/public/css/main.css → example/public/css/main.css
@@ -19,6 +19,7 @@ textarea {
 }
 
 body {
+	font-family: 'Helvetica Neue', 'Sans Serif';
     font-size: 1em;
     line-height: 1.4;
 }
@@ -97,12 +98,23 @@ textarea {
    Author's custom styles
    ========================================================================== */
 
-body {
-	font-family: 'Helvetica Neue', 'Sans Serif';
+article {
 	padding: 0 10% 0 10%;
 }
 
-.pager {
+.header {
+	background-color: #000000;
+	padding: 10px 10% 10px 10%;
+	height: 60px;
+}
+
+.header a {
+	color: #FFFFFF;
+	font-size: 2.5em;
+	text-decoration:none;
+}
+
+.pager, .pager:hover, .pager:active, .pager:visited, .pager:link {
 	color: blue;
 }
 

diff --git a/public/css/normalize.css → example/public/css/normalize.css b/public/css/normalize.css → example/public/css/normalize.css
diff --git a/public/index.html → example/public/index.html b/public/index.html → example/public/index.html
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-02-29
 Title: Méta-billet: un mot sur le Calepin

diff --git a/public/j-42-preparation → example/public/j-42-preparation b/public/j-42-preparation → example/public/j-42-preparation
@@ -11,6 +11,9 @@
 	</head>
 	<body>
 
+		<div class="header">
+			<a href="/">Some Name</a>
+		</div>
 		<article>
 			<div><p>Date: 2012-02-21
 Title: Propulsé par node.js

diff --git a/templates/layout.amber → example/templates/layout.amber b/templates/layout.amber → example/templates/layout.amber
@@ -14,6 +14,9 @@ html.no-js
 			<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
 		<![endif]-->
 
+		div.header
+			a[href="/"] #{SiteName}
+
 		article
 			block content
 

diff --git a/templates/post.amber → example/templates/post.amber b/templates/post.amber → example/templates/post.amber
diff --git a/opts.go b/opts.go
@@ -6,6 +6,10 @@ import (
 	"path/filepath"
 )
 
+const (
+	SiteName = "Some Name"
+)
+
 type options struct {
 	Port int `short:"p" long:"port" description:"the port to use for the web server" default:"9000"`
 }

diff --git a/watch.go b/watch.go
@@ -105,14 +105,15 @@ func regeneratePosts() {
 }
 
 type TemplateData struct {
-	Post   *LongPost
-	Recent []*ShortPost
-	Prev   *ShortPost
-	Next   *ShortPost
+	SiteName string
+	Post     *LongPost
+	Recent   []*ShortPost
+	Prev     *ShortPost
+	Next     *ShortPost
 }
 
 func newTemplateData(p *LongPost, i int, r []*ShortPost, all []*LongPost) *TemplateData {
-	td := &TemplateData{Post: p, Recent: r}
+	td := &TemplateData{SiteName: SiteName, Post: p, Recent: r}
 
 	if i > 0 {
 		td.Prev = all[i-1].Short()