diff --git a/CONTROL/control b/CONTROL/control index 6f8a8f8..2ea5464 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.0.15-9 +Version: 1.0.16 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.12-1),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.13),hmt(>=1.1.21),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),mongoose diff --git a/webif/cgi-bin/status.jim b/webif/cgi-bin/status.jim index 9c2dac5..d5c7cff 100755 --- a/webif/cgi-bin/status.jim +++ b/webif/cgi-bin/status.jim @@ -165,8 +165,6 @@ if {[llength $data]} { set mode "Decrypting" set icon "/img/decrypt.png " append icon "style=\"padding: 0 0.2em 0 0.5em\"" -# set icon "178_1_00_Icon_Lock.png " -# append icon "style=\"padding: 0 0.2em 0 0.5em\"" } mpg { set mode "Extracting MPG" diff --git a/webif/html/dedup/dedup b/webif/html/dedup/dedup index bc7276b..5d56b70 100755 --- a/webif/html/dedup/dedup +++ b/webif/html/dedup/dedup @@ -72,8 +72,8 @@ foreach dir $dirs { if {$doit} { # Dooooo, it. $ts settitle $syn - ts renamegroup $file $fn $ts set_deduped + ts renamegroup $file $fn } } } diff --git a/webif/html/dedup/dedup.jim b/webif/html/dedup/dedup.jim index f61fff1..227e4c6 100755 --- a/webif/html/dedup/dedup.jim +++ b/webif/html/dedup/dedup.jim @@ -69,8 +69,8 @@ foreach file [readdir $dir] { if {$doit} { # Dooooo, it. $ts settitle $syn - ts renamegroup $file $fn $ts set_deduped + ts renamegroup $file $fn puts -nonewline "Done" } } diff --git a/webif/html/img/iphone-style-checkboxes/off.png b/webif/html/img/iphone-style-checkboxes/off.png deleted file mode 100644 index f414051..0000000 Binary files a/webif/html/img/iphone-style-checkboxes/off.png and /dev/null differ diff --git a/webif/html/img/iphone-style-checkboxes/on.png b/webif/html/img/iphone-style-checkboxes/on.png deleted file mode 100644 index 94425e5..0000000 Binary files a/webif/html/img/iphone-style-checkboxes/on.png and /dev/null differ diff --git a/webif/html/img/iphone-style-checkboxes/slider.png b/webif/html/img/iphone-style-checkboxes/slider.png deleted file mode 100644 index 80e05ff..0000000 Binary files a/webif/html/img/iphone-style-checkboxes/slider.png and /dev/null differ diff --git a/webif/html/img/iphone-style-checkboxes/slider_center.png b/webif/html/img/iphone-style-checkboxes/slider_center.png deleted file mode 100644 index 310fc8c..0000000 Binary files a/webif/html/img/iphone-style-checkboxes/slider_center.png and /dev/null differ diff --git a/webif/html/img/iphone-style-checkboxes/slider_left.png b/webif/html/img/iphone-style-checkboxes/slider_left.png deleted file mode 100644 index 51576ce..0000000 Binary files a/webif/html/img/iphone-style-checkboxes/slider_left.png and /dev/null differ diff --git a/webif/html/img/iphone-style-checkboxes/slider_right.png b/webif/html/img/iphone-style-checkboxes/slider_right.png deleted file mode 100644 index 447d94a..0000000 Binary files a/webif/html/img/iphone-style-checkboxes/slider_right.png and /dev/null differ diff --git a/webif/html/lib/jquery.plugin/actual/jquery.actual.min.js b/webif/html/lib/jquery.plugin/actual/jquery.actual.min.js new file mode 100644 index 0000000..a196795 --- /dev/null +++ b/webif/html/lib/jquery.plugin/actual/jquery.actual.min.js @@ -0,0 +1,14 @@ +/*! Copyright 2012, Ben Lin (http://dreamerslab.com/) + * Licensed under the MIT License (LICENSE.txt). + * + * Version: 1.0.16 + * + * Requires: jQuery >= 1.2.3 + */ +(function(a){a.fn.addBack=a.fn.addBack||a.fn.andSelf; +a.fn.extend({actual:function(b,l){if(!this[b]){throw'$.actual => The jQuery method "'+b+'" you called does not exist';}var f={absolute:false,clone:false,includeMargin:false}; +var i=a.extend(f,l);var e=this.eq(0);var h,j;if(i.clone===true){h=function(){var m="position: absolute !important; top: -1000 !important; ";e=e.clone().attr("style",m).appendTo("body"); +};j=function(){e.remove();};}else{var g=[];var d="";var c;h=function(){c=e.parents().addBack().filter(":hidden");d+="visibility: hidden !important; display: block !important; "; +if(i.absolute===true){d+="position: absolute !important; ";}c.each(function(){var m=a(this);var n=m.attr("style");g.push(n);m.attr("style",n?n+";"+d:d); +});};j=function(){c.each(function(m){var o=a(this);var n=g[m];if(n===undefined){o.removeAttr("style");}else{o.attr("style",n);}});};}h();var k=/(outer)/.test(b)?e[b](i.includeMargin):e[b](); +j();return k;}});})(jQuery); \ No newline at end of file diff --git a/webif/html/settings/settings.jim b/webif/html/settings/settings.jim index 1030b1a..377b1c0 100755 --- a/webif/html/settings/settings.jim +++ b/webif/html/settings/settings.jim @@ -126,7 +126,7 @@ if {$aclact ne "-" && $acluser ne "-"} { exit } -jqplugin form iphone-style-checkboxes touchpunch +jqplugin form actual iphone-style-checkboxes touchpunch jscss settings.js header @@ -137,7 +137,7 @@ header }] start puts { -