Merge pull request #336 from LibCrowds/dev

v1.0.0-beta.2

bin/deploy.sh

@@ -3,7 +3,7 @@
 MASTER='www.libcrowds.com'
 STAGING='dev.libcrowds.com'
 
-if [ "${TRAVIS_BRANCH}" == "master" -a "$TRAVIS_PULL_REQUEST" = "false" ] || [ "${TRAVIS_BRANCH}" == "dev" ] ; then
+if [ "${TRAVIS_BRANCH}" == "master" -a "$TRAVIS_PULL_REQUEST" = "false" ] || [ "${TRAVIS_BRANCH}" == "dev" -a "$TRAVIS_PULL_REQUEST" = "false" ] ; then
 
   # Configure
   bin/configure.sh

docs/SUMMARY.md

@@ -8,3 +8,8 @@
   * [Directory Structure](configuration.md#directory-structure)
   * [Site Configuration](configuration.md#site-configuration)
   * [Microsite Configuration](configuration.md#microsite-configuration)
+* [Administration](administration.md)
+  * [Featured Projects](administration.md#featured-projects)
+  * [Categories](administration.md#categories)
+  * [Users](administration.md#users)
+  * [Background Jobs](administration.md#background-jobs)

docs/administration.md

@@ -0,0 +1,45 @@
+# Administration
+
+Administration settings can be accessed by admin users via the main navigation bar.
+
+![Admin menu](./assets/admin-menu.png?raw=true)
+
+## Featured Projects
+
+Featured projects will appear on the homepage of the microsite that they belong to, as well as in the categories menu on the contribute page.
+
+To feature or un-feature a project locate it by category and click the **Add to featured** or **Remove from featured** buttons.
+
+![Admin - Featured Projects](./assets/admin-featured.png?raw=true)
+
+The page also provides a list of currently featured projects.
+
+## Categories
+
+Categories for all microsites are created via the **New Category** section and edited or deleted via the **Current Categories** section.
+
+![Admin - Categories](./assets/admin-categories.png?raw=true)
+
+To link a category to a particular microsite click **Edit**, then on the subsequent page select the key of the **Microsite** within which you want the category (and all associated projects) to appear.
+
+![Admin - Edit Categories](./assets/admin-edit-categories.png?raw=true)
+
+To save any changes click **Update**.
+
+![Admin - Edit Categories Success](./assets/admin-edit-categories-success.png?raw=true)
+
+## Users
+
+To manage user administrator rights, search for the user by name and click the **Grant admin rights** or **Revoke admin rights** buttons.
+
+To download all user data click the **Export to CSV** or **Export to JSON** buttons.
+
+![Admin - Manage Users](./assets/admin-users.png?raw=true)
+
+The page also provides a list of current administrators.
+
+## Background Jobs
+
+All background jobs currently running on the server can be monitored via this page.
+
+![Admin - Background Jobs](./assets/admin-background-jobs.png?raw=true)