diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
index 21e285800..ef9a392c1 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
@@ -44,14 +44,14 @@
// Categories color stripes
'
',
+ ' ng-style="'+p+'{ right: ($index * 10) + \'%\' }">',
' ',
// Priority
'
{{'+p+'block.component.c_priority}}',
// Summary
' {{ '+p+'block.component.summary }}',
// Icons
- '
',
+ ' ',
// Component is reccurent
' repeat',
// Component has an alarm
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
index dffe0d83b..510e61525 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
@@ -39,12 +39,13 @@
// Categories color stripes
' ',
+ ' ng-style="::{ right: ($index * 10) + \'%\' }"> ',
+ ' ',
// Priority
'
',
// Summary
' {{ ::component.c_title }}',
- '
',
+ ' ',
// Component is reccurent
' repeat',
// Component has an alarm
@@ -62,6 +63,7 @@
' ',
' place ',
'
',
+ ' ',
''
].join('');
}
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
index 39d3819c4..76d1daf41 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
@@ -32,28 +32,31 @@
return [
'',
- // Categories color stripes
+ // Add a class while dragging
+ ' ng-class="{\'sg-event--dragging\': block.dragging}"',
+ ' ng-click="clickBlock({clickEvent: $event, clickComponent: block.component})">',
+ // Categories color stripes
'
',
- '
{{ '+p+'block.component.startHour }}',
- // Priority
- '
{{'+p+'block.component.c_priority}}',
- // Summary
- ' {{ '+p+'block.component.summary }}',
- '
',
- // Component is reccurent
- ' repeat',
- // Component has an alarm
- ' alarm',
- // Component is confidential
- ' visibility_off',
- // Component is private
- ' vpn_key',
- ' ',
+ ' ng-class="'+p+'(\'bg-category\' + category)"',
+ ' ng-style="'+p+'{ right: ($index * 10) + \'%\' }">
',
+ ' ',
+ // Start hour
+ ' {{ '+p+'block.component.startHour }}',
+ // Priority
+ ' {{'+p+'block.component.c_priority}}',
+ // Summary
+ ' {{ '+p+'block.component.summary }}',
+ ' ',
+ // Component is reccurent
+ ' repeat',
+ // Component has an alarm
+ ' alarm',
+ // Component is confidential
+ ' visibility_off',
+ // Component is private
+ ' vpn_key',
+ ' ',
+ '
',
''
].join('');
}
diff --git a/UI/WebServerResources/scss/core/structure.scss b/UI/WebServerResources/scss/core/structure.scss
index 22af7db1a..c6d498c54 100644
--- a/UI/WebServerResources/scss/core/structure.scss
+++ b/UI/WebServerResources/scss/core/structure.scss
@@ -37,7 +37,8 @@ html * {
position: absolute;
top: 0;
bottom: 0;
- width: 3px;
+ width: 10%;
+ z-index: $z-index-view;
}
// Group fields of a form
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index 7b3a31ca9..eec1053ab 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -376,6 +376,16 @@ $quarter_height: 10px;
.eventInside {
overflow: hidden;
+ .text {
+ position: absolute;
+ top: 3px;
+ left: 1%;
+ right: 1%;
+ bottom: 3px;
+ margin: 0 2px;
+ overflow: hidden;
+ line-height: $sg-font-size-2;
+ }
}
.material-icons {
@@ -384,7 +394,7 @@ $quarter_height: 10px;
min-width: $sg-font-size-2;
}
- .icons md-icon {
+ .sg-icons md-icon {
float: right;
}
@@ -533,10 +543,6 @@ $quarter_height: 10px;
overflow: auto;
}
}
- .text {
- position: relative;
- overflow: auto;
- }
}
// Multicolumn day cell that contains the calendar name
@@ -651,14 +657,8 @@ $quarter_height: 10px;
}
.text {
- position: absolute;
- top: 3px;
- left: 1%;
- right: 1%;
- bottom: 3px;
- margin: 0 2px;
- overflow: hidden;
- line-height: $sg-font-size-2;
+ position: relative;
+ z-index: $z-index-view + 1;
}
.gradient > IMG {