From 32602049a8e4edc408a83380cebb1c838cdf4d1e Mon Sep 17 00:00:00 2001 From: Nils Schwabe Date: Fri, 9 May 2014 19:05:13 +0200 Subject: Did some changes on webinterface --- management-interface/css/custom.css | 44 +++++++++++++++++++++++++++++++ management-interface/index.php | 37 ++++++++------------------ management-interface/php/about.inc.php | 9 +++++++ management-interface/php/functions.php | 22 ++++++++++++++++ management-interface/php/home.inc.php | 10 +++++++ management-interface/php/login.inc.php | 14 ++++++++++ management-interface/php/template.inc.php | 8 ++++++ management-interface/php/user.inc.php | 9 +++++++ 8 files changed, 127 insertions(+), 26 deletions(-) create mode 100644 management-interface/php/about.inc.php create mode 100644 management-interface/php/functions.php create mode 100644 management-interface/php/home.inc.php create mode 100644 management-interface/php/login.inc.php create mode 100644 management-interface/php/template.inc.php create mode 100644 management-interface/php/user.inc.php (limited to 'management-interface') diff --git a/management-interface/css/custom.css b/management-interface/css/custom.css index 929aeef..7486fdc 100644 --- a/management-interface/css/custom.css +++ b/management-interface/css/custom.css @@ -1,3 +1,47 @@ + +/* Fix for always scrollbars */ html { overflow-y: scroll; } + +/* Fix for login form */ +.form-signin { + max-width: 330px; + padding: 15px; + margin: 0 auto; +} +.form-adduser { + max-width: 600px; + padding: 10px; + margin: 0 auto; +} +.form-signin .form-signin-heading, +.form-signin .checkbox { + margin-bottom: 10px; +} +.form-signin .checkbox { + font-weight: normal; +} +.form-signin .form-control, +.form-adduser .form-control { + position: relative; + font-size: 16px; + height: auto; + padding: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.form-control:focus { + z-index: 2; +} +.form-signin input[type="text"] { + margin-bottom: -1px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} diff --git a/management-interface/index.php b/management-interface/index.php index ea35e8c..dbd73ce 100755 --- a/management-interface/index.php +++ b/management-interface/index.php @@ -2,6 +2,9 @@ # include important scripts require "./php/settings.php"; +require "./php/functions.php"; + +$include = true; ?> @@ -41,28 +44,16 @@ require "./php/settings.php"; - + ?m=home">
@@ -71,15 +62,9 @@ require "./php/settings.php";
- -
-

Navbar example

-

This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

-

To see the difference between static and fixed top navbars, just scroll.

-

- View navbar docs » -

-
+
diff --git a/management-interface/php/about.inc.php b/management-interface/php/about.inc.php new file mode 100644 index 0000000..57edd01 --- /dev/null +++ b/management-interface/php/about.inc.php @@ -0,0 +1,9 @@ + + +
+

+This website is the interface for the masterserver to do several things. +

+
diff --git a/management-interface/php/functions.php b/management-interface/php/functions.php new file mode 100644 index 0000000..f84c097 --- /dev/null +++ b/management-interface/php/functions.php @@ -0,0 +1,22 @@ + diff --git a/management-interface/php/home.inc.php b/management-interface/php/home.inc.php new file mode 100644 index 0000000..b003336 --- /dev/null +++ b/management-interface/php/home.inc.php @@ -0,0 +1,10 @@ + + +
+

Hello user!

+

+Lorem ipsum dolor sit amet. +

+
diff --git a/management-interface/php/login.inc.php b/management-interface/php/login.inc.php new file mode 100644 index 0000000..9d92195 --- /dev/null +++ b/management-interface/php/login.inc.php @@ -0,0 +1,14 @@ + + +
+
+ +
+
diff --git a/management-interface/php/template.inc.php b/management-interface/php/template.inc.php new file mode 100644 index 0000000..6c8bece --- /dev/null +++ b/management-interface/php/template.inc.php @@ -0,0 +1,8 @@ + + +
+

+

+
diff --git a/management-interface/php/user.inc.php b/management-interface/php/user.inc.php new file mode 100644 index 0000000..5361034 --- /dev/null +++ b/management-interface/php/user.inc.php @@ -0,0 +1,9 @@ + + +
+

+Current users:
+

+
-- cgit v1.2.3-55-g7522