From 3bf55a5edf4c66bac7bdf9a43087abd1781cc979 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 7 Feb 2018 15:36:24 -0500
Subject: [PATCH] (js) Improve handling of Web calendars

---
 UI/Templates/SchedulerUI/UIxCalMainView.wox                  | 5 ++++-
 UI/WebServerResources/js/Scheduler/CalendarsController.js    | 1 +
 .../js/Scheduler/sgCalendarListItem.directive.js             | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 50faf239a..f4e81253d 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -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"
diff --git a/UI/WebServerResources/js/Scheduler/CalendarsController.js b/UI/WebServerResources/js/Scheduler/CalendarsController.js
index 2a70b7087..7e699f453 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarsController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarsController.js
@@ -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) {
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
index bdf248f56..34760571d 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
@@ -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: {