Commit Graph

628 Commits

Author SHA1 Message Date
Peter Müller
ea566f8485 fix aesthetic issues in remote.cgi and ship them
Fix some minor cosmetic issues on remote.cgi as well as a typo in
the language files ("sesstions" -> "sessions"). The changes are
listed in "filelists" for Core Update 121.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:49:48 +01:00
Alexander Marx
c07eea1d38 BUG11559: Languagefiles
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-09 14:48:36 +01:00
Peter Müller
e70aa2e0b8 update language files
Add new language strings to the language files.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-05-07 11:37:11 +01:00
Ersan Yildirim
637eee2607 Fix mistakes in Turkish translation
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-04-24 10:46:52 +01:00
Ersan Yildirim
f8bb9b1578 Update Turkish translation and add translation for WIO and squid accounting
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-04-17 09:47:48 +01:00
Michael Tremer
cfa228c2f3 Fix capitalisation of "Root Certificate"
Reported-by: Tom Rymes <trymes@rymes.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Fixes: #10595
2018-02-06 15:45:32 +00:00
Matthias Fischer
80908b44b7 Fixed missing 'Captive' localization string for 'logs.dat'
Added 'Captive' localization string in 'de/en.pl'.

After a fresh install of Core 117, the system log shows a blank line
for 'Captive Portal' entries.

Deleted translation for 'Captive menu' and changed '30-network.menu' accordingly
to avoid duplicate translation strings.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-09 14:14:37 +00:00
Peter Müller
b62299702b update german translations
Correct some grammar errors and unify spelling of interface names (GREEN vs. GRÜN).

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-14 16:45:51 +00:00
Michael Tremer
af183eeb78 IPsec: Allow configuring inactivity timeout when in on-demand mode
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-04 17:31:53 +00:00
Michael Tremer
b429cc66cb captive: Translate times for coupon expiry time
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:11:58 +00:00
Peter Müller
297110d460 add GeoIP and rDNS information to used nameservers
Add GeoIP and rDNS information to DNS nameserver list at netexternal.cgi

Use newly implemented GeoIP function in /var/ipfire/geoip-functions.pl

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-29 12:05:43 +00:00
Peter Müller
2e94e04ec0 add language strings
Add language strings for changed config.dat CGI file.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-28 17:47:49 +00:00
Michael Tremer
1c1babf44b captive: Fix localisations
Voucher was used instead of coupon in English, and Coupon
was used instead of Gutschein in German.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-17 15:11:14 +02:00
Michael Tremer
af6c5929b0 captive: Simplify coupon time selection
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-17 15:05:53 +02:00
Michael Tremer
a54350cdb9 captive: Allow PDF export of coupons
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-16 16:36:24 +02:00
Michael Tremer
027614d2dc Merge branch 'captive-portal' into next 2017-10-04 16:10:07 +01:00
Michael Tremer
0a219160ac captive portal: Allow sessions to expire after 8 hours
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-04 14:21:12 +01:00
Michael Tremer
94e1d35c54 captive: Fix typo in German translation
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
4eecd722b7 Update German translation for captive portal
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
115b5e624e captive: Show message when an invalid coupon code was entered
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
497b910855 captive: Verify that the user actually accepted the terms and conditions
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
aed55ef9f8 captive: Show a message when no coupon code was entered
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
41964aba09 captive: Redesign clients list box
Mostly code cleanup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
a0b271e474 captive: Redesign generated coupons table
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
58fd5dd482 captive: Reformat times
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
810198110e captive: Cleanup logo upload
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
e2752bfe71 captive: Save logo in /var/ipfire/captive
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
278309b9ef captive: Allow selecting the session expiry time for terms
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
297ebdd47b captive: Group settings together and create branding section
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +01:00
Michael Tremer
97b91e8a94 captive: Rename "Voucher" mode to "Coupon"
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +01:00
Michael Tremer
9735e1670a captive: Rename "License" mode to "Terms & Conditions"
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +01:00
Michael Tremer
f8d35875d8 captive: Allow selecting highlight colour in web interface
To be able to customise the access page, we now allow the
user to select a brand colour.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:55:27 +01:00
Michael Tremer
48fb1d3b69 captive: Import new design
This is the new design of the access page of the captive
portal. It is based on the Bootstrap 4 grid system and
reboot but does not use anything else from it.

It is responsive and customisable.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
0806170370 BUG11141: Redesign of configuration website
To improve the user experience, the configuration part of generating new vouchers has been reworked.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
213335372d BUG11140: Captive logo dimensions
Now the min and max logo dimensions are shown in webinterface.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
7ab3f84b2a Improve the wording of the Captive Portal configuration site
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
2d92a4eca4 Update translations
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
52383f583e Captive-Portal: fix some typos and missing dir
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
b32d9e92be Captive-Portal: Add logo upload feature
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:45 +01:00
Alexander Marx
c7e78cc62e Captive-Portal: several design changes
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
e01c5ab71a Captive-Portal: redesign Webinterface
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Alexander Marx
8b92078917 Captive-Portal: add web-part
Introduce new Captive-Portal.
Here we add the menu, apache configuration (vhost), IPFire configuration
website and Captive-Portal Access site. Also the languagefiles are
updated.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
2017-09-22 18:54:03 +01:00
Matthias Fischer
5bb906f7a9 Typo in en.pl
Fixes typo in
http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=15f19ed85ea3e6944c5fea623eca8ef215eae39e

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-20 22:23:21 +01:00
Matthias Fischer
d3790c6a0b wlanap.cgi: Some cosmetics...
- Added missing box heading ('Access Point Configuration') in 'wlanap.cgi'.
- For this to work, added missing string 'wlanap configuration' in translations.
- Changed existing translation strings in 'de.pl' and 'en.pl': 'wlanap' means 'wlan access point', so why is it called
'wlan*ap* access point'?

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-20 22:23:19 +01:00
Peter Müller
3dcf1822e6 update german translations
- Unify translations of various terms.
- Unify translations of week days.
- Correct some typos and grammar errors.
- Modify some phrases which were not fully translated.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-04 12:25:01 +01:00
Michael Tremer
844e542e60 Merge remote-tracking branch 'ms/wlanclient' into next 2017-05-18 11:22:20 +01:00
Michael Tremer
c335b0cd8e index.cgi: Show WiFi properties on front page
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-16 16:02:25 +02:00
Michael Tremer
0628d956a7 WiFi: Show EAP status on wireless client page
This patch adds some status information so that we know what
authentication an access point is using.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-16 15:05:25 +02:00
Gabriel Rolland
a7f7657c4b Italian translations in it.pl after 110
Missing or incorrect translations.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-08 12:10:07 +01:00
Michael Tremer
19f0fa5694 wlan client: Allow configuration of EAP-PEAP and EAP-TTLS on web user interface
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-05 11:17:06 +01:00