diff options
| author | BBcan177 <bbcan177@gmail.com> | 2015-12-29 23:52:13 -0500 |
|---|---|---|
| committer | BBcan177 <bbcan177@gmail.com> | 2015-12-29 23:52:13 -0500 |
| commit | c154b9f5832830e21f3a1a825cc719fa0439374d (patch) | |
| tree | 8714ba2745a5a94eaf803bba2f2ce2d2c10d7933 /src/usr/local/www/pkg_mgr_installed.php | |
| parent | dc6927bcc7d6a6817d6a52ab39098a6007421b94 (diff) | |
| download | pfsense-c154b9f5832830e21f3a1a825cc719fa0439374d.zip pfsense-c154b9f5832830e21f3a1a825cc719fa0439374d.tar.gz | |
Update pkg_mgr_installed.php
* Mods to if/else/elseif/endif statements for consistency.
* Change font red to span class.
* Change package dependency href link icon from "paper-clip" to "globe".
* Remove redundant <i> in package dependency href link
* Put package dependency links into a <ul> for a cleaner output when dependencies span over two lines.
* Add <div> to "Action" column as the "!" icon was previously printing on the next line.
Diffstat (limited to 'src/usr/local/www/pkg_mgr_installed.php')
| -rw-r--r-- | src/usr/local/www/pkg_mgr_installed.php | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php index 55c3d69..30e8047 100644 --- a/src/usr/local/www/pkg_mgr_installed.php +++ b/src/usr/local/www/pkg_mgr_installed.php @@ -73,7 +73,6 @@ if (is_subsystem_dirty('packagelock')) { } $pgtitle = array(gettext("System"), gettext("Package Manager"), gettext("Installed Packages")); - include("head.inc"); $tab_array = array(); @@ -94,7 +93,7 @@ if (empty($installed_packages)):?> <div class="alert alert-warning"> <?=gettext("There are no packages currently installed.")?> </div> -<?php else: ?> +<?php else:?> <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Installed Packages')?></h2></div> <div class="table-responsive"> @@ -153,13 +152,13 @@ if (empty($installed_packages)):?> ?> <tr> <td> -<?php if ($upgradeavail) { ?> +<?php if ($upgradeavail):?> <a title="<?=$status?>" href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?=$pkg['name']?><?=$vergetstr?>" class="fa fa-refresh"></a> -<?php } else if ($missing) { ?> - <font color="red"><i title="<?=$status?>" class="fa fa-exclamation"></i></font> -<?php } else { ?> +<?php elseif ($missing):?> + <span class="text-danger"><i title="<?=$status?>" class="fa fa-exclamation"></i></span> +<?php else:?> <i title="<?=$status?>" class="fa fa-check"></i> -<?php } ?> +<?php endif;?> </td> <td> <span class="<?=$txtcolor?>"><?=$pkg['shortname']?></span> @@ -178,24 +177,26 @@ 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): ?> -  <a target="_blank" href="https://freshports.org/<?=$pdep['origin']?>"><i class="fa fa-paperclip"><small> <?= basename($pdep['origin']) . '-' . $pdep['version']?></small></i></a> - <?php endforeach; ?> -<?php endif; ?> +<?php if (is_array($pkg['deps']) && count($pkg['deps'])):?> + <br /><br /><?= gettext("Package Dependencies")?>:<ul> + <?php foreach ($pkg['deps'] as $pdep):?> + <a target="_blank" href="https://freshports.org/<?=$pdep['origin']?>" class="fa fa-globe"><small> <?= basename($pdep['origin']) . '-' . $pdep['version']?></small></a>  + <?php endforeach;?></ul> +<?php endif;?> </td> <td> - <a title="<?=gettext("Remove")?>" href="pkg_mgr_install.php?mode=delete&pkg=<?=$pkg['name']?>" class="fa fa-trash"></a> -<?php if ($upgradeavail) { ?> - <a title="<?=gettext("Update")?>" href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?=$pkg['name']?><?=$vergetstr?>" class="fa fa-refresh"></a> -<?php } else { ?> - <a title="<?=gettext("Reinstall")?>" href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?=$pkg['name']?>" class="fa fa-retweet"></a> -<?php } ?> + <div class="row"> + <a title="<?=gettext("Remove")?>" href="pkg_mgr_install.php?mode=delete&pkg=<?=$pkg['name']?>" class="fa fa-trash"></a> +<?php if ($upgradeavail):?> + <a title="<?=gettext("Update")?>" href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?=$pkg['name']?><?=$vergetstr?>" class="fa fa-refresh"></a> +<?php else:?> + <a title="<?=gettext("Reinstall")?>" href="pkg_mgr_install.php?mode=reinstallpkg&pkg=<?=$pkg['name']?>" class="fa fa-retweet"></a> +<?php endif;?> <?php if (!isset($g['disablepackageinfo']) && $pkg['www'] != 'UNKNOWN'):?> - <a target="_blank" title="<?=gettext("View more information")?>" href="<?=htmlspecialchars($pkg['www'])?>" class="fa fa-info"></a> -<?php endif; ?> + <a target="_blank" title="<?=gettext("View more information")?>" href="<?=htmlspecialchars($pkg['www'])?>" class="fa fa-info"></a> +<?php endif;?> + </div> </td> </tr> <?php endforeach;?> |
