Skip to content

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

a tag href fix for void(0) unsafe for firefox and safari

parent f661e39d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 378 additions and 214 deletions
Gruntfile.js
View file @ 61ebf13b
...@@ -75,6 +75,7 @@ module.exports = function (grunt) { ...@@ -75,6 +75,7 @@ module.exports = function (grunt) {
{expand: true, cwd: 'app/img/', src: 'brand-logo.png', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'brand-logo.png', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'loading_spinner.gif', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'loading_spinner.gif', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'sample-profile-pic.jpg', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'sample-profile-pic.jpg', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'empty-profile-pic.jpg', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'favicon.ico', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'favicon.ico', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/styles/roboto/', src: '**/*', dest: 'dist/css/roboto/', flatten: false}, {expand: true, cwd: 'app/styles/roboto/', src: '**/*', dest: 'dist/css/roboto/', flatten: false},
{expand: true, cwd: 'app/styles/', src: 'jquery-ui.min.css', dest: 'dist/css/', flatten: true}, {expand: true, cwd: 'app/styles/', src: 'jquery-ui.min.css', dest: 'dist/css/', flatten: true},
...@@ -90,6 +91,7 @@ module.exports = function (grunt) { ...@@ -90,6 +91,7 @@ module.exports = function (grunt) {
{expand: true, cwd: 'app/img/', src: 'brand-logo.png', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'brand-logo.png', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'loading_spinner.gif', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'loading_spinner.gif', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'sample-profile-pic.jpg', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'sample-profile-pic.jpg', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'empty-profile-pic.jpg', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/img/', src: 'favicon.ico', dest: 'dist/img/', flatten: true, filter: 'isFile'}, {expand: true, cwd: 'app/img/', src: 'favicon.ico', dest: 'dist/img/', flatten: true, filter: 'isFile'},
{expand: true, cwd: 'app/styles/roboto/', src: '**/*', dest: 'dist/css/roboto/', flatten: false}, {expand: true, cwd: 'app/styles/roboto/', src: '**/*', dest: 'dist/css/roboto/', flatten: false},
{expand: true, cwd: 'app/styles/', src: 'jquery-ui.min.css', dest: 'dist/css/', flatten: true}, {expand: true, cwd: 'app/styles/', src: 'jquery-ui.min.css', dest: 'dist/css/', flatten: true},
......
app/app.css
View file @ 61ebf13b
...@@ -512,16 +512,16 @@ select { ...@@ -512,16 +512,16 @@ select {
.sidebar-person-info { .sidebar-person-info {
overflow-x: visible; overflow-x: visible;
overflow-y: auto; overflow-y: auto;
position: absolute; /*position: absolute;*/
width: 100%; width: 100%;
max-height: calc(85% - 139px); /*max-height: 50%;*/
background: #fff; background: whitesmoke;
/*display:none;*/ /** angular template will hndle this */ /*display:none;*/ /** angular template will hndle this */
} }
.sidebar-person-info .identity { .sidebar-person-info .identity {
color:#555; color:#555;
padding:15px; padding:10px;
padding-bottom: 0px; padding-bottom: 0px;
} }
...@@ -551,8 +551,8 @@ select { ...@@ -551,8 +551,8 @@ select {
} }
.sidebar-person-info .identity img { .sidebar-person-info .identity img {
width:50px; width:40px;
height:50px; height:40px;
border-radius:100%; border-radius:100%;
margin:10px auto; margin:10px auto;
float:left; float:left;
...@@ -1423,6 +1423,7 @@ table.dataTable thead .sorting:after { ...@@ -1423,6 +1423,7 @@ table.dataTable thead .sorting:after {
.sidebar { .sidebar {
z-index: 1; z-index: 1;
position: absolute; position: absolute;
overflow-y: auto;
width: 250px; width: 250px;
height: 100%; height: 100%;
-webkit-box-shadow: 0 0 25px rgba(0,0,0,0.1); -webkit-box-shadow: 0 0 25px rgba(0,0,0,0.1);
...@@ -1446,10 +1447,14 @@ table.dataTable thead .sorting:after { ...@@ -1446,10 +1447,14 @@ table.dataTable thead .sorting:after {
.sidebar .sidebar-nav.navbar-collapse { .sidebar .sidebar-nav.navbar-collapse {
overflow-x: visible; overflow-x: visible;
overflow-y: auto; /*overflow-y: auto;*/
position: absolute; /*position: absolute;*/
width: 100%; width: 100%;
max-height: calc(100% - 139px); /*max-height: calc(50% - 139px);*/
}
.sidebar-container {
max-height: calc(100% - 120px); overflow-y: auto;
} }
footer { footer {
...@@ -1458,6 +1463,7 @@ table.dataTable thead .sorting:after { ...@@ -1458,6 +1463,7 @@ table.dataTable thead .sorting:after {
padding: 15px; padding: 15px;
width:100%; width:100%;
text-align:center; text-align:center;
background: whitesmoke;
} }
footer span { footer span {
......
app/components/crud/crud_controller.js
View file @ 61ebf13b
...@@ -146,6 +146,12 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService']) ...@@ -146,6 +146,12 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
$scope.reload({}); $scope.reload({});
}); });
// search directive updates objects after search results
$scope.$on('updateObjects', function ($event, data) {
$scope.objects = data;
CrudUtility.listPageItems($scope, {objects: $scope.objects});
});
// we use form generator for generic forms. this makes form's scope to confuse on the path to generate form // we use form generator for generic forms. this makes form's scope to confuse on the path to generate form
// object by its name. to manage to locate the form to controllers scope we use a directive called form locator // object by its name. to manage to locate the form to controllers scope we use a directive called form locator
// a bit dirty way to find form working on but solves our problem // a bit dirty way to find form working on but solves our problem
...@@ -203,7 +209,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService']) ...@@ -203,7 +209,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
} }
else { else {
// call generator's get_single_item func // call generator's get_single_item func
Generator.get_single_item($scope).then(function (res) { Generator.get_wf($scope).then(function (res) {
$scope.object = res.data.object; $scope.object = res.data.object;
$scope.model = $routeParams.model; $scope.model = $routeParams.model;
}); });
......
app/components/crud/templates/form.html
View file @ 61ebf13b
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div ng-repeat="node in Node"> <div ng-repeat="node in Node">
<h3>{{ node.title }} <h3>{{ node.title }}
<span ng-if="node.lengthModels < 1"> <span ng-if="node.lengthModels < 1">
<a href="javascript:void(0);" modal-for-nodes="{{node.schema.model_name}},Node"> <a modal-for-nodes="{{node.schema.model_name}},Node">
<i class="fa fa-plus-circle fa-fw"></i> <i class="fa fa-plus-circle fa-fw"></i>
</a> </a>
</span> </span>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div ng-repeat="node in ListNode"> <div ng-repeat="node in ListNode">
<h3>{{ node.title }} <h3>{{ node.title }}
<span> <span>
<a href="javascript:void(0);" modal-for-nodes="{{node.schema.model_name}},ListNode,add"> <a modal-for-nodes="{{node.schema.model_name}},ListNode,add">
<i class="fa fa-plus-circle fa-fw"></i> <i class="fa fa-plus-circle fa-fw"></i>
</a> </a>
</span> </span>
......
app/components/crud/templates/list.html
View file @ 61ebf13b
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
<td scope="row" style="text-align:center">{{$index}}</td> <td scope="row" style="text-align:center">{{$index}}</td>
<td ng-repeat="field in object.fields track by $index"> <td ng-repeat="field in object.fields track by $index">
<a ng-href="javascript:void(0)" <a role="button" ng-if="field.type==='link'"
ng-if="field.type==='link'"
ng-click="do_action(object.key, field.cmd, field.mode)">{{field.content}}</a> ng-click="do_action(object.key, field.cmd, field.mode)">{{field.content}}</a>
<span ng-if="field.type==='str'">{{field.content}}</span> <span ng-if="field.type==='str'">{{field.content}}</span>
</td> </td>
...@@ -71,16 +70,16 @@ ...@@ -71,16 +70,16 @@
<nav ng-if="pagination && pagination.total_pages > 1" class="text-center"> <nav ng-if="pagination && pagination.total_pages > 1" class="text-center">
<ul class="pagination"> <ul class="pagination">
<li ng-class="{disabled:pagination.page===1}"> <li ng-class="{disabled:pagination.page===1}">
<a href="javascript:void(0)" aria-label="Önceki" ng-click="reload({page:pagination.page-1})"> <a aria-label="Önceki" ng-click="reload({page:pagination.page-1})">
<span aria-hidden="true">&laquo;</span> <span aria-hidden="true">&laquo;</span>
</a> </a>
</li> </li>
<li ng-repeat="page in getNumber(pagination.total_pages) track by $index" <li ng-repeat="page in getNumber(pagination.total_pages) track by $index"
ng-class="{active:$index+1===pagination.page}"> ng-class="{active:$index+1===pagination.page}">
<a href="javascript:void(0)" ng-click="reload({page:$index+1})">{{$index+1}}</a> <a ng-click="reload({page:$index+1})">{{$index+1}}</a>
</li> </li>
<li ng-class="{disabled:pagination.page===pagination.total_pages}"> <li ng-class="{disabled:pagination.page===pagination.total_pages}">
<a href="javascript:void(0)" aria-label="Sonraki" ng-click="reload({page:pagination.page+1})"> <a aria-label="Sonraki" ng-click="reload({page:pagination.page+1})">
<span aria-hidden="true">&raquo;</span> <span aria-hidden="true">&raquo;</span>
</a> </a>
</li> </li>
......
app/components/dashboard/dashboard.html
View file @ 61ebf13b
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
<div class="dashboard-main-search clearfix"> <div class="dashboard-main-search clearfix">
<div class="dashboard-student-search" data-step="2" <div class="dashboard-student-search" data-step="2"
data-intro="isim veya tcno ile öğrenci araması yapabilirsiniz."> data-intro="isim veya tcno ile öğrenci araması yapabilirsiniz.">
<center> <div class="text-center">
<h3>ÖĞRENCİ</h3> <h3>ÖĞRENCİ</h3>
<input type="text" placeholder="Öğrenci ara" ng-model="student_kw" ng-keyup="search('ogrenci')"> <input type="text" placeholder="Öğrenci ara" ng-model="student_kw" ng-keyup="search('ogrenci')">
<span class="fa fa-search" ng-click="search('ogrenci')"></span> <span class="fa fa-search" ng-click="search('ogrenci')"></span>
</center> </div>
<div class="dashboard-search-results"> <div class="dashboard-search-results">
<ul ng-if="students.length > 0"> <ul ng-if="students.length > 0">
<li ng-repeat="student in students"> <li ng-repeat="student in students">
<a href="javascript:void(0)" ng-click="select(student, 'ogrenci')">{{student[0]}}</a> <a role="button" ng-click="select(student, 'ogrenci')">{{student[0]}}</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
<!-- end of dashboard-student-search --> <!-- end of dashboard-student-search -->
<div class="dashboard-personnel-search" data-step="3" <div class="dashboard-personnel-search" data-step="3"
data-intro="isim veya tcno ile personel araması yapabilirsiniz."> data-intro="isim veya tcno ile personel araması yapabilirsiniz.">
<center> <div class="text-center">
<h3>PERSONEL</h3> <h3>PERSONEL</h3>
<input type="text" placeholder="Personel ara" ng-model="staff_kw" ng-keyup="search('personel')"> <input type="text" placeholder="Personel ara" ng-model="staff_kw" ng-keyup="search('personel')">
<span class="fa fa-search" ng-click="search('personel')"></span> <span class="fa fa-search" ng-click="search('personel')"></span>
</center> </div>
<div class="dashboard-search-results"> <div class="dashboard-search-results">
<ul ng-if="staffs.length > 0"> <ul ng-if="staffs.length > 0">
<li ng-repeat="staff in staffs"> <li ng-repeat="staff in staffs">
<a href="javascript:void(0)" ng-click="select(staff, 'personel')">{{staff[0]}}</a> <a role="button" ng-click="select(staff, 'personel')">{{staff[0]}}</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Mesajlar</h3> <h3>Mesajlar</h3>
<span><a href="javascript:void(0)">Tüm Mesajlar</a></span> <span><a role="button">Tüm Mesajlar</a></span>
</div> </div>
<!-- end of right-sidebar-title --> <!-- end of right-sidebar-title -->
<div class="right-sidebar-message-block" ng-repeat="notify in notifications[2] | limitTo:5"> <div class="right-sidebar-message-block" ng-repeat="notify in notifications[2] | limitTo:5">
<a class="clearfix" href="javascript:void(0)" ng-click="markAsRead(notify)"> <a class="clearfix" ng-click="markAsRead(notify)">
<img src="../../../img/sample-profile-pic.jpg"> <img src="../../../img/sample-profile-pic.jpg">
<div class="right-sidebar-message-content"> <div class="right-sidebar-message-content">
<div>{{notify.title}}</div> <div>{{notify.title}}</div>
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Görevler</h3> <h3>Görevler</h3>
<span><a href="javascript:void(0)">Tüm Görevler</a></span> <span><a role="button">Tüm Görevler</a></span>
</div> </div>
<div class="right-sidebar-task-block"> <div class="right-sidebar-task-block">
<!--<div class="task-type">Onay Bekleyen Görevler</div>--> <!--<div class="task-type">Onay Bekleyen Görevler</div>-->
<a href="javascript:void(0)" ng-click="markAsRead(notify)" ng-repeat="notify in notifications[1] | limitTo:5"> <a ng-click="markAsRead(notify)" ng-repeat="notify in notifications[1] | limitTo:5">
<div class="task-title">{{notify.title}}</div> <div class="task-title">{{notify.title}}</div>
</a> </a>
</div> </div>
...@@ -97,12 +97,12 @@ ...@@ -97,12 +97,12 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Duyurular</h3> <h3>Duyurular</h3>
<span><a href="javascript:void(0)">Tüm Duyurular</a></span> <span><a role="button">Tüm Duyurular</a></span>
</div> </div>
<!-- end of right-sidebar-title --> <!-- end of right-sidebar-title -->
<div class="right-sidebar-announcement-block"> <div class="right-sidebar-announcement-block">
<a href="javascript:void(0)" ng-click="markAsRead(notify)" <a ng-click="markAsRead(notify)"
ng-repeat="notify in notifications[3] | limitTo:5">{{notify ng-repeat="notify in notifications[3] | limitTo:5">{{notify
.body}}</a> .body}}</a>
</div> </div>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Son İşlemler</h3> <h3>Son İşlemler</h3>
<span><a href="javascript:void(0)">Tüm İşlemler</a></span> <span><a role="button">Tüm İşlemler</a></span>
</div> </div>
</div> </div>
......
app/shared/directives.js
View file @ 61ebf13b
...@@ -80,7 +80,7 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -80,7 +80,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
/** /**
* *
*/ */
.directive('searchDirective', function (Generator, $log) { .directive('searchDirective', function (Generator, $log, $rootScope) {
return { return {
templateUrl: 'shared/templates/directives/search.html', templateUrl: 'shared/templates/directives/search.html',
restrict: 'E', restrict: 'E',
...@@ -117,9 +117,12 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -117,9 +117,12 @@ app.directive('logout', function ($http, $location, RESTURL) {
} }
}; };
Generator.submit(searchparams); Generator.submit(searchparams).success(function (data) {
} // update objects item of page scope
$rootScope.$broadcast('updateObjects', data.objects);
});
} }
};
} }
}; };
}) })
...@@ -243,16 +246,22 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -243,16 +246,22 @@ app.directive('logout', function ($http, $location, RESTURL) {
* produces breadcrumb with related links * produces breadcrumb with related links
*/ */
.directive('headerBreadcrumb', function () { .directive('headerBreadcrumb', function ($location) {
return { return {
templateUrl: 'shared/templates/directives/header-breadcrumb.html', templateUrl: 'shared/templates/directives/header-breadcrumb.html',
restrict: 'E', restrict: 'E',
replace: true replace: false,
link: function ($scope) {
$scope.goBack = function () {
$location.state();
}
}
}; };
}) })
/** /**
* selected user directive * selected user directive
* todo: unused
*/ */
.directive('selectedUser', function ($http, RESTURL) { .directive('selectedUser', function ($http, RESTURL) {
...@@ -309,6 +318,7 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -309,6 +318,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
}; };
var sidebarmenu = $('#side-menu'); var sidebarmenu = $('#side-menu');
var sidebarUserMenu = $('#side-user-menu');
sidebarmenu.metisMenu(); sidebarmenu.metisMenu();
$http.get(RESTURL.url + 'menu/') $http.get(RESTURL.url + 'menu/')
.success(function (data) { .success(function (data) {
...@@ -343,6 +353,7 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -343,6 +353,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
$timeout(function () { $timeout(function () {
sidebarmenu.metisMenu(); sidebarmenu.metisMenu();
sidebarUserMenu.metisMenu();
}); });
}); });
...@@ -351,10 +362,12 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -351,10 +362,12 @@ app.directive('logout', function ($http, $location, RESTURL) {
$scope.$on("menuitems", function (event, data) { $scope.$on("menuitems", function (event, data) {
var menu = {}; var menu = {};
menu[data] = $scope.allMenuItems[data]; menu[data] = $scope.allMenuItems[data];
menu['other'] = $scope.allMenuItems.other; //menu['other'] = $scope.allMenuItems.other;
$scope.menuItems = $scope.prepareMenu(menu); $scope.selectedMenuItems = $scope.prepareMenu(menu);
$timeout(function () { $timeout(function () {
sidebarmenu.metisMenu() sidebarmenu.metisMenu();
sidebarUserMenu.metisMenu();
}); });
}); });
...@@ -362,6 +375,11 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -362,6 +375,11 @@ app.directive('logout', function ($http, $location, RESTURL) {
$scope.selectedUser = data; $scope.selectedUser = data;
}); });
$scope.deselectUser = function () {
delete $scope.selectedUser;
delete $scope.selectedMenuItems;
};
$scope.openSidebar = function () { $scope.openSidebar = function () {
if ($window.innerWidth > '768') { if ($window.innerWidth > '768') {
if ($rootScope.sidebarPinned === 0) { if ($rootScope.sidebarPinned === 0) {
...@@ -409,13 +427,7 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -409,13 +427,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
// breadcrumb function changes breadcrumb items and itemlist must be list // breadcrumb function changes breadcrumb items and itemlist must be list
$scope.breadcrumb = function (itemlist, $event) { $scope.breadcrumb = function (itemlist, $event) {
//if ($event.target.href==location.href) {
// $route.reload();
//}
$rootScope.breadcrumblinks = itemlist; $rootScope.breadcrumblinks = itemlist;
// showSaveButton is used for to show or not to show save button on top of the page
// todo: remove button
$rootScope.showSaveButton = false;
}; };
$scope.multiCheck = function (y) { $scope.multiCheck = function (y) {
......
app/shared/templates/add.html
View file @ 61ebf13b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div ng-repeat="node in Node"> <div ng-repeat="node in Node">
<h3>{{ node.title }} <h3>{{ node.title }}
<span ng-if="node.lengthModels < 1"> <span ng-if="node.lengthModels < 1">
<a href="javascript:void(0);" modal-for-nodes="{{node.title}},Node"> <a modal-for-nodes="{{node.title}},Node">
<i class="fa fa-plus-circle fa-fw"></i> <i class="fa fa-plus-circle fa-fw"></i>
</a> </a>
</span> </span>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div ng-repeat="node in ListNode"> <div ng-repeat="node in ListNode">
<h3>{{ node.title }} <h3>{{ node.title }}
<span> <span>
<a href="javascript:void(0);" modal-for-nodes="{{node.title}},ListNode"> <a modal-for-nodes="{{node.title}},ListNode">
<i class="fa fa-plus-circle fa-fw"></i> <i class="fa fa-plus-circle fa-fw"></i>
</a> </a>
</span> </span>
......
app/shared/templates/directives/header-breadcrumb.html
View file @ 61ebf13b
<ul class="breadcrumb"> <button type="button" class="close breadcrumb pull-left"><i class="fa fa-angle-left"></i> Geri </button>
<li ng-repeat="link in $root.breadcrumblinks" ng-class="{'active':$last}"> <!--<ul class="breadcrumb">-->
<a href="#" ng-if="!$last">{{link}}</a> <!--<li ng-repeat="link in $root.breadcrumblinks" ng-class="{'active':$last}">-->
<span ng-if="$last">{{link}}</span> <!--<a href="#" ng-if="!$last">{{link}}</a>-->
</li> <!--<span ng-if="$last">{{link}}</span>-->
</ul> <!--</li>-->
\ No newline at end of file <!--</ul>-->
<button type="button" class="close breadcrumb pull-right" ng-click="goBack()">İleri <i class="fa fa-angle-right"></i></button>
\ No newline at end of file
app/shared/templates/directives/header-notification.html
View file @ 61ebf13b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</a> </a>
<ul class="dropdown-menu dropdown-messages" ng-if="notifications[2].length > 0"> <ul class="dropdown-menu dropdown-messages" ng-if="notifications[2].length > 0">
<li ng-repeat="notify in notifications[2] | limitTo: '8'"> <li ng-repeat="notify in notifications[2] | limitTo: '8'">
<a href="javascript:void(0)" ng-click="markAsRead(notify)"> <a ng-click="markAsRead(notify)">
<div> <div>
<strong>{{notify.title}}</strong> <strong>{{notify.title}}</strong>
<span class="pull-right text-muted"> <span class="pull-right text-muted">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</li> </li>
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a class="text-center" href="javascript:void(0)"> <a class="text-center">
<strong>Read All Messages</strong> <strong>Read All Messages</strong>
<i class="fa fa-angle-right"></i> <i class="fa fa-angle-right"></i>
</a> </a>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</a> </a>
<ul class="dropdown-menu dropdown-tasks" ng-if="notifications[1].length > 0"> <ul class="dropdown-menu dropdown-tasks" ng-if="notifications[1].length > 0">
<li ng-repeat="notify in notifications[1] | limitTo: '8'"> <li ng-repeat="notify in notifications[1] | limitTo: '8'">
<a href="javascript:void(0)" ng-click="markAsRead(notify)"> <a ng-click="markAsRead(notify)">
<div> <div>
<p> <p>
<strong>{{notify.title}}</strong> <strong>{{notify.title}}</strong>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</li> </li>
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a class="text-center" href="javascript:void(0)"> <a class="text-center">
<strong>See All Tasks</strong> <strong>See All Tasks</strong>
<i class="fa fa-angle-right"></i> <i class="fa fa-angle-right"></i>
</a> </a>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</a> </a>
<ul class="dropdown-menu dropdown-alerts" ng-if="notifications[3].length > 0"> <ul class="dropdown-menu dropdown-alerts" ng-if="notifications[3].length > 0">
<li> <li>
<a href="javascript:void(0)"> <a role="button">
<div> <div>
<i class="fa fa-comment fa-fw"></i> New Comment <i class="fa fa-comment fa-fw"></i> New Comment
<span class="pull-right text-muted small">4 minutes ago</span> <span class="pull-right text-muted small">4 minutes ago</span>
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
<i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i> <i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
</a> </a>
<ul class="dropdown-menu dropdown-user"> <ul class="dropdown-menu dropdown-user">
<li><a href="javascript:void(0)"><i class="fa fa-user fa-fw"></i> Profil</a></li> <li><a role="button"><i class="fa fa-user fa-fw"></i> Profil</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="javascript:void(0)"><i class="fa fa-gear fa-fw"></i> Ayarlar</a></li> <li><a role="button"><i class="fa fa-gear fa-fw"></i> Ayarlar</a></li>
<li><a href="#/dev/settings"><i class="fa fa-gear fa-fw"></i> Ayarlar (Dev)</a></li> <li><a href="#/dev/settings"><i class="fa fa-gear fa-fw"></i> Ayarlar (Dev)</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a ui-sref="login" href="javascript:void(0);" logout><i class="fa fa-sign-out fa-fw"></i> Çıkış</a></li> <li><a ui-sref="login" href="javascript:void(0);" logout><i class="fa fa-sign-out fa-fw"></i> Çıkış</a></li>
......
app/shared/templates/directives/header-sub-menu.html
View file @ 61ebf13b
...@@ -2,7 +2,5 @@ ...@@ -2,7 +2,5 @@
<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>-->
<selected-user class="pull-right"></selected-user>
</div> </div>
</div> </div>
\ No newline at end of file
app/shared/templates/directives/sidebar-notification.html
View file @ 61ebf13b
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Mesajlar</h3> <h3>Mesajlar</h3>
<span><a href="javascript:void(0)">Tüm Mesajlar</a></span> <span><a role="button">Tüm Mesajlar</a></span>
</div> </div>
<!-- end of right-sidebar-title --> <!-- end of right-sidebar-title -->
<div class="right-sidebar-message-block" ng-repeat="notify in notifications[2] | limitTo:5"> <div class="right-sidebar-message-block" ng-repeat="notify in notifications[2] | limitTo:5">
<a class="clearfix" href="javascript:void(0)"> <a class="clearfix">
<img src="../../../img/sample-profile-pic.jpg"> <img src="../../../img/sample-profile-pic.jpg">
<div class="right-sidebar-message-content"> <div class="right-sidebar-message-content">
<div>{{notify.title}}</div> <div>{{notify.title}}</div>
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Görevler</h3> <h3>Görevler</h3>
<span><a href="javascript:void(0)">Tüm Görevler</a></span> <span><a role="button">Tüm Görevler</a></span>
</div> </div>
<!-- end of right-sidebar-title --> <!-- end of right-sidebar-title -->
<!--<div class="right-sidebar-task-block">--> <!--<div class="right-sidebar-task-block">-->
<!--<div class="task-type">Devam Eden Görevler</div>--> <!--<div class="task-type">Devam Eden Görevler</div>-->
<!--<a href="javascript:void(0)">--> <!--<a role="button">-->
<!--<div class="task-title">Öğrenci Kayıt</div>--> <!--<div class="task-title">Öğrenci Kayıt</div>-->
<!--<div class="progress">--> <!--<div class="progress">-->
<!--<div class="progress-bar" role="progressbar" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width:25%;">--> <!--<div class="progress-bar" role="progressbar" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width:25%;">-->
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div class="right-sidebar-task-block"> <div class="right-sidebar-task-block">
<div class="task-type">Onay Bekleyen Görevler</div> <div class="task-type">Onay Bekleyen Görevler</div>
<a href="javascript:void(0)" ng-repeat="notify in notifications[1] | limitTo:5"> <a ng-repeat="notify in notifications[1] | limitTo:5">
<div class="task-title">{{notify.title}}</div> <div class="task-title">{{notify.title}}</div>
</a> </a>
</div> </div>
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Duyurular</h3> <h3>Duyurular</h3>
<span><a href="javascript:void(0)">Tüm Duyurular</a></span> <span><a role="button">Tüm Duyurular</a></span>
</div> </div>
<!-- end of right-sidebar-title --> <!-- end of right-sidebar-title -->
<div class="right-sidebar-announcement-block"> <div class="right-sidebar-announcement-block">
<a href="javascript:void(0)" ng-repeat="notify in notifications[3] | limitTo:5">{{notify.body}}</a> <a ng-repeat="notify in notifications[3] | limitTo:5">{{notify.body}}</a>
</div> </div>
<!-- end of right-sidebar-status-block --> <!-- end of right-sidebar-status-block -->
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
<div class="right-sidebar-title clearfix"> <div class="right-sidebar-title clearfix">
<h3>Son İşlemler</h3> <h3>Son İşlemler</h3>
<span><a href="javascript:void(0)">Tüm İşlemler</a></span> <span><a role="button">Tüm İşlemler</a></span>
</div> </div>
<!-- end of right-sidebar-title --> <!-- end of right-sidebar-title -->
<div class="right-sidebar-last-action-block"> <div class="right-sidebar-last-action-block">
<a href="javascript:void(0)">Birinci dönem bitimine 10 gün kaldı.</a> <a role="button">Birinci dönem bitimine 10 gün kaldı.</a>
<a href="javascript:void(0)">Ders seçimi işlemleri xx tarihinde başlayacaktır.</a> <a role="button">Ders seçimi işlemleri xx tarihinde başlayacaktır.</a>
</div> </div>
<!-- end of right-sidebar-status-block --> <!-- end of right-sidebar-status-block -->
......
app/shared/templates/directives/sidebar.html
View file @ 61ebf13b
<div class="navbar-default sidebar" role="navigation" ng-mouseenter="openSidebar()" ng-mouseleave="closeSidebar()"> <div class="navbar-default sidebar" role="navigation" ng-mouseenter="openSidebar()" ng-mouseleave="closeSidebar()">
<div class="sidebar-container">
<!-- sidebar-person-info -->
<div class="sidebar-person-info">
<!--<button class="btn btn-primary close-sidebar-person-info">Profili Kapat</button>-->
<div class="identity">
<button type="button" class="close" ng-class="{hidden: $root.collapsed || !selectedUser}"
ng-click="deselectUser()"
aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<div class="identity-header clearfix">
<img ng-src="{{selectedUser ? '/img/sample-profile-pic.jpg' : '/img/empty-profile-pic.jpg'}}">
<div class="pull-left" ng-class="{hidden: $root.collapsed}">
<p class="identity-name">{{selectedUser.name || 'Kişi seçilmedi.'}}</p>
<p class="identity-surname">{{selectedUser.surname}}</p>
<p>{{selectedUser ? 'TCNo: ' + selectedUser.tcno : ''}}</p>
</div>
</div>
<!-- end of identity-header -->
<!--<div class="identity-info" ng-class="{hidden: $root.collapsed}">-->
<!--<div class="clearfix">-->
<!--<span class="fa fa-envelope"></span>-->
<!--<div>erkanogum@gmail.com</div>-->
<!--</div>-->
<!--<div class="clearfix">-->
<!--<span class="fa fa-home"></span>-->
<!--<div>İşçi Blokları Mah. 1524. sokak B Blok 6. Kat A Kanat 27 numara</div>-->
<!--</div>-->
<!--</div>-->
</div>
<!-- end of identity -->
<div class="">
<ul class="nav in" id="side-user-menu" ng-class="{hidden: !selectedMenuItems}" data-step="2"
data-intro="seçilen personele veya öğrenciye göre ilgili menüler yer almaktadır. yapılacak işlemi buradan seçebilirsiniz.">
<li ng-repeat="(key, item) in selectedMenuItems" ng-class="{active: collapseVar == $index+1}">{{dropDown}}
<a href="" ng-click="check($index+1)">
<i class="fa fa-fw"
ng-class="{
'Admin': 'fa fa-fw fa-terminal',
'Genel': 'fa fa-fw fa-graduation-cap',
'Alt Kategori': 'fa fa-fw fa-tags',
'Kadro Islemleri': 'fa fa-fw fa-users',
'Seçime Uygun Görevler':'fa fa-fw fa-user'
}[item[0].kategori]"></i>
<span class="menu-text" ng-class="{hidden: $root.collapsed}">{{ key }}</span>
<span class="fa arrow" ng-class="{hidden: $root.collapsed}"></span>
</a>
<ul class="nav nav-second-level" ng-class="{hidden: $root.collapsed}">
<li ng-repeat="(k, v) in item">
<!--<a ng-if="v.model" ng-href="#{{v.url}}" ng- -->
<!--ng-click="breadcrumb([key, v.text], $event)">{{v.text}}</a>-->
<a ng-href="#/{{v.wf}}/{{v.model}}?{{v.param}}={{selectedUser.key}}"
ng-click="breadcrumb([key, v.text], $event)">{{v.text}}</a>
</li>
</ul>
<!-- /.nav-second-level -->
</li>
</ul>
</div>
<!-- end of person-actions -->
</div>
<!-- end of sidebar-person-info -->
<div class="sidebar-nav navbar-collapse"> <div class="sidebar-nav navbar-collapse">
<ul class="nav in" id="side-menu" ng-class="{hidden: $root.loggedInUser != true}" data-step="1" <ul class="nav in" id="side-menu" ng-class="{hidden: $root.loggedInUser != true}" data-step="1"
data-intro="seçilen personele veya öğrenciye göre ilgili menüler yer almaktadır. yapılacak işlemi buradan seçebilirsiniz."> data-intro="Genel menüler yer almaktadır. yapılacak işlemi buradan seçebilirsiniz.">
<!--<sidebar-search></sidebar-search>--> <!--<sidebar-search></sidebar-search>-->
<li ui-sref-active="active"> <li ui-sref-active="active">
<a href="#/dashboard" ng-click="breadcrumb(['Panel'])"><i class="fa fa-dashboard fa-fw"></i> <a href="#/dashboard" ng-click="breadcrumb(['Panel'])"><i class="fa fa-dashboard fa-fw"></i>
...@@ -18,7 +84,7 @@ ...@@ -18,7 +84,7 @@
'Genel': 'fa fa-fw fa-graduation-cap', 'Genel': 'fa fa-fw fa-graduation-cap',
'Alt Kategori': 'fa fa-fw fa-tags', 'Alt Kategori': 'fa fa-fw fa-tags',
'Kadro Islemleri': 'fa fa-fw fa-users', 'Kadro Islemleri': 'fa fa-fw fa-users',
'Seçime Uygun Görevler':'fa fa-fw fa-users' 'Seçime Uygun Görevler':'fa fa-fw fa-user'
}[item[0].kategori]"></i> }[item[0].kategori]"></i>
<span class="menu-text" ng-class="{hidden: $root.collapsed}">{{ key }}</span> <span class="menu-text" ng-class="{hidden: $root.collapsed}">{{ key }}</span>
<span class="fa arrow" ng-class="{hidden: $root.collapsed}"></span> <span class="fa arrow" ng-class="{hidden: $root.collapsed}"></span>
...@@ -37,6 +103,7 @@ ...@@ -37,6 +103,7 @@
</div> </div>
<!-- /.sidebar-collapse --> <!-- /.sidebar-collapse -->
</div>
<footer ng-class="{hidden: $root.collapsed}"> <footer ng-class="{hidden: $root.collapsed}">
<a class="btn btn-large btn-success" href="javascript:void(0);" onclick="javascript:introJs().setOptions({ <a class="btn btn-large btn-success" href="javascript:void(0);" onclick="javascript:introJs().setOptions({
'nextLabel': 'Sonraki', 'prevLabel': 'Öncek', 'skipLabel': 'Atla', 'doneLabel': 'Bitir' }).start();">Yardım 'nextLabel': 'Sonraki', 'prevLabel': 'Öncek', 'skipLabel': 'Atla', 'doneLabel': 'Bitir' }).start();">Yardım
......
app/shared/templates/foreignKey.html
View file @ 61ebf13b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()"> <label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()">
{{form.title}} {{form.title}}
</label> </label>
<a><i class="fa fa-plus-circle fa-fw" add-modal-for-linked-model="{{form.formName}}"></i></a> <a role="button"><i class="fa fa-plus-circle fa-fw" add-modal-for-linked-model="{{form.formName}}"></i></a>
<div class="form-group input-group"> <div class="form-group input-group">
<span class="input-group-btn"> <span class="input-group-btn">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-repeat="item in form.titleMap"> <li ng-repeat="item in form.titleMap">
<a href="javascript:void(0)" ng-click="form.onDropdownSelect(item, form.model_name)">{{item <a ng-click="form.onDropdownSelect(item, form.model_name)">{{item
.name}}</a> .name}}</a>
</li> </li>
</ul> </ul>
......
app/shared/templates/linkedModelModalContent.html
View file @ 61ebf13b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div ng-repeat="node in Node"> <div ng-repeat="node in Node">
<h3>{{ node.title }} <h3>{{ node.title }}
<span ng-if="node.lengthModels < 1"> <span ng-if="node.lengthModels < 1">
<a href="javascript:void(0);" modal-for-nodes="{{node.schema.model_name}},Node"> <a modal-for-nodes="{{node.schema.model_name}},Node">
<i class="fa fa-plus-circle fa-fw"></i> <i class="fa fa-plus-circle fa-fw"></i>
</a> </a>
</span> </span>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div ng-repeat="node in ListNode"> <div ng-repeat="node in ListNode">
<h3>{{ node.title }} <h3>{{ node.title }}
<span> <span>
<a href="javascript:void(0);" modal-for-nodes="{{node.schema.model_name}},ListNode,add"> <a modal-for-nodes="{{node.schema.model_name}},ListNode,add">
<i class="fa fa-plus-circle fa-fw"></i> <i class="fa fa-plus-circle fa-fw"></i>
</a> </a>
</span> </span>
......
app/shared/templates/multiselect.html
View file @ 61ebf13b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()"> <label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()">
{{form.title}} {{form.title}}
</label> </label>
<a><i class="fa fa-plus-circle fa-fw" add-modal-for-linked-model="{{form.formName}}"></i></a> <a role="button"><i class="fa fa-plus-circle fa-fw" add-modal-for-linked-model="{{form.formName}}"></i></a>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
</div> </div>
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<a><i class="fa fa-arrow-down fa-fw" ng-click="form.select(selectedItemsModel)"></i></a> <a role="button"><i class="fa fa-arrow-down fa-fw" ng-click="form.select(selectedItemsModel)"></i></a>
<a><i class="fa fa-arrow-up fa-fw" ng-click="form.deselect(selectedFilteredItemsModel)"></i></a> <a role="button"><i class="fa fa-arrow-up fa-fw" ng-click="form.deselect(selectedFilteredItemsModel)"></i></a>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div class="help-block" sf-message="form.description"></div> <div class="help-block" sf-message="form.description"></div>
</div> </div>
<!--<div class="col-md-4">--> <!--<div class="col-md-4">-->
<!--<a href="javascript:void(0);" add-modal-for-linked-model>--> <!--<a add-modal-for-linked-model>-->
<!--<i class="fa fa-plus-circle fa-fw"></i>--> <!--<i class="fa fa-plus-circle fa-fw"></i>-->
<!--</a>--> <!--</a>-->
<!--</div>--> <!--</div>-->
......
dist/app.js
View file @ 61ebf13b
This diff is collapsed.
dist/bower_components/components.js
View file @ 61ebf13b
This diff is collapsed.
dist/css/app.css
View file @ 61ebf13b
...@@ -525,16 +525,16 @@ select { ...@@ -525,16 +525,16 @@ select {
.sidebar-person-info { .sidebar-person-info {
overflow-x: visible; overflow-x: visible;
overflow-y: auto; overflow-y: auto;
position: absolute; /*position: absolute;*/
width: 100%; width: 100%;
max-height: calc(85% - 139px); /*max-height: 50%;*/
background: #fff; background: whitesmoke;
/*display:none;*/ /** angular template will hndle this */ /*display:none;*/ /** angular template will hndle this */
} }
.sidebar-person-info .identity { .sidebar-person-info .identity {
color:#555; color:#555;
padding:15px; padding:10px;
padding-bottom: 0px; padding-bottom: 0px;
} }
...@@ -564,8 +564,8 @@ select { ...@@ -564,8 +564,8 @@ select {
} }
.sidebar-person-info .identity img { .sidebar-person-info .identity img {
width:50px; width:40px;
height:50px; height:40px;
border-radius:100%; border-radius:100%;
margin:10px auto; margin:10px auto;
float:left; float:left;
...@@ -1436,6 +1436,7 @@ table.dataTable thead .sorting:after { ...@@ -1436,6 +1436,7 @@ table.dataTable thead .sorting:after {
.sidebar { .sidebar {
z-index: 1; z-index: 1;
position: absolute; position: absolute;
overflow-y: auto;
width: 250px; width: 250px;
height: 100%; height: 100%;
-webkit-box-shadow: 0 0 25px rgba(0,0,0,0.1); -webkit-box-shadow: 0 0 25px rgba(0,0,0,0.1);
...@@ -1459,10 +1460,14 @@ table.dataTable thead .sorting:after { ...@@ -1459,10 +1460,14 @@ table.dataTable thead .sorting:after {
.sidebar .sidebar-nav.navbar-collapse { .sidebar .sidebar-nav.navbar-collapse {
overflow-x: visible; overflow-x: visible;
overflow-y: auto; /*overflow-y: auto;*/
position: absolute; /*position: absolute;*/
width: 100%; width: 100%;
max-height: calc(100% - 139px); /*max-height: calc(50% - 139px);*/
}
.sidebar-container {
max-height: calc(100% - 120px); overflow-y: auto;
} }
footer { footer {
...@@ -1471,6 +1476,7 @@ table.dataTable thead .sorting:after { ...@@ -1471,6 +1476,7 @@ table.dataTable thead .sorting:after {
padding: 15px; padding: 15px;
width:100%; width:100%;
text-align:center; text-align:center;
background: whitesmoke;
} }
footer span { footer span {
......
dist/templates.js
View file @ 61ebf13b
This diff is collapsed.
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