iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source
This commit is contained in:
Ace 2019-04-18 00:07:49 +02:00 committed by GitHub
parent e73da0fc62
commit 3ffe644f86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Calendar/Settings-Web-UI.html
View File

@ -192,7 +192,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
<br> <br>
<script> <script>
var template = 'ical_urls = [\n"{ical_urls}"\n]\nrss_feeds = [\n"{rss_urls}"\n]\nupdate_interval = "{update_interval}"\nadditional_feature = "{additional_feature}"\napi_key = "{api_key}"\nlocation = "{location}"\nweek_starts_on = "{week_starts_on}"\nevents_max_range = "{events_max_range}"\ndisplay_colours = "{display_colours}"\nlanguage = "{language}"\nunits = "{units}"\nhours = "{hours}"'; var template = 'ical_urls = [\n"{ical_urls}"\n]\nrss_feeds = [\n"{rss_urls}"\n]\nupdate_interval = "{update_interval}"\nadditional_feature = "{additional_feature}"\napi_key = "{api_key}"\nlocation = "{location}"\nweek_starts_on = "{week_starts_on}"\nevents_max_range = "{events_max_range}"\ncalibration_hours = [{calibration_hours}]\ndisplay_colours = "{display_colours}"\nlanguage = "{language}"\nunits = "{units}"\nhours = "{hours}"';
function generate(){ function generate(){
var ical_urls = $("#ical_urls").val().trim(); var ical_urls = $("#ical_urls").val().trim();
@ -219,7 +219,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var additional_feature = "events"; var additional_feature = "events";
if ($('#rss').is(':checked')){ if ($('#rss').is(':checked')){
hours = "rss"; additional_feature = "rss";
} }
var api_key = $("#api_key").val().trim(); var api_key = $("#api_key").val().trim();
@ -234,7 +234,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var week_starts_on = "Monday"; var week_starts_on = "Monday";
if ($('#week_sunday').is(':checked')){ if ($('#week_sunday').is(':checked')){
hours = "Sunday"; week_starts_on = "Sunday";
} }
var events_max_range = $("#events_max_range").val().trim(); var events_max_range = $("#events_max_range").val().trim();
@ -242,6 +242,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
events_max_range = $("#events_max_range").attr("placeholder"); events_max_range = $("#events_max_range").attr("placeholder");
} }
var calibration_hours = $("#calibration_hours").val().trim();
if (calibration_hours == ""){
calibration_hours = $("#calibration_hours").attr("placeholder");
}
var display_colours = "bw"; var display_colours = "bw";
if ($('#b_w_r').is(':checked')){ if ($('#b_w_r').is(':checked')){
display_colours = "bwr"; display_colours = "bwr";