Skip to content

Commit fc177d6

Browse files
author
Kristan Kenney
committed
Adjust layout of Add User page
1 parent 9c48c20 commit fc177d6

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

‎web/templates/admin/add_user.html‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -62,44 +62,44 @@
6262
</td>
6363
</tr>
6464
<tr>
65-
<td class="vst-text input-label">
66-
<?php print _('Password');?> / <a href="javascript:randomString();" class="generate" ><?php print _('generate');?></a>
65+
<td class="vst-text ">
66+
<?php print _('Contact');?>
6767
</td>
6868
</tr>
6969
<tr>
7070
<td>
71-
<input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>" tabindex="2" /><br />
72-
<meter max="4" id="meter"></meter>
73-
</td>
74-
</tr>
75-
<tr>
76-
<td class="vst-text">
77-
<?php print _('Your password must have at least');?>:
78-
<ul>
79-
<li><?php print _('8 characters long');?></li>
80-
<li><?php print _('1 uppercase & 1 lowercase character');?></li>
81-
<li><?php print _('1 number');?></li>
82-
</ul>
71+
<input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="3" >
8372
</td>
8473
</tr>
8574
<tr>
86-
<td class="vst-text ">
87-
<?php print _('Contact');?>
75+
<td class="vst-text input-label">
76+
<?php print _('Email');?>
8877
</td>
8978
</tr>
9079
<tr>
9180
<td>
92-
<input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="3" >
81+
<input type="text" size="20" class="vst-input" name="v_email" id='v_email' value="<?=htmlentities(trim($v_email, "'"))?>" tabindex="5" >
9382
</td>
9483
</tr>
9584
<tr>
9685
<td class="vst-text input-label">
97-
<?php print _('Email');?>
86+
<?php print _('Password');?> / <a href="javascript:randomString();" class="generate" ><?php print _('generate');?></a>
9887
</td>
9988
</tr>
10089
<tr>
10190
<td>
102-
<input type="text" size="20" class="vst-input" name="v_email" id='v_email' value="<?=htmlentities(trim($v_email, "'"))?>" tabindex="5" >
91+
<input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>" tabindex="2" /><br />
92+
<meter max="4" id="meter"></meter>
93+
</td>
94+
</tr>
95+
<tr>
96+
<td class="vst-text">
97+
<?php print _('Your password must have at least');?>:
98+
<ul>
99+
<li><?php print _('8 characters long');?></li>
100+
<li><?php print _('1 uppercase & 1 lowercase character');?></li>
101+
<li><?php print _('1 number');?></li>
102+
</ul>
103103
</td>
104104
</tr>
105105
<tr>
@@ -108,24 +108,25 @@
108108
</td>
109109
</tr>
110110
<tr>
111-
<td class="vst-text input-label" name="v_package">
112-
<?php print _('Package');?>
111+
<td class="vst-text input-label">
112+
<?php print _('Language');?>
113113
</td>
114-
</tr>
114+
</tr>
115115
<tr>
116116
<td>
117-
<select class="vst-list" name="v_package" tabindex="6" >
117+
<select class="vst-list" name="v_language" tabindex="7" >
118118
<?php
119-
foreach ($data as $key => $value) {
120-
echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
121-
if ((!empty($v_package)) && ( $key == $_POST['v_package'])){
122-
echo 'selected' ;
123-
} else {
124-
if ( $key == 'default'){
125-
echo 'selected' ;
119+
foreach ($languages as $key => $value) {
120+
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
121+
if (( $key == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
122+
echo ' selected' ;
123+
}
124+
if (isset($v_language)){
125+
if ( htmlentities($key) == trim($v_language,"'") ){
126+
echo ' selected' ;
126127
}
127128
}
128-
echo ">".htmlentities($key)."</option>\n";
129+
echo ">".htmlentities($value)."</option>\n";
129130
}
130131
?>
131132
</select>
@@ -145,25 +146,24 @@
145146
</td>
146147
</tr>
147148
<tr>
148-
<td class="vst-text input-label">
149-
<?php print _('Language');?>
149+
<td class="vst-text input-label" name="v_package">
150+
<?php print _('Package');?>
150151
</td>
151-
</tr>
152+
</tr>
152153
<tr>
153154
<td>
154-
<select class="vst-list" name="v_language" tabindex="7" >
155+
<select class="vst-list" name="v_package" tabindex="6" >
155156
<?php
156-
foreach ($languages as $key => $value) {
157-
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
158-
if (( $key == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
159-
echo ' selected' ;
160-
}
161-
if (isset($v_language)){
162-
if ( htmlentities($key) == trim($v_language,"'") ){
163-
echo ' selected' ;
157+
foreach ($data as $key => $value) {
158+
echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
159+
if ((!empty($v_package)) && ( $key == $_POST['v_package'])){
160+
echo 'selected' ;
161+
} else {
162+
if ( $key == 'default'){
163+
echo 'selected' ;
164164
}
165165
}
166-
echo ">".htmlentities($value)."</option>\n";
166+
echo ">".htmlentities($key)."</option>\n";
167167
}
168168
?>
169169
</select>

0 commit comments

Comments
 (0)