Skip to content

O
OHR Support
Commit f5b5688e authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Move the filters buttons inside the filters fieldset on the issue list (closes #614). 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1262 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 2eb08550
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
app/views/issues/index.rhtml
View file @ f5b5688e
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
<% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
<%= hidden_field_tag('project_id', @project.id) if @project %> <%= hidden_field_tag('project_id', @project.id) if @project %>
<fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
<div class="contextual"> <div class="buttons">
<%= link_to_remote l(:button_apply), <%= link_to_remote l(:button_apply),
{ :url => { :set_filter => 1 }, { :url => { :set_filter => 1 },
:update => "content", :update => "content",
...@@ -21,8 +22,7 @@ ...@@ -21,8 +22,7 @@
<%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %> <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
<% end %> <% end %>
</div> </div>
<br /> </fieldset>
&nbsp;
<% end %> <% end %>
<% else %> <% else %>
<div class="contextual"> <div class="contextual">
......
app/views/queries/_columns.rhtml
View file @ f5b5688e
<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
<legend><%= l(:field_column_names) %></legend> <legend><%= l(:field_column_names) %></legend>
<%= hidden_field_tag 'query[column_names][]', '' %> <%= hidden_field_tag 'query[column_names][]', '', :id => nil %>
<table margin=0> <table>
<tr> <tr>
<td><%= select_tag 'available_columns', <td><%= select_tag 'available_columns',
options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}), options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
......
app/views/queries/_filters.rhtml
View file @ f5b5688e
...@@ -56,7 +56,6 @@ function toggle_multi_select(field) { ...@@ -56,7 +56,6 @@ function toggle_multi_select(field) {
//]]> //]]>
</script> </script>
<fieldset><legend><%= l(:label_filter_plural) %></legend>
<table width="100%"> <table width="100%">
<tr> <tr>
<td> <td>
...@@ -100,4 +99,3 @@ function toggle_multi_select(field) { ...@@ -100,4 +99,3 @@ function toggle_multi_select(field) {
</td> </td>
</tr> </tr>
</table> </table>
</fieldset>
\ No newline at end of file
app/views/queries/_form.rhtml
View file @ f5b5688e
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
:onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p> :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
</div> </div>
<fieldset><legend><%= l(:label_filter_plural) %></legend>
<%= render :partial => 'queries/filters', :locals => {:query => query}%> <%= render :partial => 'queries/filters', :locals => {:query => query}%>
</fieldset>
<%= render :partial => 'queries/columns', :locals => {:query => query}%> <%= render :partial => 'queries/columns', :locals => {:query => query}%>
</div> </div>
public/stylesheets/application.css
View file @ f5b5688e
...@@ -159,6 +159,9 @@ textarea.wiki-edit { width: 99%; } ...@@ -159,6 +159,9 @@ textarea.wiki-edit { width: 99%; }
li p {margin-top: 0;} li p {margin-top: 0;}
div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;} div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
#filters { margin-bottom: 1em; }
#filters .buttons { text-align: right; font-size: 0.9em; }
div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
div#issue-changesets .changeset { padding: 4px;} div#issue-changesets .changeset { padding: 4px;}
div#issue-changesets .changeset { border-bottom: 1px solid #ddd; } div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment