Merge release/5.0 into dev

pull/6827/head
Oliver Günther 9 years ago
commit b4d7457f39
  1. 7
      Gemfile.plugins
  2. 10
      app/views/my_projects_overviews/blocks/_members.html.erb

@ -0,0 +1,7 @@
# Used by travis to bundle this plugin with the OpenProject core.
# The tested plugin will be moved to the path `./plugins/this`
# whereas OpenProject will be checked out to `.`.
gem 'openproject-my_project_page', path: 'plugins/this'
# If the plugin has any dependencies declare them here:

@ -25,7 +25,7 @@ See doc/COPYRIGHT.md for more details.
<h3 class="widget-box--header"> <h3 class="widget-box--header">
<span class="icon-context icon-group"></span> <span class="icon-context icon-group"></span>
<span class="widget-box--header-title"><%=l(:label_member_plural)%></span> <span class="widget-box--header-title"><%=t(:label_member_plural)%></span>
</h3> </h3>
<% if @project.members.count > 0 && users_by_role(50).any? %> <% if @project.members.count > 0 && users_by_role(50).any? %>
@ -44,10 +44,10 @@ See doc/COPYRIGHT.md for more details.
<% end %> <% end %>
</p> </p>
</div> </div>
<% if current_user.admin? %> <% end %>
<%= link_to new_user_path, class: 'button -alt-highlight' do %> <% if current_user.admin? %>
<%= link_to new_project_member_path(project_id: project.identifier), class: 'button -alt-highlight' do %>
<i class="button--icon icon-add"></i> <i class="button--icon icon-add"></i>
<span class="button--text"><%= l('activerecord.models.member') %></span> <span class="button--text"><%= t('activerecord.models.member') %></span>
<% end %>
<% end %> <% end %>
<% end %> <% end %>

Loading…
Cancel
Save