BUGFIX Replaced hardcoded CSS in ReportAdminForm.ss, using $FieldHolder instead of $Field for search fields to gain better control on how they're laid out

This commit is contained in:
Ingo Schommer 2011-09-26 15:04:44 +02:00
parent a93994f59e
commit f8b2363075
2 changed files with 73 additions and 18 deletions

View File

@ -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;
}

View File

@ -9,28 +9,24 @@
$FieldMap.ReportTitle.FieldHolder $FieldMap.ReportTitle.FieldHolder
$FieldMap.ReportDescription.FieldHolder $FieldMap.ReportDescription.FieldHolder
<!-- Filters -->
<% if FieldMap.Filters.Children %> <% if FieldMap.Filters.Children %>
<div style="border-bottom: 1px #AAA solid"><b><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></b></div> <h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
<% control FieldMap.Filters %> <div class="filters">
<% control Children %> <% control FieldMap.Filters %>
<div style="float: left; margin: 5px 10px 10px 0; height: 35px"> <% control Children %>
<label for="$ID" style="font-weight: bold; display: block">$Title</label> $FieldHolder
$Field <% end_control %>
</div> <% end_control %>
<% end_control %> </div>
<% end_control %>
<div id="action_updatereport" style="float: left; margin: 1px 10px 10px 0"> <div id="action_updatereport">
<br /> <% if FieldMap.action_updatereport %>
<% if FieldMap.action_updatereport %> $FieldMap.action_updatereport.Field
$FieldMap.action_updatereport.Field <% end_if %>
<% end_if %> </div>
</div>
<div style="clear: both">&nbsp;</div> <div style="clear: both">&nbsp;</div>
<% end_if %> <% end_if %>
$FieldMap.ReportContent.FieldHolder $FieldMap.ReportContent.FieldHolder