diff --git a/app/assets/stylesheets/common/tables.css.scss b/app/assets/stylesheets/common/tables.css.scss index 5d61d6852..17d7e2e52 100644 --- a/app/assets/stylesheets/common/tables.css.scss +++ b/app/assets/stylesheets/common/tables.css.scss @@ -55,3 +55,11 @@ table.search { vertical-align: top; } } + +table.aligned-vertical { + @extend table.search; + + tr { + height: 1.75em; + } +} diff --git a/app/assets/stylesheets/specific/user_name_change_requests.css.scss b/app/assets/stylesheets/specific/user_name_change_requests.css.scss index bfacee695..84324a551 100644 --- a/app/assets/stylesheets/specific/user_name_change_requests.css.scss +++ b/app/assets/stylesheets/specific/user_name_change_requests.css.scss @@ -28,4 +28,4 @@ section { margin-bottom: 1em; } -} \ No newline at end of file +} diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb index ec95a1f87..10c1ff795 100644 --- a/app/models/user_name_change_request.rb +++ b/app/models/user_name_change_request.rb @@ -36,6 +36,10 @@ class UserNameChangeRequest < ActiveRecord::Base def approved? status == "approved" end + + def pending? + status == "pending" + end def normalize_name self.desired_name = desired_name.strip.gsub(/ /, "_") diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index 86275df27..6e4f5f4c2 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -1,14 +1,45 @@

Name Change Request

- -
-

<%= @change_request.original_name %> is requesting to change their name to <%= @change_request.desired_name %>.

-
- -
-

Reason

-

<%= @change_request.change_reason %>

-
+ + + + + + + + + + + + + + + + + + + + + + + + +
Date + <%= compact_time @change_request.created_at %> + <% if @change_request.updated_at - @change_request.created_at > 5.minutes %> + (updated <%= time_ago_in_words_tagged @change_request.updated_at %>) + <% end %> +
User<%= link_to_user @change_request.user %>
Request + <%= @change_request.original_name %> -> + <%= @change_request.desired_name %> +
Reason<%= @change_request.change_reason %>
Status + <%= @change_request.status %> + <% if @change_request.approved? %> + by <%= link_to_user @change_request.approver %> + <% elsif @change_request.rejected? %> + for reason: <%= link_to @change_request.rejection_reason %> + <% end %> +

Feedback

@@ -16,7 +47,7 @@ <% @change_request.feedback.each do |feedback| %> <% end %> @@ -33,17 +64,7 @@
- <% if @change_request.rejected? %> -
-

Request was rejected

-
- - <% elsif @change_request.approved? && @change_request.approver %> -
-

Request was approved by <%= @change_request.approver.name %>

-
- - <% elsif CurrentUser.user.is_admin? %> + <% if @change_request.pending? && CurrentUser.user.is_admin? %>

Options

<%= form_tag(approve_user_name_change_request_path(@change_request)) do %> @@ -69,4 +90,3 @@ <% end %>
-