Commit eac246ec authored by maeda's avatar maeda

Reverted r17252 and r17253 (#26655).

The change breaks the test suite. 


git-svn-id: https://svn.redmine.org/redmine/trunk@17254 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 4062c343
......@@ -1223,10 +1223,6 @@ module ApplicationHelper
content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(html_options))
end
def link_to_context_menu
link_to l(:button_actions), '#', title: l(:button_actions), class: 'icon-only icon-actions js-contextmenu'
end
# Helper to render JSON in views
def raw_json(arg)
arg.to_json.to_s.gsub('/', '\/').html_safe
......
......@@ -99,8 +99,7 @@ module IssuesHelper
content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
content_tag('td', h(child.status), :class => 'status') +
content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') +
content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio') +
content_tag('td', link_to_context_menu, :class => 'buttons'),
content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'),
:class => css)
end
s << '</table>'
......@@ -115,7 +114,7 @@ module IssuesHelper
relations.each do |relation|
other_issue = relation.other_issue(issue)
css = "issue hascontextmenu #{other_issue.css_classes}"
buttons = manage_relations ? link_to(l(:label_relation_delete),
link = manage_relations ? link_to(l(:label_relation_delete),
relation_path(relation),
:remote => true,
:method => :delete,
......@@ -123,7 +122,6 @@ module IssuesHelper
:title => l(:label_relation_delete),
:class => 'icon-only icon-link-break'
) : nil
buttons << link_to_context_menu
s << content_tag('tr',
content_tag('td', check_box_tag("ids[]", other_issue.id, false, :id => nil), :class => 'checkbox') +
......@@ -132,7 +130,7 @@ module IssuesHelper
content_tag('td', other_issue.start_date, :class => 'start_date') +
content_tag('td', other_issue.due_date, :class => 'due_date') +
content_tag('td', other_issue.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(other_issue.done_ratio), :class=> 'done_ratio') +
content_tag('td', buttons, :class => 'buttons'),
content_tag('td', link, :class => 'buttons'),
:id => "relation-#{relation.id}",
:class => css)
end
......
......@@ -14,7 +14,6 @@
<% query.inline_columns.each do |column| %>
<%= column_header(query, column, query_options) %>
<% end %>
<th></th>
</tr>
</thead>
<tbody>
......@@ -22,7 +21,7 @@
<% if group_name %>
<% reset_cycle %>
<tr class="group open">
<td colspan="<%= query.inline_columns.size + 2 %>">
<td colspan="<%= query.inline_columns.size + 1 %>">
<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
<span class="name"><%= group_name %></span> <span class="count"><%= group_count %></span> <span class="totals"><%= group_totals %></span>
<%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
......@@ -35,12 +34,11 @@
<% query.inline_columns.each do |column| %>
<%= content_tag('td', column_content(column, issue), :class => column.css_classes) %>
<% end %>
<td class="buttons"><%= link_to_context_menu %></td>
</tr>
<% query.block_columns.each do |column|
if (text = column_content(column, issue)) && text.present? -%>
<tr class="<%= current_cycle %>">
<td colspan="<%= query.inline_columns.size + 2 %>" class="<%= column.css_classes %>">
<td colspan="<%= query.inline_columns.size + 1 %>" class="<%= column.css_classes %>">
<% if query.block_columns.count > 1 %>
<span><%= column.caption %></span>
<% end %>
......
......@@ -35,7 +35,6 @@
<th><%= l(:label_project) %></th>
<th><%= l(:field_comments) %></th>
<th><%= l(:field_hours) %></th>
<th></th>
</tr></thead>
<tbody>
<% entries_by_day.keys.sort.reverse_each do |day| %>
......@@ -43,7 +42,6 @@
<td><strong><%= day == User.current.today ? l(:label_today).titleize : format_date(day) %></strong></td>
<td colspan="2"></td>
<td class="hours"><em><%= html_hours(format_hours(entries_by_day[day].sum(&:hours))) %></em></td>
<td></td>
</tr>
<% entries_by_day[day].each do |entry| -%>
<tr id="time-entry-<%= entry.id %>" class="time-entry hascontextmenu">
......@@ -54,7 +52,6 @@
<td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
<td class="comments"><%= entry.comments %></td>
<td class="hours"><%= html_hours(format_hours(entry.hours)) %></td>
<td class="buttons"><%= link_to_context_menu %></td>
</tr>
<% end -%>
<% end -%>
......
......@@ -47,7 +47,6 @@
:title => l(:button_delete),
:class => 'icon-only icon-del' %>
<% end -%>
<%= link_to_context_menu %>
</td>
</tr>
<% @query.block_columns.each do |column|
......
......@@ -30,7 +30,6 @@
<tr class="hascontextmenu">
<td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
<td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
<td class="buttons"><%= link_to_context_menu %></td>
</tr>
<% end -%>
</table>
......
......@@ -44,7 +44,6 @@
<tr class="issue hascontextmenu">
<td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
<td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
<td class="buttons"><%= link_to_context_menu %></td>
</tr>
<% end %>
</table>
......
......@@ -1235,4 +1235,3 @@ ar:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1330,4 +1330,3 @@ az:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1217,4 +1217,3 @@ bg:
description_all_columns: Всички колони
text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
error_can_not_delete_auth_source: Този режим за идентификация се използва и не може да бъде премахнат.
button_actions: Actions
......@@ -1248,4 +1248,3 @@ bs:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1225,4 +1225,3 @@ ca:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1233,4 +1233,3 @@ cs:
label_x_revisions: "%{count} revizí"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1252,4 +1252,3 @@ da:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -203,7 +203,6 @@ de:
button_update: Aktualisieren
button_view: Anzeigen
button_watch: Beobachten
button_actions: Aktionen
default_activity_design: Design
default_activity_development: Entwicklung
......
......@@ -1235,4 +1235,3 @@ el:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1237,4 +1237,3 @@ en-GB:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1079,7 +1079,6 @@ en:
button_reopen: Reopen
button_import: Import
button_filter: Filter
button_actions: Actions
status_active: active
status_registered: registered
......
......@@ -1265,4 +1265,3 @@ es-PA:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1263,4 +1263,3 @@ es:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1240,4 +1240,3 @@ et:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1236,4 +1236,3 @@ eu:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1236,4 +1236,3 @@ fa:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1256,4 +1256,3 @@ fi:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1235,4 +1235,3 @@ fr:
label_user_mail_option_only_owner: Only for things I watch or I am the owner of
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1243,4 +1243,3 @@ gl:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1240,4 +1240,3 @@ he:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1234,4 +1234,3 @@ hr:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1254,4 +1254,3 @@
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1239,4 +1239,3 @@ id:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1230,4 +1230,3 @@ it:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1240,4 +1240,3 @@ ja:
setting_timelog_max_hours_per_day: 1日・1人あたりの作業時間の上限
label_x_revisions: "%{count}件の履歴"
error_can_not_delete_auth_source: この認証方式は使用中です。削除できません。
button_actions: Actions
......@@ -1274,4 +1274,3 @@ ko:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1225,4 +1225,3 @@ lt:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1229,4 +1229,3 @@ lv:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1235,4 +1235,3 @@ mk:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1236,4 +1236,3 @@ mn:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1210,4 +1210,3 @@ nl:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1225,4 +1225,3 @@
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1250,4 +1250,3 @@ pl:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1248,4 +1248,3 @@ pt-BR:
label_x_revisions: "%{count} revisões"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1228,4 +1228,3 @@ pt:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1230,4 +1230,3 @@ ro:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1334,4 +1334,3 @@ ru:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1225,4 +1225,3 @@ sk:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1235,4 +1235,3 @@ sl:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1231,4 +1231,3 @@ sq:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1237,4 +1237,3 @@ sr-YU:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1236,4 +1236,3 @@ sr:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1268,4 +1268,3 @@ sv:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1232,4 +1232,3 @@ th:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1243,4 +1243,3 @@ tr:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1231,4 +1231,3 @@ uk:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1288,4 +1288,3 @@ vi:
label_x_revisions: "%{count} revisions"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1301,4 +1301,3 @@
text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -1223,4 +1223,3 @@ zh:
label_x_revisions: "%{count} 修订"
error_can_not_delete_auth_source: This authentication mode is in use and cannot be
deleted.
button_actions: Actions
......@@ -5,7 +5,7 @@ var contextMenuObserving;
function contextMenuRightClick(event) {
var target = $(event.target);
if (target.is('a:not(.js-contextmenu)')) {return;}
if (target.is('a')) {return;}
var tr = target.closest('.hascontextmenu').first();
if (tr.length < 1) {return;}
event.preventDefault();
......@@ -218,7 +218,6 @@ function contextMenuInit() {
if (!contextMenuObserving) {
$(document).click(contextMenuClick);
$(document).contextmenu(contextMenuRightClick);
$(document).on('click', '.js-contextmenu', contextMenuRightClick);
contextMenuObserving = true;
}
}
......
......@@ -228,7 +228,6 @@ table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
table.list td.checkbox input {padding:0px;}
table.list td.buttons, div.buttons { white-space:nowrap; text-align: right; }
table.list td.buttons a, div.buttons a { margin-right: 0.6em; }
table.list td.buttons a:last-child, div.buttons a:last-child { margin-right: 0; }
table.list td.buttons img, div.buttons img {vertical-align:middle;}
table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
table.list table.progress td {padding-right:0px;}
......@@ -474,7 +473,7 @@ div.issue.overdue .due-date .value { color: #c22; }
#issue_tree table.issues, #relations table.issues { border: 0; }
#issue_tree td.checkbox, #relations td.checkbox {display:none;}
#relations td.buttons, #issue_tree td.buttons {padding:0;}
#relations td.buttons {padding:0;}
fieldset.collapsible {border-width: 1px 0 0 0;}
fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
......@@ -1309,7 +1308,6 @@ div.wiki img {vertical-align:middle; max-width:100%;}
.icon-project { background-image: url(../images/projects.png); }
.icon-add-bullet { background-image: url(../images/bullet_add.png); }
.icon-shared { background-image: url(../images/link.png); }
.icon-actions { background-image: url(../images/3_bullets.png); }
.icon-file { background-image: url(../images/files/default.png); }
.icon-file.text-plain { background-image: url(../images/files/text.png); }
......
......@@ -793,13 +793,11 @@
width: 33.33%; /* three columns for all cells that are not subject */
}
#issue_tree .issues, #issue_tree .issue,
#relations .issues, #relations .issue {
position: relative; /* needed for .buttons positioning */
}
/* positioniong of unline button */
#issue_tree .issue > td.buttons,
#relations .issue > td.buttons {
text-align: right;
position: absolute;
......@@ -808,12 +806,11 @@
padding-right: 0;
}
#issue_tree .issue .buttons a,
#relations .issue .buttons a {
vertical-align: middle;
padding-right: 5px;
}
#issue_tree .issue > td.subject,
#relations .issue > td.subject {
padding-right: 25px; /* this is the spaces that .buttons uses next to subject */
}
......
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