diff options
| -rw-r--r-- | app/views/organisations/show.html.erb | 10 | ||||
| -rw-r--r-- | app/views/users/_user.html.erb | 22 |
2 files changed, 24 insertions, 8 deletions
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb index 263933bc1..c67eeb271 100644 --- a/app/views/organisations/show.html.erb +++ b/app/views/organisations/show.html.erb @@ -5,14 +5,8 @@ </p> </div> -<div class="users"> - <% @organisation.users.each do |user| %> - <%= div_for user do %> - <%= user_gravatar_image_tag user %> - <%= link_to user.name, organisation_user_path(user) %> - <div class="info"><%= user.email %></div> - <% end %> - <% end %> +<div class="users paginated_content"> + <%= paginated_content(@organisation.users, "users/user") %> </div> <% content_for :sidebar do %> diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb new file mode 100644 index 000000000..3f70e8479 --- /dev/null +++ b/app/views/users/_user.html.erb @@ -0,0 +1,22 @@ +<div id="index_item" class="panel panel-default user"> + <div class="panel-heading"> + <div class="panel-title clearfix"> + <span class="pull-right"> + <%= link_to edit_organisation_user_path( user), :class => "btn btn-default btn-sm" do %> + <span class="fa fa-pencil"></span> + <% end %> + <%= link_to organisation_user_path(user), :method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> + <span class="fa fa-trash-o"></span> + <% end %> + </span> + <h5> + <%= link_to( organisation_user_path(user), :class => "preview", :title => "#{User.model_name.human.capitalize} #{user.email}") do %> + <%= user_gravatar_image_tag(user, 20) %> + <span class="name"> + <%= truncate(user.email, :length => 20) %> + </span> + <% end %> + </h5> + </div> + </div> +</div> |