Merge pull request #3644 from doktornotor/patch-27

1 files changed, 21 insertions, 15 deletions

diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index 75ebe20..8a915c1 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -216,19 +216,6 @@ function get_pkg_table() {
 	$pkgtbl .='		</table>';
 	$pkgtbl .='		</div>';
 	$pkgtbl .='	</div>';
-	$pkgtbl .='	<br />';
-	$pkgtbl .='	<div class="text-center">';
-	$pkgtbl .='		<p>';
-	$pkgtbl .='			<i class="fa fa-refresh"></i> = ' . gettext('Update') . ' &nbsp;';
-	$pkgtbl .='			<i class="fa fa-check"></i> = ' . gettext('Current') . ' &nbsp;';
-	$pkgtbl .='		</p>';
-	$pkgtbl .='		<p>';
-	$pkgtbl .='			<i class="fa fa-trash"></i> = ' . gettext('Remove') . ' &nbsp;';
-	$pkgtbl .='			<i class="fa fa-info"></i> = ' . gettext('Information') . ' &nbsp;';
-	$pkgtbl .='			<i class="fa fa-retweet"></i> = ' . gettext('Reinstall');
-	$pkgtbl .='		</p>';
-	$pkgtbl .='		<p><span class="text-warning">' . gettext("Newer version available") . '</span></p>';
-	$pkgtbl .='		<p><span class="text-danger">' . gettext("Package is configured but not (fully) installed") . '</span></p>';
 
 	return $pkgtbl;
 }
@@ -259,7 +246,24 @@ display_top_tabs($tab_array);
 			<?php print_info_box(gettext("There are no packages currently installed."), 'warning', false); ?>
 		</div>
 	</div>
+
+	<div id="legend" class="alert-info text-center">
+		<p>
+		<i class="fa fa-refresh"></i> = <?=gettext('Update')?>  &nbsp;
+		<i class="fa fa-check"></i> = <?=gettext('Current')?> &nbsp;
+		</p>
+		<p>
+		<i class="fa fa-trash"></i> = <?=gettext('Remove')?> &nbsp;
+		<i class="fa fa-info"></i> = <?=gettext('Information')?> &nbsp;
+		<i class="fa fa-retweet"></i> = <?=gettext('Reinstall')?>
+		</p>
+		<p>
+		<span class="text-warning"><?=gettext("Newer version available")?></span>
+		</p>
+		<span class="text-danger"><?=gettext("Package is configured but not (fully) installed")?></span>
+	</div>
 </div>
+
 <script type="text/javascript">
 //<![CDATA[
 
@@ -269,6 +273,9 @@ events.push(function() {
 	// (Or display an appropriate error message)
 	var ajaxRequest;
 
+	$('#legend').hide();
+	$('#nopkg').hide();
+
 	$.ajax({
 		url: "/pkg_mgr_installed.php",
 		type: "post",
@@ -276,7 +283,6 @@ events.push(function() {
 		success: function(data) {
 			if (data == "error") {
 				$('#waitmsg').hide();
-				$('#nopkg').hide();
 				$('#errmsg').show();
 			} else if (data == "nopkg") {
 				$('#waitmsg').hide();
@@ -284,11 +290,11 @@ events.push(function() {
 				$('#errmsg').hide();
 			} else {
 				$('#pkgtbl').html(data);
+				$('#legend').show();
 			}
 		},
 		error: function() {
 			$('#waitmsg').hide();
-			$('#nopkg').hide();
 			$('#errmsg').show();
 		}
 	});