Merge pull request #364 from marklogic/ui-themes

Merging Ui themes

Author: grtjn

app/templates/bower.json

@@ -2,25 +2,28 @@
   "name": "@sample-app-name",
   "version": "0.0.0",
   "dependencies": {
+    "jquery": "~2.1.4",
     "angular": "~1.4.4",
     "angular-bootstrap": "^1.1",
     "angular-cookies": "~1.4.4",
     "angular-highlightjs": "~0.4.3",
     "angular-mocks": "~1.4.4",
     "angular-ui-router": "~0.2.15",
     "angular-ui-tinymce": "~0.0.9",
+    "angular-animate": "~1.4.4",
+    "ngtoast": "^2.0.0",
     "angular-x2js": "https://github.com/janmichaelyu/angular-x2js.git",
     "bootstrap": "~3.3.5",
-    "font-awesome": "~4.4.0",
+    "font-awesome": "~4.6.0",
     "highlightjs":"~8.7.0",
-    "jquery": "~2.1.4",
     "lodash": "~3.10.1",
     "ml-search-ng": "~0.2.0",
     "ml-utils": "withjam/ml-utils",
     "ng-json-explorer": "8c2a0f9104",
     "vkbeautify-wrapper": "*",
     "highcharts": "^4.2",
-    "angular-google-maps": "^2.2"
+    "angular-google-maps": "2.3.2",
+    "tinymce-dist": "4.3.12"
   },
   "overrides": {
     "angular-highlightjs": {

app/templates/gulp.config.js

@@ -70,7 +70,8 @@ module.exports = function() {
       '**/*.module.js',
       '**/*.js'
     ],
-    less: client + 'styles/**/main.less',
+    less: client + 'styles/**/*.less',
+    mainLess: client + 'styles/**/main.less',
     report: report,
     root: root,
     server: server,

app/templates/gulpfile.js

@@ -76,7 +76,7 @@ gulp.task('styles', ['clean-styles'], function() {
   });
 
   return gulp
-    .src(config.less)
+    .src(config.mainLess)
     .pipe($.plumber()) // exit gracefully if something fails after this
     .pipe(less)
     .pipe($.autoprefixer({browsers: ['last 2 version', '> 5%']}))

app/templates/node-server/proxy.js

@@ -81,7 +81,7 @@ function getAuth(options, session) {
 // Generic proxy function used by multiple HTTP verbs
 function proxy(req, res) {
   var queryString = req.originalUrl.split('?')[1];
-  var path = '/v1' + req.path + (queryString ? '?' + queryString : '');
+  var path = req.baseUrl + req.path + (queryString ? '?' + queryString : '');
   console.log(
     req.method + ' ' + req.path + ' proxied to ' +
     options.mlHost + ':' + options.mlHttpPort + path);

app/templates/rest-api/config/options/all.xml

@@ -92,6 +92,18 @@
     </range>
   </constraint>
 
+  <!-- Example geospatial facet based on the sample-data, used by map theme -->
+  <constraint name="Location">
+    <geo-elem-pair> 
+      <parent ns="" name="location"/> 
+      <lat ns="" name="latitude"/> 
+      <lon ns="" name="longitude"/>
+      <geo-option>boundaries-included</geo-option>
+      <geo-option>score-function=reciprocal</geo-option>
+      <heatmap s="-90" w="-180" n="90" e="180" latdivs="4" londivs="4"/>
+    </geo-elem-pair>
+  </constraint>
+
   <!-- example facet constraint below -->
   <!--
   <constraint name="myconstraint">
@@ -113,4 +125,8 @@
   </suggestion-source>
   -->
 
+  <!-- This will extract the latitude and longitude from the search. -->
+  <extract-document-data selected="all">
+  </extract-document-data>
+
 </options>

app/templates/sample-data.zip

@@ -16,7 +16,8 @@
     'app.user',
     'ui.bootstrap',
     'ui.router',
-    'ui.tinymce'
+    'ui.tinymce',
+    'ngToast'
   ]);
 
 }());

app/templates/ui/app/app.js

@@ -4,9 +4,9 @@
   angular.module('app.create')
     .controller('CreateCtrl', CreateCtrl);
 
-  CreateCtrl.$inject = ['$scope', 'MLRest', '$state', 'userService'];
+  CreateCtrl.$inject = ['$scope', 'MLRest', '$state', 'userService', 'ngToast'];
 
-  function CreateCtrl($scope, mlRest, $state, userService) {
+  function CreateCtrl($scope, mlRest, $state, userService, toast) {
     var ctrl = this;
 
     angular.extend(ctrl, {
@@ -24,8 +24,10 @@
         address: null,
         about: null,
         registered: null,
-        latitude: 0,
-        longitude: 0,
+        location: {
+          latitude: 0,
+          longitude: 0
+        },
         tags: [],
         friends: [],
         greeting: null,
@@ -51,6 +53,7 @@
         // 'perm:sample-role': 'read',
         // 'perm:sample-role': 'update'
       }).then(function(response) {
+        toast.success('Record created.');
         $state.go('root.view', { uri: response.replace(/(.*\?uri=)/, '') });
       });
     }

app/templates/ui/app/create/create.controller.js

@@ -82,16 +82,16 @@ <h2 class="col-sm-10">Create a Document</h2>
     <div class="form-group">
       <label class="col-sm-2 control-label">Location</label>
       <div class="col-sm-5">
-        <input type="text" class="form-control" ng-model="ctrl.person.latitude" placeholder="">
+        <input type="text" class="form-control" ng-model="ctrl.person.location.latitude" placeholder="">
       </div>
       <div class="col-sm-5">
-        <input type="text" class="form-control" ng-model="ctrl.person.longitude" placeholder="">
+        <input type="text" class="form-control" ng-model="ctrl.person.location.longitude" placeholder="">
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-2 control-label">Tags</label>
       <div class="col-sm-10">
-        <input type="text" ng-model="ctrl.newTag"/>
+        <input type="text" ng-model="ctrl.newTag">
         <button class="add-feature btn btn-default btn-sm" ng-click="ctrl.addTag()">Add</button>
       </div>
       <div class="col-sm-10 col-sm-offset-2">

app/templates/ui/app/create/create.html

@@ -1,5 +1,5 @@
 (function () {
   'use strict';
 
-  angular.module('app.create', ['ml.common', 'app.user']);
+  angular.module('app.create', ['ml.common', 'app.user', 'ngToast']);
 }());