From 5dcc6a74eb8014182df3975a4d1ed52be715710a Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Thu, 26 Jun 2014 22:45:21 -0700
Subject: [PATCH] iCal fixes

Fixed: Calendar feed modal
New: iCal URL now contains the API Key
---
 src/UI/Calendar/CalendarFeedView.js           |  2 +-
 src/UI/Calendar/CalendarFeedViewTemplate.html | 25 +++++++++++--------
 src/UI/Calendar/calendar.less                 |  3 +--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/UI/Calendar/CalendarFeedView.js b/src/UI/Calendar/CalendarFeedView.js
index e69895af9..cf18cb711 100644
--- a/src/UI/Calendar/CalendarFeedView.js
+++ b/src/UI/Calendar/CalendarFeedView.js
@@ -14,7 +14,7 @@ define(
             },
 
             templateHelpers: {
-                icalHttpUrl   : window.location.protocol + '//' + window.location.host + StatusModel.get('urlBase') + '/feed/calendar/NzbDrone.ics',
+                icalHttpUrl   : window.location.protocol + '//' + window.location.host + StatusModel.get('urlBase') + '/feed/calendar/NzbDrone.ics?apikey=' + window.NzbDrone.ApiKey,
                 icalWebCalUrl : 'webcal://' + window.location.host + StatusModel.get('urlBase') + '/feed/calendar/NzbDrone.ics'
             },
 
diff --git a/src/UI/Calendar/CalendarFeedViewTemplate.html b/src/UI/Calendar/CalendarFeedViewTemplate.html
index d920089b3..56ba9eb61 100644
--- a/src/UI/Calendar/CalendarFeedViewTemplate.html
+++ b/src/UI/Calendar/CalendarFeedViewTemplate.html
@@ -6,21 +6,26 @@
         </div>
         <div class="modal-body edit-series-modal">
             <div class="row">
-                <div>
+                <div class="col-md-12">
                     <div class="form-horizontal">
+
                         <div class="form-group">
-                            <label class="control-label">iCal feed</label>
+                            <label class="col-sm-3 control-label">iCal feed</label>
+
+                            <div class="col-sm-1 col-sm-push-8 help-inline">
+                                <i class="icon-nd-form-info" title="Copy this url into your clients subscription form or use the subscribe button if your browser support webcal"/>
+                            </div>
 
-                            <div class="controls ical-url">
-                                <div class="input-group">
-                                    <input type="text" class="x-ical-url" value="{{icalHttpUrl}}" readonly="readonly" />
-                                    <button class="btn btn-icon-only x-ical-copy" title="Copy to clipboard"><i class="icon-copy"></i></button>
-                                    <a class="btn btn-icon-only no-router" title="Subscribe" href="{{icalWebCalUrl}}" target="_blank"><i class="icon-calendar-empty"></i></a>
+                            <div class="col-sm-8 col-sm-pull-1">
+                                <div class="input-group ical-url">
+                                    <input type="text" class="form-control x-ical-url" value="{{icalHttpUrl}}" readonly="readonly" />
+                                    <div class="input-group-btn">
+                                        <button class="btn btn-icon-only x-ical-copy" title="Copy to clipboard"><i class="icon-copy"></i></button>
+                                        <button class="btn btn-icon-only no-router"><a title="Subscribe" href="{{icalWebCalUrl}}" target="_blank"><i class="icon-calendar-empty"></i></a></button>
+                                    </div>
                                 </div>
-                                <span class="help-inline">
-                                    <i class="icon-nd-form-info" title="Copy this url into your clients subscription form or use the subscribe button if your browser support webcal"/>
-                                </span>
                             </div>
+
                         </div>
                     </div>
                 </div>
diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less
index 3aedf3eef..5b6b1faf7 100644
--- a/src/UI/Calendar/calendar.less
+++ b/src/UI/Calendar/calendar.less
@@ -178,7 +178,6 @@
 .ical-url {
 
   input {
-    width  : 440px;
-    cursor : text;
+    cursor : text !important;
   }
 }