Author: Jonathan.Wage
Date: 2010-02-10 21:47:56 +0100 (Wed, 10 Feb 2010)
New Revision: 27853
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/shortcuts.js
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
Log:
[1.4][sfSympalPlugin][1.0] Fixing shortcuts and adding shortcut to go between
frontend and admin
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-02-10 20:36:53 UTC (rev 27852)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-02-10 20:47:56 UTC (rev 27853)
@@ -34,9 +34,13 @@
public function loadAdminMenuAssets()
{
+ sfSympalToolkit::useJQuery();
+
$response = sfContext::getInstance()->getResponse();
$response->addStylesheet(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/css/menu.css'));
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/js/menu.js'));
+
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalPlugin/js/shortcuts.js'));
+
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/js/shortcuts.js'));
}
public function addEditorHtml(sfEvent $event, $content)
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
2010-02-10 20:36:53 UTC (rev 27852)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
2010-02-10 20:47:56 UTC (rev 27853)
@@ -12,11 +12,11 @@
if ($sympalContext->isAdminModule())
{
- $menu->addChild('Go to Site', '@homepage');
+ $menu->addChild('Go to Site', '@homepage', 'id=sympal_go_to_switch');
}
else if
(sfContext::getInstance()->getUser()->hasCredential('ViewDashboard'))
{
- $menu->addChild('Go to Admin', '@sympal_dashboard');
+ $menu->addChild('Go to Admin', '@sympal_dashboard',
'id=sympal_go_to_switch');
}
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-02-10 20:36:53 UTC (rev 27852)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
2010-02-10 20:47:56 UTC (rev 27853)
@@ -12,10 +12,9 @@
{
public function executeIndex()
{
- if ($this->isAjax = $this->isAjax())
- {
- $this->setLayout(false);
- }
+ $response = $this->getResponse();
+
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalPlugin/js/shortcuts.js'));
+
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/js/shortcuts.js'));
if (sfSympalConfig::get('check_for_upgrades_on_dashboard', null, false))
{
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
2010-02-10 20:36:53 UTC (rev 27852)
+++ plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
2010-02-10 20:47:56 UTC (rev 27853)
@@ -1,8 +1,4 @@
$(function() {
- shortcut.add('Ctrl+Q', function() {
- $('.sympal_signout_icon a').click();
- });
-
// Top admin menu bar mouseover and mouseout events for dropdown menus
$('.sympal_admin_menu ul > li').bind('mouseover', sympalAdminMenuOpen);
$('.sympal_admin_menu ul > li').bind('mouseout', sympalAdminMenuClose);
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/shortcuts.js
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/shortcuts.js
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/shortcuts.js
2010-02-10 20:47:56 UTC (rev 27853)
@@ -0,0 +1,9 @@
+$(function() {
+ shortcut.add('Ctrl+Q', function() {
+ $('.sympal_signout_icon a').click();
+ });
+
+ shortcut.add('Ctrl+Shift+G', function() {
+ location.href = $('#sympal_go_to_switch').attr('href');
+ });
+});
\ 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.
