dockeruser
/
sabnzbd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Improvements to Advanced Settings switching in Config

tags/2.3.2RC2
Safihre 8 years ago
parent
ea5e4dfee1
commit
437ff427f8
5 changed files with 29 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      interfaces/Config/templates/config_notify.tmpl
  2. 9
      interfaces/Config/templates/config_server.tmpl
  3. 6
      interfaces/Config/templates/config_sorting.tmpl
  4. 3
      interfaces/Config/templates/staticcfg/css/style.css
  5. 13
      interfaces/Config/templates/staticcfg/js/script.js

19
interfaces/Config/templates/config_notify.tmpl
View File

@ -91,7 +91,7 @@
<input type="text" name="email_pwd" id="email_pwd" value="$email_pwd" /> <input type="text" name="email_pwd" id="email_pwd" value="$email_pwd" />
<span class="desc">$T('explain-email_pwd')</span> <span class="desc">$T('explain-email_pwd')</span>
</div> </div>
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_email" rel="$T('askTestEmail')"><span class="glyphicon glyphicon-envelope"></span> $T('link-testEmail')</button> <button class="btn btn-default" type="button" id="test_email" rel="$T('askTestEmail')"><span class="glyphicon glyphicon-envelope"></span> $T('link-testEmail')</button>
</div> </div>
@ -115,7 +115,7 @@
<div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->> <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
<fieldset> <fieldset>
$show_notify_checkboxes('ncenter') $show_notify_checkboxes('ncenter')
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_notif"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_notif"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -141,7 +141,7 @@
<div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->> <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
<fieldset> <fieldset>
$show_notify_checkboxes('acenter') $show_notify_checkboxes('acenter')
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_windows"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_windows"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -167,7 +167,7 @@
<div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->> <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
<fieldset> <fieldset>
$show_notify_checkboxes('ntfosd') $show_notify_checkboxes('ntfosd')
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_osd"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_osd"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -207,7 +207,7 @@
<span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span> <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
</div> </div>
$show_notify_checkboxes('nscript') $show_notify_checkboxes('nscript')
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -241,7 +241,7 @@
<span class="desc">$T('explain-growl_password')</span> <span class="desc">$T('explain-growl_password')</span>
</div> </div>
$show_notify_checkboxes('growl') $show_notify_checkboxes('growl')
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_growl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_growl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -286,7 +286,7 @@
</select> </select>
</div> </div>
<!--#end for#--> <!--#end for#-->
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_prowl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_prowl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -352,7 +352,7 @@
</select> </select>
</div> </div>
<!--#end for#--> <!--#end for#-->
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_pushover"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_pushover"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -389,7 +389,7 @@
</div> </div>
<!--#end if#--> <!--#end if#-->
$show_notify_checkboxes('pushbullet') $show_notify_checkboxes('pushbullet')
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button> <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default" type="button" id="test_pushbullet"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button> <button class="btn btn-default" type="button" id="test_pushbullet"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
</div> </div>
@ -417,6 +417,7 @@
\$(this).parents('.col2').find('.col2-cats').hide() \$(this).parents('.col2').find('.col2-cats').hide()
} }
\$('form').submit() \$('form').submit()
addRowColor()
}) })
\$('#email_endjob').change(function() { \$('#email_endjob').change(function() {
if(\$(this).val() > 0) { if(\$(this).val() > 0) {

9
interfaces/Config/templates/config_server.tmpl
View File

@ -147,7 +147,7 @@
<label class="config" for="notes">$T('srv-notes')</label> <label class="config" for="notes">$T('srv-notes')</label>
<textarea name="notes" id="notes" rows="3" cols="50"></textarea> <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
</div> </div>
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button> <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
<button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button> <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
</div> </div>
@ -159,7 +159,6 @@
</div> </div>
</div> </div>
<!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #--> <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
<!--#set $cur_prio_color = -1 #--> <!--#set $cur_prio_color = -1 #-->
<!--#set $last_prio = -1 #--> <!--#set $last_prio = -1 #-->
@ -188,7 +187,7 @@
<button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button> <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
<button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button> <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
</div> </div>
<div class="col1" style="display:none;"> <div class="col1" style="display:none;">
<input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" /> <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
<fieldset> <fieldset>
<div class="field-pair"> <div class="field-pair">
@ -437,10 +436,14 @@
} else { } else {
\$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')")); \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
} }
// Add coloring
addRowColor()
}); });
\$('#addServerButton').click(function(){ \$('#addServerButton').click(function(){
\$('#addServerContent').show(); \$('#addServerContent').show();
// Add coloring
addRowColor()
}); });
\$('[name="ssl"]').click(function() { \$('[name="ssl"]').click(function() {

6
interfaces/Config/templates/config_sorting.tmpl
View File

@ -53,7 +53,7 @@
<label class="config">$T('sortResult')</label> <span class="desc path" id="previewtv-result">&nbsp;</span> <label class="config">$T('sortResult')</label> <span class="desc path" id="previewtv-result">&nbsp;</span>
</div> </div>
</div> </div>
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<label class="config">$T('sort-legenda')</label> <label class="config">$T('sort-legenda')</label>
<button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key1').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button> <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key1').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
<table id="Key1" class="Key"> <table id="Key1" class="Key">
@ -213,7 +213,7 @@
<label class="config">$T('sortResult')</label> <span class="desc path" id="previewmovie-result">&nbsp;</span> <label class="config">$T('sortResult')</label> <span class="desc path" id="previewmovie-result">&nbsp;</span>
</div> </div>
</div> </div>
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<label class="config">$T('sort-legenda')</label> <label class="config">$T('sort-legenda')</label>
<button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key2').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button> <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key2').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
<table id="Key2" class="Key"> <table id="Key2" class="Key">
@ -345,7 +345,7 @@
<label class="config">$T('sortResult')</label> <span class="desc path" id="previewdate-result">&nbsp;</span> <label class="config">$T('sortResult')</label> <span class="desc path" id="previewdate-result">&nbsp;</span>
</div> </div>
</div> </div>
<div class="field-pair"> <div class="field-pair no-field-pair-bg">
<label class="config">$T('sort-legenda')</label> <label class="config">$T('sort-legenda')</label>
<button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key3').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button> <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key3').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
<table id="Key3" class="Key"> <table id="Key3" class="Key">

3
interfaces/Config/templates/staticcfg/css/style.css
View File

@ -171,7 +171,8 @@ input[type="checkbox"]+.desc {
.even { .even {
background-color: #F8F8F8; background-color: #F8F8F8;
} }
.field-pair:last-child { .field-pair:last-child,
.no-field-pair-bg {
background-color: transparent; background-color: transparent;
} }
.alt, .alt,

13
interfaces/Config/templates/staticcfg/js/script.js
View File

@ -311,6 +311,11 @@ function removeObfuscation() {
return true return true
} }
// Add coloring to rows (shorthand function)
function addRowColor() {
$('.field-pair:visible').removeClass('even').filter(':even').addClass('even')
}
$(document).ready(function () { $(document).ready(function () {
/** /**
Restart function Restart function
@ -412,16 +417,14 @@ $(document).ready(function () {
$('.advanced-button').on('change', function(event){ $('.advanced-button').on('change', function(event){
localStorage.setItem('advanced-settings', !$('.advanced-settings').is(':visible')) localStorage.setItem('advanced-settings', !$('.advanced-settings').is(':visible'))
$('.advanced-settings').toggle() $('.advanced-settings').toggle()
$('.field-pair:visible').removeClass('even').filter(':even').addClass('even')
}) })
if(localStorage.getItem('advanced-settings') == 'true') { if(localStorage.getItem('advanced-settings') == 'true') {
$('.advanced-settings').show() $('.advanced-settings').show()
$('#advanced-settings-button').prop('checked', true) $('#advanced-settings-button').prop('checked', true)
$('.field-pair:visible').removeClass('even').filter(':even').addClass('even') addRowColor()
} }
addRowColor()
// Add coloring
$('.field-pair:visible').removeClass('even').filter(':even').addClass('even')
}); });
/* /*

Write Preview
Loading…
Cancel
Save