diff --git a/src/Jackett/Content/custom.css b/src/Jackett/Content/custom.css index bdf75e583..a98776d35 100644 --- a/src/Jackett/Content/custom.css +++ b/src/Jackett/Content/custom.css @@ -243,4 +243,18 @@ hr { .downloadcolumn { text-align:center; +} + +pre { + display: block; + padding: 3px; + margin: 0 0 0px; + font-size: 13px; + line-height: 1.42857143; + color: #333; + word-break: break-all; + word-wrap: break-word; + background-color: transparent; + border: 0px; + border-radius: 0px; } \ No newline at end of file diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js index 0f50fee4a..5aec604fe 100644 --- a/src/Jackett/Content/custom.js +++ b/src/Jackett/Content/custom.js @@ -3,6 +3,9 @@ reloadIndexers(); loadJackettSettings(); + window.jackettIsLocal = window.location.hostname === 'localhost' || + window.location.hostname === '127.0.0.1'; + $('body').on('click', '.downloadlink', function (e, b) { $(e.target).addClass('jackettdownloaded'); }); @@ -81,7 +84,7 @@ $("#jackett-show-releases").click(function () { var count = 0; this.api().columns().every(function () { count++; - if (count === 5 || count ===7) { + if (count === 5 || count === 7) { var column = this; var select = $('') .appendTo($(column.footer()).empty()) @@ -131,7 +134,7 @@ $("#change-jackett-port").click(function () { var jsonObject = { port: jackett_port, external: jackett_external, - blackholedir: $("#jackett-savedir").val() + blackholedir: $("#jackett-savedir").val() }; var jqxhr = $.post("/admin/set_config", JSON.stringify(jsonObject), function (data) { if (data.result == "error") { @@ -293,21 +296,37 @@ function populateConfigItems(configForm, config) { } var $formItemContainer = configForm.find(".config-setup-form"); $formItemContainer.empty(); - var setupItemTemplate = Handlebars.compile($("#setup-item").html()); + + $('.jackettrecaptcha').remove(); + + var hasReacaptcha = false; + var captchaItem = null; for (var i = 0; i < config.length; i++) { - var item = config[i]; - var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html()); - - - item.value_element = setupValueTemplate(item); - var template = setupItemTemplate(item); + if (config[i].type === 'recaptcha') { + hasReacaptcha = true; + captchaItem = config[i]; + } + } + var setupItemTemplate = Handlebars.compile($("#setup-item").html()); + if (hasReacaptcha && !window.jackettIsLocal) { + var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html()); + captchaItem.value_element = setupValueTemplate(captchaItem); + var template = setupItemTemplate(captchaItem); $formItemContainer.append(template); + } else { - if (item.type === 'recaptcha') { - grecaptcha.render($('.jackettrecaptcha')[0], { - 'sitekey': item.sitekey - }); + for (var i = 0; i < config.length; i++) { + var item = config[i]; + var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html()); + item.value_element = setupValueTemplate(item); + var template = setupItemTemplate(item); + $formItemContainer.append(template); + if (item.type === 'recaptcha') { + grecaptcha.render($('.jackettrecaptcha')[0], { + 'sitekey': item.sitekey + }); + } } } } @@ -338,7 +357,11 @@ function getConfigModalJson(configForm) { itemEntry.value = $el.find(".setup-item-inputbool input").is(":checked"); break; case "recaptcha": - itemEntry.value = $('.g-recaptcha-response').val(); + if (window.jackettIsLocal) { + itemEntry.value = $('.g-recaptcha-response').val(); + } else { + itemEntry.cookie = $el.find(".setup-item-recaptcha input").val(); + } break; } configJson.push(itemEntry) diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html index 967ec8715..e42938522 100644 --- a/src/Jackett/Content/index.html +++ b/src/Jackett/Content/index.html @@ -13,7 +13,7 @@ - + @@ -21,6 +21,14 @@ + +