Commit 2a68c3b8ef157022a0d1f2a8a25038787d82e825

Authored by Deepak
1 parent 8787476a5a
Exists in master

removed header menus

imports/client/views/org/admin/Breadcrumb.js
... ... @@ -1,56 +0,0 @@
1   -import _ from 'lodash';
2   -import { Meteor } from 'meteor/meteor';
3   -
4   -import React, { Component } from 'react';
5   -import { Link,browserHistory } from 'react-router';
6   -import { Navbar,Modal, Nav, NavItem,
7   - Glyphicon, Collapse, FormGroup, FormControl, Panel,
8   - NavbarToggler, NavbarBrand, Table, ButtonToolbar,
9   - NavLink, DropdownItem, DropdownToggle, DropdownMenu,
10   - NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap';
11   -
12   -
13   -export class AdminBreadcrumb extends Component {
14   -
15   - constructor(props) {
16   - super(props);
17   - this.state = {
18   -
19   - };
20   - this.onUpdate = this.onUpdate.bind(this);
21   - };
22   -
23   - onUpdate(key, value) {
24   - this.setState({[key]: value});
25   - };
26   -
27   - render() {
28   - return (
29   - <div className="page-header page-header-default">
30   - <div className="breadcrumb-line">
31   - <Breadcrumb>
32   - <Breadcrumb.Item href="#">
33   - <i className="icon-home2 position-left"></i> Users
34   - </Breadcrumb.Item>
35   - <Breadcrumb.Item active href="#">
36   - Setup
37   - </Breadcrumb.Item>
38   - </Breadcrumb>
39   -
40   - <ul className="breadcrumb-elements">
41   - <NavItem href="#"><i className="icon-comment-discussion position-left"></i> Support</NavItem>
42   - <NavDropdown title="Settings" id="setting">
43   - <MenuItem><i className="icon-user-lock"></i> Account security</MenuItem>
44   - <MenuItem><i className="icon-statistics"></i> Analytics</MenuItem>
45   - <MenuItem><i className="icon-accessibility"></i> Accessibility</MenuItem>
46   - <MenuItem divider/>
47   - <MenuItem><i className="icon-gear"></i> All settings</MenuItem>
48   - </NavDropdown>
49   -
50   - </ul>
51   - </div>
52   - </div>
53   - );
54   - };
55   -
56   -};
imports/client/views/org/admin/Sidebar.js
... ... @@ -1,85 +0,0 @@
1   -import _ from 'lodash';
2   -import { Meteor } from 'meteor/meteor';
3   -
4   -import React, { Component } from 'react';
5   -import { Link,browserHistory } from 'react-router';
6   -import { Navbar,Modal, Nav, NavItem,
7   - Glyphicon, Collapse, FormGroup, FormControl, Panel,
8   - NavbarToggler, NavbarBrand, Table, ButtonToolbar,
9   - NavLink, DropdownItem, DropdownToggle, DropdownMenu,
10   - NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap';
11   -
12   -
13   -export class AdminSidebar extends Component {
14   -
15   - constructor(props) {
16   - super(props);
17   - this.state = {
18   -
19   - };
20   - this.onUpdate = this.onUpdate.bind(this);
21   - };
22   -
23   - onUpdate(key, value) {
24   - this.setState({[key]: value});
25   - };
26   -
27   - render() {
28   - const {user, org} = this.props;
29   - return (
30   - <div className="sidebar sidebar-main sidebar-default">
31   - <div className="sidebar-content">
32   - <div className="sidebar-category sidebar-category-visible">
33   - <div className="category-content no-padding">
34   - <Nav className="navigation navigation-main navigation-accordion">
35   - <NavItem className="navigation-header"><span>{org.name}</span> <i className="icon-menu" title="Main pages"></i></NavItem>
36   - <NavItem className="active" eventKey={1} href="#"><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
37   -
38   - <NavDropdown eventKey={2} title="Settings" name="Settings" id="setting">
39   - <MenuItem eventKey={2.1}>Information</MenuItem>
40   - <MenuItem eventKey={2.2}>Infrastructure</MenuItem>
41   - <MenuItem eventKey={2.3}>Users</MenuItem>
42   - <MenuItem eventKey={2.4}>Academic Settings</MenuItem>
43   - <MenuItem eventKey={2.5}>Account Configuration</MenuItem>
44   - </NavDropdown>
45   - <NavDropdown eventKey={3} title="Academic" name="Academic" id="academic">
46   - <MenuItem eventKey={3.1}>Layout 1</MenuItem>
47   - <MenuItem eventKey={3.2}>Layout 2</MenuItem>
48   - <MenuItem eventKey={3.3}>Layout 3</MenuItem>
49   - <MenuItem eventKey={3.4}>Layout 4</MenuItem>
50   - <MenuItem eventKey={3.5}>Layout 5</MenuItem>
51   - </NavDropdown>
52   - <NavDropdown eventKey={4} title="Communication" name="Communication" id="communication">
53   - <MenuItem eventKey={4.1}>Primary palett</MenuItem>
54   - <MenuItem eventKey={4.2}>Danger palett</MenuItem>
55   - <MenuItem eventKey={4.3}>Success palett</MenuItem>
56   - <MenuItem eventKey={4.4}>Warning palett</MenuItem>
57   - <MenuItem divider />
58   - <MenuItem eventKey={4.5}>Info palett</MenuItem>
59   - <MenuItem eventKey={4.6}>Info palett</MenuItem>
60   - <MenuItem eventKey={4.7}>Info palett</MenuItem>
61   - <MenuItem eventKey={4.8}>Info palett</MenuItem>
62   - </NavDropdown>
63   - <NavDropdown eventKey={5} title="Finance" name="Finance" id="finance">
64   - <MenuItem eventKey={5.1}>Primary palett</MenuItem>
65   - <MenuItem eventKey={5.2}>Danger palett</MenuItem>
66   - <MenuItem eventKey={5.3}>Success palett</MenuItem>
67   - <MenuItem eventKey={5.4}>Warning palett</MenuItem>
68   - <NavDropdown eventKey={5.5} title="Calumns" id="calumns">
69   - <MenuItem>Success palett</MenuItem>
70   - <MenuItem>Warning palett</MenuItem>
71   - </NavDropdown>
72   - </NavDropdown>
73   -
74   - <NavItem eventKey={6} href="#"><i className="icon-file-stats"></i><span> Reports </span></NavItem>
75   - <NavItem eventKey={7} href="#"><i className="icon-design"></i> <span>Examinations</span></NavItem>
76   -
77   - </Nav>
78   - </div>
79   - </div>
80   - </div>
81   - </div>
82   - );
83   - };
84   -
85   -};
imports/client/views/org/admin/app/AdminLayout.js
... ... @@ -6,8 +6,6 @@ import { Avatar } from &#39;/imports/client/components/Avata
6 6 import { Icon } from '/imports/client/components/Icon';
7 7 import classNames from 'classnames';
8 8 import { EnterModule } from '/imports/client/views/org/enter/module/index';
9   -import { AdminSidebar } from '../Sidebar'
10   -import { AdminBreadcrumb } from '../Breadcrumb'
11 9 // import { VerifyModule } from '/imports/client/views/verify/module/index';
12 10 import { Navbar,Modal, Nav, NavItem,
13 11 Glyphicon, Collapse,
... ... @@ -22,62 +20,44 @@ export class AdminAppLayout extends Component {
22 20 render() {
23 21 const {user, org} = this.props;
24 22 return (
25   - <div className="admin-app">
26   - <div className = "appLayout-box">
27   - <div className="page-container">
28   - <div className="page-content">
29   - <AdminSidebar
30   - user = {user}
31   - org = {org}
32   - />
33   - <div className="content-wrapper">
34   - <AdminBreadcrumb />
35   - <div className="content">
36   - <div className="row">
37   - <div className="col-lg-3 col-md-6">
38   - <div className="thumbnail">
39   - <Link to="/students" >
40   - <div className="thumb thumb-rounded">
41   - <img src="assets/images/download2.png" alt="" />
42   - </div>
43   - <div className="caption text-center">
44   - <h6 className="text-semibold no-margin">Students <small className="display-block">Click to view</small></h6>
45   - </div>
46   - </Link>
47   - </div>
48   - </div>
49   - <div className="col-lg-3 col-md-6">
50   - <div className="thumbnail">
51   - <Link to="/staff" >
52   - <div className="thumb thumb-rounded">
53   - <img src="assets/images/download3.png" alt=""/>
54   - </div>
55   - <div className="caption text-center">
56   - <h6 className="text-semibold no-margin">Teachers <small className="display-block">Click to view</small></h6>
57   - </div>
58   - </Link>
59   - </div>
60   - </div>
61   - <div className="col-lg-3 col-md-6">
62   - <div className="thumbnail">
63   - <Link to="/parents" >
64   - <div className="thumb thumb-rounded">
65   - <img src="assets/images/download3.png" alt=""/>
66   - </div>
67   - <div className="caption text-center">
68   - <h6 className="text-semibold no-margin">Parents <small className="display-block">Click to view</small></h6>
69   - </div>
70   - </Link>
71   - </div>
72   - </div>
73   - </div>
74   - </div>
  23 + <div className="row">
  24 + <div className="col-lg-3 col-md-6">
  25 + <div className="thumbnail">
  26 + <Link to="/students" >
  27 + <div className="thumb thumb-rounded">
  28 + <img src="assets/images/download2.png" alt="" />
75 29 </div>
76   - </div>
  30 + <div className="caption text-center">
  31 + <h6 className="text-semibold no-margin">Students <small className="display-block">Click to view</small></h6>
  32 + </div>
  33 + </Link>
  34 + </div>
  35 + </div>
  36 + <div className="col-lg-3 col-md-6">
  37 + <div className="thumbnail">
  38 + <Link to="/staff" >
  39 + <div className="thumb thumb-rounded">
  40 + <img src="assets/images/download3.png" alt=""/>
  41 + </div>
  42 + <div className="caption text-center">
  43 + <h6 className="text-semibold no-margin">Teachers <small className="display-block">Click to view</small></h6>
  44 + </div>
  45 + </Link>
  46 + </div>
  47 + </div>
  48 + <div className="col-lg-3 col-md-6">
  49 + <div className="thumbnail">
  50 + <Link to="/parents" >
  51 + <div className="thumb thumb-rounded">
  52 + <img src="assets/images/download3.png" alt=""/>
  53 + </div>
  54 + <div className="caption text-center">
  55 + <h6 className="text-semibold no-margin">Parents <small className="display-block">Click to view</small></h6>
  56 + </div>
  57 + </Link>
77 58 </div>
78 59 </div>
79 60 </div>
80   -
81 61 );
82 62 };
83 63  
... ...
imports/client/views/org/admin/app/module/AdminAppLayout.js
... ... @@ -7,8 +7,8 @@ import { Icon } from &#39;/imports/client/components/Icon&#39;
7 7 import classNames from 'classnames';
8 8 import { EnterModule } from '/imports/client/views/org/enter/module/index';
9 9 import {AppNavigationController} from '/imports/client/views/org/admin/app/module/navigation/index';
10   -import { AdminSidebar } from '../../Sidebar'
11   -import { AdminBreadcrumb } from '../../Breadcrumb'
  10 +import { AdminSidebar } from './Sidebar'
  11 +import { AdminBreadcrumb } from './Breadcrumb'
12 12 // import { VerifyModule } from '/imports/client/views/verify/module/index';
13 13 import { Navbar,Modal, Nav, NavItem,
14 14 Glyphicon, Collapse,
... ...
imports/client/views/org/admin/app/module/Breadcrumb.js
... ... @@ -0,0 +1,56 @@
  1 +import _ from 'lodash';
  2 +import { Meteor } from 'meteor/meteor';
  3 +
  4 +import React, { Component } from 'react';
  5 +import { Link,browserHistory } from 'react-router';
  6 +import { Navbar,Modal, Nav, NavItem,
  7 + Glyphicon, Collapse, FormGroup, FormControl, Panel,
  8 + NavbarToggler, NavbarBrand, Table, ButtonToolbar,
  9 + NavLink, DropdownItem, DropdownToggle, DropdownMenu,
  10 + NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap';
  11 +
  12 +
  13 +export class AdminBreadcrumb extends Component {
  14 +
  15 + constructor(props) {
  16 + super(props);
  17 + this.state = {
  18 +
  19 + };
  20 + this.onUpdate = this.onUpdate.bind(this);
  21 + };
  22 +
  23 + onUpdate(key, value) {
  24 + this.setState({[key]: value});
  25 + };
  26 +
  27 + render() {
  28 + return (
  29 + <div className="page-header page-header-default">
  30 + <div className="breadcrumb-line">
  31 + <Breadcrumb>
  32 + <Breadcrumb.Item href="#">
  33 + <i className="icon-home2 position-left"></i> Users
  34 + </Breadcrumb.Item>
  35 + <Breadcrumb.Item active href="#">
  36 + Setup
  37 + </Breadcrumb.Item>
  38 + </Breadcrumb>
  39 +
  40 + <ul className="breadcrumb-elements">
  41 + <NavItem href="#"><i className="icon-comment-discussion position-left"></i> Support</NavItem>
  42 + <NavDropdown title="Settings" id="setting">
  43 + <MenuItem><i className="icon-user-lock"></i> Account security</MenuItem>
  44 + <MenuItem><i className="icon-statistics"></i> Analytics</MenuItem>
  45 + <MenuItem><i className="icon-accessibility"></i> Accessibility</MenuItem>
  46 + <MenuItem divider/>
  47 + <MenuItem><i className="icon-gear"></i> All settings</MenuItem>
  48 + </NavDropdown>
  49 +
  50 + </ul>
  51 + </div>
  52 + </div>
  53 + );
  54 + };
  55 +
  56 +};
... ...
imports/client/views/org/admin/app/module/Sidebar.js
... ... @@ -0,0 +1,85 @@
  1 +import _ from 'lodash';
  2 +import { Meteor } from 'meteor/meteor';
  3 +
  4 +import React, { Component } from 'react';
  5 +import { Link,browserHistory } from 'react-router';
  6 +import { Navbar,Modal, Nav, NavItem,
  7 + Glyphicon, Collapse, FormGroup, FormControl, Panel,
  8 + NavbarToggler, NavbarBrand, Table, ButtonToolbar,
  9 + NavLink, DropdownItem, DropdownToggle, DropdownMenu,
  10 + NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap';
  11 +
  12 +
  13 +export class AdminSidebar extends Component {
  14 +
  15 + constructor(props) {
  16 + super(props);
  17 + this.state = {
  18 +
  19 + };
  20 + this.onUpdate = this.onUpdate.bind(this);
  21 + };
  22 +
  23 + onUpdate(key, value) {
  24 + this.setState({[key]: value});
  25 + };
  26 +
  27 + render() {
  28 + const {user, org} = this.props;
  29 + return (
  30 + <div className="sidebar sidebar-main sidebar-default">
  31 + <div className="sidebar-content">
  32 + <div className="sidebar-category sidebar-category-visible">
  33 + <div className="category-content no-padding">
  34 + <Nav className="navigation navigation-main navigation-accordion">
  35 + <NavItem className="navigation-header"><span>{org.name}</span> <i className="icon-menu" title="Main pages"></i></NavItem>
  36 + <NavItem className="active" eventKey={1} href="#"><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
  37 +
  38 + <NavDropdown eventKey={2} title="Settings" name="Settings" id="setting">
  39 + <MenuItem eventKey={2.1}>Information</MenuItem>
  40 + <MenuItem eventKey={2.2}>Infrastructure</MenuItem>
  41 + <MenuItem eventKey={2.3}>Users</MenuItem>
  42 + <MenuItem eventKey={2.4}>Academic Settings</MenuItem>
  43 + <MenuItem eventKey={2.5}>Account Configuration</MenuItem>
  44 + </NavDropdown>
  45 + <NavDropdown eventKey={3} title="Academic" name="Academic" id="academic">
  46 + <MenuItem eventKey={3.1}>Layout 1</MenuItem>
  47 + <MenuItem eventKey={3.2}>Layout 2</MenuItem>
  48 + <MenuItem eventKey={3.3}>Layout 3</MenuItem>
  49 + <MenuItem eventKey={3.4}>Layout 4</MenuItem>
  50 + <MenuItem eventKey={3.5}>Layout 5</MenuItem>
  51 + </NavDropdown>
  52 + <NavDropdown eventKey={4} title="Communication" name="Communication" id="communication">
  53 + <MenuItem eventKey={4.1}>Primary palett</MenuItem>
  54 + <MenuItem eventKey={4.2}>Danger palett</MenuItem>
  55 + <MenuItem eventKey={4.3}>Success palett</MenuItem>
  56 + <MenuItem eventKey={4.4}>Warning palett</MenuItem>
  57 + <MenuItem divider />
  58 + <MenuItem eventKey={4.5}>Info palett</MenuItem>
  59 + <MenuItem eventKey={4.6}>Info palett</MenuItem>
  60 + <MenuItem eventKey={4.7}>Info palett</MenuItem>
  61 + <MenuItem eventKey={4.8}>Info palett</MenuItem>
  62 + </NavDropdown>
  63 + <NavDropdown eventKey={5} title="Finance" name="Finance" id="finance">
  64 + <MenuItem eventKey={5.1}>Primary palett</MenuItem>
  65 + <MenuItem eventKey={5.2}>Danger palett</MenuItem>
  66 + <MenuItem eventKey={5.3}>Success palett</MenuItem>
  67 + <MenuItem eventKey={5.4}>Warning palett</MenuItem>
  68 + <NavDropdown eventKey={5.5} title="Calumns" id="calumns">
  69 + <MenuItem>Success palett</MenuItem>
  70 + <MenuItem>Warning palett</MenuItem>
  71 + </NavDropdown>
  72 + </NavDropdown>
  73 +
  74 + <NavItem eventKey={6} href="#"><i className="icon-file-stats"></i><span> Reports </span></NavItem>
  75 + <NavItem eventKey={7} href="#"><i className="icon-design"></i> <span>Examinations</span></NavItem>
  76 +
  77 + </Nav>
  78 + </div>
  79 + </div>
  80 + </div>
  81 + </div>
  82 + );
  83 + };
  84 +
  85 +};
... ...
imports/client/views/org/admin/app/module/navigation/AuthenticatedNavigation.js
... ... @@ -20,7 +20,6 @@ export class AuthenticatedNavigation extends Component {
20 20 this.changeBodyClass = this.changeBodyClass.bind(this);
21 21 this.state = {
22 22 dropdownOpen: false,
23   - burgerMenu: false
24 23 };
25 24 }
26 25 toggle() {
... ... @@ -29,12 +28,10 @@ export class AuthenticatedNavigation extends Component {
29 28 });
30 29 }
31 30 changeBodyClass(){
32   - if(this.state.burgerMenu){
33   - $('body').addClass('sidebar-xs');
34   - this.setState({burgerMenu: false});
35   - }else{
  31 + if($('body').hasClass('sidebar-xs')){
36 32 $('body').removeClass('sidebar-xs');
37   - this.setState({burgerMenu: true});
  33 + }else{
  34 + $('body').addClass('sidebar-xs');
38 35 }
39 36 }
40 37 render(){
... ... @@ -62,7 +59,7 @@ export class AuthenticatedNavigation extends Component {
62 59 onClick = {this.changeBodyClass}
63 60 />
64 61 </NavItem>
65   -
  62 + {/**
66 63 <NavDropdown title="Dropdown" id="update">
67 64 <div className="dropdown-content">
68 65 <div className="dropdown-content-heading">
... ... @@ -133,32 +130,38 @@ export class AuthenticatedNavigation extends Component {
133 130 </div>
134 131 </div>
135 132 </NavDropdown>
  133 + **/}
136 134 </ul>
137 135 <div className="navbar-right">
138 136 <p className="navbar-text">Hello {user.getFullName()}</p>
139 137 <p className="navbar-text"
140 138 onClick = {() => logout()}
141 139 >
142   - <span className="label logout">logout</span>
143   - </p>
  140 + <span className="label logout">
  141 + logout
  142 + </span>
  143 + </p>
  144 + {/**
144 145 <Nav>
145   - <NavDropdown title="Activity" id="activity">
  146 + <NavDropdown title="Activity" id="activity">
146 147 <div className="dropdown-content">
147 148 <div className="dropdown-content-heading">
148 149 Activity
149 150 <ul className="icons-list">
150   - <li><a href="#"><i className="icon-menu7"></i></a></li>
  151 + <li><a href="#"><i className="icon-menu7"></i></a></li>
151 152 </ul>
152 153 </div>
153 154 <ul className="media-list dropdown-content-body width-350">
154 155 <li className="media">
155 156 <div className="media-left">
156   - <a href="#" className="btn bg-success-400 btn-rounded btn-icon btn-xs"><i className="icon-mention"></i></a>
  157 + <a href="#" className="btn bg-success-400 btn-rounded btn-icon btn-xs"><i className="icon-mention"></i></a>
157 158 </div>
158 159  
159 160 <div className="media-body">
160   - <a href="#">Taylor Swift</a> mentioned you in a post "Angular JS. Tips and tricks"
161   - <div className="media-annotation">4 minutes ago</div>
  161 + <a href="#">Taylor Swift</a> mentioned you in a post "Angular JS. Tips and tricks"
  162 + <div className="media-annotation">
  163 + 4 minutes ago
  164 + </div>
162 165 </div>
163 166 </li>
164 167 <li className="media">
... ... @@ -216,8 +219,9 @@ export class AuthenticatedNavigation extends Component {
216 219 </li>
217 220 </ul>
218 221 </div>
219   - </NavDropdown>
220   - <NavDropdown title="Messages" id="messages">
  222 + </NavDropdown>
  223 +
  224 + <NavDropdown title="Messages" id="messages">
221 225 <div className="dropdown-content width-350">
222 226 <div className="dropdown-content-heading">
223 227 Messages
... ... @@ -302,8 +306,9 @@ export class AuthenticatedNavigation extends Component {
302 306 <a href="#" data-popup="tooltip" title="All messages"><i className="icon-menu display-block"></i></a>
303 307 </div>
304 308 </div>
305   - </NavDropdown>
  309 + </NavDropdown>
306 310 </Nav>
  311 + **/}
307 312 </div>
308 313 </Navbar.Collapse>
309 314 </Navbar>
... ...
imports/client/views/org/admin/parents/parentsview.js
... ... @@ -6,8 +6,6 @@ import { Link,browserHistory } from &#39;react-router&#39;;
6 6 import { FormGroup,
7 7 FormControl,Glyphicon,Button } from 'react-bootstrap';
8 8 import { Header } from '../Header';
9   -import { AdminSidebar } from '../Sidebar'
10   -import { AdminBreadcrumb } from '../Breadcrumb'
11 9 import { ParentTable } from './view/ParentTable'
12 10  
13 11  
... ...