mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

iCal fixes 

Fixed: Calendar feed modal
New: iCal URL now contains the API Key
This commit is contained in:
Mark McDowall 2014-06-26 22:45:21 -07:00
parent cb291d30b3
commit 5dcc6a74eb
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/UI/Calendar/CalendarFeedView.js
View File

@ -14,7 +14,7 @@ define(
}, },
templateHelpers: { 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' icalWebCalUrl : 'webcal://' + window.location.host + StatusModel.get('urlBase') + '/feed/calendar/NzbDrone.ics'
}, },

29
src/UI/Calendar/CalendarFeedViewTemplate.html
View File

@ -6,21 +6,26 @@
</div> </div>
<div class="modal-body edit-series-modal"> <div class="modal-body edit-series-modal">
<div class="row"> <div class="row">
<div> <div class="col-md-12">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group">
<label class="control-label">iCal feed</label>
<div class="controls ical-url"> <div class="form-group">
<div class="input-group"> <label class="col-sm-3 control-label">iCal feed</label>
<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> <div class="col-sm-1 col-sm-push-8 help-inline">
<a class="btn btn-icon-only no-router" title="Subscribe" href="{{icalWebCalUrl}}" target="_blank"><i class="icon-calendar-empty"></i></a> <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>
<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 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> </div>
</div> </div>

3
src/UI/Calendar/calendar.less
View File

@ -178,7 +178,6 @@
.ical-url { .ical-url {
input { input {
width : 440px; cursor : text !important;
cursor : text;
} }
} }