From 8b19e1b32fc58da71bedfce031c9d45be0fabe44 Mon Sep 17 00:00:00 2001 From: Marcello Coutinho Date: Sun, 3 Jun 2012 18:57:10 -0300 Subject: [PATCH] Include github changelog link to package version when $g['disablepackagehistory'] is not set, domtt titles, remove package info column and move package info to description tab --- usr/local/www/pkg_mgr_installed.php | 97 ++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 46a095b52d..f2345d75fb 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -59,6 +59,17 @@ if(is_subsystem_dirty('packagelock')) { exit; } +function domTT_title($title_msg, $return="echo"){ + if (!empty($title_msg)){ + $title_msg=preg_replace("/\s+/"," ",$title_msg); + $title_msg=preg_replace("/'/","\'",$title_msg); + $title= "onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\" onmouseover=\"domTT_activate(this, event, 'content', '{$title_msg}', 'trail', true, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle');\""; + if ($return =="echo") + echo $title; + else + return $title; + } +} if(is_array($config['installedpackages']['package'])) { foreach($config['installedpackages']['package'] as $instpkg) { $tocheck[] = $instpkg['name']; @@ -70,7 +81,11 @@ $pgtitle = array(gettext("System"),gettext("Package Manager")); include("head.inc"); ?> - + + + + + @@ -93,11 +108,11 @@ include("head.inc");
- - - - - + + + + + 0) { $tdclass = "listbggrey"; - $pkgver = gettext("Available") .": ". $latest_package . "
"; - $pkgver .= gettext("Installed") .": ". $pkg['version']; + if (isset($g['disablepackagehistory'])) + $pkgver = "".gettext("Available") .": ". $latest_package . "
"; + else + $pkgver = "".gettext("Available") .": ". $latest_package . "
"; + $pkgver .= gettext("Installed") .": ". $pkg['version']. ""; } // we're running an older version of the package if(strcmp($pkg['version'], $latest_package) < 0) { $tdclass = "listbg"; - $pkgver = "" . gettext("Available") .": ". $latest_package . "
"; - $pkgver .= gettext("Installed") .": ". $pkg['version']; + if (isset($g['disablepackagehistory'])) + $pkgver = "" . gettext("Available") .": ". $latest_package . "
"; + else + $pkgver = "" . gettext("Available") .": ". $latest_package . "
"; + $pkgver .= gettext("Installed") .": ". $pkg['version'].""; } // we're running the current version if(!strcmp($pkg['version'], $latest_package)) { $tdclass = "listr"; - $pkgver = $pkg['version']; + if (isset($g['disablepackagehistory'])) + $pkgver = "{$pkg['version']}"; + else + $pkgver = "{$pkg['version']}"; } } else { // unknown available package version $pkgver = ""; if(!strcmp($pkg['version'], $latest_package)) { $tdclass = "listr"; - $pkgver = $pkg['version']; - } + if (isset($g['disablepackagehistory'])) + $pkgver = "{$pkg['version']}"; + else + $pkgver = "{$pkg['version']}"; + } } + /* Check package info link */ + if($pkg['pkginfolink']){ + $pkginfolink = $pkg['pkginfolink']; + $pkginfo=gettext("Package info"); + } + else{ + $pkginfolink = "http://forum.pfsense.org/index.php/board,15.0.html"; + $pkginfo=gettext("No package info, check the forum"); + } + ?> - "; + else + echo ""; ?> - - -
 
@@ -149,32 +190,26 @@ include("head.inc"); - " . gettext("Package Info") . ""; - } else { - echo gettext("No info, check the") . " " . gettext("forum") . ""; - } + {$pkgver}{$pkgver} - - - + > +

+ 		- ')" href="pkg_mgr_install.php?mode=delete&pkg="> - " src="./themes//images/icons/icon_x.gif" width="17" height="17" border="0"> + ')" href="pkg_mgr_install.php?mode=delete&pkg="> + src="./themes//images/icons/icon_x.gif" width="17" height="17" border="0">
- " src="./themes//images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0"> + src="./themes//images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0"> - " src="./themes//images/icons/icon_reinstall_xml.gif" width="17" height="17" border="0"> + src="./themes//images/icons/icon_reinstall_xml.gif" width="17" height="17" border="0">