Author: Jonathan.Wage
Date: 2010-01-13 00:31:41 +0100 (Wed, 13 Jan 2010)
New Revision: 26551
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentType.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
Log:
[1.4][sfSympalPlugin][1.0] Changing app.yml configuration to go by content type
slug instead of name since name is not unique
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-12 22:09:51 UTC (rev
26550)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-12 23:31:41 UTC (rev
26551)
@@ -40,7 +40,7 @@
# Configure the available content templates for the different content types
# Every content type must have a template named "default_view"
- sfSympalPage:
+ page:
default_inline_editing_column_form: sfSympalPageForm
default_rendering_module: ~
default_rendering_action: ~
@@ -51,7 +51,7 @@
template: sympal_page/view
register:
template: sympal_register/page_template
- sfSympalContentList:
+ content-list:
default_rendering_module: ~
default_rendering_action: ~
content_templates:
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-12 22:09:51 UTC (rev 26550)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-12 23:31:41 UTC (rev 26551)
@@ -511,12 +511,12 @@
{
$template = $this->getType()->getTemplate();
}
- $templates =
sfSympalConfiguration::getActive()->getContentTemplates($this->getType()->getName());
+ $templates =
sfSympalConfiguration::getActive()->getContentTemplates($this->getType()->getSlug());
if (isset($templates[$template]))
{
$template = $templates[$template]['template'];
}
- $template = $template ? $template :
sfSympalConfig::get($this->getType()->getName(), 'default_content_template',
sfSympalConfig::get('default_content_template'));
+ $template = $template ? $template :
sfSympalConfig::get($this->getType()->getSlug(), 'default_content_template',
sfSympalConfig::get('default_content_template'));
return $template;
}
@@ -529,7 +529,7 @@
} else if ($theme = $this->getSite()->getTheme()) {
return $theme;
} else {
- return sfSympalConfig::get($this->getType()->getName(), 'default_theme',
sfSympalConfig::get('default_theme', null, $this->getSite()->getSlug()));
+ return sfSympalConfig::get($this->getType()->getSlug(), 'default_theme',
sfSympalConfig::get('default_theme', null, $this->getSite()->getSlug()));
}
}
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentType.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentType.class.php
2010-01-12 22:09:51 UTC (rev 26550)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentType.class.php
2010-01-12 23:31:41 UTC (rev 26551)
@@ -66,7 +66,7 @@
{
return $this->getCustomModuleName();
} else {
- return sfSympalConfig::get($this->getName(), 'default_rendering_module',
sfSympalConfig::get('default_rendering_module', null,
'sympal_content_renderer'));
+ return sfSympalConfig::get($this->getSlug(), 'default_rendering_module',
sfSympalConfig::get('default_rendering_module', null,
'sympal_content_renderer'));
}
}
@@ -76,7 +76,7 @@
{
return $actionName;
} else {
- return sfSympalConfig::get($this->getName(), 'default_rendering_action',
sfSympalConfig::get('default_rendering_action', null, 'index'));
+ return sfSympalConfig::get($this->getSlug(), 'default_rendering_action',
sfSympalConfig::get('default_rendering_action', null, 'index'));
}
}
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-12 22:09:51 UTC (rev 26550)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-12 23:31:41 UTC (rev 26551)
@@ -11,7 +11,7 @@
{
display: normal;
}
- .toggle_edit_mode
+ input.toggle_edit_mode
{
display: none;
}
@@ -20,7 +20,7 @@
{
display: none;
}
- .toggle_edit_mode
+ input.toggle_edit_mode
{
display: normal;
}
--
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.
