Sunny Negi / Meteor-projects

Download as
Browse Code ยป

Commit 02bf55675358695ddbec131bbc0a4c4c32fea426

Authored by anuj_thakur
1 parent 40e52f2f13
Exists in master

student view and navigation fixes

Showing 6 changed files with 180 additions and 72 deletions   Show diff stats
imports/client/views/nonOrg/enter/SignupView.js
Diff comments   View file @02bf556
... ... @@ -4,7 +4,7 @@ import { Icon } from '/imports/client/components/Icon'
4 4 import { LinkContainer } from 'react-router-bootstrap';
5 5 import { Row, Col, FormGroup,
6 6 ControlLabel, FormControl,
7   - InputGroup, Button,
  7 + InputGroup, Button,
8 8 Navbar,Modal, Nav, NavItem,
9 9 Glyphicon, Collapse,
10 10 NavbarToggler, NavbarBrand,
... ... @@ -52,7 +52,7 @@ export default class Signup extends React.Component {
52 52 return(
53 53 <div>
54 54 <div className="wrapper">
55   - <div className="Content">
  55 + <div className="Content signupView">
56 56 <Row>
57 57 <Col md={ 12 }>
58 58 <h1>Welcome to YoungDesk!!!</h1>
... ...
imports/client/views/nonOrg/enter/signup.css
Diff comments   View file @02bf556
... ... @@ -32,7 +32,7 @@
32 32 text-align: center;
33 33 }
34 34  
35   -.contact
  35 +.signupView .contact
36 36 {
37 37 text-align: center;
38 38 text-indent: 0px !important;
... ... @@ -43,24 +43,24 @@
43 43 /*width:1300px !important;*/
44 44 }
45 45  
46   -h1
  46 +.signupView h1
47 47 {
48 48 font-size: 45px !important;
49 49 }
50 50  
51   -p
  51 +.signupView p
52 52 {
53 53 text-indent: 50px;
54 54 text-align: justify;
55 55 font-size:15px;
56 56 }
57 57  
58   -h6
  58 +.signupView h6
59 59 {
60 60 text-align: center;
61 61 }
62 62  
63   -i
  63 +.signupView i
64 64 {
65 65 display: inline-block;
66 66 width: 100%;
... ... @@ -90,7 +90,7 @@ i
90 90 font-size: 14px;
91 91 }
92 92  
93   -hr {
  93 +.signupView hr {
94 94 display: block;
95 95 height: 1px;
96 96 border: 0;
... ...
imports/client/views/org/admin/students/StudentView.js
Diff comments   View file @02bf556
... ... @@ -3,9 +3,11 @@ import { Meteor } from &#39;meteor/meteor&#39;;
3 3  
4 4 import React, { Component } from 'react';
5 5 import { Link,browserHistory } from 'react-router';
6   -import { FormGroup,Panel,Table,
7   - ButtonToolbar,Modal,
8   - FormControl,Glyphicon,Button } from 'react-bootstrap';
  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';
9 11 import { AddStudent } from './addStudent';
10 12 import { StudentTable } from './StudentTable';
11 13 import { Header } from './Header';
... ... @@ -47,65 +49,150 @@ export class StudentView extends Component {
47 49 return _.includes(item.firstName.toLowerCase(),firstNameSearch.toLowerCase());
48 50 });
49 51 return (
50   - <div className="content has-detached-left">
51   - <div className="container-detached">
52   - <div className="content-detached">
53   - <Header/>
54   - <StudentTable
55   - data = {this.props.data}
56   - students = {students}
57   - />
58   - <AddStudent/>
59   - <UploadCsv />
60   - </div>
61   - </div>
62   - <div className="sidebar-detached affix-top">
63   - <div className="sidebar sidebar-default">
64   - <div className="sidebar-content">
65   -
66   - <div className="sidebar-category">
67   - <div className="category-title">
68   - <span>Advanced Search</span>
69   - <ul className="icons-list">
70   - <li><a href="#" data-action="collapse"></a></li>
71   - </ul>
72   - </div>
73   -
74   - <div className="category-content">
75   - <form action="#">
76   - <div className="has-feedback has-feedback-left">
77   - <input type="search" className="form-control"
78   - value={this.state.firstNameSearch}
79   - onChange={e=>this.onUpdate('firstNameSearch',e.target.value)}
80   - placeholder="First Name"
81   - />
82   - <div className="form-control-feedback">
83   - <i className="icon-search4 text-size-base text-muted"></i>
84   - </div>
85   - </div>
86   - </form>
87   - </div>
88   - <div className="category-content">
89   - <form action="#">
90   - <div className="has-feedback has-feedback-left">
91   - <input type="search" className="form-control"
92   - value={this.state.lastNameSearch}
93   - onChange={e=>this.onUpdate('lastNameSearch',e.target.value)}
94   - placeholder="Last Name" />
95   - <div className="form-control-feedback">
96   - <i className="icon-search4 text-size-base text-muted"></i>
97   - </div>
98   - </div>
99   - </form>
100   - </div>
101   -
102   - </div>
103   -
104   -
105   - </div>
106   - </div>
107   - </div>
108   -</div>
  52 + <div className="appLayout-box">
  53 + <div className="page-container">
  54 + <div className="page-content">
  55 + <div className="sidebar sidebar-main sidebar-default">
  56 + <div className="sidebar-content">
  57 +
  58 + <div className="sidebar-category sidebar-category-visible">
  59 + <div className="category-content no-padding">
  60 + <Nav className="navigation navigation-main navigation-accordion">
  61 + <NavItem className="navigation-header"><span>#schoolname</span> <i className="icon-menu" title="Main pages"></i></NavItem>
  62 + <NavItem className="active" eventKey={1} href="#"><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
  63 +
  64 + <NavDropdown eventKey={2} title="Settings" name="Settings" id="setting">
  65 + <MenuItem eventKey={2.1}>Information</MenuItem>
  66 + <MenuItem eventKey={2.2}>Infrastructure</MenuItem>
  67 + <MenuItem eventKey={2.3}>Users</MenuItem>
  68 + <MenuItem eventKey={2.4}>Academic Settings</MenuItem>
  69 + <MenuItem eventKey={2.5}>Account Configuration</MenuItem>
  70 + </NavDropdown>
  71 + <NavDropdown eventKey={3} title="Academic" name="Academic" id="academic">
  72 + <MenuItem eventKey={3.1}>Layout 1</MenuItem>
  73 + <MenuItem eventKey={3.2}>Layout 2</MenuItem>
  74 + <MenuItem eventKey={3.3}>Layout 3</MenuItem>
  75 + <MenuItem eventKey={3.4}>Layout 4</MenuItem>
  76 + <MenuItem eventKey={3.5}>Layout 5</MenuItem>
  77 + </NavDropdown>
  78 + <NavDropdown eventKey={4} title="Communication" name="Communication" id="communication">
  79 + <MenuItem eventKey={4.1}>Primary palett</MenuItem>
  80 + <MenuItem eventKey={4.2}>Danger palett</MenuItem>
  81 + <MenuItem eventKey={4.3}>Success palett</MenuItem>
  82 + <MenuItem eventKey={4.4}>Warning palett</MenuItem>
  83 + <MenuItem divider />
  84 + <MenuItem eventKey={4.5}>Info palett</MenuItem>
  85 + <MenuItem eventKey={4.6}>Info palett</MenuItem>
  86 + <MenuItem eventKey={4.7}>Info palett</MenuItem>
  87 + <MenuItem eventKey={4.8}>Info palett</MenuItem>
  88 + </NavDropdown>
  89 + <NavDropdown eventKey={5} title="Finance" name="Finance" id="finance">
  90 + <MenuItem eventKey={5.1}>Primary palett</MenuItem>
  91 + <MenuItem eventKey={5.2}>Danger palett</MenuItem>
  92 + <MenuItem eventKey={5.3}>Success palett</MenuItem>
  93 + <MenuItem eventKey={5.4}>Warning palett</MenuItem>
  94 + <NavDropdown eventKey={5.5} title="Calumns" id="calumns">
  95 + <MenuItem>Success palett</MenuItem>
  96 + <MenuItem>Warning palett</MenuItem>
  97 + </NavDropdown>
  98 + </NavDropdown>
  99 +
  100 + <NavItem eventKey={6} href="#"><i className="icon-file-stats"></i><span> Reports </span></NavItem>
  101 + <NavItem eventKey={7} href="#"><i className="icon-design"></i> <span>Examinations</span></NavItem>
  102 +
  103 + </Nav>
  104 + </div>
  105 + </div>
  106 + </div>
  107 + </div>
  108 + {/*end sidebar*/}
  109 + <div className="content-wrapper">
  110 + <div className="page-header page-header-default">
  111 + <div className="breadcrumb-line">
  112 + <Breadcrumb>
  113 + <Breadcrumb.Item href="#">
  114 + <i className="icon-home2 position-left"></i> Users
  115 + </Breadcrumb.Item>
  116 + <Breadcrumb.Item active href="#">
  117 + Setup
  118 + </Breadcrumb.Item>
  119 + </Breadcrumb>
  120 +
  121 + <ul className="breadcrumb-elements">
  122 + <NavItem href="#"><i className="icon-comment-discussion position-left"></i> Support</NavItem>
  123 + <NavDropdown title="Settings" id="setting">
  124 + <MenuItem><i className="icon-user-lock"></i> Account security</MenuItem>
  125 + <MenuItem><i className="icon-statistics"></i> Analytics</MenuItem>
  126 + <MenuItem><i className="icon-accessibility"></i> Accessibility</MenuItem>
  127 + <MenuItem divider/>
  128 + <MenuItem><i className="icon-gear"></i> All settings</MenuItem>
  129 + </NavDropdown>
  130 +
  131 + </ul>
  132 + </div>
  133 + </div>
  134 + {/*content*/}
  135 +
  136 + <div className="content has-detached-left">
  137 + <div className="container-detached">
  138 + <div className="content-detached">
  139 + <Header/>
  140 + <StudentTable
  141 + data = {this.props.data}
  142 + students = {students}
  143 + />
  144 + <AddStudent/>
  145 + <UploadCsv />
  146 + </div>
  147 + </div>
  148 + <div className="sidebar-detached affix-top">
  149 + <div className="sidebar sidebar-default">
  150 + <div className="sidebar-content">
  151 +
  152 + <div className="sidebar-category">
  153 + <div className="category-title">
  154 + <span>Advanced Search</span>
  155 + <ul className="icons-list">
  156 + <li><a href="#" data-action="collapse"></a></li>
  157 + </ul>
  158 + </div>
  159 +
  160 + <div className="category-content">
  161 + <form action="#">
  162 + <div className="has-feedback has-feedback-left">
  163 + <input type="search" className="form-control"
  164 + value={this.state.firstNameSearch}
  165 + onChange={e=>this.onUpdate('firstNameSearch',e.target.value)}
  166 + placeholder="First Name"
  167 + />
  168 + <div className="form-control-feedback">
  169 + <i className="icon-search4 text-size-base text-muted"></i>
  170 + </div>
  171 + </div>
  172 + </form>
  173 + </div>
  174 + <div className="category-content">
  175 + <form action="#">
  176 + <div className="has-feedback has-feedback-left">
  177 + <input type="search" className="form-control"
  178 + value={this.state.lastNameSearch}
  179 + onChange={e=>this.onUpdate('lastNameSearch',e.target.value)}
  180 + placeholder="Last Name" />
  181 + <div className="form-control-feedback">
  182 + <i className="icon-search4 text-size-base text-muted"></i>
  183 + </div>
  184 + </div>
  185 + </form>
  186 + </div>
  187 + </div>
  188 + </div>
  189 + </div>
  190 + </div>
  191 + </div>
  192 + </div>
  193 + </div>
  194 + </div>
  195 + </div>
109 196 );
110 197 };
111 198  
... ...
imports/client/views/org/admin/students/addStudent.js
Diff comments   View file @02bf556
... ... @@ -51,9 +51,11 @@ export class AddStudent extends Component {
51 51 <Modal.Body>
52 52 <AddStudentFormContainer />
53 53 </Modal.Body>
  54 + {/*
54 55 <Modal.Footer>
55 56 <Button onClick={this.hideModal}>Close</Button>
56 57 </Modal.Footer>
  58 + */}
57 59 </Modal>
58 60 </ButtonToolbar>
59 61 );
... ...
public/css/assets/css/components.css
Diff comments   View file @02bf556
... ... @@ -215,6 +215,7 @@ a.badge,
215 215 font-weight: 500;
216 216 font-size: 11px;
217 217 line-height: 1.82;
  218 + color: #000;
218 219 }
219 220 .category-title > i {
220 221 position: absolute;
... ... @@ -366,6 +367,7 @@ a.badge,
366 367 .navigation li a > i {
367 368 float: left;
368 369 top: 0;
  370 + width: auto;
369 371 margin-top: 2px;
370 372 margin-right: 15px;
371 373 -webkit-transition: opacity 0.2s ease-in-out;
... ... @@ -571,6 +573,9 @@ a.badge,
571 573 background-color: #f5f5f5;
572 574 color: #333333;
573 575 }
  576 +.sidebar-default .navigation > li > a > span {
  577 + color: inherit;
  578 +}
574 579 .sidebar-default .navigation > li.active > a .label-transparent {
575 580 color: #333333;
576 581 }
... ... @@ -20221,4 +20226,11 @@ label.display-block {
20221 20226  
20222 20227 .sidebar-xs .sidebar-main .navigation > li:hover > a:after {
20223 20228 display: block !important;
20224   -}
20225 20229 \ No newline at end of file
  20230 +}
  20231 +/*multistep*/
  20232 +.stepy-validation div[style*="text-align: left"] {
  20233 + text-align: right !important;
  20234 +}
  20235 +.stepy-validation div[style*="display: inline-block"] .btn i {
  20236 + display: none;
  20237 +}
... ...
public/css/assets/css/core.css
Diff comments   View file @02bf556
... ... @@ -4041,7 +4041,7 @@ select[multiple].input-group-xs &gt; .input-group-btn &gt; .btn {
4041 4041 -webkit-box-shadow: 0 1px 0 #fff;
4042 4042 box-shadow: 0 1px 0 #fff;
4043 4043 }
4044   - .navbar-inverse .navbar-nav .open .dropdown-menu a:not(.label-flat):not(.badge-flat):not(.disabled > a) {
  4044 + .navbar-inverse .navbar-nav .open .dropdown-menu a:not(.label-flat):not(.badge-flat):not(.disabled) > a {
4045 4045 color: rgba(255, 255, 255, 0.9);
4046 4046 }
4047 4047 .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
... ... @@ -4710,6 +4710,10 @@ ul.dropdown-menu .dropdown-content-heading:first-child {
4710 4710 .breadcrumb > li i {
4711 4711 display: inline-block;
4712 4712 font-size: 12px;
  4713 + width: auto;
  4714 +}
  4715 +.breadcrumb > li span{
  4716 + color: inherit;
4713 4717 }
4714 4718 .breadcrumb > li > .dropdown-menu {
4715 4719 margin-top: 0;
... ... @@ -4856,6 +4860,9 @@ ul.dropdown-menu .dropdown-content-heading:first-child {
4856 4860 margin-left: 20px;
4857 4861 margin-right: 20px;
4858 4862 }
  4863 +.breadcrumb-elements > li i{
  4864 + width: auto;
  4865 +}
4859 4866 .breadcrumb-line[class*=bg-] a,
4860 4867 .breadcrumb-line[class*=bg-] i {
4861 4868 color: inherit;
... ...