Merge branch 'dev'

bin/Area.js

@@ -5,14 +5,6 @@
  * @module package/quiqqer/bricks/bin/BrickAreas
  * @author www.pcsg.de (Henning Leutz)
  *
- * @require qui/QUI
- * @require qui/controls/Control
- * @require qui/controls/buttons/Button
- * @require package/quiqqer/bricks/bin/AreaWindow
- * @require Ajax
- * @require Locale
- * @require css!package/quiqqer/bricks/bin/Area.css
- *
  * @event onLoaded [ this ]
  */
 define('package/quiqqer/bricks/bin/Area', [
@@ -61,12 +53,12 @@ define('package/quiqqer/bricks/bin/Area', [
             this.$Elm = new Element('div', {
                 'class': 'quiqqer-bricks-area smooth',
                 html   : '<div class="quiqqer-bricks-area-icon">' +
-                         '<span class="fa fa-list-alt"></span>' +
-                         '</div>' +
-                         '<div class="quiqqer-bricks-area-content">' +
-                         '<div class="quiqqer-bricks-area-content-title"></div>' +
-                         '<div class="quiqqer-bricks-area-content-description"></div>' +
-                         '</div>',
+                '<span class="fa fa-list-alt"></span>' +
+                '</div>' +
+                '<div class="quiqqer-bricks-area-content">' +
+                '<div class="quiqqer-bricks-area-content-title"></div>' +
+                '<div class="quiqqer-bricks-area-content-description"></div>' +
+                '</div>',
                 events : {
                     click: this.toggle
                 }

bin/AreaWindow.js

@@ -5,12 +5,6 @@
  * @module package/quiqqer/bricks/bin/AreaWindow
  * @author www.pcsg.de (Henning Leutz)
  *
- * @require qui/QUI
- * @require qui/controls/windows/Confirm
- * @require package/quiqqer/bricks/bin/Area
- * @require Ajax
- * @require Locale
- *
  * @event onSubmit [ this, areas ]
  */
 define('package/quiqqer/bricks/bin/AreaWindow', [
@@ -93,6 +87,8 @@ define('package/quiqqer/bricks/bin/AreaWindow', [
          * @param {Function} callback
          */
         getList: function (callback) {
+            require(['']);
+
             Ajax.get('package_quiqqer_bricks_ajax_project_getAreas', callback, {
                 'package': 'quiqqer/brick',
                 project  : JSON.encode({

bin/Areas.js

+/**
+ * Main areas handler
+ *
+ * @module package/quiqqer/bricks/bin/Areas
+ * @author www.pcsg.de (Henning Leutz)
+ */
+define('package/quiqqer/bricks/bin/Areas', [
+    'package/quiqqer/bricks/bin/classes/Areas'
+], function (Areas) {
+    "use strict";
+    return new Areas();
+});
\ No newline at end of file

bin/BrickAreas.js

-
 /**
  * BrickAreas Control
  * Edit and change the areas for the brick
@@ -6,14 +5,6 @@
  * @module package/quiqqer/bricks/bin/BrickAreas
  * @author www.pcsg.de (Henning Leutz)
  *
- * @require qui/QUI
- * @require qui/controls/Control
- * @require qui/controls/buttons/Button
- * @require package/quiqqer/bricks/bin/AreaWindow
- * @require Ajax
- * @require Locale
- * @require css!package/quiqqer/bricks/bin/BrickAreas.css
- *
  * @event onLoaded [ this ]
  */
 define('package/quiqqer/bricks/bin/BrickAreas', [
@@ -22,32 +13,33 @@ define('package/quiqqer/bricks/bin/BrickAreas', [
     'qui/controls/Control',
     'qui/controls/buttons/Button',
     'package/quiqqer/bricks/bin/AreaWindow',
+    'package/quiqqer/bricks/bin/Areas',
     'Ajax',
     'Locale',
 
     'css!package/quiqqer/bricks/bin/BrickAreas.css'
 
-], function (QUI, QUIControl, QUIButton, AreaWindow, Ajax, QUILocale) {
+], function (QUI, QUIControl, QUIButton, AreaWindow, Areas, Ajax, QUILocale) {
     "use strict";
 
     return new Class({
 
-        Extends : QUIControl,
-        Type    : 'package/quiqqer/bricks/bin/BrickAreas',
+        Extends: QUIControl,
+        Type   : 'package/quiqqer/bricks/bin/BrickAreas',
 
-        Binds : [
+        Binds: [
             '$onDestroy'
         ],
 
-        options : {
-            brickId : false, // brickId
-            styles  : false,
-            projectName : false,
-            projectLang : false,
-            areas   : false
+        options: {
+            brickId    : false, // brickId
+            styles     : false,
+            projectName: false,
+            projectLang: false,
+            areas      : false
         },
 
-        initialize : function (options) {
+        initialize: function (options) {
             this.parent(options);
 
             this.$areas = {};
@@ -58,13 +50,13 @@ define('package/quiqqer/bricks/bin/BrickAreas', [
          *
          * @return {HTMLElement}
          */
-        create : function () {
+        create: function () {
             var self = this;
 
             this.$Elm = new Element('div', {
-                'class' : 'quiqqer-bricks-brickareas',
-                html    : '<div class="quiqqer-bricks-brickareas-container"></div>' +
-                          '<div class="quiqqer-bricks-brickareas-buttons"></div>'
+                'class': 'quiqqer-bricks-brickareas',
+                html   : '<div class="quiqqer-bricks-brickareas-container"></div>' +
+                '<div class="quiqqer-bricks-brickareas-buttons"></div>'
             });
 
             if (this.getAttribute('styles')) {
@@ -75,21 +67,19 @@ define('package/quiqqer/bricks/bin/BrickAreas', [
             this.$Buttons   = this.$Elm.getElement('.quiqqer-bricks-brickareas-buttons');
 
             new QUIButton({
-                text   : QUILocale.get('quiqqer/bricks', 'brick.edit.area.add'),
-                styles : {
-                    width : '100%'
+                text  : QUILocale.get('quiqqer/bricks', 'brick.edit.area.add'),
+                styles: {
+                    width: '100%'
                 },
-                events :
-                {
-                    onClick : function () {
+                events: {
+                    onClick: function () {
                         new AreaWindow({
-                            projectName : self.getAttribute('projectName'),
-                            projectLang : self.getAttribute('projectLang'),
-                            events  :
-                            {
-                                onSubmit : function (Win, areas) {
+                            projectName: self.getAttribute('projectName'),
+                            projectLang: self.getAttribute('projectLang'),
+                            events     : {
+                                onSubmit: function (Win, areas) {
                                     for (var i = 0, len = areas.length; i < len; i++) {
-                                        self.addArea(areas[ i ]);
+                                        self.addArea(areas[i]);
                                     }
                                 }
                             }
@@ -113,36 +103,66 @@ define('package/quiqqer/bricks/bin/BrickAreas', [
 
         /**
          * Add an area
+         *
          * @param {String} area - name of the area
          */
-        addArea : function (area) {
+        addArea: function (area) {
             if (area in this.$areas) {
                 return;
             }
 
             var self = this;
 
-            this.$areas[ area ] = true;
+            this.$areas[area] = true;
 
             var BrickNode = new Element('div', {
-                'class'     : 'quiqqer-bricks-brickareas-area',
-                html        : area,
-                'data-area' : area
+                'class'    : 'quiqqer-bricks-brickareas-area',
+                html       : '<span class="fa fa-spinner fa-spin"></span>',
+                'data-area': area
             }).inject(this.$Container);
 
+
+            Areas.getList(
+                this.getAttribute('projectName'),
+                this.getAttribute('projectLang')
+            ).then(function (list) {
+                var name = this.get('data-area');
+
+                var title = list.filter(function (Entry) {
+                    return Entry.name === name;
+                }).map(function (Entry) {
+                    return Entry.title;
+                });
+
+                if ("group" in title[0]) {
+                    title = QUILocale.get(
+                        title[0].group,
+                        title[0].var
+                    );
+                } else {
+                    title = title[0];
+                }
+
+                var Loader = this.getElement('.fa');
+
+                Loader.removeClass('fa');
+                Loader.removeClass('fa-spinner');
+                Loader.removeClass('fa-spin');
+                Loader.set('html', title);
+            }.bind(BrickNode));
+
             new Element('span', {
-                'class' : 'fa fa-times',
-                styles  : {
-                    cursor: 'pointer',
+                'class': 'fa fa-times',
+                styles : {
+                    cursor    : 'pointer',
                     marginLeft: 10
                 },
-                events :
-                {
-                    click : function () {
+                events : {
+                    click: function () {
                         var area = BrickNode.get('data-area');
 
-                        if (self.$areas[ area ]) {
-                            delete self.$areas[ area ];
+                        if (self.$areas[area]) {
+                            delete self.$areas[area];
                         }
 
                         BrickNode.destroy();
@@ -156,7 +176,7 @@ define('package/quiqqer/bricks/bin/BrickAreas', [
          *
          * @return {Array}
          */
-        getAreas : function () {
+        getAreas: function () {
             var result = [];
 
             for (var area in this.$areas) {

bin/Controls/Slider/PromosliderWallpaper.js

@@ -245,8 +245,8 @@ define('package/quiqqer/bricks/bin/Controls/Slider/PromosliderWallpaper', [
                         // click event
                         var Li = this.$List.getElement('li:nth-child(' + parseInt(currentSlide + 1) + ')');
 
-                        if (Li.get('data-url') && Li.get('data-url') !== '') {
-                            window.location = Li.get('data-url');
+                        if (Li.get('data-href') && Li.get('data-href') !== '') {
+                            window.location = Li.get('data-href');
                             return;
                         }
                     }
@@ -308,18 +308,17 @@ define('package/quiqqer/bricks/bin/Controls/Slider/PromosliderWallpaper', [
             });
 
             // click events
-            this.$Container.getElements("li[data-url]").each(function (LiElement) {
-
-                // if (LiElement.get('data-url') === '') {
-                //     return;
-                // }
-                //
-                // LiElement.setStyle('cursor', 'pointer');
-                // LiElement.addEvent('click', function () {
-                //     if (QUI.isScrolling() === false) {
-                //         window.location = this.get('data-url');
-                //     }
-                // });
+            this.$Container.getElements("li[data-href]").each(function (LiElement) {
+                if (LiElement.get('data-href') === '') {
+                    return;
+                }
+
+                LiElement.setStyle('cursor', 'pointer');
+                LiElement.addEvent('click', function () {
+                    if (QUI.isScrolling() === false) {
+                        window.location = this.get('data-href');
+                    }
+                });
             });
 
 
@@ -603,7 +602,7 @@ define('package/quiqqer/bricks/bin/Controls/Slider/PromosliderWallpaper', [
             var self       = this,
                 Background = Slide.getElement('.quiqqer-bricks-promoslider-wallpaper-image'),
                 display    = Background.getStyle('display'),
-                image      = Slide.get('data-url');
+                image      = Slide.get('data-image');
 
             if (display !== 'none') {
                 return;

bin/Manager.js

@@ -3,18 +3,6 @@
  *
  * @module package/quiqqer/bricks/bin/Manager
  * @author www.pcsg.de (Henning Leutz)
- *
- * @require qui/QUI
- * @require qui/controls/desktop/Panel
- * @require qui/controls/buttons/Select
- * @require qui/controls/buttons/Button
- * @require qui/controls/buttons/Separator
- * @require qui/controls/windows/Confirm
- * @require controls/grid/Grid
- * @require Locale
- * @require Projects
- * @require Ajax
- * @require css!package/quiqqer/bricks/bin/Manager.css
  */
 define('package/quiqqer/bricks/bin/Manager', [
 

bin/classes/Areas.js

+define('package/quiqqer/bricks/bin/classes/Areas', [
+
+    'qui/QUI',
+    'qui/classes/DOM',
+    'Ajax'
+
+], function (QUI, QDOM, QUIAjax) {
+    "use strict";
+
+    return new Class({
+
+        Extends: QDOM,
+        Type   : 'classes/editor/Manager',
+
+        initialize: function (options) {
+            this.parent(options);
+
+            this.$areas = null;
+        },
+
+        /**
+         * Return the area list
+         *
+         * @param project
+         * @param lang
+         * @return {Promise|*}
+         */
+        getList: function (project, lang) {
+            if (this.$areas) {
+                return Promise.resolve(this.$areas);
+            }
+
+            var self = this;
+
+            return new Promise(function (resolve) {
+                QUIAjax.get('package_quiqqer_bricks_ajax_project_getAreas', function (result) {
+                    self.$areas = result;
+                    resolve(self.$areas);
+                }, {
+                    'package': 'quiqqer/brick',
+                    project  : JSON.encode({
+                        name: project,
+                        lang: lang
+                    })
+                });
+            });
+        }
+    });
+});

composer.json

@@ -20,12 +20,12 @@
     "quiqqer\/qui": ">=1|dev-master|dev-dev",
     "quiqqer/utils": ">=1.4|dev-dev",
     "npm-asset/hammerjs": "2.*",
-    "npm-asset\/mustache": "2.*"
+    "npm-asset\/mustache": "2.*",
+    "ramsey/uuid": "3.*"
   },
   "autoload": {
-    "psr-0": {
-      "QUI": "src/"
+    "psr-4": {
+      "QUI\\Bricks\\": "src/QUI/Bricks"
     }
   }
 }
-

src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.html

@@ -2,7 +2,7 @@
     {strip}
     <ul class="hide-on-mobile">
         {foreach $desktopSlides as $key => $slide}
-        <li data-url="{image image=$slide.image onlysrc=1}">
+        <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}">
             {assign var=extraClass value=""}
 
             {if isset($slide.pos) && $slide.pos == 'quiqqer-bricks-promoslider-slide-right'}
@@ -42,7 +42,7 @@
     {strip}
     <ul class="hide-on-desktop">
         {foreach $mobileSlides as $key => $slide}
-        <li data-url="{image image=$slide.image onlysrc=1}">
+        <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}">
             {assign var=extraClass value=""}
 
             {if isset($slide.pos) && $slide.pos == 'quiqqer-bricks-promoslider-slide-right'}

src/QUI/Bricks/Controls/Slider/PromosliderWallpaper2Content.html

@@ -2,7 +2,7 @@
     {strip}
     <ul class="hide-on-mobile">
         {foreach $desktopSlides as $key => $slide}
-        <li data-url="{image image=$slide.image onlysrc=1}">
+        <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}">
             <div class="quiqqer-bricks-promoslider-wallpaper-image" style="display: none">&nbsp;</div>
 
             <div class="grid-container">
@@ -25,7 +25,7 @@
     {strip}
     <ul class="hide-on-desktop">
         {foreach $mobileSlides as $key => $slide}
-        <li data-url="{image image=$slide.image onlysrc=1}">
+        <li data-image="{image image=$slide.image onlysrc=1}" data-href="{$slide.url}">
             <div class="quiqqer-bricks-promoslider-wallpaper-image" style="display: none">&nbsp;</div>
 
             <div class="grid-container">