From c48a500728834ede67895445799906d6e780a858 Mon Sep 17 00:00:00 2001 From: Henning Leutz <leutz@pcsg.de> Date: Tue, 10 Feb 2015 07:53:19 +0100 Subject: [PATCH] dragons are here --- bin/Site/Category.js | 5 ++++- composer.json | 2 +- lib/QUI/Bricks/Manager.php | 4 ++++ locale.xml | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/bin/Site/Category.js b/bin/Site/Category.js index 55b30b1..400b4dc 100644 --- a/bin/Site/Category.js +++ b/bin/Site/Category.js @@ -82,6 +82,9 @@ define('package/quiqqer/bricks/bin/Site/Category', [ areas = JSON.decode( areas ); } + console.log( areas ); + console.warn( bricks ); + for ( i = 0, len = bricks.length; i < len; i++ ) { AC = self.$insertBrickAreaEdit( bricks[ i ] ); @@ -123,7 +126,7 @@ define('package/quiqqer/bricks/bin/Site/Category', [ }, /** - * Return the available for the site + * Return the available areas for the site * @param {Function} callback - callback function */ getBrickAreas : function(callback) diff --git a/composer.json b/composer.json index 21f4486..13b0e81 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name" : "quiqqer/bricks", "type" : "quiqqer-plugin", - "description" : "QUI Brick Plugin", + "description" : "Bricks Module", "version" : "dev-dev", "license" : "MIT", diff --git a/lib/QUI/Bricks/Manager.php b/lib/QUI/Bricks/Manager.php index c9f8deb..b959cad 100644 --- a/lib/QUI/Bricks/Manager.php +++ b/lib/QUI/Bricks/Manager.php @@ -112,6 +112,8 @@ public function getAreasByProject(Project $Project, $siteType=false) $templates[] = $vhost['template']; } + $templates = array_unique( $templates ); + // get bricks foreach ( $templates as $template ) { @@ -127,6 +129,8 @@ public function getAreasByProject(Project $Project, $siteType=false) ); } +// QUI\System\Log::writeRecursive( $bricks ); + return $bricks; } diff --git a/locale.xml b/locale.xml index f279dee..d69b8ff 100644 --- a/locale.xml +++ b/locale.xml @@ -2,6 +2,23 @@ <locales> <groups name="quiqqer/bricks" datatype="php,js"> + <locale name="package.title"> + <de><![CDATA[Baustein Modul / Bricks]]></de> + <en><![CDATA[Bricks Module]]></en> + </locale> + <locale name="package.description"> + <de><![CDATA[ + Platzieren Sie hiermit Grafiken, Texte, Videos etc. + innerhalb eines Tamplates (einer Seite Ihrer Homepage) + beliebig und immer wieder neu, bis Sie mit dem Ergebnis zufrieden sind. + ]]> + </de> + <en><![CDATA[ + + ]]></en> + </locale> + + <locale name="menu.bricks.text"> <de><![CDATA[Bausteine]]></de> <en><![CDATA[Bricks-Manager]]></en> -- GitLab