Author: ornicar2
Date: 2010-01-24 15:15:27 +0100 (Sun, 24 Jan 2010)
New Revision: 27126
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/web/css/dmReset.css
Log:
[Diem]
- fixed front edition style when site stylesheets declares raw tags
- fixed dmWidgetListForm default order for sortable tables
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
2010-01-24 13:44:32 UTC (rev 27125)
+++
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
2010-01-24 14:15:27 UTC (rev 27126)
@@ -1,4 +1,4 @@
-.breadCrumb li {
+.breadCrumb li, .pager li {
display: inline;
}
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
2010-01-24 13:44:32 UTC (rev 27125)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
2010-01-24 14:15:27 UTC (rev 27126)
@@ -87,11 +87,6 @@
}
$this->setDefaults($this->getDefaultsFromLastUpdated(array('maxPerPage',
'navTop', 'navBottom', 'view', 'orderField', 'orderType')));
-
- if(!$this->getDefault('orderField') &&
$this->dmModule->getTable()->isSortable())
- {
- $this->setDefault('orderField', 'position');
- }
}
protected function allowFilterAutoRecordId(dmModule $filterModule)
@@ -111,10 +106,10 @@
'maxPerPage' => 5,
'maxPerPage' => 0
));
-
- if ($firstOrderField =
dmArray::first(array_keys($this->getAvailableOrderFields())))
+
+ if(!$this->getDefault('orderField') &&
$this->dmModule->getTable()->isSortable())
{
- $defaults['orderField'] = $firstOrderField;
+ $defaults['orderField'] = 'position';
}
return $defaults;
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/css/dmReset.css
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/css/dmReset.css 2010-01-24
13:44:32 UTC (rev 27125)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/css/dmReset.css 2010-01-24
14:15:27 UTC (rev 27126)
@@ -30,6 +30,10 @@
text-decoration: none;
}
+.dm label {
+ display: inline;
+}
+
.dm input,
.dm input.submit,
.dm input:focus,
@@ -40,7 +44,7 @@
border: 1px solid #D4D4D4;
color: #000;
background: #fff;
- display: inherit;
+ display: inline;
height: inherit;
padding: 2px;
margin: 0;
--
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.
