summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-01-10 16:27:16 -0800
committerelijah <elijah@riseup.net>2016-01-10 16:27:16 -0800
commitc678806489cbe7d63d3946de1265697c7fb996e6 (patch)
tree9206f22e1f9889fa300d2bafce4270dd54820a1f /app/views/users
parent1cd52015a2dcac610405fd163e1dca5a8d736add (diff)
fix user list
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/_user.html.haml10
-rw-r--r--app/views/users/index.html.haml3
2 files changed, 6 insertions, 7 deletions
diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml
index 1cabcf5..e34de70 100644
--- a/app/views/users/_user.html.haml
+++ b/app/views/users/_user.html.haml
@@ -1,13 +1,13 @@
%tr
%td
- = link_to user.username, user
+ = link_to user.username, user
%td
- = user.created_at.strftime("%d %b, %Y, %H:%M")
+ = simple_date(user.created_at)
%td
- = user.updated_at.strftime("%d %b, %Y, %H:%M")
+ = simple_date(user.updated_at)
%td
- if user.enabled
- %button.btn.btn-default{:"data-toggle" => "modal", :"data-target" => "#user-form-#{user.id}", :type => "button"}
+ %button.btn.btn-sm.btn-default{:"data-toggle" => "modal", :"data-target" => "#user-form-#{user.id}", :type => "button"}
= t("actions.disable_user")
.modal.fade.hide{:id => "user-form-#{user.id}"}
.modal-dialog
@@ -19,7 +19,7 @@
= form_tag deactivate_user_path(user) do
%input.btn.btn-default.btn-danger{:type => "submit", :value => "#{t("actions.disable_user")}"}
- else
- %button.btn.btn-default{:"data-toggle" => "modal", :"data-target" => "#user-form-#{user.id}", :type => "button"}
+ %button.btn.btn-sm.btn-default{:"data-toggle" => "modal", :"data-target" => "#user-form-#{user.id}", :type => "button"}
= t("actions.enable_user")
.modal.fade.hide{:id => "user-form-#{user.id}"}
.modal-dialog
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index e1136d8..b49c854 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -1,5 +1,4 @@
- @show_navigation = false
= search :users
-= table @users, %w(username, created, updated, actions.toggle_user)
-
+= table @users, %w(username created updated actions)