fix #1093. Improved rule manager buttons (#1094)

geosolutions-it · Oct 6, 2016 · 34c5602 · 34c5602
1 parent 2e2d2f7
commit 34c5602
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/web/client/components/manager/rulesmanager/RulesManager.css b/web/client/components/manager/rulesmanager/RulesManager.css
@@ -7,10 +7,12 @@
 }
 
 .rules-controls {
-    text-align: right;
+    width: auto;
     margin-bottom: 15px;
 }
-
+.rules-controls .btn {
+    border-left: 1px solid #5C9FB4;
+}
 .rules-pagination {
     text-align: right;
     margin-top: -22px;

diff --git a/web/client/components/manager/rulesmanager/RulesTableControls.jsx b/web/client/components/manager/rulesmanager/RulesTableControls.jsx
@@ -7,7 +7,7 @@
  */
 
 const React = require('react');
-const {Button, Glyphicon, Modal} = require('react-bootstrap');
+const {ButtonGroup, Button, Glyphicon, Modal} = require('react-bootstrap');
 
 const Message = require('../../I18N/Message');
 
@@ -23,7 +23,6 @@ const RulesTableControls = React.createClass({
     },
     getDefaultProps() {
         return {
-            bsSize: "small",
             moveRulesToPage: () => {},
             updateActiveRule: () => {},
             deleteRules: () => {},
@@ -51,7 +50,7 @@ const RulesTableControls = React.createClass({
         const firstPage = this.props.rulesPage === 1 || !this.props.rulesPage;
         const lastPage = this.props.rulesPage === numberOfPages || !this.props.rulesPage;
         return (
-            <div className="rules-controls">
+            <ButtonGroup className="rules-controls">
                 <Button bsSize={bsSize} bsStyle="primary" onClick={this.getAddRuleHandler()}>
                     <Glyphicon glyph="plus"/>
                 </Button>
@@ -110,7 +109,7 @@ const RulesTableControls = React.createClass({
                         </Button>
                     </Modal.Footer>
                 </Modal>
-            </div>
+            </ButtonGroup>
         );
     }
 });

diff --git a/web/client/plugins/manager/style/manager.css b/web/client/plugins/manager/style/manager.css
@@ -20,5 +20,5 @@
 }
 .Manager-Container .Manager-Tools-Nav {
     order: -1;
-    flex: 0 0 15em;
+    max-width: 20%;
 }