meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Render columns selection using spans instead of a table.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16815 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-07-12 18:17:48 +00:00
parent 2a721fff4c
commit 081e8a8932
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/queries/_columns.html.erb
View File

@ -2,40 +2,36 @@
<% available_tag_id = "available_#{tag_id}" %> <% available_tag_id = "available_#{tag_id}" %>
<% selected_tag_id = "selected_#{tag_id}" %> <% selected_tag_id = "selected_#{tag_id}" %>
<table class="query-columns"> <span class="query-columns">
<tr> <span>
<td style="padding-left:0">
<%= label_tag available_tag_id, l(:description_available_columns) %> <%= label_tag available_tag_id, l(:description_available_columns) %>
<br />
<%= select_tag 'available_columns', <%= select_tag 'available_columns',
options_for_select(query_available_inline_columns_options(query)), options_for_select(query_available_inline_columns_options(query)),
:id => available_tag_id, :id => available_tag_id,
:multiple => true, :size => 10, :style => "width:150px", :multiple => true, :size => 10, :style => "width:150px",
:ondblclick => "moveOptions(this.form.#{available_tag_id}, this.form.#{selected_tag_id});" %> :ondblclick => "moveOptions(this.form.#{available_tag_id}, this.form.#{selected_tag_id});" %>
</td> </span>
<td class="buttons"> <span class="buttons">
<input type="button" value="&#8594;" <input type="button" value="&#8594;"
onclick="moveOptions(this.form.<%= available_tag_id %>, this.form.<%= selected_tag_id %>);" /><br /> onclick="moveOptions(this.form.<%= available_tag_id %>, this.form.<%= selected_tag_id %>);" />
<input type="button" value="&#8592;" <input type="button" value="&#8592;"
onclick="moveOptions(this.form.<%= selected_tag_id %>, this.form.<%= available_tag_id %>);" /> onclick="moveOptions(this.form.<%= selected_tag_id %>, this.form.<%= available_tag_id %>);" />
</td> </span>
<td> <span>
<%= label_tag selected_tag_id, l(:description_selected_columns) %> <%= label_tag selected_tag_id, l(:description_selected_columns) %>
<br />
<%= select_tag tag_name, <%= select_tag tag_name,
options_for_select(query_selected_inline_columns_options(query)), options_for_select(query_selected_inline_columns_options(query)),
:id => selected_tag_id, :id => selected_tag_id,
:multiple => true, :size => 10, :style => "width:150px", :multiple => true, :size => 10, :style => "width:150px",
:ondblclick => "moveOptions(this.form.#{selected_tag_id}, this.form.#{available_tag_id});" %> :ondblclick => "moveOptions(this.form.#{selected_tag_id}, this.form.#{available_tag_id});" %>
</td> </span>
<td class="buttons"> <span class="buttons">
<input type="button" value="&#8648;" onclick="moveOptionTop(this.form.<%= selected_tag_id %>);" /><br /> <input type="button" value="&#8648;" onclick="moveOptionTop(this.form.<%= selected_tag_id %>);" />
<input type="button" value="&#8593;" onclick="moveOptionUp(this.form.<%= selected_tag_id %>);" /><br /> <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.<%= selected_tag_id %>);" />
<input type="button" value="&#8595;" onclick="moveOptionDown(this.form.<%= selected_tag_id %>);" /><br /> <input type="button" value="&#8595;" onclick="moveOptionDown(this.form.<%= selected_tag_id %>);" />
<input type="button" value="&#8650;" onclick="moveOptionBottom(this.form.<%= selected_tag_id %>);" /> <input type="button" value="&#8650;" onclick="moveOptionBottom(this.form.<%= selected_tag_id %>);" />
</td> </span>
</tr> </span>
</table>
<%= javascript_tag do %> <%= javascript_tag do %>
$(document).ready(function(){ $(document).ready(function(){

19
public/stylesheets/application.css
View File

@ -372,16 +372,19 @@ table.messages td.last_message {text-align:left;}
min-width: 1em; min-width: 1em;
} }
table.query-columns { .query-columns>span {
border-collapse: collapse; display:inline-block;
border: 0; height:100%;
vertical-align: middle;
}
.query-columns label {
display:block;
}
.query-columns .buttons input[type=button] {
width:35px;
display:block;
} }
table.query-columns td.buttons {
vertical-align: middle;
text-align: center;
}
table.query-columns td.buttons input[type=button] {width:35px;}
.query-totals {text-align:right;} .query-totals {text-align:right;}
.query-totals>span:not(:first-child) {margin-left:0.6em;} .query-totals>span:not(:first-child) {margin-left:0.6em;}
.query-totals .value {font-weight:bold;} .query-totals .value {font-weight:bold;}