TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3000 from floriank/feature/18330-use-toolbar

Browse Source 
[18330] Use toolbar for harmonizing the headings
pull/3007/head
Jan Sandbrink 10 years ago
parent d7afc7f93a 6b9881ab19
commit a6fe599f2b
140 changed files with 684 additions and 549 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 52
      app/assets/stylesheets/_misc_legacy.sass
  2. 7
      app/assets/stylesheets/layout/_breadcrumb.sass
  3. 10
      app/assets/stylesheets/layout/_toolbar.md
  4. 14
      app/assets/stylesheets/layout/_toolbar.sass
  5. 2
      app/controllers/news_controller.rb
  6. 4
      app/helpers/application_helper.rb
  7. 33
      app/helpers/timelines_helper.rb
  8. 33
      app/helpers/toolbar_helper.rb
  9. 2
      app/helpers/users_helper.rb
  10. 2
      app/views/account/lost_password.html.erb
  11. 2
      app/views/account/password_recovery.html.erb
  12. 5
      app/views/account/register.html.erb
  13. 7
      app/views/activities/index.html.erb
  14. 2
      app/views/admin/info.html.erb
  15. 2
      app/views/admin/plugins.html.erb
  16. 12
      app/views/admin/projects.html.erb
  17. 2
      app/views/attachments/diff.html.erb
  18. 3
      app/views/attachments/file.html.erb
  19. 3
      app/views/auth_sources/edit.html.erb
  20. 12
      app/views/auth_sources/index.html.erb
  21. 3
      app/views/auth_sources/new.html.erb
  22. 3
      app/views/boards/edit.html.erb
  23. 4
      app/views/boards/index.html.erb
  24. 2
      app/views/boards/new.html.erb
  25. 30
      app/views/boards/show.html.erb
  26. 2
      app/views/categories/destroy.html.erb
  27. 2
      app/views/categories/edit.html.erb
  28. 2
      app/views/categories/new.html.erb
  29. 2
      app/views/copy_projects/copy_from_admin.html.erb
  30. 3
      app/views/copy_projects/copy_from_settings.html.erb
  31. 10
      app/views/custom_fields/edit.html.erb
  32. 3
      app/views/custom_fields/index.html.erb
  33. 9
      app/views/custom_fields/new.html.erb
  34. 2
      app/views/enumerations/destroy.html.erb
  35. 7
      app/views/enumerations/edit.html.erb
  36. 2
      app/views/enumerations/index.html.erb
  37. 4
      app/views/enumerations/new.html.erb
  38. 6
      app/views/groups/edit.html.erb
  39. 12
      app/views/groups/index.html.erb
  40. 3
      app/views/groups/new.html.erb
  41. 2
      app/views/groups/show.html.erb
  42. 6
      app/views/layouts/angular.html.erb
  43. 6
      app/views/layouts/base.html.erb
  44. 4
      app/views/my/page.html.erb
  45. 5
      app/views/my/page_layout.html.erb
  46. 3
      app/views/my/password.html.erb
  47. 3
      app/views/news/edit.html.erb
  48. 12
      app/views/news/index.html.erb
  49. 2
      app/views/news/new.html.erb
  50. 39
      app/views/news/show.html.erb
  51. 2
      app/views/planning_element_type_colors/_form.html.erb
  52. 6
      app/views/planning_element_type_colors/confirm_destroy.html.erb
  53. 2
      app/views/planning_element_type_colors/edit.html.erb
  54. 17
      app/views/planning_element_type_colors/index.html.erb
  55. 5
      app/views/project_types/confirm_destroy.html.erb
  56. 8
      app/views/project_types/edit.html.erb
  57. 18
      app/views/project_types/index.html.erb
  58. 6
      app/views/project_types/new.html.erb
  59. 2
      app/views/projects/destroy_info.html.erb
  60. 37
      app/views/projects/index.html.erb
  61. 2
      app/views/projects/list_members.html.erb
  62. 2
      app/views/projects/new.html.erb
  63. 14
      app/views/projects/settings.html.erb
  64. 13
      app/views/projects/show.html.erb
  65. 18
      app/views/reportings/_toolbar.html.erb
  66. 6
      app/views/reportings/confirm_destroy.html.erb
  67. 5
      app/views/reportings/edit.html.erb
  68. 16
      app/views/reportings/index.html.erb
  69. 3
      app/views/reportings/new.html.erb
  70. 17
      app/views/reportings/show.html.erb
  71. 6
      app/views/repositories/_navigation.html.erb
  72. 4
      app/views/repositories/annotate.html.erb
  73. 8
      app/views/repositories/changes.html.erb
  74. 2
      app/views/repositories/committers.html.erb
  75. 19
      app/views/repositories/diff.html.erb
  76. 6
      app/views/repositories/entry.html.erb
  77. 4
      app/views/repositories/revision.html.erb
  78. 4
      app/views/repositories/revisions.html.erb
  79. 6
      app/views/repositories/show.html.erb
  80. 2
      app/views/repositories/stats.html.erb
  81. 5
      app/views/roles/edit.html.erb
  82. 9
      app/views/roles/index.html.erb
  83. 2
      app/views/roles/new.html.erb
  84. 2
      app/views/roles/report.html.erb
  85. 2
      app/views/search/index.html.erb
  86. 2
      app/views/settings/edit.html.erb
  87. 2
      app/views/settings/plugin.html.erb
  88. 5
      app/views/statuses/edit.html.erb
  89. 20
      app/views/statuses/index.html.erb
  90. 3
      app/views/statuses/new.html.erb
  91. 19
      app/views/time_entries/reports/show.html.erb
  92. 6
      app/views/timelines/confirm_destroy.html.erb
  93. 6
      app/views/timelines/edit.html.erb
  94. 3
      app/views/timelines/new.html.erb
  95. 50
      app/views/timelines/show.html.erb
  96. 2
      app/views/timelog/edit.html.erb
  97. 18
      app/views/timelog/index.html.erb
  98. 4
      app/views/types/edit.html.erb
  99. 17
      app/views/types/index.html.erb
  100. 3
      app/views/types/new.html.erb
  101. Some files were not shown because too many files have changed in this diff Show More

52
app/assets/stylesheets/_misc_legacy.sass
Unescape View File

@ -26,12 +26,13 @@
// See doc/COPYRIGHT.rdoc for more details.
//++
/*
IMPORTANT!
This is a "junk-drawer" containing CSS rule sets that could not be easily
placed elsewhere. Pleade DO NOT add to this file. Instead MOVE, refactor or
REMOVE with ruthlessness.
// IMPORTANT!
// This is a "junk-drawer" containing CSS rule sets that could not be easily
// placed elsewhere. Pleade DO NOT add to this file. Instead MOVE, refactor or
// REMOVE with ruthlessness.
#watchers
ul
@ -88,10 +89,6 @@ p
&.breadcrumb
font-size: 0.9em
margin: 4px 0 4px 0
&.subtitle
font-size: 0.9em
margin: -6px 0 12px 0
font-style: italic
&.footnote
font-size: 0.9em
margin-top: 0
@ -296,7 +293,7 @@ p.other-formats
.other-formats span + span:before
content: "| "
/* Project members tab
/* Project members tab */
div#tab-content-members
.user.status_registered, label.status_registered
@ -428,7 +425,7 @@ ul.projects
top: 7px
right: 14px
/* file table hovers
/* file table hovers */
a.has-thumb
img
@ -471,7 +468,7 @@ form#issue-list
max-height: 200px
overflow: hidden
/* roadmap breathing
/* roadmap breathing */
#roadmap h3
margin: 21px 0 12px
@ -485,7 +482,7 @@ ul.projects div.root a.project
div.issue div#relations
margin-top: 25px
/* all kinds of wonderful tweaks
/* all kinds of wonderful tweaks*/
.question pre
color: #111
@ -513,12 +510,12 @@ div.issue hr
tr.time-entry
white-space: normal
/* comments
/* comments */
.wiki ol li
list-style: decimal inside
/* scm
/* scm */
#content table .changeset td.id a:hover
text-decoration: underline
@ -526,12 +523,12 @@ tr.time-entry
#content table.files .opt-desc
width: 45%
/* member settings [pc]
/* member settings [pc] */
select#member_role_id
width: 75px
/* fix for thumbnail jankiness
/* fix for thumbnail jankiness */
a.has-thumb
&.active
@ -539,7 +536,7 @@ a.has-thumb
margin-left: -10px
margin-right: 0
*left: -10px
/* IE6 & 7 hacks
/* IE6 & 7 hacks */
*margin-left: 0
img
z-index: 1001
@ -554,7 +551,7 @@ a.has-thumb
/* Cut of text with '...' - working on all major browsers and IE6+
* not working for Firefox < 7
* not working for Firefox < 7 */
.ellipsis
white-space: nowrap
@ -631,7 +628,7 @@ strong.related-issues-heading
div.indent
padding-left: 10px
/* Menu item configuration
/* Menu item configuration */
.menu-item-form
p
@ -673,12 +670,12 @@ div.indent
.required
color: #008BD0
/*Gannt chart fix IE 6
/*Gannt chart fix IE 6 */
.task
line-height: 1em
/*Cost-Plugin specific styles
/*Cost-Plugin specific styles */
.icon-pieces
background-image: image-url("webalys/units.png") !important
@ -721,3 +718,14 @@ h4.comment
color: #4B4B4B
strong
color: black
/*
* Legacy headings to create headings which are similiar to the toolbar
* but cannot use the toolbar yet (e.g Legacy forms)
*/
.legacy-heading
// this will harmonize the headings in the old legacy form
// to be the same as if using a toolbar component
// TODO: once WP full screen create hits, remove this
padding-top: 12px
border: 0

7
app/assets/stylesheets/layout/_breadcrumb.sass
Unescape View File

@ -47,10 +47,6 @@
&.hidden-navigation
margin-left: $main-menu-folded-width
h1
margin-bottom: 0
margin-left: 13px
a
@extend %breadcrumb--default-font
@ -63,7 +59,7 @@
max-width: $breadcrumb-height
ul.breadcrumb
margin: 0
margin: 0 0 0 13px
padding: 0
list-style: none
list-style-position: outside
@ -86,4 +82,3 @@ ul.breadcrumb
margin: 0 0 0 10px
padding: 0 25px 0 0
background: image-url('breadcrumb-list.png') no-repeat right center

10
app/assets/stylesheets/layout/_toolbar.md
Unescape View File

@ -6,10 +6,11 @@ A toolbar that can and should be used for actions on the current view. Initially
```
@full-width
<h2>Title of the page</h2>
<div class="toolbar-container">
<div id="toolbar">
<div class="title-container">
<h2>Title of the page</h2>
</div>
<ul id="toolbar-items">
<li class="toolbar-item">
<a href="#" class="button -highlight">An important button</a>
@ -33,9 +34,11 @@ A toolbar that can and should be used for actions on the current view. Initially
```
@full-width
<h2>Dragonball Z characters</h2>
<div class="toolbar-container">
<div id="toolbar">
<div class="title-container">
<h2>Dragonball Z characters</h2>
</div>
<ul id="toolbar-items">
<li class="toolbar-item">
<select name="attribue">
@ -66,5 +69,6 @@ A toolbar that can and should be used for actions on the current view. Initially
</li>
</ul>
</div>
<p class="subtitle">now with extremeley long subtitle: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste consequatur doloribus suscipit nemo temporibus deserunt alias incidunt doloremque officia rerum, nobis fuga, recusandae voluptatibus voluptatem tenetur repellendus itaque et. Eum.</p>
</div>
```

14
app/assets/stylesheets/layout/_toolbar.sass
Unescape View File

@ -37,8 +37,14 @@
text-decoration: none
.toolbar-container
height: $header-height
padding: 0
margin-bottom: 12px
> .subtitle
font-size: rem-calc(14px)
font-style: italic
margin-top: rem-calc(5px)
margin-bottom: 10px
#toolbar
ul
@ -49,6 +55,12 @@
li
list-style-type: none
// automatically clear the toolbar
#toolbar:after
clear: both
content: ""
display: table
#toolbar-items
li
float: left

2
app/controllers/news_controller.rb
Unescape View File

@ -41,8 +41,6 @@ class NewsController < ApplicationController
before_filter :find_optional_project, only: [:index]
accept_key_auth :index
menu_item :new_news, only: [:new, :create]
def index
scope = @project ? @project.news.visible : News.visible

4
app/helpers/application_helper.rb
Unescape View File

@ -70,8 +70,8 @@ module ApplicationHelper
safe_join [name, ' ', content_tag('span', '*', class: 'required')]
end
def li_unless_nil(link)
content_tag(:li, link) if link
def li_unless_nil(link, options = {})
content_tag(:li, link, options) if link
end
# Show a sorted linkified (if active) comma-joined list of users

33
app/helpers/timelines_helper.rb
Unescape View File

@ -182,4 +182,37 @@ module TimelinesHelper
def timeline_options
OpenStruct.new @timeline.options
end
def new_timeline_link(project, &block)
link_to({ controller: '/timelines', action: 'new', project_id: project },
title: l('timelines.new_timeline'),
class: 'button -alt-highlight',
&block
)
end
def edit_timeline_link(project, timeline, &block)
link_to({ controller: '/timelines',
action: 'edit',
project_id: project,
id: timeline },
class: 'button',
accesskey: accesskey(:edit),
&block
)
end
def destroy_timeline_link(project, timeline, &block)
link_to({ controller: '/timelines',
action: 'confirm_destroy',
project_id: project,
id: timeline },
class: 'button',
&block
)
end
def timeline_action_authorized?(action)
authorize_for(:timelines, action)
end
end

33
app/helpers/toolbar_helper.rb
Unescape View File

@ -0,0 +1,33 @@
module ToolbarHelper
def toolbar(title:, subtitle: '')
content_tag :div, class: 'toolbar-container' do
toolbar = content_tag :div, id: 'toolbar' do
dom_title(title) + dom_toolbar do
yield if block_given?
end
end
next toolbar if subtitle.blank?
toolbar + content_tag(:p, subtitle, class: 'subtitle')
end
end
protected
def dom_title(title)
content_tag :div, class: 'title-container' do
title_attribute = decode title
content_tag(:h2, title.html_safe, title: title_attribute)
end
end
def dom_toolbar
return '' unless block_given?
content_tag :ul, id: 'toolbar-items' do
yield
end
end
def decode(string)
raw strip_links string
end
end

2
app/helpers/users_helper.rb
Unescape View File

@ -105,7 +105,7 @@ module UsersHelper
def change_user_status_buttons(user)
build_change_user_status_action(user) do |title, name|
styled_submit_tag(title, name: name, class: '-round')
submit_tag(title, name: name, class: 'button')
end
end

2
app/views/account/lost_password.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% disable_accessibility_css! %>
<h2><%=l(:label_password_lost)%></h2>
<%= toolbar title: l(:label_password_lost) %>
<section class="form--section">
<%= styled_form_tag({:action=> "lost_password"}) do %>
<div class="form--field -required">

2
app/views/account/password_recovery.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% disable_accessibility_css! %>
<h2><%=l(:label_password_lost)%></h2>
<%= toolbar title: l(:label_password_lost) %>
<%= error_messages_for 'user' %>
<%= styled_form_tag({:token => @token.value}, :autocomplete => 'off') do %>
<section class="form--section">

5
app/views/account/register.html.erb
Unescape View File

@ -28,10 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% disable_accessibility_css! %>
<h2>
<%= l(:label_register) %>
</h2>
<%= toolbar title: l(:label_register) %>
<%= labelled_tabular_form_for(@user, :url => url_for(:action => 'register')) do |f| %>
<%= back_url_hidden_field_tag %>

7
app/views/activities/index.html.erb
Unescape View File

@ -29,10 +29,9 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook :activity_index_head %>
<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
<p class="subtitle">
<%= l(:label_date_from_to, start: format_date(@date_to - @days), end: format_date(@date_to-1)) %>
</p>
<%= toolbar title: (@author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe),
subtitle: l(:label_date_from_to, start: format_date(@date_to - @days), end: format_date(@date_to-1))
%>
<div id="activity">
<% @events_by_day.keys.sort.reverse.each do |day| %>

2
app/views/admin/info.html.erb
Unescape View File

@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title(l(:label_administration), l(:label_information_plural)) -%>
<%= content_tag :h2, I18n.t('label_information_plural') %>
<%= toolbar title: I18n.t('label_information_plural') %>
<%= call_hook(:view_admin_info_top) %>
<%= content_tag :h3, I18n.t('label_core_version') %>

2
app/views/admin/plugins.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_plugins) %>
<h2><%= l(:label_plugins) %></h2>
<%= toolbar title: l(:label_plugins) %>
<% if @plugins.any? %>
<table class="list plugins">
<% @plugins.each do |plugin| %>

12
app/views/admin/projects.html.erb
Unescape View File

@ -31,12 +31,14 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'no_data' if @no_configuration_data %>
</div>
<% content_for :action_menu_specific do %>
<%= link_to l(:label_project_new), {:controller => '/projects', :action => 'new'}, :class => 'icon icon-add' %>
<% end %>
<% html_title(l(:label_administration), l(:label_project_plural)) -%>
<h2><%=l(:label_project_plural)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_project_plural) do %>
<li class="toolbar-item">
<%= link_to new_project_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_project_new) %>
<% end %>
</li>
<% end %>
<%= form_tag({}, :method => :get) do %>
<fieldset class="simple-filters--container">
<legend><%= l(:label_filter_plural) %></legend>

2
app/views/attachments/diff.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=h @attachment.filename %></h2>
<%= toolbar title: h(@attachment.filename) %>
<div class="attachments">
<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
<span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>

3
app/views/attachments/file.html.erb
Unescape View File

@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=h @attachment.filename %></h2>
<%= toolbar title: h(@attachment.filename) %>
<div class="attachments">
<p>

3
app/views/auth_sources/edit.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{l(:label_auth_source)} #{@auth_source.name}" %>
<h2><%=l(:label_auth_source)%> (<%= @auth_source.auth_method_name %>)</h2>
<%= toolbar title: "#{l(:label_auth_source)} (#{h @auth_source.auth_method_name})" %>
<%= labelled_tabular_form_for @auth_source, :as => :auth_source do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

12
app/views/auth_sources/index.html.erb
Unescape View File

@ -27,12 +27,14 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to l(:label_auth_source_new), { :action => 'new' }, :class => 'icon icon-add' %>
<% end %>
<% html_title l(:label_administration), l(:label_auth_source_plural) %>
<h2><%=l(:label_auth_source_plural)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_auth_source_plural) do %>
<li class="toolbar-item">
<%= link_to new_auth_source_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_auth_source_new) %>
<% end %>
</li>
<% end %>
<table class="list">
<thead>
<tr>

3
app/views/auth_sources/new.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_auth_source_new) %>
<h2><%=l(:label_auth_source_new)%> (<%= @auth_source.auth_method_name %>)</h2>
<%= toolbar title: "#{l(:label_auth_source_new)} (#{h @auth_source.auth_method_name})" %>
<%= labelled_tabular_form_for @auth_source, :as => :auth_source do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

3
app/views/boards/edit.html.erb
Unescape View File

@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= Board.name.humanize %></h2>
<%= toolbar title: Board.name.humanize %>
<%= labelled_tabular_form_for [@project, @board] do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>

4
app/views/boards/index.html.erb
Unescape View File

@ -26,7 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(:label_board_plural) %></h2>
<% html_title l(:label_board_plural) %>
<%= toolbar title: l(:label_board_plural) %>
<table class="list boards">
<thead>
<tr>
@ -65,4 +66,3 @@ See doc/COPYRIGHT.rdoc for more details.
<%= auto_discovery_link_tag(:atom, {:controller => '/activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
<% end %>
<% html_title l(:label_board_plural) %>

2
app/views/boards/new.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(:label_board_new) %></h2>
<%= toolbar title: l(:label_board_new) %>
<%= labelled_tabular_form_for [@project, @board] do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>

30
app/views/boards/show.html.erb
Unescape View File

@ -29,14 +29,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= include_gon %>
<% content_for :action_menu_specific do %>
<%= link_to_if_authorized l(:label_message_new),
{controller: '/messages', action: 'new', board_id: @board},
class: 'icon icon-add',
onclick: 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
<%= watcher_link(@board, User.current) %>
<% end %>
<div id="add-message" style="display:none;">
<% if authorize_for('messages', 'new') %>
<h2><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h2>
@ -56,10 +48,24 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
</div>
<h2><%=h @board.name %></h2>
<p class="subtitle"><%=h @board.description %></p>
<%= render partial: 'layouts/action_menu_specific' %>
<%= toolbar title: @board.name, subtitle: @board.description do %>
<% if authorize_for(:messages, :new) %>
<li class="toolbar-item">
<%= link_to({ controller: '/messages', action: 'new', board_id: @board},
class: 'button -alt-highlight',
onclick: 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;') do %>
<i class="button--icon icon-add"></i> <%= l(:label_message_new) %>
<% end %>
</li>
<% end %>
<% unless User.current.anonymous? %>
<li class="toolbar-item">
<div class="button">
<%= watcher_link(@board, User.current) %>
</div>
</li>
<% end %>
<% end %>
<div ng-controller="MessagesController">
<% if @topics.any? %>

2
app/views/categories/destroy.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= Category.model_name.human %>: <%=h @category.name %></h2>
<%= toolbar title: "#{Category.model_name.human} #{h @category.name}" %>
<%= form_tag({}, {:method => :delete}) do %>
<div class="box">
<p><strong><%= l(:text_work_package_category_destroy_question, @issue_count) %></strong></p>

2
app/views/categories/edit.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= Category.model_name.human %></h2>
<%= toolbar title: Category.model_name.human %>
<%= labelled_tabular_form_for @category, :as => :category do |f| %>
<%= render :partial => 'categories/form', :locals => { :f => f } %>
<%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>

2
app/views/categories/new.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=l(:label_work_package_category_new)%></h2>
<%= toolbar title: l(:label_work_package_category_new) %>
<%= labelled_tabular_form_for [@project, @category], :as => :category do |f| %>
<%= render :partial => 'categories/form', :locals => { :f => f } %>
<%= f.button l(:button_create), class: 'button -highlight -with-icon icon-yes' %>

2
app/views/copy_projects/copy_from_admin.html.erb
Unescape View File

@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= error_messages_for 'copy_project' %>
<h2><%=l(:label_project_new)%></h2>
<%= toolbar title: l(:label_project_new) %>
<%= labelled_tabular_form_for @copy_project, :url => { :action => "copy" } do |f| %>
<%= hidden_field_tag :coming_from, 'admin' %>

3
app/views/copy_projects/copy_from_settings.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= error_messages_for 'copy_project' %>
<h2><%=l(:label_project_new)%></h2>
<%= toolbar title: l(:label_project_new) %>
<%= labelled_tabular_form_for @copy_project, :url => { :action => "copy" } do |f| %>
<section class="form--section">

10
app/views/custom_fields/edit.html.erb
Unescape View File

@ -27,11 +27,13 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{CustomField.model_name.human} #{@custom_field.name}" %>
<% html_title l(:label_administration), "#{l(:label_edit)} #{CustomField.model_name.human} #{h @custom_field.name}" %>
<h2><%= link_to l(:label_custom_field_plural), :controller => '/custom_fields', :action => 'index' %>
&#187; <%= link_to l(@custom_field.type_name), :controller => '/custom_fields', :action => 'index', :tab => @custom_field.type %>
&#187; <%=h @custom_field.name %></h2>
<%= toolbar title: %{#{link_to l(:label_custom_field_plural), custom_fields_path}
&raquo; #{link_to l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)}
&raquo; #{@custom_field.name}
}.squish
%>
<%= labelled_tabular_form_for @custom_field, :as => :custom_field,
:url => custom_field_path(@custom_field),

3
app/views/custom_fields/index.html.erb
Unescape View File

@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=l(:label_custom_field_plural)%></h2>
<%= toolbar title: l(:label_custom_field_plural) %>
<%= render_tabs custom_fields_tabs %>

9
app/views/custom_fields/new.html.erb
Unescape View File

@ -28,10 +28,11 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_custom_field_new) %>
<h2><%= link_to l(:label_custom_field_plural), :controller => '/custom_fields', :action => 'index' %>
&#187; <%= link_to l(@custom_field.type_name), :controller => '/custom_fields', :action => 'index', :tab => @custom_field.type %>
&#187; <%= l(:label_custom_field_new) %></h2>
<%= toolbar title: %{#{link_to l(:label_custom_field_plural), custom_fields_path}
&raquo; #{link_to l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)}
&raquo; #{l(:label_custom_field_new)}
}.squish
%>
<%= labelled_tabular_form_for @custom_field, :as => :custom_field,
:url => custom_fields_path,

2
app/views/enumerations/destroy.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}" %>
<%= styled_form_tag({}, :method => :delete) do %>
<section class="form--section">
<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>

7
app/views/enumerations/edit.html.erb
Unescape View File

@ -27,9 +27,8 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Enumeration.model_name.human} #{@enumeration.name}" %>
<h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=h @enumeration %></h2>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Enumeration.model_name.human} #{h @enumeration.name}" %>
<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}" %>
<%= labelled_tabular_form_for @enumeration do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
@ -37,5 +36,5 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<%= styled_form_tag(enumeration_path(@enumeration), :method => :delete) do %>
<%= styled_submit_tag l(:button_delete), class: '-highlight' %>
<%= styled_submit_tag l(:button_delete) %>
<% end %>

2
app/views/enumerations/index.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_enumerations) %>
<h2><%=l(:label_enumerations)%></h2>
<%= toolbar title: l(:label_enumerations) %>
<% Enumeration.descendants.each do |klass| %>
<h3><%= l(klass::OptionName) %></h3>
<% enumerations = klass.shared %>

4
app/views/enumerations/new.html.erb
Unescape View File

@ -28,9 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_enumeration_new) %>
<h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=l(:label_enumeration_new)%></h2>
<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{l(:label_enumeration_new)}" %>
<%= labelled_tabular_form_for @enumeration do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>

6
app/views/groups/edit.html.erb
Unescape View File

@ -27,8 +27,6 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Group.model_name.human} #{@group.name}" %>
<h2><%= link_to l(:label_group_plural), groups_path %> &#187; <%= h(@group) %></h2>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Group.model_name.human} #{h @group.name}" %>
<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{@group.name}" %>
<%= render_tabs group_settings_tabs %>

12
app/views/groups/index.html.erb
Unescape View File

@ -27,12 +27,14 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to l(:label_group_new), new_group_path, :class => 'icon icon-add' %>
<% end %>
<% html_title l(:label_administration), l("label_group_plural") %>
<h2><%= l(:label_group_plural) %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_group_plural) do %>
<li class="toolbar-item">
<%= link_to new_group_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_group_new) %>
<% end %>
</li>
<% end %>
<% if @groups.any? %>
<table class="list groups">
<thead>

3
app/views/groups/new.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l("label_group_new") %>
<h2><%= link_to l(:label_group_plural), groups_path %> &#187; <%= l(:label_group_new) %></h2>
<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{l(:label_group_new)}" %>
<%= labelled_tabular_form_for(@group) do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

2
app/views/groups/show.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= link_to l(:label_group_plural), groups_path %> &#187; <%=h @group %></h2>
<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{h @group.name}" %>
<ul>
<% @group.users.each do |user| %>
<li><%=h user %></li>

6
app/views/layouts/angular.html.erb
Unescape View File

@ -113,10 +113,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% if show_decoration %>
<div id="breadcrumb" class="<%= (side_displayed) ? '' : "nosidebar" %><%= (show_decoration) ? '' : 'nomenus' %>"
ng-class="{ 'hidden-navigation': !showNavigation }">
<h1>
<%= you_are_here_info %>
<%= full_breadcrumb %>
</h1>
<%= you_are_here_info %>
<%= full_breadcrumb %>
</div>
<% end %>
<div class="<%= (side_displayed) ? '' : "nosidebar" %><%= (show_decoration) ? '' : 'nomenus' %>" id="content"

6
app/views/layouts/base.html.erb
Unescape View File

@ -110,10 +110,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% if show_decoration %>
<div id="breadcrumb" class="<%= (side_displayed) ? '' : "nosidebar" %><%= (show_decoration) ? '' : 'nomenus' %>"
ng-class="{ 'hidden-navigation': !showNavigation }">
<h1>
<%= you_are_here_info %>
<%= full_breadcrumb %>
</h1>
<%= you_are_here_info %>
<%= full_breadcrumb %>
</div>
<% end %>
<div class="<%= (side_displayed) ? '' : "nosidebar" %><%= (show_decoration) ? '' : 'nomenus' %>" id="content"

4
app/views/my/page.html.erb
Unescape View File

@ -27,15 +27,13 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% breadcrumb_paths(l(:label_my_page)) %>
<% content_for :toolbar do %>
<%= toolbar title: l(:label_my_page) do %>
<li class="toolbar-item">
<%= link_to({ action: 'page_layout' }, accesskey: accesskey(:edit), class: 'button') do %>
<i class="icon-edit"></i> <%= l(:label_personalize_page) %>
<% end %>
</li>
<% end %>
<h2><%=l(:label_my_page)%></h2>
<%= render :partial => 'layouts/toolbar' %>
<div id="invisible-grid">
<div class="grid-block">
<div id="list-top" class="grid-content">

5
app/views/my/page_layout.html.erb
Unescape View File

@ -65,7 +65,7 @@ See doc/COPYRIGHT.rdoc for more details.
//]]>
</script>
<% content_for :toolbar do %>
<%= toolbar title: l(:label_my_page) do %>
<li class="toolbar-item">
<%= styled_form_tag({:action => "add_block"}, :id => "block-form") do %>
<%= styled_select_tag 'block', "<option>--#{t(:button_add)}--</option>".html_safe + options_for_select(@block_options),
@ -90,9 +90,6 @@ See doc/COPYRIGHT.rdoc for more details.
</li>
<% end %>
<h2><%=l(:label_my_page)%></h2>
<%= render :partial => 'layouts/toolbar' %>
<h4><%=l(:label_visible_elements) %></h4>
<div id="visible-grid">
<div class="grid-block">

3
app/views/my/password.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_my_account), l(:button_change_password) %>
<h2><%=l(:button_change_password)%></h2>
<%= toolbar title: l(:button_change_password) %>
<%= error_messages_for 'user' %>
<%= styled_form_tag({:action => :change_password},

3
app/views/news/edit.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_news_edit) %>
<h2><%= News.model_name.human %></h2>
<%= toolbar title: News.model_name.human %>
<%= labelled_tabular_form_for @news, :html => { :id => 'news-form' } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

12
app/views/news/index.html.erb
Unescape View File

@ -26,7 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=l(:label_news_plural)%></h2>
<% html_title(l(:label_news_plural)) -%>
<%= toolbar title: l(:label_news_plural) do %>
<% if User.current.allowed_to?(:manage_news, @project) %>
<li class="toolbar-item">
<%= link_to new_project_news_path(@project), title: l(:label_news_new), id: 'new_news_link', class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_news_new) %>
<% end %>
</li>
<% end %>
<% end %>
<% if @newss.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% else %>
@ -49,4 +58,3 @@ See doc/COPYRIGHT.rdoc for more details.
<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<% end %>
<% html_title(l(:label_news_plural)) -%>

2
app/views/news/new.html.erb
Unescape View File

@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l(:label_news_new) %>
<h2><%=l(:label_news_new)%></h2>
<%= toolbar title: l(:label_news_new) %>
<%= labelled_tabular_form_for [@project, @news], :html => { :id => 'news-form' } do |f| %>
<%= render :partial => 'news/form', :locals => { :f => f } %>

39
app/views/news/show.html.erb
Unescape View File

@ -27,24 +27,31 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to(l(:button_edit),
edit_news_path(@news),
:class => 'icon icon-edit',
:accesskey => accesskey(:edit),
:onclick => 'Element.show("edit-news"); return false;') if User.current.allowed_to?(:manage_news, @project) %>
<%= watcher_link(@news, User.current) %>
<%= link_to(l(:button_delete),
news_path(@news),
:confirm => l(:text_are_you_sure),
:method => :delete,
:class => 'icon icon-delete') if User.current.allowed_to?(:manage_news, @project) %>
<%= toolbar title: "#{h @news.title}" do %>
<% if User.current.allowed_to?(:manage_news, @project) %>
<%= link_to(edit_news_path(@news),
:accesskey => accesskey(:edit),
class: 'button',
:onclick => 'Element.show("edit-news"); return false;') do %>
<i class="button--icon icon-edit"></i> <%= l(:button_edit) %>
<% end %>
<% end %>
<li class="toolbar-item">
<%# hack around the old watchers_link implementation %>
<div class="button">
<%= watcher_link(@news, User.current) %>
</div>
</li>
<% if User.current.allowed_to?(:manage_news, @project) %>
<%= link_to(news_path(@news),
:confirm => l(:text_are_you_sure),
:method => :delete,
:class => 'button') do %>
<i class="button--icon icon-delete"></i> <%= l(:button_delete) %>
<% end %>
<% end %>
<% end %>
<div class="top-page">
<%= render :partial => 'layouts/action_menu_specific' %>
<h2 title="<%= h @news.title %>"><%= avatar(@news.author) %><%=h @news.title %></h2>
</div>
<% if authorize_for('news', 'edit') %>
<div id="edit-news" style="display:none;">
<%= labelled_tabular_form_for @news, :html => { :id => 'news-form' } do |f| %>

2
app/views/planning_element_type_colors/_form.html.erb
Unescape View File

@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= error_messages_for 'color' %>
<h2><%= color.new_record? ? l('timelines.new_color') : l('timelines.edit_color') %></h2>
<%= toolbar title: (color.new_record? ? l('timelines.new_color') : l('timelines.edit_color')) %>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%= l('timelines.properties') %></legend>

6
app/views/planning_element_type_colors/confirm_destroy.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= toolbar title: h(@color.name) %>
<%= labelled_tabular_form_for @color,
:url => color_url(@color),
:html => {:method => 'delete'},
@ -37,10 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.
<i class="icon-close close-handler"></i>
</div>
<h2>
<%=h @color.name %>
</h2>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%= l('timelines.properties') %></legend>
<div class="form--field">

2
app/views/planning_element_type_colors/edit.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{l("timelines.admin_menu.color")} #{@color.name}" %>
<% html_title l(:label_administration), "#{l(:label_edit)} #{l("timelines.admin_menu.color")} #{h @color.name}" %>
<%= labelled_tabular_form_for @color,
:url => color_url(@color),

17
app/views/planning_element_type_colors/index.html.erb
Unescape View File

@ -27,18 +27,15 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to(l("timelines.new_color"),
new_color_path,
:title => l("timelines.new_color"),
:class => 'icon icon-add') %>
<% end %>
<% html_title l(:label_administration), l("timelines.admin_menu.colors") %>
<h2><%= l('timelines.admin_menu.colors') %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l('timelines.admin_menu.colors') do %>
<li class="toolbar-item">
<%= link_to new_color_path, class: 'button -alt-highlight', title: l('timelines.new_color') do %>
<i class="button--icon icon-add"></i> <%= l('timelines.new_color') %>
<% end %>
</li>
<% end %>
<% if @colors.blank? %>
<p class="nodata"><%= l(:label_no_data) %></p>

5
app/views/project_types/confirm_destroy.html.erb
Unescape View File

@ -27,6 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= toolbar title: h(@project_type.name) %>
<%= labelled_tabular_form_for(@project_type,
:url => project_type_path(@project_type),
:html => {:method => 'delete'}) do |f| %>
@ -36,10 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.
<i class="icon-close close-handler"></i>
</div>
<h2>
<%=h @project_type.name %>
</h2>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%= l('timelines.properties') %></legend>
<div class="form--field">

8
app/views/project_types/edit.html.erb
Unescape View File

@ -29,15 +29,11 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l(:label_administration), "#{l(:label_edit)} #{l("timelines.admin_menu.project_type")} #{@project_type.name}" %>
<% html_title l(:label_administration), "#{l(:label_edit)} #{l("timelines.admin_menu.project_type")} #{h @project_type.name}" %>
<%= toolbar title: "#{l(:label_edit)} #{l("timelines.admin_menu.project_type")} #{h @project_type.name}" %>
<%= labelled_tabular_form_for(@project_type,
:url => project_type_path(@project_type),
:html => {:method => 'put'}) do |f| %>
<h2>
<% html_title "#{l("timelines.edit_project_type")}: #{h(@project_type.name)}" %>
<%= l("timelines.edit_project_type") %>: <%=h @project_type.name %>
</h2>
<%= render :partial => "project_types/form",
:locals => {:f => f, :project_type => @project_type} %>
<% end %>

18
app/views/project_types/index.html.erb
Unescape View File

@ -27,20 +27,16 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to(l("timelines.new_project_type"),
new_project_type_path,
:title => l("timelines.new_project_type"),
:class => 'icon icon-add') %>
<% end %>
<% html_title l(:label_administration), l("timelines.admin_menu.project_types") %>
<h2><%= l("timelines.admin_menu.project_types") %></h2>
<%= toolbar title: l("timelines.admin_menu.project_types") do %>
<li class="toolbar-item">
<%= link_to new_project_type_path, class: 'button -alt-highlight', title: l('timelines.new_project_type') do %>
<i class="button--icon icon-add"></i> <%= l('timelines.new_project_type') %>
<% end %>
</li>
<% end %>
<%= render :partial => 'layouts/action_menu_specific' %>
<% if @project_types.blank? %>
<p class="nodata"><%= l(:label_no_data) %></p>

6
app/views/project_types/new.html.erb
Unescape View File

@ -30,14 +30,10 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l(:label_administration), "#{l(:label_new)} #{l("timelines.admin_menu.project_type")}" %>
<%= toolbar title: l('timelines.new_project_type') %>
<%= labelled_tabular_form_for(@project_type,
:url => project_types_path,
:html => {:method => 'post'}) do |f| %>
<h2>
<% html_title l("timelines.new_project_type") %>
<%= l("timelines.new_project_type") %>
</h2>
<%= render :partial => "project_types/form",
:locals => {:f => f, :project_type => @project_type} %>
<% end %>

2
app/views/projects/destroy_info.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=l(:label_confirmation)%></h2>
<%= toolbar title: l(:label_confirmation) %>
<div class="warning">
<p><strong><%=h @project_to_destroy %></strong><br />
<%=l(:text_project_destroy_confirmation)%>

37
app/views/projects/index.html.erb
Unescape View File

@ -29,19 +29,36 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
<% end %>
<% content_for :action_menu_specific do %>
<%= link_to(l(:label_project_new), {:controller => '/projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
<%= link_to(l(:label_work_package_view_all), { controller: :work_packages }) + ' |' if User.current.allowed_to?(:view_work_packages, nil, :global => true) %>
<%= link_to(l(:label_overall_spent_time), { :controller => '/time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
<%= link_to(l(:label_news_view_all), { :controller => '/news' }) + ' |' if User.current.allowed_to?(:view_news, nil, :global => true) %>
<%= link_to l(:label_overall_activity), { :controller => '/activities', :action => 'index' }%>
<% end %>
<% html_title(l(:label_project_plural)) -%>
<h2><%=l(:label_project_plural)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_project_plural) do %>
<% if User.current.allowed_to?(:add_project, nil, global: true) %>
<li class="toolbar-item">
<%= link_to new_project_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_project_new) %>
<% end %>
</li>
<% end %>
<% if User.current.allowed_to?(:view_work_packages, nil, :global => true) %>
<li class="toolbar-item">
<%= link_to l(:label_work_package_view_all),work_packages_path, class: 'button' %>
</li>
<% end %>
<% if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
<li class="toolbar-item">
<%= link_to l(:label_overall_spent_time), time_entries_path, class: 'button' %>
</li>
<% end %>
<% if User.current.allowed_to?(:view_news, nil, :global => true) %>
<li class="toolbar-item">
<%= link_to l(:label_news_view_all), news_index_path, class: 'button' %>
</li>
<% end %>
<li class="toolbar-item">
<%= link_to l(:label_overall_activity), activities_path, class: 'button' %>
</li>
<% end %>
<div class="wiki">
<%= format_text Setting.welcome_text %>

2
app/views/projects/list_members.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=l(:label_member_plural)%></h2>
<%= toolbar title: l(:label_member_plural) %>
<% if @members.empty? %>
<p><i><%= l(:label_no_data) %></i></p>
<% end %>

2
app/views/projects/new.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l("label_project_new") %>
<h2><%=l(:label_project_new)%></h2>
<%= toolbar title: l(:label_project_new) %>
<%= labelled_tabular_form_for @project do |f| %>
<%= render :partial => 'form', :locals => { :f => f, :project => @project, :renderTypes => true } %>
<%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>

14
app/views/projects/settings.html.erb
Unescape View File

@ -26,11 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%=l(:label_settings)%></h2>
<%= render :partial => 'projects/settings/action_menu', :locals => { :project => @project } %>
<% html_title(l(:label_settings)) -%>
<% breadcrumb_paths(l(:label_settings)) %>
<%= toolbar title: l(:label_settings) do %>
<% if @project.copy_allowed? %>
<li class="toolbar-item">
<%= link_to copy_from_project_path(@project, coming_from: :settings), class: 'button copy', accesskey: accesskey(:copy) do %>
<i class="button--icon icon-copy"></i> <%= l(:button_copy) %>
<% end %>
</li>
<% end %>
<% end %>
<%= render_tabs project_settings_tabs %>
<% html_title(l(:label_settings)) -%>

13
app/views/projects/show.html.erb
Unescape View File

@ -27,17 +27,18 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= toolbar title: l(:label_overview) do %>
<% if User.current.allowed_to?(:add_subprojects, @project) %>
<%= link_to l(:label_subproject_new), {:controller => '/projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
<li class="toolbar-item">
<%= link_to({:controller => '/projects', :action => 'new', :parent_id => @project}, :class => 'button -alt-highlight') do %>
<span class="button--text"><i class="button--icon icon-add"></i> <%= l(:label_subproject_new) %></span>
<% end %>
</li>
<% end %>
<% end %>
<h2><%=l(:label_overview)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<% breadcrumb_paths(l(:label_overview)) %>
<div class="grid-block">
<div class="grid-block medium-up-2">
<div class="grid-content">
<div class="wiki" ng-non-bindable>
<%= format_text @project.description %>

18
app/views/reportings/_toolbar.html.erb
Unescape View File

@ -0,0 +1,18 @@
<%= toolbar(title: l("timelines.reporting_for_project.show",
:title => link_to_project(@reporting.reporting_to_project))) do %>
<% if show_actions %>
<% if authorize_for :reportings, :edit %>
<li class="toolbar-item">
<%= link_to edit_project_reporting_path(@project, @reporting), class: 'button' do %>
<i class="button--icon icon-edit"></i> <%= l(:button_edit) %>
<% end %>
</li>
<% end %>
<% if authorize_for :reportings, :destroy %>
<%= link_to confirm_destroy_project_reporting_path(@project, @reporting), class: 'button' do %>
<i class="button--icon icon-delete"></i> <%= l(:button_delete) %>
<% end %>
<% end %>
<% end %>
<% end %>

6
app/views/reportings/confirm_destroy.html.erb
Unescape View File

@ -31,10 +31,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l('timelines.reporting_for_project.show',
:title => h(@reporting.reporting_to_project.name)) %>
<h2>
<%= l('timelines.reporting_for_project.show',
:title => link_to_project(@reporting.reporting_to_project)).html_safe %>
</h2>
<%= render partial: 'toolbar', locals: { show_actions: false } %>
<%= form_for :reporting,
:url => project_reporting_path(@project, @reporting),

5
app/views/reportings/edit.html.erb
Unescape View File

@ -39,10 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l('timelines.reporting_for_project.show',
:title => h(@reporting.reporting_to_project.name)) %>
<h2>
<%= l('timelines.reporting_for_project.show',
:title => link_to_project(@reporting.reporting_to_project)).html_safe %>
</h2>
<%= render partial: 'toolbar', locals: { show_actions: false } %>
<%= labelled_tabular_form_for :reporting,
:url => project_reporting_path(@project, @reporting),

16
app/views/reportings/index.html.erb
Unescape View File

@ -28,17 +28,15 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= javascript_include_tag 'contextual_fieldset.js' %>
<% content_for :action_menu_specific do %>
<%= link_to_if_authorized(l("timelines.new_reporting"),
{ :action => :new },
{ :title => l("timelines.new_reporting"),
:class => ("icon icon-add")
}) %>
<% end %>
<% html_title l("timelines.project_menu.reportings") %>
<h2><%= l("timelines.project_menu.reportings") %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l("timelines.project_menu.reportings") do %>
<% if authorize_for(:reportings, :new) %>
<%= link_to new_project_reporting_path(@project), title: l("timelines.new_reporting"), class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l("timelines.new_reporting") %>
<% end %>
<% end %>
<% end %>
<% if @reportings.blank? %>
<p class="nodata"><%= l(:label_no_data) %></p>

3
app/views/reportings/new.html.erb
Unescape View File

@ -37,7 +37,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= javascript_include_tag "timelines_select_boxes.js" %>
<% end %>
<h2><%= l('timelines.new_reporting').tap { |t| html_title t } %></h2>
<% html_title l('timelines.new_reporting') %>
<%= toolbar title: l('timelines.new_reporting') %>
<%= labelled_tabular_form_for :reporting,
:url => project_reportings_path(@project),

17
app/views/reportings/show.html.erb
Unescape View File

@ -32,22 +32,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l('timelines.reporting_for_project.show',
:title => h(@reporting.reporting_to_project.name)) %>
<% content_for :action_menu_specific do %>
<%= link_to_if_authorized(l(:button_edit),
{:action => :edit, :project_id => @project, :id => @reporting},
:class => 'icon icon-edit',
accesskey: accesskey(:edit)) %>
<%= link_to_if_authorized(l(:button_delete),
{:action => :confirm_destroy, :project_id => @project, :id => @reporting},
:class => 'icon icon-delete') %>
<% end %>
<h2>
<%= l('timelines.reporting_for_project.show',
:title => link_to_project(@reporting.reporting_to_project)).html_safe %>
</h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= render partial: 'toolbar', locals: { show_actions: true } %>
<%= render :partial => 'show' %>

6
app/views/repositories/_navigation.html.erb
Unescape View File

@ -30,8 +30,9 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :header_tags do %>
<%= javascript_include_tag 'repository_navigation' %>
<% end %>
<% content_for :toolbar do %>
<% merge ||= {} %>
<% crumbs = render :partial => 'breadcrumbs', :locals => { :path => @path, :revision => @rev }.merge(merge) %>
<%= toolbar title: crumbs do %>
<li class="toolbar-item">
<%= link_to stats_project_repository_path(@project), class: 'button' do %>
<i class="icon icon-stats1"></i> <%= l(:label_statistics) %>
@ -64,3 +65,4 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<% end -%>
<% end %>

4
app/views/repositories/annotate.html.erb
Unescape View File

@ -27,9 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<%= render :partial => 'navigation' %>
<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= render :partial => 'navigation', locals: { merge: { kind: 'file' } } %>
<p><%= render :partial => 'link_to_functions' %></p>
<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
<div class="autoscroll">

8
app/views/repositories/changes.html.erb
Unescape View File

@ -29,13 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<%= render :partial => 'navigation' %>
<h2>
<%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %>
</h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= render :partial => 'navigation', locals: { merge: { kind: (@entry ? @entry.kind : nil) } } %>
<p><%= render :partial => 'link_to_functions' %></p>

2
app/views/repositories/committers.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(:label_repository) %></h2>
<%= toolbar title: l(:label_repository) %>
<%= simple_format(l(:text_repository_usernames_mapping)) %>
<% if @committers.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>

19
app/views/repositories/diff.html.erb
Unescape View File

@ -27,27 +27,16 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<li>
<!-- Choose view type -->
<%= form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
<%= toolbar title: "#{l(:label_revision)} #{@diff_format_revisions} #{h @path}" do %>
<li class="toolbar-item">
<%= form_tag({path: to_path_param(@path)}, method: :get) do %>
<%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
<%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
<span class='legacy-actions--inline-label'>
<label class='form-label -transparent'><%= l(:label_view_diff) %></label>
<%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
</span>
<%= styled_select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %>
<% end %>
</li>
<% end %>
<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<span class="clear"></span>
<% cache(@cache_key) do -%>
<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
<% end -%>

6
app/views/repositories/entry.html.erb
Unescape View File

@ -29,11 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<%= render :partial => 'navigation' %>
<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= render :partial => 'navigation', locals: { merge: { kind: 'file'} } %>
<p><%= render :partial => 'link_to_functions' %></p>

4
app/views/repositories/revision.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :toolbar do %>
<%= toolbar title: "#{l(:label_revision)} #{format_revision(@changeset)}" do %>
<li class="toolbar-item">
<% if @changeset.previous.nil? %>
<button class="button" disabled="disabled"><%= l(:label_previous) %></button>
@ -48,8 +48,6 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
</li>
<% end %>
<h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
<%= render :partial => 'layouts/toolbar' %>
<p><% if @changeset.scmid %>ID: <%= h(@changeset.scmid) %><br />
<% end %>
<span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p>

4
app/views/repositories/revisions.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :toolbar do %>
<%= toolbar title: l(:label_revision_plural) do %>
<%= form_tag({ action: 'revision', id: @project }, { method: :get }) do %>
<li class="toolbar-item">
<%= label_tag :rev, l(:label_revision), class: 'hidden-for-sighted' %>
@ -37,8 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.
</li>
<% end %>
<% end %>
<h2><%= l(:label_revision_plural) %></h2>
<%= render :partial => 'layouts/toolbar' %>
<%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
<%= pagination_links_full @changesets %>
<% content_for :header_tags do %>

6
app/views/repositories/show.html.erb
Unescape View File

@ -29,11 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
<%= render :partial => 'navigation' %>
<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
<%= render :partial => 'layouts/toolbar' %>
<%= render :partial => 'navigation', locals: { merge: { kind: 'dir' } } %>
<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
<%= render :partial => 'dir_list' %>

2
app/views/repositories/stats.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(:label_statistics) %></h2>
<%= toolbar title: l(:label_statistics) %>
<p>
<%= tag("embed", :width => 800,

5
app/views/roles/edit.html.erb
Unescape View File

@ -27,9 +27,10 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Role.model_name.human} #{@role.name}" %>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Role.model_name.human} #{h @role.name}" %>
<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{@role.name}" %>
<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=h @role.name %></h2>
<%= labelled_tabular_form_for @role, :html => { :id => 'role_form' }, :as => :role do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

9
app/views/roles/index.html.erb
Unescape View File

@ -28,10 +28,15 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
<% end %>
<% html_title l(:label_administration), l("label_role_plural") %>
<h2><%=l(:label_role_plural)%></h2>
<%= toolbar title: l(:label_role_plural) do %>
<li class="toolbar-item">
<%= link_to new_role_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_role_new) %>
<% end %>
</li>
<% end %>
<%= render :partial => 'layouts/action_menu_specific' %>
<table class="list">
<thead>

2
app/views/roles/new.html.erb
Unescape View File

@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l(:label_administration), l("label_group_new") %>
<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_role_new)%></h2>
<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{l(:label_role_new)}" %>
<%= labelled_tabular_form_for @role, :html => {:id => 'role_form'}, :as => :role do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

2
app/views/roles/report.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_permissions_report)%></h2>
<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{l(:label_permissions_report)}" %>
<%= form_tag(roles_path, :method => :put, :id => 'permissions_form') do %>
<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
<div class="autoscroll">

2
app/views/search/index.html.erb
Unescape View File

@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% content_for :header_tags do %>
<%= call_hook :search_index_head %>
<% end %>
<h2><%= l(:label_search) %></h2>
<%= toolbar title: l(:label_search) %>
<%= styled_form_tag(search_path(@project), :method => :get) do %>
<fieldset class="simple-filters--container" id="search-filter">
<ul class="simple-filters--filters">

2
app/views/settings/edit.html.erb
Unescape View File

@ -29,6 +29,6 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l(:label_administration), l(:label_settings) -%>
<h2><%= l(:label_settings) %></h2>
<%= toolbar title: l(:label_settings) %>
<%= render_tabs administration_settings_tabs %>

2
app/views/settings/plugin.html.erb
Unescape View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
<%= toolbar title: "#{l(:label_settings)}: #{h @plugin.name}" %>
<div id="settings">
<%= styled_form_tag({:action => 'plugin'}) do %>
<div class="box">

5
app/views/statuses/edit.html.erb
Unescape View File

@ -27,9 +27,8 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Status.model_name.human} #{@status.name}" %>
<h2><%= link_to l(:label_work_package_status_plural), :controller => '/statuses', :action => 'index' %> &#187; <%=h @status %></h2>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Status.model_name.human} #{h @status.name}" %>
<%= toolbar title: "#{link_to l(:label_work_package_status_plural), new_status_path} &raquo; #{h @status.name}"%>
<%= labelled_tabular_form_for(@status) do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

20
app/views/statuses/index.html.erb
Unescape View File

@ -27,13 +27,21 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to l(:label_work_package_status_new), new_status_path, :class => 'icon icon-add' %>
<%= link_to(l(:label_update_work_package_done_ratios), update_work_package_done_ratio_statuses_path, :class => 'icon icon-reload2', :method => 'post', :confirm => l(:text_are_you_sure)) if WorkPackage.use_status_for_done_ratio? %>
<% end %>
<% html_title l(:label_administration), l(:label_work_package_status_plural) -%>
<h2><%=l(:label_work_package_status_plural)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_work_package_status_plural) do %>
<li class="toolbar-item">
<%= link_to new_status_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_work_package_status_new) %>
<% end %>
</li>
<% if WorkPackage.use_status_for_done_ratio? %>
<li class="toolbar-item">
<%= link_to update_work_package_done_ratio_statuses_path, class: 'button', remote: true, method: :post, data: { confirm: l(:text_are_you_sure) } do %>
<i class="button--icon icon-reload2"></i> <%= l(:label_update_work_package_done_ratios) %>
<% end %>
</li>
<% end %>
<% end %>
<table class="list">
<thead>
<tr>

3
app/views/statuses/new.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_work_package_status_new) %>
<h2><%= link_to l(:label_work_package_status_plural), :controller => '/statuses', :action => 'index' %> &#187; <%=l(:label_work_package_status_new)%></h2>
<%= toolbar title: "#{link_to l(:label_work_package_status_plural), new_status_path} &raquo; #{l(:label_work_package_status_new)}"%>
<%= labelled_tabular_form_for(@status) do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

19
app/views/time_entries/reports/show.html.erb
Unescape View File

@ -27,18 +27,17 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to_if User.current.allowed_to?({ :controller => '/timelog', :action => 'new' }, @project),
l(:button_log_time),
polymorphic_new_time_entry_path(@issue || @project),
:class => 'icon icon-time' %>
<% end %>
<%= render_timelog_breadcrumb %>
<h2><%= l(:label_spent_time) %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_spent_time) do %>
<% if User.current.allowed_to?({controller: 'timelog', action: :new}, @project) %>
<li class="toolbar-item">
<%= link_to polymorphic_new_time_entry_path(@issue || @project), class: 'button' do %>
<span class="button--text"><i class="button--icon icon-time"></i> <%= l(:button_log_time) %></span>
<% end %>
</li>
<% end %>
<% end %>
<%= styled_form_tag(polymorphic_time_entries_report_path(@issue || @project), :method => :get, :id => 'query_form') do %>
<% @criterias.each do |criteria| %>

6
app/views/timelines/confirm_destroy.html.erb
Unescape View File

@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title I18n.t("timelines.delete_timeline", :timeline => @timeline.name) %>
<%= toolbar title: h(@timeline.name) %>
<%= labelled_tabular_form_for @timeline,
:url => project_timeline_path(@project, @timeline),
:html => {:method => 'delete'} do |f| %>
@ -37,10 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= l('timelines.really_delete_timeline') %>
</div>
<h2>
<%=h @timeline.name %>
</h2>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%= l('timelines.properties') %></legend>

6
app/views/timelines/edit.html.erb
Unescape View File

@ -26,10 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title I18n.t("timelines.edit_timeline", :timeline => @timeline.name) %>
<h2>
<%=I18n.t("timelines.edit_timeline", :timeline => @timeline.name)%>
</h2>
<% html_title I18n.t("timelines.edit_timeline", :timeline => h(@timeline.name)) %>
<%= toolbar title: I18n.t("timelines.edit_timeline", :timeline => h(@timeline.name)) %>
<%= labelled_tabular_form_for(@timeline,
:url => project_timeline_path(@project, @timeline),

3
app/views/timelines/new.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l("timelines.new_timeline") %>
<h2><%=l('timelines.new_timeline')%></h2>
<%= toolbar title: l('timelines.new_timeline') %>
<%= labelled_tabular_form_for(@timeline,
:url => project_timelines_path,

50
app/views/timelines/show.html.erb
Unescape View File

@ -27,37 +27,33 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title "#{l('timelines.project_menu.timelines')}: #{@timeline.name}" %>
<% content_for :action_menu_specific do %>
<%= li_unless_nil(link_to_if_authorized(l('timelines.new_timeline'),
{:controller => '/timelines', :action => 'new', :project_id => @project},
:title => l('timelines.new_timeline'),
:class => 'icon icon-add')) %>
<% html_title "#{l('timelines.project_menu.timelines')}: #{h @timeline.name}" %>
<%= toolbar title: h(@timeline.name) do %>
<% if timeline_action_authorized?(:new) %>
<li class="toolbar-item">
<%= new_timeline_link @project do %>
<i class="button--icon icon-add"></i> <%= l('timelines.new_timeline') %><span class='hidden-for-sighted'><%= h(@timeline.name) %></span>
<% end %>
</li>
<% end %>
<%= li_unless_nil(link_to_if_authorized({:controller => '/timelines',
:action => 'edit',
:project_id => @project,
:id => @timeline},
:class => 'icon icon-edit',
:accesskey => accesskey(:edit)) do %>
<%= l(:button_edit) %><span class='hidden-for-sighted'><%= h(@timeline.name) %></span>
<% end) %>
<% if timeline_action_authorized?(:edit) %>
<li class="toolbar-item">
<%= edit_timeline_link @project, @timeline do %>
<i class="button--icon icon-edit"></i> <%= l(:button_edit) %><span class='hidden-for-sighted'><%= h(@timeline.name) %></span>
<% end %>
</li>
<% end %>
<%= li_unless_nil(link_to_if_authorized({:controller => '/timelines',
:action => 'confirm_destroy',
:project_id => @project,
:id => @timeline},
:class => 'icon icon-delete') do %>
<%= l(:button_delete) %><span class='hidden-for-sighted'><%= h(@timeline.name) %></span>
<% end) %>
<% if timeline_action_authorized?(:destroy) %>
<li class="toolbar-item">
<%= destroy_timeline_link @project, @timeline do %>
<i class="button--icon icon-delete"></i> <%= l(:button_delete) %><span class='hidden-for-sighted'><%= h(@timeline.name) %></span>
<% end %>
</li>
<% end %>
<% end %>
<h2><%= @timeline.name %></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<div id="timeline">
<%= form_tag '', {:id => "specialForm", 'ng-controller' => 'TimelineSelectionController'} do %>
<span class="inline-label">

2
app/views/timelog/edit.html.erb
Unescape View File

@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<h2><%= l(:label_spent_time) %></h2>
<%= toolbar title: l(:label_spent_time) %>
<%= labelled_tabular_form_for [@time_entry.project, @time_entry], as: :time_entry do |f| %>
<%= error_messages_for 'time_entry' %>
<%= back_url_hidden_field_tag %>

18
app/views/timelog/index.html.erb
Unescape View File

@ -29,18 +29,18 @@ See doc/COPYRIGHT.rdoc for more details.
<%= include_gon %>
<% content_for :action_menu_specific do %>
<%= link_to_if User.current.allowed_to?({ :controller => '/timelog', :action => 'new' }, @project),
l(:button_log_time),
polymorphic_new_time_entry_path(@issue || @project),
:class => 'icon icon-time' %>
<% end %>
<%= render_timelog_breadcrumb %>
<h2><%= l(:label_spent_time) %></h2>
<%= toolbar title: l(:label_spent_time) do %>
<% if User.current.allowed_to?({controller: :timelog, action: :new}, @project) %>
<li class="toolbar-item">
<%= link_to polymorphic_new_time_entry_path(@issue || @project), class: 'button' do %>
<span class="button--text"><i class="button--icon icon-time"></i> <%= l(:button_log_time) %></span>
<% end %>
</li>
<% end %>
<% end %>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= form_tag(polymorphic_path([@issue || @project, :time_entries]), :method => :get, :id => 'query_form') do %>
<%= render :partial => 'date_range' %>

4
app/views/types/edit.html.erb
Unescape View File

@ -27,9 +27,9 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Type.model_name.human} #{@type.name}" %>
<% html_title l(:label_administration), "#{l(:label_edit)} #{Type.model_name.human} #{h @type.name}" %>
<h2><%= link_to t(:label_type_plural), types_path %> &#187; <%= @type.name %></h2>
<%= toolbar title: "#{link_to t(:label_type_plural), types_path} &raquo; #{h @type.name}" %>
<%= form_for @type, builder: TabularFormBuilder, lang: current_language do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

17
app/views/types/index.html.erb
Unescape View File

@ -27,17 +27,14 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% content_for :action_menu_specific do %>
<%= link_to l(:label_type_new), {:action => 'new'}, :class => 'icon icon-add' %>
<% end %>
<% html_title l(:label_administration), l("label_type_plural") %>
<h2><%=l(:label_type_plural)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %>
<%= toolbar title: l(:label_type_plural) do %>
<li class="toolbar-item">
<%= link_to new_type_path, class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <%= l(:label_type_new) %>
<% end %>
</li>
<% end %>
<table class="list timelines-pet">
<thead>

3
app/views/types/new.html.erb
Unescape View File

@ -28,8 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_type_new) %>
<h2><%= link_to t(:label_type_plural), types_path %> &#187; <%= t(:label_type_new) %></h2>
<%= toolbar title: "#{link_to t(:label_type_plural), types_path} &raquo; #{t(:label_type_new)}" %>
<%= form_for controller.type, builder: TabularFormBuilder, lang: current_language do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save