Commit 59805ca7 authored by Evren Kutar's avatar Evren Kutar

Merge branch '#11_dashboard_duzenlemeleri'

parents fece6430 71dcef91
...@@ -55,6 +55,7 @@ a:hover { ...@@ -55,6 +55,7 @@ a:hover {
padding:0; padding:0;
font-size:18px; font-size:18px;
float:left; float:left;
margin-bottom: 0;
} }
/** BRAND **/ /** BRAND **/
...@@ -310,15 +311,16 @@ select { ...@@ -310,15 +311,16 @@ select {
} }
.manager-view-header { .manager-view-header {
width:100%; /*width:100%;*/
padding:10px 15px; width: calc(100% - 300px);
padding:10px;
background-color:#fff; background-color:#fff;
border-bottom:1px solid #ccc; border-bottom:1px solid #ccc;
-webkit-flex-shrink: 0; -webkit-flex-shrink: 0;
flex-shrink: 0; flex-shrink: 0;
position:relative; position:relative;
z-index:1; z-index:1;
height: 98px; height: 43px;
} }
.manager-view-content { .manager-view-content {
...@@ -1073,9 +1075,10 @@ table.dataTable thead .sorting:after { ...@@ -1073,9 +1075,10 @@ table.dataTable thead .sorting:after {
width: 300px; width: 300px;
background-color: #FFFFFF; background-color: #FFFFFF;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
height: calc(100% - 140px); /*height: calc(100% - 140px);*/
height: calc(100% - 40px);
position: absolute; position: absolute;
top: 98px; top: 0px;
right: 0px; right: 0px;
overflow-y: auto; overflow-y: auto;
} }
......
...@@ -24,18 +24,16 @@ ...@@ -24,18 +24,16 @@
<div class="dashboard-student-search"> <div class="dashboard-student-search">
<center> <center>
<h3>ÖĞRENCİ</h3> <h3>ÖĞRENCİ</h3>
<input type="text" placeholder="Öğrenci ara"><span class="fa fa-search"></span> <input type="text" placeholder="Öğrenci ara" ng-model="student_kw"
ng-keyup="search('Ogrenci')"><span
class="fa fa-search"
ng-click="search('Ogrenci')"></span>
</center> </center>
<div class="dashboard-search-results"> <div class="dashboard-search-results">
<ul> <ul ng-if="students.length > 0">
<li><a href="#">Sample Student 1</a></li> <li ng-repeat="student in students">
<li><a href="#">Sample Student 2</a></li> <a href="javascript:void(0)" ng-click="select(student)">{{student}}</a>
<li><a href="#">Sample Student 3</a></li> </li>
<li><a href="#">Sample Student 4</a></li>
<li><a href="#">Sample Student 5</a></li>
<li><a href="#">Sample Student 6</a></li>
<li><a href="#">Sample Student 7</a></li>
<li><a href="#">Sample Student 8</a></li>
</ul> </ul>
</div> </div>
<!-- end of dashboard-student-search-results --> <!-- end of dashboard-student-search-results -->
...@@ -44,18 +42,15 @@ ...@@ -44,18 +42,15 @@
<div class="dashboard-personnel-search"> <div class="dashboard-personnel-search">
<center> <center>
<h3>PERSONEL</h3> <h3>PERSONEL</h3>
<input type="text" placeholder="Personel ara"><span class="fa fa-search"></span> <input type="text" placeholder="Personel ara" ng-model="staff_kw"
ng-keyup="search('Personel')"><span
class="fa fa-search" ng-click="search('Personel')"></span>
</center> </center>
<div class="dashboard-search-results"> <div class="dashboard-search-results">
<ul> <ul ng-if="staffs.length > 0">
<li><a href="#">Sample Personnel 1</a></li> <li ng-repeat="staff in staffs">
<li><a href="#">Sample Personnel 2</a></li> <a href="javascript:void(0)" ng-click="select(staff)">{{staff}}</a>
<li><a href="#">Sample Personnel 3</a></li> </li>
<li><a href="#">Sample Personnel 4</a></li>
<li><a href="#">Sample Personnel 5</a></li>
<li><a href="#">Sample Personnel 6</a></li>
<li><a href="#">Sample Personnel 7</a></li>
<li><a href="#">Sample Personnel 8</a></li>
</ul> </ul>
</div> </div>
<!-- end of dashboard-personnel-search-results --> <!-- end of dashboard-personnel-search-results -->
......
...@@ -14,22 +14,40 @@ angular.module('ulakbus.dashboard', ['ngRoute']) ...@@ -14,22 +14,40 @@ angular.module('ulakbus.dashboard', ['ngRoute'])
$rootScope.section = section_index; $rootScope.section = section_index;
}; };
$scope.what = ""; $scope.student_kw = "";
$scope.staff_kw = "";
$scope.listitems = []; $scope.students = [];
$scope.staffs = [];
$scope.search = function (where) { $scope.search = function (where) {
$timeout(function () { $timeout(function () {
if ($scope.what.length > 3) { if (where === 'Personel') {
// if input length greater than 3 search for the value // if input length greater than 3 search for the value
$http.post(RESTURL.url + where, {"query": $scope.what}) if ($scope.staff_kw.length > 3) {
.success(function (data) { $scope.staffs = $scope.getItems(where, $scope.staff_kw);
$scope.listitems = data; }
}); }
if (where === 'Ogrenci') {
if ($scope.student_kw.length > 3) {
$scope.students = $scope.getItems(where, $scope.student_kw);
}
} }
}); });
}; };
$scope.getItems = function (where, params) {
$http.post(RESTURL.url + where, {"query": params})
.success(function (data) {
return data;
});
};
$scope.select = function (who) {
$rootScope.who = who;
// todo: get 'who's related transactions and manipulate sidebar menu
};
// when select a user from list // when select a user from list
//$http.post(RESTURL.url + 'crud/').success(function (data) { //$http.post(RESTURL.url + 'crud/').success(function (data) {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
/** /**
* logout directive * logout directive
*/ */
app.directive('logout', function ($http, $location, RESTURL) { app.directive('logout', function ($http, $location, RESTURL) {
return { return {
link: function ($scope, $element, $rootScope) { link: function ($scope, $element, $rootScope) {
...@@ -24,6 +25,7 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -24,6 +25,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
/** /**
* headerNotification directive for header * headerNotification directive for header
*/ */
app.directive('headerNotification', function ($http, $interval, RESTURL) { app.directive('headerNotification', function ($http, $interval, RESTURL) {
return { return {
templateUrl: 'shared/templates/directives/header-notification.html', templateUrl: 'shared/templates/directives/header-notification.html',
...@@ -40,6 +42,11 @@ app.directive('headerNotification', function ($http, $interval, RESTURL) { ...@@ -40,6 +42,11 @@ app.directive('headerNotification', function ($http, $interval, RESTURL) {
}; };
}); });
/**
* collapseMenu directive
* toggle collapses sidebar menu when clicked menu button
*/
app.directive('collapseMenu', function () { app.directive('collapseMenu', function () {
return { return {
templateUrl: 'shared/templates/directives/menuCollapse.html', templateUrl: 'shared/templates/directives/menuCollapse.html',
...@@ -60,6 +67,11 @@ app.directive('collapseMenu', function () { ...@@ -60,6 +67,11 @@ app.directive('collapseMenu', function () {
}; };
}); });
/**
* headerSubmenu directive
* todo: will be deleted
*/
app.directive('headerSubMenu', function () { app.directive('headerSubMenu', function () {
return { return {
templateUrl: 'shared/templates/directives/header-sub-menu.html', templateUrl: 'shared/templates/directives/header-sub-menu.html',
...@@ -76,6 +88,11 @@ app.directive('headerSubMenu', function () { ...@@ -76,6 +88,11 @@ app.directive('headerSubMenu', function () {
}; };
}); });
/**
* breadcrumb directive
* produces breadcrumb with related links
*/
app.directive('headerBreadcrumb', function () { app.directive('headerBreadcrumb', function () {
return { return {
templateUrl: 'shared/templates/directives/header-breadcrumb.html', templateUrl: 'shared/templates/directives/header-breadcrumb.html',
...@@ -84,6 +101,12 @@ app.directive('headerBreadcrumb', function () { ...@@ -84,6 +101,12 @@ app.directive('headerBreadcrumb', function () {
}; };
}); });
/**
* sidebar directive
* changes breadcrumb when an item selected
* consists of menu items of related user or transaction
*/
app.directive('sidebar', ['$location', function () { app.directive('sidebar', ['$location', function () {
return { return {
templateUrl: 'shared/templates/directives/sidebar.html', templateUrl: 'shared/templates/directives/sidebar.html',
...@@ -171,14 +194,22 @@ app.directive('stats', function () { ...@@ -171,14 +194,22 @@ app.directive('stats', function () {
}; };
}); });
/**
* header menu notifications directive
*/
app.directive('notifications', function () { app.directive('notifications', function () {
return { return {
templateUrl: 'shared/templates/directives/notifications.html', templateUrl: 'shared/templates/directives/notifications.html',
restrict: 'E', restrict: 'E',
replace: true, replace: true
}; };
}); });
/**
* search directive in sidebar
*/
app.directive('sidebarSearch', function () { app.directive('sidebarSearch', function () {
return { return {
templateUrl: 'shared/templates/directives/sidebar-search.html', templateUrl: 'shared/templates/directives/sidebar-search.html',
...@@ -191,18 +222,18 @@ app.directive('sidebarSearch', function () { ...@@ -191,18 +222,18 @@ app.directive('sidebarSearch', function () {
}; };
}); });
app.directive('timeline', function () { //app.directive('timeline', function () {
return { // return {
templateUrl: 'shared/templates/directives/timeline.html', // templateUrl: 'shared/templates/directives/timeline.html',
restrict: 'E', // restrict: 'E',
replace: true, // replace: true,
}; // };
}); //});
//
app.directive('chat', function () { //app.directive('chat', function () {
return { // return {
templateUrl: 'shared/templates/directives/chat.html', // templateUrl: 'shared/templates/directives/chat.html',
restrict: 'E', // restrict: 'E',
replace: true, // replace: true,
}; // };
}); //});
\ No newline at end of file \ No newline at end of file
<div class="manager-view-header container-fluid" ng-class="{hidden: $root.loggedInUser != true}"> <div class="manager-view-header" ng-class="{hidden: $root.loggedInUser != true}">
<div class="clearfix"> <div class="clearfix">
<header-breadcrumb></header-breadcrumb> <header-breadcrumb></header-breadcrumb>
<loaderdiv><div></div></loaderdiv> <loaderdiv><div></div></loaderdiv>
<!--<div class="loader">Loading...</div>--> <!--<div class="loader">Loading...</div>-->
</div> </div>
<div id="header-buttons" ng-class="{hidden: $root.showSaveButton != true}"> <!--<div id="header-buttons" ng-class="{hidden: $root.showSaveButton != true}">-->
<button type="button" class="btn btn-primary" ng-click="triggerSubmit()">Kaydet</button> <!--<button type="button" class="btn btn-primary" ng-click="triggerSubmit()">Kaydet</button>-->
<!--<button type="button" class="btn btn-warning">Düzenle</button>--> <!--&lt;!&ndash;<button type="button" class="btn btn-warning">Düzenle</button>&ndash;&gt;-->
<!--<button type="button" class="btn btn-danger">İptal</button>--> <!--&lt;!&ndash;<button type="button" class="btn btn-danger">İptal</button>&ndash;&gt;-->
</div> <!--</div>-->
</div> </div>
\ No newline at end of file
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Charts</h1>
</div>
<!-- /.col-lg-12 -->
</div>
<div class="row">
<div class="col-lg-6 col-sm-12" id="line-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Line Chart</div>
<div class="panel-body">
<canvas id="line" class="chart chart-line chart-xl" data="line.data" labels="line.labels" legend="true"
click="line.onClick" series="line.series"></canvas>
</div>
</div>
</div>
<div class="col-lg-6 col-sm-12" id="bar-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Bar Chart</div>
<div class="panel-body">
<canvas id="bar" class="chart chart-bar" data="bar.data" labels="bar.labels" series="bar.series"
options="bar.options"></canvas>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-sm-12" id="doughnut-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Doughnut Chart</div>
<div class="panel-body">
<canvas id="doughnut" class="chart chart-doughnut chart-xs" data="donut.data" labels="donut.labels" legend="false"></canvas>
</div>
</div>
</div>
<div class="col-lg-6 col-sm-12" id="radar-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Radar Chart</div>
<div class="panel-body">
<canvas id="area" class="chart chart-radar" data="radar.data" labels="radar.labels" click="onClick"></canvas>
</div>
</div>
</div>
<div class="col-lg-6 col-sm-12" id="pie-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Pie Chart</div>
<div class="panel-body">
<canvas id="pie" class="chart chart-pie chart-xs" data="pie.data" labels="pie.labels"></canvas>
</div>
</div>
</div>
<div class="col-lg-6 col-sm-12" id="polar area-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Polar Area Chart</div>
<div class="panel-body">
<canvas id="polar" class="chart chart-polar-area" data="polar.data" labels="polar.labels"></canvas>
</div>
</div>
</div>
<div class="col-lg-6 col-sm-12" id="base-chart" ng-controller="ChartCtrl">
<div class="panel panel-default">
<div class="panel-heading">Dynamic Chart</div>
<div class="panel-body">
<canvas id="base" class="chart chart-base" chart-type="dynamic.type" data="dynamic.data" labels="dynamic.labels" legend="true"></canvas>
</div>
</div>
<button type="button" class="btn btn-primary pull-right" ng-click="dynamic.toggle()">Toggle</button>
</div>
</div>
\ No newline at end of file
<div>
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Dashboard</h1>
</div>
<!-- /.col-lg-12 -->
</div>
<!-- /.row -->
<div class="row">
<stats number="6" comments="New comments!" colour="primary" type="comments"></stats>
<stats number="12" comments="New tasks!" colour="primary" type="user"></stats>
<stats number="18" comments="New orders!" colour="yellow" type="shopping-cart"></stats>
<stats number="24" comments="Support tickets!" colour="red" type="support"></stats>
</div>
<!-- /.panel -->
<div class="row">
<div class="col-lg-8">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i> Responsive Timeline
</div>
<!-- /.panel-heading -->
<timeline></timeline>
<!-- /.panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-8 -->
<div class="col-lg-4">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bell fa-fw"></i> Notifications Panel
</div>
<!-- /.panel-heading -->
<notifications></notifications>
<!-- /.panel-body -->
</div>
<!-- /.panel -->
<chat></chat>
<!-- /.panel .chat-panel -->
</div>
<!-- /.col-lg-4 -->
</div>
<!-- /.row -->
</div>
<div id="wrapper">
<!-- Navigation -->
<header></header>
<!-- /.navbar-top-links -->
<!-- /.navbar-static-side -->
<div id="page-wrapper" style="min-height: 561px;">
<div ui-view></div>
</div>
<!-- /#page-wrapper -->
</div>
This diff is collapsed.
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Blank</h1>
</div>
<!-- /.col-lg-12 -->
</div>
<!-- /.row -->
</div>
\ No newline at end of file
<div class="container">
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="login-panel panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Please Sign In</h3>
</div>
<div class="panel-body">
<form role="form">
<fieldset>
<div class="form-group">
<input class="form-control" placeholder="E-mail" name="email" type="email" autofocus>
</div>
<div class="form-group">
<input class="form-control" placeholder="Password" name="password" type="password" value="">
</div>
<div class="checkbox">
<label>
<input name="remember" type="checkbox" value="Remember Me">Remember Me
</label>
</div>
<!-- Change this to a button or input when using this as a form -->
<a ui-sref="dashboard.home" class="btn btn-lg btn-success btn-block">Login</a>
</fieldset>
</form>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Notifications</h1>
</div>
<!-- /.col-lg-12 -->
</div>
<!-- /.row -->
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
Alert Styles
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<div class="alert alert-success">
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
<div class="alert alert-info">
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
<div class="alert alert-warning">
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
<div class="alert alert-danger">
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
</div>
<!-- .panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-6 -->
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
Dismissable Alerts
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
<div class="alert alert-info alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
<div class="alert alert-warning alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. <a href="#" class="alert-link">Alert Link</a>.
</div>
</div>
<!-- .panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-6 -->
</div>
<!-- /.row -->
<div class="row">
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
Modals
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<!-- Button trigger modal -->
<button class="btn btn-primary btn-lg" data-toggle="modal" data-target="#myModal">
Launch Demo Modal
</button>
<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">Modal title</h4>
</div>
<div class="modal-body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
</div>
<!-- .panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-6 -->
<div class="col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
Tooltips and Popovers
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<h4>Tooltip Demo</h4>
<div class="tooltip-demo">
<button type="button" tooltip="Tooltip on left" tooltip-placement="left" class="btn btn-default" title="Tooltip on left">Tooltip on left</button>
<button type="button" tooltip="Tooltip on top" tooltip-placement="top" class="btn btn-default" title="Tooltip on top">Tooltip on top</button>
<button type="button" tooltip="Tooltip on bottom" tooltip-placement="bottom" class="btn btn-default" title="Tooltip on bottom">Tooltip on bottom</button>
<button type="button" tooltip="Tooltip on right" tooltip-placement="right" class="btn btn-default" title="Tooltip on right">Tooltip on right</button>
</div>
<br>
<br>
<h4>Clickable Popover Demo</h4>
<div class="tooltip-demo">
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="left" popover-trigger="click">
Popover on left
</button>
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="top" popover-trigger="click">
Popover on top
</button>
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="bottom" popover-trigger="click">
Popover on bottom
</button>
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="right" popover-trigger="click">
Popover on right
</button>
</div>
</div>
<!-- .panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-6 -->
</div>
This diff is collapsed.
This diff is collapsed.
...@@ -254,8 +254,6 @@ form_generator.factory('Generator', function ($http, $q, $timeout, RESTURL, Form ...@@ -254,8 +254,6 @@ form_generator.factory('Generator', function ($http, $q, $timeout, RESTURL, Form
//data.form = get_diff; //data.form = get_diff;
} }
debugger;
return $http.post(generator.makeUrl($scope.url), data); return $http.post(generator.makeUrl($scope.url), data);
//.success(function () { //.success(function () {
// //
......
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