Skip to content

Commit c017536

Browse files
midgetspymidgetspy
committed
Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows_binaries
2 parents 4ba5699 + 630fb45 commit c017536

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1172
-705
lines changed

‎data/images/notifiers/boxcar.png

-1.5 KB
Binary file not shown.

‎data/images/notifiers/boxcar2.png

761 Bytes
Loading

‎data/images/notifiers/pushalot.png

927 Bytes
Loading

‎data/interfaces/default/config_notifications.tmpl

Lines changed: 107 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -700,52 +700,92 @@
700700

701701
<div class="component-group clearfix">
702702
<div class="component-group-desc">
703-
<img class="notifier-icon" src="$sbRoot/images/notifiers/boxcar.png" alt="" title="Boxcar" />
704-
<h3><a href="http://boxcar.io/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Boxcar</a></h3>
705-
<p>Universal push notification for iOS. Read your messages where and when you want them! A subscription will be sent if needed.</p>
703+
<img class="notifier-icon" src="$sbRoot/images/notifiers/boxcar2.png" alt="" title="Boxcar2" />
704+
<h3><a href="http://boxcar.io/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Boxcar2</a></h3>
705+
<p>Personalized Push and Alerts Inbox for your iPhone that lets you manage and live news in real-time.</p>
706706
</div>
707707
<fieldset class="component-group-list">
708708
<div class="field-pair">
709-
<input type="checkbox" class="enabler" name="use_boxcar" id="use_boxcar" #if $sickbeard.USE_BOXCAR then "checked=\"checked\"" else ""# />
710-
<label class="clearfix" for="use_boxcar">
709+
<input type="checkbox" class="enabler" name="use_boxcar2" id="use_boxcar2" #if $sickbeard.USE_BOXCAR2 then "checked=\"checked\"" else ""# />
710+
<label class="clearfix" for="use_boxcar2">
711711
<span class="component-title">Enable</span>
712-
<span class="component-desc">Should Sick Beard send Boxcar notifications?</span>
712+
<span class="component-desc">Should Sick Beard send Boxcar2 notifications?</span>
713713
</label>
714714
</div>
715715

716-
<div id="content_use_boxcar">
716+
<div id="content_use_boxcar2">
717717
<div class="field-pair">
718-
<input type="checkbox" name="boxcar_notify_onsnatch" id="boxcar_notify_onsnatch" #if $sickbeard.BOXCAR_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
719-
<label class="clearfix" for="boxcar_notify_onsnatch">
718+
<input type="checkbox" name="boxcar2_notify_onsnatch" id="boxcar2_notify_onsnatch" #if $sickbeard.BOXCAR2_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
719+
<label class="clearfix" for="boxcar2_notify_onsnatch">
720720
<span class="component-title">Notify on Snatch</span>
721721
<span class="component-desc">Send notification when we start a download?</span>
722722
</label>
723723
</div>
724724
<div class="field-pair">
725-
<input type="checkbox" name="boxcar_notify_ondownload" id="boxcar_notify_ondownload" #if $sickbeard.BOXCAR_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
726-
<label class="clearfix" for="boxcar_notify_ondownload">
725+
<input type="checkbox" name="boxcar2_notify_ondownload" id="boxcar2_notify_ondownload" #if $sickbeard.BOXCAR2_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
726+
<label class="clearfix" for="boxcar2_notify_ondownload">
727727
<span class="component-title">Notify on Download</span>
728728
<span class="component-desc">Send notification when we finish a download?</span>
729729
</label>
730730
</div>
731731
<div class="field-pair">
732732
<label class="nocheck clearfix">
733-
<span class="component-title">Boxcar Username</span>
734-
<input type="text" name="boxcar_username" id="boxcar_username" value="$sickbeard.BOXCAR_USERNAME" size="35" />
733+
<span class="component-title">Custom Sound</span>
734+
<select id="boxcar2_sound" name="boxcar2_sound">
735+
<option value="default" #if $sickbeard.BOXCAR2_SOUND == "default" then 'selected="selected"' else ""#>Default (General)</option>
736+
<option value="no-sound" #if $sickbeard.BOXCAR2_SOUND == "no-sound" then 'selected="selected"' else ""#>Silent</option>
737+
<option value="beep-crisp" #if $sickbeard.BOXCAR2_SOUND == "beep-crisp" then 'selected="selected"' else ""#>Beep Crisp</option>
738+
<option value="beep-soft" #if $sickbeard.BOXCAR2_SOUND == "beep-soft" then 'selected="selected"' else ""#>Beep Soft</option>
739+
<option value="bell-modern" #if $sickbeard.BOXCAR2_SOUND == "bell-modern" then 'selected="selected"' else ""#>Bell Modern</option>
740+
<option value="bell-one-tone" #if $sickbeard.BOXCAR2_SOUND == "bell-one-tone" then 'selected="selected"' else ""#>Bell One Tone</option>
741+
<option value="bell-simple" #if $sickbeard.BOXCAR2_SOUND == "bell-simple" then 'selected="selected"' else ""#>Bell Simple</option>
742+
<option value="bell-triple" #if $sickbeard.BOXCAR2_SOUND == "bell-triple" then 'selected="selected"' else ""#>Bell Triple</option>
743+
<option value="bird-1" #if $sickbeard.BOXCAR2_SOUND == "bird-1" then 'selected="selected"' else ""#>Bird 1</option>
744+
<option value="bird-2" #if $sickbeard.BOXCAR2_SOUND == "bird-2" then 'selected="selected"' else ""#>Bird 2</option>
745+
<option value="boing" #if $sickbeard.BOXCAR2_SOUND == "boing" then 'selected="selected"' else ""#>Boing</option>
746+
<option value="cash" #if $sickbeard.BOXCAR2_SOUND == "cash" then 'selected="selected"' else ""#>Cash</option>
747+
<option value="clanging" #if $sickbeard.BOXCAR2_SOUND == "clanging" then 'selected="selected"' else ""#>Clanging</option>
748+
<option value="detonator-charge" #if $sickbeard.BOXCAR2_SOUND == "detonator-charge" then 'selected="selected"' else ""#>Detonator Charge</option>
749+
<option value="digital-alarm" #if $sickbeard.BOXCAR2_SOUND == "digital-alarm" then 'selected="selected"' else ""#>Digital Alarm</option>
750+
<option value="done" #if $sickbeard.BOXCAR2_SOUND == "done" then 'selected="selected"' else ""#>Done</option>
751+
<option value="echo" #if $sickbeard.BOXCAR2_SOUND == "echo" then 'selected="selected"' else ""#>Echo</option>
752+
<option value="flourish" #if $sickbeard.BOXCAR2_SOUND == "flourish" then 'selected="selected"' else ""#>Flourish</option>
753+
<option value="harp" #if $sickbeard.BOXCAR2_SOUND == "harp" then 'selected="selected"' else ""#>Harp</option>
754+
<option value="light" #if $sickbeard.BOXCAR2_SOUND == "light" then 'selected="selected"' else ""#>Light</option>
755+
<option value="magic-chime" #if $sickbeard.BOXCAR2_SOUND == "magic-chime" then 'selected="selected"' else ""#>Magic Chime</option>
756+
<option value="magic-coin" #if $sickbeard.BOXCAR2_SOUND == "magic-coin" then 'selected="selected"' else ""#>Magic Coin 1</option>
757+
<option value="notifier-1" #if $sickbeard.BOXCAR2_SOUND == "notifier-1" then 'selected="selected"' else ""#>Notifier 1</option>
758+
<option value="notifier-2" #if $sickbeard.BOXCAR2_SOUND == "notifier-2" then 'selected="selected"' else ""#>Notifier 2</option>
759+
<option value="notifier-3" #if $sickbeard.BOXCAR2_SOUND == "notifier-3" then 'selected="selected"' else ""#>Notifier 3</option>
760+
<option value="orchestral-long" #if $sickbeard.BOXCAR2_SOUND == "orchestral-long" then 'selected="selected"' else ""#>Orchestral Long</option>
761+
<option value="orchestral-short" #if $sickbeard.BOXCAR2_SOUND == "orchestral-short" then 'selected="selected"' else ""#>Orchestral Short</option>
762+
<option value="score" #if $sickbeard.BOXCAR2_SOUND == "score" then 'selected="selected"' else ""#>Score</option>
763+
<option value="success" #if $sickbeard.BOXCAR2_SOUND == "success" then 'selected="selected"' else ""#>Success</option>
764+
<option value="up" #if $sickbeard.BOXCAR2_SOUND == "up" then 'selected="selected"' else ""#>Up</option>
765+
</select>
766+
</label>
767+
<label class="nocheck clearfix">
768+
<span class="component-title">&nbsp;</span>
769+
<span class="component-desc">Override the default sound selected for the General notification.</span>
770+
</label>
771+
</div>
772+
<div class="field-pair">
773+
<label class="nocheck clearfix">
774+
<span class="component-title">Boxcar2 Access Token</span>
775+
<input type="text" name="boxcar2_access_token" id="boxcar2_access_token" value="$sickbeard.BOXCAR2_ACCESS_TOKEN" size="35" />
735776
</label>
736777
<label class="nocheck clearfix">
737778
<span class="component-title">&nbsp;</span>
738-
<span class="component-desc">Username of your Boxcar account</span>
779+
<span class="component-desc">Access Token of your Boxcar2 account</span>
739780
</label>
740781
</div>
741-
<div class="testNotification" id="testBoxcar-result">Click below to test.</div>
742-
<input type="button" class="btn" value="Test Boxcar" id="testBoxcar" />
782+
<div class="testNotification" id="testBoxcar2-result">Click below to test.</div>
783+
<input type="button" class="btn" value="Test Boxcar2" id="testBoxcar2" />
743784
<input type="submit" class="btn config_submitter" value="Save Changes" />
744-
</div><!-- /content_use_boxcar //-->
785+
</div><!-- /content_use_boxcar2 //-->
745786

746787
</fieldset>
747-
</div><!-- /boxcar component-group //-->
748-
788+
</div><!-- /boxcar2 component-group //-->
749789

750790
<div class="component-group clearfix">
751791
<div class="component-group-desc">
@@ -811,6 +851,54 @@
811851
</fieldset>
812852
</div><!-- /nma component-group //-->
813853

854+
<div class="component-group clearfix">
855+
<div class="component-group-desc">
856+
<img class="notifier-icon" src="$sbRoot/images/notifiers/pushalot.png" alt="" title="Pushalot" />
857+
<h3><a href="https://pushalot.com" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Pushalot</a></h3>
858+
<p>Pushalot is a platform for receiving custom push notifications to connected devices running Windows Phone or Windows 8.</p>
859+
</div>
860+
<fieldset class="component-group-list">
861+
<div class="field-pair">
862+
<input type="checkbox" class="enabler" name="use_pushalot" id="use_pushalot" #if $sickbeard.USE_PUSHALOT then "checked=\"checked\"" else ""# />
863+
<label class="clearfix" for="use_pushalot">
864+
<span class="component-title">Enable</span>
865+
<span class="component-desc">Should Sick Beard send Pushalot notifications?</span>
866+
</label>
867+
</div>
868+
869+
<div id="content_use_pushalot">
870+
<div class="field-pair">
871+
<input type="checkbox" name="pushalot_notify_onsnatch" id="pushalot_notify_onsnatch" #if $sickbeard.PUSHALOT_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
872+
<label class="clearfix" for="pushalot_notify_onsnatch">
873+
<span class="component-title">Notify on Snatch</span>
874+
<span class="component-desc">Send notification when we start a download?</span>
875+
</label>
876+
</div>
877+
<div class="field-pair">
878+
<input type="checkbox" name="pushalot_notify_ondownload" id="pushalot_notify_ondownload" #if $sickbeard.PUSHALOT_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
879+
<label class="clearfix" for="pushalot_notify_ondownload">
880+
<span class="component-title">Notify on Download</span>
881+
<span class="component-desc">Send notification when we finish a download?</span>
882+
</label>
883+
</div>
884+
<div class="field-pair">
885+
<label class="nocheck clearfix">
886+
<span class="component-title">Pushalot Authorization Token</span>
887+
<input type="text" name="pushalot_authorizationtoken" id="pushalot_authorizationtoken" value="$sickbeard.PUSHALOT_AUTHORIZATIONTOKEN" size="35" />
888+
</label>
889+
<label class="nocheck clearfix">
890+
<span class="component-title">&nbsp;</span>
891+
<span class="component-desc">Authorization Token of your Pushalot account</span>
892+
</label>
893+
</div>
894+
<div class="testNotification" id="testPushalot-result">Click below to test.</div>
895+
<input type="button" class="btn" value="Test Pushalot" id="testPushalot" />
896+
<input type="submit" class="btn config_submitter" value="Save Changes" />
897+
</div><!-- /content_use_pushalot //-->
898+
899+
</fieldset>
900+
</div><!-- /pushalot component-group //-->
901+
814902
<div class="component-group-save">
815903
<input type="submit" class="btn config_submitter" value="Save Changes" />
816904
</div><br />

‎data/interfaces/default/config_postProcessing.tmpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@
6868
</label>
6969
</div>
7070

71+
<div class="field-pair">
72+
<label class="nocheck clearfix" for="filter_associated_files">
73+
<span class="component-title">Filter Associated Files</span>
74+
<input type="text" name="filter_associated_files" id="filter_associated_files" value="$sickbeard.FILTER_ASSOCIATED_FILES" size="35" />
75+
</label>
76+
<label class="nocheck clearfix">
77+
<span class="component-title">&nbsp;</span>
78+
<span class="component-desc">Filter associated files by specific non-media file extensions (separated with coma). (eg. .idx, .sub, .en.srt)</span>
79+
</label>
80+
</div>
81+
7182
<div class="field-pair">
7283
<input type="checkbox" name="rename_episodes" id="rename_episodes" #if $sickbeard.RENAME_EPISODES == True then "checked=\"checked\"" else ""# />
7384
<label class="clearfix" for="rename_episodes">

0 commit comments

Comments
 (0)