Author: Jonathan.Wage
Date: 2010-01-13 21:14:48 +0100 (Wed, 13 Jan 2010)
New Revision: 26580
Modified:
plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/view.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.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_themes/lib/Basesympal_themesActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
Log:
[1.4][sfSympalPlugin][1.0] renaming and reorganizing admin menu
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-13 19:09:56 UTC (rev 26579)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -43,8 +43,10 @@
$menu->setCredentials(array('ViewAdminBar'));
$menu->addChild('Go to Site Frontend', '@homepage');
$menu->addChild('My Dashboard', '@sympal_dashboard');
- $menu->addChild('Administration');
- $menu->addChild('Security');
+ $menu->addChild('Content', null, array('label' => 'Site Content'));
+ $menu->addChild('Administration', null, array('label' => 'Global Setup'));
+ $menu->addChild('Site Administration', null, array('label' =>
sfSympalContext::getInstance()->getSite()->getTitle().' Setup'));
+ $menu->addChild('Security', null, array('label' => 'Users & Security'));
sfApplicationConfiguration::getActive()->getEventDispatcher()->notify(new
sfEvent($menu, 'sympal.load_admin_menu'));
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -12,6 +12,7 @@
public function loadAdminMenu(sfEvent $event)
{
$menu = $event->getSubject();
+ $manageContent = $menu->getChild('Content');
$user = sfContext::getInstance()->getUser();
@@ -20,28 +21,33 @@
$contentTypes =
Doctrine_Core::getTable('sfSympalContentType')->findAll();
foreach ($contentTypes as $contentType)
{
- $node = $menu->addChild('Manage '.$contentType->getLabel().' Content');
- $node->addChild('Create',
'@sympal_content_create_type?type='.$contentType->getId());
- $node->addChild('List',
'@sympal_content_list_type?type='.$contentType->getId());
+ $manageContent->addChild($contentType->getLabel(),
'@sympal_content_list_type?type='.$contentType->getId());
}
}
- $administration = $menu->getChild('Administration');
+ $siteAdministration = $menu->getChild('Site Administration');
- $administration->addChild('Sites', '@sympal_sites')
- ->setCredentials(array('ManageSites'));
+ $siteAdministration
+ ->addChild('404 Redirects', '@sympal_redirects')
+ ->setCredentials(array('ManageContentSetup'));
- $administration->addChild('Content Types', '@sympal_content_types')
+ $siteAdministration
+ ->addChild('Edit Site',
'@sympal_sites_edit?id='.sfSympalContext::getInstance()->getSite()->getId())
->setCredentials(array('ManageContentSetup'));
- $administration->addChild('Configuration', '@sympal_config')
- ->setCredentials(array('ManageConfiguration'));
-
- $administration->addChild('Manage Redirects', '@sympal_redirects')
+ $manageContent->addChild('Content Types', '@sympal_content_types')
->setCredentials(array('ManageContentSetup'));
- $administration->addChild('Preview Themes', '@sympal_themes')
+ $administration = $menu->getChild('Administration');
+
+ $administration->addChild('Themes', '@sympal_themes')
->setCredentials(array('ManageThemes'));
+
+ $administration->addChild('Sites', '@sympal_sites')
+ ->setCredentials(array('ManageSites'));
+
+ $administration->addChild('System Settings', '@sympal_config')
+ ->setCredentials(array('ManageConfiguration'));
}
public function loadConfigForm(sfEvent $event)
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/view.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/view.yml
2010-01-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/view.yml
2010-01-13 20:14:48 UTC (rev 26580)
@@ -1,3 +1,3 @@
default:
metas:
- title: Sympal Admin / Configuration
\ No newline at end of file
+ title: Sympal Admin / Settings
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
2010-01-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -1,5 +1,5 @@
<div id="sf_admin_container">
- <h1><?php echo __('Sympal Configuration') ?></h1>
+ <h1><?php echo __('System Settings') ?></h1>
<p><?php echo __('Manage the configuration of your Sympal project from the
easy to use web form below. The different functionalities added by Sympal
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-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_menu_item/lib/Basesympal_content_menu_itemActions.class.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -15,8 +15,15 @@
parent::preExecute();
$this->loadAdminTheme();
+
+ $this->getContext()->getEventDispatcher()->connect('admin.save_object',
array($this, 'listenToAdminSaveObject'));
}
+ public function listenToAdminSaveObject(sfEvent $event)
+ {
+ $this->resetSympalRoutesCache();
+ }
+
public function executeIndex(sfWebRequest $request)
{
$this->content = $this->getRoute()->getObject();
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-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_themes/lib/Basesympal_themesActions.class.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -16,8 +16,10 @@
if ($preview = $request->getParameter('preview'))
{
+ $this->getResponse()->setTitle(sprintf('Sympal Admin / Previewing %s',
$preview));
$this->loadTheme($preview);
} else {
+ $this->getResponse()->setTitle(sprintf('Sympal Admin / Themes'));
$this->loadAdminTheme();
}
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
2010-01-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAssetsPlugin/config/sfSympalAssetsPluginConfiguration.class.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -12,8 +12,8 @@
public function loadAdminMenu(sfEvent $event)
{
$menu = $event->getSubject();
- $menu->getChild('Administration')
- ->addChild('Assets Manager', '@sympal_assets');
+ $menu->getChild('Content')
+ ->addChild('Assets', '@sympal_assets');
}
public function loadConfigForm(sfEvent $event)
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-01-13 19:09:56 UTC (rev 26579)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-01-13 20:14:48 UTC (rev 26580)
@@ -15,11 +15,9 @@
public function loadAdminMenu(sfEvent $event)
{
- $menu = $event->getSubject();
-
- $administration = $menu->getChild('Administration');
- $menus = $administration->addChild('Menu Manager', '@sympal_menu_items')
- ->setCredentials(array('ManageMenus'));
+ $event->getSubject()
+ ->getChild('Site Administration')
+ ->addChild('Menus',
'@sympal_menu_items')->setCredentials(array('ManageMenus'));
}
public function loadEditor(sfEvent $event)
--
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.
