Author: ornicar2
Date: 2010-01-24 19:49:41 +0100 (Sun, 24 Jan 2010)
New Revision: 27138
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmLayout/templates/_content.php
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
Log:
[Diem]
- Allowed better widget type public names
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmLayout/templates/_content.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmLayout/templates/_content.php
2010-01-24 18:20:26 UTC (rev 27137)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmLayout/templates/_content.php
2010-01-24 18:49:41 UTC (rev 27138)
@@ -8,22 +8,23 @@
{
continue;
}
-
- echo £o('li.mb5');
- echo £('strong', $area->get('type').':');
-
- echo £o('ul.ml10');
-
+
+ $widgets = array();
foreach($area->get('Zones') as $zone)
{
foreach($zone->get('Widgets') as $widget)
{
- echo £('li',
__($sf_context->get('widget_type_manager')->getWidgetType($widget)->getPublicName()));
+ $widgets[] =
__($sf_context->get('widget_type_manager')->getWidgetType($widget)->getPublicName());
}
}
-
- echo £c('ul');
- echo £c('li');
+
+ if(!empty($widgets))
+ {
+ echo £('li.mb5',
+ £('strong', $area->type.': ').
+ implode(' | ', $widgets)
+ );
+ }
}
echo £c('li');
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
2010-01-24 18:20:26 UTC (rev 27137)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
2010-01-24 18:49:41 UTC (rev 27138)
@@ -33,6 +33,8 @@
form:
cache: false
+ public_name: Search form
results:
- cache: false
\ No newline at end of file
+ cache: false
+ public_name: Search results
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
2010-01-24 18:20:26 UTC (rev 27137)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
2010-01-24 18:49:41 UTC (rev 27138)
@@ -1,12 +1,10 @@
<?php
-class dmWidgetTypeManager
+class dmWidgetTypeManager extends dmConfigurable
{
-
protected
$dispatcher,
$serviceContainer,
- $options,
$widgetTypes;
public function __construct(sfEventDispatcher $dispatcher,
dmBaseServiceContainer $serviceContainer, array $options = array())
@@ -16,12 +14,17 @@
$this->initialize($options);
}
+
+ public function getDefaultOptions()
+ {
+ return array(
+ 'config_file' => 'config/dm/widget_types.yml'
+ );
+ }
public function initialize(array $options = array())
{
- $this->options = array_merge(array(
- 'config_file' => 'config/dm/widget_types.yml'
- ), $options);
+ $this->configure($options);
$this->widgetTypes = null;
}
@@ -38,7 +41,8 @@
if (empty($this->widgetTypes))
{
- $internalConfig =
include($this->serviceContainer->getService('config_cache')->checkConfig($this->options['config_file']));
+ $internalConfigFile =
$this->serviceContainer->getService('config_cache')->checkConfig($this->getOption('config_file'));
+ $internalConfig = include($internalConfigFile);
$this->widgetTypes = array();
@@ -56,7 +60,7 @@
$widgetTypeConfig = array(
'full_key' => $moduleKey.ucfirst($actionKey),
'name' => $name,
- 'public_name' => dmString::humanize($name),
+ 'public_name' => dmArray::get($action, 'public_name',
dmString::humanize($name)),
'form_class' => dmArray::get($action, 'form_class',
$fullKey.'Form'),
'view_class' => dmArray::get($action, 'view_class',
$fullKey.'View'),
'use_component' => $this->componentExists($moduleKey, $fullKey),
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
