From 5c1ab19573f51b8cb872b169e694c39a136d69b6 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Wed, 10 Oct 2012 17:19:19 +0100
Subject: [PATCH] Started refactoring tw5dropbox into separate wikis

One wiki for the hosted shared app, and one for the wiki app that is
created in the dropbox sandbox
---
 dbld.sh                                       | 10 +++----
 tw5dropbox/mainwiki/plugins/tiddlywiki.files  | 28 +++++++++++++++++++
 .../mainwiki/wiki/styles.template.css.tid     |  2 +-
 tw5dropbox/{mainwiki => }/plugins/async.js    |  0
 .../{mainwiki => }/plugins/async.js.meta      |  0
 tw5dropbox/{mainwiki => }/plugins/dropbox.js  |  0
 .../{mainwiki => }/plugins/logoutmacro.js     |  0
 7 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 tw5dropbox/mainwiki/plugins/tiddlywiki.files
 rename tw5dropbox/{mainwiki => }/plugins/async.js (100%)
 rename tw5dropbox/{mainwiki => }/plugins/async.js.meta (100%)
 rename tw5dropbox/{mainwiki => }/plugins/dropbox.js (100%)
 rename tw5dropbox/{mainwiki => }/plugins/logoutmacro.js (100%)

diff --git a/dbld.sh b/dbld.sh
index d7d3815ae..c5214f4ea 100755
--- a/dbld.sh
+++ b/dbld.sh
@@ -2,13 +2,13 @@
 
 # build TiddlyWiki5 in the Sky for Dropbox
 
-pushd tw5dropbox > /dev/null
+pushd tw5dropbox/mainwiki > /dev/null
 
-node ../core/boot.js \
+node ../../core/boot.js \
 	--verbose \
-	--savetiddler $:/core/templates/tw5dropbox.template.js ../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \
-	--savetiddler $:/core/templates/index.template.html ../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \
-	--savetiddler $:/core/templates/styles.template.css ../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \
+	--savetiddler $:/core/templates/tw5dropbox.template.js ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \
+	--savetiddler $:/core/templates/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \
+	--savetiddler $:/core/templates/styles.template.css ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \
 	|| exit 1
 
 popd > /dev/null
diff --git a/tw5dropbox/mainwiki/plugins/tiddlywiki.files b/tw5dropbox/mainwiki/plugins/tiddlywiki.files
new file mode 100644
index 000000000..155dd95c3
--- /dev/null
+++ b/tw5dropbox/mainwiki/plugins/tiddlywiki.files
@@ -0,0 +1,28 @@
+{
+	"tiddlers": [
+		{
+			"file": "../../plugins/async.js", 
+			"fields": {
+				"title": "$:/plugins/dropbox/async.js",
+				"type": "application/javascript",
+				"library": "yes"
+			}
+		},
+		{
+			"file": "../../plugins/dropbox.js",
+			"fields": {
+				"title": "$:/plugins/dropbox/dropbox.js",
+				"type": "application/javascript",
+				"module-type": "startup"
+			}
+		},
+		{
+			"file": "../../plugins/logoutmacro.js",
+			"fields": {
+				"title": "$:/plugins/dropbox/logoutmacro.js",
+				"type": "application/javascript",
+				"module-type": "macro"
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/tw5dropbox/mainwiki/wiki/styles.template.css.tid b/tw5dropbox/mainwiki/wiki/styles.template.css.tid
index a6da2ce65..4c4cbbbda 100644
--- a/tw5dropbox/mainwiki/wiki/styles.template.css.tid
+++ b/tw5dropbox/mainwiki/wiki/styles.template.css.tid
@@ -1,4 +1,4 @@
 title: $:/core/templates/styles.template.css
 type: text/x-tiddlywiki-html
 
-<<serialize "[is[shadow]type[text/css]]" application/x-tiddler-css>>
+<<serialize "[is[shadow]type[text/css]]" text/plain>>
diff --git a/tw5dropbox/mainwiki/plugins/async.js b/tw5dropbox/plugins/async.js
similarity index 100%
rename from tw5dropbox/mainwiki/plugins/async.js
rename to tw5dropbox/plugins/async.js
diff --git a/tw5dropbox/mainwiki/plugins/async.js.meta b/tw5dropbox/plugins/async.js.meta
similarity index 100%
rename from tw5dropbox/mainwiki/plugins/async.js.meta
rename to tw5dropbox/plugins/async.js.meta
diff --git a/tw5dropbox/mainwiki/plugins/dropbox.js b/tw5dropbox/plugins/dropbox.js
similarity index 100%
rename from tw5dropbox/mainwiki/plugins/dropbox.js
rename to tw5dropbox/plugins/dropbox.js
diff --git a/tw5dropbox/mainwiki/plugins/logoutmacro.js b/tw5dropbox/plugins/logoutmacro.js
similarity index 100%
rename from tw5dropbox/mainwiki/plugins/logoutmacro.js
rename to tw5dropbox/plugins/logoutmacro.js