From eab829ee37b0bf23568cc15e13db72a2abfd35ed Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Wed, 5 Nov 2014 13:45:15 +0100 Subject: Update V1.0.3 WebAdmin Fixes --- MCServer/webadmin/login_template.html | 4 ++-- MCServer/webadmin/temp.html | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 MCServer/webadmin/temp.html (limited to 'MCServer') diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html index a6a8dea44..a4522b015 100644 --- a/MCServer/webadmin/login_template.html +++ b/MCServer/webadmin/login_template.html @@ -1,4 +1,4 @@ -/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ + MCServer WebAdmin - Login @@ -61,7 +61,7 @@
- Current time: + Current time: Copyright © MCServer Team 2014.
diff --git a/MCServer/webadmin/temp.html b/MCServer/webadmin/temp.html deleted file mode 100644 index 8b1378917..000000000 --- a/MCServer/webadmin/temp.html +++ /dev/null @@ -1 +0,0 @@ - -- cgit v1.2.3 From 0fa8c881a6967ea0c97da4852854102da5cd94c0 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Wed, 5 Nov 2014 14:20:03 +0100 Subject: Update V1.0.9 Removed Time, Scroll-Able Header, Resized contention --- MCServer/webadmin/files/style.css | 28 ++++++++------------ MCServer/webadmin/login_template.html | 3 +-- MCServer/webadmin/template.lua | 49 +++++++++++++++++------------------ 3 files changed, 36 insertions(+), 44 deletions(-) (limited to 'MCServer') diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index 541cd389a..7c0671970 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -9,6 +9,8 @@ body { background: #fff; width: 100%; min-width: 100%; + height:100%; + min-height:100%; overflow-y: scroll; overflow-x: hidden; } @@ -48,7 +50,8 @@ h1 { margin: 0 auto; text-align: center; vertical-align: middle; - margin-top: 125px; + margin-top: 25px; + margin-bottom: 25px; } .contention { @@ -58,10 +61,10 @@ h1 { margin: 0; font-family: Tahoma,Verdana,Arial,Sans-Serif; font-size: 13px; + margin-bottom:75px; } -.push10 { - padding-bottom: 75px; +.push25 { } #panel ul.menu { @@ -93,10 +96,6 @@ h1 { padding: 7px; } -#footer { - z-index: 99999; -} - #footer ul.menu { margin: 0; padding: 0; @@ -154,13 +153,14 @@ h1 { } #footer { - position: fixed; - left: 0; - bottom: 0; - height: 60px; + position: fixed; + left:0; + bottom:0; + height: 61px; width: 100%; background: #999; border-top: 1px #000 solid; + border-bottom: 1px #000 solid; } * html #footer { @@ -234,10 +234,6 @@ table { -moz-box-sizing: border-box; } -.padtopp { - padding-top: 25px; -} - table { color: #000; font-size: 13px; @@ -319,8 +315,6 @@ select { } .pagehead { - position: fixed; - z-index: 99999; top: 0; left: 0; width: 100%; diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html index a4522b015..7a8601065 100644 --- a/MCServer/webadmin/login_template.html +++ b/MCServer/webadmin/login_template.html @@ -17,7 +17,7 @@
-
+ @@ -61,7 +61,6 @@
- Current time: Copyright © MCServer Team 2014.
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index 2811d16f8..4d3934da8 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -81,7 +81,7 @@ function ShowPage(WebAdmin, TemplateRequest) end Output([[ -/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ + ]] .. Title .. [[ @@ -90,7 +90,7 @@ function ShowPage(WebAdmin, TemplateRequest) -
+
@@ -110,27 +110,27 @@ function ShowPage(WebAdmin, TemplateRequest)
-
-
- - - -
- - - - - - - - - - - - - - -
Menu
Home
Server Management
+
+
+ + + +
+ + + + + + + + + + + + + + +
Menu
Home
Server Management
]]) @@ -173,7 +173,6 @@ function ShowPage(WebAdmin, TemplateRequest)
- ]]) -- cgit v1.2.3