diff options
60 files changed, 8 insertions, 77 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cd10c9a40..9da044c04 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index d1aa97ae7..972e6b9cb 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -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 diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 2126f632e..8024a6948 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -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);"> </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 %> diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index 7354c757d..f96ee6c2e 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -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 -%> diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index 019ddbb53..6f126b0f7 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -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| diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index eeb9f3f06..2914a6dbc 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -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> diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index 677cc1410..a62b0a1d0 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -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> diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 2c79b0217..9f9dd9913 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -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 diff --git a/config/locales/az.yml b/config/locales/az.yml index 6d9cc736d..c0da39c45 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -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 diff --git a/config/locales/bg.yml b/config/locales/bg.yml index ed89c9ebf..d5f35cd6f 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1217,4 +1217,3 @@ bg: description_all_columns: Всички колони text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.' error_can_not_delete_auth_source: Този режим за идентификация се използва и не може да бъде премахнат. - button_actions: Actions diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 12e9641ab..e23add1d0 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -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 diff --git a/config/locales/ca.yml b/config/locales/ca.yml index eeff67730..c86c0b516 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -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 diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 2fe26d895..dbc4999b1 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -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 diff --git a/config/locales/da.yml b/config/locales/da.yml index e92d2a89d..c563d1596 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -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 diff --git a/config/locales/de.yml b/config/locales/de.yml index 7d4a4582d..62def24c4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -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 diff --git a/config/locales/el.yml b/config/locales/el.yml index c425a081e..4cd4f362b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -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 diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 038be2908..eb4164c6f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 618ff3f2a..d9095432b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1079,7 +1079,6 @@ en: button_reopen: Reopen button_import: Import button_filter: Filter - button_actions: Actions status_active: active status_registered: registered diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml index ce1eb06e3..4f49b295f 100644 --- a/config/locales/es-PA.yml +++ b/config/locales/es-PA.yml @@ -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 diff --git a/config/locales/es.yml b/config/locales/es.yml index 27623324f..7c16893ec 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -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 diff --git a/config/locales/et.yml b/config/locales/et.yml index 3ae436c0a..dfdff8d5b 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -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 diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 9cff5edce..54fd44841 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -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 diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 131706d7f..638b039c4 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -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 diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 6a20fcff1..8dba1a280 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -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 diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 18e4e7b39..65d08cd6e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -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 diff --git a/config/locales/gl.yml b/config/locales/gl.yml index e427b5caa..785f76a60 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -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 diff --git a/config/locales/he.yml b/config/locales/he.yml index 862674232..a6382e723 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -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 diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 489a265c3..47cc9c784 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -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 diff --git a/config/locales/hu.yml b/config/locales/hu.yml index d55226ed4..e4e3bfa8a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -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 diff --git a/config/locales/id.yml b/config/locales/id.yml index 69885b3bd..67ccb46eb 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -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 diff --git a/config/locales/it.yml b/config/locales/it.yml index 052968149..65eb6759a 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -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 diff --git a/config/locales/ja.yml b/config/locales/ja.yml index a2f314338..c3b63d8de 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -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 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 645cd85f0..2cd2c79df 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -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 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 6760891f9..4b8cc72a2 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -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 diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 2e80eaba5..49914ee56 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -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 diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 0742d438b..21dab7662 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -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 diff --git a/config/locales/mn.yml b/config/locales/mn.yml index c74918cde..ebee43a92 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -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 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index d6ab31b53..bcea0b960 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -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 diff --git a/config/locales/no.yml b/config/locales/no.yml index 05213a037..2e801f50d 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -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 diff --git a/config/locales/pl.yml b/config/locales/pl.yml index ac2f67818..db237e5b5 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -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 diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index f58d0488a..fdae78bca 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -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 diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 456a1da9c..4bed2049d 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -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 diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 8fadcdc54..6777a96ff 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -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 diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f7df5fe40..3621363e1 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -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 diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d8edb6836..cb3e192b8 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -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 diff --git a/config/locales/sl.yml b/config/locales/sl.yml index c9c13e9b7..1c4f31b7b 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -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 diff --git a/config/locales/sq.yml b/config/locales/sq.yml index c368c0c3a..5fa794696 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -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 diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 7000f5c71..24728bd39 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -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 diff --git a/config/locales/sr.yml b/config/locales/sr.yml index d447dad83..bb6dcc149 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -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 diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 545cddfec..70cf7ee0b 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -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 diff --git a/config/locales/th.yml b/config/locales/th.yml index b791f9966..9a20cfaa0 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -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 diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 809052385..aace6e063 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -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 diff --git a/config/locales/uk.yml b/config/locales/uk.yml index e11b9d34f..cf6996254 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -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 diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 09f7809b7..7c7d2db79 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -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 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index cfc89e307..4fcab2cfe 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -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 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d7ff1f9be..9425aa108 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -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 diff --git a/public/images/3_bullets.png b/public/images/3_bullets.png Binary files differdeleted file mode 100644 index 616593b2a..000000000 --- a/public/images/3_bullets.png +++ /dev/null diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js index 9bc64b171..cd2cf0884 100644 --- a/public/javascripts/context_menu.js +++ b/public/javascripts/context_menu.js @@ -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; } } diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fa9e44bdc..35bd4ca04 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -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); } diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css index fb156863a..76e2d5945 100644 --- a/public/stylesheets/responsive.css +++ b/public/stylesheets/responsive.css @@ -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 */ } |
