From 1e538dc7cc37e59d6bbdffa59f2d7ed6aa7fca0e Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Thu, 26 Jun 2014 22:34:11 +0200
Subject: [PATCH] Fixed: webcal url now has the apikey embedded to support more
 third-party webcal clients.

---
 src/UI/Calendar/CalendarFeedView.js           |  2 +-
 src/UI/Calendar/CalendarFeedViewTemplate.html | 32 +++++++------------
 src/UI/Calendar/calendar.less                 |  4 +--
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/UI/Calendar/CalendarFeedView.js b/src/UI/Calendar/CalendarFeedView.js
index cf18cb711..c626a56ee 100644
--- a/src/UI/Calendar/CalendarFeedView.js
+++ b/src/UI/Calendar/CalendarFeedView.js
@@ -15,7 +15,7 @@ define(
 
             templateHelpers: {
                 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'
+                icalWebCalUrl : 'webcal://' + window.location.host + StatusModel.get('urlBase') + '/feed/calendar/NzbDrone.ics?apikey=' + window.NzbDrone.ApiKey
             },
 
             onShow: function () {
diff --git a/src/UI/Calendar/CalendarFeedViewTemplate.html b/src/UI/Calendar/CalendarFeedViewTemplate.html
index 56ba9eb61..b217a953e 100644
--- a/src/UI/Calendar/CalendarFeedViewTemplate.html
+++ b/src/UI/Calendar/CalendarFeedViewTemplate.html
@@ -5,27 +5,19 @@
             <h3>NzbDrone Calendar feed</h3>
         </div>
         <div class="modal-body edit-series-modal">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="form-horizontal">
-
-                        <div class="form-group">
-                            <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 class="form-horizontal">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">iCal feed</label>
+                    <div class="col-sm-1 col-sm-push-9 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="col-sm-9 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" title="Subscribe" href="{{icalWebCalUrl}}" target="_blank" data-container=".modal-body"><i class="icon-calendar-empty"></i></button>
                             </div>
-
-                            <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>
-                            </div>
-
                         </div>
                     </div>
                 </div>
diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less
index 5b6b1faf7..865206cb8 100644
--- a/src/UI/Calendar/calendar.less
+++ b/src/UI/Calendar/calendar.less
@@ -177,7 +177,7 @@
 
 .ical-url {
 
-  input {
-    cursor : text !important;
+  input, input[readonly] {
+    cursor : text;
   }
 }