organized files

.gitignore

@@ -1,10 +1,7 @@
-.DS_Store
 _blog
-assets/*.min.js
-assets/*.min.css
+public/js/*.js
+public/css/*.css
 discussd/discuss.dirty
-blog
-!templates/blog
-proj
-!templates/proj
+public/blog
+public/proj
 node_modules

.publish

@@ -1,2 +0,0 @@
-publish_host=samhuri.net
-publish_dir=samhuri.net/public/

Makefile

@@ -1,51 +1,51 @@
-JAVASCRIPTS=assets/blog.js assets/gitter.js assets/jquery-serializeObject.js assets/proj.js \
-	    assets/request.js assets/showdown.js assets/storage-polyfill.js assets/store.js \
-	    assets/strftime.js assets/tmpl.js
-
-MIN_JAVASCRIPTS=assets/blog.min.js assets/gitter.min.js assets/jquery-serializeObject.min.js assets/proj.min.js \
-		assets/request.min.js assets/showdown.min.js assets/storage-polyfill.min.js assets/store.min.js \
-		assets/strftime.min.js assets/tmpl.min.js
-
-STYLESHEETS=assets/style.css assets/blog.css assets/proj.css
-
-MIN_STYLESHEETS=assets/style.min.css assets/blog.min.css assets/proj.min.css
-
-POSTS=$(shell echo _blog/published/*.html)
+JAVASCRIPTS=$(shell echo assets/js/*.js)
+STYLESHEETS=$(shell echo assets/css/*.css)
+POSTS=$(shell echo _blog/published/*.html) $(shell echo _blog/published/*.md)
 
 all: proj blog combine
 
-proj: projects.json templates/proj/index.html templates/proj/proj/index.html
-	./build.js
+proj: projects.json templates/proj/index.html templates/proj/project.html
+	@echo
+	./bin/projects.js projects.json public/proj
 
 blog: _blog/blog.json templates/blog/index.html templates/blog/post.html $(POSTS)
 	@echo
-	./blog.rb _blog blog
+	./bin/blog.rb _blog public/blog
 
 minify: $(JAVASCRIPTS) $(STYLESHEETS)
 	@echo
-	./minify.sh
+	./bin/minify.sh
 
-combine: minify $(MIN_JAVASCRIPTS) $(MIN_STYLESHEETS)
+combine: minify $(JAVASCRIPTS) $(STYLESHEETS)
 	@echo
-	./combine.sh
+	./bin/combine.sh
 
-publish_blog: blog combine
-	publish assets
-	publish blog
-	scp blog/posts.json bohodev.net:discussd/posts.json
+publish_assets: combine
+	@echo
+	./bin/publish.sh --delete public/css public/images public/js
 
-publish_proj: proj combine
-	publish assets
-	publish proj
+publish_blog: blog publish_assets
+	@echo
+	./bin/publish.sh --delete public/blog
+	scp public/blog/posts.json bohodev.net:discussd/posts.json
 
-publish: publish_blog publish_proj index.html
-	publish index.html
-	publish .htaccess
+publish_proj: proj publish_assets
+	@echo
+	./bin/publish.sh --delete proj
+
+publish_index: public/index.html
+	@echo
+	./bin/publish.sh public/index.html
+
+publish: publish_index publish_blog publish_proj
+	@echo
+	./bin/publish.sh public/.htaccess
+	./bin/publish.sh public/favicon.ico
 
 clean:
-	rm -rf proj/*
-	rm -rf blog/*
-	rm assets/*.min.js
-	rm assets/*.min.css
+	rm -rf public/proj/*
+	rm -rf public/blog/*
+	rm public/css/*.css
+	rm public/js/*.js
 
 .PHONY: proj blog

assets/css/blog.css

@@ -1,5 +1,7 @@
 body { margin: 0
-     ; padding: 0
+     ; padding: 0 0 4em
+     ; position: relative
+     ; min-height: 100%
      }
 
 h1 { margin: 0
@@ -168,6 +170,8 @@ footer { margin: 0
        ; border-top: solid 1px #bbb
        ; clear: both
        ; width: 100%
+       ; position: absolute
+       ; bottom: 0
        }
 
 footer p { margin: 0.5em }

assets/css/ie6.css

@@ -0,0 +1,7 @@
+ul { behavior: none
+   ; padding-bottom: 25px
+   }
+
+img { behavior: url(../js/iepngfix.htc)
+    ; behavior: url(../../js/iepngfix.htc)
+    }

assets/css/proj.css

@@ -8,8 +8,8 @@
       ; -moz-border-radius: 20px
       ; -webkit-border-radius: 20px
       ; border-radius: 20px
-      ; behavior: url(../assets/border-radius.htc)
-      ; behavior: url(../../assets/border-radius.htc)
+      ; behavior: url(../js/border-radius.htc)
+      ; behavior: url(../../js/border-radius.htc)
       }
 
 h4 { margin: 0.5em 0 0.7em }

assets/css/style.css

@@ -47,8 +47,8 @@ ul.nav { text-align: center
        ; -moz-border-radius: 20px
        ; -webkit-border-radius: 20px
        ; border-radius: 20px
-       ; behavior: url(assets/border-radius.htc)
-       ; behavior: url(../assets/border-radius.htc)
+       ; behavior: url(js/border-radius.htc)
+       ; behavior: url(../js/border-radius.htc)
        }
 
 ul.nav li { display: block

assets/ie6.css

@@ -1,7 +0,0 @@
-ul { behavior: none
-   ; padding-bottom: 25px
-   }
-
-img { behavior: url(../assets/iepngfix.htc)
-    ; behavior: url(../../assets/iepngfix.htc)
-    }

bin/blog.rb

@@ -174,7 +174,7 @@ class Blag
 
     xml = Builder::XmlMarkup.new
     xml.instruct! :xml, :version => '1.0'
-    xml.instruct! 'xml-stylesheet', :href => 'http://samhuri.net/assets/blog-all.min.css', :type => 'text/css'
+    xml.instruct! 'xml-stylesheet', :href => 'http://samhuri.net/css/blog-all.min.css', :type => 'text/css'
     xml.rss :version => '2.0' do
       xml.channel do
         xml.title title

bin/combine.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env zsh
+
+### javascript ###
+
+# blog
+echo "request,showdown,strftime,tmpl,jquery-serializeObject,blog -> blog-all.min.js"
+cat public/js/{request,showdown,strftime,tmpl,jquery-serializeObject,blog}.min.js >|public/js/blog-all.min.js
+
+# project index
+echo "gitter,store -> proj-index-all.min.js"
+cat public/js/{gitter,store}.min.js >|public/js/proj-index-all.min.js
+
+# projects
+echo "gitter,store,proj -> proj-all.min.js"
+cat public/js/{gitter,store,proj}.min.js >|public/js/proj-all.min.js
+
+
+### css ###
+
+# blog
+echo "style,blog -> blog-all.min.css"
+cat public/css/{style,blog}.min.css >|public/css/blog-all.min.css
+
+# project index
+echo "style,proj-common,proj-index -> proj-index-all.min.css"
+cat public/css/{style,proj-common,proj-index}.min.css >|public/css/proj-index-all.min.css
+
+# projects
+echo "style,proj-common,proj -> proj-all.min.css"
+cat public/css/{style,proj-common,proj}.min.css >|public/css/proj-all.min.css

bin/minify.sh

@@ -2,18 +2,18 @@
 
 setopt extendedglob
 
-for js (assets/*.js~*.min.js) {
-    target=${js%.js}.min.js
+for js (assets/js/*.js) {
+    target=public/js/${${js:t}%.js}.min.js
     if [ ! -f $target ] || [ $js -nt $target ]; then
     echo "$js -> $target"
     closure < $js >| $target
     fi
 }
 
-for css (assets/*.css~*.min.css) {
-    target=${css%.css}.min.css
+for css (assets/css/*.css) {
+    target=public/css/${${css:t}%.css}.min.css
     if [ ! -f $target ] || [ $css -nt $target ]; then
     echo "$css -> $target"
     yui-compressor $css $target
     fi
-}
+}

bin/projects.js

@@ -4,21 +4,26 @@ var fs = require('fs')
   , path = require('path')
   , mustache = require('mustache')
 
+  , rootDir = path.join(__dirname, '..')
+  , projectFile = path.join(rootDir, process.argv[2])
+  , templateDir = path.join(rootDir, 'templates', 'proj')
+  , targetDir = path.join(rootDir, process.argv[3])
+
 function main() {
   var ctx = {}
-  fs.readFile(path.join(__dirname, 'templates', 'proj', 'proj', 'index.html'), function(err, html) {
+  fs.readFile(path.join(templateDir, 'project.html'), function(err, html) {
     if (err) throw err
     ctx.template = html.toString()
-    fs.readFile(path.join(__dirname, 'projects.json'), function(err, json) {
+    fs.readFile(projectFile, function(err, json) {
       if (err) throw err
       var projects = JSON.parse(json)
         , names = Object.keys(projects)
-        , index = path.join(__dirname, 'proj', 'index.html')
+        , index = path.join(targetDir, 'index.html')
       
       // write project index
-      fs.readFile(path.join(__dirname, 'templates', 'proj', 'index.html'), function(err, tpl) {
+      fs.readFile(path.join(templateDir, 'index.html'), function(err, tpl) {
         if (err) throw err
-        fs.mkdir(path.join(__dirname, 'proj'), 0775, function(err) {
+        fs.mkdir(targetDir, 0775, function(err) {
           if (err && err.code !== 'EEXIST') throw err
           fs.unlink(index, function(err) {
             if (err && err.code !== 'ENOENT') throw err
@@ -43,7 +48,7 @@ function main() {
 }
 
 function buildProject(name, project, ctx) {
-  var dir = path.join(__dirname, 'proj', name)
+  var dir = path.join(targetDir, name)
     , index = path.join(dir, 'index.html')
 
   try {

bin/publish.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+bail() {
+    echo fail: $*
+    exit 1
+}
+
+# exit on errors
+set -e
+
+publish_host=samhuri.net
+publish_dir=samhuri.net/public/
+
+# test
+if [[ "$1" = "-t" ]]; then
+    prefix=echo
+    shift
+fi
+
+# --delete, passed to rsync
+if [[ "$1" = "--delete" ]]; then
+    delete="--delete"
+    shift
+fi
+
+if [[ $# -eq 0 ]]; then
+    if [[ "$delete" != "" ]]; then
+        bail "no paths given, cowardly refusing to publish everything with --delete"
+    fi
+    $prefix rsync -aKv $delete public/* "$publish_host":"${publish_dir}${subdir}"
+else
+    $prefix rsync -aKv $delete "$@" "$publish_host":"${publish_dir}${subdir}"
+fi

combine.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env zsh
-
-
-### javascript ###
-
-# blog
-echo "request,showdown,strftime,tmpl,jquery-serializeObject,blog -> assets/blog-all.min.js"
-cat assets/{request,showdown,strftime,tmpl,jquery-serializeObject,blog}.min.js >|assets/blog-all.min.js
-
-# project index
-echo "gitter,store -> assets/proj-index-all.min.js"
-cat assets/{gitter,store}.min.js >|assets/proj-index-all.min.js
-
-# projects
-echo "gitter,store,proj -> assets/proj-all.min.js"
-cat assets/{gitter,store,proj}.min.js >|assets/proj-all.min.js
-
-
-### css ###
-
-# blog
-echo "style,blog -> assets/blog-all.min.css"
-cat assets/{style,blog}.min.css >|assets/blog-all.min.css
-
-# project index
-echo "style,proj-common,proj-index -> assets/proj-index-all.min.css"
-cat assets/{style,proj-common,proj-index}.min.css >|assets/proj-index-all.min.css
-
-# projects
-echo "style,proj-common,proj -> assets/proj-all.min.css"
-cat assets/{style,proj-common,proj}.min.css >|assets/proj-all.min.css

public/index.html

@@ -4,21 +4,24 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>samhuri.net</title>
-  <link rel="icon" type="image/gif" href="assets/s.gif">
-  <link rel="stylesheet" href="assets/style.min.css">
-  <link rel="stylesheet" media="screen" href="assets/mobile.min.css">
+  <link rel="icon" type="image/gif" href="images/s.gif">
+  <link rel="stylesheet" href="css/style.min.css">
+  <link rel="stylesheet" media="screen" href="css/mobile.min.css">
   <!--[if lt IE 7]>
-  <link rel="stylesheet" href="assets/ie6.min.css">
+  <link rel="stylesheet" href="css/ie6.min.css">
   <![endif]-->
   <!--[if lt IE 8]>
-  <link rel="stylesheet" href="assets/ie7.min.css">
+  <link rel="stylesheet" href="css/ie7.min.css">
   <![endif]-->
 </head>
 <body>
+
 <header>
   <h1>samhuri.net</h1>
 </header>
-<a href="https://github.com/samsonjs/samhuri.net"><img id="forkme" src="assets/forkme.png" alt="Fork me on GitHub"></a>
+
+<a href="https://github.com/samsonjs/samhuri.net"><img id="forkme" src="images/forkme.png" alt="Fork me on GitHub"></a>
+
 <nav>
   <ul class="nav" id="main">
     <li><a href="proj">projects</a></li>
@@ -26,13 +29,15 @@
     <li><a href="json-diff">json-diff</a></li>
   </ul>
 </nav>
+
+<p id="promote-js">
+  <a class="img" href="https://developer.mozilla.org/en/JavaScript/Guide" title="JS Tutorial, JavaScript Tutorial, JavaScript Guide, Learn JavaScript JS, How To Learn JS, Learning JavaScript"><img src="images/promotejshs.png" height="150" width="180" alt="JS Tutorial, JavaScript Tutorial, JavaScript Guide, Learn JavaScript JS, How To Learn JS, Learning JavaScript"></a>
+</p>
+
 <footer>
   <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
   <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
 </footer>
-<p id="promote-js">
-  <a class="img" href="https://developer.mozilla.org/en/JavaScript/Guide" title="JS Tutorial, JavaScript Tutorial, JavaScript Guide, Learn JavaScript JS, How To Learn JS, Learning JavaScript"><img src="assets/promotejshs.png" height="150" width="180" alt="JS Tutorial, JavaScript Tutorial, JavaScript Guide, Learn JavaScript JS, How To Learn JS, Learning JavaScript"></a>
-</p>
 
 <script>
 var _gaq = _gaq || []

public/js/iepngfix.htc

@@ -16,7 +16,7 @@ IEPNGFix.data = IEPNGFix.data || {};
 // * An absolute path like:  '/images/blank.gif'
 // * A path relative to this HTC file like:  thisFolder + 'blank.gif'
 var thisFolder = document.URL.replace(/(\\|\/)[^\\\/]*$/, '/');
-IEPNGFix.blankImg = thisFolder + 'blank.gif';
+IEPNGFix.blankImg = '/images/blank.gif';
 
 
 IEPNGFix.fix = function(elm, src, t) {

samhuri.net.tmproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>assets/mobile.css</string>
+	<string>.gitignore</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -14,7 +14,9 @@
 			<key>regexFileFilter</key>
 			<string>!(\.DS_Store|.*\.min\..*|.*\.tmproj)$</string>
 			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|samhuri\.net/blog|node_modules|CVS|_blog|samhuri.net/proj|Chalk|json-diff|riak-js|f|node|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
+			<string>!.*/(\.[^/]*|public/blog|node_modules|CVS|_blog|public/proj|Chalk|json-diff|riak-js|f|node|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
+			<key>selected</key>
+			<true/>
 			<key>sourceDirectory</key>
 			<string></string>
 		</dict>
@@ -23,6 +25,20 @@
 	<integer>200</integer>
 	<key>metaData</key>
 	<dict>
+		<key>.gitignore</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>7</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
 		<key>Makefile</key>
 		<dict>
 			<key>caret</key>
@@ -30,7 +46,7 @@
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>25</integer>
+				<integer>46</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -44,93 +60,35 @@
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>3</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>-1</integer>
-		</dict>
-		<key>assets/blog.css</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>17</integer>
-				<key>line</key>
-				<integer>1</integer>
+				<integer>22</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>assets/mobile.css</key>
+		<key>bin/blog.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>25</integer>
+				<integer>119</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>0</integer>
+			<integer>91</integer>
 		</dict>
-		<key>assets/request.js</key>
+		<key>public/js/iepngfix.htc</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>14</integer>
+				<integer>20</integer>
 				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>assets/style.css</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>25</integer>
-				<key>line</key>
-				<integer>25</integer>
-			</dict>
-			<key>columnSelection</key>
-			<false/>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>15</integer>
-				<key>line</key>
-				<integer>25</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>25</integer>
-				<key>line</key>
-				<integer>25</integer>
-			</dict>
-		</dict>
-		<key>combine.sh</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>40</integer>
-				<key>line</key>
-				<integer>21</integer>
+				<integer>18</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -154,13 +112,15 @@
 	</dict>
 	<key>openDocuments</key>
 	<array>
-		<string>assets/blog.css</string>
-		<string>assets/style.css</string>
-		<string>assets/mobile.css</string>
+		<string>bin/blog.rb</string>
+		<string>TODO</string>
+		<string>Makefile</string>
+		<string>public/js/iepngfix.htc</string>
+		<string>.gitignore</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>
 	<key>windowFrame</key>
-	<string>{{0, 4}, {1120, 1024}}</string>
+	<string>{{840, 4}, {840, 1024}}</string>
 </dict>
 </plist>

templates/blog/archive.html

@@ -4,9 +4,9 @@
 <meta name="viewport" content="width=device-width">
 <title>archive :: sjs' blog</title>
 <meta name="keywords" content="{{keywords}}">
-<link rel="icon" type="image/gif" href="../assets/s.gif">
-<link rel="stylesheet" href="../assets/blog-all.min.css">
-<link rel="stylesheet" media="screen" href="../assets/mobile.min.css">
+<link rel="icon" type="image/gif" href="../images/s.gif">
+<link rel="stylesheet" href="../css/blog-all.min.css">
+<link rel="stylesheet" media="screen" href="../css/mobile.min.css">
 <link rel="alternate" type="application/rss+xml" href="http://samhuri.net/blog/sjs.rss" title="sjs' blog">
 <body id="blog">
 <nav id="breadcrumbs"><a href="../">samhuri.net</a></nav>

templates/blog/index.html

@@ -3,9 +3,9 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
 <title>sjs' blog</title>
-<link rel="icon" type="image/gif" href="../assets/s.gif">
-<link rel="stylesheet" href="../assets/blog-all.min.css">
-<link rel="stylesheet" media="screen" href="../assets/mobile.min.css">
+<link rel="icon" type="image/gif" href="../images/s.gif">
+<link rel="stylesheet" href="../css/blog-all.min.css">
+<link rel="stylesheet" media="screen" href="../css/mobile.min.css">
 <link rel="alternate" type="application/rss+xml" href="http://samhuri.net/blog/sjs.rss" title="sjs' blog">
 <body id="blog">
 <nav id="breadcrumbs"><a href="../">samhuri.net</a></nav>
@@ -19,7 +19,7 @@
 <div class="center" id="sd-container"><a id="sd" href="#comment-stuff">show the discussion</a></div>
 <div id="comment-stuff">
   <div id="comments">
-    <div id="comments-spinner"><img src="../assets/spinner.gif"></div>
+    <div id="comments-spinner"><img src="../images/spinner.gif"></div>
   </div>
   <form id="comment-form">
     <input name="post" type="hidden" value="{{filename}}">
@@ -69,7 +69,7 @@ _gaq.push( ['_setAccount', 'UA-214054-5']
 window.SJS = window.SJS || {}
 window.SJS.filename = "{{filename}}"
 </script>
-<script src="../assets/blog-all.min.js"></script>
+<script src="../js/blog-all.min.js"></script>
 {{/comments}}
 </body>
 </html>

templates/blog/post.html

@@ -4,9 +4,9 @@
 <meta name="viewport" content="width=device-width">
 <title>{{title}} :: sjs' blog</title>
 <meta name="keywords" content="{{keywords}}">
-<link rel="icon" type="image/gif" href="../assets/s.gif">
-<link rel="stylesheet" href="../assets/blog-all.min.css">
-<link rel="stylesheet" media="screen" href="../assets/mobile.min.css">
+<link rel="icon" type="image/gif" href="../images/s.gif">
+<link rel="stylesheet" href="../css/blog-all.min.css">
+<link rel="stylesheet" media="screen" href="../css/mobile.min.css">
 <link rel="alternate" type="application/rss+xml" href="http://samhuri.net/blog/sjs.rss" title="sjs' blog">
 <body id="blog">
 <nav id="breadcrumbs"><a href="../">samhuri.net</a></nav>
@@ -20,7 +20,7 @@
 <div class="center" id="sd-container"><a id="sd" href="#comment-stuff">show the discussion</a></div>
 <div id="comment-stuff">
   <div id="comments">
-    <div id="comments-spinner"><img src="../assets/spinner.gif"></div>
+    <div id="comments-spinner"><img src="../images/spinner.gif"></div>
   </div>
   <form id="comment-form">
     <input name="post" type="hidden" value="{{filename}}">
@@ -70,7 +70,7 @@ _gaq.push( ['_setAccount', 'UA-214054-5']
 window.SJS = window.SJS || {}
 window.SJS.filename = "{{filename}}"
 </script>
-<script src="../assets/blog-all.min.js"></script>
+<script src="../js/blog-all.min.js"></script>
 {{/comments}}
 </body>
 </html>

templates/proj/index.html

@@ -3,16 +3,16 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>projects :: samhuri.net</title> 
-  <link rel="icon" type="image/gif" href="../assets/s.gif">
-  <link rel="stylesheet" href="../assets/proj-index-all.min.css">
-  <link rel="stylesheet" media="screen" href="../assets/mobile.min.css">
+  <link rel="icon" type="image/gif" href="../images/s.gif">
+  <link rel="stylesheet" href="../css/proj-index-all.min.css">
+  <link rel="stylesheet" media="screen" href="../css/mobile.min.css">
   <!--[if IE 6]>
-  <link rel="stylesheet" href="../assets/ie6.min.css">
+  <link rel="stylesheet" href="../css/ie6.min.css">
   <![endif]-->
   <!--[if lt IE 8]>
-  <link rel="stylesheet" href="../assets/ie7.min.css">
+  <link rel="stylesheet" href="../css/ie7.min.css">
   <script src="http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js"></script>
-  <script src="../assets/storage-polyfill.min.js"></script>
+  <script src="../js/storage-polyfill.min.js"></script>
   <![endif]-->
   <style>
     #gh { text-align: center }
@@ -22,7 +22,7 @@
   </style>
 </head>
 <nav id="breadcrumbs"><a href="../">samhuri.net</a></nav>
-<a href="https://github.com/samsonjs"><img id="forkme" src="../assets/forkme.png" alt="Fork me on GitHub"></a>
+<a href="https://github.com/samsonjs"><img id="forkme" src="../images/forkme.png" alt="Fork me on GitHub"></a>
 <header>
   <h1>projects</h1>
 </header>
@@ -34,18 +34,18 @@
   </ul>
 </nav>
 <p id="gh">
-  <a class="img" href="https://github.com/samsonjs"><img src="../assets/gh.png" alt="GitHub"></a>
+  <a class="img" href="https://github.com/samsonjs"><img src="../images/gh.png" alt="GitHub"></a>
 </p>
 <table align="center" id="stats">
   <tr>
-    <td align="right"><span id="nrepos"><img src="../assets/spinner.gif"></span> projects</td>
+    <td align="right"><span id="nrepos"><img src="../images/spinner.gif"></span> projects</td>
     <td>&mdash;</td>
-    <td align="left"><span id="nfollowers"><img src="../assets/spinner.gif"></span> followers</td>
+    <td align="left"><span id="nfollowers"><img src="../images/spinner.gif"></span> followers</td>
   </tr>
   <tr>
-    <td align="right">watching <span id="nwatched"><img src="../assets/spinner.gif"></span>
+    <td align="right">watching <span id="nwatched"><img src="../images/spinner.gif"></span>
     <td>&mdash;</td>
-    <td align="left">following <span id="nfollowing"><img src="../assets/spinner.gif"></span></td>
+    <td align="left">following <span id="nfollowing"><img src="../images/spinner.gif"></span></td>
   </tr>
 </table>
 <footer>
@@ -53,7 +53,7 @@
   <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
 </footer>
 <p id="promote-js">
-  <a class="img" href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function" title='JS Function arity'><img src="../assets/promotejsh.gif" height="150" width="180" alt='JS Function arity'/></a>
+  <a class="img" href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function" title='JS Function arity'><img src="../images/promotejsh.gif" height="150" width="180" alt='JS Function arity'/></a>
 </p>
 <script>
 var _gaq = _gaq || []
@@ -71,7 +71,7 @@ _gaq.push( ['_setAccount', 'UA-214054-5']
   s.parentNode.insertBefore(ga, s)
 }())
 </script>
-<script src="../assets/proj-index-all.min.js"></script>
+<script src="../js/proj-index-all.min.js"></script>
 <script>
 if (typeof console === 'undefined') {
   console = {log:function(){}}

templates/proj/project.html

@@ -3,33 +3,33 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>{{name}} :: samhuri.net</title>
-  <link rel="icon" type="image/gif" href="../../assets/s.gif">
-  <link rel="stylesheet" href="../../assets/proj-all.min.css">
-  <link rel="stylesheet" media="screen" href="../../assets/mobile.min.css">
+  <link rel="icon" type="image/gif" href="../../images/s.gif">
+  <link rel="stylesheet" href="../../css/proj-all.min.css">
+  <link rel="stylesheet" media="screen" href="../../css/mobile.min.css">
 </head>
 <nav id="breadcrumbs"><a href="../../">samhuri.net</a> &bull; <a href="../">projects</a></nav>
-<a href="https://github.com/samsonjs/{{name}}"><img id="forkme" src="../../assets/forkme.png" alt="Fork me on GitHub"></a>
+<a href="https://github.com/samsonjs/{{name}}"><img id="forkme" src="../../images/forkme.png" alt="Fork me on GitHub"></a>
 <h1>{{name}}</h1>
 <h2>{{description}}</h2>
 <table align="center">
   <tr>
-    <td align="right"><span id="nwatchers"><img src="../../assets/spinner.gif"></span> watcher<span id="wplural">s</span></td>
+    <td align="right"><span id="nwatchers"><img src="../../images/spinner.gif"></span> watcher<span id="wplural">s</span></td>
     <td>&mdash;</td>
-    <td align="left"><span id="nforks"><img src="../../assets/spinner.gif"></span> fork<span id="fplural">s</span></td>
+    <td align="left"><span id="nforks"><img src="../../images/spinner.gif"></span> fork<span id="fplural">s</span></td>
   </tr>
 </table>
 <div id="info">
   <div>
     <h4>branches</h4>
-    <span id="branches"><img src="../../assets/spinner.gif"></span>
+    <span id="branches"><img src="../../images/spinner.gif"></span>
   </div>
   <div>
     <h4>languages</h4>
-    <span id="langs"><img src="../../assets/spinner.gif"></span>
+    <span id="langs"><img src="../../images/spinner.gif"></span>
   </div>
   <div id="contributors-box">
     <h4>contributors</h4>
-    <span id="contributors"><img src="../../assets/spinner.gif"></span>
+    <span id="contributors"><img src="../../images/spinner.gif"></span>
   </div>
   <br class="clear">
 </div>
@@ -54,10 +54,10 @@ _gaq.push( ['_setAccount', 'UA-214054-5']
 </script>
 <!--[if lt IE 8]>
 <script src="http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js"></script>
-<script src="../../assets/storage-polyfill.min.js"></script>
+<script src="../../js/storage-polyfill.min.js"></script>
 <![endif]-->
 <script src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.1.0/prototype.js"></script>
-<script src="../../assets/proj-all.min.js"></script>
+<script src="../../js/proj-all.min.js"></script>
 <script>
 SJS.proj('{{name}}')
 </script>