summaryrefslogtreecommitdiff
path: root/ikiwiki
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-02 02:58:27 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-02 02:58:27 +0200
commit41bd1226cba5b58ef7e551be4e815cb2d439660b (patch)
tree065a6fcba999f0a8c767a350b14ec5d93945a7fb /ikiwiki
parent97e7abf7570ac672c353b5a32574244c134587f7 (diff)
Add Sass/css, and move templates away from designers' reach.
Diffstat (limited to 'ikiwiki')
-rw-r--r--ikiwiki/website.mdwn18
-rw-r--r--ikiwiki/website/tech.mdwn31
2 files changed, 27 insertions, 22 deletions
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]