From df338ac7465a04f067b771a5dabd88583131ae5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Tue, 29 Sep 2015 10:31:13 +0200
Subject: [PATCH] Fix alignment for AclInformationButton

---
 .../ascribe_buttons/acl_button_list.js        | 15 +------------
 .../ascribe_buttons/acl_information_button.js | 21 +++++++++----------
 js/components/ascribe_detail/edition.js       |  3 ++-
 sass/main.scss                                |  9 ++++++++
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/js/components/ascribe_buttons/acl_button_list.js b/js/components/ascribe_buttons/acl_button_list.js
index e5207cd9..73f00c90 100644
--- a/js/components/ascribe_buttons/acl_button_list.js
+++ b/js/components/ascribe_buttons/acl_button_list.js
@@ -24,17 +24,7 @@ let AclButtonList = React.createClass({
             React.PropTypes.element
         ])
     },
-    getDefaultProps(){
-        return {
-            actionsLabelStyle: {
-                float: 'left',
-                fontSize: '11.2px'
-                },
-            buttonsStyle: {
-                marginLeft: '0.25cm'
-            }
-        };
-    },
+
     getInitialState() {
         return UserStore.getState();
     },
@@ -55,9 +45,6 @@ let AclButtonList = React.createClass({
     render() {
         return (
             <div className={this.props.className}>
-                <span style={this.props.actionsLabelStyle}>
-                    {getLangText('ACTIONS')}
-                </span>
                 <span style={this.props.buttonsStyle}>
                     <AclButton
                         availableAcls={this.props.availableAcls}
diff --git a/js/components/ascribe_buttons/acl_information_button.js b/js/components/ascribe_buttons/acl_information_button.js
index f60a849b..bea9808e 100644
--- a/js/components/ascribe_buttons/acl_information_button.js
+++ b/js/components/ascribe_buttons/acl_information_button.js
@@ -4,8 +4,12 @@
 'use strict';
 
 import React from 'react';
+import classnames from 'classnames'; 
+
 import DropdownButton from 'react-bootstrap/lib/Button';
 
+
+
 let AclInformationButton = React.createClass({
     getDefaultProps: function() {
         let rows = [];
@@ -75,10 +79,6 @@ let AclInformationButton = React.createClass({
             },
             dropdownListStyle: {
                 textAlign: 'left',
-                border: '1px solid #02B6A3',
-                borderTop: 'none',
-                borderBottom: 'none',
-                float: 'right',
                 width: '80.8%'
             }
         };
@@ -101,15 +101,14 @@ let AclInformationButton = React.createClass({
         }
     },
     render: function () {
-        console.log('will start rendering');
         return (
             <span>
-                <DropdownButton style={this.props.dropdownButtonStyle} className={'glyphicon glyphicon-question-sign' +
-                        (this.state.isVisible ? ' clicked' : '')} onClick={this.show}>
-                    {console.log(this.state.isVisible)}
-                </DropdownButton>
-                <p></p>
-                <div style = {this.props.dropdownListStyle}>
+                <DropdownButton
+                    style={this.props.dropdownButtonStyle}
+                    className="glyphicon glyphicon-question-sign" onClick={this.show} />
+                <div
+                    style={this.props.dropdownListStyle}
+                    className={classnames({'hidden': !this.state.isVisible})}>
                     {this.showInformation()}
                 </div>
             </span>
diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js
index bd76b0b8..9b429ca2 100644
--- a/js/components/ascribe_detail/edition.js
+++ b/js/components/ascribe_detail/edition.js
@@ -270,7 +270,7 @@ let EditionSummary = React.createClass({
                 <Row>
                     <Col md={11}>
                         <AclButtonList
-                            className="text-center ascribe-button-list"
+                            className="ascribe-button-list ascribe-button-list-detail"
                             availableAcls={this.props.edition.acl}
                             editions={[this.props.edition]}
                             handleSuccess={this.props.handleSuccess}>
@@ -300,6 +300,7 @@ let EditionSummary = React.createClass({
                     label={getLangText('OWNER')}
                     value={ this.props.edition.owner } />
                 {this.getStatus()}
+                <hr />
                 {this.getActions()}
                 <hr/>
             </div>
diff --git a/sass/main.scss b/sass/main.scss
index b0ad7e1c..30156c46 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -265,6 +265,11 @@ hr {
 
 .ascribe-detail-property-label {
     font-size: 0.8em;
+    
+}
+
+.ascribe-detail-property-label.col-bottom {
+    vertical-align: top;
 }
 
 .ascribe-detail-property-value {
@@ -369,6 +374,10 @@ hr {
     margin-top: 1px;
 }
 
+.ascribe-button-list-detail {
+    margin-top:0;
+}
+
 .margin-left-2px{
     margin-left: 2px;
 }