captive: Cleanup logo upload

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-28 14:41:57 +01:00
parent e7d16ea553
commit 810198110e
11 changed files with 24 additions and 23 deletions

View File

@@ -10,6 +10,8 @@ WARNING: translation string unused: Captive invalid logosize
WARNING: translation string unused: Captive invalid_voucher
WARNING: translation string unused: Captive ip
WARNING: translation string unused: Captive logo_set
WARNING: translation string unused: Captive logo_upload
WARNING: translation string unused: Captive logo_upload1
WARNING: translation string unused: Captive nr
WARNING: translation string unused: Captive time
WARNING: translation string unused: Captive voucher
@@ -686,6 +688,8 @@ WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: bytes

View File

@@ -634,14 +634,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -644,14 +644,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -711,14 +711,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -707,14 +707,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -634,14 +634,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -636,14 +636,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -719,14 +719,14 @@ WARNING: untranslated string: Captive err doublevoucher
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive generate coupon
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive logo_upload
WARNING: untranslated string: Captive logo_upload1
WARNING: untranslated string: Captive mac
WARNING: untranslated string: Captive menu
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive voactive
WARNING: untranslated string: Captive vouchervalid
WARNING: untranslated string: Captive vout

View File

@@ -3,6 +3,8 @@
############################################################################
< addon
< Captive genvoucher
< Captive logo_upload
< Captive logo_upload1
< ccd maxclients
< ovpn_fragment
############################################################################

View File

@@ -326,18 +326,13 @@ print<<END;
<input type="color" name="COLOR" value="$settings{'COLOR'}">
</td>
</tr>
END
# Logo Upload
print <<END;
<tr>
<td>
$Lang::tr{'Captive logo_upload'}
<br>
$Lang::tr{'Captive logo_upload1'}
$Lang::tr{'Captive upload logo'}
</td>
<td>
<input type="file" name="logo">
<br>$Lang::tr{'Captive upload logo recommendations'}
</td>
</tr>
END

View File

@@ -35,8 +35,6 @@
'Captive ip' => 'IP Address',
'Captive logo uploaded' => 'Logo uploaded',
'Captive logo_set' => 'Current Logo',
'Captive logo_upload' => 'Upload Logo',
'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
'Captive mac' => 'MAC Address',
'Captive menu' => 'Captive Portal',
'Captive noexpiretime' => 'No valid connection time range given',
@@ -45,6 +43,8 @@
'Captive terms' => 'Terms &amp; Conditions',
'Captive time' => 'Access time post activation (hours)',
'Captive title' => 'Title of Login Page',
'Captive upload logo' => 'Upload Logo',
'Captive upload logo recommendations' => '(PNG or JPEG, recommended 1280x720 pixels)',
'Captive voactive' => 'Active Vouchers',
'Captive voucher' => 'Voucher',
'Captive vouchervalid' => 'Allowed time for this voucher',