From 3b5fe4b0de1c7920697b245074f65cb906e90d5a Mon Sep 17 00:00:00 2001 From: JackDandy Date: Mon, 27 Oct 2014 00:29:12 +0000 Subject: [PATCH] Overhaul General Configuration. Tweak top navbar. Fix imdb and other images. Change to rename General Configuration -> "Web Interface" tab as "Interface". Add a "User Interface" section to the "Interface" tab. Change consolidate "Date and Time" and "Theme" tab content to "User Interface" section. Add field in Advanced setting for a custom remote name used to populate branch versions. Change theme name "original" to "light". Improve text wording on all UI options under General Configuration. Improve reduce over use of capitals. Improve streamline UI layout, mark-up and some CSS styling of all General Configuration tabs. Fix default top navbar background white-out behaviour on browsers that don't support gradients. Improve top navbar gradient use for greater cross browser compatibility (e.g. Safari). Fix dark theme divider between Season numbers on display show page. Fix main background and border colour of logs on log page. Fix imdb and three other images rejected by IExplorer because they were corrupt. Turns out that they were .ico files renamed to either .gif or .png instead of being properly converted. Fix "Subtitle Language" drop down font colour when entering text on the Subtitles Search settings. Clean up text, correct quotations, use spaces for code lines, tabs for html. Update changelog. --- CHANGES.md | 27 +- gui/slick/css/dark.css | 48 +- gui/slick/css/{original.css => light.css} | 47 +- gui/slick/css/style.css | 55 +- gui/slick/images/imdb.png | Bin 9158 -> 1239 bytes gui/slick/images/providers/fanzub.gif | Bin 1406 -> 101 bytes gui/slick/images/providers/nextgen.png | Bin 1150 -> 243 bytes gui/slick/images/subtitles/itasa.png | Bin 1150 -> 984 bytes .../interfaces/default/config_general.tmpl | 976 +++++++++--------- .../interfaces/default/inc_rootDirs.tmpl | 19 +- sickbeard/__init__.py | 7 +- sickbeard/versionChecker.py | 6 +- sickbeard/webserve.py | 3 +- 13 files changed, 597 insertions(+), 591 deletions(-) rename gui/slick/css/{original.css => light.css} (98%) diff --git a/CHANGES.md b/CHANGES.md index 0e6e6998..2f536bfb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,27 @@ -### 0.x.x (2014-10-22 xx:xx:xx UTC) +### 0.x.x (2014-10-27 xx:xx:xx UTC) -* Add Bootstrap for UI features. -* Change UI to resize fluidly on different display sizes. +* Add Bootstrap for UI features +* Change UI to resize fluidly on different display sizes, fixes the issue where top menu items would disappear on smaller screens. * Add date formats "dd/mm/yy", "dd/mm/yyyy", "day, dd/mm/yy" and "day, dd/mm/yyyy" +* Improve display of progress bars in the Downloads columns of the show list page +* Improve display of progress bars under the images in Layout Poster of the show list page +* Remove imdb watchlist feature as it wasn't ready for prime time +* Change to rename General Configuration -> "Web Interface" tab as "Interface" +* Add a "User Interface" section to the "Interface" tab +* Change bring together "Date and Time" and "Theme" tab content to "User Interface" section +* Add field in Advanced setting for a custom remote name used to populate branch versions +* Change theme name "original" to "light" +* Improve text wording on all UI options under General Configuration +* Improve reduce over use of capitals +* Improve streamline UI layout, mark-up and some CSS styling of all General Configuration tabs +* Fix default top navbar background white-out behaviour on browsers that don't support gradients +* Improve top navbar gradient use for greater cross browser compatibility (e.g. Safari) +* Fix dark theme divider between Season numbers on display show page +* Fix main background and border colour of logs on log page +* Fix imdb and three other images rejected by IExplorer because they were corrupt. Turns out that they were .ico files renamed to either .gif or .png instead of being properly converted +* Fix "Subtitle Language" drop down font colour when entering text on the Subtitles Search settings +* Clean up text, correct quotations, use spaces for code lines, tabs for html +* Update changelog ### 0.2.1 (2014-10-22 06:41:00 UTC) @@ -24,7 +43,7 @@ * Add return code from hardlinking error to log * Fix ABD regex for certain filenames * Miscellaneous UI fixes -* Update Tornado webserver to 4.1dev1 and add the certifi lib dependency. +* Update Tornado webserver to 4.1dev1 and add the certifi lib dependency * Fix trending shows page from loading full size poster images * Add "Archive on first match" to Manage, Mass Update, Edit Selected page * Fix searching IPTorrentsProvider diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index e5f13513..5d0bf275 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -1502,22 +1502,6 @@ config*.tmpl padding-left: 20px; } -#config label span.component-title { - float: left; - width: 172px; - margin-right: 10px; - font-size: 13px; - font-weight: bold; -} - -#config label span.component-desc { - padding-bottom: 2px; - font-size: 12px; - font-weight: normal; - display:inline-block; - width:475px; -} - #config .metadataDiv { display: none; } @@ -1768,7 +1752,7 @@ td.tableright { .separator { font-size: 90%; - color: #333333; + color: #fff; } a.whitelink { @@ -1939,10 +1923,6 @@ html * { outline: 0 !important; } -input[type="checkbox"] { - margin: 3px 0px 0px; - line-height: normal; -} input[type="radio"] { margin: 2px 0px 0px; @@ -1965,8 +1945,10 @@ input, textarea, select, .uneditable-input { /* navbar styling */ .navbar-default { - background-image: -moz-linear-gradient(#297AB8, #15528F); - background-image: linear-gradient(#297AB8, #15528F); + background-color: #15528F; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#297AB8', endColorstr='#15528F'); + background: -webkit-gradient(linear, left top, left bottom, from(#297AB8), to(#15528F)); + background: -moz-linear-gradient(top, #297AB8, #15528F); border-color: #3e3f3a; } @@ -2468,6 +2450,12 @@ label { font-weight: normal; } +pre { + color: #fff; + background-color: #3d3d3d; + border-color: #111; +} + /* ======================================================================= input sizing (for config pages) ========================================================================== */ @@ -2922,17 +2910,11 @@ li.token-input-input-token input { } div.token-input-dropdown { - position: absolute; - width: 273px; background-color: #fff; - overflow: hidden; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - cursor: default; - font-size: 11px; - font-family: Verdana; - z-index: 1; + color: #000; + border-left-color: #ccc; + border-right-color: #ccc; + border-bottom-color: #ccc; } div.token-input-dropdown p { diff --git a/gui/slick/css/original.css b/gui/slick/css/light.css similarity index 98% rename from gui/slick/css/original.css rename to gui/slick/css/light.css index 8a22dc46..feac4096 100644 --- a/gui/slick/css/original.css +++ b/gui/slick/css/light.css @@ -1479,22 +1479,6 @@ config*.tmpl padding-left: 20px; } -#config label span.component-title { - float: left; - width: 172px; - margin-right: 10px; - font-size: 13px; - font-weight: bold; -} - -#config label span.component-desc { - padding-bottom: 2px; - font-size: 12px; - font-weight: normal; - display:inline-block; - width:475px; -} - #config .metadataDiv { display: none; } @@ -1914,11 +1898,6 @@ html * { outline: 0 !important; } -input[type="checkbox"] { - margin: 3px 0px 0px; - line-height: normal; -} - input[type="radio"] { margin: 2px 0px 0px; line-height: normal; @@ -1940,8 +1919,10 @@ input, textarea, select, .uneditable-input { /* navbar styling */ .navbar-default { - background-image: -moz-linear-gradient(#555555, #333333); - background-image: linear-gradient(#555555, #333333); + background-color: #333333; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333'); + background: -webkit-gradient(linear, left top, left bottom, from(#555), to(#333)); + background: -moz-linear-gradient(top, #555, #333); border-color: #3e3f3a; } @@ -2439,9 +2420,9 @@ label { } pre { - color: #fff; - background-color: #3d3d3d; - border: 1px solid #111; + color: #000; + background-color: #F5F5F5; + border-color: #ccc; } /* ======================================================================= @@ -2866,17 +2847,11 @@ li.token-input-input-token input { } div.token-input-dropdown { - position: absolute; - width: 273px; background-color: #fff; - overflow: hidden; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - cursor: default; - font-size: 11px; - font-family: Verdana; - z-index: 1; + color: #000; + border-left-color: #ccc; + border-right-color: #ccc; + border-bottom-color: #ccc; } div.token-input-dropdown p { diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index e4478471..a6b4d1a5 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -489,6 +489,20 @@ inc_bottom.tmpl display: inline; } +/* ======================================================================= +inc_rootDirs.tmpl +========================================================================== */ +.rootdir-selectbox, +.rootdir-selectbox #rootDirs, +.rootdir-controls { + width: 430px +} +.rootdir-selectbox { + padding: 0 0 5px +} +.rootdir-controls { + text-align: center +} /* ======================================================================= home.tmpl @@ -1511,16 +1525,20 @@ config*.tmpl padding: 12px 0px; } +#config div.field-pair select, #config div.field-pair input { - float: left; margin-right: 6px; } +#config div.field-pair input { + float: left; +} + #config .nocheck, #config div #customQuality, .metadataDiv, .providerDiv { padding-left: 20px; } -#config label span.component-title { +#config span.component-title { float: left; width: 172px; margin-right: 10px; @@ -1528,14 +1546,17 @@ config*.tmpl font-weight: bold; } -#config label span.component-desc { - padding-bottom: 2px; +#config span.component-desc { font-size: 12px; font-weight: normal; - display:inline-block; + display:block; width:475px; + margin-left:182px } +#config label.space-right { + margin-right:10px +} #config .metadataDiv { display: none; } @@ -1956,7 +1977,7 @@ html * { } input[type="checkbox"] { - margin: 3px 0px 0px; + margin: 2px 0px 0px; line-height: normal; } @@ -1980,12 +2001,6 @@ input, textarea, select, .uneditable-input { } /* navbar styling */ -.navbar-default { - background-image: -moz-linear-gradient(#555555, #333333); - background-image: linear-gradient(#555555, #333333); - border-color: #3e3f3a; -} - .navbar-default .navbar-brand { color: #ffffff; } @@ -2480,9 +2495,7 @@ label { } pre { - color: #fff; - background-color: #3d3d3d; - border: 1px solid #111; + border: 1px solid; } /* ======================================================================= @@ -2933,11 +2946,10 @@ li.token-input-input-token input { div.token-input-dropdown { position: absolute; width: 273px; - background-color: #fff; overflow: hidden; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; + border-left: 1px solid; + border-right: 1px solid; + border-bottom: 1px solid; cursor: default; font-size: 11px; font-family: Verdana; @@ -2981,4 +2993,7 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item { span.token-input-delete-token { margin: 0 1px; -} \ No newline at end of file +} + +.red-text {color:#d33} +.clear-left {clear:left} \ No newline at end of file diff --git a/gui/slick/images/imdb.png b/gui/slick/images/imdb.png index 961177009aabef915420ef26fde96679d31d7c68..2eb430c07dacc4ff581e3dba7c01087c864d219e 100644 GIT binary patch literal 1239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dK5ixfJ|<;(R%0EG z2p_)a0KTkf!Q2GF!W6-hOu>p=!R~6YiS^=Bn#C7(ORbzDwQh>+&P8&&mdGAkqI77T z+}X8C7dIUPvpRoB=e@7N?1ZGA(?;hnoAf<4kZ295-)sJ7{ck%Ky)7cbcNPdWr97Cq zV5wV6aaEugmt$glsz#}hOsSDf$-0hfe11Rk*A~P-3{+e2>W1Sk-A8-N-!0u}a{pb? h_H7FzuZJz(aFSj6n!wC2aiZX|!_(EzWt~$(69C*wd6obG literal 9158 zcmeHMX;c(f7XD~xXqu+`HDEX0P)&Cgn>+4`8Wj~3P}G1Lm#AahV%&{OSOi&QHKHh} zxNF2{P~#r=T@$03ER)P6Gnswn%#w5FocZtE_X>=Y)3nx^$%#Msig(|;OI24ry5GCs zEx-=}U<}k7FkcU(0*H)M^?QLpGuhm3Rc|r?t4u&rQj2Z|TpfT!I)^R+3KQ3%u1)Ad z%+Q$`^f3wyU3$TsIT_}0Q(>L@I;=An!TQ=VSQo5>b?loA=i4XrF=h8Tj#L!1O~n9FdWccDv1Hiy)XxPA9k6TP&uiDAk~b*dl^y zl?n4VAQT9&(n`a110A8TAP80%Ne`qW6pkmlKm1{alk_0r*ZJ#&Zh$@@gs)n(ewoE} z91gDQTwF(h15Ss>?T(3Yxg<%7j^_6gE(}jB;o%<7(;?wM#Q$?9A3s*tSz4Mw%P&1W zEyh0Jrw@cKl-Al%3-nQL=%ab_Krc~q$uM;6A=Y1G-ytye8wz9pVK5G$mYf3Pz~L|s z8UgdDi7=;65^J<&%oJF%rou9Q8Y~m0!;(D%)`@drojecLDGOkoM(g*hZ>VedtR=9{ zUW$l$YZ0-0J?twgz?L|22F`l&Z950K?gK~-C&3ynz_s%<c6$y!hydtsVP_O9NX}DK(>O9gb zI(JD+Lzt76vm`h}X#QgDw4^7cb?KU(j_@dm!$e(x9WtWQyLQXSKtwde5sJRh+et)c zbnBj(i4GDi??y;w^hcnbgp}F6=a@0Dxe%lag3E$|2(puKjp^BY>{!@i;1}bE7zMa=s1`K!grD-jSbo9xM5Yq|o(A z(qF5e4^_XS&{%21uUNxc{W^X}h@|Ti{fVS=c&CKfzW3|A_-(e>Sc;A1k42R6>GMgG zV{Nv$xL_cT`z7A!WBloU$>s@`;^Ln2>*7>DNxe9SXIM5{e0;1V#mkZ;#}i5911VOu z#S?4}F58CVnf?Tya5#Lr6CBaL{n0MpewQoJCtPly?nL)9{chi&+5Sn9NT1HR_DpKe zlc(rRoNt@K^A)e0J244{uDxMOraWd?2IVm?!np^wIoIa3QqH%hErfMCac<7LXHe~Q=3+!FDp0xh^6e_$ezOs5)h?BH zuW8ATIRDPw2bQ;Ao?B@=_heQ|={gJq~&Ed9bbL zAl07~+@95+gR9|v$XkiGH=KuS`zf&PRO78Dj^E1ncedng#QWtPSKw}>*j>c?cb^5@ zP5Lfg51?9ss0UnyYwvkAuiHy`-M$Nu_uLRUo_inp4vqI$yV&qTh+ z>k9IP&!JrS1(b_aU%2#3C|7<38=qB`}R->Nl-`+tD)A=Moo{0Yj( zRJZ0i<|kBx_>}6`ybkfjKSa){eDxiDBir$!%s{M0#EsE}xOmPspC9oFUTJ2V#)QO4 znvmG>6;0^aX}TtK>hhWU#tn;do0t09=%p*La*L$YC`WmYc!!x z-?yF*Lthnfef#C+<_@DDV?ZwDb>KoBwERAeKNG5%az_(I=Jp$qmzOu3$LCS;9eI>Y z4i|%#crtNSpeKb6NY2mC=kFy0@@*vZDLz#Ucmz-0@CH{c77{iJO&(ZKP%w%VeSw{1 z0X2K;00sPnQCt-^JB1D$R9IM;P8NM3udWwTW32-e()&-ObCtgpMI?m|8eCLVlu3%d z$U#z!_@Iayig`zU{2gTG-%;U4T>J)-PUm8+UQZj)o zfhAESc@v_94@&5rEG7uM5EMEjrL?p(hs=Sc(Ioks5fVTtHI(xB9Bz*mf>H>Mf--W+v5;!&-e$aUb`XwozxTM}}p5dF_H59_yy`&sdbJU~zNx2L@{ZE}}DHl diff --git a/gui/slick/images/providers/nextgen.png b/gui/slick/images/providers/nextgen.png index 1bba1164881c2d56630b5bc86ef9bf0ed26b9366..724e76e9f7b78e7b26246fd404752358b4d87783 100644 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`yF6VSLo9mVPDtc!HV|mF7vtFw z!YG!OIQ4+%0VWRyPG=|e#Hkyi92|vJa_admncQX3souZt`uBaWMgOhx@@)ICx8^O-7Yv@RelF{r5}E*KT3CVr literal 1150 zcmeHGF%E)25F8Q<3kyt)B{5X?zQr#Pe?V)=TlfN%)_%b+P}|`Q?2^qz5^Lj?RG0eb*Pf+=REJl$yb0uX-1TI@=q5z;#`S9#7k!I!ErJ`;ms8~7b_ zEusB;t2o4?akLv#!`XA@aSl-Xq zd?H6Z_?@M%h;(1Yy2r_S@)>s)&w7ishv(v6z3QovTNCPW{{AWFA5Rk)2Eb9=fK3Lh R3FuD{w5Byz;1#&8c>@{4xxxSd diff --git a/gui/slick/images/subtitles/itasa.png b/gui/slick/images/subtitles/itasa.png index 908a52adae06ff1de52837cdd35b7942a7ec43ce..bede8940c81e5a0b8dc3d59f09d5e1a48eca0ea8 100644 GIT binary patch literal 984 zcmV;}11J26P)2NNwsC(}yN?NfUi=OMF4?qitV| z54LVGF`_lJ8Ydb?ERwcR5DP7`$<|?;FvFc0?#!Kg@4xzBAbiPrJm)0moDT{iz|NyW zNO!XQP^}wHmMAbanddc;G&}A=Apf`*jT|UIqbh=Un;?YPhQqjWVcB_SG)o&8=iu_1 zbN1kX?kFj zKJm$l^JapGvOO-e*j6m}oGeqWZM(;9R$e!d9-q(CN{4Z!`L9ghNAqT<5CZ(6J4b77 zr>45sofG#AQa`#$8t!FD-OUs}f>M~5tl4bW4c$2k7zGs?TFDSzG?um>>nK%z=0d>p zv)RtistaD5G;rOYDg4x2o>oPZPHT06G%ZIHR%=Jl{mZn0Yy5(3stA%i6CUhfC7`0j zlEuPd1;#dPTH5HBhuZ?K9smHanb0EZ)^RkjVIM{iFisgtn7BMgxu--y=>QVR4V#v6 zE~I)d`e!9ib{{BIMz->DNzm~?V4=}uu7PqOg}V?7FT&?XdDY@zeVF_OV}gF z{0O8=Ww?Yme23LyZT(#`6|uCc$Hg1&)k?X}MW0KlcY zt8ZVvA3rA}h?{r&`$JxJtw>YS%@u|HjX~egkN+lLDD$X^mT*xo5JG@=`(`gG7jCfD zAMW*O0yS}_KJ-<`!-4LQSBuLCQo~{X!IjM6FUD40%~S5aeyX9p!tYuG0Q@fi000To zDSPktnTy?1@#h@I-3o$^Uy}_PLXsoQXH)KK-CG*{^qKwV!iDaott#Qpccz?6x0ljK zy2e*u?th>+XDnRo)s)=9ilU+C9|?W`bXDM2RYGLv7XAY$+7<4c25IoEc9XG*~rv;K{Y z_vg39J9dvae|W(y#OZa}9)3qd>m5sucCTwse~Jr~Lrs-&UYv36WP`nXlhMg%bX`NL zBIJg~&zPrdM=p{53gBUuGLC-t2>#>Ro<3Dd3u}z#W;OU7I$7F#m2ENFL zHjwieG}0gXLXQ2X`vB;Dw(355?5G9KM?1}5-}^BiFZw$VLrvs^WsK|d=48~p9W<(( zFyIB(^8!a1q4vN2`c?`rICn~XpnU3b5lfHMT>vjR6)u^!SNBVVCva0+6_G9CrmeLy z4zC3-IZ3Zmgy`y--l`#u_;UXCcYR&?SXlB_f_~oh;rHxc7Bg^3tu7wytd$cFdO}}- zz`CDX^wgi#R3Vq0{H%GlXR}{Z5(Z67+96Vw!lLH67I0kiz9e819VY*P~63VCU`Dx-%e z(&y^M*;X^GW!AozcWw-*m@>j%iH+_`{(0z1!t>GqrrxZ1Sv diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index 06e0eb81..4fed019d 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -7,17 +7,18 @@ #from sickbeard import config #from sickbeard import metadata #from sickbeard.metadata.generic import GenericMetadata -#set global $title = "Config - General" -#set global $header = "General Configuration" -#set global $sbPath="../.." +#set global $title = 'Config - General' +#set global $header = 'General Configuration' -#set global $topmenu="config"# -#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") +#set global $sbPath = '../..' -#if $varExists('header') +#set global $topmenu = 'config' +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl') + +#if $varExists('header')

$header

-#else +#else

$title

#end if @@ -33,503 +34,512 @@
-
- +
+ - -
- -
-

Misc

-

Startup options.

-

Some options may require a manual restart to take effect.

-
-
-
- - -
+
+
-
- - -
- -
- - - -
+
+

Misc

+

Startup options. Indexer options. Log and show file locations.

+

Some options may require a manual restart to take effect.

+
-
- - -
+
+
+ +
-
- - - -
-
- - -
- -
- - -
- -
- -
+
+ +
-
- - -
+
+ +
-
- -
+
+ +
-
- - - -
+
+ +
-
- - -
-
-
- - -
- -
- - -
- -
-

Web Interface

-

It is recommended that you enable a username and password to secure SickRage from being tampered with remotely.

-

These options require a manual restart to take effect.

-
- -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- -
-
- - -
- -
- - -
-
- - -
-
- -
- -
-

Date and Time

-
- -
- -
- - -
-
- - -
- -
- -
- -
- - - -
- -
- - -
- - -
-
- -
- -
-

Advanced Settings

-

You need to know what you are doing here!!!

-
- -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
-
- - -
-
- -
- - - -
- -
- - - -
- -
- - -
-
- -
- -
-
+ +
+
+
-
- -
-

UI Theme Settings

-

Change UI settings to your liking.

-
- -
+
+

Updates

+

Options for software updates.

+
+
- - -
+ +
- - -
- -
+
+ +
+ +
+ +
+ +
+ +
+ + + + +
+
+ + +
+
+ +
+

User Interface

+

Options for visual appearance.

+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ Timezone: + + + +

display dates and times in either your timezone or the shows network timezone

+ +
+ +
+
+ + + +
+ +
+ +
+ +
+

Web Interface

+

It is recommended that you enable a username and password to secure SickRage from being tampered with remotely.

+

These options require a manual restart to take effect.

+
+ +
+ +
+ +
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ + +
+ +
+

Advanced Settings

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+
+ +
All non-absolute folder locations are relative to $sickbeard.DATA_DIR
- -
- + + + @@ -538,9 +548,9 @@ -#include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") +#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl') diff --git a/gui/slick/interfaces/default/inc_rootDirs.tmpl b/gui/slick/interfaces/default/inc_rootDirs.tmpl index 9f3a9614..2bce6754 100644 --- a/gui/slick/interfaces/default/inc_rootDirs.tmpl +++ b/gui/slick/interfaces/default/inc_rootDirs.tmpl @@ -11,18 +11,17 @@ #end if -
- #for $cur_dir in $backend_dirs: - + #end for - +
-
- - - - +
+ + + +
-
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index ce4da832..06d5c1fc 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -104,6 +104,7 @@ AUTO_UPDATE = False NOTIFY_ON_UPDATE = False CUR_COMMIT_HASH = None BRANCH = '' +GIT_REMOTE = '' CUR_COMMIT_BRANCH = '' INIT_LOCK = Lock() @@ -460,7 +461,7 @@ def get_backlog_cycle_time(): def initialize(consoleLogging=True): with INIT_LOCK: - global BRANCH, CUR_COMMIT_HASH, CUR_COMMIT_BRANCH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ + global BRANCH, GIT_REMOTE, CUR_COMMIT_HASH, CUR_COMMIT_BRANCH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \ SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \ NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \ @@ -530,6 +531,9 @@ def initialize(consoleLogging=True): # wanted branch BRANCH = check_setting_str(CFG, 'General', 'branch', '') + # git_remote + GIT_REMOTE = check_setting_str(CFG, 'General', 'git_remote', 'origin') + # current commit hash CUR_COMMIT_HASH = check_setting_str(CFG, 'General', 'cur_commit_hash', '') @@ -1353,6 +1357,7 @@ def save_config(): # For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config() new_config['General'] = {} new_config['General']['branch'] = BRANCH + new_config['General']['git_remote'] = GIT_REMOTE new_config['General']['cur_commit_hash'] = CUR_COMMIT_HASH new_config['General']['cur_commit_branch'] = CUR_COMMIT_BRANCH new_config['General']['config_version'] = CONFIG_VERSION diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py index 9e1bc19c..44bf3aa0 100644 --- a/sickbeard/versionChecker.py +++ b/sickbeard/versionChecker.py @@ -443,7 +443,7 @@ class GitUpdateManager(UpdateManager): self._num_commits_ahead = 0 # get all new info from github - output, err, exit_status = self._run_git(self._git_path, 'fetch origin') + output, err, exit_status = self._run_git(self._git_path, 'fetch %s' % sickbeard.GIT_REMOTE) if not exit_status == 0: logger.log(u"Unable to contact github, can't check for update", logger.ERROR) @@ -538,7 +538,7 @@ class GitUpdateManager(UpdateManager): """ if self.branch == self._find_installed_branch(): - output, err, exit_status = self._run_git(self._git_path, 'pull -f origin ' + self.branch) # @UnusedVariable + output, err, exit_status = self._run_git(self._git_path, 'pull -f %s %s' % (sickbeard.GIT_REMOTE, self.branch)) # @UnusedVariable else: output, err, exit_status = self._run_git(self._git_path, 'checkout -f ' + self.branch) # @UnusedVariable @@ -553,7 +553,7 @@ class GitUpdateManager(UpdateManager): return False def list_remote_branches(self): - branches, err, exit_status = self._run_git(self._git_path, 'ls-remote --heads origin') # @UnusedVariable + branches, err, exit_status = self._run_git(self._git_path, 'ls-remote --heads %s' % sickbeard.GIT_REMOTE) # @UnusedVariable if exit_status == 0 and branches: return re.findall('\S+\Wrefs/heads/(.*)', branches) return [] diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index cc3c4cbf..931cec8c 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1502,7 +1502,7 @@ class ConfigGeneral(MainHandler): use_api=None, api_key=None, indexer_default=None, timezone_display=None, cpu_preset=None, web_password=None, version_notify=None, enable_https=None, https_cert=None, https_key=None, handle_reverse_proxy=None, sort_article=None, auto_update=None, notify_on_update=None, - proxy_setting=None, proxy_indexers=None, anon_redirect=None, git_path=None, calendar_unprotected=None, + proxy_setting=None, proxy_indexers=None, anon_redirect=None, git_path=None, git_remote=None, calendar_unprotected=None, fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None, indexer_timeout=None, play_videos=None, rootDir=None, theme_name=None): @@ -1525,6 +1525,7 @@ class ConfigGeneral(MainHandler): sickbeard.PROXY_SETTING = proxy_setting sickbeard.PROXY_INDEXERS = config.checkbox_to_value(proxy_indexers) sickbeard.GIT_PATH = git_path + sickbeard.GIT_REMOTE = git_remote sickbeard.CALENDAR_UNPROTECTED = config.checkbox_to_value(calendar_unprotected) # sickbeard.LOG_DIR is set in config.change_LOG_DIR()