diff --git a/CONTROL/control b/CONTROL/control index 079a3b8a..8a5190d7 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.4.4-2 +Version: 1.4.4-3 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.12-1),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98-3),sqlite3(>=3.15.1),jim-xconv diff --git a/webif/html/browse/_dir.jim b/webif/html/browse/_dir.jim new file mode 100755 index 00000000..be3af946 --- /dev/null +++ b/webif/html/browse/_dir.jim @@ -0,0 +1,21 @@ +#!/mod/bin/jimsh + +package require cgi +package require pack +source /mod/webif/lib/setup +require json + +httpheader "application/json" + +set root [cgi_get dir] +# Strip double slashes +regsub -all -- {\/+} "$root/*" "/" root + +puts "{" +foreach _ [glob -nocomplain "$root/_*"] { + set node [lindex [split [file dirname $_] /] end] + puts "\"[jescape $node]\": 1," +} +puts "\"dummy\" : 0" +puts "}" + diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index f299650d..762a1c7c 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -43,6 +43,7 @@ if {$order eq "-"} { } set nofcount [$config nounwatchedcount] +set nounderscore [$config nounderscore] set model [system model] set dustbin [system dustbin 1] @@ -63,6 +64,7 @@ proc directory {file bfile tbfile} { if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" } puts "" if {!$::nofcount} { puts "" } + if {!$::nounderscore} { puts "_" } puts "" puts "|\/@])/g, '\\$1'); + //console.log("Folder: (%s)", folder); + $('#img' + folder + ' ~ span.folderu').show(); +} + +function __folder_callback(data, status, xhr) +{ + //console.dir(data); + $.each(data, set_folder__); } function delete_callback(file, dir, id) diff --git a/webif/html/css/style.css b/webif/html/css/style.css index 2119ba5b..7542df1d 100644 --- a/webif/html/css/style.css +++ b/webif/html/css/style.css @@ -559,13 +559,38 @@ span.foldernum color: white; height: 15px; line-height: 16px; - background-color: #CC0000; - background: linear-gradient(#FF0000, #CC0000) repeat scroll 0 0 #EEEEEE; + background-color: #cc0000; + background: linear-gradient(#ff0000, #cc0000) repeat scroll 0 0 #eeeeee; font-size: 10px; border: 1px solid #660000; padding: 0 2px 0 2px; border-radius: 1em 1em 1em 1em; - -moz-border-radius: 1em; + -moz-border-radius: 1em; + -webkit-border-radius: 1em; + border-top-right-radius: 1em; + border-top-left-radius: 1em; + border-bottom-right-radius: 1em; + border-bottom-left-radius: 1em; +} + +span.folderu +{ + display: none; + position: absolute; + z-index: 40; + left: 34px; + top: 7px; + color: black; + font-weight: bold; + height: 10px; + line-height: 1px; + background-color: #00cc00; + background: linear-gradient(#00ff00, #00cc00) repeat scroll 0 0 #eeeeee; + font-size: 10px; + border: 1px solid #660000; + padding: 0 2px 0 2px; + border-radius: 1em 1em 1em 1em; + -moz-border-radius: 1em; -webkit-border-radius: 1em; border-top-right-radius: 1em; border-top-left-radius: 1em; diff --git a/webif/html/img/new_flag.png b/webif/html/img/new_flag.png new file mode 100644 index 00000000..8c7dd27c Binary files /dev/null and b/webif/html/img/new_flag.png differ diff --git a/webif/lib/settings.class b/webif/lib/settings.class index cbbadab0..05361dd5 100644 --- a/webif/lib/settings.class +++ b/webif/lib/settings.class @@ -31,6 +31,7 @@ class settings { nohelplinks 0 notwitfeed 0 nounwatchedcount 0 + nounderscore 0 hidevisualota 0 xepghours 4 epgscroll 0 @@ -220,6 +221,10 @@ settings method nounwatchedcount {{val -1}} { return [$self _nval_setting nounwatchedcount $val] } +settings method nounderscore {{val -1}} { + return [$self _nval_setting nounderscore $val] +} + settings method hidevisualota {{val -1}} { return [$self _nval_setting hidevisualota $val] }