Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen

This commit is contained in:
Alexander Marx
2013-10-07 07:25:19 +02:00
32 changed files with 2277 additions and 10629 deletions

View File

@@ -446,7 +446,7 @@ sub showEditBox() {
<table width='100%'>
<tr>
<td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td>
<td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td>
<td width='40%'><input type='text' name='SSID' value="$settings{'SSID'}" size='25'/></td>
<td class='base' width='10%'>$Lang::tr{'enabled'}</td>
<td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
</tr>
@@ -464,7 +464,7 @@ sub showEditBox() {
</tr>
<tr>
<td class='base' width='20%'>$Lang::tr{'wlan client psk'}:&nbsp;</td>
<td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td>
<td width='40%'><input type='password' name='PSK' value="$settings{'PSK'}" size='25'/></td>
<td colspan="2" width='40%'></td>
</tr>
</table>