Merge branch 'hotfix-10.8.35' into stable

.travis.yml

@@ -3,24 +3,28 @@ rvm:
   - 1.9.3
 jdk:
   - oraclejdk8
-sudo: required
-group: deprecated
-addons:
-  mariadb: '10.1'
+node_js:
+  - "4.2.6"
 services:
   - docker
+  - mysql
 before_install:
-- mkdir /tmp/bin
-- export PATH=$PATH:/tmp/bin
+  - mkdir /tmp/bin
+  - export PATH=$PATH:/tmp/bin
 install:
-- curl --location 'https://www.ortussolutions.com/parent/download/commandbox/type/bin' -o /tmp/box.zip
-- unzip /tmp/box.zip -d /tmp/bin
-- sed -i "s/java_args='-client'/java_args='-Xmx512m -client'/" /tmp/bin/box
-- gem install s3_website
+  - curl --location 'https://www.ortussolutions.com/parent/download/commandbox/type/bin' -o /tmp/box.zip
+  - unzip /tmp/box.zip -d /tmp/bin
+  - sed -i "s/java_args='-client'/java_args='-Xmx512m -client'/" /tmp/bin/box
+  - gem install s3_website
 before_script:
-- mysql -u root -e 'create database preside_test;'
+  - mysql -u root -e 'create database preside_test;'
+  - npm install grunt-cli -g
 script:
-- "./build.sh"
+  - "./build.sh"
+cache:
+  directories:
+    - system/assets/node_modules
+    - $HOME/.CommandBox
 
 notifications:
   email: false

build.sh

@@ -11,10 +11,11 @@ echo "";
 echo "This script will install dependencies, run tests, and conditionally build docs and package preside into a ZIP file.";
 echo "Each of these operations can be run independently with the following commands:";
 echo "";
-echo "box install                      - installs dependencies";
-echo "./test.sh                        - runs tests";
-echo "./support/docs/build.sh          - builds documentation";
-echo "ant -f ./support/build/build.xml - packages PresideCMS into a zip file";
+echo "box install                                   - installs dependencies";
+echo "cd system/assets/ && npm install && grunt all - builds static assets";
+echo "./test.sh                                     - runs tests";
+echo "./support/docs/build.sh                       - builds documentation";
+echo "ant -f ./support/build/build.xml              - packages PresideCMS into a zip file";
 echo "";
 echo "The script has dependencies on CommandBox, ant + an accessible database for running the test suite.";
 echo "";
@@ -23,9 +24,19 @@ echo "-------------------------------------------------------";
 echo "";
 echo "Installing dependencies via box.json...";
 echo "";
-box install --force save=false
-rm -rf ./system/externals/lucee-spreadsheet/javaLoader
-rm -rf ./system/externals/lucee-spreadsheet/test
+box install --force save=false || exit 1;
+rm -rf ./system/externals/lucee-spreadsheet/javaLoader;
+rm -rf ./system/externals/lucee-spreadsheet/test;
+
+
+echo "";
+echo "Building static assets with grunt";
+echo "";
+
+cd system/assets;
+npm install || exit 1;
+grunt all || exit 1;
+cd ../../;
 
 echo "";
 echo "Running tests (please be patient, expect this to take several minutes)...";
@@ -92,4 +103,4 @@ echo "";
 echo "All done :)";
 echo "";
 
-exit 0;
+exit 0;

support/docs/docs/03.contribguides/01.buildfromsource/page.md

@@ -3,14 +3,19 @@ id: buildfromsource
 title: Building Preside locally
 ---
 
-In order to run Preside from a local copy of the codebase, the system requires that external dependencies be pulled in to the expected locations in the project. Before continuing, you will need to make sure you have [CommandBox](https://www.ortussolutions.com/products/commandbox) installed and available in your path. Build steps:
+In order to run Preside from a local copy of the codebase, the system requires that external dependencies be pulled in to the expected locations in the project. Before continuing, you will need to make sure you have [CommandBox](https://www.ortussolutions.com/products/commandbox), [NodeJs](https://nodejs.org/en/) and [grunt-cli](https://www.npmjs.com/package/grunt-cli) installed and available in your path. Build steps:
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) the [GitHub repository](https://github.com/pixl8/Preside-CMS)
 2. [Make a local clone](https://help.github.com/articles/cloning-a-repository/) of your forked repository
-3. Run the `box install` command to have CommandBox pull in all of presides dependencies that are declared in its `box.json` file:
+3. Run the `box install save=false` command to have CommandBox pull in all of presides dependencies that are declared in its `box.json` file:
 ```
 /preside> box install
 ```
+4. CD into the `system/assets` directory and run `grunt` to compile static assets:
+```
+/preside/system/assets> npm install && grunt all
+```
+
 
 Once you have the repository cloned to your local machine and have pulled down the dependencies, create a `/preside` mapping in your application that points at your clone. You will then be able to develop in your fork and test the changes in your application. See [[submittingchanges]] for details on how best to contribute your changes back to the project.
 

system/assets/.gitignore

@@ -1,3 +1,7 @@
 # Ignore ckeditor (pulled in externally)
 /ckeditor/*
-/node_modules/*
+/node_modules/*
+*.min.js
+*.min.css
+*.less.css
+*.min.map