Author: Jonathan.Wage
Date: 2010-01-12 19:29:29 +0100 (Tue, 12 Jan 2010)
New Revision: 26544
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/config/view.yml
plugins/sfSympalPlugin/trunk/test/fixtures/project/data/fresh_test_db.sqlite
plugins/sfSympalPlugin/trunk/test/unit/DataGridTest.php
Log:
[1.4][sfSympalPlugin][1.0] Adding ability to configure content type template
and theme from app.yml
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-12 17:38:36 UTC (rev
26543)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-12 18:29:29 UTC (rev
26544)
@@ -42,16 +42,18 @@
# Every content type must have a template named "default_view"
sfSympalPage:
default_inline_editing_column_form: sfSympalPageForm
- default_rendering_module: sympal_content_renderer
- default_rendering_action: index
+ default_rendering_module: ~
+ default_rendering_action: ~
+ default_content_template: ~
+ default_theme: ~
content_templates:
default_view:
template: sympal_page/view
register:
template: sympal_register/page_template
sfSympalContentList:
- default_rendering_module: sympal_content_renderer
- default_rendering_action: index
+ default_rendering_module: ~
+ default_rendering_action: ~
content_templates:
default_view:
template: sympal_content_list/view
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-12 17:38:36 UTC (rev 26543)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-12 18:29:29 UTC (rev 26544)
@@ -516,20 +516,20 @@
{
$template = $templates[$template]['template'];
}
- $template = $template ? $template :
sfSympalConfig::get('default_content_template');
+ $template = $template ? $template :
sfSympalConfig::get($this->getType()->getName(), 'default_content_template',
sfSympalConfig::get('default_content_template'));
return $template;
}
public function getThemeToRenderWith()
{
- if ($layout = $this->getTheme()) {
- return $layout;
- } else if ($layout = $this->getType()->getTheme()) {
- return $layout;
- } else if ($layout = $this->getSite()->getTheme()) {
- return $layout;
+ if ($theme = $this->getTheme()) {
+ return $theme;
+ } else if ($theme = $this->getType()->getTheme()) {
+ return $theme;
+ } else if ($theme = $this->getSite()->getTheme()) {
+ return $theme;
} else {
- return sfSympalConfig::get('default_theme', null,
$this->getSite()->getSlug());
+ return sfSympalConfig::get($this->getType()->getName(), 'default_theme',
sfSympalConfig::get('default_theme', null, $this->getSite()->getSlug()));
}
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/config/view.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/config/view.yml
2010-01-12 17:38:36 UTC (rev 26543)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/config/view.yml
2010-01-12 18:29:29 UTC (rev 26544)
@@ -1,5 +1,5 @@
all:
- stylesheets: ["/sfSympalPluginManagerPlugin/css/plugin_manager": { position:
last }]
+ stylesheets: ["/sfSympalPluginManagerPlugin/css/plugin_manager.css": {
position: last }]
default:
metas:
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/data/fresh_test_db.sqlite
===================================================================
(Binary files differ)
Modified: plugins/sfSympalPlugin/trunk/test/unit/DataGridTest.php
===================================================================
--- plugins/sfSympalPlugin/trunk/test/unit/DataGridTest.php 2010-01-12
17:38:36 UTC (rev 26543)
+++ plugins/sfSympalPlugin/trunk/test/unit/DataGridTest.php 2010-01-12
18:29:29 UTC (rev 26544)
@@ -36,8 +36,8 @@
'c.default_path' => '/pages/:slug',
'c.theme' => NULL,
'c.template' => 'default_view',
- 'c.module' => 'sympal_content_renderer',
- 'c.action' => 'index',
+ 'c.module' => NULL,
+ 'c.action' => NULL,
'c.slug' => 'page',
)
)
--
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.
