Author: ornicar2
Date: 2010-02-08 11:38:40 +0100 (Mon, 08 Feb 2010)
New Revision: 27717
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
plugins/diemPlugin/trunk/dmFrontPlugin/config/routing.yml
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
Log:
[Diem]
- added signin/signout routes for admin and front
- updated front and admin toolbars to use new routes and new theming API
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
2010-02-08 10:37:12 UTC (rev 27716)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php
2010-02-08 10:38:40 UTC (rev 27717)
@@ -121,6 +121,24 @@
'class' => 'sfRoute',
'url' => '/+/:module/:action/*'
);
+
+ $config['signin'] = array(
+ 'class' => 'sfRoute',
+ 'url' => '/security/signin',
+ 'params' => array(
+ 'module' => 'dmUserAdmin',
+ 'action' => 'signin'
+ )
+ );
+
+ $config['signout'] = array(
+ 'class' => 'sfRoute',
+ 'url' => '/security/signout',
+ 'params' => array(
+ 'module' => 'dmUserAdmin',
+ 'action' => 'signout'
+ )
+ );
$config['dm_module_type'] = array(
'class' => 'sfRoute',
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-08 10:37:12 UTC (rev 27716)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-08 10:38:40 UTC (rev 27717)
@@ -2,7 +2,7 @@
echo _open('div#dm_tool_bar.clearfix.'.sfConfig::get('dm_toolBar_flavour',
'blue'));
- echo _link('dmAuthAdmin/signout')->text('')->title($sf_user->getUsername().'
: '.__('Logout'))->set('.widget16.s16block.s16_signout');
+ echo _link('@signout')->text('')->title($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
if ($sf_user->can('clear_cache'))
{
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/config/routing.yml
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/config/routing.yml 2010-02-08
10:37:12 UTC (rev 27716)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/config/routing.yml 2010-02-08
10:38:40 UTC (rev 27717)
@@ -9,6 +9,10 @@
url: /admin
params: { module: dmFront, action: toAdmin }
+signout:
+ url: /security/signout
+ params: { module: dmUser, action: signout }
+
dmPaginatedPage:
url: /:slug/page/:page
params: { module: dmFront, action: page }
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-08 10:37:12 UTC (rev 27716)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-08 10:38:40 UTC (rev 27717)
@@ -4,7 +4,7 @@
echo
_tag('a.show_tool_bar_toggle.s16block.s16_chevron_'.($sf_user->getShowToolBar()
? 'down' : 'up'), '+');
- echo _link('+/dmAuth/signout')->text('')->title($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
+ echo _link('@signout')->text('')->title($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
echo
_link('app:admin')->text('')->title(__('Administration'))->set('.widget16.s16block.s16_home');
@@ -25,7 +25,7 @@
if (isset($themeSelect))
{
- echo _tag('div.widget16.mt3', $themeSelect->render('dm_select_theme',
$sf_user->getTheme()->getKey()));
+ echo _tag('div.widget16.mt3', $themeSelect->render('dm_select_theme',
$sf_user->getTheme()->getName()));
}
if ($sf_user->can('page_edit'))
--
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.
