updates

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1665 2a923420-c742-0410-a762-8d5b09965624

CONTROL/conffiles

@@ -0,0 +1 @@
+var/mongoose/html/css/EXTRA.css

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.6-2
+Version: 1.0.6-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)

CONTROL/postinst

@@ -37,6 +37,7 @@ if [ ! -f /mod/webif/.strip-updated ]; then
 fi
 
 /mod/webif/lib/bin/diskattrs
+var/mongoose/lib/bin/resetnew
 
 [ -f $tmpf ] && rm -f $tmpf
 

var/mongoose/cgi-bin/settings.jim

@@ -40,6 +40,7 @@ set pkgdev [$settings pkgdev]
 set notoolbar [$settings notoolbar]
 set nomobile [$settings nomobile]
 set nohelplinks [$settings nohelplinks]
+set nounwatchedcount [$settings nounwatchedcount]
 set xepghours [$settings xepghours]
 if {$xepghours == 0} { set xepghours 4 }
 set genrededup [$settings genrededup]
@@ -84,6 +85,7 @@ handle_int_update pkgdev $pkgdev "Development Package Display"
 handle_int_update notoolbar $notoolbar "Disable toolbar"
 handle_int_update nomobile $nomobile "Disable mobile link"
 handle_int_update nohelplinks $nohelplinks "Disable help links"
+handle_int_update nounwatchedcount $nounwatchedcount "Disable unwatched count"
 handle_int_update genrededup $genrededup "Genre search dedup"
 handle_int_update autolog $autolog "Auto-processing log level"
 
@@ -171,6 +173,7 @@ setting_toggle "HTTPS web server?" "https" \
 setting_toggle "Slide-down toolbar?" "notoolbar" $(!$notoolbar) 1
 setting_toggle "Mobile link on main page?" "nomobile" $(!$nomobile) 1
 setting_toggle "Help links on main page?" "nohelplinks" $(!$nohelplinks) 1
+setting_toggle "Unwatched count on folders?" "nounwatchedcount" $(!$nounwatchedcount) 1
 
 puts -nonewline "
 	<tr>

var/mongoose/cgi-bin/xepg.js

@@ -9,15 +9,13 @@ $('button.nav').click(function() {
             '&pos=' + $('#xegrid').scrollTop();
 });
 
-var now = new Date().getTime();
-
 $('#xepg_dp').datepicker({
         buttonImage: '/img/cal.gif',
         buttonImageOnly: true,
         showOn: 'button',
         dateFormat: '@',
-        minDate: now,
-        maxDate: now + 7 * 86400,
+        minDate: 0,
+        maxDate: 8,
         onSelect: function(val, sel) {
                 var stt = $(this).attr('stt');
                 // Extract date part

var/mongoose/html/browse/index.jim

@@ -20,13 +20,17 @@ if {![dict exists $env REQUEST_URI]} {
 
 if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
 
+set config [settings new]
+
 set order [cgi_get order -]
 if {$order eq "-"} {
-	set order [[settings new] sortorder]
+	set order [$config sortorder]
 } else {
-	[settings new] sortorder $order
+	$config sortorder $order
 }
 
+set nofcount [$config nounwatchedcount]
+
 set model [system model]
 set dustbin [system dustbin 1]
 
@@ -43,7 +47,7 @@ proc directory {file bfile tbfile} {
 	set img "/images/711_1_09_Media_Folder.png"
 	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
 	puts "<img border=0 class=va id=\"img$tbfile\" src=$img>"
-	puts "<span class=foldernum></span>"
+	if {!$::nofcount} { puts "<span class=foldernum></span>" }
 	puts "<input class=\"fs fsdir\" type=checkbox>"
 	puts "<a class=dbf
 	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"

var/mongoose/html/css/EXTRA.css

@@ -0,0 +1,5 @@
+/* This style sheet can be customised to change the look and feel of some
+ * web interface elements.
+ * It will not be overwritten on webif updates.
+ */
+

var/mongoose/html/edit/edit.jim

@@ -46,6 +46,7 @@ class="ui-widget ui-corner-all"></textarea>
 <ul>
 	<li><a href=# class=qfile>/mod/etc/anacrontab</a></li>
 	<li><a href=# class=qfile>/mod/var/spool/cron/crontabs/root</a></li>
+	<li><a href=# class=qfile>/mod/webif/html/css/EXTRA.css</a></li>
 }
 
 proc quickedit {file} {

var/mongoose/html/lib/header.jim

@@ -21,6 +21,7 @@ puts {
 <link type="text/css" href="/lib/jquery.ui/css/humax/jquery-ui.css"
     rel="Stylesheet" />     
 <link href="/css/style.css" rel="Stylesheet" type="text/css" />
+<link href="/css/EXTRA.css" rel="Stylesheet" type="text/css" />
 <script type="text/javascript" src="/js/jquery.js"></script>
 <script type="text/javascript" src="/lib/jquery.ui/js/jquery-ui.js"></script>
 </head>

var/mongoose/lib/bin/resetnew

@@ -0,0 +1,25 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require system.class ts.class
+
+proc scan {dir} {
+	puts "Fixing $dir..."
+	file stat "$dir/" st
+	if {$st(dev) != $::rootdev} { return }
+
+	ts resetnew $dir
+
+	foreach entry [readdir -nocomplain $dir] {
+		if {[file isdirectory "$dir/$entry"]} {
+			scan "$dir/$entry"
+		}
+	}
+}
+
+set root [system mediaroot]
+file stat "$root/" rootstat
+set rootdev $rootstat(dev)
+
+scan $root
+

var/mongoose/lib/settings.class

@@ -25,6 +25,7 @@ class settings {
 	notoolbar	0
 	nomobile	0
 	nohelplinks	0
+	nounwatchedcount	0
 	xepghours	4
 	genrededup	0
 	autolog		0
@@ -165,6 +166,10 @@ settings method nohelplinks {{val -1}} {
 	return [$self _nval_setting nohelplinks $val]
 }
 
+settings method nounwatchedcount {{val -1}} {
+	return [$self _nval_setting nounwatchedcount $val]
+}
+
 settings method sortorder {{val -1}} {
 	return [$self _nval_setting sortorder $val]
 }