Merge pull request #1801 from jaapmarcus/fix/1791-overflow-issues-layout

#1791 Fix over flow issues

web/templates/pages/list_services.html

@@ -8,6 +8,7 @@
 			<?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?>
 				<a href="/list/firewall/" class="ui-button cancel" dir="ltr"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
 			<?php }?>
+            <a href="/list/updates/" class="ui-button cancel" dir="ltr"><i class="fas fa-sync status-icon green"></i><?=_('Updates');?></a>
 			<a href="/list/log/?user=system&token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-history status-icon lightblue"></i><?=_('Logs');?></a>
 			<div class="actions-panel display-inline-block" key-action="js">
 				<a class="data-controls do_servicerestart ui-button danger cancel">
@@ -19,21 +20,13 @@
 				</a>
 			</div>
 		</div>
-		<ul class="context-menu sort-order animated fadeIn" style="display:none;">
-			<li entity="sort-cpu" sort_as_int="1"><span class="name"><?=_('CPU');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-			<li entity="sort-memory" sort_as_int="1"><span class="name"><?=_('Memory');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-			<li entity="sort-name"><span class="name active"><?=_('Name');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
-		</ul>
 		<div class="l-sort-toolbar clearfix">
 			<table>
 				<tr>
-					<td class="sort-by" title="<?=_('Sort items');?>">
-						<?=_('sort by');?>: <span><b><?=_('Name');?> <i class="fas fa-sort-alpha-down"></i></b></span>
-					</td>
 					<td>
 						<form action="/bulk/service/" method="post" id="objects">
 							<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-							<div class="l-select">
+							<div class="l-select" style="width:160px !important;">
 								<select class="" name="action">
 									<option value=""><?=_('apply to selected');?></option>
 									<option value="stop"><?=_('stop');?></option>

web/templates/pages/list_updates.html

@@ -7,32 +7,14 @@
 				if($autoupdate == 'Enabled') {
 					$btn_url = '/delete/cron/autoupdate/?token='.$_SESSION['token'].'';
 					$btn_icon = 'fa-toggle-on status-icon green';
-					$btn_label = 'disable autoupdate';
+					$btn_label = _('Disable autoupdate');
 				} else {
 					$btn_url = '/add/cron/autoupdate/?token='.$_SESSION['token'].'';
 					$btn_icon = 'fa-toggle-off status-icon red';
-					$btn_label = 'enable autoupdate';
+					$btn_label = _('Enable autoupdate');
 				}
 			?>
-			<a class="ui-button cancel" dir="ltr" href="<?=$btn_url;?>"><i class="fas <?=$btn_icon;?>"></i><?=_($btn_label);?></a>
-		</div>
-		<div class="l-sort-toolbar clearfix">
-			<table>
-				<tr>
-					<td>
-						<form action="/bulk/hestia/" method="post" id="objects">
-						<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-						<div class="l-select">
-							<select name="action" id="">
-								<option value=""><?=_('apply to selected');?></option>
-								<option value="update"><?=_('update') ?></option>
-							</select>
-						</div>
-						<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>"><i class="fas fa-arrow-right"></i></button>
-						</form>
-					</td>
-				</tr>
-			</table>
+			<a class="ui-button cancel" dir="ltr" href="<?=$btn_url;?>"><i class="fas <?=$btn_icon;?>"></i><?=$btn_label;?></a>
 		</div>
 	</div>
 </div>