From c6c599f6319230a22d7f9a8fcca69e364bbbc068 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 15 Dec 2015 14:41:19 -0500
Subject: Show package dependencies if they exist (on both available package
 list and installed package list)

---
 src/usr/local/www/pkg_mgr.php           | 6 ++++++
 src/usr/local/www/pkg_mgr_installed.php | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'src/usr/local')

diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index 3872e89..5f25564 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -217,6 +217,12 @@ if (!$pkg_info || !is_array($pkg_info)):
 ?>
 					<td>
 						<?=$index['desc']?>
+<?php if (is_array($index['deps']) && count($index['deps'])): ?>
+						<br /><br /><?= gettext("Package Dependencies") ?>:
+	<?php foreach ($index['deps'] as $pdep): ?>
+						<br /><i class="fa fa-paperclip"></i> <?= basename($pdep['origin']) ?>-<?= $pdep['version'] ?>
+	<?php endforeach; ?>
+<?php endif; ?>
 					</td>
 					<td>
 						<a title="<?=gettext("Click to install")?>" href="pkg_mgr_install.php?id=<?=$index['name']?>" class="btn btn-success btn-sm">install</a>
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index fca2f6d..8d8f298 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -180,6 +180,12 @@ if (empty($installed_packages)):?>
 		</td>
 		<td>
 			<?=$pkg['desc']?>
+<?php if (is_array($pkg['deps']) && count($pkg['deps'])): ?>
+			<br /><br /><?= gettext("Package Dependencies") ?>:
+	<?php foreach ($pkg['deps'] as $pdep): ?>
+			<br /><i class="fa fa-paperclip"></i> <?= basename($pdep['origin']) ?>-<?= $pdep['version'] ?>
+	<?php endforeach; ?>
+<?php endif; ?>
 		</td>
 		<td>
 			<a title="<?=gettext("Remove")?>" href="pkg_mgr_install.php?mode=delete&amp;pkg=<?=$pkg['name']?>" class="fa fa-trash"></a>
-- 
cgit v1.1


From 8cfdeb2ef63e283fad931f220d1f1930651097d4 Mon Sep 17 00:00:00 2001
From: BBcan177 <bbcan177@gmail.com>
Date: Tue, 15 Dec 2015 16:44:31 -0500
Subject: Add breadcrumb to pkg.php

---
 src/usr/local/www/pkg.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/usr/local')

diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php
index d4ba7b0..0737b0c 100755
--- a/src/usr/local/www/pkg.php
+++ b/src/usr/local/www/pkg.php
@@ -181,7 +181,24 @@ if ($pkg['custom_php_command_before_form'] != "") {
 	eval($pkg['custom_php_command_before_form']);
 }
 
-$pgtitle = array($pkg['title']);
+// Breadcrumb
+if ($pkg['title'] != "") {
+	if (!$only_edit) {
+ 		$pkg['title'] = $pkg['title'] . '/Edit';
+	}
+	if (strpos($pkg['title'], '/')) {
+		$title = explode('/', $pkg['title']);
+
+		foreach ($title as $subtitle) {
+			$pgtitle[] = gettext($subtitle);
+		}
+	} else {
+		$pgtitle = array(gettext("Package"), gettext($pkg['title']));
+	}
+} else {
+	$pgtitle = array(gettext("Package"), gettext("Editor"));
+}
+
 include("head.inc");
 
 ?>
-- 
cgit v1.1