From 9b2f138fd91d18bfde71e5a99f21ea7f46fff3c0 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 25 Sep 2011 18:25:09 +0000 Subject: [PATCH] update git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@420 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/html/js/iajax.js | 3 ++- var/mongoose/html/lib/header.jim | 3 +-- var/mongoose/html/lib/header.shtml | 3 +-- var/mongoose/include/modversion.jim | 1 + var/mongoose/lib/system.class | 4 ++++ 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 4e7ebb5..bea675b 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.7.1-2 +Version: 0.7.1-3 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.3),hmt(>=1.0.6),ssmtp diff --git a/var/mongoose/html/js/iajax.js b/var/mongoose/html/js/iajax.js index 1da56e2..2b21942 100644 --- a/var/mongoose/html/js/iajax.js +++ b/var/mongoose/html/js/iajax.js @@ -33,7 +33,8 @@ jQuery.ajaxPrefilter(function(options, _, jqXHR) { } } } catch(e) { - console.log(e); + if (window.console) + console.log(e); } }, options.progressInterval); diff --git a/var/mongoose/html/lib/header.jim b/var/mongoose/html/lib/header.jim index 38cc0f1..049089d 100644 --- a/var/mongoose/html/lib/header.jim +++ b/var/mongoose/html/lib/header.jim @@ -1,6 +1,5 @@ puts { - + diff --git a/var/mongoose/html/lib/header.shtml b/var/mongoose/html/lib/header.shtml index 53eb96d..aff584a 100644 --- a/var/mongoose/html/lib/header.shtml +++ b/var/mongoose/html/lib/header.shtml @@ -1,5 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> +<!doctype html> <html> <head> <title><!--#exec cmd="/mod/var/mongoose/include/model.jim" --> diff --git a/var/mongoose/include/modversion.jim b/var/mongoose/include/modversion.jim index 097bb84..968cf4c 100755 --- a/var/mongoose/include/modversion.jim +++ b/var/mongoose/include/modversion.jim @@ -4,6 +4,7 @@ source /mod/var/mongoose/lib/setup require system.class puts " + Web interface version: [system pkgver webif]
Custom firmware version: [system modversion] " diff --git a/var/mongoose/lib/system.class b/var/mongoose/lib/system.class index be76070..2ea87b4 100644 --- a/var/mongoose/lib/system.class +++ b/var/mongoose/lib/system.class @@ -32,6 +32,10 @@ proc {system modversion} {} { return [format "%d.%d%d" $a $b $c] } +proc {system pkgver} {{pkg webif}} { + return [lrange [split [exec opkg list-installed $pkg] " "] 2 end] +} + proc {system diskspace} {} { switch [system model] { HDR { set part /mnt/hd2 }