@@ -390,14 +395,14 @@
Panel-specific settings
-
+
+ placeholder="https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics">
-
-
+
+
@@ -477,12 +482,12 @@
});
function generate() {
- var ical_urls = $("#ical_urls").val().trim();
+ var ical_urls = $("#ical_urls").val().trim().split(' ').join('').split(',');
if (ical_urls == "") {
ical_urls = $("#ical_urls").attr("placeholder");
}
- var rss_urls = $("#rss_urls").val().trim();
+ var rss_urls = $("#rss_urls").val().trim().split(' ').join('').split(',');
if (rss_urls == "") {
rss_urls = $("#rss_urls").attr("placeholder");
}
@@ -525,6 +530,9 @@
}
var model = "epd_7_in_5_v2_colour";
+ if ($('#9_in_7').is(':checked')) {
+ model = "9_in_7";
+ }
if ($('#epd_7_in_5_v2').is(':checked')) {
model = "epd_7_in_5_v2";
}
@@ -697,7 +705,7 @@
image_path_body
) {
var result = {
- "language": language, // "en", "de", "fr", "jp" etc.
+ "language": language, // "en", "de", "fr", "jp" etc.
"units": units, // "metric", "imperial"
"hours": Number(hours), // 24, 12
"model": model,
@@ -735,7 +743,7 @@
"height" : middle_section_height,
"config": {
"week_starts_on": week_starts_on, //"Sunday", "Monday"...
- "ical_urls": ical_urls.split().map(function (x) { return TrimSingleQuotes(x); })
+ "ical_urls": ical_urls
}
}
)
@@ -765,7 +773,7 @@
"type": bottom_section,
"height" : bottom_section_height,
"config": {
- "rss_urls": rss_urls.split().map(function (x) { return TrimSingleQuotes(x); })
+ "rss_urls": rss_urls
}
}
)