consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into admin-profiles

Browse Source
This commit is contained in:
decabeza
2017-10-25 18:29:01 +02:00
parent b7b0651ccb ac957c53a3
commit 9ba96becd2
85 changed files with 1547 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/admin/managers/_manager.html.erb
View File

@@ -1,27 +0,0 @@
<table>
<thead>
<th scope="col"><%= t("admin.managers.index.name") %></th>
<th scope="col"><%= t("admin.managers.index.email") %></th>
<th scope="col" class="small-3"><%= t("admin.shared.actions") %></th>
</thead>
<tr>
<td>
<%= manager.name %>
</td>
<td>
<%= manager.email %>
</td>
<td>
<% if manager.persisted? %>
<%= link_to t('admin.managers.manager.delete'),
admin_manager_path(manager),
method: :delete,
class: "button hollow alert expanded"
%>
<% else %>
<%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id },
method: :post, class: "button success expanded" %>
<% end %>
</td>
</tr>
</table>

21
app/views/admin/managers/index.html.erb
View File

@@ -1,17 +1,6 @@
<h2><%= t("admin.managers.index.title") %></h2>
<div class="small-12 medium-6">
<%= form_tag search_admin_managers_path, method: :get, remote: true do %>
<div class="input-group">
<%= text_field_tag :email, '', placeholder: t('admin.managers.search.email_placeholder') %>
<div class="input-group-button">
<%= submit_tag t('admin.managers.search.search'), class: 'button' %>
</div>
</div>
<% end %>
</div>
<div id="search-result"></div>
<%= render 'admin/shared/user_search', url: search_admin_managers_path %>
<div id="managers">
<% if @managers.any? %>
@@ -40,8 +29,12 @@
class: "button hollow alert expanded"
%>
<% else %>
<%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id },
method: :post, class: "button success expanded" %>
<%= link_to t('admin.managers.manager.add'),
{ controller: "admin/managers",
action: :create,
user_id: manager.user_id },
method: :post,
class: "button success expanded" %>
<% end %>
</td>
</tr>

29
app/views/admin/managers/search.html.erb Normal file
View File

@@ -0,0 +1,29 @@
<h2><%= t("admin.managers.search.title") %></h2>
<%= render 'admin/shared/user_search', url: search_admin_managers_path %>
<h3><%= page_entries_info @users %></h3>
<table id="managers">
<% @users.each do |user| %>
<tr>
<td><%= user.name %></td>
<td><%= user.email %></td>
<td class="text-right">
<% if user.manager? && user.manager.persisted? %>
<%= link_to t('admin.managers.manager.delete'),
admin_manager_path(user),
method: :delete,
class: "button hollow alert" %>
<% else %>
<%= link_to t('admin.managers.manager.add'),
{ controller: "admin/managers",
action: :create,
user_id: user },
method: :post,
class: "button success" %>
<% end %>
</td>
</tr>
<% end %>
</table>

1
app/views/admin/managers/search.js.erb
View File

@@ -1 +0,0 @@
$("#search-result").html("<%= j render 'manager', manager: @manager %>");

1
app/views/admin/managers/user_not_found.js.erb
View File

@@ -1 +0,0 @@
$("#search-result").html("<div class=\"callout alert\"><%= j t('admin.managers.search.user_not_found') %></div>");