Merge pull request #320 from withjam/issue308

Add options for new themes, include default files to track changes

Author: grtjn

app/templates/bower.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "dependencies": {
     "angular": "~1.4.4",
-    "angular-bootstrap": "~0.14.0",
+    "angular-bootstrap": "^1.1",
     "angular-cookies": "~1.4.4",
     "angular-highlightjs": "~0.4.3",
     "angular-mocks": "~1.4.4",
@@ -18,7 +18,9 @@
     "ml-search-ng": "~0.2.0",
     "ml-utils": "withjam/ml-utils",
     "ng-json-explorer": "8c2a0f9104",
-    "vkbeautify-wrapper": "*"
+    "vkbeautify-wrapper": "*",
+    "highcharts": "^4.2",
+    "angular-google-maps": "^2.2"
   },
   "overrides": {
     "angular-highlightjs": {

app/templates/gulpfile.js

@@ -344,7 +344,7 @@ gulp.task('optimize', ['inject', 'test'], function() {
 
     // Rename the recorded file names in the steam, and in the html to append rev numbers
     .pipe($.revReplace())
-    
+
     // copy result to dist/, and print some logging..
     .pipe(gulp.dest(config.build))
     .pipe($.if(args.verbose, $.print()));

app/templates/ui/styles/main.less

@@ -5,13 +5,13 @@
 @FontAwesomePath:    "/fonts/";
 
 /* for the uiux pieces */
-@import "uiux.less";
+@import "theme.less";
 
 /* Admin design - icons for top nativation
 @import "admin.less";
 */
 
-/* Blue design 
+/* Blue design
 @import "blues.less";
 @import "blues-variables.less";
 */

app/templates/ui/styles/uiux.less renamed to app/templates/ui/styles/theme.less

@@ -185,8 +185,8 @@ width: 10px;
 height: 20px;
 }
 
-input.vertical { 
-  -webkit-appearance: slider-vertical; 
+input.vertical {
+  -webkit-appearance: slider-vertical;
   height: 100px;
-  writing-mode: bt-lr; 
-}
+  writing-mode: bt-lr;
+}

slushfile.js

@@ -323,7 +323,21 @@ gulp.task('init', ['checkForUpdates'], function (done) {
       'you will be asked to enter it at appropriate commands.\n? MarkLogic Admin Password?', default: ''},
     {type: 'input', name: 'nodePort', message: 'Node app port?', default: 9070},
     {type: 'input', name: 'appPort', message: 'MarkLogic App/Rest port?', default: 8040},
-    {type: 'input', name: 'xccPort', message: 'XCC port?', default:8041, when: function(answers){return answers.mlVersion < 8;}}
+    {type: 'input', name: 'xccPort', message: 'XCC port?', default:8041, when: function(answers){return answers.mlVersion < 8;} },
+    {type:'list', name: 'template', message: 'Select Template', choices: [
+      { name: 'default', value: 'default' },
+      { name: '3-columns', value: '3column' },
+      { name: 'Dashboard', value: 'dashboard' },
+      { name: 'Full-screen map', value: 'map' },
+      { name: 'I don\'t know', value: 'unsure' }
+    ]},
+    {type:'list', name: 'theme', message: 'What is the main focus?', when: function(ans) { return ans.template === 'unsure'; }, choices: [
+      { name: 'Semantics', value: '3column' },
+      { name: 'Charts', value: 'dashboard' },
+      { name: 'Map/Graph', value: 'map' },
+      { name: 'Documents', value: '3column' },
+      { name: 'Other', value: 'default' }
+    ]}
   ];
 
   if (typeof appName === 'undefined') {
@@ -350,6 +364,9 @@ gulp.task('init', ['checkForUpdates'], function (done) {
       .then(function() {
         // Copy over the Angular files
         var files = [__dirname + '/app/templates/**'];
+        if (answers.theme !== 'default') { // overlay the theme if not the default theme chosen
+          files.push( __dirname + '/app/themes/' + (answers.theme || answers.template) + '/**');
+        }
 
         process.chdir('./' + answers.nameDashed);