Author: annis
Date: 2010-04-15 11:37:10 +0200 (Thu, 15 Apr 2010)
New Revision: 29159
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdmin/parts/sortingAction.php
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/sf_admin.de.xml
plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
Log:
Merge branch 'master' into HEAD
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdmin/parts/sortingAction.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdmin/parts/sortingAction.php
2010-04-15 08:33:58 UTC (rev 29158)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdmin/parts/sortingAction.php
2010-04-15 09:37:10 UTC (rev 29159)
@@ -53,6 +53,7 @@
{
if (null !== $sort = $this->getUser()->getAttribute('<?php echo
$this->getModuleName() ?>.sort', null, 'admin_module'))
{
+ if (isset($sort[1])) $sort[1] = strtolower($sort[1]);
return $sort;
}
@@ -68,6 +69,8 @@
$sort[1] = 'asc';
}
+ $sort[1] = strtolower($sort[1]);
+
$this->getUser()->setAttribute('<?php echo $this->getModuleName()
?>.sort', $sort, 'admin_module');
}
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
2010-04-15 08:33:58 UTC (rev 29158)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
2010-04-15 09:37:10 UTC (rev 29159)
@@ -55,6 +55,7 @@
{
if (null !== ($sort = $this->getUser()->getAttribute('<?php echo
$this->getModuleName() ?>.sort', null, 'admin_module')))
{
+ if (isset($sort[1])) $sort[1] = strtolower($sort[1]);
return $sort;
}
@@ -70,6 +71,8 @@
$sort[1] = 'asc';
}
+ $sort[1] = strtolower($sort[1]);
+
$this->getUser()->setAttribute('<?php echo $this->getModuleName()
?>.sort', $sort, 'admin_module');
}
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
2010-04-15 08:33:58 UTC (rev 29158)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/template/templates/_list_th_tabular.php
2010-04-15 09:37:10 UTC (rev 29159)
@@ -3,10 +3,10 @@
<th class="sf_admin_<?php echo strtolower($field->getType()) ?>
sf_admin_list_th_<?php echo $name ?>">
<?php if ($field->isReal() || $field->getConfig('is_sortable', false, false)):
?>
[?php if ('<?php echo $name ?>' == $sort[0]): ?]
- [?php echo link_to(__('<?php echo $field->getConfig('label', '', true)
?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo
$this->getUrlForAction('list') ?>', array('query_string' => 'sort=<?php echo
$name ?>&sort_type='.($sort[1] == 'asc' ? 'desc' : 'asc'))) ?]
- [?php echo image_tag('icons/arrow_'.$sort[1].'.png', array('alt' =>
__($sort[1], array(), 'sf_admin'), 'title' => __($sort[1], array(),
'sf_admin'))) ?]
+ [?php echo link_to(__('<?php echo $field->getConfig('label', '', true)
?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo
$this->getUrlForAction('list') ?>', array('title' => __('sort '.($sort[1] ==
'asc' ? 'descending' : 'ascending'), array(), 'sf_admin'), 'query_string' =>
'sort=<?php echo $name ?>&sort_type='.($sort[1] == 'asc' ? 'desc' : 'asc'))) ?]
+ [?php echo image_tag('icons/arrow_'.$sort[1].'.png', array('alt_title' =>
__('sorted '.($sort[1] == 'asc' ? 'ascending' : 'descending'), array(),
'sf_admin'))) ?]
[?php else: ?]
- [?php echo link_to(__('<?php echo $field->getConfig('label', '', true)
?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo
$this->getUrlForAction('list') ?>', array('query_string' => 'sort=<?php echo
$name ?>&sort_type=asc')) ?]
+ [?php echo link_to(__('<?php echo $field->getConfig('label', '', true)
?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo
$this->getUrlForAction('list') ?>', array('title' => __('sort ascending',
array(), 'sf_admin'), 'query_string' => 'sort=<?php echo $name
?>&sort_type=asc')) ?]
[?php endif; ?]
<?php else: ?>
[?php echo __('<?php echo $field->getConfig('label', '', true) ?>', array(),
'<?php echo $this->getI18nCatalogue() ?>') ?]
Modified: plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/sf_admin.de.xml
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/sf_admin.de.xml
2010-04-15 08:33:58 UTC (rev 29158)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/sf_admin.de.xml
2010-04-15 09:37:10 UTC (rev 29159)
@@ -24,6 +24,22 @@
<source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
<target>[0] kein Ergebnis|[1] 1 Ergebnis|(1,+Inf] %1%
Ergebnisse</target>
</trans-unit>
+ <trans-unit>
+ <source>sort ascending</source>
+ <target>aufsteigend sortieren</target>
+ </trans-unit>
+ <trans-unit>
+ <source>sort descending</source>
+ <target>absteigend sortieren</target>
+ </trans-unit>
+ <trans-unit>
+ <source>sorted ascending</source>
+ <target>aufsteigend sortiert</target>
+ </trans-unit>
+ <trans-unit>
+ <source>sorted descending</source>
+ <target>absteigend sortiert</target>
+ </trans-unit>
<!-- Pagination -->
<!-- Form -->
Modified: plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-15
08:33:58 UTC (rev 29158)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-15
09:37:10 UTC (rev 29159)
@@ -10,9 +10,9 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-04-13</date>
+ <date>2010-04-15</date>
<version>
- <release>0.8.6</release>
+ <release>0.8.7</release>
<api>0.8.0</api>
</version>
<stability>
@@ -111,5 +111,23 @@
Nevertheless, all recent changed completely maintain BC!
</notes>
</release>
+ <release>
+ <version>
+ <release>0.8.7</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-15</date>
+ <license>MIT</license>
+ <notes>
+ - both in ahAdminGeneratorThemesPluginAdmin & ahAdmin admin
generator themes: fixed a bug where when the session contained no information
about sorted column and the developer had default_sort defined in generator.yml
with uppercase sort method (ASC, DESC) the icons could not be found on systems
with case-sensitive filesystems (e.g. Linux), e.g. array_DESC.png would be
generated as the filename
+ - only in ahAdminGeneratorThemesPluginAdmin: added alt and
title attributes to indicate what is sorted on and in what direction ('sorted
descending') on the icon and what will be sorted on ('sort ascending') on the
link – also localized this for German
+ - updated package.xml for version 0.8.7
+ </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.
