Skip to content

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

Merge branch 'Academic-Calendar-Widget-UI' into develop

parents 5fd7b4bc 1e385121
Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 3 deletions
app/app.css
View file @ 0978115e
......@@ -1889,6 +1889,188 @@ table.dataTable thead .sorting:after {
/* END OF ACADEMICIAN DASHBOARD */
/* ACADEMIC CALENDER DASHBOARD WIDGET */
.academic-calendar-widget .panel-body {
padding-top:30px;
padding-bottom:30px;
}
.academic-calendar-widget .calendar-inner {
width: 85%;
margin-left: auto;
margin-right: auto;
position: relative;
}
.academic-calendar-widget .date-circle {
width: calc(100%/7);
float:left;
}
.academic-calendar-widget .date-circle .year {
width: 75px;
text-align: center;
font-size: 11px;
color: #C6C6C6;
}
.academic-calendar-widget .date-circle-container .date-circle:nth-child(5) .year,
.academic-calendar-widget .date-circle-container .date-circle:nth-child(6) .year,
.academic-calendar-widget .date-circle-container .date-circle:nth-child(7) .year {
float:right;
}
.academic-calendar-widget .date-circle a {
width:75px;
height:75px;
color:#808285;
border: 3px solid #fff;
background-color:#fff;
border-radius: 100%;
text-align: center;
display:block;
margin-left: auto;
margin-right: auto;
margin-top:12px;
z-index:1;
position:relative;
cursor:pointer;
font-family:'robotolight';
}
.academic-calendar-widget .date-circle a:hover {
background-color:#EBEBEB;
}
.academic-calendar-widget .date-circle a:before {
border: 2px solid #939598;
content: " ";
position: absolute;
z-index: -1;
border-radius: 100%;
width: 100%;
height: 100%;
margin-left: auto;
margin-right: auto;
left: 0;
right: 0;
}
.academic-calendar-widget .date-today .year {
width: 95px;
margin-left: auto;
margin-right: auto;
}
.academic-calendar-widget .date-today a {
width:95px;
height:95px;
border: 2px solid #fff;
border-radius: 100%;
text-align: center;
margin-top:0;
color:#000;
}
.academic-calendar-widget .date-today a:hover {
background-color:#C9635F;
color:#fff;
}
.academic-calendar-widget .date-today a:before {
border-color: #BE1E2D;
}
.academic-calendar-widget .date-today a .date-day {
margin-top: 18px;
font-size: 25px;
}
.academic-calendar-widget .date-today a .date-month {
font-size: 17px;
}
.academic-calendar-widget a .date-day {
margin-top: 12px;
font-size: 19px;
}
.academic-calendar-widget a .date-month {
line-height: 7px;
}
.calendar-line {
width: 100%;
height: 1px;
background-color: #E5E5E5;
position: absolute;
margin-top: 48px;
z-index: 0;
}
.academic-calendar-widget .date-circle-container .date-circle:nth-child(1) a,
.academic-calendar-widget .date-circle-container .date-circle:nth-child(2) a,
.academic-calendar-widget .date-circle-container .date-circle:nth-child(3) a {
margin-left:0;
}
.academic-calendar-widget .date-circle-container .date-circle:nth-child(5) a,
.academic-calendar-widget .date-circle-container .date-circle:nth-child(6) a,
.academic-calendar-widget .date-circle-container .date-circle:nth-child(7) a {
margin-right:0;
}
.calendar-widget-navigation {
position: relative;
font-size: 40px;
color: #ccc;
}
.calendar-widget-navigation .fa {
position:absolute;
top: 27px;
cursor:pointer;
-webkit-transition: all .2s;
-moz-transition: all .2s;
-ms-transition: all .2s;
-o-transition: all .2s;
transition: all .2s;
}
.calendar-widget-navigation .fa:hover {
color:#666;
}
.calendar-widget-navigation .fa-angle-left {
left:25px;
}
.calendar-widget-navigation .fa-angle-right {
right:25px;
}
.academic-calendar-widget-popover label {
color:#A61229;
}
.academic-calendar-widget-popover .content-wrapper {
border-bottom:1px solid #dedede;
margin-bottom:10px;
}
.academic-calendar-widget-popover .content-wrapper:last-child {
border:none;
}
.academic-calendar-widget .date-circle .popover {
width:450px !important;
padding-bottom:0 !important;
}
/* END OF ACADEMIC CALENDER DASHBOARD WIDGET */
/* Responsive: Portrait tablets and up */
......
app/components/dashboard/dashboard.html
View file @ 0978115e
<div ng-app="ulakbus.dashboard" class="dashboard academician-dashboard">
<div class="starter-template">
<academic-calendar></academic-calendar>
<!--<user-tasks></user-tasks>-->
<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>
......
app/components/dashboard/dashboard_widgets_directives.js
View file @ 0978115e
......@@ -45,4 +45,15 @@ angular.module('ulakbus.dashboard')
}
}
};
});
\ No newline at end of file
})
.directive('academicCalendar', function () {
return {
templateUrl: 'components/dashboard/directives/academic-calendar.html',
restrict: 'E',
replace: true,
scope: {},
controller: function ($scope) {
}
};
});;
\ No newline at end of file
app/components/dashboard/directives/academic-calendar.html 0 → 100644
View file @ 0978115e
<div class="row">
<div class="col-md-12 academic-calendar-widget">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Akademik Takvim Göstergeci</div>
<div class="panel-action pull-right">Tüm Akademik Takvim</div>
</div>
<div class="panel-body">
<div class="calendar-inner">
<div class="calendar-line"></div>
<div class="date-circle-container">
<div class="date-circle">
<a class="popper" data-toggle="popover">
<div class="date-day">02</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">03</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">04</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle date-today">
<a popover-trigger="mouseenter" popover-placement="bottom" uib-popover-template="'components/dashboard/directives/calendar-popover.html'">
<div class="date-day">05</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">06</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">07</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">08</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
</div>
<!-- end of date-circle-container -->
</div>
<!-- end of calendar-inner -->
<div class="calendar-widget-navigation">
<span class="fa fa-angle-left"></span>
<span class="fa fa-angle-right"></span>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
app/components/dashboard/directives/calendar-popover.html 0 → 100644
View file @ 0978115e
<div class="academic-calendar-widget-popover">
<div class="content-wrapper">
<label>5 Şubat 2016</label>
<p>Öğrenci katkı paylarının Ödenmesi için son gün</p>
</div>
<div class="content-wrapper">
<label>5 - 8 Şubat 2016</label>
<p>Etkileşimli kayıtlar ve danışman onayları (Ön lisans, lisans ve lisansüstü programlar)</p>
</div>
</div>
\ No newline at end of file
app/shared/templates/datefield.html
View file @ 0978115e
......@@ -18,7 +18,7 @@
id="{{form.key.slice(-1)[0]}}"
ng-model-options="form.ngModelOptions"
ng-model="$$value$$"
ng-disabled="form.readonly"
ng-disabled="form.is_disabled()"
schema-validate="form"
name="{{form.key.slice(-1)[0]}}"
aria-describedby="{{form.key.slice(-1)[0] + 'Status'}}"
......
app/zetalib/form_service.js
View file @ 0978115e
......@@ -565,13 +565,23 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
return deferred.promise;
}
},
disabled: false,
is_disabled: function () {
return this.disabled;
},
status: {opened: false},
open: function ($event) {
this.status.opened = true;
this.disabled = true;
// scope.$apply();
scope.model[k] = Moment(scope.model[k], "DD.MM.YYYY").toDate();
var that = this;
$timeout(function () {
that.status.opened = true;
}, 100);
},
format: 'dd.MM.yyyy',
onSelect: function () {
this.disabled = false;
scope.model[k] = angular.copy(generator.dateformatter(scope.model[k]));
}
};
......
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