Skip to content

Commit 84144a4

Browse files
author
Kristan Kenney
committed
Move options in Edit User, adjust Advanced Options button design
1 parent 74dbf60 commit 84144a4

File tree

5 files changed

+127
-116
lines changed

5 files changed

+127
-116
lines changed

‎web/templates/admin/add_dns.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
</tr>
104104
<tr>
105105
<td class="vst-text input-label step-top">
106-
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?>&nbsp;<i class="fas fa-arrow-circle-right"></i></a>
106+
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?></a>
107107
</td>
108108
</tr>
109109
<tr>

‎web/templates/admin/add_mail_acc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</tr>
8989
<tr>
9090
<td class="vst-text">
91-
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print _('Advanced options');?>&nbsp;<i class="fas fa-arrow-circle-right"></i></a>
91+
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print _('Advanced options');?></a>
9292
</td>
9393
</tr>
9494
<tr>

‎web/templates/admin/edit_server_nginx.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</tr>
166166
<tr>
167167
<td class="vst-text input-label">
168-
<a href="javascript:toggleOptions();" class="vst-advanced"><?php print _('Advanced options');?>&nbsp;<i class="fas fa-arrow-circle-right"></i></a>
168+
<a href="javascript:toggleOptions();" class="vst-advanced"><?php print _('Advanced options');?></a>
169169
</td>
170170
</tr>
171171
</table>

‎web/templates/admin/edit_user.html‎

Lines changed: 123 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -178,124 +178,135 @@
178178
</td>
179179
</tr>
180180
<tr>
181-
<td class="vst-text input-label">
182-
<?php print _('SSH Access');?>
181+
<td class="step-top vst-text" style="/*padding: 32px 0 20px 0;*/">
182+
<a href="javascript:elementHideShow('advanced-opts');" class="vst-advanced"><?php print _('Advanced options');?></a>
183183
</td>
184184
</tr>
185185
<tr>
186-
<td>
187-
<select class="vst-list" name="v_shell">
188-
<?php
189-
foreach ($shells as $key => $value) {
190-
echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
191-
$svalue = "'".$value."'";
192-
if (( $value == $v_shell ) || ($svalue == $v_shell )){
193-
echo 'selected' ;
194-
}
195-
echo ">".htmlentities($value)."</option>\n";
196-
}
186+
<td class="step-top">
187+
<table id="advanced-opts" style="display: none;">
188+
<tr>
189+
<td class="vst-text input-label">
190+
<?php print _('SSH Access');?>
191+
</td>
192+
</tr>
193+
<tr>
194+
<td>
195+
<select class="vst-list" name="v_shell">
196+
<?php
197+
foreach ($shells as $key => $value) {
198+
echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
199+
$svalue = "'".$value."'";
200+
if (( $value == $v_shell ) || ($svalue == $v_shell )){
201+
echo 'selected' ;
202+
}
203+
echo ">".htmlentities($value)."</option>\n";
204+
}
205+
?>
206+
</select>
207+
</td>
208+
</tr>
209+
<tr>
210+
<td class="vst-text input-label">
211+
<?php print _('PHP CLI Version');?>
212+
</td>
213+
</tr>
214+
<tr>
215+
<td>
216+
<select class="vst-list" name="v_phpcli">
217+
<?php
218+
foreach ($php_versions as $key => $value) {
219+
$php = explode('-',$value);
220+
echo "\t\t\t\t<option value=\"".$value."\"";
221+
$svalue = "'".$value."'";
222+
if ((!empty($v_phpcli)) && ( $value == $v_phpcli ) || ($svalue == $v_phpcli)){
223+
echo ' selected' ;
224+
}
225+
if ((empty($v_phpcli)) && ($value == DEFAULT_PHP_VERSION)){
226+
echo ' selected' ;
227+
}
228+
echo ">".htmlentities($value)."</option>\n";
229+
}
230+
?>
231+
</select>
232+
</td>
233+
</tr>
234+
<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
235+
<tr>
236+
<td class="vst-text input-label">
237+
<?php print _('Default Name Servers');?>
238+
</td>
239+
</tr>
240+
<tr>
241+
<td>
242+
<input type="text" size="20" class="vst-input" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
243+
<span class="remove-ns additional-control delete vst-advanced button danger"><?=_('delete')?></span>
244+
</td>
245+
</tr>
246+
<tr>
247+
<td>
248+
<input type="text" size="20" class="vst-input" name="v_ns2" value="<?=htmlentities(trim($v_ns2, "'"))?>">
249+
<span class="remove-ns additional-control delete vst-advanced button danger"><?=_('delete')?></span>
250+
</td>
251+
</tr>
252+
<? if($v_ns3)
253+
echo '<tr>
254+
<td>
255+
<input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
256+
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
257+
</td>
258+
</tr>';
259+
260+
if($v_ns4)
261+
echo '<tr>
262+
<td>
263+
<input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
264+
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
265+
</td>
266+
</tr>';
267+
268+
if($v_ns5)
269+
echo '<tr>
270+
<td>
271+
<input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
272+
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
273+
</td>
274+
</tr>';
275+
276+
if($v_ns6)
277+
echo '<tr>
278+
<td>
279+
<input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
280+
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
281+
</td>
282+
</tr>';
283+
284+
if($v_ns7)
285+
echo '<tr>
286+
<td>
287+
<input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
288+
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
289+
</td>
290+
</tr>';
291+
292+
if($v_ns8)
293+
echo '<tr>
294+
<td>
295+
<input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
296+
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
297+
</td>
298+
</tr>';
197299
?>
198-
</select>
199-
</td>
200-
</tr>
201-
<tr>
202-
<td class="vst-text input-label">
203-
<?php print _('PHP CLI Version');?>
204-
</td>
205-
</tr>
206-
<tr>
207-
<td>
208-
<select class="vst-list" name="v_phpcli">
209-
<?php
210-
foreach ($php_versions as $key => $value) {
211-
$php = explode('-',$value);
212-
echo "\t\t\t\t<option value=\"".$value."\"";
213-
$svalue = "'".$value."'";
214-
if ((!empty($v_phpcli)) && ( $value == $v_phpcli ) || ($svalue == $v_phpcli)){
215-
echo ' selected' ;
216-
}
217-
if ((empty($v_phpcli)) && ($value == DEFAULT_PHP_VERSION)){
218-
echo ' selected' ;
219-
}
220-
echo ">".htmlentities($value)."</option>\n";
221-
}
222-
?>
223-
</select>
224-
</td>
225-
</tr>
226-
<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
227-
<tr>
228-
<td class="vst-text input-label">
229-
<?php print _('Default Name Servers');?>
300+
301+
<tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
302+
<td class="step-top-small">
303+
<span class="add-ns-button vst-advanced button"><?=_('Add one more Name Server')?></span>
304+
</td>
305+
</tr>
306+
<?php } ?>
307+
</table>
230308
</td>
231309
</tr>
232-
<tr>
233-
<td>
234-
<input type="text" size="20" class="vst-input" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
235-
<span class="remove-ns additional-control delete vst-advanced button danger"><?=_('delete')?></span>
236-
</td>
237-
</tr>
238-
<tr>
239-
<td>
240-
<input type="text" size="20" class="vst-input" name="v_ns2" value="<?=htmlentities(trim($v_ns2, "'"))?>">
241-
<span class="remove-ns additional-control delete vst-advanced button danger"><?=_('delete')?></span>
242-
</td>
243-
</tr>
244-
<? if($v_ns3)
245-
echo '<tr>
246-
<td>
247-
<input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
248-
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
249-
</td>
250-
</tr>';
251-
252-
if($v_ns4)
253-
echo '<tr>
254-
<td>
255-
<input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
256-
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
257-
</td>
258-
</tr>';
259-
260-
if($v_ns5)
261-
echo '<tr>
262-
<td>
263-
<input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
264-
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
265-
</td>
266-
</tr>';
267-
268-
if($v_ns6)
269-
echo '<tr>
270-
<td>
271-
<input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
272-
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
273-
</td>
274-
</tr>';
275-
276-
if($v_ns7)
277-
echo '<tr>
278-
<td>
279-
<input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
280-
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
281-
</td>
282-
</tr>';
283-
284-
if($v_ns8)
285-
echo '<tr>
286-
<td>
287-
<input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
288-
<span class="remove-ns additional-control delete vst-advanced button danger">'._('delete').'</span>
289-
</td>
290-
</tr>';
291-
?>
292-
293-
<tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
294-
<td class="step-top-small">
295-
<span class="add-ns-button vst-advanced button"><?=_('Add one more Name Server')?></span>
296-
</td>
297-
</tr>
298-
<?php } ?>
299310
</table>
300311
<table class="data-col2"></table>
301312
</td>

‎web/templates/user/edit_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
</tr>
357357
<tr>
358358
<td class="step-top vst-text " style="/*padding: 32px 0 20px 0;*/">
359-
<a href="javascript:elementHideShow('advanced-options-table');" class="vst-advanced"><i class="fas fa-eye status-icon lightblue icon-pad-right"></i><?php print _('Advanced options');?></a>
359+
<a href="javascript:elementHideShow('advanced-options-table');" class="vst-advanced"><?php print _('Advanced options');?></a>
360360
</td>
361361
</tr>
362362
<tr>

0 commit comments

Comments
 (0)