Merge branch 'master' into full-width-tables

3 files changed, 38 insertions, 1 deletions

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index a36ae0b766c..7a78526e09a 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -47,6 +47,12 @@
           = f.label :version_check_enabled do
             = f.check_box :version_check_enabled
             Version check enabled
+    .form-group
+      = f.label :admin_notification_email, class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_field :admin_notification_email, class: 'form-control'
+        .help-block
+          Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.
 
   %fieldset
     %legend Account and Limit Settings
diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml
new file mode 100644
index 00000000000..90d9980c85c
--- /dev/null
+++ b/app/views/admin/users/_profile.html.haml
@@ -0,0 +1,31 @@
+.panel.panel-default
+  .panel-heading
+    Profile
+  %ul.well-list
+    %li
+      %span.light Member since
+      %strong= user.created_at.stamp("Aug 21, 2011")
+    - unless user.public_email.blank?
+      %li
+        %span.light E-mail:
+        %strong= link_to user.public_email, "mailto:#{user.public_email}"
+    - unless user.skype.blank?
+      %li
+        %span.light Skype:
+        %strong= link_to user.skype, "skype:#{user.skype}"
+    - unless user.linkedin.blank?
+      %li
+        %span.light LinkedIn:
+        %strong= link_to user.linkedin, "http://www.linkedin.com/in/#{user.linkedin}"
+    - unless user.twitter.blank?
+      %li
+        %span.light Twitter:
+        %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}"
+    - unless user.website_url.blank?
+      %li
+        %span.light Website:
+        %strong= link_to user.short_website_url, user.full_website_url
+    - unless user.location.blank?
+      %li
+        %span.light Location:
+        %strong= user.location
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 231bcb0426f..0848504b7a6 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -14,7 +14,7 @@
           %strong
             = link_to user_path(@user) do
               = @user.username
-    = render 'users/profile', user: @user
+    = render 'admin/users/profile', user: @user
 
     .panel.panel-default
       .panel-heading