(js) Improve handling of Web calendars

This commit is contained in:
Francis Lachapelle
2018-02-07 15:36:24 -05:00
parent b120669747
commit 3bf55a5edf
3 changed files with 7 additions and 2 deletions
+4 -1
View File
@@ -679,7 +679,10 @@
<md-dialog flex="50" flex-xs="90">
<form name="authForm" ng-submit="$WebCalendarAuthDialogController.authenticate(authForm)">
<md-dialog-content class="md-dialog-content" layout="column">
<h2 class="md-title" ng-bind="$WebCalendarAuthDialogController.title"><!-- title --></h2>
<h2 class="md-title">
{{::$WebCalendarAuthDialogController.title}}
<div class="md-caption" ng-bind="::$WebCalendarAuthDialogController.url"><!-- url --></div>
</h2>
<md-input-container>
<label>{{ ::'Username' | loc }}</label>
<input type="text" name="username"
@@ -138,6 +138,7 @@
hostname = parts[2];
vm.title = l("Please identify yourself to %{0}").formatted(hostname);
vm.url = url;
vm.authenticate = function(form) {
if (form.$valid || !form.$error.required) {
calendar.setCredentials(vm.username, vm.password).then(function(message) {
@@ -22,6 +22,7 @@
'<p class="sg-item-name"',
' ng-dblclick="$ctrl.editFolder($event)">',
' <span ng-bind="$ctrl.calendar.name"></span>',
' <md-icon ng-if="$ctrl.calendar.$error" class="md-warn">error</md-icon>',
' <md-tooltip md-delay="1000"',
' md-autohide="true"',
' ng-bind="$ctrl.calendar.name"></md-tooltip>',
@@ -282,7 +283,7 @@
targetEvent: $event,
clickOutsideToClose: true,
escapeToClose: true,
templateUrl: 'UIxCalendarImportDialog',
templateUrl: 'UIxCalendarImportDialog', // subtemplate of UIxCalMainView.wox
controller: CalendarImportDialogController,
controllerAs: '$CalendarImportDialogController',
locals: {