Author: Jonathan.Wage
Date: 2010-01-15 20:30:01 +0100 (Fri, 15 Jan 2010)
New Revision: 26691
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_is_published.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_list_actions.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/indexSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/templates/_is_published.php
plugins/sfSympalPlugin/trunk/web/images/not_published.png
plugins/sfSympalPlugin/trunk/web/images/published.png
plugins/sfSympalPlugin/trunk/web/images/published_in_future.png
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/config/generator.yml
Log:
[1.4][sfSympalPlugin][1.0] Enhancing menu and content admin generator to show a
published icon
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-15 19:26:15 UTC (rev 26690)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -58,10 +58,15 @@
{
return $actionName;
} else {
- return str_replace('-', '_', $this->getSlug());
+ return $this->getUnderscoredSlug();
}
}
+ public function getUnderscoredSlug()
+ {
+ return str_replace('-', '_', $this->getSlug());
+ }
+
public function getActionToRenderWith()
{
if ($this->hasCustomAction())
@@ -301,6 +306,16 @@
->render();
}
+ public function getIsPublished()
+ {
+ return ($this->getDatePublished() && strtotime($this->getDatePublished())
<= time()) ? true : false;
+ }
+
+ public function getIsPublishedInTheFuture()
+ {
+ return ($this->getDatePublished() && strtotime($this->getDatePublished())
> time()) ? true : false;
+ }
+
public function getMonthPublished($format = 'm')
{
return date('m', strtotime($this->getDatePublished()));
@@ -335,7 +350,7 @@
{
if ($this->get('custom_path', false) || $this->get('module', false) ||
$this->get('action', false))
{
- return '@sympal_content_' . str_replace('-', '_', $this['slug']);
+ return '@sympal_content_' . $this->getUnderscoredSlug();
}
else if ($this['Type']['default_path'])
{
@@ -359,7 +374,7 @@
}
else if ($this->get('module', false) || $this->get('action', false))
{
- $values = $this->_buildValues();
+ $values = $this->_buildRouteValues();
$values['sf_culture'] = ':sf_culture';
$values['sf_format'] = ':sf_format';
return $this->getRouteObject()->generate($values);
@@ -415,14 +430,14 @@
public function getEvaluatedRoutePath()
{
- $values = $this->_buildValues();
+ $values = $this->_buildRouteValues();
$values['sf_culture'] = sfContext::getInstance()->getUser()->getCulture();
return $this->getRouteObject()->generate($values);
}
protected function _fillRoute($route)
{
- $values = $this->_buildValues();
+ $values = $this->_buildRouteValues();
if (!empty($values))
{
return $route.'?'.http_build_query($values);
@@ -431,7 +446,7 @@
}
}
- protected function _buildValues()
+ protected function _buildRouteValues()
{
$variables = $this->getRouteObject()->getVariables();
$isI18nEnabled = sfSympalConfig::isI18nEnabled();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
2010-01-15 19:26:15 UTC (rev 26690)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/config/generator.yml
2010-01-15 19:30:01 UTC (rev 26691)
@@ -55,7 +55,7 @@
list:
table_method: getAdminGenQuery
title: Manage Content
- display: [_title, date_published]
+ display: [_title, _is_published]
sort: ['m.root_id, m.lft', 'asc']
batch_actions:
_delete:
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_is_published.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_is_published.php
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_is_published.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -0,0 +1,7 @@
+<?php if ($sf_sympal_content->getIsPublished()): ?>
+ <?php echo image_tag('/sfSympalPlugin/images/published.png',
'title=Published on '.format_date($sf_sympal_content->getDatePublished(), 'g'))
?>
+<?php elseif ($sf_sympal_content->getIsPublishedInTheFuture()): ?>
+ <?php echo image_tag('/sfSympalPlugin/images/published_in_future.png',
'title=Will publish on '.format_date($sf_sympal_content->getDatePublished(),
'g')) ?>
+<?php else: ?>
+ <?php echo image_tag('/sfSympalPlugin/images/not_published.png', 'title=Has
not been published yet.') ?>
+<?php endif; ?>
\ No newline at end of file
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_list_actions.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_list_actions.php
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/_list_actions.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -0,0 +1 @@
+<?php echo $helper->linkToNew(array( 'params' => array( ), 'class_suffix'
=> 'new', 'label' => 'New '.$contentType->getLabel(),)) ?>
\ No newline at end of file
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/indexSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/indexSuccess.php
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/indexSuccess.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -0,0 +1,28 @@
+<?php use_helper('I18N', 'Date') ?>
+<?php include_partial('sympal_content/assets') ?>
+
+<div id="sf_admin_container">
+ <h1><?php echo $title = __('Manage '.$contentType->getLabel().' Content',
array(), 'messages'); $sf_response->setTitle($title); ?></h1>
+
+ <div id="sf_admin_header">
+ <?php include_partial('sympal_content/list_header', array('pager' =>
$pager)) ?>
+ </div>
+
+ <div id="sf_admin_bar">
+ <?php include_partial('sympal_content/filters', array('form' => $filters,
'configuration' => $configuration)) ?>
+ </div>
+
+ <div id="sf_admin_content">
+ <form action="<?php echo url_for('sympal_content_collection',
array('action' => 'batch')) ?>" method="post">
+ <?php include_partial('sympal_content/list', array('pager' => $pager,
'sort' => $sort, 'helper' => $helper)) ?>
+ <ul class="sf_admin_actions">
+ <?php include_partial('sympal_content/list_batch_actions',
array('helper' => $helper)) ?>
+ <?php include_partial('sympal_content/list_actions', array('helper' =>
$helper, 'contentType' => $contentType)) ?>
+ </ul>
+ </form>
+ </div>
+
+ <div id="sf_admin_footer">
+ <?php include_partial('sympal_content/list_footer', array('pager' =>
$pager)) ?>
+ </div>
+</div>
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-01-15 19:26:15 UTC (rev 26690)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -31,7 +31,7 @@
if ($menuItem && $menuItem->exists())
{
- if ($menuItem->isPublished())
+ 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 {
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
2010-01-15 19:26:15 UTC (rev 26690)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -141,11 +141,16 @@
return $this->_get('is_primary');
}
- public function isPublished()
+ public function getIsPublished()
{
- return $this->_get('date_published');
+ return ($this->getDatePublished() && strtotime($this->getDatePublished())
<= time()) ? true : false;
}
+ public function getIsPublishedInTheFuture()
+ {
+ return ($this->getDatePublished() && strtotime($this->getDatePublished())
> time()) ? true : false;
+ }
+
public function getDatePublished()
{
return $this->_get('date_published');
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/config/generator.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/config/generator.yml
2010-01-15 19:26:15 UTC (rev 26690)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/config/generator.yml
2010-01-15 19:30:01 UTC (rev 26691)
@@ -17,7 +17,7 @@
title: Menu items list
sort: ['root_id, lft', 'asc']
max_per_page: 9999999999999999999
- display: [=name]
+ display: [=name, _is_published]
batch_actions:
publish:
action: publish
Added:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/templates/_is_published.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/templates/_is_published.php
(rev 0)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/templates/_is_published.php
2010-01-15 19:30:01 UTC (rev 26691)
@@ -0,0 +1,7 @@
+<?php if ($sf_sympal_menu_item->getIsPublished()): ?>
+ <?php echo image_tag('/sfSympalPlugin/images/published.png',
'title=Published on '.format_date($sf_sympal_menu_item->getDatePublished(),
'g')) ?>
+<?php elseif ($sf_sympal_menu_item->getIsPublishedInTheFuture()): ?>
+ <?php echo image_tag('/sfSympalPlugin/images/published_in_future.png',
'title=Will publish on '.format_date($sf_sympal_menu_item->getDatePublished(),
'g')) ?>
+<?php else: ?>
+ <?php echo image_tag('/sfSympalPlugin/images/not_published.png', 'title=Has
not been published yet.') ?>
+<?php endif; ?>
\ No newline at end of file
Added: plugins/sfSympalPlugin/trunk/web/images/not_published.png
===================================================================
(Binary files differ)
Property changes on: plugins/sfSympalPlugin/trunk/web/images/not_published.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: plugins/sfSympalPlugin/trunk/web/images/published.png
===================================================================
(Binary files differ)
Property changes on: plugins/sfSympalPlugin/trunk/web/images/published.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: plugins/sfSympalPlugin/trunk/web/images/published_in_future.png
===================================================================
(Binary files differ)
Property changes on:
plugins/sfSympalPlugin/trunk/web/images/published_in_future.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.
