diff --git a/bin/Area.js b/bin/Area.js
index 54739446040d4d1d67eccd4a67de520f5ec8f071..6d795e51edb26c4ba4284db32f0d1d40a8bbaa95 100644
--- a/bin/Area.js
+++ b/bin/Area.js
@@ -6,9 +6,16 @@
* @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', [
'qui/QUI',
@@ -41,7 +48,7 @@ define('package/quiqqer/bricks/bin/Area', [
initialize : function(options)
{
- this.parent( options );
+ this.parent(options);
this.$Title = false;
this.$Desc = false;
@@ -69,19 +76,19 @@ define('package/quiqqer/bricks/bin/Area', [
}
});
- this.$Title = this.$Elm.getElement( '.quiqqer-bricks-area-content-title' );
- this.$Desc = this.$Elm.getElement( '.quiqqer-bricks-area-content-description' );
+ this.$Title = this.$Elm.getElement('.quiqqer-bricks-area-content-title');
+ this.$Desc = this.$Elm.getElement('.quiqqer-bricks-area-content-description');
- if ( this.getAttribute( 'area' ) ) {
- this.$Elm.set( 'data-area', this.getAttribute( 'area' ) );
+ if (this.getAttribute('area')) {
+ this.$Elm.set('data-area', this.getAttribute('area'));
}
- if ( this.getAttribute( 'title' ) ) {
- this.$Title.set( 'html', this.getAttribute( 'title' ) );
+ if (this.getAttribute('title')) {
+ this.$Title.set('html', this.getAttribute('title'));
}
- if ( this.getAttribute( 'description' ) ) {
- this.$Desc.set( 'html', this.getAttribute( 'description' ) );
+ if (this.getAttribute('description')) {
+ this.$Desc.set('html', this.getAttribute('description'));
}
@@ -93,7 +100,7 @@ define('package/quiqqer/bricks/bin/Area', [
*/
toggle : function()
{
- if ( this.$selected )
+ if (this.$selected)
{
this.unselect();
return;
@@ -107,12 +114,12 @@ define('package/quiqqer/bricks/bin/Area', [
*/
select : function()
{
- if ( this.$selected ) {
+ if (this.$selected) {
return;
}
this.$selected = true;
- this.$Elm.addClass( 'quiqqer-bricks-area-selected' );
+ this.$Elm.addClass('quiqqer-bricks-area-selected');
},
/**
@@ -120,12 +127,12 @@ define('package/quiqqer/bricks/bin/Area', [
*/
unselect : function()
{
- if ( this.$selected === false ) {
+ if (this.$selected === false) {
return;
}
this.$selected = false;
- this.$Elm.removeClass( 'quiqqer-bricks-area-selected' );
+ this.$Elm.removeClass('quiqqer-bricks-area-selected');
}
});
});
diff --git a/bin/AreaWindow.js b/bin/AreaWindow.js
index eb93e48b4bb17e0fe91698d5c13acf16e2b4d37e..1d154d2e89fe956999e62890af84dc137204821d 100644
--- a/bin/AreaWindow.js
+++ b/bin/AreaWindow.js
@@ -6,9 +6,14 @@
* @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', [
'qui/QUI',
@@ -31,16 +36,27 @@ define('package/quiqqer/bricks/bin/AreaWindow', [
],
options : {
- title : QUILocale.get( 'quiqqer/bricks', 'area.window.title' ),
+ icon : 'icon-th',
+ title : QUILocale.get('quiqqer/bricks', 'area.window.title'),
projectName : false,
projectLang : false,
- maxHeight : 500,
- maxWidth : 400
+ maxHeight : 600,
+ maxWidth : 400,
+ texticon : false,
+
+ cancel_button : {
+ text : QUILocale.get('quiqqer/system', 'cancel'),
+ textimage : 'icon-remove fa fa-remove'
+ },
+ ok_button : {
+ text : QUILocale.get('quiqqer/system', 'accept'),
+ textimage : 'icon-ok fa fa-check'
+ }
},
initialize : function(options)
{
- this.parent( options );
+ this.parent(options);
this.addEvents({
onOpen : this.$onOpen
@@ -61,15 +77,15 @@ define('package/quiqqer/bricks/bin/AreaWindow', [
var i, len, desc, title;
var Content = self.getContent();
- for ( i = 0, len = result.length; i < len; i++ )
+ for (i = 0, len = result.length; i < len; i++)
{
- title = result[ i ].title;
- desc = result[ i ].description;
+ title = result[i].title;
+ desc = result[i].description;
new Area({
- title : QUILocale.get( title.group, title['var'] ),
- description : QUILocale.get( desc.group, desc['var'] ),
- area : result[ i ].name
+ title : QUILocale.get(title.group, title['var']),
+ description : QUILocale.get(desc.group, desc['var']),
+ area : result[i].name
}).inject( Content );
}
@@ -87,8 +103,8 @@ define('package/quiqqer/bricks/bin/AreaWindow', [
Ajax.get('package_quiqqer_bricks_ajax_project_getAreas', callback, {
'package' : 'quiqqer/brick',
project : JSON.encode({
- name : this.getAttribute( 'projectName' ),
- lang : this.getAttribute( 'projectLang' )
+ name : this.getAttribute('projectName'),
+ lang : this.getAttribute('projectLang')
})
});
},
@@ -106,9 +122,9 @@ define('package/quiqqer/bricks/bin/AreaWindow', [
return Elm.get( 'data-area' );
});
- this.fireEvent( 'submit', [ this, areas ] );
+ this.fireEvent('submit', [this, areas]);
- if ( this.getAttribute( 'autoclose' ) ) {
+ if (this.getAttribute('autoclose')) {
this.close();
}
}
diff --git a/bin/BrickAreas.js b/bin/BrickAreas.js
index cf0aa752092649611a6b2a46da6e8358f74aa4fa..a499889404f61bf9da7a4d4c7a1ac700d70f00d0 100644
--- a/bin/BrickAreas.js
+++ b/bin/BrickAreas.js
@@ -6,9 +6,16 @@
* @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', [
'qui/QUI',
diff --git a/bin/BrickEdit.js b/bin/BrickEdit.js
index f5eaddf6c54f7658bcdefadeeab9db3df5f3f7b0..969bdff5a4a6d3e87e7162ec48e761accacb6480 100644
--- a/bin/BrickEdit.js
+++ b/bin/BrickEdit.js
@@ -412,10 +412,6 @@ define('package/quiqqer/bricks/bin/BrickEdit', [
data.settings,
QUIFormUtils.getFormData(Form)
);
-
-
- console.log(data.settings);
-
}
if (unload == 'content') {
diff --git a/bin/Site/Area.js b/bin/Site/Area.js
index 0ead234d4a79f8b28cb230479dcfd0e77ac1045d..dc0160446085a03e119fdc95be5cc6ca3e920755 100644
--- a/bin/Site/Area.js
+++ b/bin/Site/Area.js
@@ -484,7 +484,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
for (i = 0, len = bricks.length; i < len; i++)
{
custom = '';
- brickId = bricks[i].get('id');
+ brickId = bricks[i].getParent().get('id');
if (brickId in this.$brickCustomData) {
custom = this.$brickCustomData[brickId];
@@ -813,7 +813,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
maxHeight : 400,
autoclose : false,
ok_button : {
- text : QUILocale.get('quiqqer/system', 'save'),
+ text : QUILocale.get('quiqqer/system', 'accept'),
textimage : 'icon-save fa fa-save'
},
cancel_button : {
@@ -856,7 +856,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
var Form = Win.getContent().getElement('form'),
data = QUIFormUtils.getFormData(Form),
- brickId = Select.get('id');
+ brickId = Select.getParent().get('id');
self.$brickCustomData[brickId] = JSON.encode(data);