Author: annis
Date: 2010-04-13 17:29:09 +0200 (Tue, 13 Apr 2010)
New Revision: 29111
Added:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show_footer.php
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show_header.php
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
Log:
Merge branch 'master' into HEAD
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
2010-04-13 15:24:55 UTC (rev 29110)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_show.php
2010-04-13 15:29:09 UTC (rev 29111)
@@ -1,9 +1,11 @@
<!--<div class="clearfix">-->
[?php if (has_component_slot('show_header'))
include_component_slot('show_header') ?]
+ [?php include_partial('<?php echo $this->getModuleName() ?>/show_header',
array('pager' => $pager, 'helper' => $helper)) ?]
<table>
<tbody>
[?php include_partial('<?php echo $this->getModuleName()
?>/show_tr_<?php echo $this->configuration->getValue('list.layout') ?>',
array('<?php echo ahToolkit::variablize($this->getSingularName()) ?>' => $<?php
echo ahToolkit::variablize($this->getSingularName()) ?>, 'helper' => $helper))
?]
</tbody>
</table>
<!--</div>-->
+ [?php include_partial('<?php echo $this->getModuleName() ?>/show_footer',
array('pager' => $pager, 'helper' => $helper)) ?]
[?php if (has_component_slot('show_footer'))
include_component_slot('show_footer') ?]
\ No newline at end of file
Modified: plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-13
15:24:55 UTC (rev 29110)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-13
15:29:09 UTC (rev 29111)
@@ -10,9 +10,9 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-04-12</date>
+ <date>2010-04-13</date>
<version>
- <release>0.8.4</release>
+ <release>0.8.5</release>
<api>0.8.0</api>
</version>
<stability>
@@ -77,5 +77,22 @@
- code conventions (missing brackets)
</notes>
</release>
+ <release>
+ <version>
+ <release>0.8.5</release>
+ <api>0.8.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2010-04-13</date>
+ <license>MIT</license>
+ <notes>
+ - added show_header and show_footer partials that are included
in the show partial,
+ completely BC (backwards-compatible), just clear the symfony
cache and you're good to go
+ </notes>
+ </release>
</changelog>
</package>
--
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.
