Add Sass/css, and move templates away from designers' reach.

3 files changed, 35 insertions, 30 deletions

diff --git a/ikiroles.mdwn b/ikiroles.mdwn
index 491eb69..bd6ad35 100644
--- a/ikiroles.mdwn
+++ b/ikiroles.mdwn
@@ -22,12 +22,12 @@ alternate development draft site using different git branch for content and/or s
 	center=1
 
 	{rank=same; user author designer}
-//	{rank=same; search_query txt tmpl media}
+//	{rank=same; search_query txt css media}
 	subgraph cluster_clitools {
 		label="Commandline editing"
 		style=dashed
 		txt
-		tmpl
+		css
 		media
 	}
 	subgraph cluster_webtools {
@@ -36,13 +36,13 @@ alternate development draft site using different git branch for content and/or s
 		txt
 		search_query
 	}
-//	{rank=same; txt_stored media_stored tmpl_stored}
+//	{rank=same; txt_stored media_stored css_stored}
 	subgraph cluster_storage {
 		label="Server storage"
 		style=dashed
 		search_db
 		txt_stored
-		tmpl_stored
+		css_stored
 		media_stored
 	}
 	{rank=same; webpages webpages_alt webpages_searchresult}
@@ -56,14 +56,14 @@ alternate development draft site using different git branch for content and/or s
 	search_query [shape=plaintext, label="Search query"]
 	txt [shape=plaintext, label="Markdown text"]
 	media [shape=plaintext, label="Graphics file"]
-	tmpl [shape=plaintext, label="Html template"]
+	css [shape=plaintext, label="Sass files"]
 
 	search_db [shape=box, label="Search index"]
 
 	/* stored data types */
 	txt_stored [shape=box, label="Version-controlled Markdown texts"]
 	media_stored [shape=box, label="Graphics files"]
-	tmpl_stored [shape=box, label="Version-controlled html templates"]
+	css_stored [shape=box, label="Version-controlled Sass files"]
 
 	webpages [label="Static website"]
 	webpages_alt [label="Alternate static website", color=grey]
@@ -76,8 +76,8 @@ alternate development draft site using different git branch for content and/or s
 
 	designer -> txt
 
-	designer -> tmpl -> tmpl_stored -> webpages
-	tmpl_stored -> webpages_alt [color=grey]
+	designer -> css -> css_stored -> webpages
+	css_stored -> webpages_alt [color=grey]
 
 	designer -> media -> media_stored -> webpages
 	media_stored -> webpages_alt [color=grey]
diff --git a/ikiwiki/website.mdwn b/ikiwiki/website.mdwn
index ceb8115..77580f6 100644
--- a/ikiwiki/website.mdwn
+++ b/ikiwiki/website.mdwn
@@ -79,8 +79,8 @@ ikiwiki-based websites are setup to reflect that:
 	/* input data */
 	txt [shape=plaintext, label="text"]
 	media [shape=plaintext, label="graphics"]
-	tmpl [shape=plaintext, label="templates"]
-	{rank=same; txt tmpl media}
+	css [shape=plaintext, label="stylesheets"]
+	{rank=same; txt css media}
 
 	iki_engine [shape=box, label="web engine"]
 
@@ -88,7 +88,7 @@ ikiwiki-based websites are setup to reflect that:
 	reader -> webpages [dir=back]
 	editor -> txt -> iki_engine
 	designer -> media -> iki_engine
-	designer -> tmpl -> iki_engine
+	designer -> css -> iki_engine
 	iki_engine -> webpages
 }
 """]]
@@ -117,14 +117,14 @@ causes the static web page to be regenerated.
 	/* stored data */
 	txt_stored [shape=box, label="text content"]
 	media_stored [shape=box, label="graphics files"]
-	tmpl_stored [shape=box, label="html templates"]
-	{rank=same; txt_stored media_stored tmpl_stored}
+	css_stored [shape=box, label="Sass files"]
+	{rank=same; txt_stored media_stored css_stored}
 
 	/* paths */
 	editor -> webpages [dir=back]
 	editor -> content_form -> txt_stored -> webpage_new
 	media_stored -> webpage_new
-	tmpl_stored -> webpage_new
+	css_stored -> webpage_new
 }
 """]]
 
@@ -149,13 +149,13 @@ maybe even while offline.
 	/* stored data */
 	txt_stored [shape=box, label="text content"]
 	media_stored [shape=box, label="graphics files"]
-	tmpl_stored [shape=box, label="html templates"]
-	{rank=same; txt_stored media_stored tmpl_stored}
+	css_stored [shape=box, label="Sass files"]
+	{rank=same; txt_stored media_stored css_stored}
 
 	/* paths */
 	designer -> webpages [dir=back]
 	designer -> git -> txt_stored -> webpage_new
 	media_stored -> webpage_new
-	tmpl_stored -> webpage_new
+	css_stored -> webpage_new
 }
 """]]
diff --git a/ikiwiki/website/tech.mdwn b/ikiwiki/website/tech.mdwn
index 05fcf50..5e0c43d 100644
--- a/ikiwiki/website/tech.mdwn
+++ b/ikiwiki/website/tech.mdwn
@@ -26,15 +26,16 @@ and different kinds of users (see also the [[introduction|website]]):
 	txt_editor [shape=plaintext, label="Markdown text"]
 	txt_designer [shape=plaintext, label="Markdown text"]
 	media [shape=plaintext, label="graphics files"]
+	css [shape=plaintext, label="Sass files"]
 	tmpl [shape=plaintext, label="html templates"]
-//	{rank=same; search_query txt_editor txt_designer tmpl media}
+//	{rank=same; search_query txt_editor txt_designer css tmpl media}
 
 	/* user tool */
 	browser_reader [label="web browser"]
 	browser_editor [label="web browser"]
 	browser_designer [label="web browser"]
 	vcs_txt_local [shape=egg, label="Git repository"]
-	vcs_tmpl_local [shape=egg, label="Git repository"]
+	vcs_css_local [shape=egg, label="Git repository"]
 	fs_local [shape=egg, label="filesystem"]
 
 	/* user interface */
@@ -45,17 +46,19 @@ and different kinds of users (see also the [[introduction|website]]):
 	/* storage types */
 	search_db [shape=egg, label="search index (Hyper Estraier)"]
 	vcs_txt [shape=egg, label="VCS repository (Git)"]
-	vcs_tmpl [shape=egg, label="VCS repository (Git)"]
+	vcs_css [shape=egg, label="VCS repository (Git)"]
 	fs [shape=egg, label="filesystem"]
-//	{rank=same; search_db vcs_txt vcs_tmpl fs}
+	compass [shape=egg, label="Sass libraries (compass)"]
+//	{rank=same; search_db vcs_txt vcs_css fs compass}
 
 	/* stored data */
 	txt_stored [shape=plaintext, label="version-controlled Markdown text"]
 	media_stored [shape=plaintext, label="graphics files"]
-	tmpl_stored [shape=plaintext, label="version-controlled html templates"]
-//	{rank=same; txt_stored media_stored tmpl_stored}
+	css_stored [shape=plaintext, label="version-controlled Sass files"]
+//	{rank=same; txt_stored media_stored css_stored}
 
 	/* engines */
+	css_engine [shape=box, label="css renderer (Sass)"]
 	iki_engine [shape=box, label="html renderer (Ikiwiki)"]
 	search_engine [shape=box, label="search engine (Hyper Estraier)"]
 	{rank=same; iki_engine search_engine}
@@ -65,9 +68,9 @@ and different kinds of users (see also the [[introduction|website]]):
 		label="commandline editing"
 		style=dashed
 		txt_designer
-		tmpl
+		css
 		media
-		vcs_tmpl_local
+		vcs_css_local
 		vcs_txt_local
 		fs_local
 	}
@@ -86,13 +89,14 @@ and different kinds of users (see also the [[introduction|website]]):
 	subgraph cluster_storage {
 		label="server storage"
 		style=dashed
-		vcs_tmpl
+		vcs_css
 		vcs_txt
 		fs
 		search_db
 		txt_stored
-		tmpl_stored
+		css_stored
 		media_stored
+		compass
 	}
 
 	/* paths */
@@ -109,9 +113,10 @@ and different kinds of users (see also the [[introduction|website]]):
 
 	vcs_txt_local -> vcs_txt [dir=both]
 
-	designer -> tmpl -> vcs_tmpl_local
-	vcs_tmpl_local -> vcs_tmpl [dir=both]
-	vcs_tmpl -> tmpl_stored -> iki_engine
+	designer -> css -> vcs_css_local
+	vcs_css_local -> vcs_css [dir=both]
+	vcs_css -> css_stored -> css_engine -> iki_engine
+	compass -> css_engine -> iki_engine
 
 	designer -> media -> fs_local
 	fs_local -> fs [dir=both]