Merge 'develop' for mid-sprint release v1.1.141

config/demo-prod.json

@@ -1,6 +1,6 @@
 {
     "useStrict"    : "use strict",
-    "apiUrl"       : "https://api-demo.ottemo.io",
+    "apiUrl"       : "https://api.demo.ottemo.io",
     "mediaPath"    : "https://demo.ottemo.io/media/",
     "itemsPerPage" : "15"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Dashboard",
-  "version": "1.1.14",
+  "version": "1.1.141",
   "description": "Ottemo Administration Tool",
   "main": "gulpfile.js",
   "repository": {

src/app/app.scss

@@ -16,7 +16,7 @@
 @import 'cms/cms';
 @import 'config/config';
 @import 'dashboard/dashboard';
-@import 'design/design';
+@import 'core/core';
 @import 'discounts/discounts';
 @import 'impex/impex';
 @import 'login/login';

src/app/category/edit.html

@@ -10,7 +10,7 @@ <h1 ng-if="!category._id">
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="category"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="category"></ot-attributes-editor-form-tabs>

src/app/category/init.js

@@ -1,4 +1,4 @@
-angular.module("categoryModule", ["ngRoute", "ngResource", "designModule"])
+angular.module("categoryModule", ["ngRoute", "ngResource", "coreModule"])
 
 /*
  *  Basic routing configuration

src/app/category/list.html

@@ -5,5 +5,5 @@ <h1>
 </div>
 
 <!-- Table -->
-<gui-table-manager items="categories" object="this"></gui-table-manager>
+<ot-table-manager items="categories" object="this"></ot-table-manager>
 

src/app/cms/block-edit.html → src/app/cms/block/edit.html

@@ -7,7 +7,7 @@ <h1>
 
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="block"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="block"></ot-attributes-editor-form-tabs>

src/app/cms/block-list.html → src/app/cms/block/list.html

@@ -3,4 +3,4 @@ <h1><i class="fa fa-file-text-o"></i> Blocks</h1>
 </div>
 
 <!-- Table -->
-<gui-table-manager items="blocks" object="this"></gui-table-manager>
+<ot-table-manager items="blocks" object="this"></ot-table-manager>

src/app/cms/init.js

@@ -1,29 +1,29 @@
 angular.module('cmsModule', [
     'ngRoute',
     'ngResource',
-    'designModule'
+    'coreModule'
 ])
 
 .config(['$routeProvider', function($routeProvider) {
     $routeProvider
         .when('/cms/pages', {
-            templateUrl: '/views/cms/page-list.html',
+            templateUrl: '/views/cms/page/list.html',
             controller: 'cmsPageListController'
         })
         .when('/cms/pages/:id', {
-            templateUrl: '/views/cms/page-edit.html',
+            templateUrl: '/views/cms/page/edit.html',
             controller: 'cmsPageEditController'
         })
         .when('/cms/blocks', {
-            templateUrl: '/views/cms/block-list.html',
+            templateUrl: '/views/cms/block/list.html',
             controller: 'cmsBlockListController'
         })
         .when('/cms/blocks/:id', {
-            templateUrl: '/views/cms/block-edit.html',
+            templateUrl: '/views/cms/block/edit.html',
             controller: 'cmsBlockEditController'
         })
         .when('/cms/media', {
-            templateUrl: '/views/cms/media-list.html',
+            templateUrl: '/views/cms/media/list.html',
             controller: 'cmsMediaListController'
         });
 

src/app/cms/media-list.html → src/app/cms/media/list.html

@@ -12,7 +12,7 @@ <h4>Uploading Images</h4>
             <p>Accepted file formats: .jpg, .jpeg, .png, .gif</p>
         </div>
         <div class="col-sm-6">
-            <gui-message-manager item="up.message"></gui-message-manager>
+            <ot-message-manager item="up.message"></ot-message-manager>
 
             <div class="row">
                 <div class="col-xs-8">

src/app/cms/page-edit.html → src/app/cms/page/edit.html

@@ -6,7 +6,7 @@ <h1>
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="page"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="page"></ot-attributes-editor-form-tabs>

src/app/cms/page-list.html → src/app/cms/page/list.html

@@ -6,4 +6,4 @@ <h1>
 </div>
 
 <!-- Table -->
-<gui-table-manager items="pages" object="this"></gui-table-manager>
+<ot-table-manager items="pages" object="this"></ot-table-manager>

src/app/config/directives/guiConfigEditorForm.js → src/app/config/directives/ot-config-editor-form.directive.js

@@ -1,17 +1,17 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 /**
 *  Directive used for automatic attributes editor form creation
 */
-.directive("guiConfigEditorForm", [function () {
+.directive("otConfigEditorForm", [function () {
     return {
         restrict: "E",
         scope: {
             "parent": "=object",
             "item": "=item",
             "attributes": "=attributesList"
         },
-        templateUrl: "/views/config/gui/configEditorForm.html",
+        templateUrl: "/views/config/directives/ot-config-editor-form.html",
         controller: function ($scope) {
             var updateAttributes, addTab, addFields, sortFieldsInGroups;
 

src/app/config/gui/configEditorForm.html → src/app/config/directives/ot-config-editor-form.html

@@ -14,7 +14,7 @@
 
         <div class="tab-content animated fadeIn m-t-0">
             <div ng-class='{active:$first,in:$first}' id="collapse{{key}}" class="tab-pane fade" ng-repeat="(key, items) in attributeGroups">
-                <gui-form-builder attributes="items" item="item"></gui-form-builder>
+                <ot-form-builder attributes="items" item="item"></ot-form-builder>
             <div>
         </div>
         <br>

src/app/config/edit.html

@@ -7,9 +7,9 @@ <h1>
 
 <div ng-init="init()">
 	<!-- Error message -->
-    <gui-message-manager item="message"></gui-message-manager>
+    <ot-message-manager item="message"></ot-message-manager>
 
 	<!-- Tabs editor -->
-    <gui-config-editor-form attributes-list="sections" object="this" item="items"></gui-config-editor-form>
+    <ot-config-editor-form attributes-list="sections" object="this" item="items"></ot-config-editor-form>
 
 </div>

src/app/config/init.js

@@ -1,7 +1,7 @@
 /**
  * Config Module
  */
-angular.module("configModule", ["ngRoute", "ngResource", "designModule"])
+angular.module("configModule", ["ngRoute", "ngResource", "coreModule"])
 
 .config(["$routeProvider", function ($routeProvider) {
     $routeProvider

src/app/design/api.service.js → src/app/core/api.service.js

@@ -1,8 +1,8 @@
-angular.module("designModule")
+angular.module("coreModule")
 /*
  *  productApiService interaction service
  */
-.service("designApiService", ["$resource", "REST_SERVER_URI", function ($resource, REST_SERVER_URI) {
+.service("coreApiService", ["$resource", "REST_SERVER_URI", function ($resource, REST_SERVER_URI) {
     return $resource(REST_SERVER_URI, {}, {
         "attributesModel": {
             method: "GET",

src/app/design/directives/editor/guiArrayModelSelector.js → src/app/core/directives/editor/ot-array-model-selector.directive.js

@@ -1,14 +1,14 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
  *  Directive used for automatic attribute editor creation
  */
-    .directive("guiArrayModelSelector", [
-        "designApiService",
-        "designImageService",
-        function (designApiService, designImageService) {
+    .directive("otArrayModelSelector", [
+        "coreApiService",
+        "coreImageService",
+        function (coreApiService, coreImageService) {
             return {
                 restrict: "E",
-                templateUrl: "/views/design/gui/editor/arrayModelSelector.html",
+                templateUrl: "/views/core/directives/editor/ot-array-model-selector.html",
 
                 scope: {
                     "attribute": "=editorScope",
@@ -154,7 +154,7 @@ angular.module("designModule")
 
                         parseOptions($scope.attribute.Options);
 
-                        designApiService.attributesModel(getParams(options.model, $scope.item)).$promise.then(
+                        coreApiService.attributesModel(getParams(options.model, $scope.item)).$promise.then(
                             function (response) {
                                 var result = response.result || [];
                                 $scope.items = result;
@@ -169,7 +169,7 @@ angular.module("designModule")
                      * @returns {string}        - full path to image
                      */
                     $scope.getImage = function (image) {
-                        return designImageService.getImage(image);
+                        return coreImageService.getImage(image);
                     };
 
                 }

src/app/design/directives/editor/guiBoolean.js → src/app/core/directives/editor/ot-boolean.directive.js

@@ -1,9 +1,9 @@
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiBoolean', [function() {
+.directive('otBoolean', [function() {
     return {
         restrict: 'E',
-        templateUrl: '/views/design/gui/editor/select.html',
+        templateUrl: '/views/core/directives/editor/ot-select.html',
 
         scope: {
             'attribute': '=editorScope',

src/app/design/directives/editor/guiCategorySelector.js → src/app/core/directives/editor/ot-category-selector.directive.js

@@ -1,8 +1,8 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
-.directive("guiCategorySelector", [
+.directive("otCategorySelector", [
     "$location",
     "$routeParams",
     "dashboardListService",
@@ -16,7 +16,7 @@ angular.module("designModule")
 
         return {
             restrict: "E",
-            templateUrl: "/views/design/gui/editor/categorySelector.html",
+            templateUrl: "/views/core/directives/editor/ot-category-selector.html",
 
             scope: {
                 "attribute": "=editorScope",

src/app/design/gui/editor/categorySelector.html → src/app/core/directives/editor/ot-category-selector.html

@@ -16,7 +16,7 @@ <h2 class="modal-title text-center">Categories</h2>
 
             <div class="modal-body">
                 <!-- Table -->
-                <gui-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></gui-table-manager-popup>
+                <ot-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></ot-table-manager-popup>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-primary" ng-click="hide(attribute.Attribute)">Save</button>

src/app/design/directives/editor/guiDatetime.js → src/app/core/directives/editor/ot-datetime.directive.js

@@ -1,16 +1,16 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
 
-.directive("guiDatetime", [function () {
+.directive("otDatetime", [function () {
     return {
         restrict: "E",
         scope: {
             "attribute": "=editorScope",
             "item": "=item"
         },
-        templateUrl: "/views/design/gui/editor/datetime.html",
+        templateUrl: "/views/core/directives/editor/ot-datetime.html",
 
         controller: [
             "$scope",

src/app/design/directives/editor/guiHtml.js → src/app/core/directives/editor/ot-html.directive.js

@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiHtml', [function() {
+.directive('otHtml', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/html.html'
+        templateUrl: '/views/core/directives/editor/ot-html.html'
     };
 }]);
 

src/app/design/directives/editor/guiJsonEditor.js → src/app/core/directives/editor/ot-json-editor.directive.js

@@ -1,14 +1,14 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
-.directive("guiJsonEditor", [function () {
+.directive("otJsonEditor", [function () {
     return {
         restrict: "E",
         scope: {
             "data": "=data"
         },
-        templateUrl: "/views/design/gui/editor/json.html",
+        templateUrl: "/views/core/directives/editor/ot-json.html",
 
         controller: ["$scope", function ($scope) {
             $scope.items = [

src/app/design/directives/editor/guiModelSelector.js → src/app/core/directives/editor/ot-model-selector.directive.js

@@ -1,12 +1,12 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 /**
  *  Directive used for automatic attribute editor creation
  */
-    .directive("guiModelSelector", ["designApiService", function (designApiService) {
+    .directive("otModelSelector", ["coreApiService", function (coreApiService) {
         return {
             restrict: "E",
-            templateUrl: "/views/design/gui/editor/modelSelector.html",
+            templateUrl: "/views/core/directives/editor/ot-model-selector.html",
 
             scope: {
                 "attribute": "=editorScope",
@@ -86,7 +86,7 @@ angular.module("designModule")
                         return true;
                     }
 
-                    designApiService.attributesModel(params).$promise.then(
+                    coreApiService.attributesModel(params).$promise.then(
                         function (response) {
                             try {
                                 var result = response.result || [];

src/app/design/directives/editor/guiMultiSelect.js → src/app/core/directives/editor/ot-multi-select.directive.js

@@ -1,12 +1,12 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiMultiSelect", [function () {
+.directive("otMultiSelect", [function () {
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/multi-select.html",
+        templateUrl: "/views/core/directives/editor/ot-multi-select.html",
 
         scope: {
             "attribute": "=editorScope",

src/app/design/directives/editor/guiMultilineText.js → src/app/core/directives/editor/ot-multiine-text.directive.js

@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiMultilineText', [function() {
+.directive('otMultilineText', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/multilineText.html'
+        templateUrl: '/views/core/directives/editor/ot-multiline-text.html'
     };
 }]);