aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-05-16 14:42:47 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-05-23 09:15:49 +0100
commit2e69a53ff5c3e15dd5a7a0fcb5f8fcedf3d6f778 (patch)
tree363e917f7b7da4ef0e431aadf0338246c2062817
parent599fc689b1df50eb1c6a7233af153693e23c46e3 (diff)
Introduce ability to install multiple, layered themes.
-rw-r--r--config/general.yml-example8
-rwxr-xr-xscript/rails-post-deploy10
2 files changed, 16 insertions, 2 deletions
diff --git a/config/general.yml-example b/config/general.yml-example
index 3c50e8005..019eb7ada 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -34,8 +34,12 @@ SPECIAL_REPLY_VERY_LATE_AFTER_DAYS: 60
# example public bodies for the home page, semicolon delimited - short_names
FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq'
-# URL of theme to install (when running rails-post-deploy script)
-THEME_URL: 'git://github.com/sebbacon/alavetelitheme.git'
+# URLs of themes to download and use (when running rails-post-deploy
+# script). Earlier in the list means the templates have a higher
+# priority.
+THEME_URLS:
+ - 'git://github.com/sebbacon/adminbootstraptheme.git'
+ - 'git://github.com/sebbacon/alavetelitheme.git'
# Whether a user needs to sign in to start the New Request process
FORCE_REGISTRATION_ON_NEW_REQUEST: false
diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index b0c0acdc5..370819c67 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -81,6 +81,16 @@ else
bundle exec bundle install
fi
+if [ -n "$OPTION_THEME_URLS" ]
+then
+ echo $OPTION_THEME_URLS
+ for THEME in $OPTION_THEME_URLS
+ do
+ script/plugin install --force $THEME
+ done
+fi
+
+# Old version of the above, for backwards compatibility
if [ -n "$OPTION_THEME_URL" ]
then
script/plugin install --force $OPTION_THEME_URL