summaryrefslogtreecommitdiff
path: root/http/src
diff options
context:
space:
mode:
Diffstat (limited to 'http/src')
-rw-r--r--http/src/js/1_main.js1
-rw-r--r--http/src/js/5_timerDialog.js12
-rw-r--r--http/src/js/pages.profile.js34
-rw-r--r--http/src/lang/de.js4
4 files changed, 31 insertions, 20 deletions
diff --git a/http/src/js/1_main.js b/http/src/js/1_main.js
index 8c7d689..fc16403 100644
--- a/http/src/js/1_main.js
+++ b/http/src/js/1_main.js
@@ -19,6 +19,7 @@ epgd.userProfile_defaults = {
pickerFirstDay: '6',
quickTimes: '',
startWithSched: 0,
+ osdTimerNotify: 0,
startPage: "menu_options",
namingModeSerie: "0",
namingModeSearchSerie: "0",
diff --git a/http/src/js/5_timerDialog.js b/http/src/js/5_timerDialog.js
index 113e7a9..7ee729b 100644
--- a/http/src/js/5_timerDialog.js
+++ b/http/src/js/5_timerDialog.js
@@ -364,7 +364,7 @@ epgd.searchTimerDialog.prototype.create = function () {
+ '<div class="full"><select id="tSMode" style="width:auto">' + sModes + '</select>'
+ '&nbsp;&nbsp;<input type="checkbox" id="tCaseSens" />&nbsp;<label for="tCaseSens">'
+ trS.caseSensitive + '</label></div>'
- + '<div class="ui-corner-all week">' + [""].concat(trS.searchFields).join('<input type="checkbox" name="tSFields" />') + '</div>'
+ + '<div class="ui-corner-all week">' + [" "].concat(trS.searchFields).join('<input type="checkbox" name="tSFields" />') + '</div>'
+ '<div><label for="tAdv"><input type="checkbox" id="tAdv" />&nbsp;' + epgd.tr.advanced + epgd.pages.help.getIcon('sTAdv') + '</label><div class="ui-corner-all week">'
+ '<span>' + tr.episode + '</span><input type="text" id="tSFEpisode" style="width:200px" /> '
+ '<span>' + epgd.tr.pages.eventDetail.season + '</span><input type="text" id="tSFSeason" style="width:40px" /> '
@@ -376,7 +376,7 @@ epgd.searchTimerDialog.prototype.create = function () {
+ '<br /><input type="checkbox" id="tSFNoEpgMatch" />' + tr.noEpgMatch
+ '</div></div>'
+ '<div class="noTypeS"><div><label for="tRepeat"><input type="checkbox" id="tRepeat" />&nbsp;'
- + tr.noRepeat + epgd.pages.help.getIcon('sTRepeat') + '</label><div class="ui-corner-all week">' + [""].concat(trS.searchFields).join('<input type="checkbox" name="tRFields" />') + '</div></div></div>'
+ + tr.noRepeat + epgd.pages.help.getIcon('sTRepeat') + '</label><div class="ui-corner-all week">' + [""].concat(trS.repeatFields).join('<input type="checkbox" name="tRFields" />') + '</div></div></div>'
+ '<div><input type="radio" name="tChExclude" value="1" id="tChExclude0" /><label for="tChInclude">' + tr.chInclude
+ '</label>' + epgd.pages.help.getIcon('sTChannels') + '<input type="radio" name="tChExclude" value="0" id="tChExclude1" /><label for="tChExclude">' + tr.chExclude
+ '</label></div><input type="text" id="tChannels" class="full"/>'
@@ -390,6 +390,12 @@ epgd.searchTimerDialog.prototype.create = function () {
$([form.tTime, form.tRepeat, form.tAdv]).change(function () {
$(this).parent().next().toggle(this.checked);
});
+ $(form.tRFields).change(function () {
+ if (this.checked)
+ $(this).prev().prop("disabled", true).prop("checked", true).change();
+ else
+ $(this).prev().prop("disabled", false)
+ });
$([form.tSFSeason, form.tSFSPart, form.tSFYear]).change(function () {
this.value = this.value.replace(/[^0-9-]/g, '');
if (this.value.length == 1 && this.value == '-')
@@ -424,7 +430,7 @@ epgd.searchTimerDialog.prototype.render = function (t) {
form.tRFields[i].checked = (d & f);
form.tRepeat.checked = d > 0;
$(form.tRepeat).change();
-
+ $(form.tRFields).change();
form.tSFEpisode.value = t.episodename || '';
form.tSFSeason.value = t.season || '';
form.tSFSPart.value = t.seasonpart || '';
diff --git a/http/src/js/pages.profile.js b/http/src/js/pages.profile.js
index 87bbc1b..08e02bf 100644
--- a/http/src/js/pages.profile.js
+++ b/http/src/js/pages.profile.js
@@ -42,6 +42,7 @@ epgd.pages.profile = {
+ '<tr><td>' + epgd.tr.advanced + '</td><td><input type="checkbox" id="searchAdv" /></td></tr>'
+ '<tr><th colspan="2">VDR OSD</th><tr>'
+ '<tr><td>' + epgd.tr.pages.profile.vdr.startWithSched + '</td><td><input type="checkbox" id="startWithSched"' + (epgd.profile.startWithSched == "1" ? ' checked="checked"' : '') + ' /></td></tr>'
+ + '<tr><td>' + epgd.tr.pages.profile.vdr.osdTimerNotify + '</td><td><input type="checkbox" id="osdTimerNotify"' + (epgd.profile.osdTimerNotify == "1" ? ' checked="checked"' : '') + ' /></td></tr>'
+ '<tr><th colspan="2">' + epgd.tr.menu.records + '</th><tr>'
+ '<tr><td>' + epgd.tr.pages.profile.record.subFolderSort + '</td><td><select id="recordSubFolderSort"><option value="1">' + epgd.tr.pages.eventDetail.title + ' up</option><option value="2">' + epgd.tr.pages.eventDetail.title + ' down</option><option value="3">' + epgd.tr.pages.timerList.folder + ' up</option><option value="4">' + epgd.tr.pages.timerList.folder + ' down</option><option value="5">' + epgd.tr.pages.timerList.recordTime + ' up</option><option value="6">' + epgd.tr.pages.timerList.recordTime + ' down</option></select></td></tr>'
+ '</table></div>';
@@ -117,23 +118,23 @@ epgd.pages.profile = {
this.form.namingModeMovie.selectedIndex = epgd.profile.namingModeMovie;
this.form.namingModeSearchMovie.selectedIndex = epgd.profile.namingModeSearchMovie;
- $([this.form.namingModeSerie,this.form.namingModeSearchSerie,this.form.namingModeMovie,this.form.namingModeSearchMovie] ).change(function () {
- this.nextSibling.style.display = (this.selectedIndex == 6) ? 'block' : 'none';
+ $([this.form.namingModeSerie,this.form.namingModeSearchSerie,this.form.namingModeMovie,this.form.namingModeSearchMovie] ).change(function () {
+ this.nextSibling.style.display = (this.selectedIndex == 6) ? 'block' : 'none';
}).change();
epgd.utils.addPlaceholders(this.form.namingModeSerieTemplate, '%', epgd.tr.pages.timerList.templateFields);
epgd.utils.addPlaceholders(this.form.namingModeSearchSerieTemplate, '%', epgd.tr.pages.timerList.templateFields);
epgd.utils.addPlaceholders(this.form.namingModeMovieTemplate, '%', epgd.tr.pages.timerList.templateFields);
epgd.utils.addPlaceholders(this.form.namingModeSearchMovieTemplate, '%', epgd.tr.pages.timerList.templateFields);
- $(this.form.quickTimes).one("focus", function () {
- var quickTimes = this;
- epgd.ajax({ url: epgd.login.url + "data/searchtimers?type=S" }, function (data) {
- var placeholders = { "@Now": ": current time", "@Next": ": next event" };
- $.each(data.searchtimers, function (id, t) {
- placeholders['@' + t.name || t.expression] = ': saved timer';
- });
- epgd.utils.addPlaceholders(quickTimes, '@', placeholders);
- });
+ $(this.form.quickTimes).one("focus", function () {
+ var quickTimes = this;
+ epgd.ajax({ url: epgd.login.url + "data/searchtimers?type=S" }, function (data) {
+ var placeholders = { "@Now": ": current time", "@Next": ": next event" };
+ $.each(data.searchtimers, function (id, t) {
+ placeholders['@' + t.name || t.expression] = ': saved timer';
+ });
+ epgd.utils.addPlaceholders(quickTimes, '@', placeholders);
+ });
});
this.form.searchAdv.checked = epgd.profile.searchAdv == "1";
@@ -161,6 +162,7 @@ epgd.pages.profile = {
checkData({ name: "defaultVDRuuid", value: $(form.defaultVDRuuid).val() || '', owner: owner });
checkData({ name: "quickTimes", value: form.quickTimes.value.replace(/\n/g, '~'), owner: owner });
checkData({ name: "startWithSched", value: $(form.startWithSched).prop('checked') ? "1" : "0", owner: owner });
+ checkData({ name: "osdTimerNotify", value: $(form.osdTimerNotify).prop('checked') ? "1" : "0", owner: owner });
checkData({ name: "pickerFirstDay", value: new String(form.pickerFirstDay.selectedIndex), owner: owner });
checkData({ name: "startPage", value: $(form.startPage).val() || '', owner: owner });
checkData({ name: "namingModeSerie", value: new String(this.form.namingModeSerie.selectedIndex), owner: owner });
@@ -239,13 +241,13 @@ epgd.pages.profile = {
}
return true;
},
- checkRegex: function (input) {
- if (input.getAttribute('data-valexp') && !new RegExp(input.getAttribute('data-valexp')).test(input.value)) {
+ checkRegex: function (input) {
+ if (input.getAttribute('data-valexp') && !new RegExp(input.getAttribute('data-valexp')).test(input.value)) {
input.focus();
epgd.utils.popup(epgd.tr.error.invalid);
- return false;
- }
- return true;
+ return false;
+ }
+ return true;
}
}
};
diff --git a/http/src/lang/de.js b/http/src/lang/de.js
index 5ba75b7..0cf1c12 100644
--- a/http/src/lang/de.js
+++ b/http/src/lang/de.js
@@ -226,6 +226,7 @@ epgd.tr = {
caseSensitive: "Klein-/Großschreibung",
searchModes: ["exakte Übereinstimmung", "regulärer Ausdruck", "Muster", "enthalten in"],
searchFields: ["Titel", "Kurztext", "Beschreibung"],
+ repeatFields: ["Titel", "Kurztext"],
empty: "Leider nichts gefunden.",
matchdensity: "Treffergenauigkeit"
},
@@ -260,7 +261,8 @@ epgd.tr = {
label: "epgd Backend"
},
vdr: {
- startWithSched:'EPG Menü startet mit Schedule'
+ startWithSched:'EPG Menü startet mit Schedule',
+ osdTimerNotify:'Info anzeigen, wenn der VDR einen Timer übernommen hat'
},
record: {
subFolderSort: 'Sortierung der Unterordner'
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 12:35:51 +0000