Skip to content

U
ulakbus-ui
Commit 0d87f831 authored by Vladimir Baranov's avatar Vladimir Baranov
Browse files
Options

Merge branch 'course-program-scheduler-ui' into develop

parents 5cbbc193 298ad0a4
Hide whitespace changes
Inline Side-by-side
Showing with 353 additions and 3 deletions
app/app.css
View file @ 0d87f831
...@@ -2085,8 +2085,8 @@ table.dataTable thead .sorting:after { ...@@ -2085,8 +2085,8 @@ table.dataTable thead .sorting:after {
position: fixed; position: fixed;
bottom: 15px; bottom: 15px;
right: 15px; right: 15px;
-moz-box-shadow: 0px 0px 15px rgba(0,0,0,0.2); -moz-box-shadow: 0px 0px 15px rgba(0,0,0,0.3);
box-shadow: 0px 0px 15px rgba(0,0,0,0.2); box-shadow: 0px 0px 15px rgba(0,0,0,0.3);
z-index: 10; z-index: 10;
border-radius: 3px; border-radius: 3px;
} }
...@@ -2582,6 +2582,114 @@ table.dataTable thead .sorting:after { ...@@ -2582,6 +2582,114 @@ table.dataTable thead .sorting:after {
/* END OF CHAT APPLICATION */ /* END OF CHAT APPLICATION */
/* COURSE PROGRAM SCHEDULER */
.course-prg-scheduler .tab-content {
padding:25px 0;
}
.course-prg-scheduler .nav-tabs {
margin:15px !important;
margin-left:0 !important;
}
.course-prg-scheduler .tab-content .info-header .info-wrapper {
float:left;
margin-right:45px;
}
.course-prg-scheduler .tab-content .info-header .info-wrapper .user-name {
font-family:'robotobold';
font-size: 17px;
color: #444;
}
.course-prg-scheduler .tab-content .info-header .info-wrapper .btn {
margin-top:8px;
}
.course-prg-scheduler .tab-content .info-header .profile-pic {
width: 50px;
height: 50px;
border-radius: 100%;
margin-right:7px;
}
.course-prg-scheduler .tab-content .table-warning {
background-color: #dedede;
padding: 15px;
border-radius: 2px;
font-size: 15px;
font-family: 'robotomedium';
color: #8e8e8e;
display: inline-block;
margin: 15px auto;
}
.course-prg-scheduler .tab-content table tr.headers td {
font-family:'robotobold';
background-color:#f9f9f9;
}
.course-prg-scheduler .tab-content table tr td:first-child {
font-size:11px;
font-family:'robotobold';
width: 180px;
background-color:#f9f9f9;
}
.course-prg-scheduler .tab-content table tbody {
border: 1px solid #d6d6d6;
}
.course-prg-scheduler .tab-content table td {
width: 100px;
height: 50px;
text-align:center;
}
.course-prg-scheduler .tab-content table td .btn {
height: 49px;
margin-top: -7px;
border-radius:0;
}
.course-prg-scheduler .tab-content table td .btn:hover {
background-color:transparent;
}
.course-prg-scheduler .tab-content table td .btn:focus {
outline:none !important;
background-color:#fff;
}
.course-prg-scheduler .tab-content table td .filter-option {
text-align:center !important;
}
.course-prg-scheduler .tab-content table td .bootstrap-select ul.dropdown-menu li a {
padding:10px;
}
.course-prg-scheduler .tab-content table td .bootstrap-select ul.dropdown-menu li a:focus {
outline:none;
}
.course-prg-scheduler .panel-body .nav-tabs li.active a {
border-bottom-color: #ddd;
border-top-color: #ddd;
border-left-color: #ddd;
border-right-color: transparent;
background-color:#fff;
}
.course-prg-scheduler .panel-body .nav-tabs li a:hover {
border-color: #ddd;
border-left-width: 1px;
}
/* END OF COURSE PROGRAM SCHEDULER */
/* Responsive: Portrait tablets and up */ /* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
......
app/components/dashboard/dashboard.html
View file @ 0d87f831
<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">
<div class="col-md-12 course-prg-scheduler">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Course Scheduler Widget</div>
</div>
<div class="panel-body">
<div class="col-xs-3"> <!-- required for floating -->
<!-- Nav tabs -->
<ul class="nav nav-tabs tabs-left">
<li class="active"><a data-target="#one" data-toggle="tab">Eğitim Görevlisi 1</a></li>
<li><a data-target="#two" data-toggle="tab">Eğitim Görevlisi 2</a></li>
<li><a data-target="#three" data-toggle="tab">Eğitim Görevlisi 3</a></li>
<li><a data-target="#four" data-toggle="tab">Eğitim Görevlisi 4</a></li>
<li><a data-target="#five" data-toggle="tab">Eğitim Görevlisi 5</a></li>
<li><a data-target="#six" data-toggle="tab">Eğitim Görevlisi 6</a></li>
<li><a data-target="#seven" data-toggle="tab">Eğitim Görevlisi 7</a></li>
</ul>
</div>
<div class="col-xs-9">
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="one">
<div class="info-header clearfix">
<div class="info-wrapper">
<img src="../../img/gokhan.jpg" class="profile-pic">
<span class="user-name">Öğretim Görevlisi 1</span>
</div>
<div class="info-wrapper">
<div style="margin-top:14px;">
<span>Ders Yükü:</span> <span>20 saat</span>
</div>
</div>
<div class="info-wrapper pull-right" style="margin-right:0;">
<button class="btn btn-success">Kaydet</button>
</div>
</div>
<!-- end of header -->
<div class="table-warning">
<span class="glyphicon glyphicon-exclamation-sign"></span> Tabloda en az 30 saat uygun olarak işaretlemelisiniz.
</div>
<table border="1">
<tbody>
<tr class="headers">
<td></td>
<td>PZT</td>
<td>SAL</td>
<td>ÇAR</td>
<td>PER</td>
<td>CUM</td>
<td>CMT</td>
<td>PAZ</td>
</tr>
<tr>
<td>08:00 - 12:00</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
</tr>
<tr>
<td>12:00 - 15:00</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
</tr>
<tr>
<td>15:00 - 17:00</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
<td>
<select id="basic" class="form-control">
<option>Uygun</option>
<option>Belirsiz</option>
<option>Meşgul</option>
</select>
</td>
</tr>
</tbody>
</table>
</div>
<!-- end of one -->
<div class="tab-pane" id="two">Tab Two</div>
<div class="tab-pane" id="three">Tab Three</div>
<div class="tab-pane" id="four">Tab Four</div>
<div class="tab-pane" id="five">Tab Five</div>
<div class="tab-pane" id="six">Tab Six</div>
<div class="tab-pane" id="seven">Tab Seven</div>
</div>
</div>
</div>
<!-- end of panel-body -->
</div>
<!-- end of panel -->
</div>
<!-- end of course-prg-scheduler -->
</div>
<!-- end of row -->
<academic-calendar></academic-calendar> <academic-calendar></academic-calendar>
<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>
......
app/index.html
View file @ 0d87f831
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<link rel="icon" type="image/png" href="/img/favicon.ico"> <link rel="icon" type="image/png" href="/img/favicon.ico">
<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"> <link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="bower_components/bootstrap-vertical-tabs/bootstrap.vertical-tabs.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<link href="styles/roboto/roboto.css" rel="stylesheet"> <link href="styles/roboto/roboto.css" rel="stylesheet">
<link href="styles/jquery-ui.min.css" rel="stylesheet"> <link href="styles/jquery-ui.min.css" rel="stylesheet">
...@@ -26,7 +27,8 @@ ...@@ -26,7 +27,8 @@
<link rel="stylesheet" href="bower_components/intro.js/introjs.css" type="text/css"> <link rel="stylesheet" href="bower_components/intro.js/introjs.css" type="text/css">
<link rel="stylesheet" href="bower_components/intro.js/themes/introjs-nassim.css" type="text/css"> <link rel="stylesheet" href="bower_components/intro.js/themes/introjs-nassim.css" type="text/css">
<link rel="stylesheet" href="bower_components/toastr/toastr.min.css" type="text/css"> <link rel="stylesheet" href="bower_components/toastr/toastr.min.css" type="text/css">
</head> </head>
<body ng-controller="KeyListenController" ng-keydown="down($event)"> <body ng-controller="KeyListenController" ng-keydown="down($event)">
......
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