Permalink
Browse files

BUGFIX Replaced hardcoded CSS in ReportAdminForm.ss, using $FieldHold…

…er instead of $Field for search fields to gain better control on how they're laid out
  • Loading branch information...
1 parent a93994f commit f8b2363075b1f858d6e5232d095cc5dad67d75dc @chillu chillu committed Sep 26, 2011
Showing with 76 additions and 21 deletions.
  1. +59 −0 css/ReportAdmin.css
  2. +17 −21 templates/ReportAdminForm.ss
View
@@ -0,0 +1,59 @@
+#ReportSelector_holder {
+ background-color: #EEE;
+ border-bottom: 1px #CCC solid;
+ margin: 0;
+ padding: 3px;
+}
+
+#right iframe.AWStatsReport {
+ width: 98%;
+ height: 85%;
+}
+
+.ReportAdmin h4 {
+ border-bottom: 1px #AAA solid;
+ margin-bottom: 0.5em;
+}
+
+.ReportAdmin .right form h4 {
+ font-size: 11px;
+}
+
+.ReportAdmin .filters {
+ overflow: auto;
+}
+
+.ReportAdmin .filters .field {
+ padding: 0;
+}
+
+.ReportAdmin .filters > .field {
+ float: left;
+ clear: none;
+ margin-right: 1em;
+ margin-bottom: .5em;
+}
+
+.ReportAdmin .right form .field label.left {
+ width: auto;
+ height: 15px;
+}
+
+.ReportAdmin .right form .field .middleColumn {
+ width: auto;
+ padding: 0;
+}
+
+.ReportAdmin .filters .field .middleColumn {
+ background: none;
+}
+
+.ReportAdmin .filters .field.checkbox {
+ margin-top: 18px;
+ padding: 0;
+}
+
+.ReportAdmin .filters .field.datetime .field.date,
+.ReportAdmin .filters .field.datetime .field.time {
+ float: left;
+}
@@ -9,28 +9,24 @@
$FieldMap.ReportTitle.FieldHolder
$FieldMap.ReportDescription.FieldHolder
- <!-- Filters -->
-
<% if FieldMap.Filters.Children %>
- <div style="border-bottom: 1px #AAA solid"><b><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></b></div>
-
- <% control FieldMap.Filters %>
- <% control Children %>
- <div style="float: left; margin: 5px 10px 10px 0; height: 35px">
- <label for="$ID" style="font-weight: bold; display: block">$Title</label>
- $Field
- </div>
- <% end_control %>
- <% end_control %>
-
- <div id="action_updatereport" style="float: left; margin: 1px 10px 10px 0">
- <br />
- <% if FieldMap.action_updatereport %>
- $FieldMap.action_updatereport.Field
- <% end_if %>
- </div>
-
- <div style="clear: both">&nbsp;</div>
+ <h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
+
+ <div class="filters">
+ <% control FieldMap.Filters %>
+ <% control Children %>
+ $FieldHolder
+ <% end_control %>
+ <% end_control %>
+ </div>
+
+ <div id="action_updatereport">
+ <% if FieldMap.action_updatereport %>
+ $FieldMap.action_updatereport.Field
+ <% end_if %>
+ </div>
+
+ <div style="clear: both">&nbsp;</div>
<% end_if %>
$FieldMap.ReportContent.FieldHolder

0 comments on commit f8b2363

Please sign in to comment.