diff --git a/_build/build.transport.php b/_build/build.transport.php index 8ae867b..03d8f7b 100644 --- a/_build/build.transport.php +++ b/_build/build.transport.php @@ -35,7 +35,7 @@ define('PKG_NAME','Asides'); define('PKG_NAME_LOWER',strtolower(PKG_NAME)); define('PKG_VERSION','1.0.0'); -define('PKG_RELEASE','rc3'); +define('PKG_RELEASE','pl'); // define sources $root = dirname(dirname(__FILE__)).'/'; diff --git a/_build/properties/properties.showAside.php b/_build/properties/properties.showAside.php index caadaa5..88a0767 100644 --- a/_build/properties/properties.showAside.php +++ b/_build/properties/properties.showAside.php @@ -34,6 +34,30 @@ 'value' => '', 'lexicon' => 'asides:properties', ) + ,array( + 'name' => 'wrapper', + 'desc' => 'prop_asides.wrapper_desc', + 'type' => 'textfield', + 'options' => '', + 'value' => '', + 'lexicon' => 'asides:properties', + ) + ,array( + 'name' => 'outputSeparator', + 'desc' => 'prop_asides.outputseparator_desc', + 'type' => 'textfield', + 'options' => '', + 'value' => '', + 'lexicon' => 'asides:properties', + ) + ,array( + 'name' => 'toPlaceholder', + 'desc' => 'prop_asides.toplaceholder_desc', + 'type' => 'textfield', + 'options' => '', + 'value' => '', + 'lexicon' => 'asides:properties', + ) ); return $properties; \ No newline at end of file diff --git a/assets/components/asides/js/mgr/widgets/asides.grid.js b/assets/components/asides/js/mgr/widgets/asides.grid.js index eec3904..6a21530 100644 --- a/assets/components/asides/js/mgr/widgets/asides.grid.js +++ b/assets/components/asides/js/mgr/widgets/asides.grid.js @@ -13,15 +13,12 @@ Asides.grid.Items = function(config) { ,columns: [{ header: _('name') ,dataIndex: 'name' - //,width: 200 },{ header: _('description') ,dataIndex: 'description' - //,width: 250 },{ header: _('locked') ,dataIndex: 'locked' - //,width: 70 }] ,tbar: [{ xtype: 'textfield' @@ -176,6 +173,8 @@ Asides.window.CreateAside = function(config) { ,id: this.ident ,url: Asides.config.connector_url ,action: 'mgr/asides/create' + ,collapsible: false + ,width: '650' ,fields: [{ xtype: 'textfield' ,fieldLabel: _('name') @@ -209,6 +208,8 @@ Asides.window.UpdateAside = function(config) { ,id: this.ident ,url: Asides.config.connector_url ,action: 'mgr/asides/update' + ,collapsible: false + ,width: '650' ,fields: [{ xtype: 'hidden' ,name: 'id' diff --git a/core/components/asides/docs/changelog.txt b/core/components/asides/docs/changelog.txt index 4fff15b..d229403 100644 --- a/core/components/asides/docs/changelog.txt +++ b/core/components/asides/docs/changelog.txt @@ -2,8 +2,10 @@ Changelog for Asides. -------------------------------------------------------------------------------- -2011/xx/xx: 1.0.0-pl +2011/08/12: 1.0.0-pl ======================================================== +- Added an option to remove an aside from any resource + without deleting the aside (chunk) - Ensure an aside isn't in use before deletion - Added id placeholder for the wrapper, to allow a better css styling/targeting. diff --git a/core/components/asides/docs/readme.txt b/core/components/asides/docs/readme.txt index fe4702c..699253b 100644 --- a/core/components/asides/docs/readme.txt +++ b/core/components/asides/docs/readme.txt @@ -1,7 +1,7 @@ -------------------------------------------------------------------------------- Asides -------------------------------------------------------------------------------- -Version: 1.0.0-rc3 +Version: 1.0.0-pl Author: Romain Tripault // Melting Media -------------------------------------------------------------------------------- diff --git a/core/components/asides/elements/snippets/showAside.php b/core/components/asides/elements/snippets/showAside.php index 6129dfd..7f8e106 100755 --- a/core/components/asides/elements/snippets/showAside.php +++ b/core/components/asides/elements/snippets/showAside.php @@ -10,7 +10,7 @@ if (!isset($scriptProperties['chunks'])) { return ''; } -$outputSeparator = $modx->getOption('outputSeparator',$scriptProperties,"\n\n"); +$outputSeparator = $modx->getOption('outputSeparator',$scriptProperties,"\n"); $wrapper = !empty($wrapper) ? $wrapper : ''; $toPlaceholder = $modx->getOption('toPlaceholder',$scriptProperties,false); diff --git a/core/components/asides/lexicon/en/properties.inc.php b/core/components/asides/lexicon/en/properties.inc.php index d8f53dd..1b4c8c7 100644 --- a/core/components/asides/lexicon/en/properties.inc.php +++ b/core/components/asides/lexicon/en/properties.inc.php @@ -26,4 +26,7 @@ * @subpackage lexicon */ -$_lang['prop_asides.chunks_desc'] = 'Specify the TV containing your chunks list to be used as asides.'; \ No newline at end of file +$_lang['prop_asides.chunks_desc'] = 'Specify the TV containing your chunks list to be used as asides (should be [[*aside]] by default).'; +$_lang['prop_asides.wrapper_desc'] = 'A chunk to wrap each result in.'; +$_lang['prop_asides.outputseparator_desc'] = 'Default to "\n".'; +$_lang['prop_asides.toplaceholder_desc'] = 'Output the results to the given placeholder.'; \ No newline at end of file diff --git a/core/components/asides/lexicon/fr/properties.inc.php b/core/components/asides/lexicon/fr/properties.inc.php index 3c638be..590d740 100644 --- a/core/components/asides/lexicon/fr/properties.inc.php +++ b/core/components/asides/lexicon/fr/properties.inc.php @@ -26,4 +26,7 @@ * @subpackage lexicon */ -$_lang['prop_asides.chunks_desc'] = 'Indiquez la variable de modèle contenant la liste de vos chunks à utiliser comme modules.'; \ No newline at end of file +$_lang['prop_asides.chunks_desc'] = 'Indiquez la variable de modèle contenant la liste de vos chunks à utiliser comme modules ([[*aside]] par défaut).'; +$_lang['prop_asides.wrapper_desc'] = 'Un chunk dans lequel afficher chaque résultat.'; +$_lang['prop_asides.outputseparator_desc'] = '"\n" par défaut.'; +$_lang['prop_asides.toplaceholder_desc'] = 'Affiche les résultats dans le placeholder indiqué.'; \ No newline at end of file