Sunny Negi / Meteor-projects

Download as
Browse Code ยป

Commit 1d1a74ececdfeb3a6e4694d514f3a5dff3d28737

Authored by Deepak
2 parents 7aa6f173b0 9fc4b89838
Exists in master

Merge branch 'anuj'

Showing 5 changed files   Show diff stats
imports/client/layouts/OrgApp.js
Diff comments   View file @1d1a74e
... ... @@ -15,8 +15,9 @@ import {AppNavigationController} from '/imports/client/views/org/app/module/n
15 15 return (
16 16 <div>
17 17 <AppNavigationController />
  18 + { this.props.children }
18 19 <Grid>
19   - { this.props.children }
  20 +
20 21 </Grid>
21 22 </div>
22 23 )
... ...
imports/client/views/org/app/module/AppLayout.js
Diff comments   View file @1d1a74e
... ... @@ -7,8 +7,14 @@ 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 { VerifyModule } from '/imports/client/views/verify/module/index';
10   -
11   -
  10 +import { Navbar,Modal, Nav, NavItem,
  11 + Glyphicon, Collapse,
  12 + NavbarToggler, NavbarBrand,
  13 + NavLink, DropdownItem, DropdownToggle, DropdownMenu,
  14 + NavDropdown, MenuItem } from 'react-bootstrap';
  15 +
  16 +var Accordion = require('react-bootstrap').Accordion;
  17 +var Panel = require('react-bootstrap').Panel;
12 18 export class AppLayout extends Component {
13 19  
14 20 render() {
... ... @@ -24,7 +30,133 @@ export class AppLayout extends Component {
24 30 );
25 31 }
26 32 return (
  33 +
27 34 <div className = "appLayout-box">
  35 + <div className="page-container">
  36 + <div className="page-content">
  37 + <div className="sidebar sidebar-main sidebar-default">
  38 + <div className="sidebar-content">
  39 +
  40 + <div className="sidebar-category sidebar-category-visible">
  41 + <div className="category-content no-padding">
  42 + <Nav className="navigation navigation-main navigation-accordion">
  43 + <NavItem className="navigation-header"><span>#schoolname</span> <i className="icon-menu" title="Main pages"></i></NavItem>
  44 + <NavItem className="active" eventKey={1} href="#"><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
  45 +
  46 + <NavDropdown eventKey={2} title="Settings" id="setting">
  47 + <MenuItem eventKey={2.1}>Information</MenuItem>
  48 + <MenuItem eventKey={2.2}>Infrastructure</MenuItem>
  49 + <MenuItem eventKey={2.3}>Users</MenuItem>
  50 + <MenuItem eventKey={2.4}>Academic Settings</MenuItem>
  51 + <MenuItem eventKey={2.5}>Account Configuration</MenuItem>
  52 +
  53 + </NavDropdown>
  54 + <li>
  55 + <a href="#"><i className="icon-copy"></i> <span>Academic</span></a>
  56 + <ul>
  57 + <li><a href="../../../layout_1/LTR/index.html" id="layout1">Layout 1</a></li>
  58 + <li><a href="index.html" id="layout2">Layout 2 <span className="label bg-warning-400">Current</span></a></li>
  59 + <li><a href="../../../layout_3/LTR/index.html" id="layout3">Layout 3</a></li>
  60 + <li><a href="../../../layout_4/LTR/index.html" id="layout4">Layout 4</a></li>
  61 + <li><a href="../../../layout_5/LTR/index.html" id="layout5">Layout 5</a></li>
  62 + <li className="disabled"><a href="../../../layout_6/LTR/index.html" id="layout6">Layout 6 <span className="label label-transparent">Coming soon</span></a></li>
  63 + </ul>
  64 + </li>
  65 + <li>
  66 + <a href="#"><i className="glyphicon glyphicon-send"></i> <span>Communication</span></a>
  67 + <ul>
  68 + <li><a href="#">Primary palette</a></li>
  69 + <li><a href="#">Danger palette</a></li>
  70 + <li><a href="#">Success palette</a></li>
  71 + <li><a href="#">Warning palette</a></li>
  72 + <li><a href="#">Info palette</a></li>
  73 + <li className="navigation-divider"></li>
  74 + <li><a href="#">Pink palette</a></li>
  75 + <li><a href="#">Violet palette</a></li>
  76 + <li><a href="#">Purple palette</a></li>
  77 + <li><a href="#">Indigo palette</a></li>
  78 + <li><a href="colors_blue.html">Blue palette</a></li>
  79 + <li><a href="colors_teal.html">Teal palette</a></li>
  80 + <li><a href="colors_green.html">Green palette</a></li>
  81 + <li><a href="colors_orange.html">Orange palette</a></li>
  82 + <li><a href="colors_brown.html">Brown palette</a></li>
  83 + <li><a href="colors_grey.html">Grey palette</a></li>
  84 + <li><a href="colors_slate.html">Slate palette</a></li>
  85 + </ul>
  86 + </li>
  87 + <li>
  88 + <a href="#"><i className="glyphicon glyphicon-stats"></i> <span>Finance</span></a>
  89 + <ul>
  90 + <li><a href="starters/horizontal_nav.html">Horizontal navigation</a></li>
  91 + <li><a href="starters/1_col.html">1 column</a></li>
  92 + <li><a href="starters/2_col.html">2 columns</a></li>
  93 + <li>
  94 + <a href="#">3 columns</a>
  95 + <ul>
  96 + <li><a href="starters/3_col_dual.html">Dual sidebars</a></li>
  97 + <li><a href="starters/3_col_double.html">Double sidebars</a></li>
  98 + </ul>
  99 + </li>
  100 + <li><a href="starters/4_col.html">4 columns</a></li>
  101 + <li>
  102 + <a href="#">Detached layout</a>
  103 + <ul>
  104 + <li><a href="starters/detached_left.html">Left sidebar</a></li>
  105 + <li><a href="starters/detached_right.html">Right sidebar</a></li>
  106 + <li><a href="starters/detached_sticky.html">Sticky sidebar</a></li>
  107 + </ul>
  108 + </li>
  109 + <li><a href="starters/layout_boxed.html">Boxed layout</a></li>
  110 + <li className="navigation-divider"></li>
  111 + <li><a href="starters/layout_navbar_fixed_main.html">Fixed main navbar</a></li>
  112 + <li><a href="starters/layout_navbar_fixed_secondary.html">Fixed secondary navbar</a></li>
  113 + <li><a href="starters/layout_navbar_fixed_both.html">Both navbars fixed</a></li>
  114 + <li><a href="starters/layout_fixed.html">Fixed layout</a></li>
  115 + </ul>
  116 + </li>
  117 + <li><a href=""><i className="icon-file-stats"></i><span> Reports </span></a></li>
  118 + <li><a href=""><i className="icon-design"></i> <span>Examinations</span></a></li>
  119 +
  120 + </Nav>
  121 + </div>
  122 + </div>
  123 + </div>
  124 + </div>
  125 + {/*end sidebar*/}
  126 + <div className="content-wrapper">
  127 +
  128 + <div className="page-header page-header-default">
  129 + <div className="breadcrumb-line">
  130 + <ul className="breadcrumb">
  131 + <li><a href="index.html"><i className="icon-home2 position-left"></i> Users</a></li>
  132 + <li className="active">Setup</li>
  133 + </ul>
  134 +
  135 + <ul className="breadcrumb-elements">
  136 + <li><a href="#"><i className="icon-comment-discussion position-left"></i> Support</a></li>
  137 + <li className="dropdown">
  138 + <a href="#" className="dropdown-toggle" data-toggle="dropdown">
  139 + <i className="icon-gear position-left"></i>
  140 + Settings
  141 + <span className="caret"></span>
  142 + </a>
  143 +
  144 + <ul className="dropdown-menu dropdown-menu-right">
  145 + <li><a href="#"><i className="icon-user-lock"></i> Account security</a></li>
  146 + <li><a href="#"><i className="icon-statistics"></i> Analytics</a></li>
  147 + <li><a href="#"><i className="icon-accessibility"></i> Accessibility</a></li>
  148 + <li className="divider"></li>
  149 + <li><a href="#"><i className="icon-gear"></i> All settings</a></li>
  150 + </ul>
  151 + </li>
  152 + </ul>
  153 + </div>
  154 + </div>
  155 + </div>
  156 + {/*end content*/}
  157 +
  158 + </div>
  159 + </div>
28 160  
29 161 <div className = "appLayout-wrapOuter">
30 162 <div className = "appLayout-wrapInner">
... ...
imports/client/views/org/app/module/navigation/AuthenticatedNavigation.js
Diff comments   View file @1d1a74e
... ... @@ -45,8 +45,8 @@ export class AuthenticatedNavigation extends Component {
45 45 <NavItem eventKey={1} href="#" className="sidebar-control sidebar-main-toggle hidden-xs">
46 46 <i className="icon-paragraph-justify3"/>
47 47 </NavItem>
48   - <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
49   -
  48 +
  49 + <NavDropdown title="Dropdown" id="update">
50 50 <div className="dropdown-content">
51 51 <div className="dropdown-content-heading">
52 52 Git updates
... ... @@ -121,23 +121,177 @@ export class AuthenticatedNavigation extends Component {
121 121 <p className="navbar-text">Hello {user.getFullName()}</p>
122 122 <p className="navbar-text"><span className="label bg-success-400">Online</span></p>
123 123 <Nav>
124   - <NavItem eventKey={2} href="#" >
125   - <i className="icon-bell2"/>
126   - <span className="visible-xs-inline-block position-right">Activity</span>
127   - <span className="status-mark border-orange-400"></span>
128   - </NavItem>
129   - <NavItem eventKey={2} href="#">
130   - <i className="icon-bubble8"></i>
131   - <span className="visible-xs-inline-block position-right">Messages</span>
132   - <span className="status-mark border-orange-400"></span>
133   - {/*<div
  124 + <NavDropdown title="Activity" id="activity">
  125 + <div className="dropdown-content">
  126 + <div className="dropdown-content-heading">
  127 + Activity
  128 + <ul className="icons-list">
  129 + <li><a href="#"><i className="icon-menu7"></i></a></li>
  130 + </ul>
  131 + </div>
  132 + <ul className="media-list dropdown-content-body width-350">
  133 + <li className="media">
  134 + <div className="media-left">
  135 + <a href="#" className="btn bg-success-400 btn-rounded btn-icon btn-xs"><i className="icon-mention"></i></a>
  136 + </div>
  137 +
  138 + <div className="media-body">
  139 + <a href="#">Taylor Swift</a> mentioned you in a post "Angular JS. Tips and tricks"
  140 + <div className="media-annotation">4 minutes ago</div>
  141 + </div>
  142 + </li>
  143 + <li className="media">
  144 + <div className="media-left">
  145 + <a href="#" className="btn bg-pink-400 btn-rounded btn-icon btn-xs"><i className="icon-paperplane"></i></a>
  146 + </div>
  147 +
  148 + <div className="media-body">
  149 + Special offers have been sent to subscribed users by <a href="#">Donna Gordon</a>
  150 + <div className="media-annotation">36 minutes ago</div>
  151 + </div>
  152 + </li>
  153 + <li className="media">
  154 + <div className="media-left">
  155 + <a href="#" className="btn bg-blue btn-rounded btn-icon btn-xs"><i className="icon-plus3"></i></a>
  156 + </div>
  157 +
  158 + <div className="media-body">
  159 + <a href="#">Chris Arney</a> created a new <span className="text-semibold">Design</span> branch in <span className="text-semibold">Limitless</span> repository
  160 + <div className="media-annotation">2 hours ago</div>
  161 + </div>
  162 + </li>
  163 +
  164 + <li className="media">
  165 + <div className="media-left">
  166 + <a href="#" className="btn bg-purple-300 btn-rounded btn-icon btn-xs"><i className="icon-truck"></i></a>
  167 + </div>
  168 +
  169 + <div className="media-body">
  170 + Shipping cost to the Netherlands has been reduced, database updated
  171 + <div className="media-annotation">Feb 8, 11:30</div>
  172 + </div>
  173 + </li>
  174 +
  175 + <li className="media">
  176 + <div className="media-left">
  177 + <a href="#" className="btn bg-warning-400 btn-rounded btn-icon btn-xs"><i className="icon-bubble8"></i></a>
  178 + </div>
  179 +
  180 + <div className="media-body">
  181 + New review received on <a href="#">Server side integration</a> services
  182 + <div className="media-annotation">Feb 2, 10:20</div>
  183 + </div>
  184 + </li>
  185 +
  186 + <li className="media">
  187 + <div className="media-left">
  188 + <a href="#" className="btn bg-teal-400 btn-rounded btn-icon btn-xs"><i className="icon-spinner11"></i></a>
  189 + </div>
  190 +
  191 + <div className="media-body">
  192 + <strong>January, 2016</strong> - 1320 new users, 3284 orders, $49,390 revenue
  193 + <div className="media-annotation">Feb 1, 05:46</div>
  194 + </div>
  195 + </li>
  196 + </ul>
  197 + </div>
  198 + </NavDropdown>
  199 + <NavDropdown title="Messages" id="messages">
  200 + <div className="dropdown-content width-350">
  201 + <div className="dropdown-content-heading">
  202 + Messages
  203 + <ul className="icons-list">
  204 + <li><a href="#"><i className="icon-compose"></i></a></li>
  205 + </ul>
  206 + </div>
  207 +
  208 + <ul className="media-list dropdown-content-body">
  209 + <li className="media">
  210 + <div className="media-left">
  211 +
  212 + <span className="badge bg-danger-400 media-badge">5</span>
  213 + </div>
  214 +
  215 + <div className="media-body">
  216 + <a href="#" className="media-heading">
  217 + <span className="text-semibold">James Alexander</span>
  218 + <span className="media-annotation pull-right">04:58</span>
  219 + </a>
  220 +
  221 + <span className="text-muted">who knows, maybe that would be the best thing for me...</span>
  222 + </div>
  223 + </li>
  224 +
  225 + <li className="media">
  226 + <div className="media-left">
  227 +
  228 + <span className="badge bg-danger-400 media-badge">4</span>
  229 + </div>
  230 +
  231 + <div className="media-body">
  232 + <a href="#" className="media-heading">
  233 + <span className="text-semibold">Margo Baker</span>
  234 + <span className="media-annotation pull-right">12:16</span>
  235 + </a>
  236 +
  237 + <span className="text-muted">That was something he was unable to do because...</span>
  238 + </div>
  239 + </li>
  240 +
  241 + <li className="media">
  242 + <div className="media-left"></div>
  243 + <div className="media-body">
  244 + <a href="#" className="media-heading">
  245 + <span className="text-semibold">Jeremy Victorino</span>
  246 + <span className="media-annotation pull-right">22:48</span>
  247 + </a>
  248 +
  249 + <span className="text-muted">But that would be extremely strained and suspicious...</span>
  250 + </div>
  251 + </li>
  252 +
  253 + <li className="media">
  254 + <div className="media-left"></div>
  255 + <div className="media-body">
  256 + <a href="#" className="media-heading">
  257 + <span className="text-semibold">Beatrix Diaz</span>
  258 + <span className="media-annotation pull-right">Tue</span>
  259 + </a>
  260 +
  261 + <span className="text-muted">What a strenuous career it is that I've chosen...</span>
  262 + </div>
  263 + </li>
  264 +
  265 + <li className="media">
  266 + <div className="media-left">
  267 +
  268 + </div>
  269 + <div className="media-body">
  270 + <a href="#" className="media-heading">
  271 + <span className="text-semibold">Richard Vango</span>
  272 + <span className="media-annotation pull-right">Mon</span>
  273 + </a>
  274 +
  275 + <span className="text-muted">Other travelling salesmen live a life of luxury...</span>
  276 + </div>
  277 + </li>
  278 + </ul>
  279 +
  280 + <div className="dropdown-content-footer">
  281 + <a href="#" data-popup="tooltip" title="All messages"><i className="icon-menu display-block"></i></a>
  282 + </div>
  283 + </div>
  284 + </NavDropdown>
  285 +
  286 + {/* <NavItem eventKey={2} href="#">
  287 + <div
134 288 className = "appLayout-topItem"
135 289 onClick = {() => logout()}
136 290 >
137 291 logout
138   - </div>*/}
139   - </NavItem>
140   -
  292 + </div>
  293 + </NavItem>*/}
  294 +
141 295 </Nav>
142 296 </div>
143 297  
... ...
public/css/assets/css/components.css
Diff comments   View file @1d1a74e
... ... @@ -445,6 +445,11 @@ a.badge,
445 445 min-height: 44px;
446 446 font-weight: 500;
447 447 }
  448 +.navigation .navigation-header a {
  449 + padding: 0;
  450 + min-height: initial;
  451 + background: transparent !important;
  452 +}
448 453 .navigation > li.active > a,
449 454 .navigation > li.active > a:hover,
450 455 .navigation > li.active > a:focus {
... ... @@ -20086,3 +20091,19 @@ label.display-block {
20086 20091 float: right;
20087 20092 display: block;
20088 20093 }
  20094 +
  20095 +/*new css*/
  20096 +.sidebar-content ul.dropdown-menu {
  20097 + position: static;
  20098 + opacity: 1;
  20099 + width: 100%;
  20100 + clear: both;
  20101 + display: block;
  20102 + max-height: 0;
  20103 + overflow: hidden;
  20104 + transition: all .3s;
  20105 +}
  20106 +
  20107 +.sidebar-content li.dropdown.open ul.dropdown-menu {
  20108 + max-height: 1000px;
  20109 +}
20089 20110 \ No newline at end of file
... ...
public/css/assets/css/core.css
Diff comments   View file @1d1a74e
... ... @@ -371,6 +371,24 @@ a.bg-danger:focus {
371 371 nav.bg-crimson.navbar .container {
372 372 width: 100%;
373 373 }
  374 +.nav a#messages {
  375 + font-size: 0;
  376 +}
  377 +.nav a#messages .caret:after {
  378 + content: "\eb14";
  379 +}
  380 +.nav a#activity .caret:after {
  381 + content: "\eaac";
  382 +}
  383 +.nav a#activity {
  384 + font-size: 0;
  385 +}
  386 +.nav a#update {
  387 + font-size: 0;
  388 +}
  389 +.nav a#update .caret:after {
  390 + content: "\ec1e";
  391 +}
374 392 .page-header-inverse {
375 393 background-color: #273246;
376 394 color: #fff;
... ...