Author: Jonathan.Wage
Date: 2010-02-01 01:44:54 +0100 (Mon, 01 Feb 2010)
New Revision: 27369
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuDashboard.class.php
Modified:
plugins/sfSympalPlugin/trunk/i18n/messages.de.xml
plugins/sfSympalPlugin/trunk/i18n/messages.fr.xml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/indexSuccess.json.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/modules/sympal_dashboard/templates/indexSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/dashboard.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
Log:
[1.4][sfSympalPlugin][1.0] Initial re-design of dashboard. Got rid of dashboard
boxes and used admin menu to make things simpler
Modified: plugins/sfSympalPlugin/trunk/i18n/messages.de.xml
===================================================================
--- plugins/sfSympalPlugin/trunk/i18n/messages.de.xml 2010-01-31 22:06:12 UTC
(rev 27368)
+++ plugins/sfSympalPlugin/trunk/i18n/messages.de.xml 2010-02-01 00:44:54 UTC
(rev 27369)
@@ -40,7 +40,7 @@
<target>Titel</target>
</trans-unit>
<trans-unit id="80">
- <source>Go to Site Frontend</source>
+ <source>Go to Site</source>
<target>Zum Frontend wechseln</target>
</trans-unit>
<trans-unit id="90">
Modified: plugins/sfSympalPlugin/trunk/i18n/messages.fr.xml
===================================================================
--- plugins/sfSympalPlugin/trunk/i18n/messages.fr.xml 2010-01-31 22:06:12 UTC
(rev 27368)
+++ plugins/sfSympalPlugin/trunk/i18n/messages.fr.xml 2010-02-01 00:44:54 UTC
(rev 27369)
@@ -31,7 +31,7 @@
<target>Titre</target>
</trans-unit>
<trans-unit id="80">
- <source>Go to Site Frontend</source>
+ <source>Go to Site</source>
<target>Aller sur le site</target>
</trans-unit>
<trans-unit id="90">
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -8,29 +8,23 @@
$this->dispatcher->connect('sympal.load_config_form', array($this,
'loadConfigForm'));
$this->dispatcher->connect('sympal.load_editor', array($this,
'loadEditor'));
$this->dispatcher->connect('context.load_factories', array($this,
'addAdminMenu'));
- $this->dispatcher->connect('sympal.load_inline_edit_bar_buttons',
array($this, 'loadInlineEditBarButtons'));
}
- public function loadInlineEditBarButtons(sfEvent $event)
+ public function shouldLoadAdminMenu()
{
- if (sfContext::getInstance()->getUser()->hasCredential('ViewDashboard'))
- {
- $menu = $event->getSubject();
- $menu->
- addChild('Dashboard', '@sympal_dashboard')->
- setShortcut('Ctrl+D')->
- setInputClass('toggle_dashboard_menu')->
- setCredentials('ViewDashboard')
- ;
- }
+ $context = sfContext::getInstance();
+ $request = $context->getRequest();
+ $format = $request->getRequestFormat();
+ $format = $format ? $format : 'html';
+
+ return $context->getUser()->hasCredential('ViewAdminBar')
+ && $format == 'html'
+ && $request->getParameter('module') !== 'sympal_dashboard';
}
public function addAdminMenu()
{
- $format = sfContext::getInstance()->getRequest()->getRequestFormat();
- $format = $format ? $format : 'html';
-
- if (sfContext::getInstance()->getUser()->hasCredential('ViewAdminBar') &&
$format == 'html')
+ if ($this->shouldLoadAdminMenu())
{
$this->loadAdminMenuAssets();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/indexSuccess.json.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/indexSuccess.json.php
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/indexSuccess.json.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -3,6 +3,7 @@
foreach ($this->configuration->getValue('list.display') as $name => $field)
{
$columns[$name] = __($field->getConfig('label', '', true));
+ break;
}
?>
[?php echo
$helper->getNestedSetJsonResults($sf_request->getParameter('root_id'), $pager,
<?php echo var_export($columns, true) ?>) ?]
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/helper/AdminHelper.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -1,6 +1,6 @@
<?php
-function get_sympal_admin_menu_object()
+function get_sympal_admin_menu_object($class = 'sfSympalMenuAdminMenu')
{
static $menu;
@@ -8,18 +8,18 @@
{
$sympalContext = sfSympalContext::getInstance();
$siteTitle = $sympalContext->getSite()->getTitle();
- $menu = new sfSympalMenuAdminMenu('Sympal Admin', '@sympal_dashboard');
+ $menu = new $class('Sympal Admin', '@sympal_dashboard');
if ($sympalContext->isAdminModule())
{
- $menu->addChild('Go to Site Frontend', '@homepage');
+ $menu->addChild('Go to Site', '@homepage');
}
-
- if (sfContext::getInstance()->getUser()->hasCredential('ViewDashboard'))
+ else if
(sfContext::getInstance()->getUser()->hasCredential('ViewDashboard'))
{
- $menu->addChild('My Dashboard', '@sympal_dashboard');
+ $menu->addChild('Go to Admin', '@sympal_dashboard');
}
+
if (sfContext::getInstance()->getUser()->hasCredential('ClearCache'))
{
$menu->addChild('Clear Cache', '@sympal_clear_cache');
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuDashboard.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuDashboard.class.php
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuDashboard.class.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -0,0 +1,22 @@
+<?php
+
+class sfSympalMenuDashboard extends sfSympalMenuAdminMenu
+{
+ public function render()
+ {
+ $html = '';
+ foreach ($this->_children as $child)
+ {
+ if ($child->hasChildren())
+ {
+ $html .= '<div class="sympal_dashboard_box">';
+ $html .= '<h2>'.$child->renderLabel().'</h2>';
+ $html .= '<ul>';
+ $html .= $child->renderChildren();
+ $html .= '</ul>';
+ $html .= '</div>';
+ }
+ }
+ return $html;
+ }
+}
\ No newline at end of file
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-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -29,71 +29,5 @@
} else {
$this->hasNewVersion = false;
}
-
- $this->boxes = new sfSympalMenu('Dashboard Boxes');
-
- $this->boxes['Sites']
- ->setRoute('@sympal_sites')
- ->setCredentials(array('ManageSites'));
-
- $this->boxes['Manage Content']
- ->setRoute('@sympal_content')
- ->setCredentials(array('ManageContent'));
-
- $contentTypes =
Doctrine_Core::getTable('sfSympalContentType')->getAllContentTypes();
-
- foreach ($contentTypes as $contentType)
- {
- $this->boxes['Create '.$contentType['label']]
- ->setRoute('@sympal_content_create_type?type='.$contentType['slug'])
- ->setCredentials(array('ManageContent'))
- ->setLiClass('create_content');
- }
-
- $this->boxes['Assets Manager']
- ->setRoute('@sympal_assets')
- ->setCredentials(array('ManageAssets'));
-
- $this->boxes['Menu Manager']
- ->setRoute('@sympal_menu_items')
- ->setCredentials(array('ManageMenus'));
-
- $this->boxes['Plugin Manager']
- ->setRoute('@sympal_plugin_manager')
- ->setCredentials(array('ManagePlugins'));
-
- $this->boxes['Content Types']
- ->setRoute('@sympal_content_types')
- ->setCredentials(array('ManageContentTypes'));
-
- $this->boxes['Users']
- ->setRoute('@sympal_users')
- ->setCredentials(array('ManageUsers'));
-
- $this->boxes['Groups']
- ->setRoute('@sympal_groups')
- ->setCredentials(array('ManageGroups'));
-
- $this->boxes['Permissions']
- ->setRoute('@sympal_permissions')
- ->setCredentials(array('ManagePermissions'));
-
- $this->boxes['Configuration']
- ->setRoute('@sympal_config')
- ->setCredentials(array('ManageSystemSettings'));
-
- $this->boxes['Sitemap']
- ->setRoute('@sympal_sitemap')
- ->setCredentials(array('ManageMenus'));
-
- $this->boxes['Check for Updates']
- ->setRoute('@sympal_check_for_updates')
- ->setCredentials(array('UpdateManager'));
-
- $this->boxes['Check Server']
- ->setRoute('@sympal_check_server')
- ->setCredentials(array('ViewServerCheck'));
-
- $this->getContext()->getEventDispatcher()->notify(new
sfEvent($this->boxes, 'sympal.load_dashboard'));
}
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/templates/indexSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/templates/indexSuccess.php
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/templates/indexSuccess.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -1,10 +1,5 @@
-<?php if ($isAjax): ?>
- <link rel="stylesheet" type="text/css" media="screen" href="<?php echo
stylesheet_path('/sfSympalAdminPlugin/css/dashboard.css') ?>" />
- <link rel="stylesheet" type="text/css" media="screen" href="<?php echo
stylesheet_path('/sfSympalUpgradePlugin/css/upgrade.css') ?>" />
-<?php else: ?>
- <?php sympal_use_stylesheet('/sfSympalAdminPlugin/css/dashboard.css') ?>
- <?php sympal_use_stylesheet('/sfSympalUpgradePlugin/css/upgrade.css') ?>
-<?php endif; ?>
+<?php sympal_use_stylesheet('/sfSympalAdminPlugin/css/dashboard.css') ?>
+<?php sympal_use_stylesheet('/sfSympalUpgradePlugin/css/upgrade.css') ?>
<?php if ($hasNewVersion): ?>
<div class="sympal_new_version_box">
@@ -12,19 +7,15 @@
</div>
<?php endif; ?>
+<?php if ($sf_request->isXmlHttpRequest()): ?>
+ <p><?php echo link_to(__('Go to the Sympal admin area for your site.'),
'@sympal_dashboard') ?></p>
+<?php endif; ?>
+
<div id="sympal-dashboard">
- <div id="boxes">
- <h1><?php echo __('Sympal Dashboard') ?></h1>
+ <h1><?php echo __('Sympal Dashboard') ?></h1>
- <p><?php echo __('Hello %name%! Welcome to your Sympal Dashboard. Below
you can navigate the functionality and administer your site.', array('%name%'
=> '<strong>'.$sf_user->getName().'</strong>')) ?></p>
+ <p><?php echo __('Hello %name%! Welcome to your Sympal Dashboard. Below you
can navigate the functionality and administer your site.', array('%name%' =>
'<strong>'.$sf_user->getName().'</strong>')) ?></p>
- <?php if ($sf_request->isXmlHttpRequest()): ?>
- <p><?php echo link_to(__('Go to the Sympal admin area for your site.'),
'@sympal_dashboard') ?></p>
- <?php endif; ?>
-
- <?php echo $boxes->render() ?>
- </div>
- <?php if ($isAjax): ?>
- <a class="sympal_close_menu"><?php echo __('Close') ?></a>
- <?php endif; ?>
+ <?php echo get_sympal_admin_menu_object('sfSympalMenuDashboard') ?>
+ <br style="clear: left;" />
</div>
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
2010-02-01 00:44:54 UTC (rev 27369)
@@ -71,12 +71,17 @@
margin: 0 auto;
padding: 0;
width: 100%;
+ min-width: 900px;
}
+#container #footer {
+ padding-top: 20px;
+ clear: both;
+}
+
#container #footer p {
text-align: center;
font-size: 11px;
- clear: both;
}
#content {
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/dashboard.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/dashboard.css
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/dashboard.css
2010-02-01 00:44:54 UTC (rev 27369)
@@ -1,132 +1,65 @@
-#sympal-dashboard {
-
+body {
+ text-align: center;
}
-#sympal-dashboard #boxes {
- width: 100%;
+#sympal-dashboard {
+ background: #ccc;
+ -khtml-border-radius:0.75em;
+ -moz-border-radius: 0.75em;
+ -webkit-border-radius: 0.75em;
+ border-radius: 0.75em;
+ padding: 16px;
+ margin-right: 200px;
+ width: 90%;
+ border: 1px solid #aaa;
+ text-align: left;
+ margin: auto;
}
-#sympal-dashboard #boxes ul {
- margin: 0;
- padding: 0;
+#sympal-dashboard h1 {
+ color: #002970;
+ font-size: 25px;
}
-#sympal-dashboard #boxes ul li {
+#sympal-dashboard .sympal_dashboard_box {
float: left;
- list-style-type: none;
- height: 85px;
- width: 160px;
- margin-right: 5px;
- border: 1px dotted #ccc;
- text-align: center;
- margin: 5px;
- padding: 0;
- padding-top: 10px;
+ width: 175px;
background: #fff;
- border: 1px solid #ccc;
- font-size: 14px;
- -khtml-border-radius:0.4em;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
+ margin-right: 10px;
+ -khtml-border-radius:0.75em;
+ -moz-border-radius: 0.75em;
+ -webkit-border-radius: 0.75em;
+ border-radius: 0.75em;
}
-#sympal-dashboard #boxes ul li a {
- width: 100%;
- height: 85px;
- display: block;
- font-weight: bold;
- text-decoration: none;
- background: url(../images/default_dashboard_icon.png) no-repeat;
- background-position: center;
-}
-
-#sympal-dashboard #boxes ul li a:hover {
+#sympal-dashboard .sympal_dashboard_box h2 {
+ background: #1049A9;
color: #fff;
- font-size: 15px;
+ margin: 0;
+ padding: 10px;
}
-#sympal-dashboard #boxes ul li:hover {
- background: #375fc2;
- border: 1px solid #333;
- color: #fff;
+#sympal-dashboard .sympal_dashboard_box ul {
+ margin: 0;
+ padding: 0;
}
-#sympal-dashboard #boxes ul li:hover a {
- color: white;
+#sympal-dashboard .sympal_dashboard_box ul li {
+ padding: 6px;
+ padding-left: 12px;
+ padding-right: 12px;
+ border-bottom: 1px solid #ccc;
}
-#sympal-dashboard #boxes ul li#dashboard-boxes-sitemap a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -1295px;
+#sympal-dashboard .sympal_dashboard_box ul li a:hover {
+ font-weight: bold;
}
-#sympal-dashboard #boxes ul li#dashboard-boxes-manage-content a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -75px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-sites a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center 20px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-menu-manager a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -390px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-plugin-manager a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -505px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-content-types a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -620px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-content-templates a {
- background: url(../images/content_templates.png) no-repeat;
- background-position: center;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-users a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -750px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-groups a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -895px;
-}
-
-#sympal-dashboard #boxes ul li.create_content a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -175px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-permissions a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -1035px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-configuration a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -1175px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-assets-manager a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -275px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-check-for-updates a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -1400px;
-}
-
-#sympal-dashboard #boxes ul li#dashboard-boxes-check-server a {
- background: url(../images/dashboard_sprite.gif) no-repeat;
- background-position: center -1510px;
+#sympal-dashboard .sympal_dashboard_box ul li:before
+{
+ padding-top: 5px;
+ content: ' ยป ';
+ font-weight: bold;
+ font-size: 20px;
+ color: #1049A9;
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -47,7 +47,6 @@
<div id="sympal_assets"></div>
<div id="sympal_links"></div>
<div id="sympal_objects"></div>
-<div id="sympal_dashboard"></div>
<div id="sympal_slot_errors"></div>
<div id="sympal_slot_errors_icon"></div>
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
2010-02-01 00:44:54 UTC (rev 27369)
@@ -314,11 +314,6 @@
text-indent: 15px;
}
-.sympal_inline_edit_bar input.toggle_dashboard_menu {
- background: #f5f5f5 url(../../sfSympalPlugin/images/dashboard_icon.gif) 2px
4px no-repeat !important;
- text-indent: 15px;
-}
-
.sympal_inline_edit_bar input.toggle_sympal_links {
background: #f5f5f5 url(../../sfSympalPlugin/images/links_icon.gif) 2px 5px
no-repeat !important;
text-indent: 15px;
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
2010-02-01 00:44:54 UTC (rev 27369)
@@ -285,7 +285,6 @@
function sympalCloseAllDropdowns()
{
- $('#sympal_dashboard').hide();
$('#sympal_editor').hide();
$('#sympal_assets').hide();
$('#sympal_links').hide();
@@ -294,7 +293,6 @@
function sympalSetupDropdownMenus()
{
- sympalSetupDropdownMenu('#sympal_dashboard', '.toggle_dashboard_menu');
sympalSetupDropdownMenu('#sympal_assets', '.toggle_sympal_assets');
sympalSetupDropdownMenu('#sympal_links', '.toggle_sympal_links');
sympalSetupDropdownMenu('#sympal_objects', '.toggle_sympal_objects');
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
2010-01-31 22:06:12 UTC (rev 27368)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
2010-02-01 00:44:54 UTC (rev 27369)
@@ -373,15 +373,22 @@
{
$id = Doctrine_Inflector::urlize($this->getName().'-menu');
$html = '<ul'.($this->_ulClass ? ' class="'.$this->_ulClass.'"' :
null).' id="'.$id.'">';
- foreach ($this->_children as $child)
- {
- $html .= $child->renderChild();
- }
+ $html .= $this->renderChildren();
$html .= '</ul>';
return $html;
}
}
+ public function renderChildren()
+ {
+ $html = '';
+ foreach ($this->_children as $child)
+ {
+ $html .= $child->renderChild();
+ }
+ return $html;
+ }
+
public function renderChild()
{
if ($this->checkUserAccess())
--
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.
