Author: Jonathan.Wage
Date: 2010-01-14 02:40:04 +0100 (Thu, 14 Jan 2010)
New Revision: 26604
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/lib/Basesympal_configActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_menu_item/lib/Basesympal_content_menu_itemActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/lib/Basesympal_content_typesActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_redirects/lib/Basesympal_redirectsActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/lib/Basesympal_sitesActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_themes/lib/Basesympal_themesActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/modules/sympal_assets/lib/Basesympal_assetsActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/lib/Basesympal_plugin_managerActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUpgradePlugin/modules/sympal_upgrade/lib/Basesympal_upgradeActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_groups/lib/Basesympal_groupsActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_permissions/lib/Basesympal_permissionsActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_users/lib/Basesympal_usersActions.class.php
Log:
[1.4][sfSympalPlugin][1.0] Making admin modules configurable
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-14 00:44:09 UTC (rev
26603)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-14 01:40:04 UTC (rev
26604)
@@ -1,5 +1,23 @@
all:
sympal_config:
+ admin_modules:
+ - sympal_admin
+ - sympal_config
+ - sympal_content
+ - sympal_content_menu_item
+ - sympal_content_types
+ - sympal_dashboard
+ - sympal_redirects
+ - sympal_sites
+ - sympal_themes
+ - sympal_users
+ - sympal_groups
+ - sympal_permissions
+ - sympal_menu_items
+ - sympal_plugin_manager
+ - sympal_assets
+ - sympal_upgrade
+
# Minify css and javascript
minifier:
enabled: true
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -30,7 +30,8 @@
'sfParameterHolder',
'sfSympalDataGrid',
'sfSympalUpgradeFromWeb',
- 'sfSympalServerCheckHtmlRenderer'
+ 'sfSympalServerCheckHtmlRenderer',
+ 'sfSympalSitemapGenerator'
));
$this->_dispatcher->connect('context.load_factories', array($this,
'bootstrap'));
@@ -239,9 +240,15 @@
return sfSympalConfig::get($model, 'content_templates', array());
}
- public function getDefaultTheme(sfWebRequest $request)
+ public function getThemeForRequest(sfWebRequest $request)
{
- $theme = sfSympalConfig::get($request->getParameter('module'), 'theme');
+ $module = $request->getParameter('module');
+ $adminModules = sfSympalConfig::get('admin_modules');
+ if (in_array($module, $adminModules))
+ {
+ return sfSympalConfig::get('admin_theme', null, 'admin');
+ }
+ $theme = sfSympalConfig::get($module, 'theme');
if (!$theme)
{
$theme =
sfSympalConfig::get(sfContext::getInstance()->getRouting()->getCurrentRouteName(),
'theme');
@@ -259,7 +266,7 @@
if (!$request->isXmlHttpRequest())
{
- $this->_sympalContext->loadTheme($this->getDefaultTheme($request));
+ $this->_sympalContext->loadTheme($this->getThemeForRequest($request));
}
}
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-14 00:44:09 UTC (rev 26603)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -39,12 +39,13 @@
*/
function get_sympal_admin_menu()
{
+ $siteTitle = sfSympalContext::getInstance()->getSite()->getTitle();
$menu = new sfSympalMenuAdminMenu('Sympal Admin');
$menu->setCredentials(array('ViewAdminBar'));
$menu->addChild('Go to Site Frontend', '@homepage');
$menu->addChild('My Dashboard', '@sympal_dashboard');
- $menu->addChild('Content', null, array('label' => 'Site Content'));
- $menu->addChild('Site Administration', null, array('label' =>
sfSympalContext::getInstance()->getSite()->getTitle().' Setup'));
+ $menu->addChild('Content', null, array('label' => $siteTitle.' Content'));
+ $menu->addChild('Site Administration', null, array('label' => $siteTitle.'
Setup'));
$menu->addChild('Security', null, array('label' => 'Users & Security'));
$menu->addChild('Administration', null, array('label' => 'Global Setup'));
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -18,8 +18,6 @@
return $this->redirect('@sympal_dashboard');
}
- $this->loadAdminTheme();
-
$class = sfConfig::get('app_sf_guard_plugin_signin_form',
'sfGuardFormSignin');
$this->form = new $class();
@@ -74,7 +72,6 @@
public function executeCheck_server(sfWebRequest $request)
{
$this->getResponse()->setTitle('Sympal Admin / Check Server');
- $this->loadAdminTheme();
$check = new sfSympalServerCheck();
$this->renderer = new sfSympalServerCheckHtmlRenderer($check);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/lib/Basesympal_configActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/lib/Basesympal_configActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/lib/Basesympal_configActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -10,13 +10,6 @@
*/
abstract class Basesympal_configActions extends sfActions
{
- public function preExecute()
- {
- parent::preExecute();
-
- $this->loadAdminTheme();
- }
-
protected function _getForm()
{
$class = sfSympalConfig::get('config_form_class', null,
'sfSympalConfigForm');
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -12,7 +12,6 @@
$this->redirect('@homepage');
}
- $this->loadAdminTheme();
$this->getContext()->getEventDispatcher()->connect('admin.save_object',
array($this, 'listenToAdminSaveObject'));
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_menu_item/lib/Basesympal_content_menu_itemActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_menu_item/lib/Basesympal_content_menu_itemActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_menu_item/lib/Basesympal_content_menu_itemActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -14,8 +14,6 @@
{
parent::preExecute();
- $this->loadAdminTheme();
-
$this->getContext()->getEventDispatcher()->connect('admin.save_object',
array($this, 'listenToAdminSaveObject'));
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/lib/Basesympal_content_typesActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/lib/Basesympal_content_typesActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/lib/Basesympal_content_typesActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -6,7 +6,6 @@
{
parent::preExecute();
- $this->loadAdminTheme();
$this->getContext()->getEventDispatcher()->connect('admin.save_object',
array($this, 'listenToAdminSaveObject'));
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -10,13 +10,6 @@
*/
abstract class Basesympal_dashboardActions extends sfActions
{
- public function preExecute()
- {
- parent::preExecute();
-
- $this->loadAdminTheme();
- }
-
public function executeIndex()
{
if ($this->isAjax = $this->isAjax())
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_redirects/lib/Basesympal_redirectsActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_redirects/lib/Basesympal_redirectsActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_redirects/lib/Basesympal_redirectsActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -13,12 +13,6 @@
*/
abstract class Basesympal_redirectsActions extends autoSympal_redirectsActions
{
- public function preExecute()
- {
- parent::preExecute();
- $this->loadAdminTheme();
- }
-
public function executeCreate(sfWebRequest $request)
{
$this->form = $this->configuration->getForm();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/lib/Basesympal_sitesActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/lib/Basesympal_sitesActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/lib/Basesympal_sitesActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -2,13 +2,6 @@
class Basesympal_sitesActions extends autosympal_sitesActions
{
- public function preExecute()
- {
- parent::preExecute();
-
- $this->loadAdminTheme();
- }
-
protected function processForm(sfWebRequest $request, sfForm $form)
{
$form->bind($request->getParameter($form->getName()),
$request->getFiles($form->getName()));
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_themes/lib/Basesympal_themesActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_themes/lib/Basesympal_themesActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_themes/lib/Basesympal_themesActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -20,7 +20,6 @@
$this->loadTheme($preview);
} else {
$this->getResponse()->setTitle(sprintf('Sympal Admin / Themes'));
- $this->loadAdminTheme();
}
}
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/modules/sympal_assets/lib/Basesympal_assetsActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/modules/sympal_assets/lib/Basesympal_assetsActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/modules/sympal_assets/lib/Basesympal_assetsActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -4,8 +4,6 @@
{
public function preExecute()
{
- $this->loadAdminTheme();
-
$this->isAjax = $this->isAjax();
if ($this->isAjax)
{
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -6,8 +6,6 @@
{
parent::preExecute();
- $this->loadAdminTheme();
-
$this->getContext()->getEventDispatcher()->connect('admin.build_query',
array($this, 'listenToAdminBuildQuery'));
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/lib/Basesympal_plugin_managerActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/lib/Basesympal_plugin_managerActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/modules/sympal_plugin_manager/lib/Basesympal_plugin_managerActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -14,8 +14,6 @@
{
parent::preExecute();
- $this->loadAdminTheme();
-
$sympalConfiguration =
sfSympalContext::getInstance()->getSympalConfiguration();
$this->addonPlugins = $sympalConfiguration->getAllManageablePlugins();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUpgradePlugin/modules/sympal_upgrade/lib/Basesympal_upgradeActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUpgradePlugin/modules/sympal_upgrade/lib/Basesympal_upgradeActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUpgradePlugin/modules/sympal_upgrade/lib/Basesympal_upgradeActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -14,8 +14,6 @@
{
parent::preExecute();
- $this->loadAdminTheme();
-
$this->upgrade = new sfSympalUpgradeFromWeb(
$this->getContext()->getConfiguration(),
$this->getContext()->getEventDispatcher(),
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_groups/lib/Basesympal_groupsActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_groups/lib/Basesympal_groupsActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_groups/lib/Basesympal_groupsActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -5,10 +5,4 @@
class Basesympal_groupsActions extends autoSympal_groupsActions
{
- public function preExecute()
- {
- parent::preExecute();
-
- $this->loadAdminTheme();
- }
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_permissions/lib/Basesympal_permissionsActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_permissions/lib/Basesympal_permissionsActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_permissions/lib/Basesympal_permissionsActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -5,10 +5,4 @@
class Basesympal_permissionsActions extends autosympal_permissionsActions
{
- public function preExecute()
- {
- parent::preExecute();
-
- $this->loadAdminTheme();
- }
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_users/lib/Basesympal_usersActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_users/lib/Basesympal_usersActions.class.php
2010-01-14 00:44:09 UTC (rev 26603)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalUserPlugin/modules/sympal_users/lib/Basesympal_usersActions.class.php
2010-01-14 01:40:04 UTC (rev 26604)
@@ -5,10 +5,4 @@
class Basesympal_usersActions extends autosympal_usersActions
{
- public function preExecute()
- {
- parent::preExecute();
-
- $this->loadAdminTheme();
- }
}
\ No newline at end of file
--
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.
