LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(html) Colorize event/task categories chips

pull/201/head
Francis Lachapelle 2016-03-01 14:30:36 -05:00
parent 9b58693873
commit 68cb3d091c
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -20,6 +20,7 @@ Enhancements
- [web] list search now displays a warning regarding the minlength constraint - [web] list search now displays a warning regarding the minlength constraint
- [web] loading an LDAP-based addressbook is now instantaneous when listRequiresDot is disabled (#438, #3464) - [web] loading an LDAP-based addressbook is now instantaneous when listRequiresDot is disabled (#438, #3464)
- [web] improve display of messages with many recipients - [web] improve display of messages with many recipients
- [web] colorize categories chips in event and task viewers
- [web] initial stylesheet for printing - [web] initial stylesheet for printing
- [eas] now support EAS MIME truncation - [eas] now support EAS MIME truncation

3
UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
View File

@ -41,6 +41,9 @@
<md-list-item ng-show="editor.component.categories.length > 0"> <md-list-item ng-show="editor.component.categories.length > 0">
<md-chips class="sg-readonly" ng-model="::editor.component.categories" readonly="true"> <md-chips class="sg-readonly" ng-model="::editor.component.categories" readonly="true">
<md-chip-template> <md-chip-template>
<span class="sg-chip-color" style="z-index: 1">
<span ng-style="{ 'background-color': editor.service.$categories[$chip] }"><!-- color --></span>
</span>
<span>{{$chip}}</span> <span>{{$chip}}</span>
</md-chip-template> </md-chip-template>
</md-chips> </md-chips>

3
UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
View File

@ -41,6 +41,9 @@
<md-list-item ng-show="editor.component.categories.length > 0"> <md-list-item ng-show="editor.component.categories.length > 0">
<md-chips class="sg-readonly" ng-model="::editor.component.categories" readonly="true"> <md-chips class="sg-readonly" ng-model="::editor.component.categories" readonly="true">
<md-chip-template> <md-chip-template>
<span class="sg-chip-color" style="z-index: 1">
<span ng-style="{ 'background-color': editor.service.$categories[$chip] }"><!-- color --></span>
</span>
<span>{{$chip}}</span> <span>{{$chip}}</span>
</md-chip-template> </md-chip-template>
</md-chips> </md-chips>

5
UI/WebServerResources/js/Scheduler/ComponentController.js
View File

@ -6,10 +6,11 @@
/** /**
* @ngInject * @ngInject
*/ */
ComponentController.$inject = ['$rootScope', '$mdDialog', 'Calendar', 'AddressBook', 'Alarm', 'stateComponent']; ComponentController.$inject = ['$rootScope', '$mdDialog', 'Calendar', 'Component', 'AddressBook', 'Alarm', 'stateComponent'];
function ComponentController($rootScope, $mdDialog, Calendar, AddressBook, Alarm, stateComponent) { function ComponentController($rootScope, $mdDialog, Calendar, Component, AddressBook, Alarm, stateComponent) {
var vm = this, component; var vm = this, component;
vm.service = Component;
vm.component = stateComponent; vm.component = stateComponent;
vm.close = close; vm.close = close;
vm.cardFilter = cardFilter; vm.cardFilter = cardFilter;