Author: Jonathan.Wage
Date: 2010-01-18 01:58:33 +0100 (Mon, 18 Jan 2010)
New Revision: 26791
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/editor.css
plugins/sfSympalPlugin/trunk/web/images/add_new.png
Modified:
plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php
plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/css/editor.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/js/editor.js
Log:
[1.4][sfSympalPlugin][1.0] Style/ui tweaking of inline edit bar
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
2010-01-17 23:01:50 UTC (rev 26790)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
2010-01-18 00:58:33 UTC (rev 26791)
@@ -255,13 +255,19 @@
return sfSympalConfig::get($model, 'content_templates', array());
}
+ public function isAdminModule()
+ {
+ $module = $this->_symfonyContext->getRequest()->getParameter('module');
+ $adminModules = sfSympalConfig::get('admin_modules');
+ return array_key_exists($module, $adminModules);
+ }
+
public function getThemeForRequest()
{
$request = $this->_symfonyContext->getRequest();
+ $module = $request->getParameter('module');
- $module = $request->getParameter('module');
- $adminModules = sfSympalConfig::get('admin_modules');
- if (array_key_exists($module, $adminModules))
+ if ($this->isAdminModule())
{
return sfSympalConfig::get('admin_theme', null, 'admin');
}
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php 2010-01-17
23:01:50 UTC (rev 26790)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php 2010-01-18
00:58:33 UTC (rev 26791)
@@ -106,6 +106,11 @@
return $this->_themeObjects;
}
+ public function isAdminModule()
+ {
+ return $this->_sympalConfiguration->isAdminModule();
+ }
+
public function getPreviousTheme()
{
return $this->getThemeObject($this->_previousTheme);
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-17 23:01:50 UTC (rev 26790)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-18 00:58:33 UTC (rev 26791)
@@ -39,11 +39,18 @@
*/
function get_sympal_admin_menu()
{
- $siteTitle = sfSympalContext::getInstance()->getSite()->getTitle();
+ $sympalContext = sfSympalContext::getInstance();
+ $siteTitle = $sympalContext->getSite()->getTitle();
$menu = new sfSympalMenuAdminMenu('Sympal Admin');
$menu->setCredentials(array('ViewAdminBar'));
- $menu->addChild('Go to Site Frontend', '@homepage');
+ if ($sympalContext->isAdminModule())
+ {
+ $menu->addChild('Go to Site Frontend', '@homepage');
+ } else {
+ $menu->addChild('Go to Site Admin Area', '@sympal_admin');
+ }
+
if (sfSympalConfig::get('page_cache', 'enabled'))
{
$menu->addChild('Clear Cache', '@sympal_clear_cache');
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
2010-01-17 23:01:50 UTC (rev 26790)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
2010-01-18 00:58:33 UTC (rev 26791)
@@ -1,3 +1,5 @@
+<?php sympal_use_stylesheet('/sfSympalAdminPlugin/css/editor.css', 'last') ?>
+
<div id="sf_admin_container">
<h1>Editing "<?php echo $sf_sympal_content ?>" Slots</h1>
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/editor.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/editor.css
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/editor.css
2010-01-18 00:58:33 UTC (rev 26791)
@@ -0,0 +1,36 @@
+#sympal_dashboard, #sympal_editor, #sympal_assets, #sympal_links ,
#sympal_assets {
+ top: 30px;
+}
+
+#sfWebDebugBar {
+ border-bottom: none;
+ background: none !important;
+ position: fixed;
+ top: 0;
+ left: 0;
+}
+
+.sympal_inline_edit_bar_background {
+ filter:alpha(opacity=75);
+ -moz-opacity:0.75;
+ -khtml-opacity: 0.75;
+ opacity: 0.75;
+ border-bottom: 1px solid #000;
+ background: #333 !important;
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 30px;
+ width: 100%;
+}
+
+.sympal_inline_edit_bar_container {
+ font-weight: bold;
+ position: fixed;
+ top: 3px;
+ right: 10px;
+}
+
+.sympal_toggle_inline_edit_bar {
+ display: none;
+}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-17 23:01:50 UTC (rev 26790)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-18 00:58:33 UTC (rev 26791)
@@ -27,13 +27,18 @@
<?php endif; ?>
</style>
+<div class="sympal_inline_edit_bar_background"></div>
+
<div class="sympal_inline_edit_bar_container">
<div class="sympal_inline_edit_bar sympal_form">
- <ul>
- <li><?php echo button_to('X', '@sympal_signout', array(
- 'title' => __('Signout'),
- 'class' => 'signout',
- 'confirm' => __('Are you sure you want to signout?'))) ?></li>
+
+ <?php if (!$sf_sympal_context->isAdminModule()): ?>
+ <div class="sympal_inline_edit_admin_menu">
+ <?php echo get_sympal_admin_menu() ?>
+ </div>
+ <?php endif; ?>
+
+ <ul class="sympal_inline_edit_bar_big_buttons">
<?php if (sfSympalConfig::isI18nEnabled()): ?>
<li>
<?php
@@ -54,7 +59,7 @@
<li><input type="button" class="toggle_edit_mode" value="<?php echo
__('Enable Edit Mode') ?>" /></li>
</ul>
- <ul class="sympal_inline_edit_bar_buttons">
+ <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>
<li><input type="button" class="sympal_save_content_slots" name="save"
value="<?php echo __('Save') ?>" /></li>
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/css/editor.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/css/editor.css
2010-01-17 23:01:50 UTC (rev 26790)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/css/editor.css
2010-01-18 00:58:33 UTC (rev 26791)
@@ -3,7 +3,7 @@
padding: 12px;
border: 1px solid #ccc;
position: fixed;
- top: 20px;
+ top: 60px;
right: 25px;
display: none;
width: 600px;
@@ -173,31 +173,152 @@
z-index: 9999999;
}
+.sympal_toggle_inline_edit_bar {
+ position: absolute;
+ left: 0;
+ top: 37px;
+ z-index: 9999999999;
+ color: #333;
+ font-weight: bold;
+ cursor: pointer;
+ background: #ccc;
+ padding: 4px;
+}
+
+.sympal_inline_edit_bar_background {
+ filter:alpha(opacity=75);
+ -moz-opacity:0.75;
+ -khtml-opacity: 0.75;
+ opacity: 0.75;
+ border-bottom: 1px solid #000;
+ background: #333 !important;
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 60px;
+ width: 100%;
+}
+
.sympal_inline_edit_bar_container {
font-weight: bold;
- margin-top: 2px;
- margin-right: 10px;
position: fixed;
+ top: 30px;
+ right: 10px;
+}
+
+.sympal_inline_edit_bar {
+}
+
+.sympal_inline_edit_admin_menu
+{
+ background: #333;
+ height: 25px;
+ position: fixed;
top: 0;
- right: 0;
- z-index: 9999999;
+ left: 0;
+ margin: 0;
+ padding: 0;
}
-.sympal_inline_edit_bar ul {
+.sympal_inline_edit_admin_menu ul
+{
+ padding: 0;
+ margin: 0;
+}
+
+.sympal_inline_edit_admin_menu ul li
+{
float: left;
+ list-style: none;
+ color: #fff;
margin: 0;
+ padding: 4px;
+ padding-right: 8px;
+ padding-left: 8px;
+ font-weight: normal;
+}
+
+.sympal_inline_edit_admin_menu ul li:hover
+{
+ background: #fff;
+ color: #333;
+}
+
+.sympal_inline_edit_admin_menu ul li:hover a
+{
+ color: #333;
+}
+
+.sympal_inline_edit_admin_menu ul li a
+{
+ display: block;
+ text-decoration: none;
+ white-space: nowrap;
+ color: #fff;
+ font-weight: normal;
+}
+
+.sympal_inline_edit_admin_menu ul li a:hover
+{
+ text-decoration: none;
+ color: #333;
+}
+
+.sympal_inline_edit_admin_menu ul li ul
+{
+ margin: 0;
padding: 0;
+ position: absolute;
+ visibility: hidden;
+ background: #fff;
+ border-left: 1px solid #333;
+ border-bottom: 1px solid #333;
+ border-right: 1px solid #333;
+ margin-left: -9px;
+ margin-top: 4px;
+ width: 200px;
+ padding-top: 10px;
}
-.sympal_inline_edit_bar ul li {
+
+.sympal_inline_edit_admin_menu ul li ul li
+{
+ float: none;
+ display: inline;
+ padding: 0;
+ margin: 0;
+}
+
+.sympal_inline_edit_admin_menu ul li ul li a
+{
+ width: auto;
+ color: #333;
+ padding: 6px;
+}
+
+.sympal_inline_edit_admin_menu ul li ul li a:hover
+{
+ text-decoration: none;
+ background: #333;
+ color: #fff;
+}
+
+.sympal_inline_edit_bar ul.sympal_inline_edit_bar_big_buttons {
float: left;
margin: 0;
padding: 0;
+}
+
+.sympal_inline_edit_bar ul.sympal_inline_edit_bar_big_buttons li {
+ float: left;
+ margin: 0;
+ padding: 0;
list-style-type: none;
}
-.sympal_inline_edit_bar ul li input {
+.sympal_inline_edit_bar ul.sympal_inline_edit_bar_big_buttons li input {
margin-right: 5px;
- border: 1px solid #888 !important;
+ padding: 3px !important;
+ border: none !important;
cursor: pointer;
-khtml-border-radius: 5px;
-moz-border-radius: 5px;
@@ -207,7 +328,11 @@
font-size: 13px !important;
}
-.sympal_inline_edit_bar ul li a {
+.sympal_inline_edit_bar ul.sympal_inline_edit_bar_big_buttons li input:hover {
+ color: #fff;
+}
+
+.sympal_inline_edit_bar ul.sympal_inline_edit_bar_big_buttons li a {
cursor: pointer;
}
@@ -224,8 +349,7 @@
.sympal_inline_edit_bar input.sympal_save_content_slots:hover,
.sympal_inline_edit_bar input.sympal_preview_content_slots:hover {
background-color: #333 !important;
- color: #ffffff !important;
- border: 1px solid #333 !important;
+ color: #fff !important;
}
.sympal_inline_edit_bar input, .sympal_inline_edit_bar select {
@@ -237,15 +361,6 @@
color: #ffffff;
}
-.sympal_inline_edit_bar a {
- text-decoration: none;
- font-weight: bold;
- font-size: 16px;
- width: 175px;
- margin-top: 5px;
- color: #333 !important;
-}
-
.sympal_inline_edit_bar a:hover {
text-decoration: underline;
}
@@ -266,16 +381,32 @@
}
#sfWebDebugBar {
- background: #fff;
- border-bottom: 1px solid #ccc;
- width: 100%;
- height: 20px;
+ border-bottom: none;
+ background: none !important;
+ position: fixed;
+ top: 0;
+ right: 0;
+ height: 0;
}
-.sympal_inline_edit_bar .signout, .sympal_inline_edit_bar .signout:hover {
- background: url(../../sfSympalPlugin/images/signout.png) no-repeat center
!important;
- width: 20px;
- height: 20px;
- color: transparent;
- border: none !important;
+#sfWebDebugBar .sfWebDebugMenu li
+{
+ color: #fff !important;
+}
+
+#sfWebDebug .sfWebDebugTop
+{
+ position: fixed !important;
+ top: 30px !important;
+}
+
+.sfWebDebugInfo, .sfWebDebugInfo td
+{
+ background: none !important;
+ color: #fff !important;
+}
+
+.sfWebDebugInfo a, .sfWebDebugInfo td a
+{
+ color: #fff !important;
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/js/editor.js
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/js/editor.js
2010-01-17 23:01:50 UTC (rev 26790)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/web/js/editor.js
2010-01-18 00:58:33 UTC (rev 26791)
@@ -132,6 +132,7 @@
$.cookie('sympal_inline_edit_mode', 'false');
sympalCloseAllDropdowns();
+ $('#sfWebDebug').show();
});
$('.sympal_content_slot .editor input, .sympal_content_slot .editor
textarea').focus(function() {
@@ -147,6 +148,46 @@
});
});
+var timeout = 1000;
+var closetimer = 0;
+var sympalMenuItem = 0;
+
+function sympalAdminMenuOpen()
+{
+ sympalAdminMenuCancelTimer();
+ sympalAdminMenuClose();
+ sympalMenuItem = $(this).find('ul').css('visibility', 'visible');
+}
+
+function sympalAdminMenuClose()
+{
+ if (sympalMenuItem)
+ {
+ sympalMenuItem.css('visibility', 'hidden');
+ }
+}
+
+function sympalAdminMenuTimer()
+{
+ closetimer = window.setTimeout(sympalAdminMenuClose, timeout);
+}
+
+function sympalAdminMenuCancelTimer()
+{
+ if (closetimer)
+ {
+ window.clearTimeout(closetimer);
+ closetimer = null;
+ }
+}
+
+$ (document).ready(function()
+{
+ $('.sympal_inline_edit_admin_menu ul > li').bind('mouseover',
sympalAdminMenuOpen);
+});
+
+document.onclick = sympalAdminMenuClose;
+
function sympalTinyMCETriggerSave()
{
tinyMCE.triggerSave();
Added: plugins/sfSympalPlugin/trunk/web/images/add_new.png
===================================================================
(Binary files differ)
Property changes on: plugins/sfSympalPlugin/trunk/web/images/add_new.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
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.
