From 2f8866add5af28a1ff0f0882f7f23a9fcdf7da3a Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 11 Nov 2013 15:03:17 -0500
Subject: [PATCH] Change admin display-row css so that multiple lines can fit
 in the control column. Don't hard-code a height on the rows.

---
 app/assets/javascripts/admin/templates/user.js.handlebars | 4 ++--
 app/assets/stylesheets/common/admin/admin_base.scss       | 4 +++-
 spec/services/staff_action_logger_spec.rb                 | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars
index fb707b054f6..746b09fba77 100644
--- a/app/assets/javascripts/admin/templates/user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user.js.handlebars
@@ -22,7 +22,7 @@
     <div class='value'><a href="mailto:{{unbound email}}">{{email}}</a></div>
   </div>
 
-  <div class='display-row' style='height: 50px'>
+  <div class='display-row'>
     <div class='field'>{{i18n user.avatar.title}}</div>
     <div class='value'>{{avatar content imageSize="large"}}</div>
   </div>
@@ -46,7 +46,7 @@
     </div>
   </div>
 
-  <div class='display-row' style='height: 50px'>
+  <div class='display-row'>
     <div class='field'>{{i18n user.ip_address.title}}</div>
     <div class='value'>{{ip_address}}</div>
     <div class='controls'>
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index f78f38168e8..141e4f7eef6 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -195,7 +195,6 @@ table {
 }
 
 .display-row {
-  height: 30px;
   line-height: 30px;
   padding: 5px;
   &:nth-of-type(1) {
@@ -235,6 +234,9 @@ table {
   }
 
   .controls {
+    width: 600px;
+    float: left;
+    margin-left: 12px;
     .btn {
       margin-right: 5px;
     }
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index 71c26d3dd5d..4ce04aabd66 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -117,7 +117,7 @@ describe StaffActionLogger do
   end
 
   describe "log_user_suspend" do
-    let(:user) { Fabricate(:user) }
+    let(:user) { Fabricate(:user, suspended_at: 10.minutes.ago, suspended_till: 1.day.from_now) }
 
     it "raises an error when arguments are missing" do
       expect { logger.log_user_suspend(nil, nil) }.to raise_error(Discourse::InvalidParameters)