From 36d82968af29baf1e7a3ca9cfe7fb4aaff4c0e81 Mon Sep 17 00:00:00 2001 From: Marcello Coutinho Date: Sun, 3 Jun 2012 18:52:19 -0300 Subject: 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.php | 83 +++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 31 deletions(-) (limited to 'usr') diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 16b3ca8..9e2c483 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -2,7 +2,7 @@ /* $Id$ */ /* pkg_mgr.php - Copyright (C) 2004-2010 Scott Ullrich + Copyright (C) 2004-2012 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without @@ -62,8 +62,14 @@ if(is_subsystem_dirty('packagelock')) { echo ""; exit; } - -$pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "supportedbybsdperimeter")); +function domTT_title($title_msg){ + if (!empty($title_msg)){ + $title_msg=preg_replace("/\s+/"," ",$title_msg); + $title_msg=preg_replace("/'/","\'",$title_msg); + echo "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');\""; + } +} +$pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "supportedbybsdperimeter","config_file")); if($pkg_info) { $fout = fopen("{$g['tmp_path']}/pkg_info.cache", "w"); fwrite($fout, serialize($pkg_info)); @@ -88,7 +94,11 @@ $pgtitle = array(gettext("System"),gettext("Package Manager")); include("head.inc"); ?> - + + + + + - - - - - - + + + + + 0)) continue; + /* get history/changelog git dir */ + $commit_dir=split("/",$index['config_file']); + $changeloglink ="https://github.com/bsdperimeter/pfsense-packages/commits/master/config/".$commit_dir[(count($commit_dir)-2)]; + /* Check package info link */ + if($index['pkginfolink']){ + $pkginfolink = $index['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"); + } ?> - --> - - - -


+	>	@@ -190,30 +211,30 @@ include("head.inc");	- - - - - - - -	+ +	+ +	> + + + ". gettext("Package Info") .""; - } else { - echo gettext("No info, check the") . " " . gettext("forum") . ""; - } + if (isset($g['disablepackagehistory'])) + echo"{$index['version']}"; + else + echo "{$index['version']}"; ?> + + + +	- +	> + +	- ')" href="pkg_mgr_install.php?id="> +	+ ')" href="pkg_mgr_install.php?id="> src="./themes//images/icons/icon_plus.gif" width="17" height="17" border="0">