diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb deleted file mode 100644 index 62038b817..000000000 --- a/app/views/sessions/new.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -
- <%= form_tag sessions_path, :class => 'default-form' do %> - <%= error_messages_for :session %> -
-

<%= t("login.details") %>

- -

- <%= label_tag "user_name", t("login.username") %> - <%= text_field_tag "user_name" %> -

- -

- <%= label_tag "password", t('login.password.label') %> - <%= password_field_tag "password" %> -

- -
- <%= submit_button t("buttons.login") %> -
-
- <%= link_to t("login.password.reset"), :controller => "password_recovery_requests", :action => "new" %> - <% end %> -
\ No newline at end of file diff --git a/app/views/sessions/new.html.slim b/app/views/sessions/new.html.slim new file mode 100644 index 000000000..8e161dcc5 --- /dev/null +++ b/app/views/sessions/new.html.slim @@ -0,0 +1,14 @@ +.login_page + = form_tag sessions_path, :class => 'default-form' do + = error_messages_for :session + .login_panel + h3= t("login.details") + p + = label_tag "user_name", t("login.username") + = text_field_tag "user_name" + p + = label_tag "password", t('login.password.label') + = password_field_tag "password" + .btn_panel + = submit_button t("buttons.login") + = link_to t("login.password.reset"), :controller => "password_recovery_requests", :action => "new" diff --git a/app/views/users/_devices.html.erb b/app/views/users/_devices.html.erb deleted file mode 100644 index f2248d560..000000000 --- a/app/views/users/_devices.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -
-

Devices

- - - - - - - - - <% devices.each do |device| %> - - - - - <% end %> - -
IMEIBlacklisted?
- <%= device.imei %> - - <%= hidden_field_tag "user[devices][][imei]", device.imei %> - <%= hidden_field_tag "user[devices][][user_name]", device.user_name %> - <%= check_box_tag "user[devices][][blacklisted]", true, device.blacklisted?, :class => "blacklisted-checkbox-#{device.imei}" %> -
-
diff --git a/app/views/users/_devices.html.slim b/app/views/users/_devices.html.slim new file mode 100644 index 000000000..64f2e80be --- /dev/null +++ b/app/views/users/_devices.html.slim @@ -0,0 +1,17 @@ +fieldset + h3 Devices + table.devices + thead + tr + th IMEI + th Blacklisted? + tbody + - devices.each do |device| + tr id="device-imei-#{device.imei}" + td + = device.imei + td + = hidden_field_tag "user[devices][][imei]", device.imei + = hidden_field_tag "user[devices][][user_name]", device.user_name + = check_box_tag "user[devices][][blacklisted]", true, device.blacklisted?, :class => "blacklisted-checkbox-#{device.imei}" + diff --git a/app/views/users/_editable_user.html.erb b/app/views/users/_editable_user.html.erb deleted file mode 100644 index 5f64c77bc..000000000 --- a/app/views/users/_editable_user.html.erb +++ /dev/null @@ -1,110 +0,0 @@ - - -<% if flash[:verify] %> -
-

<%= flash[:verify] %>

-
-<% end %> -<%= form_for editable_user, :html => {:class => ''} do |f| %> - <%= f.error_messages :header_tag => :h3 %> - <% trying_to_edit_ourself = editing_ourself?(editable_user) %> - - -
* <%= t("mandatory_field") %>
-
-
-

- <%= f.label :full_name, t("user.full_name"), :class=>'key' %> - <%= f.text_field :full_name, :autocomplete => "off"%>* -

- -

- <%= f.label :user_name, t("login.username"), :class=>'key' %> - <%= f.text_field :user_name, :disabled => !editable_user.new_record?, :autocomplete => "off" %>* - <%= t("user.no_blank") %> -

- -

- <%= f.label :password, t('login.password.label'), :class=>'key' %> - <%= f.password_field :password, :autocomplete => "off" %>* -

- -

- <%= f.label :password_confirmation,t("login.password.re_enter"), :class=>'key' %> - <%= f.password_field :password_confirmation, :autocomplete => "off" %>* -

- - <% if !trying_to_edit_ourself %> -

- - <% @roles.each do |role| %> - <%= f.check_box :role_ids, {:id => "user_#{role.name}", :name => "user[role_ids][]"}, role.id, "" %> - <%= f.label role.name %> - <% end %> -

- <% end %> - -

- <%= f.label :phone, t("phone"), :class=>'key' %> - <%= f.text_field :phone %> -

-

- <%= f.label :email, t("email"), :class=>'key' %> - <%= f.text_field :email %> -

- -

- <%= f.label :organisation, t("organisation"), :class=>'key' %> - <%= f.text_field :organisation %>* -

- -

- <%= f.label :position, t("position"), :class=>'key' %> - <%= f.text_field :position %> -

- -

- <%= f.label :location, t("location"), :class=>'key' %> - <%= f.text_field :location %> -

- - <% if !trying_to_edit_ourself && can?(:disable, @user) %> -

- <%= f.label :disabled, t("user.disabled"), :class=>'key' %> - <%= f.check_box :disabled, {}, "true", "false" %> -

- <% end %> - - <%= f.hidden_field :verified, :value => true %> - -
- -
- - <%= cancel_button(users_path) %> - <%= submit_button(editable_user.new_record? ? t("user.create") : (params[:verify] ? t('user.verify') : t('user.update'))) %> -
-<% end %> diff --git a/app/views/users/_editable_user.html.slim b/app/views/users/_editable_user.html.slim new file mode 100644 index 000000000..dc9035000 --- /dev/null +++ b/app/views/users/_editable_user.html.slim @@ -0,0 +1,81 @@ +script charset="utf-8" type="text/javascript" + | function confirmBlacklisted() { + | $(".devices :checkbox").each(function () { + | if (this.checked && !this.defaultChecked) + | return confirm(I18n.t("devices.message.disable")); + | }); + | return true; + | } + + | function confirmDisable() { + | var checkbox = $("#user_disabled")[0]; + | if (checkbox.checked && !checkbox.defaultChecked) { + | return confirm(I18n.t("users.messages.disable")); + | } + | return true; + | } + + | $(document).ready(function () { + | $("form").submit(function () { + | return (confirmDisable() && confirmBlacklisted()); + | }); + | }); +- if flash[:verify] + .flash + p.notice= flash[:verify] += form_for editable_user, :html => {:class => ''} do |f| + = f.error_messages :header_tag => :h3 + - trying_to_edit_ourself = editing_ourself?(editable_user) + .mandate_panel + span * + = t("mandatory_field") + .clearfix + fieldset + p + = f.label :full_name, t("user.full_name"), :class=>'key' + = f.text_field :full_name, :autocomplete => "off" + | * + p + = f.label :user_name, t("login.username"), :class=>'key' + = f.text_field :user_name, :disabled => !editable_user.new_record?, :autocomplete => "off" + | * + span.footnote= t("user.no_blank") + p + = f.label :password, t('login.password.label'), :class=>'key' + = f.password_field :password, :autocomplete => "off" + | * + p + = f.label :password_confirmation,t("login.password.re_enter"), :class=>'key' + = f.password_field :password_confirmation, :autocomplete => "off" + | * + - if !trying_to_edit_ourself + p + label.key= t("roles.label") + - @roles.each do |role| + = f.check_box :role_ids, {:id => "user_#{role.name}", :name => "user[role_ids][]"}, role.id, "" + = f.label role.name + p + = f.label :phone, t("phone"), :class=>'key' + = f.text_field :phone + p + = f.label :email, t("email"), :class=>'key' + = f.text_field :email + p + = f.label :organisation, t("organisation"), :class=>'key' + = f.text_field :organisation + | * + p + = f.label :position, t("position"), :class=>'key' + = f.text_field :position + p + = f.label :location, t("location"), :class=>'key' + = f.text_field :location + - if !trying_to_edit_ourself && can?(:disable, @user) + p + = f.label :disabled, t("user.disabled"), :class=>'key' + = f.check_box :disabled, {}, "true", "false" + = f.hidden_field :verified, :value => true + .btn_panel + /! TODO: After we got the user object in the session replace the DB query with User object + = cancel_button(users_path) + = submit_button(editable_user.new_record? ? t("user.create") : (params[:verify] ? t('user.verify') : t('user.update'))) diff --git a/app/views/users/_mobile_login_history.html.erb b/app/views/users/_mobile_login_history.html.erb deleted file mode 100644 index 9b0505898..000000000 --- a/app/views/users/_mobile_login_history.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -
-

<%= I18n.t("device.information") %>

- - - - - - - - - <% @user.mobile_login_history.reverse.each do |event| %> - - - - - - <% end %> - -
<%= I18n.t("device.timestamp") %><%= I18n.t("imei") %><%= I18n.t("device.mobile_number") %>
<%= event[:timestamp].in_time_zone(@user.time_zone) %><%= event[:imei] %><%= event[:mobile_number] %>
- -
\ No newline at end of file diff --git a/app/views/users/_mobile_login_history.html.slim b/app/views/users/_mobile_login_history.html.slim new file mode 100644 index 000000000..3f5b0a162 --- /dev/null +++ b/app/views/users/_mobile_login_history.html.slim @@ -0,0 +1,12 @@ +.device-information + h3= I18n.t("device.information") + table + tr + th= I18n.t("device.timestamp") + th= I18n.t("imei") + th= I18n.t("device.mobile_number") + - @user.mobile_login_history.reverse.each do |event| + tr + td= event[:timestamp].in_time_zone(@user.time_zone) + td= event[:imei] + td= event[:mobile_number] diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb deleted file mode 100644 index dd201276f..000000000 --- a/app/views/users/_user.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - <%= h user.full_name %> - <%= h user.user_name %> - - <% if can?(:disable, user) %> - - <%= render :partial => 'user_disabled_checkbox', :locals => {:user => user} %> - - <% end %> - <% if can? :show, User %> - <%= link_to t("users.actions.show"), user %> - <% end %> - <% if can? :edit, User %> - <%= link_to t("buttons.edit"), edit_user_path(user) %> - <% end %> - <% if can? :destroy, User %> - - <% if current_user_name != user.user_name %> - <%= link_to t("user.actions.delete"), user, method: :delete, data: { confirm: t("user.messages.confirmation") } %> - <% end %> - <% end %> - - diff --git a/app/views/users/_user.html.slim b/app/views/users/_user.html.slim new file mode 100644 index 000000000..c827096cb --- /dev/null +++ b/app/views/users/_user.html.slim @@ -0,0 +1,15 @@ +tr id="user-row-#{user.user_name}" + td.full_name= h user.full_name + td.user-name= h user.user_name + - if can?(:disable, user) + td.user-status + = render :partial => 'user_disabled_checkbox', :locals => {:user => user} + - if can? :show, User + td= link_to t("users.actions.show"), user + - if can? :edit, User + td= link_to t("buttons.edit"), edit_user_path(user) + - if can? :destroy, User + td + - if current_user_name != user.user_name + = link_to t("user.actions.delete"), user, method: :delete, data: { confirm: t("user.messages.confirmation") } + diff --git a/app/views/users/_user_disabled_checkbox.html.erb b/app/views/users/_user_disabled_checkbox.html.erb deleted file mode 100644 index 3846d0ca9..000000000 --- a/app/views/users/_user_disabled_checkbox.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if current_user_name != user.user_name %> - - /> -<% else %> - <%= h t("enabled") %> -<% end %> diff --git a/app/views/users/_user_disabled_checkbox.html.slim b/app/views/users/_user_disabled_checkbox.html.slim new file mode 100644 index 000000000..bdc290e37 --- /dev/null +++ b/app/views/users/_user_disabled_checkbox.html.slim @@ -0,0 +1,6 @@ +- if current_user_name != user.user_name + | - <%= t("user.full_name") %> - <%= t("login.username") %> - <% if can?(:disable, User) %> - <%= t("user.disabled") %> - <% end %> - <% if can? :show, User %> - - <% end %> - <% if can? :edit, User %> - - <% end %> - <% if can? :destroy, User %> - - <% end %> - diff --git a/app/views/users/_users_header.html.slim b/app/views/users/_users_header.html.slim new file mode 100644 index 000000000..82ffd587e --- /dev/null +++ b/app/views/users/_users_header.html.slim @@ -0,0 +1,11 @@ +tr + th= t("user.full_name") + th= t("login.username") + - if can?(:disable, User) + th= t("user.disabled") + - if can? :show, User + th + - if can? :edit, User + th + - if can? :destroy, User + th diff --git a/app/views/users/_users_table.html.erb b/app/views/users/_users_table.html.erb deleted file mode 100644 index 5d5ee1f04..000000000 --- a/app/views/users/_users_table.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -

<%= t("users.label") %>

- -<% if can? :create,User %> - <%= link_to content_tag(:span, t("users.create"), :class => 'create_user'), new_user_path, :class => 'btn' %> -<% end %> -
- -
-
<%= t("users.actions.show_all") %> <%= pluralize(@users.length, t("user.label")) %>
-
<%= t("users.actions.show") %>: <%= select_tag :filter, options_for_select([[t("children.filer_by.active"),"active"],[ t("children.filer_by.all"), "all" ]], params[:filter]), { :onchange => "this.form.submit();"} %>
-
<%= t("users.sort_by.label") %>: <%= select_tag :sort, options_for_select([[t("users.sort_by.full_name"),"full_name"],[ t("login.username"), "user_name"]], params[:sort]), { :onchange => "this.form.submit();"} %>
-
- - - - <%= render :partial => 'users_header' %> - - - <%= render :partial => 'user', :collection => @users %> - -
diff --git a/app/views/users/_users_table.html.slim b/app/views/users/_users_table.html.slim new file mode 100644 index 000000000..94b266cd2 --- /dev/null +++ b/app/views/users/_users_table.html.slim @@ -0,0 +1,22 @@ +h2= t("users.label") +- if can? :create,User + = link_to content_tag(:span, t("users.create"), :class => 'create_user'), new_user_path, :class => 'btn' +.clearfix +form.filter_bar + .show_count + = t("users.actions.show_all") + = " " + = pluralize(@users.length, t("user.label")) + .float_left + = t("users.actions.show") + | : #{select_tag :filter, options_for_select([[t("children.filer_by.active"),"active"],[ t("children.filer_by.all"), "all" ]], params[:filter]), { :onchange => "this.form.submit();"}} + .float_left + = t("users.sort_by.label") + | : #{select_tag :sort, options_for_select([[t("users.sort_by.full_name"),"full_name"],[ t("login.username"), "user_name"]], params[:sort]), { :onchange => "this.form.submit();"}} +table#users.list_table + thead + thead + = render :partial => 'users_header' + tbody + = render :partial => 'user', :collection => @users + diff --git a/app/views/users/change_password.html.erb b/app/views/users/change_password.html.erb deleted file mode 100644 index e0f744ad3..000000000 --- a/app/views/users/change_password.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -

<%=I18n.t("user.manage_password")%>

-
- -
- - <%= form_for @change_password_request, :url => update_password_users_path, :html => { :class => '' } do |f| %> - <%= f.error_messages :header_tag => :h3 %> - <% @change_password_request.errors.clear %> - -
-

- <%= f.label :old_password, I18n.t("user.old_password"), :class => 'key' %> - <%= f.password_field :old_password %> -

- -

- <%= f.label :new_password, I18n.t("user.new_password"), :class => 'key' %> - <%= f.password_field :new_password %> -

- -

- <%= f.label :new_password_confirmation, I18n.t("user.new_password_confirmation"), :class => 'key' %> - <%= f.password_field :new_password_confirmation %> -

-
- -
- <%= submit_button I18n.t("buttons.save") %> -
- - <% end %> - -
- -
\ No newline at end of file diff --git a/app/views/users/change_password.html.slim b/app/views/users/change_password.html.slim new file mode 100644 index 000000000..426a7f98f --- /dev/null +++ b/app/views/users/change_password.html.slim @@ -0,0 +1,18 @@ +h1.no_border= I18n.t("user.manage_password") +.page-content-new + .side-tab-content.full_width + = form_for @change_password_request, :url => update_password_users_path, :html => { :class => '' } do |f| + = f.error_messages :header_tag => :h3 + - @change_password_request.errors.clear + fieldset + p + = f.label :old_password, I18n.t("user.old_password"), :class => 'key' + = f.password_field :old_password + p + = f.label :new_password, I18n.t("user.new_password"), :class => 'key' + = f.password_field :new_password + p + = f.label :new_password_confirmation, I18n.t("user.new_password_confirmation"), :class => 'key' + = f.password_field :new_password_confirmation + .btn_panel + = submit_button I18n.t("buttons.save") diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb deleted file mode 100644 index 849bd960d..000000000 --- a/app/views/users/edit.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -

<%= t("users.manage") %>

-
- <%= render :partial => 'shared/side_tab', :locals => {:highlight_page => 'users'} %> -
-

<%= link_to I18n.t("users.label"), users_path %> > <%= @user.user_name %>

- - <%= link_to content_tag(:span, t("user.user_action_history") , :class => 'log'), user_history_path(@user), :class=>'btn' %> -
- - <%= render :partial => "editable_user", :object => @user %> - <%= render :partial => "mobile_login_history", :object => @user %> -
-
diff --git a/app/views/users/edit.html.slim b/app/views/users/edit.html.slim new file mode 100644 index 000000000..e5ce7efce --- /dev/null +++ b/app/views/users/edit.html.slim @@ -0,0 +1,13 @@ +h1.no_border= t("users.manage") +.page-content-new + = render :partial => 'shared/side_tab', :locals => {:highlight_page => 'users'} + .side-tab-content + div + h2 + = link_to I18n.t("users.label"), users_path + | > #{@user.user_name} + = link_to content_tag(:span, t("user.user_action_history") , :class => 'log'), user_history_path(@user), :class=>'btn' + .clearfix + = render :partial => "editable_user", :object => @user + = render :partial => "mobile_login_history", :object => @user + diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb deleted file mode 100644 index 5f3073427..000000000 --- a/app/views/users/index.html.erb +++ /dev/null @@ -1,26 +0,0 @@ - - - - -

<%= t("users.manage") %>

- -
- <%= render :partial => 'shared/side_tab', :locals => {:highlight_page => 'users'} %> -
- <% if @access_error.present? %> - <%= @access_error %> - <% end %> - <% if @users.present? %> - <%= render :partial => 'users_table' %> -

<%= link_to t("buttons.back"), :back %>

- - - -
diff --git a/app/views/users/index.html.slim b/app/views/users/index.html.slim new file mode 100644 index 000000000..0595c389b --- /dev/null +++ b/app/views/users/index.html.slim @@ -0,0 +1,15 @@ +javascript: + | $(function () { + | window.Users.refresh( raw @users_details.to_json ); + | }); +h1= t("users.manage") +.page-content-new + = render :partial => 'shared/side_tab', :locals => {:highlight_page => 'users'} + .side-tab-content + - if @access_error.present? + strong= @access_error + - if @users.present? + = render :partial => 'users_table' + p= link_to t("buttons.back"), :back + #modal-dialog/ + diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index 4f2ffc14c..000000000 --- a/app/views/users/new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

<%= t("users.label") %>

-
- <%= render :partial => 'shared/side_tab', :locals => {:highlight_page => 'users'} %> -
-

<%= link_to t("users.label"), users_path %>> <%= t("users.create") %>

- <%= render :partial => "editable_user", :object => @user %> -
-
diff --git a/app/views/users/new.html.slim b/app/views/users/new.html.slim new file mode 100644 index 000000000..ef2c14d98 --- /dev/null +++ b/app/views/users/new.html.slim @@ -0,0 +1,10 @@ +h1.no_border= t("users.label") +.page-content-new + = render :partial => 'shared/side_tab', :locals => {:highlight_page => 'users'} + .side-tab-content + h2 + = link_to t("users.label"), users_path + | > #{t("users.create")} + = render :partial => "editable_user", :object => @user + + diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb deleted file mode 100644 index 3aeb332d1..000000000 --- a/app/views/users/show.html.erb +++ /dev/null @@ -1,75 +0,0 @@ -

<%= t("users.account_details") %>

-
- <%= render :partial => 'shared/side_tab', :locals => {:highlight_page => ''} %> -
-

<%= link_to(I18n.t("users.label"), users_path) + " > " if can?(:read, User)%> <%= @user.user_name %> - <% if can? :edit, User %> - <%= link_to '('+I18n.t("buttons.edit")+')', edit_user_path(@user), :class => 'edit_crumb'%> - <% else %> - <%= link_to "(" + I18n.t("buttons.change_password") +")", change_password_users_path %> - <% end %> -

- <%= link_to content_tag(:span, t("user.user_action_history") , :class => 'log'), user_history_path(@user), :class=>'btn' %> -
- -
-

- - <%= h @user.full_name %> -

- -

- - <%= h @user.user_name %> -

- -

- - <%= @user.roles.map(&:name).join(",") %> -

- -

- - <%= h @user.phone %> -

- -

- - <%= h @user.email %> -

- -

- - <%= h @user.organisation %> -

- -

- - <%= h @user.position %> -

- -

- - <%= h @user.location %> -

- -

- - <%= h @user.disabled ? t("user.disabled") : t("enabled") %> -

- -

-
- <% @user.devices.each do |device| %> - <% if device.blacklisted? %> - <%= device.imei %> (blacklisted)
- <% else %> - <%= device.imei %>
- <% end %> - <% end %> -

- -
- <%= render :partial => "mobile_login_history", :object => @user %> -
-
diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim new file mode 100644 index 000000000..c31fb1413 --- /dev/null +++ b/app/views/users/show.html.slim @@ -0,0 +1,72 @@ +h1.no_border= t("users.account_details") +.page-content-new + = render :partial => 'shared/side_tab', :locals => {:highlight_page => ''} + .side-tab-content + h2.float_left.no_border + = link_to(I18n.t("users.label"), users_path) + " > " if can?(:read, User) + = @user.user_name + - if can? :edit, User + = link_to '('+I18n.t("buttons.edit")+')', edit_user_path(@user), :class => 'edit_crumb' + - else + = link_to "(" + I18n.t("buttons.change_password") +")", change_password_users_path + = link_to content_tag(:span, t("user.user_action_history") , :class => 'log'), user_history_path(@user), :class=>'btn' + .clearfix + fieldset + p + label.key + = t("name") + | : + = h @user.full_name + p + label.key + = t("login.username") + | : + = h @user.user_name + p + label.key= t("permissions.label") + = @user.roles.map(&:name).join(",") + p + label.key + = t("contact.field.phone") + | : + = h @user.phone + p + label.key + = t("email") + | : + = h @user.email + p + label.key + = t("organisation") + | : + = h @user.organisation + p + label.key + = t("position") + | : + = h @user.position + p + label.key + = t("location") + | : + = h @user.location + p + label.key + = t("status") + | : + = h @user.disabled ? t("user.disabled") : t("enabled") + p + label + = t("devices") + | : + br/ + - @user.devices.each do |device| + - if device.blacklisted? + span.device-blacklisted + = device.imei + | (blacklisted) + br/ + - else + = device.imei + br/ + = render :partial => "mobile_login_history", :object => @user diff --git a/app/views/users/unverified.html.erb b/app/views/users/unverified.html.erb deleted file mode 100644 index 67a045061..000000000 --- a/app/views/users/unverified.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

<%= t("users.unverified") %>

-
- <%= render :partial => 'shared/side_tab', :locals => {:highlight_page => 'unverified'} %> -
- - - - - - - - - - - - <% @users.each do |user|%> - - - - - - - <% end %> - -
<%= t("user.full_name") %><%= t("login.username") %><%= t("organisation") %>
<%= user.full_name %><%= user.user_name %><%= user.organisation %><%= link_to t("user.verify"), edit_user_path(user, {:verify => true}) %>
-
-
diff --git a/app/views/users/unverified.html.slim b/app/views/users/unverified.html.slim new file mode 100644 index 000000000..b7b97939c --- /dev/null +++ b/app/views/users/unverified.html.slim @@ -0,0 +1,20 @@ +h1= t("users.unverified") +.page-content-new + = render :partial => 'shared/side_tab', :locals => {:highlight_page => 'unverified'} + .side-tab-content + table#users.list_table + thead + thead + tr + th= t("user.full_name") + th= t("login.username") + th= t("organisation") + th + tbody + - @users.each do |user| + tr + td= user.full_name + td= user.user_name + td= user.organisation + td= link_to t("user.verify"), edit_user_path(user, verify=true ) + diff --git a/infrastructure b/infrastructure index c7f40625f..bf867af0c 160000 --- a/infrastructure +++ b/infrastructure @@ -1 +1 @@ -Subproject commit c7f40625fc933d4da9250fbf0833cc5b1e57e6ec +Subproject commit bf867af0cbd55bf737f0abf4497c6f440a97c8ca diff --git a/spec/views/sessions/new.html.erb_spec.rb b/spec/views/sessions/new.html.slim_spec.rb similarity index 71% rename from spec/views/sessions/new.html.erb_spec.rb rename to spec/views/sessions/new.html.slim_spec.rb index 4d22d918b..a6c0d8342 100644 --- a/spec/views/sessions/new.html.erb_spec.rb +++ b/spec/views/sessions/new.html.slim_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/sessions/new.html.erb", :type => :view do +describe "/sessions/new.html.slim", :type => :view do it "should have a 'Request Password Reset' link" do render expect(rendered).to have_tag("a") diff --git a/spec/views/users/_mobile_login_history.html.erb_spec.rb b/spec/views/users/_mobile_login_history.html.slim_spec.rb similarity index 92% rename from spec/views/users/_mobile_login_history.html.erb_spec.rb rename to spec/views/users/_mobile_login_history.html.slim_spec.rb index c7eb54a50..fb75b53c9 100644 --- a/spec/views/users/_mobile_login_history.html.erb_spec.rb +++ b/spec/views/users/_mobile_login_history.html.slim_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "users/_mobile_login_history.html.erb", :type => :view do +describe "users/_mobile_login_history.html.slim", :type => :view do describe "Viewing a user's mobile login history" do it "should show the login events" do diff --git a/spec/views/users/_user_disabled_checkbox.html.erb_spec.rb b/spec/views/users/_user_disabled_checkbox.html.slim_spec.rb similarity index 86% rename from spec/views/users/_user_disabled_checkbox.html.erb_spec.rb rename to spec/views/users/_user_disabled_checkbox.html.slim_spec.rb index 2828133cb..61576e433 100644 --- a/spec/views/users/_user_disabled_checkbox.html.erb_spec.rb +++ b/spec/views/users/_user_disabled_checkbox.html.slim_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "users/_user_disabled_checkbox.html.erb", :type => :view do +describe "users/_user_disabled_checkbox.html.slim", :type => :view do describe "Viewing users disabled status as a checkbox" do describe "when current user is the same" do @@ -9,7 +9,7 @@ user.disabled = false user.user_name = "someusername" - render :partial => 'users/user_disabled_checkbox', :locals => {:current_user_name => "someusername", :user => user}, :formats => [:html], :handlers => [:erb] + render :partial => 'users/user_disabled_checkbox', :locals => {:current_user_name => "someusername", :user => user}, :formats => [:html], :handlers => [:slim] expect(rendered).not_to match(/checkbox/) end @@ -27,7 +27,7 @@ render :partial => 'users/user_disabled_checkbox', :locals => { :current_user_name => "different", :user => @user - }, :formats => [:html], :handlers => [:erb] + }, :formats => [:html], :handlers => [:slim] expect(rendered).to match(/checkbox/) expect(rendered).not_to match(/checked/) @@ -39,7 +39,7 @@ render :partial => 'users/user_disabled_checkbox', :locals => { :current_user_name => "different", :user => @user - }, :formats => [:html], :handlers => [:erb] + }, :formats => [:html], :handlers => [:slim] expect(rendered).to match(/checkbox/) expect(rendered).to match(/checked/)