clean up installed packages

2 files changed, 26 insertions, 26 deletions

diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index 1ca5d5a..df0f98b 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -122,14 +122,14 @@ if(empty($installed_packages)):?>
 		}
 
 		#check package version
-		$txtcolor = "black";
+		$txtcolor = "";
 		$upgradeavail = false;
 		$missing = false;
 		$vergetstr = "";
 
 		if (isset($pkg['broken'])) {
 			// package is configured, but does not exist in the system
-			$txtcolor = "red";
+			$txtcolor = "text-danger";
 			$missing = true;
 			$status = 'Package is configured, but not installed!';
 		} else if (isset($pkg['installed_version']) && isset($pkg['version'])) {
@@ -141,7 +141,7 @@ if(empty($installed_packages)):?>
 			} else if ($version_compare == '<') {
 				// we're running an older version of the package
 				$status = 'Upgrade available to '.$pkg['version'];
-				$txtcolor = "blue";
+				$txtcolor = "text-warning";
 				$upgradeavail = true;
 				$vergetstr = '&amp;from=' . $pkg['installed_version'] . '&amp;to=' . $pkg['version'];
 			} else if ($version_compare == '=') {
@@ -167,7 +167,7 @@ if(empty($installed_packages)):?>
 <?php } ?>
 		</td>
 		<td>
-			<font color="<?=$txtcolor?>"><?=$pkg['shortname']?></font>
+			<span class="<?=$txtcolor?>"><?=$pkg['shortname']?></span>
 		</td>
 		<td>
 			<?=implode(" ", $pkg['categories'])?>
@@ -185,7 +185,7 @@ if(empty($installed_packages)):?>
 			<?=$pkg['desc']?>
 		</td>
 		<td>
-			<a title="<?=gettext("Remove")?>" href="pkg_mgr_install.php?mode=delete&amp;pkg=<?=$pkg['name']?>" class="fa fa-minus-circle"></a>
+			<a title="<?=gettext("Remove")?>" href="pkg_mgr_install.php?mode=delete&amp;pkg=<?=$pkg['name']?>" class="fa fa-trash"></a>
 <?php if($upgradeavail) { ?>
 			<a title="<?=gettext("Update")?>" href="pkg_mgr_install.php?mode=reinstallpkg&amp;pkg=<?=$pkg['name']?><?=$vergetstr?>" class="fa fa-refresh"></a>
 <?php } else { ?>
@@ -203,18 +203,18 @@ if(empty($installed_packages)):?>
 </div>
 </div>
 <br />
-<div style="text-align: center;">
-	<span>
-		<i class="fa fa-refresh"></i> = Update, &nbsp;
-		<i class="fa fa-check"></i> = Current, &nbsp;
-		<i class="fa fa-minus-circle"></i> = Remove, &nbsp;
-		<i class="fa fa-info"></i> = Information, &nbsp;
-		<i class="fa fa-retweet"></i> = Reinstall.
-		<br />
-		<font color="blue"><?=gettext("Blue package name")?></font> = <?=gettext("Newer version available")?>
-		<br />
-		<font color="red"><?=gettext("Red")?></font> = <?=gettext("Package is configured but not (fully) installed")?>
-	</span>
+<div class="text-center">
+	<p>
+		<i class="fa fa-refresh"></i> = Update &nbsp;
+		<i class="fa fa-check"></i> = Current &nbsp;
+	</p>
+	<p>
+		<i class="fa fa-trash"></i> = Remove &nbsp;
+		<i class="fa fa-info"></i> = Information &nbsp;
+		<i class="fa fa-retweet"></i> = Reinstall
+	</p>
+	<p><span class="text-warning"><?=gettext("Newer version available")?></span></p>
+	<p><span class="text-danger"><?=gettext("Package is configured but not (fully) installed")?></span></p>
 </div>
 
 <?php endif; ?>
diff --git a/src/usr/local/www/widgets/widgets/installed_packages.widget.php b/src/usr/local/www/widgets/widgets/installed_packages.widget.php
index 8f11a9c..035dad1 100644
--- a/src/usr/local/www/widgets/widgets/installed_packages.widget.php
+++ b/src/usr/local/www/widgets/widgets/installed_packages.widget.php
@@ -95,13 +95,13 @@ if($_REQUEST && $_REQUEST['ajax']) {
 			continue;
 		}
 
-		$txtcolor = "black";
+		$txtcolor = "";
 		$upgradeavail = false;
 		$vergetstr = "";
 		$missing = false;
 
 		if (isset($pkg['broken'])) {
-			$txtcolor = "red";
+			$txtcolor = "text-danger";
 			$missing = true;
 			$status = 'Package is configured, but not installed!';
 		} else if (isset($pkg['installed_version']) && isset($pkg['version'])) {
@@ -115,7 +115,7 @@ if($_REQUEST && $_REQUEST['ajax']) {
 				// we're running an older version of the package
 				$status = 'Upgrade available to '.$pkg['version'];
 				$statusicon = 'plus-circle';
-				$txtcolor = "blue";
+				$txtcolor = "text-warning";
 				$upgradeavail = true;
 				$vergetstr = '&amp;from=' . $pkg['installed_version'] .
 				    '&amp;to=' . $pkg['version'];
@@ -134,10 +134,10 @@ if($_REQUEST && $_REQUEST['ajax']) {
 		}
 
 		print("<tr>\n");
-		print(		'<td><font color="' . $txtcolor . '">' . $pkg['shortname'] . "</font></td>\n");
+		print(		'<td><span class="' . $txtcolor . '">' . $pkg['shortname'] . "</span></td>\n");
 		print(		"<td>" . implode(' ', $pkg['categories']) . "</td>\n");
 		print(		"<td>\n");
-		print(			'<i title="' . $status . '" class="fa fa-' . $statusicon . '"></i>');
+		print(			'<i title="' . $status . '" class="fa fa-' . $statusicon . '"></i> ');
 
 		if (!$g['disablepackagehistory']) {
 			print('<a target="_blank" title="' . gettext("View changelog") . '" href="' . htmlspecialchars($pkg['changeloglink']) . '">');
@@ -151,7 +151,7 @@ if($_REQUEST && $_REQUEST['ajax']) {
 
 		print(	"</td>\n");
 		print(	"<td>\n");
-		print(		'<a title="' . gettext("Remove") . '" href="pkg_mgr_install.php?mode=delete&amp;pkg=' . $pkg['name'] . '"><i class="fa fa-times"></i></a>'."\n");
+		print(		'<a title="' . gettext("Remove") . '" href="pkg_mgr_install.php?mode=delete&amp;pkg=' . $pkg['name'] . '"><i class="fa fa-trash"></i></a>'."\n");
 
 		if($upgradeavail) {
 			print(	'<a title="' . gettext("Update") . '" href="pkg_mgr_install.php?mode=reinstallpkg&amp;pkg=' . $pkg['name'] . $vergetstr . '"><i class="fa fa-refresh"></i></a>'."\n");
@@ -179,9 +179,9 @@ if($_REQUEST && $_REQUEST['ajax']) {
 	</table>
 </div>
 
-<div style="text-align: center;">
-	<?=gettext("Packages may be added/managed here: ")?> <a href="pkg_mgr_installed.php">System -&gt;Packages</a>
-</div>
+<p class="text-center">
+	<?=gettext("Packages may be added/managed here: ")?> <a href="pkg_mgr_installed.php">System -&gt; Packages</a>
+</p>
 
 <script type="text/javascript">
 //<![CDATA[