diff options
author | Steve Beaver <sbeaver@netgate.com> | 2017-02-22 09:42:49 -0500 |
---|---|---|
committer | Steve Beaver <sbeaver@netgate.com> | 2017-02-22 09:43:50 -0500 |
commit | 17f622b69c9743f7091864fc9977be14ebfff733 (patch) | |
tree | f0187be34dfddcb41a01e6c8b75f0a4f91eeca0d /src/usr/local/www/pkg_mgr_installed.php | |
parent | aba748830d69b05df8c4a4cee370413c91c32273 (diff) | |
download | pfsense-17f622b69c9743f7091864fc9977be14ebfff733.zip pfsense-17f622b69c9743f7091864fc9977be14ebfff733.tar.gz |
Fixed #7203 by visually separating the legend area
Make legen area fixed rather than AJAX data
Diffstat (limited to 'src/usr/local/www/pkg_mgr_installed.php')
-rw-r--r-- | src/usr/local/www/pkg_mgr_installed.php | 36 |
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 13c77d2..c9f47d9 100644 --- a/src/usr/local/www/pkg_mgr_installed.php +++ b/src/usr/local/www/pkg_mgr_installed.php @@ -184,19 +184,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') . ' '; - $pkgtbl .=' <i class="fa fa-check"></i> = ' . gettext('Current') . ' '; - $pkgtbl .=' </p>'; - $pkgtbl .=' <p>'; - $pkgtbl .=' <i class="fa fa-trash"></i> = ' . gettext('Remove') . ' '; - $pkgtbl .=' <i class="fa fa-info"></i> = ' . gettext('Information') . ' '; - $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; } @@ -227,7 +214,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')?> + <i class="fa fa-check"></i> = <?=gettext('Current')?> + </p> + <p> + <i class="fa fa-trash"></i> = <?=gettext('Remove')?> + <i class="fa fa-info"></i> = <?=gettext('Information')?> + <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[ @@ -237,6 +241,9 @@ events.push(function() { // (Or display an appropriate error message) var ajaxRequest; + $('#legend').hide(); + $('#nopkg').hide(); + $.ajax({ url: "/pkg_mgr_installed.php", type: "post", @@ -244,7 +251,6 @@ events.push(function() { success: function(data) { if (data == "error") { $('#waitmsg').hide(); - $('#nopkg').hide(); $('#errmsg').show(); } else if (data == "nopkg") { $('#waitmsg').hide(); @@ -252,11 +258,11 @@ events.push(function() { $('#errmsg').hide(); } else { $('#pkgtbl').html(data); + $('#legend').show(); } }, error: function() { $('#waitmsg').hide(); - $('#nopkg').hide(); $('#errmsg').show(); } }); |