author: Alexander Harkness <me@bearbin.net> 2014-11-05 20:37:09 +0100
committer: Alexander Harkness <me@bearbin.net> 2014-11-05 20:37:09 +0100
commit: dc401e6ff4ba2500214984a96669e50d20d8cd04 (patch)
tree: 35382048793e012cac45f27091bbc104b15d1091
parent: WebAdmin: Fixed login template destination address. (diff)
parent: Update V1.0.9 (diff)
download: cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar
cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.gz
cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.bz2
cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.lz
cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.xz
cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.zst
cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.zip
4 files changed, 36 insertions, 45 deletions
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 148f39deb..7a8601065 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 */
+<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -->
 <html>
 <head>
 	<title>MCServer WebAdmin - Login</title>
@@ -61,7 +61,6 @@
 	</div>
 	<div class="lower">
 		<div class="wrapper">
-			<span id="current_time"><strong>Current time:</strong> <script type="text/javascript">document.write('Time: <strong><span id="date-time">',new Date().toLocaleString(),"</span></strong>");if(document.getElementById){onload=function(){setInterval("document.getElementById ('date-time').firstChild.data = new Date().toLocaleString()",50)}};</script></span>
 			<span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
 		</div>
 	</div>
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 @@
-
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 */
+<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 -->
 <html>
 <head>
 	<title>]] .. Title .. [[</title>
@@ -90,7 +90,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 	<link rel="icon" href="/favicon.ico">
 </head>
 <body>
-<div class="contention">
+<div class="contention push25">
 	<div class="pagehead">
 		<div class="row1">
 			<div class="wrapper">
@@ -110,27 +110,27 @@ function ShowPage(WebAdmin, TemplateRequest)
 			</div>
 		</div>
 	</div>
-<div class="row2 push10">
-	<div class="wrapper padtopp">
-		<table width="100%" border="0" align="center">
-			<tbody>
-				<tr>
-					<td width="180" valign="top">
-						<table border="0" cellspacing="0" cellpadding="5" class="tborder">
-						<tbody>
-							<tr>
-								<td class="thead"><strong>Menu</strong></td>
-							</tr>
-							<tr>
-								<td class="trow1 smalltext"><a href=']] .. BaseURL .. [[' class='usercp_nav_item usercp_nav_home'>Home</a></td>
-							</tr>
-							<tr>
-								<td class="tcat"><div><span class="smalltext"><strong><font color="#000">Server Management</font></strong></span></div></td>
-							</tr>
-						</tbody>
-						<tbody style="" id="usercppms_e">
-							<tr>
-								<td class="trow1 smalltext">
+	<div class="row2">
+		<div class="wrapper">
+			<table width="100%" border="0" align="center">
+				<tbody>
+					<tr>
+						<td width="180" valign="top">
+							<table border="0" cellspacing="0" cellpadding="5" class="tborder">
+							<tbody>
+								<tr>
+									<td class="thead"><strong>Menu</strong></td>
+								</tr>
+								<tr>
+									<td class="trow1 smalltext"><a href=']] .. BaseURL .. [[' class='usercp_nav_item usercp_nav_home'>Home</a></td>
+								</tr>
+								<tr>
+									<td class="tcat"><div><span class="smalltext"><strong><font color="#000">Server Management</font></strong></span></div></td>
+								</tr>
+							</tbody>
+							<tbody style="" id="usercppms_e">
+								<tr>
+									<td class="trow1 smalltext">
 	]])
 
 
@@ -173,7 +173,6 @@ function ShowPage(WebAdmin, TemplateRequest)
 			</table>
 		</div>
 	</div>
-</div>
 <div id="footer">
 	<div class="upper">
 		<div class="wrapper">
@@ -188,11 +187,11 @@ function ShowPage(WebAdmin, TemplateRequest)
 	</div>
 	<div class="lower">
 		<div class="wrapper">
-			<span id="current_time"><strong>Current time:</strong> <script type="text/javascript">document.write('Time: <strong><span id="date-time">',new Date().toLocaleString(),"</span></strong>");if(document.getElementById){onload=function(){setInterval("document.getElementById ('date-time').firstChild.data = new Date().toLocaleString()",50)}};</script></span>
 			<span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
 		</div>
 	</div>
 </div>
+</div>
 </body>
 </html>
 ]])
author	Alexander Harkness <me@bearbin.net>	2014-11-05 20:37:09 +0100
committer	Alexander Harkness <me@bearbin.net>	2014-11-05 20:37:09 +0100
commit	dc401e6ff4ba2500214984a96669e50d20d8cd04 (patch)
tree	35382048793e012cac45f27091bbc104b15d1091
parent	WebAdmin: Fixed login template destination address. (diff)
parent	Update V1.0.9 (diff)
download	cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.gz cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.bz2 cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.lz cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.xz cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.tar.zst cuberite-dc401e6ff4ba2500214984a96669e50d20d8cd04.zip