',
'
',
'
',
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
index 86fb28054..e2506a3e0 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
@@ -29,10 +29,10 @@
clickBlock: '&sgClick'
},
template: [
- '
'
+ '
'
].join('')
};
}
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarMonthDay.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarMonthDay.directive.js
index 458267727..46bc61cad 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarMonthDay.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarMonthDay.directive.js
@@ -14,20 +14,22 @@
+ sg-day="20150408"
+ sg-click="open({ event: clickEvent, component: clickComponent })"/>
*/
function sgCalendarMonthDay() {
return {
restrict: 'E',
scope: {
blocks: '=sgBlocks',
- day: '@sgDay'
+ day: '@sgDay',
+ clickBlock: '&sgClick'
},
- replace: true,
template: [
'
'
+ ' sg-block="block"',
+ ' sg-click="clickBlock({event: clickEvent, component: clickComponent})"/>'
].join('')
};
}
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
index 8068f446c..d799a8509 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
@@ -19,21 +19,21 @@
return {
restrict: 'E',
scope: {
- block: '=sgBlock'
+ block: '=sgBlock',
+ clickBlock: '&sgClick'
},
replace: true,
template: [
- '
',
- '
{{ block.starthour }} - ',
- ' {{ block.component.c_title }}',
- '
',
- ' ',
- ' ',
- ' ',
- ' ',
+ '
',
+ '
{{ block.starthour }} - ',
+ ' {{ block.component.c_title }}',
+ '
',
+ ' ',
+ ' ',
+ ' ',
+ ' ',
'
',
'
',
- '
',
'
'
].join(''),
link: link
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index 0fafa285f..83f4b68e7 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -1,6 +1,10 @@
/// SchedulerUI.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-
$hours_margin: 50px;
+.sg-draggable {
+ cursor: move;
+}
+
.dayLabels {
color: sg-color($sogoBlue, 700);
height: 35px;
@@ -32,6 +36,7 @@ $hours_margin: 50px;
.daysViewFor1Days {
.day {
+ left: $hours_margin;
width: 100%;
}
.days {
@@ -87,8 +92,8 @@ $hours_margin: 50px;
top: 0;
}
}
- .event {
- cursor: default;
+ .sg-event {
+ border-radius: 10px;
margin-right: 1px;
position: absolute;
left: 0%;
@@ -106,9 +111,6 @@ $hours_margin: 50px;
bottom: 0px;
left: 0px;
right: 0px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- cursor:move;
}
}
}