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

(js) Add "today" button to Calendar module

pull/105/head
Francis Lachapelle 2015-09-22 10:17:17 -04:00
parent 957336b24c
commit 08fbc00d7a
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/Templates/SchedulerUI/UIxCalMainView.wox
View File

@ -585,14 +585,18 @@
<!-- day/week/month views --> <!-- day/week/month views -->
<md-toolbar class="view-detail" hide-sm="hide-sm"> <md-toolbar class="view-detail" hide-sm="hide-sm">
<div class="md-toolbar-tools" layout-align="end center"> <div class="md-toolbar-tools">
<a class="sg-icon-button md-button" <md-button class="md-icon-button"
label:aria-label="Today"
ng-click="app.today()"><md-icon>today</md-icon></md-button>
<div class="md-flex"><!-- spacer --></div>
<a class="md-icon-button md-button"
label:aria-label="Day" label:aria-label="Day"
href="#/calendar/day"><md-icon>view_day</md-icon></a> href="#/calendar/day"><md-icon>view_day</md-icon></a>
<a class="sg-icon-button md-button" <a class="md-icon-button md-button"
label:aria-label="Week" label:aria-label="Week"
href="#/calendar/week"><md-icon>view_week</md-icon></a> href="#/calendar/week"><md-icon>view_week</md-icon></a>
<a class="sg-icon-button md-button" <a class="md-icon-button md-button"
label:aria-label="Month" label:aria-label="Month"
href="#/calendar/month"><md-icon>view_module</md-icon></a> href="#/calendar/month"><md-icon>view_module</md-icon></a>
</div> </div>

14
UI/WebServerResources/js/Scheduler/CalendarsController.js
View File

@ -6,8 +6,8 @@
/** /**
* @ngInject * @ngInject
*/ */
CalendarsController.$inject = ['$scope', '$rootScope', '$stateParams', '$state', '$timeout', '$q', '$mdDialog', '$log', 'sgFocus', 'Dialog', 'sgSettings', 'Calendar', 'User', 'stateCalendars']; CalendarsController.$inject = ['$scope', '$window', '$mdDialog', '$log', 'sgFocus', 'Dialog', 'sgSettings', 'Calendar', 'User', 'stateCalendars'];
function CalendarsController($scope, $rootScope, $stateParams, $state, $timeout, $q, $mdDialog, $log, focus, Dialog, Settings, Calendar, User, stateCalendars) { function CalendarsController($scope, $window, $mdDialog, $log, focus, Dialog, Settings, Calendar, User, stateCalendars) {
var vm = this; var vm = this;
vm.activeUser = Settings.activeUser; vm.activeUser = Settings.activeUser;
@ -22,6 +22,7 @@
vm.showLinks = showLinks; vm.showLinks = showLinks;
vm.showProperties = showProperties; vm.showProperties = showProperties;
vm.subscribeToFolder = subscribeToFolder; vm.subscribeToFolder = subscribeToFolder;
vm.today = today;
// Dispatch the event named 'calendars:list' when a calendar is activated or deactivated or // Dispatch the event named 'calendars:list' when a calendar is activated or deactivated or
// when the color of a calendar is changed // when the color of a calendar is changed
@ -204,6 +205,15 @@
Dialog.alert(l('Warning'), l('An error occured please try again.')); Dialog.alert(l('Warning'), l('An error occured please try again.'));
}); });
} }
function today() {
var fragments = $window.location.hash.split('/'),
state = fragments[1],
view = fragments[2],
now = new Date(),
path = ['#', state, view, now.getDayString()];
$window.location = path.join('/');
}
} }
angular angular