From 48e166d96e2863bc0391c8c5d92193d5bf445dd1 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 31 Dec 2015 11:21:47 +0100 Subject: [PATCH] license: make it more prominent; improve look --- .../app/models/OPNsense/Base/Menu/Menu.xml | 5 +- .../mvc/app/views/layouts/default.volt | 1 - src/www/foot.inc | 1 - src/www/license.php | 70 +++++++------------ 4 files changed, 30 insertions(+), 47 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml index 2e0369115..566db9141 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml @@ -3,8 +3,9 @@ - - + + + diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt index 1a8ca50e5..130cd80fa 100644 --- a/src/opnsense/mvc/app/views/layouts/default.volt +++ b/src/opnsense/mvc/app/views/layouts/default.volt @@ -167,7 +167,6 @@ diff --git a/src/www/foot.inc b/src/www/foot.inc index e19a56334..55f52803b 100644 --- a/src/www/foot.inc +++ b/src/www/foot.inc @@ -3,7 +3,6 @@
(c) - ()
diff --git a/src/www/license.php b/src/www/license.php index 766873745..0ec65bf23 100644 --- a/src/www/license.php +++ b/src/www/license.php @@ -27,55 +27,39 @@ require_once("guiconfig.inc"); -/* XXX how about a better place in the menu? */ -$menuBreadcrumbs = array( - array('name' => gettext('Lobby')), - array('name' => gettext('License')), -); - include("head.inc"); ?> - + -
-
-
-
-

- - OPNsense® is Copyright © by Deciso B.V.
All rights reserved.
- - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
- - THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- OPNsense is based on FreeBSD
- Copyright © The FreeBSD Project. All rights reserved.
-
- OPNsense is a fork of pfSense® (Copyright © 2004-2014 Electric Sheep Fencing, LLC. All rights reserved.) a fork from m0n0wall® (Copyright © 2002-2013 Manuel Kasper).
-
- OPNsense includes various freely available software packages and ports.
- The current ports are listed here.
-
- The authors of OPNsense would like to thank all contributors for their efforts.
-

-
-
-
+
+
+
+

OPNsense® is Copyright © by Deciso B.V. All rights reserved.

+

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+

  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    2. +
  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

+

THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

OPNsense is based on FreeBSD Copyright © The FreeBSD Project. All rights reserved.

+

OPNsense is a fork of pfSense® (Copyright © 2004-2014 Electric Sheep Fencing, LLC. All rights reserved.) a fork from m0n0wall® (Copyright © 2002-2013 Manuel Kasper).

+

OPNsense includes various freely available software packages and ports. + The incorporated third party tools are listed here.

+

The authors of OPNsense would like to thank all contributors for their efforts.

+
+
+
- +