Skip to content

U
ulakbus-ui
Commit f54e8e16 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

Merge branch 'mergedesign'

parents 23f35a14 2fce5801
Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 123 deletions
app/app.css
View file @ f54e8e16
/* Space out content a bit */ /* Space out content a bit */
body { body {
font-family:'robotoregular'; font-family:'robotoregular';
background-color: #222d32;
overflow:hidden;
}
.btn:focus,
.btn:active:focus,
.btn.active:focus,
.btn.focus,
.btn:active.focus,
.btn.active.focus {
outline: none;
}
a {
color:#a61229;
}
a:hover {
color:#941A1A;
}
.breadcrumb {
background-color:transparent;
padding:0;
font-size:18px;
}
.brand {
border-bottom:1px solid #ccc;
}
.logo {
}
.logo img {
width: 80%;
margin-left: 8%;
margin-top: 23px;
margin-bottom: 23px;
} }
/* Everything but the jumbotron gets side spacing for mobile first views */ /* Everything but the jumbotron gets side spacing for mobile first views */
...@@ -33,7 +73,7 @@ body { ...@@ -33,7 +73,7 @@ body {
nav.navbar { nav.navbar {
background-color: #A61229; background-color: #A61229;
border-color: #941A1A; border-color: #941A1A;
min-height:65px; min-height:30px;
} }
a.navbar-brand img { a.navbar-brand img {
...@@ -75,10 +115,31 @@ a.navbar-brand img { ...@@ -75,10 +115,31 @@ a.navbar-brand img {
margin-top: 28px; margin-top: 28px;
} }
ul.header-menu {
float:left;
padding-left:23px;
}
ul.header-menu li {
list-style:none;
float:left;
margin-right:15px;
margin-top:10px;
}
ul.header-menu li a{
color:#fff;
text-decoration:none;
opacity:0.9;
}
ul.header-menu li a:hover{
opacity:1;
}
.nav>li>a { .nav>li>a {
color: #b8c7ce; color: #696969;
border-left: 3px solid transparent; border-left:3px solid transparent;
padding:15px;
-webkit-transition: all .2s; -webkit-transition: all .2s;
-moz-transition: all .2s; -moz-transition: all .2s;
-ms-transition: all .2s; -ms-transition: all .2s;
...@@ -86,20 +147,30 @@ a.navbar-brand img { ...@@ -86,20 +147,30 @@ a.navbar-brand img {
transition: all .2s; transition: all .2s;
} }
.sidebar .nav>li ul {
border-bottom: 3px solid #E4E4E4;
border-left: 3px solid #A61229;
}
.sidebar .nav>li ul>li a {
font-family:'robotoregular';
background-color:#f5f5f5;
}
.nav>li>a:visited { .nav>li>a:visited {
background-color: #222d32;
} }
.nav>li.active>a { .nav>li.active>a {
text-decoration: none; text-decoration: none;
background-color: #1e282c; background-color: #f5f5f5;
color:#fff; color: #565656;
border-color:#A61229; border-color:#A61229;
} }
.nav>li.active>a:hover,
.sidebar .nav>li ul>li a:hover,
.nav>li>a:hover { .nav>li>a:hover {
background-color: #1e282c; background-color:#f9f9f9;
color:#fff;
} }
/*! /*!
...@@ -108,18 +179,51 @@ a.navbar-brand img { ...@@ -108,18 +179,51 @@ a.navbar-brand img {
* For details, see http://www.apache.org/licenses/LICENSE-2.0. * For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/ */
body { select {
background-color: #222d32; padding: 5px 10px;
border-color: #dcdcdc;
outline: none;
} }
#wrapper { #wrapper {
width: 100%; width: 100%;
} }
#page-wrapper { .manager-view {
padding: 0 15px; height:100%;
min-height: 568px; width: calc(100% - 250px);
background-color: #fff; -webkit-width: calc(100% - 250px);
position: absolute;
right: 0;
background-color:#f5f5f5;
}
.manager-view-inner {
height:calc(100% - 41px);
-webkit-height:calc(100% - 41px);
width:100%;
display: -webkit-flex;
display: flex;
-webkit-flex-direction: column;
flex-direction: column;
}
.manager-view-header {
width:100%;
padding:10px 15px;
background-color:#fff;
border-bottom:1px solid #ccc;
-webkit-flex-shrink: 0;
flex-shrink: 0;
position:relative;
z-index:1;
}
.manager-view-content {
padding:35px 50px;
overflow:auto;
-webkit-flex-grow: 1;
flex-grow: 1;
} }
.navbar-top-links { .navbar-top-links {
...@@ -135,8 +239,6 @@ body { ...@@ -135,8 +239,6 @@ body {
} }
.navbar-top-links li a { .navbar-top-links li a {
padding: 22px 20px;
min-height: 65px;
color:#fff; color:#fff;
cursor:pointer; cursor:pointer;
} }
...@@ -205,7 +307,9 @@ body { ...@@ -205,7 +307,9 @@ body {
} }
.sidebar { .sidebar {
background-color:#222d32; background-color:#fff;
border-right: 1px solid #ccc;
overflow:auto;
} }
.sidebar .sidebar-nav.navbar-collapse { .sidebar .sidebar-nav.navbar-collapse {
...@@ -218,6 +322,9 @@ body { ...@@ -218,6 +322,9 @@ body {
} }
.sidebar ul li { .sidebar ul li {
font-family: 'robotomedium';
letter-spacing: 0.2px;
border-bottom: 1px solid #DCDCDC;
} }
.sidebar ul li a.active { .sidebar ul li a.active {
...@@ -623,10 +730,13 @@ table.dataTable thead .sorting:after { ...@@ -623,10 +730,13 @@ table.dataTable thead .sorting:after {
border-bottom: 0; border-bottom: 0;
} }
.sidebar { .sidebar {
z-index: 1; z-index: 1;
position: absolute; position: absolute;
width: 250px; width: 250px;
margin-top: 65px; height: 100%;
-webkit-box-shadow: 0 0 25px rgba(0,0,0,0.1);
-moz-box-shadow: 0 0 25px rgba(0,0,0,0.1);
box-shadow: 0 0 25px rgba(0,0,0,0.1);
} }
.navbar-top-links .dropdown-messages, .navbar-top-links .dropdown-messages,
...@@ -634,21 +744,20 @@ table.dataTable thead .sorting:after { ...@@ -634,21 +744,20 @@ table.dataTable thead .sorting:after {
.navbar-top-links .dropdown-alerts { .navbar-top-links .dropdown-alerts {
margin-left: auto; margin-left: auto;
} }
#page-wrapper {
position: inherit;
margin: 0 0 0 250px;
padding: 0 30px;
border-left: 1px solid #e7e7e7;
background-color:#fcfcfc;
}
.container { .container {
max-width: 730px; max-width: 730px;
} }
.manager-view {
height:100%;
}
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.manager-view {
width:100%;
}
ul.timeline:before { ul.timeline:before {
left: 40px; left: 40px;
} }
......
app/components/dashboard/dashboard.html
View file @ f54e8e16
<div ng-app="ulakbus.dashboard"> <div ng-app="ulakbus.dashboard">
<div class="starter-template"> <div class="starter-template">
<h1>Main Dashboard2</h1>
<!-- {{ testData }} --> <!-- table view -->
<table class="table table-bordered" style="background-color:#fff;"> <table class="table table-bordered" style="background-color:#fff;">
<thead> <thead>
<tr> <tr>
<th colspan="2">#</th> <th colspan="2">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
Hepsini Seç
</label>
</th>
<th>First Name</th> <th>First Name</th>
<th>Last Name</th> <th>Last Name</th>
<th>Username</th> <th>Username</th>
...@@ -80,5 +85,23 @@ ...@@ -80,5 +85,23 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- end of table view -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
İşlemler <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="">İşlem 1</a></li>
<li><a href="">İşlem 2</a></li>
<li><a href="">İşlem 3</a></li>
<li role="separator" class="divider"></li>
<li><a href="">İşlem 4</a></li>
</ul>
</div>
<hr>
</div> </div>
</div> </div>
\ No newline at end of file
app/components/personelinfo/personelinfo.html 0 → 100644
View file @ f54e8e16
<div ng-app="ulakbus.personelinfo">
<div class="starter-template">
<!-- table view -->
<table class="table table-bordered" style="background-color:#fff;">
<thead>
<tr>
<th colspan="2">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
Hepsini Seç2
</label>
</th>
<th>First Name</th>
<th>Last Name</th>
<th>Username</th>
</tr>
</thead>
<tbody>
<tr>
<td width="60">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">1</th>
<td>Mark</td>
<td>Otto</td>
<td>@mdo</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">2</th>
<td>Jacob</td>
<td>Thornton</td>
<td>@fat</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">3</th>
<td>Larry</td>
<td>the Bird</td>
<td>@twitter</td>
</tr>
<tr>
<td width="60">
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">4</th>
<td>Mark</td>
<td>Otto</td>
<td>@mdo</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">5</th>
<td>Jacob</td>
<td>Thornton</td>
<td>@fat</td>
</tr>
<tr>
<td>
<label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label>
</td>
<th scope="row" style="text-align:center">6</th>
<td>Larry</td>
<td>the Bird</td>
<td>@twitter</td>
</tr>
</tbody>
</table>
<!-- end of table view -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
İşlemler <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="">İşlem 1</a></li>
<li><a href="">İşlem 2</a></li>
<li><a href="">İşlem 3</a></li>
<li role="separator" class="divider"></li>
<li><a href="">İşlem 4</a></li>
</ul>
</div>
<hr>
</div>
</div>
\ No newline at end of file
app/index.html
View file @ f54e8e16
...@@ -27,8 +27,13 @@ ...@@ -27,8 +27,13 @@
<body> <body>
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<ul class="header-menu">
<li><a href="">Mesajlar</a></li>
<li><a href="">Görevler</a></li>
<li><a href="">Raporlar</a></li>
<li><a href="">Ayarlar</a></li>
</ul>
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
...@@ -39,23 +44,35 @@ ...@@ -39,23 +44,35 @@
</div> </div>
<!-- /.navbar-header --> <!-- /.navbar-header -->
<header-notification></header-notification> <header-notification></header-notification>
<sidebar></sidebar>
</nav> </nav>
<sidebar></sidebar>
<div class="manager-view">
<div class="manager-view-inner">
<!-- manager-header -->
<div class="manager-view-header container-fluid">
<ul class="breadcrumb">
<li><a href="#">Personeller</a></li>
<li><a href="#">Liste</a></li>
<li class="active">Tablo</li>
</ul>
<button type="button" class="btn btn-primary">Kaydet</button>
</div>
<!-- end of manager-header -->
<div class="manager-view-content">
<div class="row">
<div class="main" ng-view>
</div>
<div id="page-wrapper">
<div class="col-md-12">
<div class="row">
<div class="main" ng-view>
</div> </div>
<hr>
</div> </div>
</div> </div>
</div> </div>
<script src="bower_components/angular/angular.min.js"></script> <script src="bower_components/angular/angular.min.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script> <script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/angular-route/angular-route.min.js"></script> <script src="bower_components/angular-route/angular-route.min.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.min.js"></script> <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
<script src="bower_components/angular-resource/angular-resource.min.js"></script> <script src="bower_components/angular-resource/angular-resource.min.js"></script>
......
app/shared/templates/directives/sidebar-search.html
View file @ f54e8e16
<li class="sidebar-search">
<div class="input-group custom-search-form">
<input type="text" class="form-control" placeholder="Search...">
<span class="input-group-btn">
<button class="btn btn-default" type="button">
<i class="fa fa-search"></i>
</button>
</span>
</div>
</li>
\ No newline at end of file
app/shared/templates/directives/sidebar.html
View file @ f54e8e16
<div class="navbar-default sidebar" role="navigation"> <div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse"> <div class="sidebar-nav navbar-collapse">
<div class="brand">
<a href="" class="logo"><img src="../../../img/brand-logo.png" /></a>
</div>
<ul class="nav in" id="side-menu"> <ul class="nav in" id="side-menu">
<sidebar-search></sidebar-search> <sidebar-search></sidebar-search>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a href="#/dashboard"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a> <a href="#/dashboard"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
</li> </li>
<!--<li ui-sref-active="active"><a href="#/staffs" translate>Staffs</a></li>-->
<!--<li ui-sref-active="active"><a href="#/staff/add" translate>New Staff</a></li>-->
<!--<li ui-sref-active="active"-->
<!--ng-repeat="item in menuItems"><a href="#">{{ item }}</a></li>-->
<li ng-repeat="(key, item) in menuItems" ng-class="{active: collapseVar == key}">{{dropDown}} <li ng-repeat="(key, item) in menuItems" ng-class="{active: collapseVar == key}">{{dropDown}}
<a href="" ng-click="check(key)"><i class="fa fa-wrench fa-fw"></i> {{ item }}<span <a href="" ng-click="check(key)"><i class="fa fa-wrench fa-fw"></i> {{ item }}<span
class="fa arrow"></span></a> class="fa arrow"></span></a>
......
index.html
View file @ f54e8e16
...@@ -31,89 +31,106 @@ ...@@ -31,89 +31,106 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"> <ul class="header-menu">
<li><a href="">Mesajlar</a></li>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <li><a href="">Görevler</a></li>
<span class="sr-only">Toggle navigation</span> <li><a href="">Raporlar</a></li>
<span class="icon-bar"></span> <li><a href="">Ayarlar</a></li>
<span class="icon-bar"></span> </ul>
<span class="icon-bar"></span> <div class="navbar-header">
</button> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<a class="navbar-brand" href="index.html"><img src="img/ulakbus-logo.png"/></a> <span class="sr-only">Toggle navigation</span>
</div> <span class="icon-bar"></span>
<!-- /.navbar-header --> <span class="icon-bar"></span>
<header-notification></header-notification> <span class="icon-bar"></span>
<sidebar></sidebar> </button>
</nav> <a class="navbar-brand" href="index.html"><img src="img/ulakbus-logo.png"/></a>
</div>
<!-- /.navbar-header -->
<header-notification></header-notification>
</nav>
<sidebar></sidebar>
<div id="page-wrapper"> <div class="manager-view">
<div class="col-md-12"> <div class="manager-view-inner">
<!-- manager-header -->
<div class="manager-view-header container-fluid">
<ul class="breadcrumb">
<li><a href="#">Personeller</a></li>
<li><a href="#">Liste</a></li>
<li class="active">Tablo</li>
</ul>
<button type="button" class="btn btn-primary">Kaydet</button>
</div>
<!-- end of manager-header -->
<div class="manager-view-content">
<div class="row"> <div class="row">
<div class="main" ng-view> <div class="main" ng-view>
</div> </div>
<hr>
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- @if NODE_ENV == 'DEVELOPMENT' --> <!-- @if NODE_ENV == 'DEVELOPMENT' -->
<script src="bower_components/angular/angular.min.js"></script> <script src="bower_components/angular/angular.min.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script> <script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/angular-route/angular-route.min.js"></script> <script src="bower_components/angular-route/angular-route.min.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.min.js"></script> <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
<script src="bower_components/angular-resource/angular-resource.min.js"></script> <script src="bower_components/angular-resource/angular-resource.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script> <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
<script src="bower_components/tv4/tv4.js"></script> <script src="bower_components/tv4/tv4.js"></script>
<script src="bower_components/objectpath/lib/ObjectPath.js"></script> <script src="bower_components/objectpath/lib/ObjectPath.js"></script>
<script src="bower_components/objectpath/lib/ObjectPath.js"></script> <script src="bower_components/objectpath/lib/ObjectPath.js"></script>
<script src="bower_components/angular-schema-form/dist/schema-form.min.js"></script> <script src="bower_components/angular-schema-form/dist/schema-form.min.js"></script>
<script src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script> <script src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script>
<!--<script src="bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script>--> <!--<script src="bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script>-->
<script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script> <script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script>
<!-- TODO: check all js and remove unused --> <!-- TODO: check all js and remove unused -->
<script src="bower_components/json3/lib/json3.min.js"></script> <script src="bower_components/json3/lib/json3.min.js"></script>
<script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script> <script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
<script src="bower_components/metisMenu/dist/metisMenu.min.js"></script> <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
<script src="bower_components/Chart.js/Chart.min.js"></script> <script src="bower_components/Chart.js/Chart.min.js"></script>
<script src="shared/translations.js"></script> <script src="shared/translations.js"></script>
<script src="tmp/templates.js"></script> <script src="tmp/templates.js"></script>
<script src="app.js"></script> <script src="app.js"></script>
<script src="app_routes.js"></script> <script src="app_routes.js"></script>
<script src="shared/scripts/theme.js"></script> <script src="shared/scripts/theme.js"></script>
<script src="shared/directives.js"></script> <script src="shared/directives.js"></script>
<script src="zetalib/interceptors.js"></script> <script src="zetalib/interceptors.js"></script>
<script src="zetalib/general.js"></script> <script src="zetalib/general.js"></script>
<script src="zetalib/forms/form_service.js"></script> <script src="zetalib/forms/form_service.js"></script>
<!-- components --> <!-- components -->
<script src="components/auth/auth_controller.js"></script> <script src="components/auth/auth_controller.js"></script>
<script src="components/auth/auth_service.js"></script> <script src="components/auth/auth_service.js"></script>
<script src="components/dashboard/dashboard_controller.js"></script> <script src="components/dashboard/dashboard_controller.js"></script>
<script src="components/crud/crud_controller.js"></script> <script src="components/crud/crud_controller.js"></script>
<script src="components/staff/staff_controller.js"></script> <script src="components/staff/staff_controller.js"></script>
<script src="components/student/student_controller.js"></script> <script src="components/student/student_controller.js"></script>
<script src="components/version/version.js"></script> <script src="components/version/version.js"></script>
<!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>--> <!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>-->
<!-- @endif --> <!-- @endif -->
<!-- @if NODE_ENV == 'PRODUCTION' --> <!-- @if NODE_ENV == 'PRODUCTION' -->
<script src="bower_components/jquery.min.js"></script> <script src="bower_components/jquery.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.17/angular.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.17/angular.min.js"></script>
<script src="bower_components/components.js"></script> <script src="bower_components/components.js"></script>
<script src="shared/translations.js"></script> <script src="shared/translations.js"></script>
<script src="templates.js"></script> <script src="templates.js"></script>
<script src="app.js"></script> <script src="app.js"></script>
<!-- @endif --> <!-- @endif -->
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment