Skip to content

Commit 2a711da

Browse files
author
Kristan Kenney
committed
Adjust style of options on Edit Server page
1 parent 800da87 commit 2a711da

File tree

3 files changed

+106
-62
lines changed

3 files changed

+106
-62
lines changed

web/css/src/themes/default.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3307,10 +3307,11 @@ a.button.cancel {
33073307
letter-spacing: -0.01em;
33083308
border-bottom: 1px solid #ccc;
33093309
cursor: pointer;
3310+
min-width: 379px;
33103311
}
33113312

33123313
.section-hide-button {
3313-
margin-top: 30px;
3314+
margin-top: 32px;
33143315
display: inline-block;
33153316
margin-left: -14px;
33163317
}

web/css/themes/default.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/templates/admin/edit_server.html

Lines changed: 103 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -979,83 +979,123 @@
979979
<td class="vst-text input-label step-left">
980980
<table style="<?php if (empty($v_security_adv)) echo 'display:none;';?>" id="security">
981981
<tr>
982-
<td class="vst-text step-top">
983-
<?php print _('Enable API access');?>
982+
<td class="section-title" onclick="javascript:elementHideShow('security-system-table');">
983+
<?=('System');?>
984984
</td>
985-
</tr>
986-
<tr>
987-
<td>
988-
<select class="vst-list" name="v_api" id="api">
989-
<option value='yes'><?php print _('yes'); ?></option>
990-
<option value='no' <?php if($_SESSION['API'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
991-
</select>
992-
<br><br>
993-
</td>
994-
</tr>
995-
<tr>
996-
<td>
997-
<table id="security_ip" style="<?php if ($_SESSION['API'] == "no") echo 'display:none;';?>">
998-
<tr>
999-
<td class="vst-text input-label">
1000-
<?php print _('Allowed IP addresses for API');?> <span class="optional" style="float:right">1 IP address per line</span>
985+
<td class="section-hide-button">
986+
<a href="javascript:elementHideShow('security-system-table');"><i class="fas fa-minus-square status-icon dim maroon"></i></a>
1001987
</td>
1002988
</tr>
1003989
<tr>
1004990
<td>
1005-
<textarea size="20" class="vst-textinput short" name="v_api_allowed_ip"><?php
1006-
foreach(explode(',',$_SESSION['API_ALLOWED_IP']) as $ip ){
1007-
echo $ip."\n";
1008-
}
1009-
?></textarea>
1010-
<br><br>
1011-
</td>
1012-
</tr>
1013-
</table>
1014-
</td></tr>
1015-
<tr>
1016-
<td class="vst-text input-label">
1017-
<?php print _('Login screen style');?>
1018-
</td>
1019-
</tr>
1020-
<tr>
1021-
<td>
1022-
<select class="vst-list" name="v_login_style">
1023-
<option value='default'><?php print _('Default'); ?></option>
1024-
<option value='old' <?php if($_SESSION['LOGIN_STYLE'] == 'old') echo 'selected' ?> ><?php print _('Old Style'); ?></option>
1025-
</select>
1026-
<br><br>
991+
<table id="security-system-table" style="display: none;">
992+
<tr>
993+
<td class="vst-text step-top">
994+
<?php print _('Enable API access');?>
995+
</td>
996+
</tr>
997+
<tr>
998+
<td>
999+
<select class="vst-list" name="v_api" id="api">
1000+
<option value='yes'><?php print _('yes'); ?></option>
1001+
<option value='no' <?php if($_SESSION['API'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
1002+
</select>
1003+
<br><br>
1004+
</td>
1005+
</tr>
1006+
<tr>
1007+
<td>
1008+
<table id="security_ip" style="<?php if ($_SESSION['API'] == "no") echo 'display:none;';?>">
1009+
<tr>
1010+
<td class="vst-text input-label">
1011+
<?php print _('Allowed IP addresses for API');?> <span class="optional" style="float:right">1 IP address per line</span>
1012+
</td>
1013+
</tr>
1014+
<tr>
1015+
<td>
1016+
<textarea size="20" class="vst-textinput short" name="v_api_allowed_ip"><?php
1017+
foreach(explode(',',$_SESSION['API_ALLOWED_IP']) as $ip ){
1018+
echo $ip."\n";
1019+
}
1020+
?></textarea>
1021+
<br><br>
1022+
</td>
1023+
</tr>
1024+
</table>
1025+
</td></tr>
1026+
<tr>
1027+
<td class="vst-text input-label">
1028+
<?php print _('Login screen style');?>
1029+
</td>
1030+
</tr>
1031+
<tr>
1032+
<td>
1033+
<select class="vst-list" name="v_login_style">
1034+
<option value='default'><?php print _('Default'); ?></option>
1035+
<option value='old' <?php if($_SESSION['LOGIN_STYLE'] == 'old') echo 'selected' ?> ><?php print _('Old Style'); ?></option>
1036+
</select>
1037+
<br><br>
1038+
</td>
1039+
</tr>
1040+
</table>
10271041
</td>
10281042
</tr>
10291043
<? if (($_SESSION['userContext'] === "admin") && ($_SESSION['user'] === 'admin')) {?>
10301044
<tr>
1031-
<td class="vst-text input-label">
1032-
<?php print _('Restrict access to System Administrator account items');?>
1045+
<td class="section-title" onclick="javascript:elementHideShow('security-sysadminprotect-table');">
1046+
<?=('System Administrator Protection');?>
10331047
</td>
1034-
</tr>
1035-
<tr>
1036-
<td>
1037-
<select class="vst-list" name="v_policy_system_protected_admin">
1038-
<option value='yes'><?php print _('yes'); ?></option>
1039-
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?php print _('no'); ?></option>
1040-
</select>
1041-
<br><br>
1042-
</td>
1043-
</tr>
1044-
<tr>
1045-
<td class="vst-text input-label">
1046-
<?php print _('Hide Administrator account from other Administrators');?>
1048+
<td class="section-hide-button">
1049+
<a href="javascript:elementHideShow('security-sysadminprotect-table');"><i class="fas fa-minus-square status-icon dim maroon"></i></a>
10471050
</td>
10481051
</tr>
10491052
<tr>
10501053
<td>
1051-
<select class="vst-list" name="v_policy_system_hide_admin">
1052-
<option value='yes'><?php print _('yes'); ?></option>
1053-
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?php print _('no'); ?></option>
1054-
</select>
1055-
<br><br>
1054+
<table id="security-sysadminprotect-table" class="step-top" style="display: none;">
1055+
<tr>
1056+
<td class="vst-text input-label">
1057+
<?php print _('Restrict access to System Administrator account items');?>
1058+
</td>
1059+
</tr>
1060+
<tr>
1061+
<td>
1062+
<select class="vst-list" name="v_policy_system_protected_admin">
1063+
<option value='yes'><?php print _('yes'); ?></option>
1064+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?php print _('no'); ?></option>
1065+
</select>
1066+
<br><br>
1067+
</td>
1068+
</tr>
1069+
<tr>
1070+
<td class="vst-text input-label">
1071+
<?php print _('Hide Administrator account from other Administrators');?>
1072+
</td>
1073+
</tr>
1074+
<tr>
1075+
<td>
1076+
<select class="vst-list" name="v_policy_system_hide_admin">
1077+
<option value='yes'><?php print _('yes'); ?></option>
1078+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?php print _('no'); ?></option>
1079+
</select>
1080+
<br><br>
1081+
</td>
1082+
</tr>
1083+
</table>
10561084
</td>
10571085
</tr>
10581086
<?}?>
1087+
<tr>
1088+
<td class="section-title" onclick="javascript:elementHideShow('security-policies-table');">
1089+
<?=('Policies');?>
1090+
</td>
1091+
<td class="section-hide-button">
1092+
<a href="javascript:elementHideShow('security-policies-table');"><i class="fas fa-minus-square status-icon dim maroon"></i></a>
1093+
</td>
1094+
</tr>
1095+
<tr>
1096+
<td>
1097+
<table id="security-policies-table" style="display: none;">
1098+
10591099
<tr>
10601100
<td class="vst-text input-label">
10611101
<?php print _('Allow users to edit their account details');?>
@@ -1136,6 +1176,9 @@
11361176
</select>
11371177
<br><br>
11381178
</td>
1179+
</tr>
1180+
</table>
1181+
</td>
11391182
</tr>
11401183
</table>
11411184
</td>

0 commit comments

Comments
 (0)