diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-15 17:20:48 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-15 17:20:48 -0500 |
commit | accb5203fab95bb428768ad579989136415274e5 (patch) | |
tree | 3689957c517d791351609fa513725c2cd419efc2 /src/usr | |
parent | 335ac1e893fc9cd59bd7c350599334449a046cb6 (diff) | |
parent | 8cfdeb2ef63e283fad931f220d1f1930651097d4 (diff) | |
download | pfsense-accb5203fab95bb428768ad579989136415274e5.zip pfsense-accb5203fab95bb428768ad579989136415274e5.tar.gz |
Merge pull request #2241 from BBcan177/patch-3
Diffstat (limited to 'src/usr')
-rwxr-xr-x | src/usr/local/www/pkg.php | 19 | ||||
-rw-r--r-- | src/usr/local/www/pkg_mgr.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/pkg_mgr_installed.php | 6 |
3 files changed, 30 insertions, 1 deletions
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"); ?> 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&pkg=<?=$pkg['name']?>" class="fa fa-trash"></a> |