| @@ -4,8 +4,9 | |||
|
|
4 | 4 | |
|
|
5 | 5 | <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> |
|
|
6 | 6 | <%= hidden_field_tag('project_id', @project.id) if @project %> |
|
|
7 | <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend> | |
|
|
7 | 8 | <%= render :partial => 'queries/filters', :locals => {:query => @query} %> |
|
|
8 |
<div class=" |
|
|
|
9 | <div class="buttons"> | |
|
|
9 | 10 | <%= link_to_remote l(:button_apply), |
|
|
10 | 11 | { :url => { :set_filter => 1 }, |
|
|
11 | 12 | :update => "content", |
| @@ -21,8 +22,7 | |||
|
|
21 | 22 | <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %> |
|
|
22 | 23 | <% end %> |
|
|
23 | 24 | </div> |
|
|
24 | <br /> | |
|
|
25 | | |
|
|
25 | </fieldset> | |
|
|
26 | 26 | <% end %> |
|
|
27 | 27 | <% else %> |
|
|
28 | 28 | <div class="contextual"> |
| @@ -1,8 +1,8 | |||
|
|
1 | 1 | <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> |
|
|
2 | 2 | <legend><%= l(:field_column_names) %></legend> |
|
|
3 | 3 | |
|
|
4 | <%= hidden_field_tag 'query[column_names][]', '' %> | |
|
|
5 |
<table |
|
|
|
4 | <%= hidden_field_tag 'query[column_names][]', '', :id => nil %> | |
|
|
5 | <table> | |
|
|
6 | 6 | <tr> |
|
|
7 | 7 | <td><%= select_tag 'available_columns', |
|
|
8 | 8 | options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}), |
| @@ -56,7 +56,6 function toggle_multi_select(field) { | |||
|
|
56 | 56 | //]]> |
|
|
57 | 57 | </script> |
|
|
58 | 58 | |
|
|
59 | <fieldset><legend><%= l(:label_filter_plural) %></legend> | |
|
|
60 | 59 | <table width="100%"> |
|
|
61 | 60 | <tr> |
|
|
62 | 61 | <td> |
| @@ -100,4 +99,3 function toggle_multi_select(field) { | |||
|
|
100 | 99 | </td> |
|
|
101 | 100 | </tr> |
|
|
102 | 101 | </table> |
|
|
103 | </fieldset> No newline at end of file | |
| @@ -16,6 +16,9 | |||
|
|
16 | 16 | :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p> |
|
|
17 | 17 | </div> |
|
|
18 | 18 | |
|
|
19 | <fieldset><legend><%= l(:label_filter_plural) %></legend> | |
|
|
19 | 20 | <%= render :partial => 'queries/filters', :locals => {:query => query}%> |
|
|
21 | </fieldset> | |
|
|
22 | ||
|
|
20 | 23 | <%= render :partial => 'queries/columns', :locals => {:query => query}%> |
|
|
21 | 24 | </div> |
| @@ -159,6 +159,9 textarea.wiki-edit { width: 99%; } | |||
|
|
159 | 159 | li p {margin-top: 0;} |
|
|
160 | 160 | div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;} |
|
|
161 | 161 | |
|
|
162 | #filters { margin-bottom: 1em; } | |
|
|
163 | #filters .buttons { text-align: right; font-size: 0.9em; } | |
|
|
164 | ||
|
|
162 | 165 | div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} |
|
|
163 | 166 | div#issue-changesets .changeset { padding: 4px;} |
|
|
164 | 167 | div#issue-changesets .changeset { border-bottom: 1px solid #ddd; } |
General Comments 0
You need to be logged in to leave comments.
Login now