Author: Jonathan.Wage
Date: 2010-01-15 01:26:16 +0100 (Fri, 15 Jan 2010)
New Revision: 26661
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalRenderingPlugin/modules/sympal_content_renderer/config/cache.yml
plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixes for content routing
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-14 23:18:42 UTC (rev 26660)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-15 00:26:16 UTC (rev 26661)
@@ -336,9 +336,13 @@
if ($this->get('custom_path', false) || $this->get('module', false) ||
$this->get('action', false))
{
return '@sympal_content_' . str_replace('-', '_', $this['slug']);
- } else if ($this['Type']['default_path']) {
+ }
+ else if ($this['Type']['default_path'])
+ {
return $this['Type']['route_name'];
- } else if ($this['slug']) {
+ }
+ else if ($this['slug'])
+ {
return '@sympal_content_view';
}
}
@@ -352,28 +356,21 @@
$path .= '.:sf_format';
}
return $path;
- } else if ($path = $this['Type']['route_path']) {
+ }
+ else if ($this->get('module', false) || $this->get('action', false))
+ {
+ $values = $this->_buildValues();
+ $values['sf_culture'] = ':sf_culture';
+ $values['sf_format'] = ':sf_format';
+ return $this->getRouteObject()->generate($values);
+ }
+ else if ($path = $this['Type']['route_path'])
+ {
return $path;
- } else if ($this['slug']) {
- return '/content/:slug';
}
- }
-
- public function getAutomaticUrlHierarchy()
- {
- $menuItem = $this->getMenuItem();
- unset($this->MenuItem);
- if ($menuItem)
+ else if ($this['slug'])
{
- $url = str_replace(' / ', '/',
$menuItem->getBreadcrumbs($this)->getPathAsString());
- $e = explode('/', $url);
- unset($e[0]);
- $e = array_map(array('Doctrine_Inflector', 'urlize'), $e);
- $url = implode('/', $e);
- if ($url)
- {
- return '/'.$url;
- }
+ return '/content/:slug';
}
}
@@ -418,7 +415,9 @@
public function getEvaluatedRoutePath()
{
- return $this->getRouteObject()->generate($this->_buildValues());
+ $values = $this->_buildValues();
+ $values['sf_culture'] = sfContext::getInstance()->getUser()->getCulture();
+ return $this->getRouteObject()->generate($values);
}
protected function _fillRoute($route)
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
2010-01-14 23:18:42 UTC (rev 26660)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
2010-01-15 00:26:16 UTC (rev 26661)
@@ -212,15 +212,6 @@
color: #fff;
}
-#sf_admin_container .sf_admin_row_0 td
-{
-}
-
-#sf_admin_container .sf_admin_row_1 td
-{
-/* background-color: #eee;*/
-}
-
#sf_admin_container fieldset h2
{
text-shadow: #4E89D5 1px 1px 1px;
@@ -287,6 +278,13 @@
border-bottom: 1px solid #ddd;
}
+#sf_admin_container .sf_admin_text input,
+#sf_admin_container .sf_admin_text textarea
+{
+ width: 75%;
+}
+
+
#sf_admin_container .sf_admin_form_row .content
{
padding-left: 9em;
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalRenderingPlugin/modules/sympal_content_renderer/config/cache.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalRenderingPlugin/modules/sympal_content_renderer/config/cache.yml
2010-01-14 23:18:42 UTC (rev 26660)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalRenderingPlugin/modules/sympal_content_renderer/config/cache.yml
2010-01-15 00:26:16 UTC (rev 26661)
@@ -1,4 +1,4 @@
-<?php if (sfConfig::get('sf_environment') == 'prod'): ?>
+<?php if (sfConfig::get('sf_cache')): ?>
index:
enabled: <?php echo var_export(sfSympalConfig::get('page_cache',
'enabled', false))."\n" ?>
Modified: plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
2010-01-14 23:18:42 UTC (rev 26660)
+++ plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
2010-01-15 00:26:16 UTC (rev 26661)
@@ -206,7 +206,7 @@
{
$routes['content_'.$content->getId()] = sprintf($routeTemplate,
substr($content->getRouteName(), 1),
- $content->getEvaluatedRoutePath(),
+ $content->getRoutePath(),
$content->getModuleToRenderWith(),
$content->getActionToRenderWith(),
$content->Type->name,
--
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.
