From 6bfde35de0e79ae05294e84bbdeb2e6e9aa175fa Mon Sep 17 00:00:00 2001
From: ivaosthu <ivar.conradi.osthus@finn.no>
Date: Thu, 11 Dec 2014 08:19:31 +0100
Subject: [PATCH] Fixed presentation and formatting of toggles and log-entries

---
 package.json                                 |  2 +-
 public/css/unleash.css                       |  3 ++-
 public/js/components/feature/Feature.jsx     | 15 +++++++--------
 public/js/components/feature/FeatureList.jsx |  1 -
 public/js/components/log/LogEntry.jsx        |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 86a4ae9a1a..0bdd4ede95 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
         "start": "NODE_ENV=production node server.js",
         "build": "./node_modules/.bin/webpack",
         "dev": "NODE_ENV=development supervisor --ignore ./node_modules/,./public/js server.js",
-        "test": "export PORT=4243 ; jshint server.js lib test && jsxhint public/js/**/*.jsx && mocha test test/*.js && npm run coverage",
+        "test": "export PORT=4243 ; jest && jshint server.js lib test && jsxhint public/js/**/*.jsx && mocha test test/*.js && npm run coverage",
         "tdd": "mocha --watch test test/*",
         "test-bamboo-ci": "mocha test test/*",
         "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec",
diff --git a/public/css/unleash.css b/public/css/unleash.css
index 0266021bf0..2d77687794 100644
--- a/public/css/unleash.css
+++ b/public/css/unleash.css
@@ -20,5 +20,6 @@
 }
 
 code {
-    word-wrap: break-word;;
+    word-wrap: break-word;
+    white-space: pre;
 }
\ No newline at end of file
diff --git a/public/js/components/feature/Feature.jsx b/public/js/components/feature/Feature.jsx
index 4a395a1ba7..47bc20f1e6 100644
--- a/public/js/components/feature/Feature.jsx
+++ b/public/js/components/feature/Feature.jsx
@@ -37,7 +37,7 @@ var Feature = React.createClass({
     renderEditMode: function() {
         return (
             <tr>
-                <td colSpan="5" className="pan man no-border">
+                <td colSpan="4" className="pan man no-border">
                     <FeatureForm feature={this.props.feature} onSubmit={this.saveFeature} onCancel={this.toggleEditMode} />
                 </td>
             </tr>
@@ -54,18 +54,17 @@ var Feature = React.createClass({
                         </span>
                     </td>
                     <td>
-                        {this.props.feature.name}
-                    </td>
-
-                    <td className='opaque smalltext word-break' width="600">
-                        {this.props.feature.description || '\u00a0'}
+                        {this.props.feature.name} <br />
+                        <span className="opaque smalltext word-break">
+                            {this.props.feature.description || '\u00a0'}
+                        </span>
                     </td>
 
                     <td>
                         {this.props.feature.strategy}
                     </td>
 
-                    <td width="100">
+                    <td width="110">
                         <div className="line">
                             <div className="unit size1of2">
                                 <button className={this.state.editMode ? "primary" : ""} title='Edit' onClick={this.toggleEditMode}>
@@ -92,7 +91,7 @@ var Feature = React.createClass({
 
     renderHistory: function() {
         return (<tr>
-                    <td colSpan="5" className="no-border">
+                    <td colSpan="4" className="no-border">
                         <LogEntryList events={this.state.events} />
                     </td>
                 </tr>);
diff --git a/public/js/components/feature/FeatureList.jsx b/public/js/components/feature/FeatureList.jsx
index 513782191c..f344e71507 100644
--- a/public/js/components/feature/FeatureList.jsx
+++ b/public/js/components/feature/FeatureList.jsx
@@ -19,7 +19,6 @@ var FeatureList = React.createClass({
                 <tr>
                   <th></th>
                   <th>Name</th>
-                  <th>Description</th>
                   <th>Strategy</th>
                   <th></th>
                 </tr>
diff --git a/public/js/components/log/LogEntry.jsx b/public/js/components/log/LogEntry.jsx
index 3a53ead31d..338c76a50a 100644
--- a/public/js/components/log/LogEntry.jsx
+++ b/public/js/components/log/LogEntry.jsx
@@ -20,7 +20,7 @@ var LogEntry = React.createClass({
                     <strong>{this.props.event.data.name}</strong><em>[{this.props.event.type}]</em>
                 </td>
                 <td style={{maxWidth: 300}}>
-                    <code className='JSON smalltext'>{JSON.stringify(localEventData)}</code>
+                    <code className='JSON smalltext man'>{JSON.stringify(localEventData, null, 2)}</code>
                 </td>
                 <td>{this.props.event.createdBy}</td>
             </tr>