cleanup settings styling a bit

1 files changed, 87 insertions, 53 deletions

diff --git a/templates/settings.php b/templates/settings.php
index 089555e..f0241fa 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -6,63 +6,97 @@ script('files_antivirus', 'settings');
 	<form id="antivirus" action="#" method="post">
 		<fieldset class="personalblock">
 			<h2><?php p($l->t('Antivirus for Files'));?></h2>
-			<p class="av_mode"><label for="av_mode"><?php p($l->t('Mode'));?></label>
-				<select id="av_mode" name="avMode"><?php print_unescaped(html_select_options(array('executable' => $l->t('ClamAV Executable'), 'daemon' => $l->t('ClamAV Daemon'), 'socket' => $l->t('ClamAV Daemon (Socket)'), 'kaspersky' => $l->t('Kaspersky Daemon')), $_['avMode'])) ?></select>
-			</p>
-		    <p class="av_socket"><label for="av_socket"><?php p($l->t('Socket'));?></label><input type="text" id="av_socket" name="avSocket" value="<?php p($_['avSocket']); ?>" title="<?php p($l->t('Clamav Socket.')).' '.$l->t('Not required in Executable Mode.'); ?>"></p>
-			<p class="av_host"><label for="av_host"><?php p($l->t('Host'));?></label><input type="text" id="av_host" name="avHost" value="<?php p($_['avHost']); ?>" title="<?php p($l->t('Address of Antivirus Host.')). ' ' .$l->t('Not required in Executable Mode.');?>"></p>
-			<p class="av_port"><label for="av_port"><?php p($l->t('Port'));?></label><input type="text" id="av_port" name="avPort" value="<?php p($_['avPort']); ?>" title="<?php p($l->t('Port number of Antivirus Host.')). ' ' .$l->t('Not required in Executable Mode.');?>"></p>
-			<p class="av_stream_max_length">
-				<label for="av_stream_max_length">
-					<?php p($l->t('Stream Length'));?>
-				</label>
-				<input type="text" id="av_stream_max_length" name="avStreamMaxLength" value="<?php p($_['avStreamMaxLength']); ?>"
-					   title="<?php p($l->t('ClamAV StreamMaxLength value in bytes.')). ' ' .$l->t('Not required in Executable Mode.');?>"
-				/>
-				<label for="av_stream_max_length" class="a-left"><?php p($l->t('bytes'))?></label>
-			</p>
-			<p class="av_path">
-				<label for="av_path"><?php p($l->t('Path to clamscan'));?></label><input type="text" id="av_path" name="avPath" value="<?php p($_['avPath']); ?>" title="<?php p($l->t('Path to clamscan executable.')). ' ' .$l->t('Not required in Daemon Mode.');?>" />
-			</p>
-			<p class="av_path">
-				<label for="av_cmd_options"><?php p($l->t('Extra command line options (comma-separated)'));?></label><input type="text" id="av_cmd_options" name="avCmdOptions" value="<?php p($_['avCmdOptions']); ?>" />
-			</p>
-			<p class="av_max_file_size">
-				<label for="av_max_file_size"><?php p($l->t('File size limit, -1 means no limit'));?></label>
-				<input type="text" id="av_max_file_size" name="avMaxFileSize" value="<?php p($_['avMaxFileSize']); ?>"
-					   title="<?php p($l->t('Background scan file size limit in bytes, -1 means no limit'));?>"
-				/>
-				<label for="av_max_file_size" class="a-left"><?php p($l->t('bytes'))?></label>
-			</p>
-			<p class="infected_action"><label for="av_infected_action"><?php p($l->t('When infected files are found during a background scan'));?></label>
-				<select id="av_infected_action" name="avInfectedAction"><?php print_unescaped(html_select_options(array('only_log' => $l->t('Only log'), 'delete' => $l->t('Delete file')), $_['avInfectedAction'])) ?></select>
-			</p>
+			<table>
+				<tr class="av_mode">
+					<td><label for="av_mode"><?php p($l->t('Mode'));?></label></td>
+					<td>
+						<select id="av_mode" name="avMode"><?php print_unescaped(html_select_options([
+								'executable' => $l->t('ClamAV Executable'),
+								'daemon' => $l->t('ClamAV Daemon'),
+								'socket' => $l->t('ClamAV Daemon (Socket)'),
+								'kaspersky' => $l->t('Kaspersky Daemon')],
+								$_['avMode']
+							)) ?></select>
+					</td>
+					<td></td>
+				</tr>
+				<tr class="av_socket">
+					<td><label for="av_socket"><?php p($l->t('Socket'));?></label></td>
+					<td><input type="text" id="av_socket" name="avSocket" value="<?php p($_['avSocket']); ?>" title="<?php p($l->t('Clamav Socket.')).' '.$l->t('Not required in Executable Mode.'); ?>"></td>
+					<td></td>
+				</tr>
+				<tr class="av_host">
+					<td><label for="av_host"><?php p($l->t('Host'));?></label></td>
+					<td><input type="text" id="av_host" name="avHost" value="<?php p($_['avHost']); ?>" title="<?php p($l->t('Address of Antivirus Host.')). ' ' .$l->t('Not required in Executable Mode.');?>"></td>
+					<td></td>
+				</tr>
+				<tr class="av_port">
+					<td><label for="av_port"><?php p($l->t('Port'));?></label></td>
+					<td><input type="text" id="av_port" name="avPort" value="<?php p($_['avPort']); ?>" title="<?php p($l->t('Port number of Antivirus Host.')). ' ' .$l->t('Not required in Executable Mode.');?>"></td>
+					<td></td>
+				</tr>
+				<tr class="av_stream_max_length">
+					<td><label for="av_stream_max_length"><?php p($l->t('Stream Length'));?></label></td>
+					<td>
+					<input type="text" id="av_stream_max_length" name="avStreamMaxLength" value="<?php p($_['avStreamMaxLength']); ?>"
+						   title="<?php p($l->t('ClamAV StreamMaxLength value in bytes.')). ' ' .$l->t('Not required in Executable Mode.');?>"
+					/>
+					</td>
+					<td><label for="av_stream_max_length" class="a-left"><?php p($l->t('bytes'))?></label></td>
+				</tr>
+				<tr class="av_path">
+					<td><label for="av_path"><?php p($l->t('Path to clamscan'));?></label></td>
+					<td><input type="text" id="av_path" name="avPath" value="<?php p($_['avPath']); ?>" title="<?php p($l->t('Path to clamscan executable.')). ' ' .$l->t('Not required in Daemon Mode.');?>" /></td>
+					<td></td>
+				</tr>
+				<tr class="av_path">
+					<td><label for="av_cmd_options"><?php p($l->t('Extra command line options (comma-separated)'));?></label></td>
+					<td><input type="text" id="av_cmd_options" name="avCmdOptions" value="<?php p($_['avCmdOptions']); ?>" /></td>
+					<td></td>
+				</tr>
+				<tr class="av_max_file_size">
+					<td><label for="av_max_file_size"><?php p($l->t('File size limit, -1 means no limit'));?></label></td>
+					<td>
+						<input type="text" id="av_max_file_size" name="avMaxFileSize" value="<?php p($_['avMaxFileSize']); ?>"
+						   title="<?php p($l->t('Background scan file size limit in bytes, -1 means no limit'));?>"
+						/>
+					</td>
+					<td><label for="av_max_file_size" class="a-left"><?php p($l->t('bytes'))?></label></td>
+				</tr>
+				<tr class="infected_action">
+					<td><label for="av_infected_action"><?php p($l->t('When infected files are found during a background scan'));?></label></td>
+					<td><select id="av_infected_action" name="avInfectedAction"><?php print_unescaped(html_select_options(array('only_log' => $l->t('Only log'), 'delete' => $l->t('Delete file')), $_['avInfectedAction'])) ?></select></td>
+					<td></td>
+				</tr>
+			</table>
 			<input id="av_submit" type="submit" value="<?php p($l->t('Save'));?>" />
 			<span id="antivirus_save_msg"></span>
 		</fieldset>
 	</form>
-	<hr />
-	<button id="antivirus-advanced"><?php p($l->t('Advanced')) ?></button>
-	<div class="spoiler">
-		<h3><?php p($l->t('Rules')) ?></h3>
-		<div id="antivirus-buttons">
-			<button id="antivirus-clear"><?php p($l->t('Clear All')) ?></button>
-			<button id="antivirus-reset"><?php p($l->t('Reset to defaults')) ?></button>
+	<div id="antivirus-advanced-wrapper">
+		<hr />
+		<button id="antivirus-advanced"><?php p($l->t('Advanced')) ?></button>
+		<div class="spoiler">
+			<h3><?php p($l->t('Rules')) ?></h3>
+			<div id="antivirus-buttons">
+				<button id="antivirus-clear"><?php p($l->t('Clear All')) ?></button>
+				<button id="antivirus-reset"><?php p($l->t('Reset to defaults')) ?></button>
+			</div>
+			<table id="antivirus-statuses" class="grid">
+				<thead>
+				<tr>
+					<th></th>
+					<th><?php p($l->t('Match by')) ?></th>
+					<th><?php p($l->t('Scanner exit status or signature to search')) ?></th>
+					<th><?php p($l->t('Description')); ?></th>
+					<th><?php p($l->t('Mark as')) ?></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+			<button id="antivirus-add" class="icon-add"><?php p($l->t('Add a rule')) ?></button>
 		</div>
-		<table id="antivirus-statuses" class="grid">
-			<thead>
-			<tr>
-				<th></th>
-				<th><?php p($l->t('Match by')) ?></th>
-				<th><?php p($l->t('Scanner exit status or signature to search')) ?></th>
-				<th><?php p($l->t('Description')); ?></th>
-				<th><?php p($l->t('Mark as')) ?></th>
-				<th></th>
-			</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
-		<button id="antivirus-add" class="icon-add"><?php p($l->t('Add a rule')) ?></button>
 	</div>
 </div>