1
0

Merge pull request #1587 from Ambushed91/WebAdmin

Update V1.0.3
This commit is contained in:
Alexander Harkness 2014-11-05 19:37:09 +00:00
commit dc401e6ff4
4 changed files with 36 additions and 45 deletions

View File

@ -9,6 +9,8 @@ body {
background: #fff; background: #fff;
width: 100%; width: 100%;
min-width: 100%; min-width: 100%;
height:100%;
min-height:100%;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
} }
@ -48,7 +50,8 @@ h1 {
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
margin-top: 125px; margin-top: 25px;
margin-bottom: 25px;
} }
.contention { .contention {
@ -58,10 +61,10 @@ h1 {
margin: 0; margin: 0;
font-family: Tahoma,Verdana,Arial,Sans-Serif; font-family: Tahoma,Verdana,Arial,Sans-Serif;
font-size: 13px; font-size: 13px;
margin-bottom:75px;
} }
.push10 { .push25 {
padding-bottom: 75px;
} }
#panel ul.menu { #panel ul.menu {
@ -93,10 +96,6 @@ h1 {
padding: 7px; padding: 7px;
} }
#footer {
z-index: 99999;
}
#footer ul.menu { #footer ul.menu {
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -155,12 +154,13 @@ h1 {
#footer { #footer {
position: fixed; position: fixed;
left: 0; left:0;
bottom: 0; bottom:0;
height: 60px; height: 61px;
width: 100%; width: 100%;
background: #999; background: #999;
border-top: 1px #000 solid; border-top: 1px #000 solid;
border-bottom: 1px #000 solid;
} }
* html #footer { * html #footer {
@ -234,10 +234,6 @@ table {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
} }
.padtopp {
padding-top: 25px;
}
table { table {
color: #000; color: #000;
font-size: 13px; font-size: 13px;
@ -319,8 +315,6 @@ select {
} }
.pagehead { .pagehead {
position: fixed;
z-index: 99999;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;

View File

@ -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> <html>
<head> <head>
<title>MCServer WebAdmin - Login</title> <title>MCServer WebAdmin - Login</title>
@ -61,7 +61,6 @@
</div> </div>
<div class="lower"> <div class="lower">
<div class="wrapper"> <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> <span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
</div> </div>
</div> </div>

View File

@ -1 +0,0 @@

View File

@ -81,7 +81,7 @@ function ShowPage(WebAdmin, TemplateRequest)
end end
Output([[ 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> <html>
<head> <head>
<title>]] .. Title .. [[</title> <title>]] .. Title .. [[</title>
@ -90,7 +90,7 @@ function ShowPage(WebAdmin, TemplateRequest)
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
</head> </head>
<body> <body>
<div class="contention"> <div class="contention push25">
<div class="pagehead"> <div class="pagehead">
<div class="row1"> <div class="row1">
<div class="wrapper"> <div class="wrapper">
@ -110,8 +110,8 @@ function ShowPage(WebAdmin, TemplateRequest)
</div> </div>
</div> </div>
</div> </div>
<div class="row2 push10"> <div class="row2">
<div class="wrapper padtopp"> <div class="wrapper">
<table width="100%" border="0" align="center"> <table width="100%" border="0" align="center">
<tbody> <tbody>
<tr> <tr>
@ -173,7 +173,6 @@ function ShowPage(WebAdmin, TemplateRequest)
</table> </table>
</div> </div>
</div> </div>
</div>
<div id="footer"> <div id="footer">
<div class="upper"> <div class="upper">
<div class="wrapper"> <div class="wrapper">
@ -188,11 +187,11 @@ function ShowPage(WebAdmin, TemplateRequest)
</div> </div>
<div class="lower"> <div class="lower">
<div class="wrapper"> <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> <span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
</div> </div>
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>
]]) ]])