Author: Jonathan.Wage
Date: 2010-01-20 06:25:29 +0100 (Wed, 20 Jan 2010)
New Revision: 26910
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/templates/admin.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/lib/Basesympal_editorActions.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
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/modules/sympal_default/templates/ask_confirmationSuccess.php
plugins/sfSympalPlugin/trunk/web/css/sympal.css
Log:
[1.4][sfSympalPlugin][1.0] Improving ui
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -9,7 +9,8 @@
$_allPermissions,
$_route,
$_routeObject,
- $_mainMenuItem;
+ $_mainMenuItem,
+ $_editableSlotsExistOnPage = false;
public static function createNew($type)
{
@@ -37,6 +38,16 @@
return $content;
}
+ public function setEditableSlotsExistOnPage($bool)
+ {
+ $this->_editableSlotsExistOnPage = $bool;
+ }
+
+ public function getEditableSlotsExistOnPage()
+ {
+ return $this->_editableSlotsExistOnPage;
+ }
+
public function getModuleToRenderWith()
{
if ($module = $this->_get('module'))
@@ -246,6 +257,10 @@
public function publish()
{
+ if ($menu = $this->getMenuItem())
+ {
+ $menu->publish();
+ }
$this->date_published = new Doctrine_Expression('NOW()');
$this->save();
$this->refresh();
@@ -253,6 +268,10 @@
public function unpublish()
{
+ if ($menu = $this->getMenuItem())
+ {
+ $menu->unpublish();
+ }
$this->date_published = null;
$this->save();
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
2010-01-20 05:25:29 UTC (rev 26910)
@@ -11,13 +11,13 @@
param: { module: sympal_admin, action: clear_cache }
sympal_publish_content:
- url: /publish_content/:id
+ url: /admin/content/:id/publish
param: { module: sympal_editor, action: publish_content }
class: sfDoctrineRoute
options: { model: sfSympalContent, type: object }
sympal_unpublish_content:
- url: /unpublish_content/:id
+ url: /admin/content/:id/unpublish
param: { module: sympal_editor, action: unpublish_content }
class: sfDoctrineRoute
options: { model: sfSympalContent, type: object }
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -80,31 +80,29 @@
$menu = $event->getSubject();
$content = $event['content'];
+ $menuItem = $event['menuItem'];
+
+ $sympalConfiguration = sfSympalConfiguration::getActive();
$user = sfContext::getInstance()->getUser();
$request = sfContext::getInstance()->getRequest();
- $contentEditor = $menu->addChild($content['Type']['label'] . ' Actions')
+ $contentEditor = $menu->getChild($content->getType()->getLabel() . '
Actions')
->setCredentials(array('ManageContent'));
- if ($request->getParameter('module') == 'sympal_content' ||
$request->getParameter('module') == 'sympal_menu_items')
+ if ($sympalConfiguration->isAdminModule())
{
- $contentEditor->addChild(image_tag('/sf/sf_admin/images/list.png').'
View '.$content['Type']['label'], $content->getRoute());
+ $contentEditor->addChild(image_tag('/sf/sf_admin/images/list.png').'
View '.$content->getType()->getLabel(), $content->getRoute());
}
-
- if ($request->getParameter('module') != 'sympal_content')
- {
- $contentEditor->addChild(image_tag('/sf/sf_admin/images/edit.png').'
Edit '.$content['Type']['label'], $content->getEditRoute());
- }
+ $contentEditor->addChild(image_tag('/sf/sf_admin/images/add.png').' Create
New '.$content->getType()->getLabel(),
'@sympal_content_create_type?type='.$content['Type']['slug']);
+ $contentEditor->addChild(image_tag('/sf/sf_admin/images/edit.png').' Edit
'.$content->getType()->getLabel(), $content->getEditRoute());
$contentEditor->addChild(image_tag('/sf/sf_admin/images/edit.png').' Edit
Content Type', '@sympal_content_types_edit?id='.$content->getType()->getId());
- if ($content['date_published'])
+ if ($menuItem && $menuItem->exists())
{
- $contentEditor->addChild(image_tag('/sf/sf_admin/images/cancel.png').'
Un-Publish', '@sympal_unpublish_content?id='.$content['id']);
+ $contentEditor->addChild(image_tag('/sf/sf_admin/images/edit.png').'
Edit Menu Item', '@sympal_content_menu_item?id='.$content->getId());
} else {
- $contentEditor->addChild(image_tag('/sf/sf_admin/images/tick.png').'
Publish', '@sympal_publish_content?id='.$content['id']);
+ $contentEditor->addChild(image_tag('/sf/sf_admin/images/add.png').' Add
to Menu', '@sympal_content_menu_item?id='.$content->getId());
}
-
- $contentEditor->addChild(image_tag('/sf/sf_admin/images/add.png').' Create
New '.$content['Type']['label'],
'@sympal_content_create_type?type='.$content['Type']['slug']);
}
}
\ 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-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -50,22 +50,6 @@
}
}
- public function executePublish(sfWebRequest $request)
- {
- $content = $this->_getContent($request);
- $this->_publishMenuItem($content, true);
-
- $msg = $publish ? 'Content published successfully!':'Content unpublished
successfully!';
- $this->getUser()->setFlash('notice', $msg);
- $this->redirect($request->getReferer());
- }
-
- public function executeUnpublish(sfWebRequest $request)
- {
- $content = $this->_getContent($request);
- $this->_publishContent($content, false);
- }
-
protected function _getContentType($type, sfWebRequest $request)
{
if (!$this->contentType)
@@ -177,6 +161,12 @@
$user = $this->getUser();
$user->checkContentSecurity($this->sf_sympal_content);
+ $this->getSympalContext()->setCurrentContent($this->sf_sympal_content);
+ if ($menuItem = $this->sf_sympal_content->getMenuItem())
+ {
+
$this->getSympalContext()->setCurrentMenuItem($this->sf_sympal_content->getMenuItem());
+ }
+
$this->getResponse()->setTitle('Sympal Admin / Editing
'.$this->sf_sympal_content);
$this->form = $this->configuration->getForm($this->sf_sympal_content);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/templates/admin.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/templates/admin.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/templates/admin.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -16,22 +16,17 @@
</div>
<div id="container">
-
- <!-- content -->
- <div id="content">
-
- <?php if ($sf_sympal_context->getSite() && $sf_user->isAuthenticated()): ?>
- <div id="header">
- <h1><?php echo $sf_sympal_context->getSite()->getTitle() ?> <?php echo
sfSympalConfig::getCurrentVersion() ?> Admin</h1>
+ <div id="content">
+ <?php echo get_sympal_flash() ?>
+ <?php echo $sf_content ?>
</div>
- <?php endif; ?>
- <?php echo get_sympal_flash() ?>
- <?php echo $sf_content ?>
-
+ <?php if ($sf_sympal_context->getSite() && $sf_user->isAuthenticated()): ?>
+ <div id="footer">
+ <p><?php echo __('Powered by %1% %2%', array('%1%' =>
link_to('Sympal', 'http://www.sympalphp.org', 'target=_BLANK'), '%2%' =>
sfSympalConfig::getCurrentVersion())) ?>.</p>
+ </div>
+ <?php endif; ?>
</div>
- <!-- end content -->
- <br style="clear: both;" />
- </div>
+
</body>
</html>
\ 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-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/admin.css
2010-01-20 05:25:29 UTC (rev 26910)
@@ -47,19 +47,6 @@
margin-bottom: 0;
}
-#content #header {
- position: absolute;
- right: 30px;
- top: 10px;
- height: 50px;
-}
-
-#content #header h1 {
- font-weight: bold;
- color: #333;
- font-size: 20px;
-}
-
#content h1 {
color: #11A8FF;
font-size: 18px;
@@ -86,11 +73,15 @@
width: 100%;
}
+#container #footer p {
+ text-align: center;
+ font-size: 11px;
+}
+
#content {
margin: 0;
padding: 20px;
background-color: #fff;
- min-height: 400px;
position: relative;
}
@@ -112,19 +103,19 @@
background: url(../images/error.png) no-repeat 4px 4px;
}
-#ask_confirmation {
+#sympal_ask_confirmation {
padding: 12px;
background: #ffc;
border: 1px solid #ddd;
}
-#ask_confirmation h2 {
+#sympal_ask_confirmation h2 {
padding: 0;
margin: 0;
margin-bottom: 10px;
}
-#ask_confirmation p {
+#sympal_ask_confirmation p {
margin-bottom: 10px;
}
@@ -146,7 +137,6 @@
#content {
background: none;
- min-height: 600px;
}
#content #sympal_content_type_menu {
@@ -155,7 +145,7 @@
position: absolute;
top: 50px;
right: 40px;
- z-index: 9999999999;
+ z-index: 101;
}
#content #sympal_content_type_menu h3 {
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/config/sfSympalEditorPluginConfiguration.class.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -66,10 +66,9 @@
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalEditorPlugin/js/editor.js'));
$response->addStylesheet(sfSympalConfig::getAssetPath('/sfSympalEditorPlugin/css/editor.css'));
- if (!sfConfig::get('sf_debug'))
- {
-
$response->addStylesheet(sfSympalConfig::getAssetPath('/sfSympalEditorPlugin/css/editor_nodebug.css'),
'last');
- }
+ // Fancybox
+
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalPlugin/fancybox/jquery.fancybox.js'));
+
$response->addStylesheet(sfSympalConfig::getAssetPath('/sfSympalPlugin/fancybox/jquery.fancybox.css'));
$this->_editorAssetsLoaded = true;
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -2,6 +2,8 @@
function get_sympal_content_slot_editor(sfSympalContent $content,
sfSympalContentSlot $slot)
{
+ $content->setEditableSlotsExistOnPage(true);
+
$slot->setContentRenderedFor($content);
$name = $slot->getName();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/lib/Basesympal_editorActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/lib/Basesympal_editorActions.class.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/lib/Basesympal_editorActions.class.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -4,18 +4,28 @@
{
public function executePublish_content(sfWebRequest $request)
{
+ $this->askConfirmation(
+ 'Publish Content',
+ 'Are you sure you want publish this content?'
+ );
+
$this->getRoute()->getObject()->publish();
-
+
$this->getUser()->setFlash('notice', 'Content published successfully!');
- $this->redirect($request->getReferer());
+ $this->redirect($request->getParameter('redirect_url'));
}
public function executeUnpublish_content(sfWebRequest $request)
{
+ $this->askConfirmation(
+ 'Un-publish Content',
+ 'Are you sure you want un-publish this content?'
+ );
+
$this->getRoute()->getObject()->unpublish();
$this->getUser()->setFlash('notice', 'Content un-published successfully!');
- $this->redirect($request->getReferer());
+ $this->redirect($request->getParameter('redirect_url'));
}
public function executeLinks(sfWebRequest $request)
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-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -32,11 +32,11 @@
<?php if (isset($sf_sympal_content) && $sf_sympal_content): ?>
<div class="sympal_inline_edit_bar_publish">
<?php if ($sf_sympal_content->getIsPublished()): ?>
- <?php echo image_tag('/sfSympalPlugin/images/published_icon.png',
'title=Published on '.format_date($sf_sympal_content->getDatePublished(), 'g'))
?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/published_icon.png', 'title=Published
on '.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
image_tag('/sfSympalPlugin/images/future_published_icon.png', 'title=Will
publish on '.format_date($sf_sympal_content->getDatePublished(), 'g')) ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/future_published_icon.png',
'title=Will publish on '.format_date($sf_sympal_content->getDatePublished(),
'g').'. Click to unpublish content.'),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
<?php else: ?>
- <?php echo image_tag('/sfSympalPlugin/images/unpublished_icon.png',
'title=Has not been published yet.') ?>
+ <?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; ?>
@@ -67,15 +67,21 @@
</li>
<?php endif; ?>
<li><input type="button" class="toggle_dashboard_menu" value="<?php
echo __('Dashboard') ?>" rel="<?php echo url_for('@sympal_dashboard') ?>"
/></li>
- <li><input type="button" class="toggle_edit_mode" value="<?php echo
__('Enable Edit Mode') ?>" /></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>
<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>
- <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 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; ?>
</div>
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/css/editor.css
2010-01-20 05:25:29 UTC (rev 26910)
@@ -402,4 +402,20 @@
#sfWebDebug .sfWebDebugTop
{
top: 30px !important;
+}
+
+#sympal_ask_confirmation {
+ padding: 12px;
+ background: #ffc;
+ border: 1px solid #ddd;
+}
+
+#sympal_ask_confirmation h2 {
+ padding: 0;
+ margin: 0;
+ margin-bottom: 10px;
+}
+
+#sympal_ask_confirmation p {
+ margin-bottom: 10px;
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
2010-01-20 05:25:29 UTC (rev 26910)
@@ -4,6 +4,30 @@
$(function()
{
+ $('#sympal_assets #sympal_ask_confirmation input.no').live('click',
function() {
+ $('#sympal_assets').load($('.toggle_sympal_assets').attr('rel'));
+ return false;
+ });
+
+ $('#fancy_content #sympal_ask_confirmation input.no').live('click',
function() {
+ $.fn.fancybox.close();
+ return false;
+ });
+
+ $('#fancy_content #sympal_ask_confirmation input.yes').live('click',
function() {
+ $.fn.fancybox.close();
+ setTimeout(function() {
+ location.href = location.href;
+ }, 750);
+ });
+
+ $('.sympal_inline_edit_bar_publish a').fancybox({
+ 'zoomSpeedIn': 300,
+ 'zoomSpeedOut': 300,
+ 'overlayShow': true,
+ 'hideOnContentClick': false,
+ });
+
$('#sfWebDebugBar a:first').click(function() {
if ($('#sfWebDebugDetails').css('visibility') == 'visible')
{
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -9,7 +9,6 @@
public function initialize()
{
- $this->dispatcher->connect('sympal.load_editor', array($this,
'loadEditor'));
$this->dispatcher->connect('sympal.load_admin_menu', array($this,
'loadAdminMenu'));
}
@@ -19,30 +18,4 @@
->getChild('Site Administration')
->addChild('Menus',
'@sympal_menu_items')->setCredentials(array('ManageMenus'));
}
-
- public function loadEditor(sfEvent $event)
- {
- $menuItem = $event['menuItem'];
- $menu = $event->getSubject();
- $content = $event['content'];
-
- $menuEditor = $menu->addChild('Menu Actions')
- ->setCredentials(array('ManageMenus'));
-
- if ($menuItem && $menuItem->exists())
- {
- if ($menuItem->getIsPublished())
- {
- $menuEditor->addChild(image_tag('/sf/sf_admin/images/cancel.png').'
Un-Publish Menu Item', '@sympal_unpublish_menu_item?id='.$menuItem['id']);
- } else {
- $menuEditor->addChild(image_tag('/sf/sf_admin/images/tick.png').'
Publish Menu Item', '@sympal_publish_menu_item?id='.$menuItem['id']);
- }
-
- $menuEditor->addChild(image_tag('/sf/sf_admin/images/edit.png').' Edit
Menu Item', '@sympal_content_menu_item?id='.$content['id']);
-
- $menuEditor->addChild(image_tag('/sf/sf_admin/images/delete.png').'
Delete', '@sympal_menu_items_delete?id='.$menuItem['id']);
- } else {
- $menuEditor->addChild(image_tag('/sf/sf_admin/images/add.png').' Add to
Menu', '@sympal_content_menu_item?id='.$content['id']);
- }
- }
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/modules/sympal_default/templates/ask_confirmationSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/modules/sympal_default/templates/ask_confirmationSuccess.php
2010-01-20 03:47:51 UTC (rev 26909)
+++
plugins/sfSympalPlugin/trunk/modules/sympal_default/templates/ask_confirmationSuccess.php
2010-01-20 05:25:29 UTC (rev 26910)
@@ -4,15 +4,15 @@
<?php if ($isAjax): ?>
<script type="text/javascript">
$(function() {
- var updateId = $('#ask_confirmation').parent('div, span').attr('id');
- $('#ask_confirmation form').ajaxForm({
+ var updateId = $('#sympal_ask_confirmation').parent('div,
span').attr('id');
+ $('#sympal_ask_confirmation form').ajaxForm({
target: '#' + updateId
});
});
</script>
<?php endif; ?>
-<div id="ask_confirmation">
+<div id="sympal_ask_confirmation">
<h2><?php echo $title ?></h2>
<p><?php echo htmlspecialchars_decode($message) ?></p>
@@ -26,9 +26,9 @@
<input type="hidden" name="<?php echo $key ?>" value="<?php echo $value
?>" />
<?php endforeach; ?>
- <input type="submit" name="yes" value="Yes" />
+ <input type="submit" name="yes" class="yes" value="Yes" />
<?php if ($sf_request->getReferer()): ?>
- <input type="submit" name="no" value="No" />
+ <input type="submit" name="no" class="no" value="No" />
<?php endif; ?>
</form>
</div>
\ No newline at end of file
Modified: plugins/sfSympalPlugin/trunk/web/css/sympal.css
===================================================================
--- plugins/sfSympalPlugin/trunk/web/css/sympal.css 2010-01-20 03:47:51 UTC
(rev 26909)
+++ plugins/sfSympalPlugin/trunk/web/css/sympal.css 2010-01-20 05:25:29 UTC
(rev 26910)
@@ -457,19 +457,19 @@
background: url(../images/error.png) no-repeat 4px 4px;
}
-#ask_confirmation {
+#sympal_ask_confirmation {
padding: 12px;
background: #ffc;
border: 1px solid #ddd;
}
-#ask_confirmation h2 {
+#sympal_ask_confirmation h2 {
padding: 0;
margin: 0;
margin-bottom: 10px;
}
-#ask_confirmation p {
+#sympal_ask_confirmation p {
margin-bottom: 10px;
}
--
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.
