Commit Graph

166 Commits

Author SHA1 Message Date
Peter Müller
b67e79a4f1 embed background image in redirect template
Embed the IPFire background image into the redirect template
directly via CSS instead of loading it from somewhere else.
This is necessary because of Content Security Policy (CSP).

This patch inserts the base64 encoded image during build so
nothing needs to be updated twice in case background image
changes.

It supersedes first to fourth version of this patch and has
been successfully tested during a clean build.

Fixes #11650

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-10 16:30:09 +01:00
Peter Müller
725396af2c link to HTTPS version of www.ipfire.org in WebUI
Change links to www.ipfire.org in WebUI themes since the website
now uses HTTPS.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-07 16:14:36 +00:00
Peter Müller
dc6ed83537 delete unused dial.cgi file
Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-10 12:22:19 +01:00
Michael Tremer
1f06098ba7 captive-portal: Serve Ubuntu font files locally
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-10-04 12:55:17 +01:00
Michael Tremer
963beecdb8 captive: Fix passing redirection URL
Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 19:00:04 +01:00
Michael Tremer
45b1b7cf65 captive: Do not show checkbox when in coupon mode
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
eb3e3017cb captive: Style any error messages
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
8b0679cc89 captive: Fix some template updates that I forgot
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +01:00
Michael Tremer
8802d70a28 captive: Serve logo through an extra CGI script
This CGI script makes saving the logo easier (especially for
backup purposes).

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:56:04 +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
966971e589 captive: Don't compare action string
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +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
Michael Tremer
a2c26388db captive-portal: Use template engine to render HTML template
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
0a02d9bb0c captive-portal: Move CGI files to CGI directory
Previously the assets directory has ExecCGI privileges
which is not at all required and potentially dangerous.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +01:00
Michael Tremer
d57e8c67bc captive-portal: Code cleanup
No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-09-22 18:54:45 +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
415cbcecfa GUI: Some simple FW-Log cosmetics
I altered 'showrequestfromcountry.dat', 'showrequestfromip.dat' and 'showrequestfromport.dat'
in the same manner as the 'Loggraphs'-Pages in commit

Each 'Details'-page got a unique title.

Furthermore, I added a 'Back'-Button to go back to the previous page. For this, I used
'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropriate image.

'ipinfo.cgi' got a centered 'Back'-Button, too.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-03 17:06:29 +01:00
Michael Tremer
e89b407f88 Fix updated graphs in legacy theme
The images are now a little bigger and will be scaled down
here, but the iframe box never grows bigger than the max.
size of the container.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-03-22 17:22:26 +00:00
Michael Tremer
a249ccd2e4 Improve graphs
The graphs are using an iframe and PNG images where the resolution
did often not fit and the browser had to resize the image. That
led to blurred fonts and hard to read graphs.

This patch increases the size of the box and the image. With that
higher resolution resizing should not be too much of an issue, but
since the sizes of the iframe and image have been aligned should
not even be necessary.

Reported-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-03-15 13:45:05 +00:00
Alf Høgemark
f00699e8bb Change case of the unit "bit" from "Bit" to "bit" in web UI
The correct case for "kilobit" is "kilobit", not "kiloBit".
And the same applies for Mbit, Gbit etc.
Reference is https://en.wikipedia.org/wiki/Kilobit

This commit changes the texts used in the web UI, so
that it correctly displays as "bit", "kbit", "Mbit" etc.

This fixes bugzilla item 10918.

Signed-off-by: Alf Høgemark <alf@i100.no>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-07-20 16:46:23 +01:00
Larsen
a2069a37b8 Link the IPFire logo to ipfire.org
Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-07-29 16:22:06 +01:00
Michael Tremer
905a9dc346 maniac theme: Remove unnecessary Thumbs.db file
Reported-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-06-16 17:08:49 +02:00
Stefan Schantl
f28a284c33 Drop old flag icons. 2015-05-03 21:53:03 +02:00
Stefan Schantl
c98b743c09 firewall.cgi: Dynamically show/hide DNAT and SNAT configure elements.
Fixes #10732.
2015-04-19 01:19:11 +02:00
Michael Tremer
6e8089a94f theme: Fix spacing of version string in footer. 2014-05-10 14:25:36 +02:00
Michael Tremer
2b6c5f2579 ipfire theme: Fix default setting for hostname in title. 2014-03-13 15:43:52 +01:00
Alf Høgemark
480f354d89 ipfire theme: Use div align for center
Revert change to make openbox produce validating html,
when center alignment for box is wanted.

I have not been able to find css solution for
properly aligning the div horisontally.
2014-02-26 18:37:57 +01:00
Alf Høgemark
0f43165084 ipfire theme: Fix align on div, and fix javascript tag
Remove align attribute on div for openbox, rather use
style attribute with text-align, since align attribute
causes html validation warnings, since it is deprecated.

Remove deprecated and useless attribute on javascript tag.
2014-02-22 17:35:46 +01:00
Michael Tremer
2f65e28425 Merge remote-tracking branch 'alfh/bugfix_missing_swapvisibility' into next 2014-02-19 20:48:12 +01:00
Alf Høgemark
a636a76016 ipfire theme: Add missing swapVisibility javascript function
qos.cgi and media.cgi depend on swapVisibility function, this
is defined in each theme, but was missing from the new theme.

Add the function, and implement it using jquery, since jquery
is always present in the new theme.
2014-02-19 18:05:55 +01:00
Alf Høgemark
db3096173d webgui menus: Make top menu item clickable on mobile safari
The menus in the new default theme does not work properly on
ipad and I guess other devices using mobile safari.

The reason is that <a> tags without href is not marked as
clickable by ios, and therefore no css hover effect is applied.

The fix is either to add a href="#" attribute
or a onclick="return true;" atribute on the <a> tag.
I prefer the href solution, since it is a no javascript solution.
2014-02-19 17:30:49 +01:00
Alf Høgemark
2c01f467d9 cgi-bin and themes: Remove language attribute on script tag 2014-02-15 16:11:45 +01:00
Alexander Marx
b1be2de786 NEW THEME: added padding right for TH and TD tags 2014-01-29 14:32:56 +01:00
Alexander Marx
11e012ef66 NEW THEME: added padding-left to all tables <td> because it looks much better 2014-01-29 14:32:50 +01:00
Arne Fitzenreiter
e66d300a43 WebIF: fix gpl accept redirection for elinks.
elinks doesn't like get a 302 redirection after an other.
2014-01-23 19:21:22 +01:00
Michael Tremer
30491c6ac7 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
Conflicts:
	html/html/themes/ipfire/include/css/style.css
2014-01-11 13:08:27 +01:00
Michael Tremer
b5890e7369 theme: Move table styles to bottom of the CSS file. 2014-01-11 13:06:00 +01:00
Michael Tremer
412a1f43ce theme: Make table borders lighter. 2014-01-11 13:04:45 +01:00
Michael Tremer
9c9c9cb613 theme: Fix padding at the top of page header. 2014-01-11 13:03:06 +01:00
Michael Tremer
d0c91170ca theme: Change default font to DejaVu Sans. 2014-01-11 12:58:05 +01:00
Michael Tremer
7fbb771896 theme: Change HTML doctype to HTML5.
This is really not valid HTML5 code, nor is it XHTML 1.1 Strict.
2014-01-11 12:55:30 +01:00
Michael Tremer
1ada718c39 theme: Set width to 960px. 2014-01-11 12:51:21 +01:00
Michael Tremer
68e89a2f28 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen 2014-01-11 12:46:56 +01:00
Michael Tremer
0f9894afa1 theme: Fix size and colouring of the headlines. 2014-01-11 12:45:04 +01:00
Alexander Marx
82f7d1b4d8 Edited stylecss so that TR:first-child td {} has a top border (for firewall rulecreation) 2014-01-11 12:13:32 +01:00
Michael Tremer
c82aa2ec9e theme: Decrease font size of h2 elements. 2014-01-09 18:46:03 +01:00
Michael Tremer
4e36e1791f theme: Fix coding style of the rounded tables. 2014-01-09 12:17:39 +01:00