Skip to content

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

academician template gets seperated

parent fd73ba1f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 363 additions and 136 deletions
app/app.js
View file @ 5166f9f9
...@@ -73,12 +73,16 @@ angular.module( ...@@ -73,12 +73,16 @@ angular.module(
return {url: backendurl}; return {url: backendurl};
})()) })())
.service('DESIGN', function ($routeParams, $cookies) { .service('DESIGN', function ($routeParams, $cookies, $log) {
// use route param to change cookie for design // use route param to change cookie for design
// this is a config as a service added for designer can work without backend // this is a config as a service added for designer can work without backend
try {
if (angular.isDefined($routeParams.design) || location.hash.split('?')[1].split('=')[1]) { if (angular.isDefined($routeParams.design) || location.hash.split('?')[1].split('=')[1]) {
$cookies.put('design', $routeParams.design || location.hash.split('?')[1].split('=')[1]); $cookies.put('design', $routeParams.design || location.hash.split('?')[1].split('=')[1]);
} }
} catch (e){
$log.error("Error for design parameter", e);
}
return $cookies.get('design') === 'true' ? {switch: true} : {switch: false}; return $cookies.get('design') === 'true' ? {switch: true} : {switch: false};
}) })
.constant('toastr', window.toastr) .constant('toastr', window.toastr)
......
app/components/dashboard/dashboard.html
View file @ 5166f9f9
<div ng-app="ulakbus.dashboard" class="dashboard academician-dashboard"> <div ng-app="ulakbus.dashboard" class="dashboard academician-dashboard">
<div class="starter-template"> <div class="starter-template">
<div class="row">
<!-- ACADEMICIAN COURSES -->
<div class="col-lg-5 col-md-12 academician-course-list">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Dersler</div>
</div>
<div class="panel-body">
<ul>
<li><a href="#"><span>181</span> Basic Physics <div>Asistanlar: Evren Kutar</div></a></li>
<li><a href="#"><span>421</span> Research and Development <div>Asistanlar: Erkan Öğümsöğütlü</div></a></li>
<li><a href="#"><span>435</span> Project Management and Development <div>Asistanlar: -</div></a></li>
<li><a href="#"><span>207</span> Design and Use of Instructional Material <div>Asistanlar: -</div></a></li>
<li><a href="#"><span>323</span> Multimedia Design and Development <div>Asistanlar: Evren Kutar</div></a></li>
<li><a href="#"><span>475</span> Climate Change Education for Sustainability <div>Asistanlar: Evren Kutar</div></a></li>
</ul>
</div>
</div>
</div>
<!-- END OF ACADEMICIAN COURSES -->
<!-- ACADEMICIAN WEEKLY SCHEDULE -->
<div class="col-lg-7 col-md-12 academician-weekly-schedule">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Ders Programı</div>
</div>
<div class="panel-body">
<table border="1">
<tbody>
<tr class="days">
<td></td>
<td>Pazartesi</td>
<td>Salı</td>
<td>Çarşamba</td>
<td>Perşembe</td>
<td>Cuma</td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td><a uib-tooltip="Bacis Physics - Derslik 5">181</a></td>
<td></td>
<td></td>
<td><a uib-tooltip="Research and Development - Derslik 1">421</a></td>
<td></td>
</tr>
<tr>
<td>09:40 - 09:30</td>
<td><a uib-tooltip="Bacis Physics - Derslik 5">181</a></td>
<td><a uib-tooltip="Project Management and Development - Derslik 8">435</a></td>
<td></td>
<td><a uib-tooltip="Research and Development - Derslik 1">421</a></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td><a uib-tooltip="Project Management and Development - Derslik 8">435</a></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td><a uib-tooltip="Multimedia Design and Development - Derslik 9">323</a></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a uib-tooltip="Climate Change Education for Sustainability - Derslik 15">475</a></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a uib-tooltip="Climate Change Education for Sustainability - Derslik 15">475</a></td>
</tr>
</tbody>
</table>
<p class="schedule-notice"><span>Not:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</div>
</div>
<!-- END OF ACADEMICIAN WEEKLY SCHEDULE -->
</div>
<ng-include src="'components/dashboard/user-templates/student.html'" ng-if="$root.current_user.is_student"></ng-include> <ng-include src="'components/dashboard/user-templates/student.html'" ng-if="$root.current_user.is_student"></ng-include>
<ng-include src="'components/dashboard/user-templates/staff.html'" ng-if="!$root.current_user.is_student"></ng-include> <ng-include src="'components/dashboard/user-templates/staff.html'" ng-if="!$root.current_user.is_student"></ng-include>
<ng-include src="'components/dashboard/user-templates/academician.html'" ng-if="$root.current_user.is_staff && $root.current_user.is_academic"></ng-include>
</div> </div>
</div> </div>
\ No newline at end of file
app/components/dashboard/user-templates/academician.html 0 → 100644
View file @ 5166f9f9
<div class="row">
<!-- ACADEMICIAN COURSES -->
<div class="col-lg-5 col-md-12 academician-course-list">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Dersler</div>
</div>
<div class="panel-body">
<ul>
<li><a href="#"><span>181</span> Basic Physics <div>Asistanlar: Evren Kutar</div></a></li>
<li><a href="#"><span>421</span> Research and Development <div>Asistanlar: Erkan Öğümsöğütlü</div></a></li>
<li><a href="#"><span>435</span> Project Management and Development <div>Asistanlar: -</div></a></li>
<li><a href="#"><span>207</span> Design and Use of Instructional Material <div>Asistanlar: -</div></a></li>
<li><a href="#"><span>323</span> Multimedia Design and Development <div>Asistanlar: Evren Kutar</div></a></li>
<li><a href="#"><span>475</span> Climate Change Education for Sustainability <div>Asistanlar: Evren Kutar</div></a></li>
</ul>
</div>
</div>
</div>
<!-- END OF ACADEMICIAN COURSES -->
<!-- ACADEMICIAN WEEKLY SCHEDULE -->
<div class="col-lg-7 col-md-12 academician-weekly-schedule">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Ders Programı</div>
</div>
<div class="panel-body">
<table border="1">
<tbody>
<tr class="days">
<td></td>
<td>Pazartesi</td>
<td>Salı</td>
<td>Çarşamba</td>
<td>Perşembe</td>
<td>Cuma</td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td><a uib-tooltip="Bacis Physics - Derslik 5">181</a></td>
<td></td>
<td></td>
<td><a uib-tooltip="Research and Development - Derslik 1">421</a></td>
<td></td>
</tr>
<tr>
<td>09:40 - 09:30</td>
<td><a uib-tooltip="Bacis Physics - Derslik 5">181</a></td>
<td><a uib-tooltip="Project Management and Development - Derslik 8">435</a></td>
<td></td>
<td><a uib-tooltip="Research and Development - Derslik 1">421</a></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td><a uib-tooltip="Project Management and Development - Derslik 8">435</a></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td><a uib-tooltip="Multimedia Design and Development - Derslik 9">323</a></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a uib-tooltip="Climate Change Education for Sustainability - Derslik 15">475</a></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a uib-tooltip="Climate Change Education for Sustainability - Derslik 15">475</a></td>
</tr>
</tbody>
</table>
<p class="schedule-notice"><span>Not:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</div>
</div>
<!-- END OF ACADEMICIAN WEEKLY SCHEDULE -->
</div>
\ No newline at end of file
app/main.js
View file @ 5166f9f9
...@@ -78,12 +78,16 @@ angular.module( ...@@ -78,12 +78,16 @@ angular.module(
return {url: backendurl}; return {url: backendurl};
})()) })())
.service('DESIGN', function ($routeParams, $cookies) { .service('DESIGN', function ($routeParams, $cookies, $log) {
// use route param to change cookie for design // use route param to change cookie for design
// this is a config as a service added for designer can work without backend // this is a config as a service added for designer can work without backend
try {
if (angular.isDefined($routeParams.design) || location.hash.split('?')[1].split('=')[1]) { if (angular.isDefined($routeParams.design) || location.hash.split('?')[1].split('=')[1]) {
$cookies.put('design', $routeParams.design || location.hash.split('?')[1].split('=')[1]); $cookies.put('design', $routeParams.design || location.hash.split('?')[1].split('=')[1]);
} }
} catch (e){
$log.error("Error for design parameter", e);
}
return $cookies.get('design') === 'true' ? {switch: true} : {switch: false}; return $cookies.get('design') === 'true' ? {switch: true} : {switch: false};
}) })
.constant('toastr', window.toastr) .constant('toastr', window.toastr)
......
dist/app.js
View file @ 5166f9f9
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/bower_components/components.js
View file @ 5166f9f9
This diff is collapsed.
dist/css/app.css
View file @ 5166f9f9
...@@ -1808,6 +1808,101 @@ table.dataTable thead .sorting:after { ...@@ -1808,6 +1808,101 @@ table.dataTable thead .sorting:after {
/* END OF STUDENT DASHBOARD */ /* END OF STUDENT DASHBOARD */
/* ACADEMICIAN DASHBOARD */
.academician-dashboard a:hover {
text-decoration:none;
background-color:#f9f9f9;
}
.academician-dashboard .panel-body ul,
.academician-dashboard .panel-body {
padding:0;
margin:0;
}
.academician-dashboard .panel-body ul li {
list-style: none;
border-bottom: 1px solid #f5f5f5;
font-size:16px;
}
.academician-dashboard .panel-body ul li a {
padding:20px 25px;
display:block;
color:#333;
}
.academician-dashboard .panel-body ul li:last-child {
border:none;
}
.academician-course-list .panel-body,
.academician-weekly-schedule .panel-body {
height:437px;
overflow-y:auto;
overflow-x:hidden;
}
.academician-course-list .panel-body ul li span {
margin-right:15px;
}
.academician-course-list .panel-body ul li div {
margin-left: 47px;
font-size: 15px;
color: #7E7E7E;
}
.academician-dashboard .academician-weekly-schedule table {
width: calc(100% + 2px);
-webkit-width: calc(100% + 2px);
border: none;
margin-top: -1px;
margin-left: -1px;
text-align:center;
}
.academician-dashboard .academician-weekly-schedule table a {
color:#333;
display:block;
height: 38px;
line-height: 38px;
}
.academician-dashboard .academician-weekly-schedule table a:hover {
font-family:'robotobold';
background-color:transparent;
font-size:16px;
}
.academician-dashboard .academician-weekly-schedule table tr.days td {
width: calc(100% / 6);
font-family: 'robotomedium';
background-color: #FDFDFD;
}
.academician-dashboard .academician-weekly-schedule table tr.days td:first-child {
background-color:transparent;
}
.academician-dashboard .academician-weekly-schedule table tr td:first-child {
height: 38px;
font-family: 'robotomedium';
background-color: #FDFDFD;
}
.academician-dashboard .academician-weekly-schedule p.schedule-notice {
margin-left: 36px;
margin-top: 18px;
}
.academician-dashboard .academician-weekly-schedule p.schedule-notice span {
font-family: 'robotomedium';
}
/* END OF ACADEMICIAN DASHBOARD */
/* Responsive: Portrait tablets and up */ /* Responsive: Portrait tablets and up */
......
dist/templates.js
View file @ 5166f9f9
...@@ -435,8 +435,133 @@ angular.module("components/crud/templates/show.html", []).run(["$templateCache", ...@@ -435,8 +435,133 @@ angular.module("components/crud/templates/show.html", []).run(["$templateCache",
angular.module("components/dashboard/dashboard.html", []).run(["$templateCache", function($templateCache) { angular.module("components/dashboard/dashboard.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/dashboard/dashboard.html", $templateCache.put("components/dashboard/dashboard.html",
"<div ng-app=\"ulakbus.dashboard\" class=\"dashboard student-dashboard\">\n" + "<div ng-app=\"ulakbus.dashboard\" class=\"dashboard academician-dashboard\">\n" +
" <div class=\"starter-template\">\n" + " <div class=\"starter-template\">\n" +
" \n" +
" <div class=\"row\">\n" +
" <!-- ACADEMICIAN COURSES -->\n" +
" <div class=\"col-lg-5 col-md-12 academician-course-list\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <div class=\"panel-title\">Dersler</div>\n" +
" </div>\n" +
" <div class=\"panel-body\">\n" +
" \n" +
" <ul>\n" +
" <li><a href=\"#\"><span>181</span> Basic Physics <div>Asistanlar: Evren Kutar</div></a></li>\n" +
" <li><a href=\"#\"><span>421</span> Research and Development <div>Asistanlar: Erkan Öğümsöğütlü</div></a></li>\n" +
" <li><a href=\"#\"><span>435</span> Project Management and Development <div>Asistanlar: -</div></a></li>\n" +
" <li><a href=\"#\"><span>207</span> Design and Use of Instructional Material <div>Asistanlar: -</div></a></li>\n" +
" <li><a href=\"#\"><span>323</span> Multimedia Design and Development <div>Asistanlar: Evren Kutar</div></a></li>\n" +
" <li><a href=\"#\"><span>475</span> Climate Change Education for Sustainability <div>Asistanlar: Evren Kutar</div></a></li>\n" +
" </ul>\n" +
" \n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" <!-- END OF ACADEMICIAN COURSES -->\n" +
" \n" +
" <!-- ACADEMICIAN WEEKLY SCHEDULE -->\n" +
" <div class=\"col-lg-7 col-md-12 academician-weekly-schedule\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <div class=\"panel-title\">Ders Programı</div>\n" +
" </div>\n" +
" <div class=\"panel-body\">\n" +
" \n" +
" <table border=\"1\">\n" +
" <tbody>\n" +
" <tr class=\"days\">\n" +
" <td></td>\n" +
" <td>Pazartesi</td>\n" +
" <td>Salı</td>\n" +
" <td>Çarşamba</td>\n" +
" <td>Perşembe</td>\n" +
" <td>Cuma</td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td><a uib-tooltip=\"Bacis Physics - Derslik 5\">181</a></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Research and Development - Derslik 1\">421</a></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>09:40 - 09:30</td>\n" +
" <td><a uib-tooltip=\"Bacis Physics - Derslik 5\">181</a></td>\n" +
" <td><a uib-tooltip=\"Project Management and Development - Derslik 8\">435</a></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Research and Development - Derslik 1\">421</a></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Project Management and Development - Derslik 8\">435</a></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Design and Use of Instructional Material - Derslik 4\">207</a></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Design and Use of Instructional Material - Derslik 4\">207</a></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Design and Use of Instructional Material - Derslik 4\">207</a></td>\n" +
" <td><a uib-tooltip=\"Multimedia Design and Development - Derslik 9\">323</a></td>\n" +
" <td></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Climate Change Education for Sustainability - Derslik 15\">475</a></td>\n" +
" </tr>\n" +
" <tr>\n" +
" <td>08:40 - 09:30</td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td><a uib-tooltip=\"Climate Change Education for Sustainability - Derslik 15\">475</a></td>\n" +
" </tr>\n" +
" </tbody>\n" +
" </table>\n" +
" \n" +
" <p class=\"schedule-notice\"><span>Not:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>\n" +
"\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" <!-- END OF ACADEMICIAN WEEKLY SCHEDULE -->\n" +
" </div>\n" +
" \n" +
" <ng-include src=\"'components/dashboard/user-templates/student.html'\" ng-if=\"$root.current_user.is_student\"></ng-include>\n" + " <ng-include src=\"'components/dashboard/user-templates/student.html'\" ng-if=\"$root.current_user.is_student\"></ng-include>\n" +
" <ng-include src=\"'components/dashboard/user-templates/staff.html'\" ng-if=\"!$root.current_user.is_student\"></ng-include>\n" + " <ng-include src=\"'components/dashboard/user-templates/staff.html'\" ng-if=\"!$root.current_user.is_student\"></ng-include>\n" +
" </div>\n" + " </div>\n" +
......
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