Cleaning up html

6 files changed, 53 insertions, 44 deletions

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index b069f6432..bb43af802 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -31,7 +31,11 @@ export default class AdminController extends React.Component {
         }
 
         return (
-            <div>
+            <div className='container-fluid'>
+                <div
+                    className='sidebar--menu'
+                    id='sidebar-menu'
+                />
                 <AdminSidebar
                     selected={this.state.selected}
                     selectTab={this.selectTab}
@@ -45,9 +49,7 @@ export default class AdminController extends React.Component {
                             id='app-content'
                             className='app__content admin'
                         >
-                            <div className='wrapper--fixed'>
-                                {tab}
-                            </div>
+                        {tab}
                         </div>
                     </div>
                 </div>
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 64a99b1f4..6b3be89d0 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -26,6 +26,39 @@ export default class AdminSidebar extends React.Component {
         return '';
     }
 
+    componentDidMount() {
+        $('.nav__menu-item').on('click', function clickme(e) {
+            e.preventDefault();
+            $(this).closest('.sidebar--collapsable').find('.nav__menu-item').removeClass('active');
+            $(this).addClass('active');
+            $(this).closest('.sidebar--collapsable').find('.nav__sub-menu').addClass('hide');
+            $(this).next('.nav__sub-menu').removeClass('hide');
+        });
+
+        $('.nav__sub-menu a').on('click', function clickme(e) {
+            e.preventDefault();
+            $(this).closest('.nav__sub-menu').find('a').removeClass('active');
+            $(this).addClass('active');
+        });
+
+        $('.nav__sub-menu-item').on('click', function clickme(e) {
+            e.preventDefault();
+            $(this).closest('.sidebar--collapsable').find('.nav__inner-menu').addClass('hide');
+            $(this).closest('li').next('li').find('.nav__inner-menu').removeClass('hide');
+            $(this).closest('li').next('li').find('.nav__inner-menu li:first a').addClass('active');
+        });
+
+        $('.nav__inner-menu a').on('click', function clickme() {
+            $(this).closest('.nav__inner-menu').closest('li').prev('li').find('a').addClass('active');
+        });
+
+        $('.nav__sub-menu .menu__close').on('click', function close() {
+            var menuItem = $(this).closest('li');
+            menuItem.next('li').remove();
+            menuItem.remove();
+        });
+    }
+
     render() {
         return (
             <div className='sidebar--left sidebar--collapsable'>
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 59475dc94..3c53a8ee1 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -11,7 +11,7 @@ export default class EmailSettings extends React.Component {
 
     render() {
         return (
-            <div>
+            <div className='wrapper--fixed'>
                 <h3>{'Email Settings'}</h3>
                 <form
                     className='form-horizontal'
diff --git a/web/react/components/admin_console/jobs_settings.jsx b/web/react/components/admin_console/jobs_settings.jsx
index c36d20df7..34ec9693d 100644
--- a/web/react/components/admin_console/jobs_settings.jsx
+++ b/web/react/components/admin_console/jobs_settings.jsx
@@ -11,7 +11,7 @@ export default class Jobs extends React.Component {
 
     render() {
         return (
-            <div>
+            <div className='wrapper--fixed'>
                 <h3>{' **************   JOB Settings'}</h3>
                 <form
                     className='form-horizontal'
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 7bffeab08..689a6b3a2 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -1,6 +1,7 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+var ErrorBar = require('../components/error_bar.jsx');
 var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
 var AdminController = require('../components/admin_console/admin_controller.jsx');
 
@@ -14,6 +15,11 @@ export function setupAdminConsolePage() {
         <SelectTeamModal />,
         document.getElementById('select_team_modal')
     );
+
+    React.render(
+        <ErrorBar/>,
+        document.getElementById('error_bar')
+    );
 }
 
 global.window.setup_admin_console_page = setupAdminConsolePage;
diff --git a/web/templates/admin_console.html b/web/templates/admin_console.html
index d7fd9217e..1444d9b17 100644
--- a/web/templates/admin_console.html
+++ b/web/templates/admin_console.html
@@ -5,50 +5,18 @@
 {{template "head" . }}
 <body>
 
-<div class='container-fluid'>
-    <div id="error_bar"></div>
-    <div id="admin_controller" ></div>
-    <div id="select_team_modal"></div>
-</div>
+<div id="error_bar"></div>
+
+<div id="admin_controller"></div>
+
+<div id="select_team_modal"></div>
 
 <script>
     window.setup_admin_console_page();
     
     $(document).ready(function(){
-        $('.nav__menu-item').on('click', function(e){
-            e.preventDefault();
-            $(this).closest('.sidebar--collapsable').find('.nav__menu-item').removeClass('active');
-            $(this).addClass('active');
-            $(this).closest('.sidebar--collapsable').find('.nav__sub-menu').addClass('hide');
-            $(this).next('.nav__sub-menu').removeClass('hide');
-        });
-
-        $('.nav__sub-menu a').on('click', function(e){
-            e.preventDefault();
-            $(this).closest('.nav__sub-menu').find('a').removeClass('active');
-            $(this).addClass('active');
-        });
-
-        $('.nav__sub-menu-item').on('click', function(e){
-            e.preventDefault();
-            $(this).closest('.sidebar--collapsable').find('.nav__inner-menu').addClass('hide');
-            $(this).closest('li').next('li').find('.nav__inner-menu').removeClass('hide');
-            $(this).closest('li').next('li').find('.nav__inner-menu li:first a').addClass('active');
-        });
-
-        $('.nav__inner-menu a').on('click', function(e){
-            $(this).closest('.nav__inner-menu').closest('li').prev('li').find('a').addClass('active');
-        });
-
-        $('.nav__sub-menu .menu__close').on('click', function(e){
-            var menuItem = $(this).closest('li');
-            menuItem.next('li').remove();
-            menuItem.remove();
-        });
-
         $('[data-toggle="tooltip"]').tooltip();
-        $('[data-toggle="popover"]').popover()
-
+        $('[data-toggle="popover"]').popover();
     });
 </script>
 </body>