put filters and groups into one collapsible fieldset. the headlines look a bit odd, still

git-svn-id: https://dev.finn.de/svn/cockpit/branches/reporting_merge@2040 7926756e-e54e-46e6-9721-ed318f58905e

app/views/cost_reports/index.rhtml

@@ -16,14 +16,14 @@
 
 <% form_for @query, :url => {:controller => 'cost_report', :action => 'new' }, :html => {:id => 'query_form', :method => :post} do |query_form| %>
 <div id="query_form_content">
-  <fieldset id="filters" class="collapsible <%= "collapsed" unless @query.new_record? %>">
-    <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
-    <div <%= 'style="display:none;"' unless @query.new_record? %>><%= render :partial => 'filters', :locals => {:f => query_form, :query => @query} %></div>
-  </fieldset>
-
-  <fieldset id="group-by" class="collapsible <%= "collapsed" unless @query.new_record? %>">
-    <legend onclick="toggleFieldset(this);"><%= l(:label_group_by) %></legend>
-    <div <%= 'style="display:none;"' unless @query.new_record? %>><%= render :partial => 'group_by', :locals => {:f => query_form, :query => @query} %></div>
+  <fieldset id="query_fieldset" class="collapsible <%= "collapsed" unless @query.new_record? %>">
+    <legend onclick="toggleFieldset(this);"><%= l(:label_query) %></legend>
+    <div id="query_settings">
+      <h1><%= l(:label_filter_plural) %></h1>
+      <div <%= 'style="display:none;"' unless @query.new_record? %>><%= render :partial => 'filters', :locals => {:f => query_form, :query => @query} %></div>
+      <h1><%= l(:label_group_by) %></h1>
+      <div <%= 'style="display:none;"' unless @query.new_record? %>><%= render :partial => 'group_by', :locals => {:f => query_form, :query => @query} %></div>
+    </div>
   </fieldset>
 
   <%= render :partial => 'restore_query', :locals => {:f => query_form, :query => @query} %>

assets/stylesheets/reporting.css

@@ -98,7 +98,7 @@
 }
 
 /* Aligning filter elements at the top. */
-.new_cost_query fieldset#filters table td {
+table#filter_table td {
   vertical-align: top;
   border-spacing: 5px 5px;
   border-color: white;
@@ -106,7 +106,7 @@
   border-width: 2px 0px 0px;
 }
 
-.new_cost_query fieldset#filters table td > label {
+table#filter_table td > label {
   left: 3px;
   top: 3px;
   position: relative;
@@ -159,19 +159,27 @@
   margin-top: 6px;
 }
 
-.new_cost_query fieldset#filters table tr.filter:hover {
+div#query_settings h1 {
+  margin-top: 15px;
+}
+
+
+table#filter_table {
+  border-spacing: 0px 0px;
+}
+
+table#filter_table tr.filter:hover {
   background: #aaa;
 }
 
-.new_cost_query fieldset#filters table tr.filter {
+table#filter_table tr.filter {
   color: #000;
-  background: #ededed;
+  background-color: #ededed;
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
 
-
 .drag_element {
   /*cursor: move;*/
 }

config/locales/de.yml

@@ -14,6 +14,7 @@ de:
   label_money: "Geld"
   label_columns: "Spalten"
   label_rows: "Zeilen"
+  label_query: "Anfrage"
   label_is_project_with_subprojects: "ist (mit Unterprojekten)"
   label_is_not_project_with_subprojects: "ist nicht (mit Unterprojekten)"
 

config/locales/en.yml

@@ -14,6 +14,7 @@ en:
   label_money: "Money"
   label_columns: "Columns"
   label_rows: "Rows"
+  label_query: "Query"
   label_is_project_with_subprojects: "is (includes subprojects)"
   label_is_not_project_with_subprojects: "is not (includes subprojects)"