Major rewrite of graph: more intuitive structure.

1 files changed, 57 insertions, 23 deletions

diff --git a/ikisystem.mdwn b/ikisystem.mdwn
index c2aeb60..e1e6e49 100644
--- a/ikisystem.mdwn
+++ b/ikisystem.mdwn
@@ -13,32 +13,57 @@ and different kinds of users:
 //	rotate=90
 	center=1
 
-	subgraph cluster_user {
-		label="Any user"
+	{rank=same; user author designer}
+//	{rank=same; search_query txt_author txt_designer tmpl media}
+	subgraph cluster_clitools {
+		label="Commandline editing"
 		style=dashed
-		browser_user
+		txt_designer
+		tmpl
+		media
+		vcs_tmpl_local
+		vcs_txt_local
+		fs_local
 	}
-	subgraph cluster_author {
-		label="Author"
+	subgraph cluster_webtools {
+		label="Web editing"
 		style=dashed
-		browser_author
+		txt_author
+		search_query
+		{
+			rank=same
+			browser_user
+			browser_author
+			browser_designer
+		}
 	}
-	subgraph cluster_designer {
-		label="Web designer"
+	{rank=same; search_form txt_form}
+//	{rank=same; txt_stored media_stored tmpl_stored}
+//	{rank=same; search_db vcs_txt vcs_tmpl fs}
+	subgraph cluster_storage {
+		label="Server storage"
 		style=dashed
-		browser_designer
-		vcs_tmpl_local
-		vcs_txt_local
-		fs_local
+		vcs_tmpl
+		vcs_txt
+		fs
+		search_db
+		txt_stored
+		tmpl_stored
+		media_stored
 	}
-	{rank=same; txt_form search_form}
-	{rank=same; search_db vcs_txt vcs_tmpl fs}
-	{rank=same; search_query txt media tmpl}
+	{rank=same; iki_engine search_engine}
 	{rank=same; webpages webpages_admin webpages_searchresult}
 
+	/* roles */
+	user [shape=house, label="Any user"]
+	author [shape=house, label="Author"]
+	designer [shape=house, label="Web designer"]
+
+	/* input data types */
 	search_query [shape=plaintext, label="Search query"]
-	txt [shape=plaintext, label="Markdown text"]
-	media [shape=plaintext, label="Graphics"]
+	txt_author [shape=plaintext, label="Markdown text"]
+	txt_designer [shape=plaintext, label="Markdown text"]
+	media [shape=plaintext, label="Graphics files"]
 	tmpl [shape=plaintext, label="Html templates"]
 
 	browser_user [label="Web browser"]
@@ -54,27 +79,36 @@ and different kinds of users:
 	vcs_txt [shape=egg, label="VCS repository (Git)"]
 	vcs_tmpl [shape=egg, label="VCS repository (Git)"]
 	fs [shape=egg, label="Filesystem"]
+
+	/* stored data types */
+	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"]
+
 	iki_engine [shape=box, label="Html renderer (Ikiwiki)"]
 	search_engine [shape=box, label="Search engine (Hyper Estraier)"]
 	webpages [label="Plain web pages"]
 	webpages_admin [label="Wiki pages"]
 	webpages_searchresult [label="Search results", style=dotted]
 
-	browser_user -> search_form -> search_query -> search_engine -> webpages_searchresult
-	search_db -> search_engine [weight=0]
+	user -> search_query -> browser_user -> search_form -> search_engine -> webpages_searchresult
+	search_db -> search_engine
 	search_db -> iki_engine [dir=back]
 
-	browser_author -> txt_form -> vcs_txt -> txt -> iki_engine -> webpages
+	author -> txt_author -> browser_author -> txt_form -> vcs_txt -> txt_stored -> iki_engine -> webpages
 	iki_engine -> webpages_admin
 
-	browser_designer -> txt_form
+	designer -> txt_designer -> browser_designer -> txt_form
+	txt_designer -> vcs_txt_local
 
 	vcs_txt_local -> vcs_txt [dir=both]
 
+	designer -> tmpl -> vcs_tmpl_local
 	vcs_tmpl_local -> vcs_tmpl [dir=both]
-	vcs_tmpl -> tmpl -> iki_engine
+	vcs_tmpl -> tmpl_stored -> iki_engine
 
+	designer -> media -> fs_local
 	fs_local -> fs [dir=both]
-	fs -> media -> iki_engine
+	fs -> media_stored -> iki_engine
 }
 """]]