Author: Jonathan.Wage
Date: 2010-01-30 08:05:38 +0100 (Sat, 30 Jan 2010)
New Revision: 27321
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/menu.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
Modified:
plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php
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_admin/templates/_menu.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
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
Log:
[1.4][sfSympalPlugin][1.0] Refactoring admin menu out of the editor plugin and
into the admin plugin
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php 2010-01-30
06:17:48 UTC (rev 27320)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php 2010-01-30
07:05:38 UTC (rev 27321)
@@ -78,36 +78,11 @@
/**
* Get the floating sympal editor for the given MenuItem and Content instances
*
- * @param MenuItem $menuItem
- * @param Content $content
* @return string $html
*/
-function get_sympal_editor($menuItem = null, $content = null)
+function get_sympal_editor()
{
- $sympalContext = sfSympalContext::getInstance();
- $editorPluginConfigurartion = $sympalContext->
- getSymfonyContext()->
- getConfiguration()->
- getPluginConfiguration('sfSympalEditorPlugin');
-
- $editorPluginConfigurartion->loadEditorAssets();
-
- $content = $sympalContext->getCurrentContent();
- $menuItem = $sympalContext->getCurrentMenuItem();
-
- if ($content)
- {
- sfApplicationConfiguration::getActive()->getEventDispatcher()->notify(
- new sfEvent(get_sympal_admin_menu_object(), 'sympal.load_editor', array(
- 'content' => $content,
- 'menuItem' => $menuItem
- )
- ));
- }
-
- return get_partial('sympal_editor/editor', array(
- 'loadInlineEditor' => $editorPluginConfigurartion->shouldLoadInlineEditor()
- ));
+ return get_partial('sympal_editor/editor');
}
/**
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-30 06:17:48 UTC (rev 27320)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-30 07:05:38 UTC (rev 27321)
@@ -74,5 +74,20 @@
function get_sympal_admin_menu()
{
$menu = get_sympal_admin_menu_object();
+
+ $sympalContext = sfSympalContext::getInstance();
+ $contentRecord = $sympalContext->getCurrentContent();
+ $menuItem = $sympalContext->getCurrentMenuItem();
+
+ if ($contentRecord)
+ {
+ sfApplicationConfiguration::getActive()->getEventDispatcher()->notify(
+ new sfEvent($menu, 'sympal.load_editor', array(
+ 'content' => $contentRecord,
+ 'menuItem' => $menuItem
+ )
+ ));
+ }
+
return get_partial('sympal_admin/menu', array('menu' => $menu));
-}
+}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-30 07:05:38 UTC (rev 27321)
@@ -7,8 +7,43 @@
$this->dispatcher->connect('sympal.load_admin_menu', array($this,
'loadAdminMenu'));
$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'));
}
+ public function addAdminMenu()
+ {
+ if (sfContext::getInstance()->getUser()->isEditMode())
+ {
+ $this->loadAdminMenuAssets();
+
+ $this->dispatcher->connect('response.filter_content', array($this,
'addEditorHtml'));
+ }
+ }
+
+ public function loadAdminMenuAssets()
+ {
+ $response = sfContext::getInstance()->getResponse();
+
$response->addStylesheet(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/css/menu.css'));
+
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/js/menu.js'));
+ }
+
+ public function shouldLoadAdminMenu()
+ {
+ $format = sfContext::getInstance()->getRequest()->getRequestFormat();
+ $format = $format ? $format : 'html';
+
+ return sfContext::getInstance()->getUser()->isAuthenticated() && $format
== 'html';
+ }
+
+ public function addEditorHtml(sfEvent $event, $content)
+ {
+ if ($this->shouldLoadAdminMenu())
+ {
+ $content = str_replace('</body>', get_sympal_admin_menu().'</body>',
$content);
+ }
+ return $content;
+ }
+
public function loadAdminMenu(sfEvent $event)
{
$menu = $event->getSubject();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/_menu.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/_menu.php
2010-01-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/templates/_menu.php
2010-01-30 07:05:38 UTC (rev 27321)
@@ -1,5 +1,9 @@
-<?php if ($menu = $menu->render()): ?>
- <div id="sympal_admin_menu">
- <?php echo $menu ?>
- </div>
-<?php endif; ?>
\ No newline at end of file
+<div class="sympal_top_bar_background"></div>
+
+<div class="sympal_admin_menu">
+ <?php if ($menu = $menu->render()): ?>
+ <div id="sympal_admin_menu">
+ <?php echo $menu ?>
+ </div>
+ <?php endif; ?>
+</div>
\ No newline at end of file
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-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-01-30 07:05:38 UTC (rev 27321)
@@ -182,6 +182,8 @@
}
$this->getSympalContext()->getContentRenderer($this->sf_sympal_content)->render();
+ $this->dispatcher->notify(new sfEvent($this, 'sympal.load_content',
array('content' => $this->sf_sympal_content)));
+
$this->getContext()->getConfiguration()->getPluginConfiguration('sfSympalEditorPlugin')->loadEditorAssets();
}
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/menu.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/menu.css
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/menu.css
2010-01-30 07:05:38 UTC (rev 27321)
@@ -0,0 +1,155 @@
+.sympal_top_bar_background {
+ border-bottom: 1px solid #000;
+ filter:alpha(opacity=80);
+ -moz-opacity: 0.80;
+ -khtml-opacity: 0.80;
+ opacity: 0.80;
+ background: #333;
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 30px;
+ width: 100%;
+ z-index: 100;
+}
+
+.sympal_admin_menu
+{
+ height: 30px;
+ position: fixed;
+ top: 0;
+ right: 80px;
+ margin: 0;
+ padding: 0;
+ z-index: 999999999;
+}
+
+.sympal_admin_menu ul
+{
+ z-index: 999999999 !important;
+ padding: 0;
+ margin: 0;
+}
+
+.sympal_admin_menu ul li
+{
+ cursor: pointer;
+ float: left;
+ list-style: none;
+ color: #fff;
+ margin: 0;
+ padding: 8px;
+ font-weight: normal;
+ font-size: 12px;
+}
+
+.sympal_admin_menu ul li:hover
+{
+ background: #fff;
+ color: #333;
+}
+
+.sympal_admin_menu ul li:hover a
+{
+ color: #333;
+}
+
+.sympal_admin_menu ul li a
+{
+ display: block;
+ text-decoration: none;
+ white-space: nowrap;
+ color: #fff;
+ font-weight: normal;
+}
+
+.sympal_admin_menu ul li a:hover
+{
+ text-decoration: none;
+ color: #333;
+}
+
+.sympal_admin_menu ul li ul
+{
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ display: none;
+ background: #fff;
+ border-left: 1px solid #333;
+ border-bottom: 1px solid #333;
+ border-right: 1px solid #333;
+ margin-left: -9px;
+ margin-top: 7px;
+ width: 200px;
+}
+
+.sympal_admin_menu ul li ul li
+{
+ float: none;
+ display: inline;
+ padding: 0;
+ margin: 0;
+}
+
+.sympal_admin_menu ul li ul li a
+{
+ width: auto;
+ color: #333;
+ padding: 6px;
+}
+
+.sympal_admin_menu ul li ul li a:hover
+{
+ text-decoration: none;
+ background: #000;
+ color: #fff;
+}
+
+/* Change the web debug toolbar to make way for the admin menu */
+
+#sfWebDebugBar .sfWebDebugMenu {
+ background: #000 !important;
+ visibility: hidden;
+}
+
+#sfWebDebugBar {
+ border-bottom: none;
+ background: none !important;
+ position: fixed;
+ left: 0;
+ top: 5px !important;
+ height: 0;
+}
+
+#sfWebDebugSymfonyVersion
+{
+ margin-left: 0pt;
+ padding-top: 1px;
+ padding-right: 4px;
+ padding-bottom: 1px;
+ padding-left: 4px;
+ background-color: #333 !important;
+ color: #ffffff;
+}
+
+#sfWebDebugBar .sfWebDebugMenu li
+{
+ color: #fff !important;
+}
+
+.sfWebDebugInfo, .sfWebDebugInfo td
+{
+ background: none !important;
+ color: #fff !important;
+}
+
+.sfWebDebugInfo a, .sfWebDebugInfo td a
+{
+ color: #fff !important;
+}
+
+#sfWebDebug .sfWebDebugTop
+{
+ top: 30px !important;
+}
\ No newline at end of file
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
(rev 0)
+++ plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/menu.js
2010-01-30 07:05:38 UTC (rev 27321)
@@ -0,0 +1,13 @@
+$(function() {
+ // Override the webdebug toolbar and how it is hidden and displayed
+ $('#sfWebDebugBar a:first').click(function() {
+ if ($('#sfWebDebugDetails').css('visibility') == 'visible')
+ {
+ $('#sfWebDebugDetails').css('visibility', 'hidden');
+ } else {
+ $('#sfWebDebugDetails').css('visibility', 'visible');
+ }
+ sfWebDebugToggleMenu();
+ return false;
+ });
+});
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
2010-01-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
2010-01-30 07:05:38 UTC (rev 27321)
@@ -6,7 +6,7 @@
public function initialize()
{
- $this->dispatcher->connect('context.load_factories', array($this,
'loadEditor'));
+ $this->dispatcher->connect('sympal.load_content', array($this,
'loadEditor'));
}
public function shouldLoadEditor()
@@ -14,19 +14,8 @@
$format = sfContext::getInstance()->getRequest()->getRequestFormat();
$format = $format ? $format : 'html';
- return sfContext::getInstance()->getUser()->isEditMode() && $format ==
'html';
- }
-
- public function shouldLoadInlineEditor()
- {
- // Load inline editor if
- // ...page caching is off
- // ...and inline editing is enabled
- // ...and we are editing a content record
- // OR
- // ...we are in the admin module
- // ...and we are editing a content record
- return (!sfSympalConfig::get('page_cache', 'enabled')
+ return sfContext::getInstance()->getUser()->isEditMode()
+ && $format == 'html' && (!sfSympalConfig::get('page_cache', 'enabled')
&& sfSympalConfig::get('inline_editing', 'enabled')
&& sfSympalContext::getInstance()->getCurrentContent())
|| (sfSympalConfiguration::getActive()->isAdminModule() &&
sfSympalContext::getInstance()->getCurrentContent());
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-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-30 07:05:38 UTC (rev 27321)
@@ -20,78 +20,64 @@
<?php endif; ?>
</style>
-<div class="sympal_inline_edit_bar_top_background"></div>
-
<input type="hidden" id="sympal_base_url" value="<?php echo
url_for('@homepage', 'absolute=true') ?>" />
-<?php if ($loadInlineEditor): ?>
- <input type="hidden" id="sympal_save_slots_url" value="<?php echo
url_for('@sympal_save_content_slots?content_id='.$sf_sympal_content->getId())
?>" />
- <div class="sympal_inline_edit_bar_bottom_background"></div>
-<?php endif; ?>
+<input type="hidden" id="sympal_save_slots_url" value="<?php echo
url_for('@sympal_save_content_slots?content_id='.$sf_sympal_content->getId())
?>" />
+<div class="sympal_inline_edit_bar_bottom_background"></div>
<div class="sympal_inline_edit_bar_container">
<div class="sympal_inline_edit_bar sympal_form">
- <?php if ($loadInlineEditor): ?>
- <div class="sympal_inline_edit_bar_publish">
- <?php if ($sf_sympal_content->getIsPublished()): ?>
- <?php echo
link_to(image_tag('/sfSympalPlugin/images/published_icon.png',
'title='.__('Published on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
- <?php elseif ($sf_sympal_content->getIsPublishedInTheFuture()): ?>
- <?php echo
link_to(image_tag('/sfSympalPlugin/images/future_published_icon.png',
'title='.__('Will publish on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
- <?php else: ?>
- <?php echo
link_to(image_tag('/sfSympalPlugin/images/unpublished_icon.png',
'title='.__('Has not been published yet.').' '.__('Click to publish
content.')), '@sympal_publish_content?id='.$sf_sympal_content['id']) ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <div class="sympal_inline_edit_admin_menu">
- <?php echo get_sympal_admin_menu() ?>
+ <div class="sympal_inline_edit_bar_publish">
+ <?php if ($sf_sympal_content->getIsPublished()): ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/published_icon.png',
'title='.__('Published on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
+ <?php elseif ($sf_sympal_content->getIsPublishedInTheFuture()): ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/future_published_icon.png',
'title='.__('Will publish on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
+ <?php else: ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/unpublished_icon.png',
'title='.__('Has not been published yet.').' '.__('Click to publish
content.')), '@sympal_publish_content?id='.$sf_sympal_content['id']) ?>
+ <?php endif; ?>
</div>
<div class="sympal_inline_edit_signout">
<?php echo link_to(image_tag('/sfSympalPlugin/images/signout.png',
'title='.__('Signout')), '@sympal_signout', 'confirm='.__('Are you sure you
want to signout?')) ?>
</div>
- <?php if ($loadInlineEditor): ?>
- <ul class="sympal_inline_edit_bar_big_buttons">
- <?php if (sfSympalConfig::isI18nEnabled()): ?>
- <li>
- <?php
- $user = sfContext::getInstance()->getUser();
- $form = new sfFormLanguage($user, array('languages' =>
sfSympalConfig::getLanguageCodes()));
- unset($form[$form->getCSRFFieldName()]);
- $widgetSchema = $form->getWidgetSchema();
- $widgetSchema['language']->setAttribute('onChange',
"this.form.submit();");
- ?>
+ <ul class="sympal_inline_edit_bar_big_buttons">
+ <?php if (sfSympalConfig::isI18nEnabled()): ?>
+ <li>
+ <?php
+ $user = sfContext::getInstance()->getUser();
+ $form = new sfFormLanguage($user, array('languages' =>
sfSympalConfig::getLanguageCodes()));
+ unset($form[$form->getCSRFFieldName()]);
+ $widgetSchema = $form->getWidgetSchema();
+ $widgetSchema['language']->setAttribute('onChange',
"this.form.submit();");
+ ?>
- <?php echo
$form->renderFormTag(url_for('@sympal_change_language_form')) ?>
- <?php echo $form['language'] ?>
- </form>
- </li>
- <?php endif; ?>
- <li><input type="button" class="toggle_dashboard_menu" value="<?php
echo __('Dashboard') ?>" rel="<?php echo url_for('@sympal_dashboard') ?>"
/></li>
+ <?php echo
$form->renderFormTag(url_for('@sympal_change_language_form')) ?>
+ <?php echo $form['language'] ?>
+ </form>
+ </li>
+ <?php endif; ?>
+ <li><input type="button" class="toggle_dashboard_menu" value="<?php echo
__('Dashboard') ?>" rel="<?php echo url_for('@sympal_dashboard') ?>" /></li>
- <?php if ($sf_sympal_content->getEditableSlotsExistOnPage()): ?>
- <li><input type="button" class="toggle_edit_mode" value="<?php echo
__('Enable Edit Mode') ?>" /></li>
- <?php endif; ?>
- </ul>
+ <?php if ($sf_sympal_content->getEditableSlotsExistOnPage()): ?>
+ <li><input type="button" class="toggle_edit_mode" value="<?php echo
__('Enable Edit Mode') ?>" /></li>
+ <?php endif; ?>
+ </ul>
- <ul class="sympal_inline_edit_bar_big_buttons
sympal_inline_edit_bar_buttons">
- <li><input type="button" class="toggle_sympal_assets" name="assets"
rel="<?php echo url_for('@sympal_assets_select') ?>" value="<?php echo
__('Assets') ?>" /></li>
- <li><input type="button" class="toggle_sympal_links" name="links"
rel="<?php echo url_for('@sympal_editor_links') ?>" value="<?php echo
__('Links') ?>" /></li>
+ <ul class="sympal_inline_edit_bar_big_buttons
sympal_inline_edit_bar_buttons">
+ <li><input type="button" class="toggle_sympal_assets" name="assets"
rel="<?php echo url_for('@sympal_assets_select') ?>" value="<?php echo
__('Assets') ?>" /></li>
+ <li><input type="button" class="toggle_sympal_links" name="links"
rel="<?php echo url_for('@sympal_editor_links') ?>" value="<?php echo
__('Links') ?>" /></li>
- <?php if ($sf_sympal_content->getEditableSlotsExistOnPage()): ?>
- <li><input type="button" class="sympal_save_content_slots"
name="save" value="<?php echo __('Save') ?>" /></li>
- <li><input type="button" class="sympal_preview_content_slots"
name="preview" value="<?php echo __('Preview') ?>" /></li>
- <li><input type="button" class="sympal_disable_edit_mode"
name="disable_edit_mode" value="<?php echo __('Disable Edit Mode') ?>" /></li>
- <?php endif; ?>
- </ul>
- <?php endif; ?>
+ <?php if ($sf_sympal_content->getEditableSlotsExistOnPage()): ?>
+ <li><input type="button" class="sympal_save_content_slots" name="save"
value="<?php echo __('Save') ?>" /></li>
+ <li><input type="button" class="sympal_preview_content_slots"
name="preview" value="<?php echo __('Preview') ?>" /></li>
+ <li><input type="button" class="sympal_disable_edit_mode"
name="disable_edit_mode" value="<?php echo __('Disable Edit Mode') ?>" /></li>
+ <?php endif; ?>
+ </ul>
</div>
</div>
-<?php if ($loadInlineEditor): ?>
- <div id="sympal_assets"></div>
- <div id="sympal_links"></div>
- <div id="sympal_dashboard"></div>
-<?php endif; ?>
\ No newline at end of file
+<div id="sympal_assets"></div>
+<div id="sympal_links"></div>
+<div id="sympal_dashboard"></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-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
2010-01-30 07:05:38 UTC (rev 27321)
@@ -101,7 +101,7 @@
padding: 4px;
}
-.sympal_inline_edit_bar_top_background {
+.sympal_top_bar_background {
border-bottom: 1px solid #000;
filter:alpha(opacity=80);
-moz-opacity: 0.80;
@@ -166,7 +166,7 @@
border: none;
}
-.sympal_inline_edit_admin_menu
+.sympal_admin_menu
{
height: 30px;
position: fixed;
@@ -177,14 +177,14 @@
z-index: 999999999;
}
-.sympal_inline_edit_admin_menu ul
+.sympal_admin_menu ul
{
z-index: 999999999 !important;
padding: 0;
margin: 0;
}
-.sympal_inline_edit_admin_menu ul li
+.sympal_admin_menu ul li
{
cursor: pointer;
float: left;
@@ -196,18 +196,18 @@
font-size: 12px;
}
-.sympal_inline_edit_admin_menu ul li:hover
+.sympal_admin_menu ul li:hover
{
background: #fff;
color: #333;
}
-.sympal_inline_edit_admin_menu ul li:hover a
+.sympal_admin_menu ul li:hover a
{
color: #333;
}
-.sympal_inline_edit_admin_menu ul li a
+.sympal_admin_menu ul li a
{
display: block;
text-decoration: none;
@@ -216,13 +216,13 @@
font-weight: normal;
}
-.sympal_inline_edit_admin_menu ul li a:hover
+.sympal_admin_menu ul li a:hover
{
text-decoration: none;
color: #333;
}
-.sympal_inline_edit_admin_menu ul li ul
+.sympal_admin_menu ul li ul
{
margin: 0;
padding: 0;
@@ -237,7 +237,7 @@
width: 200px;
}
-.sympal_inline_edit_admin_menu ul li ul li
+.sympal_admin_menu ul li ul li
{
float: none;
display: inline;
@@ -245,14 +245,14 @@
margin: 0;
}
-.sympal_inline_edit_admin_menu ul li ul li a
+.sympal_admin_menu ul li ul li a
{
width: auto;
color: #333;
padding: 6px;
}
-.sympal_inline_edit_admin_menu ul li ul li a:hover
+.sympal_admin_menu ul li ul li a:hover
{
text-decoration: none;
background: #000;
@@ -358,52 +358,6 @@
border-radius: 20px;
}
-#sfWebDebugBar .sfWebDebugMenu {
- background: #000 !important;
- visibility: hidden;
-}
-
-#sfWebDebugBar {
- border-bottom: none;
- background: none !important;
- position: fixed;
- left: 0;
- top: 5px !important;
- height: 0;
-}
-
-#sfWebDebugSymfonyVersion
-{
- margin-left: 0pt;
- padding-top: 1px;
- padding-right: 4px;
- padding-bottom: 1px;
- padding-left: 4px;
- background-color: #333 !important;
- color: #ffffff;
-}
-
-#sfWebDebugBar .sfWebDebugMenu li
-{
- color: #fff !important;
-}
-
-.sfWebDebugInfo, .sfWebDebugInfo td
-{
- background: none !important;
- color: #fff !important;
-}
-
-.sfWebDebugInfo a, .sfWebDebugInfo td a
-{
- color: #fff !important;
-}
-
-#sfWebDebug .sfWebDebugTop
-{
- top: 30px !important;
-}
-
#sympal_ask_confirmation {
padding: 12px;
background: #ffc;
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
2010-01-30 06:17:48 UTC (rev 27320)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
2010-01-30 07:05:38 UTC (rev 27321)
@@ -3,8 +3,8 @@
$(function()
{
// Top admin menu bar mouseover and mouseout events for dropdown menus
- $('.sympal_inline_edit_admin_menu ul > li').bind('mouseover',
sympalAdminMenuOpen);
- $('.sympal_inline_edit_admin_menu ul > li').bind('mouseout',
sympalAdminMenuClose);
+ $('.sympal_admin_menu ul > li').bind('mouseover', sympalAdminMenuOpen);
+ $('.sympal_admin_menu ul > li').bind('mouseout', sympalAdminMenuClose);
// Content publishing fancybox
$('#sympal_assets #sympal_ask_confirmation input.no').live('click',
function() {
@@ -31,18 +31,6 @@
'hideOnContentClick': false,
});
- // Override the webdebug toolbar and how it is hidden and displayed
- $('#sfWebDebugBar a:first').click(function() {
- if ($('#sfWebDebugDetails').css('visibility') == 'visible')
- {
- $('#sfWebDebugDetails').css('visibility', 'hidden');
- } else {
- $('#sfWebDebugDetails').css('visibility', 'visible');
- }
- sfWebDebugToggleMenu();
- return false;
- });
-
// Toggle edit mode
var editMode = $.cookie('sympal_inline_edit_mode');
--
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.
