From c23d87277db3adecc5c09c9531ee5e4aae8cad15 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Thu, 23 Oct 2014 19:59:49 +0200 Subject: Update WebAdmin All files have been updated to the latest version off the new WebAdmin look. --- MCServer/webadmin/(original).html | 8 +- MCServer/webadmin/files/guest.html | 5 + MCServer/webadmin/files/header.png | Bin 0 -> 221 bytes MCServer/webadmin/files/home.gif | Bin 0 -> 1026 bytes MCServer/webadmin/files/loading.gif | Bin 0 -> 7364 bytes MCServer/webadmin/files/log_out.png | Bin 0 -> 995 bytes MCServer/webadmin/files/login.css | 442 +++++++++++++ MCServer/webadmin/files/login.gif | Bin 0 -> 586 bytes MCServer/webadmin/files/logo_login.png | Bin 0 -> 18057 bytes MCServer/webadmin/files/pmfolder.gif | Bin 0 -> 995 bytes MCServer/webadmin/files/style.css | 1063 ++++++++++++++++++++++++------ MCServer/webadmin/files/sub_pmfolder.gif | Bin 0 -> 1022 bytes MCServer/webadmin/files/tcat.png | Bin 0 -> 183 bytes MCServer/webadmin/files/thead.png | Bin 0 -> 132 bytes MCServer/webadmin/login_template.html | 78 ++- MCServer/webadmin/temp.html | 100 +++ MCServer/webadmin/template.html | 261 ++++---- MCServer/webadmin/template.lua | 143 ++-- 18 files changed, 1699 insertions(+), 401 deletions(-) create mode 100644 MCServer/webadmin/files/guest.html create mode 100644 MCServer/webadmin/files/header.png create mode 100644 MCServer/webadmin/files/home.gif create mode 100644 MCServer/webadmin/files/loading.gif create mode 100644 MCServer/webadmin/files/log_out.png create mode 100644 MCServer/webadmin/files/login.css create mode 100644 MCServer/webadmin/files/login.gif create mode 100644 MCServer/webadmin/files/logo_login.png create mode 100644 MCServer/webadmin/files/pmfolder.gif create mode 100644 MCServer/webadmin/files/sub_pmfolder.gif create mode 100644 MCServer/webadmin/files/tcat.png create mode 100644 MCServer/webadmin/files/thead.png create mode 100644 MCServer/webadmin/temp.html diff --git a/MCServer/webadmin/(original).html b/MCServer/webadmin/(original).html index 673a93ada..239a255e5 100644 --- a/MCServer/webadmin/(original).html +++ b/MCServer/webadmin/(original).html @@ -1,7 +1,7 @@ - + {TITLE} -
- -

MCServer - WebAdmin

-
- -
-
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + +
+
+ Welcome Guest +
+
+
+ +
+
+
+
+
+ - + \ No newline at end of file diff --git a/MCServer/webadmin/temp.html b/MCServer/webadmin/temp.html new file mode 100644 index 000000000..697bf6276 --- /dev/null +++ b/MCServer/webadmin/temp.html @@ -0,0 +1,100 @@ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Menu
User CP Home
+
[-]
+
Messenger
+
Compose
+ + + + +
Tracking
Edit Folders
+
[-]
+
Your Profile
+
+ + + + + + + + +
Edit Options
+
[-]
+
Miscellaneous
+
Group Memberships
Buddy/Ignore List
Manage Attachments
Saved Drafts
Subscribed Threads
Forum Subscriptions
View Profile
+ 		+ + + + + + + + + + +
Your Account Summary
ambushed01
 + ambushed01
+ Posts: 25 (4.3 per day | 0.16 percent of total posts)
+ + Reputation: 0 [Details]
+ + Email: arianroeloffzen@gmail.com
+ Registration Date: 10-10-2014, 09:07 PM
+ Primary User Group: Registered
+ + Members Referred: 0
+
To refer a member to this board, direct them to http://forum.mc-server.org/member.php?action=register&referrer=2273 + +
+
\ No newline at end of file diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index b0864e35d..822f73857 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -1,140 +1,129 @@ - - {TITLE} | {PLUGIN_NAME} - - - - - - -
- - Login: {USERNAME} - -
-
- -
- -
- {CONTENT} -
-
-

MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.

-

Web Design by

-
+ + {TITLE} | {PLUGIN_NAME} + + + + + + + +
+ Login: {USERNAME}
+
+ +
+ +
+ {CONTENT}
- +

MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.

Web Design by Tiger

+
+ diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index 84a50b055..1b2f18246 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -23,30 +23,11 @@ end function GetDefaultPage() local PM = cRoot:Get():GetPluginManager() - local SubTitle = "Current Game" + local SubTitle = "Home" local Content = "" - Content = Content .. "

Server Name:

" - Content = Content .. "

" .. cRoot:Get():GetServer():GetServerID() .. "

" + Content = Content .. "

Home Home Home

    I have no idea what this content should do.
" - Content = Content .. "

Plugins:

    " - local AllPlugins = PM:GetAllPlugins() - for key,value in pairs(AllPlugins) do - if( value ~= nil and value ~= false ) then - Content = Content .. "
  • " .. key .. " V." .. value:GetVersion() .. "
    • " - end - end - - Content = Content .. "
" - Content = Content .. "

Players:

    " - - local AddPlayerToTable = function( Player ) - Content = Content .. "
  • " .. Player:GetName() .. "
    • " - end - cRoot:Get():ForEachPlayer( AddPlayerToTable ) - - Content = Content .. "

"; - return Content, SubTitle end @@ -83,20 +64,47 @@ function ShowPage(WebAdmin, TemplateRequest) Output([[ - - -]] .. Title .. [[ - - + ]] .. Title .. [[ + + + + + -
-
- MCServer -
- + ]]) -- cgit v1.2.3 From 8d941212edaba3635e9d558f6c4a27e603b905ef Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Thu, 23 Oct 2014 20:55:49 +0200 Subject: Update guest.html --- MCServer/webadmin/files/guest.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MCServer/webadmin/files/guest.html b/MCServer/webadmin/files/guest.html index 28c3cdbf9..1230a8c01 100644 --- a/MCServer/webadmin/files/guest.html +++ b/MCServer/webadmin/files/guest.html @@ -2,4 +2,4 @@ Hello Admin, this is a welcome message. You will see this because you didn't cha To change the welcome message go to file: files/guest.html and change it!.

-This file is using html, for more information see: http://www.w3schools.com \ No newline at end of file +This file is written in HTML, for more information see: http://www.w3schools.com -- cgit v1.2.3 From 811c10625ab49b84a2e914ab8766bbbb0b303512 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Thu, 23 Oct 2014 20:59:00 +0200 Subject: Update style.css --- MCServer/webadmin/files/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index dfdbe4559..12db60a9f 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1021,4 +1021,4 @@ button:disabled, input:disabled{ border:none!important; color:#fff!important; background-color:#ccc!important; -} \ No newline at end of file +} -- cgit v1.2.3 From 1c58137ef0b46eb1ecdbdca6ff68203c7ef3f092 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Thu, 23 Oct 2014 21:02:02 +0200 Subject: Update (original).html --- MCServer/webadmin/(original).html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MCServer/webadmin/(original).html b/MCServer/webadmin/(original).html index 239a255e5..673a93ada 100644 --- a/MCServer/webadmin/(original).html +++ b/MCServer/webadmin/(original).html @@ -1,7 +1,7 @@ - + {TITLE} - - - - - - -
- Login: {USERNAME}
-
- -
- -
- {CONTENT} + + {TITLE} | {PLUGIN_NAME} + + + + + + +
+ + Login: {USERNAME} + +
+
+ +
+ +
+ {CONTENT} +
+
+

MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.

+

Web Design by

+
-

MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.

Web Design by Tiger

-
- + -- cgit v1.2.3 From bc1a98b2db6de29826ab8bd0282671fbc9eb13b8 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Mon, 27 Oct 2014 18:45:41 +0100 Subject: Update template.lua Removed FusionCare link, change position for "Current time JS", Compression Ratio: 31% (HTML) --- MCServer/webadmin/template.lua | 165 +++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 90 deletions(-) diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index fe04c00ca..baca461b0 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -64,47 +64,44 @@ function ShowPage(WebAdmin, TemplateRequest) Output([[ - ]] .. Title .. [[ - - - - +]] .. Title .. [[ + + + + - -
-
-
-
- -
-
-
-
-
- -
Welcome back, ]] .. TemplateRequest.Request.Username .. [[
-
-
-
-
-
-
- - - - + + +
- - - - - - - - -
Menu
Home
Server Management
+
+
+
+
+ +
+
+
+
+
+ +
Welcome back, ]] .. TemplateRequest.Request.Username .. [[
+
+
+
+
+
+
+ + + - - - -
+ + + + + + + + -
Menu
Home
Server Management
]]) @@ -125,57 +122,45 @@ function ShowPage(WebAdmin, TemplateRequest) Output([[
- 		- - - - - - - -
]] .. SubTitle .. [[
- ]] .. PageContent .. [[ -
-
-
-
-
- - - - +
+		 + + + + + + + +
]] .. SubTitle .. [[
+]] .. PageContent .. [[ +
+
+
+
+
+ + ]]) return table.concat(SiteContent) -- cgit v1.2.3 From d0a47d9273d7254c82fb5c780ef28c58c1d1e306 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Mon, 27 Oct 2014 19:13:25 +0100 Subject: Update template.lua --- MCServer/webadmin/template.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index baca461b0..d6ac2e94c 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -82,9 +82,11 @@ function ShowPage(WebAdmin, TemplateRequest)
-
Welcome back, ]] .. TemplateRequest.Request.Username .. [[
+
Welcome back, ]] .. TemplateRequest.Request.Username .. [[    Log Out
@@ -101,7 +103,7 @@ function ShowPage(WebAdmin, TemplateRequest) Home -
Server Management
+
Server Management
]]) @@ -145,9 +147,11 @@ function ShowPage(WebAdmin, TemplateRequest)
-- cgit v1.2.3 From 1aef54e79339adb7bf7aa0d607cf7c8ab6639c41 Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 19:30:37 +0100 Subject: Update login.css Added licence --- MCServer/webadmin/files/login.css | 1 + 1 file changed, 1 insertion(+) diff --git a/MCServer/webadmin/files/login.css b/MCServer/webadmin/files/login.css index e3c7add74..3a766e1b6 100644 --- a/MCServer/webadmin/files/login.css +++ b/MCServer/webadmin/files/login.css @@ -1 +1,2 @@ +/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ *{margin:0}body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;-webkit-font-smoothing:antialiased;background:#fff url(header.png) repeat-x top left;width:100%;min-width:100%;overflow:hidden}a:link{color:#555;text-decoration:none}a:visited{color:#444;text-decoration:none}a:hover,a:active{color:#000;text-decoration:underline}img{border:none}h1{color:#069}.row1{border-bottom:1px solid #000;height:100px;max-height:100px}.row2{margin:0 auto;text-align:center;vertical-align:middle}.contention{color:#000;text-align:left;line-height:1.4;margin:0;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px}button{background:#fff;color:#000;border:1px solid #ccc;padding:3px;font-family:Tahoma,Verdana,Arial,Sans-Serif;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;margin:-3px 0}button:hover{border-top-color:#28597a;background:#28597a;color:#ccc}button:active{border-top-color:#1b435e;background:#1b435e}.push10{padding-bottom:75px}#panel .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #fff;border-bottom:1px solid #bbb;padding:7px}#footer{z-index:99999}#footer ul.menu{margin:0;padding:0;list-style:none}#footer ul.menu li{margin:0 5px;display:inline}#footer .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #bbb;padding:6px;overflow:hidden;font-size:12px}#footer .upper ul.bottom_links{float:left;margin:3px 0 0 -5px}#footer .lower{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ddd;overflow:hidden;padding:8px;font-size:11px}#footer .lower a:link,#footer .lower a:visited{color:#fff;font-weight:700}#footer .lower a:hover,#footer .lower a:active{color:#fff;font-weight:700}#footer .lower #current_time{float:right;padding-right:6px}.wrapper{width:85%;min-width:970px;max-width:1500px;margin:auto}#footer{position:fixed;left:0;bottom:0;height:60px;width:100%;background:#999;border-top:1px #000 solid}* html #footer{position:absolute;top:expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px')}tr td.trow2:first-child{border-left:0}tr td.trow2:last-child{border-right:0}.tborder{-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px}.thead,.rounded_top{-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-left-radius:6px;-webkit-border-top-right-radius:6px;border-top-left-radius:6px;border-top-right-radius:6px}table{color:#000;font-size:13px}.tborder{background:#fff;width:100%;margin:auto;border:1px solid #ccc;padding:1px}.thead{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-bottom:1px solid #8e8f8f;padding:8px}.trow2{background:#efefef;border:1px solid;border-color:#fff #ddd #ddd #fff}.padtopp{padding-top:25px} -- cgit v1.2.3 From 9c002dc0c896005bf7713ccc7a68a8fa585ad8d9 Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 19:31:06 +0100 Subject: Update style.css Added licence --- MCServer/webadmin/files/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index fad1a5df4..4c38af695 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1 +1,2 @@ +/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ *{margin:0}body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;-webkit-font-smoothing:antialiased;background:#fff;width:100%;min-width:100%;overflow-y:scroll;overflow-x:hidden}a:link{color:#555;text-decoration:none}a:visited{color:#444;text-decoration:none}a:hover,a:active{color:#000;text-decoration:underline}img{border:none}h1{color:#069;text-shadow:2px 2px #000}.row1{border-bottom:1px #000 solid;height:100px;max-height:100px;background:#fff url(header.png) repeat-x top left}.row2{margin:0 auto;text-align:center;vertical-align:middle;margin-top:125px}.contention{color:#000;text-align:left;line-height:1.4;margin:0;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px}.push10{padding-bottom:75px}#panel ul.menu{margin:0;padding:0;list-style:none}#panel ul.menu li{margin:0 5px;display:inline}#panel ul.menu li a{padding-left:20px;background-repeat:no-repeat;background-position:left center}#panel .upper ul.top_links{float:right;font-weight:700}#panel .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #fff;border-bottom:1px solid #bbb;padding:7px}#footer{z-index:99999}#footer ul.menu{margin:0;padding:0;list-style:none}#footer ul.menu li{margin:0 5px;display:inline}#footer .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #bbb;padding:6px;overflow:hidden;font-size:12px}#footer .upper ul.bottom_links{float:left;margin:3px 0 0 -5px}#footer .lower{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ddd;overflow:hidden;padding:8px;font-size:11px}#footer .lower a:link,#footer .lower a:visited{color:#fff;font-weight:700}#footer .lower a:hover,#footer .lower a:active{color:#fff;font-weight:700}#footer .lower #current_time{float:right;padding-right:6px}.wrapper{width:85%;min-width:970px;max-width:1500px;margin:auto}#footer{position:fixed;left:0;bottom:0;height:60px;width:100%;background:#999;border-top:1px #000 solid}* html #footer{position:absolute;top:expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px')}tr td.trow1:first-child,tr td.trow2:first-child{border-left:0}tr td.trow1:last-child,tr td.trow2:last-child{border-right:0}.tborder{-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px}.thead{-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-left-radius:6px;-webkit-border-top-right-radius:6px;border-top-left-radius:6px;border-top-right-radius:6px}table{color:#000;font-size:13px}.tborder{background:#fff;width:100%;margin:auto;border:1px solid #ccc;padding:1px}.thead{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-bottom:1px solid #8e8f8f;padding:8px}.tcat{background:#dcdbdc url(tcat.png) repeat-x;color:#fff;border-bottom:1px solid #bbb;padding:6px;font-size:12px}.trow1{background:#f5f5f5;border:1px solid;border-color:#fff #ddd #ddd #fff}.trow2{background:#efefef;border:1px solid;border-color:#fff #ddd #ddd #fff;padding:15px;box-sizing:border-box;-moz-box-sizing:border-box}.padtopp{padding-top:25px}table{color:#000;font-size:13px;text-align:left}.tborder{background:#fff;width:100%;margin:auto;border:1px solid #ccc;padding:1px}.thead{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-bottom:1px solid #8e8f8f;padding:8px}.tcat{background:#dcdbdc url(tcat.png) repeat-x;color:#fff;border-bottom:1px solid #bbb;padding:6px;font-size:12px}.trow1{background:#f5f5f5;border:1px solid;border-color:#fff #ddd #ddd #fff}.trow2{background:#efefef;border:1px solid;border-color:#fff #ddd #ddd #fff}.smalltext{font-size:11px}textarea{background:#fff;color:#000;border:1px solid #ccc;padding:2px;line-height:1.4;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px}select{background:#fff;padding:3px;border:1px solid #ccc;font-family:Tahoma,Verdana,Arial,Sans-Serif}.usercp_nav_item{display:block;padding:1px 0 1px 23px}.usercp_nav_pmfolder{background:url(pmfolder.gif) no-repeat left center}.usercp_nav_sub_pmfolder{padding-left:40px;background:url(sub_pmfolder.gif) no-repeat left center}.usercp_nav_home{background:url(home.gif) no-repeat left center}.pagehead{position:fixed;z-index:99999;top:0;left:0;width:100%}table{width:100%}table th{border-bottom:1px solid rgba(0,0,0,0.12);padding:5px;text-align:left}table tr:nth-child(odd){background-color:rgba(0,0,0,0.015)}p{margin:4px 0;padding:4px 3px}a{text-decoration:none;color:#000;-webkit-transition:color .1s linear;-moz-transition:color .1s linear;transition:color .1s linear}a:hover{color:#888}input[type="text"]{background:#fff;color:#000;border:1px solid #ccc;padding:2px;line-height:1.4;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}input[type="text"]:hover{background-color:#E5E4E2}input[type="text"]:focus{background-color:#E5E4E2}hr{border:none;height:1px;background-color:rgba(0,0,0,0.12)}h4{padding-bottom:10px;margin-bottom:12px;border-bottom:1px solid rgba(0,0,0,0.12)}#ChatDiv{margin-bottom:10px}#ChatMessage{width:92%;margin-right:5px;box-sizing:border-box;-moz-box-sizing:border-box}input[type="submit"]{padding:3px;padding-left:5px;padding-right:5px;cursor:pointer;font-family:Tahoma,Verdana,Arial,Sans-Serif;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background:#f5f5f5;border:1px solid #ccc}input[type="submit"]:hover{background-color:#E5E4E2}button:disabled,input:disabled{padding:3px;padding-left:5px;padding-right:5px;cursor:pointer;font-family:Tahoma,Verdana,Arial,Sans-Serif;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border:none!important;color:#fff!important;background-color:#ccc!important} -- cgit v1.2.3 From 7590d5facf5f7e8945bbfe555552b774f5e31857 Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 19:31:25 +0100 Subject: Update login_template.html Added licence --- MCServer/webadmin/login_template.html | 1 + 1 file changed, 1 insertion(+) diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html index b305e030f..af80470e8 100644 --- a/MCServer/webadmin/login_template.html +++ b/MCServer/webadmin/login_template.html @@ -1,3 +1,4 @@ +/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ MCServer WebAdmin - Login -- cgit v1.2.3 From 738905c84d30072a8801ef6819f858926bab99e0 Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 19:31:51 +0100 Subject: Update template.lua Added licence --- MCServer/webadmin/template.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index d6ac2e94c..fc0d8837a 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -62,6 +62,7 @@ function ShowPage(WebAdmin, TemplateRequest) end Output([[ +/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ ]] .. Title .. [[ -- cgit v1.2.3 From 6d306b9c4e8778afdd2763f2b273509cedca62af Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 23:46:46 +0100 Subject: Update style.css --- MCServer/webadmin/files/style.css | 433 +++++++++++++++++++++++++++++++++++++- 1 file changed, 432 insertions(+), 1 deletion(-) diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index 4c38af695..c3f6849df 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1,2 +1,433 @@ /* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -*{margin:0}body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;-webkit-font-smoothing:antialiased;background:#fff;width:100%;min-width:100%;overflow-y:scroll;overflow-x:hidden}a:link{color:#555;text-decoration:none}a:visited{color:#444;text-decoration:none}a:hover,a:active{color:#000;text-decoration:underline}img{border:none}h1{color:#069;text-shadow:2px 2px #000}.row1{border-bottom:1px #000 solid;height:100px;max-height:100px;background:#fff url(header.png) repeat-x top left}.row2{margin:0 auto;text-align:center;vertical-align:middle;margin-top:125px}.contention{color:#000;text-align:left;line-height:1.4;margin:0;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px}.push10{padding-bottom:75px}#panel ul.menu{margin:0;padding:0;list-style:none}#panel ul.menu li{margin:0 5px;display:inline}#panel ul.menu li a{padding-left:20px;background-repeat:no-repeat;background-position:left center}#panel .upper ul.top_links{float:right;font-weight:700}#panel .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #fff;border-bottom:1px solid #bbb;padding:7px}#footer{z-index:99999}#footer ul.menu{margin:0;padding:0;list-style:none}#footer ul.menu li{margin:0 5px;display:inline}#footer .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #bbb;padding:6px;overflow:hidden;font-size:12px}#footer .upper ul.bottom_links{float:left;margin:3px 0 0 -5px}#footer .lower{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ddd;overflow:hidden;padding:8px;font-size:11px}#footer .lower a:link,#footer .lower a:visited{color:#fff;font-weight:700}#footer .lower a:hover,#footer .lower a:active{color:#fff;font-weight:700}#footer .lower #current_time{float:right;padding-right:6px}.wrapper{width:85%;min-width:970px;max-width:1500px;margin:auto}#footer{position:fixed;left:0;bottom:0;height:60px;width:100%;background:#999;border-top:1px #000 solid}* html #footer{position:absolute;top:expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px')}tr td.trow1:first-child,tr td.trow2:first-child{border-left:0}tr td.trow1:last-child,tr td.trow2:last-child{border-right:0}.tborder{-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px}.thead{-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-left-radius:6px;-webkit-border-top-right-radius:6px;border-top-left-radius:6px;border-top-right-radius:6px}table{color:#000;font-size:13px}.tborder{background:#fff;width:100%;margin:auto;border:1px solid #ccc;padding:1px}.thead{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-bottom:1px solid #8e8f8f;padding:8px}.tcat{background:#dcdbdc url(tcat.png) repeat-x;color:#fff;border-bottom:1px solid #bbb;padding:6px;font-size:12px}.trow1{background:#f5f5f5;border:1px solid;border-color:#fff #ddd #ddd #fff}.trow2{background:#efefef;border:1px solid;border-color:#fff #ddd #ddd #fff;padding:15px;box-sizing:border-box;-moz-box-sizing:border-box}.padtopp{padding-top:25px}table{color:#000;font-size:13px;text-align:left}.tborder{background:#fff;width:100%;margin:auto;border:1px solid #ccc;padding:1px}.thead{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-bottom:1px solid #8e8f8f;padding:8px}.tcat{background:#dcdbdc url(tcat.png) repeat-x;color:#fff;border-bottom:1px solid #bbb;padding:6px;font-size:12px}.trow1{background:#f5f5f5;border:1px solid;border-color:#fff #ddd #ddd #fff}.trow2{background:#efefef;border:1px solid;border-color:#fff #ddd #ddd #fff}.smalltext{font-size:11px}textarea{background:#fff;color:#000;border:1px solid #ccc;padding:2px;line-height:1.4;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px}select{background:#fff;padding:3px;border:1px solid #ccc;font-family:Tahoma,Verdana,Arial,Sans-Serif}.usercp_nav_item{display:block;padding:1px 0 1px 23px}.usercp_nav_pmfolder{background:url(pmfolder.gif) no-repeat left center}.usercp_nav_sub_pmfolder{padding-left:40px;background:url(sub_pmfolder.gif) no-repeat left center}.usercp_nav_home{background:url(home.gif) no-repeat left center}.pagehead{position:fixed;z-index:99999;top:0;left:0;width:100%}table{width:100%}table th{border-bottom:1px solid rgba(0,0,0,0.12);padding:5px;text-align:left}table tr:nth-child(odd){background-color:rgba(0,0,0,0.015)}p{margin:4px 0;padding:4px 3px}a{text-decoration:none;color:#000;-webkit-transition:color .1s linear;-moz-transition:color .1s linear;transition:color .1s linear}a:hover{color:#888}input[type="text"]{background:#fff;color:#000;border:1px solid #ccc;padding:2px;line-height:1.4;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}input[type="text"]:hover{background-color:#E5E4E2}input[type="text"]:focus{background-color:#E5E4E2}hr{border:none;height:1px;background-color:rgba(0,0,0,0.12)}h4{padding-bottom:10px;margin-bottom:12px;border-bottom:1px solid rgba(0,0,0,0.12)}#ChatDiv{margin-bottom:10px}#ChatMessage{width:92%;margin-right:5px;box-sizing:border-box;-moz-box-sizing:border-box}input[type="submit"]{padding:3px;padding-left:5px;padding-right:5px;cursor:pointer;font-family:Tahoma,Verdana,Arial,Sans-Serif;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background:#f5f5f5;border:1px solid #ccc}input[type="submit"]:hover{background-color:#E5E4E2}button:disabled,input:disabled{padding:3px;padding-left:5px;padding-right:5px;cursor:pointer;font-family:Tahoma,Verdana,Arial,Sans-Serif;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border:none!important;color:#fff!important;background-color:#ccc!important} +* { + margin: 0; +} + +body { + font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; + -webkit-font-smoothing: antialiased; + background: #fff; + width: 100%; + min-width: 100%; + overflow-y: scroll; + overflow-x: hidden; +} + +a:link { + color: #555; + text-decoration: none; +} + +a:visited { + color: #444; + text-decoration: none; +} + +a:hover,a:active { + color: #000; + text-decoration: underline; +} + +img { + border: none; +} + +h1 { + color: #069; + text-shadow: 2px 2px #000; +} + +.row1 { + border-bottom: 1px #000 solid; + height: 100px; + max-height: 100px; + background: #fff url(header.png) repeat-x top left; +} + +.row2 { + margin: 0 auto; + text-align: center; + vertical-align: middle; + margin-top: 125px; +} + +.contention { + color: #000; + text-align: left; + line-height: 1.4; + margin: 0; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + font-size: 13px; +} + +.push10 { + padding-bottom: 75px; +} + +#panel ul.menu { + margin: 0; + padding: 0; + list-style: none; +} + +#panel ul.menu li { + margin: 0 5px; + display: inline; +} + +#panel ul.menu li a { + padding-left: 20px; + background-repeat: no-repeat; + background-position: left center; +} + +#panel .upper ul.top_links { + float: right; + font-weight: 700; +} + +#panel .upper { + background: #dcdbdc url(tcat.png) repeat-x; + border-top: 1px solid #fff; + border-bottom: 1px solid #bbb; + padding: 7px; +} + +#footer { + z-index: 99999; +} + +#footer ul.menu { + margin: 0; + padding: 0; + list-style: none; +} + +#footer ul.menu li { + margin: 0 5px; + display: inline; +} + +#footer .upper { + background: #dcdbdc url(tcat.png) repeat-x; + border-top: 1px solid #bbb; + padding: 6px; + overflow: hidden; + font-size: 12px; +} + +#footer .upper ul.bottom_links { + float: left; + margin: 3px 0 0 -5px; +} + +#footer .lower { + background: #a1a2a2 url(thead.png) top left repeat-x; + color: #fff; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ddd; + overflow: hidden; + padding: 8px; + font-size: 11px; +} + +#footer .lower a:link,#footer .lower a:visited { + color: #fff; + font-weight: 700; +} + +#footer .lower a:hover,#footer .lower a:active { + color: #fff; + font-weight: 700; +} + +#footer .lower #current_time { + float: right; + padding-right: 6px; +} + +.wrapper { + width: 85%; + min-width: 970px; + max-width: 1500px; + margin: auto; +} + +#footer { + position: fixed; + left: 0; + bottom: 0; + height: 60px; + width: 100%; + background: #999; + border-top: 1px #000 solid; +} + +* html #footer { + position: absolute; + top: expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px'); +} + +tr td.trow1:first-child,tr td.trow2:first-child { + border-left: 0; +} + +tr td.trow1:last-child,tr td.trow2:last-child { + border-right: 0; +} + +.tborder { + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; +} + +.thead { + -moz-border-radius-topleft: 6px; + -moz-border-radius-topright: 6px; + -webkit-border-top-left-radius: 6px; + -webkit-border-top-right-radius: 6px; + border-top-left-radius: 6px; + border-top-right-radius: 6px; +} + +table { + color: #000; + font-size: 13px; +} + +.tborder { + background: #fff; + width: 100%; + margin: auto; + border: 1px solid #ccc; + padding: 1px; +} + +.thead { + background: #a1a2a2 url(thead.png) top left repeat-x; + color: #fff; + border-bottom: 1px solid #8e8f8f; + padding: 8px; +} + +.tcat { + background: #dcdbdc url(tcat.png) repeat-x; + color: #fff; + border-bottom: 1px solid #bbb; + padding: 6px; + font-size: 12px; +} + +.trow1 { + background: #f5f5f5; + border: 1px solid; + border-color: #fff #ddd #ddd #fff; +} + +.trow2 { + background: #efefef; + border: 1px solid; + border-color: #fff #ddd #ddd #fff; + padding: 15px; + box-sizing: border-box; + -moz-box-sizing: border-box; +} + +.padtopp { + padding-top: 25px; +} + +table { + color: #000; + font-size: 13px; + text-align: left; +} + +.tborder { + background: #fff; + width: 100%; + margin: auto; + border: 1px solid #ccc; + padding: 1px; +} + +.thead { + background: #a1a2a2 url(thead.png) top left repeat-x; + color: #fff; + border-bottom: 1px solid #8e8f8f; + padding: 8px; +} + +.tcat { + background: #dcdbdc url(tcat.png) repeat-x; + color: #fff; + border-bottom: 1px solid #bbb; + padding: 6px; + font-size: 12px; +} + +.trow1 { + background: #f5f5f5; + border: 1px solid; + border-color: #fff #ddd #ddd #fff; +} + +.trow2 { + background: #efefef; + border: 1px solid; + border-color: #fff #ddd #ddd #fff; +} + +.smalltext { + font-size: 11px; +} + +textarea { + background: #fff; + color: #000; + border: 1px solid #ccc; + padding: 2px; + line-height: 1.4; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + font-size: 13px; +} + +select { + background: #fff; + padding: 3px; + border: 1px solid #ccc; + font-family: Tahoma,Verdana,Arial,Sans-Serif; +} + +.usercp_nav_item { + display: block; + padding: 1px 0 1px 23px; +} + +.usercp_nav_pmfolder { + background: url(pmfolder.gif) no-repeat left center; +} + +.usercp_nav_sub_pmfolder { + padding-left: 40px; + background: url(sub_pmfolder.gif) no-repeat left center; +} + +.usercp_nav_home { + background: url(home.gif) no-repeat left center; +} + +.pagehead { + position: fixed; + z-index: 99999; + top: 0; + left: 0; + width: 100%; +} + +table { + width: 100%; +} + +table th { + border-bottom: 1px solid rgba(0,0,0,0.12); + padding: 5px; + text-align: left; +} + +table tr:nth-child(odd) { + background-color: rgba(0,0,0,0.015); +} + +p { + margin: 4px 0; + padding: 4px 3px; +} + +a { + text-decoration: none; + color: #000; + -webkit-transition: color .1s linear; + -moz-transition: color .1s linear; + transition: color .1s linear; +} + +a:hover { + color: #888; +} + +input[type="text"] { + background: #fff; + color: #000; + border: 1px solid #ccc; + padding: 2px; + line-height: 1.4; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + font-size: 13px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +input[type="text"]:hover { + background-color: #E5E4E2; +} + +input[type="text"]:focus { + background-color: #E5E4E2; +} + +hr { + border: none; + height: 1px; + background-color: rgba(0,0,0,0.12); +} + +h4 { + padding-bottom: 10px; + margin-bottom: 12px; + border-bottom: 1px solid rgba(0,0,0,0.12); +} + +#ChatDiv { + margin-bottom: 10px; +} + +#ChatMessage { + width: 92%; + margin-right: 5px; + box-sizing: border-box; + -moz-box-sizing: border-box; +} + +input[type="submit"] { + padding: 3px; + padding-left: 5px; + padding-right: 5px; + cursor: pointer; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + background: #f5f5f5; + border: 1px solid #ccc; +} + +input[type="submit"]:hover { + background-color: #E5E4E2; +} + +button:disabled,input:disabled { + padding: 3px; + padding-left: 5px; + padding-right: 5px; + cursor: pointer; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + border: none!important; + color: #fff!important; + background-color: #ccc!important; +} -- cgit v1.2.3 From 22165559ea3797a3892d6910133af078ec55c8de Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 23:48:02 +0100 Subject: Update login.css --- MCServer/webadmin/files/login.css | 219 +++++++++++++++++++++++++++++++++++++- 1 file changed, 218 insertions(+), 1 deletion(-) diff --git a/MCServer/webadmin/files/login.css b/MCServer/webadmin/files/login.css index 3a766e1b6..659837598 100644 --- a/MCServer/webadmin/files/login.css +++ b/MCServer/webadmin/files/login.css @@ -1,2 +1,219 @@ /* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -*{margin:0}body{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;-webkit-font-smoothing:antialiased;background:#fff url(header.png) repeat-x top left;width:100%;min-width:100%;overflow:hidden}a:link{color:#555;text-decoration:none}a:visited{color:#444;text-decoration:none}a:hover,a:active{color:#000;text-decoration:underline}img{border:none}h1{color:#069}.row1{border-bottom:1px solid #000;height:100px;max-height:100px}.row2{margin:0 auto;text-align:center;vertical-align:middle}.contention{color:#000;text-align:left;line-height:1.4;margin:0;font-family:Tahoma,Verdana,Arial,Sans-Serif;font-size:13px}button{background:#fff;color:#000;border:1px solid #ccc;padding:3px;font-family:Tahoma,Verdana,Arial,Sans-Serif;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;margin:-3px 0}button:hover{border-top-color:#28597a;background:#28597a;color:#ccc}button:active{border-top-color:#1b435e;background:#1b435e}.push10{padding-bottom:75px}#panel .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #fff;border-bottom:1px solid #bbb;padding:7px}#footer{z-index:99999}#footer ul.menu{margin:0;padding:0;list-style:none}#footer ul.menu li{margin:0 5px;display:inline}#footer .upper{background:#dcdbdc url(tcat.png) repeat-x;border-top:1px solid #bbb;padding:6px;overflow:hidden;font-size:12px}#footer .upper ul.bottom_links{float:left;margin:3px 0 0 -5px}#footer .lower{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ddd;overflow:hidden;padding:8px;font-size:11px}#footer .lower a:link,#footer .lower a:visited{color:#fff;font-weight:700}#footer .lower a:hover,#footer .lower a:active{color:#fff;font-weight:700}#footer .lower #current_time{float:right;padding-right:6px}.wrapper{width:85%;min-width:970px;max-width:1500px;margin:auto}#footer{position:fixed;left:0;bottom:0;height:60px;width:100%;background:#999;border-top:1px #000 solid}* html #footer{position:absolute;top:expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px')}tr td.trow2:first-child{border-left:0}tr td.trow2:last-child{border-right:0}.tborder{-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px}.thead,.rounded_top{-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-left-radius:6px;-webkit-border-top-right-radius:6px;border-top-left-radius:6px;border-top-right-radius:6px}table{color:#000;font-size:13px}.tborder{background:#fff;width:100%;margin:auto;border:1px solid #ccc;padding:1px}.thead{background:#a1a2a2 url(thead.png) top left repeat-x;color:#fff;border-bottom:1px solid #8e8f8f;padding:8px}.trow2{background:#efefef;border:1px solid;border-color:#fff #ddd #ddd #fff}.padtopp{padding-top:25px} +* { + margin: 0; +} + +body { + font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; + -webkit-font-smoothing: antialiased; + background: #fff url(header.png) repeat-x top left; + width: 100%; + min-width: 100%; + overflow: hidden; +} + +a:link { + color: #555; + text-decoration: none; +} + +a:visited { + color: #444; + text-decoration: none; +} + +a:hover,a:active { + color: #000; + text-decoration: underline; +} + +img { + border: none; +} + +h1 { + color: #069; +} + +.row1 { + border-bottom: 1px solid #000; + height: 100px; + max-height: 100px; +} + +.row2 { + margin: 0 auto; + text-align: center; + vertical-align: middle; +} + +.contention { + color: #000; + text-align: left; + line-height: 1.4; + margin: 0; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + font-size: 13px; +} + +button { + background: #fff; + color: #000; + border: 1px solid #ccc; + padding: 3px; + font-family: Tahoma,Verdana,Arial,Sans-Serif; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + margin: -3px 0; +} + +button:hover { + border-top-color: #28597a; + background: #28597a; + color: #ccc; +} + +button:active { + border-top-color: #1b435e; + background: #1b435e; +} + +.push10 { + padding-bottom: 75px; +} + +#panel .upper { + background: #dcdbdc url(tcat.png) repeat-x; + border-top: 1px solid #fff; + border-bottom: 1px solid #bbb; + padding: 7px; +} + +#footer { + z-index: 99999; +} + +#footer ul.menu { + margin: 0; + padding: 0; + list-style: none; +} + +#footer ul.menu li { + margin: 0 5px; + display: inline; +} + +#footer .upper { + background: #dcdbdc url(tcat.png) repeat-x; + border-top: 1px solid #bbb; + padding: 6px; + overflow: hidden; + font-size: 12px; +} + +#footer .upper ul.bottom_links { + float: left; + margin: 3px 0 0 -5px; +} + +#footer .lower { + background: #a1a2a2 url(thead.png) top left repeat-x; + color: #fff; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ddd; + overflow: hidden; + padding: 8px; + font-size: 11px; +} + +#footer .lower a:link,#footer .lower a:visited { + color: #fff; + font-weight: 700; +} + +#footer .lower a:hover,#footer .lower a:active { + color: #fff; + font-weight: 700; +} + +#footer .lower #current_time { + float: right; + padding-right: 6px; +} + +.wrapper { + width: 85%; + min-width: 970px; + max-width: 1500px; + margin: auto; +} + +#footer { + position: fixed; + left: 0; + bottom: 0; + height: 60px; + width: 100%; + background: #999; + border-top: 1px #000 solid; +} + +* html #footer { + position: absolute; + top: expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px'); +} + +tr td.trow2:first-child { + border-left: 0; +} + +tr td.trow2:last-child { + border-right: 0; +} + +.tborder { + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; +} + +.thead,.rounded_top { + -moz-border-radius-topleft: 6px; + -moz-border-radius-topright: 6px; + -webkit-border-top-left-radius: 6px; + -webkit-border-top-right-radius: 6px; + border-top-left-radius: 6px; + border-top-right-radius: 6px; +} + +table { + color: #000; + font-size: 13px; +} + +.tborder { + background: #fff; + width: 100%; + margin: auto; + border: 1px solid #ccc; + padding: 1px; +} + +.thead { + background: #a1a2a2 url(thead.png) top left repeat-x; + color: #fff; + border-bottom: 1px solid #8e8f8f; + padding: 8px; +} + +.trow2 { + background: #efefef; + border: 1px solid; + border-color: #fff #ddd #ddd #fff; +} + +.padtopp { + padding-top: 25px; +} -- cgit v1.2.3 From 292d13ad9a42342dc79d3f1ea794f8877264e931 Mon Sep 17 00:00:00 2001 From: Arian Date: Mon, 27 Oct 2014 23:49:26 +0100 Subject: Update login_template.html --- MCServer/webadmin/login_template.html | 166 ++++++++++++++++++++++------------ 1 file changed, 108 insertions(+), 58 deletions(-) diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html index af80470e8..4ab76b36b 100644 --- a/MCServer/webadmin/login_template.html +++ b/MCServer/webadmin/login_template.html @@ -1,68 +1,118 @@ /* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -MCServer WebAdmin - Login - - - + + MCServer WebAdmin - Login + + + + -
-
-
- -
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - -
-
-MCServer WebAdmin -
-
-
- -
-
-
-
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + + + + + + +
+
+ + MCServer WebAdmin + +
+
+
+ +
+
+
+
-- cgit v1.2.3 From c0c1a9ceea0a2231f7365c47cda933dcc18a44ed Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 00:08:29 +0100 Subject: Update template.lua --- MCServer/webadmin/template.lua | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index fc0d8837a..b3c84dee2 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -23,11 +23,30 @@ end function GetDefaultPage() local PM = cRoot:Get():GetPluginManager() - local SubTitle = "Home" + local SubTitle = "Current Game" local Content = "" - Content = Content .. "

Home Home Home

    I have no idea what this content should do.
" + Content = Content .. "

Server Name:

" + Content = Content .. "

" .. cRoot:Get():GetServer():GetServerID() .. "

" + Content = Content .. "

Plugins:

    " + local AllPlugins = PM:GetAllPlugins() + for key,value in pairs(AllPlugins) do + if( value ~= nil and value ~= false ) then + Content = Content .. "
  • " .. key .. " (version " .. value:GetVersion() .. ")
    • " + end + end + + Content = Content .. "
" + Content = Content .. "

Players:

    " + + local AddPlayerToTable = function( Player ) + Content = Content .. "
  • " .. Player:GetName() .. "
    • " + end + cRoot:Get():ForEachPlayer( AddPlayerToTable ) + + Content = Content .. "

"; + return Content, SubTitle end -- cgit v1.2.3 From 9b93cb647d763eaf76c679ba0c5061210c7b1c4d Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 21:40:50 +0100 Subject: Update guest.html --- MCServer/webadmin/files/guest.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MCServer/webadmin/files/guest.html b/MCServer/webadmin/files/guest.html index 9a9fabfcb..7ae78a3f0 100644 --- a/MCServer/webadmin/files/guest.html +++ b/MCServer/webadmin/files/guest.html @@ -1,3 +1,2 @@ -Hello Admin, this is a welcome message.
-You will see this because you didn't change the guest welcome message.
-To change the welcome message go to file: files/guest.html and change it!. +Hello! Welcome to the MCServer WebAdmin.
+This is a default message, edit files/guest.html to add your own custom message. -- cgit v1.2.3 From 3f21c8bb24d106fa157ddc7af721b854e962d5f2 Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 21:41:16 +0100 Subject: Update login.css --- MCServer/webadmin/files/login.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MCServer/webadmin/files/login.css b/MCServer/webadmin/files/login.css index 659837598..2d2a8e9e9 100644 --- a/MCServer/webadmin/files/login.css +++ b/MCServer/webadmin/files/login.css @@ -4,7 +4,7 @@ } body { - font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; -webkit-font-smoothing: antialiased; background: #fff url(header.png) repeat-x top left; width: 100%; -- cgit v1.2.3 From a9f2f2e6344c71b13a7292b9c9303b635fc2b848 Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 21:41:56 +0100 Subject: Update login.css --- MCServer/webadmin/files/login.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MCServer/webadmin/files/login.css b/MCServer/webadmin/files/login.css index 2d2a8e9e9..5d87da4c5 100644 --- a/MCServer/webadmin/files/login.css +++ b/MCServer/webadmin/files/login.css @@ -22,7 +22,7 @@ a:visited { text-decoration: none; } -a:hover,a:active { +a:hover, a:active { color: #000; text-decoration: underline; } @@ -128,12 +128,12 @@ button:active { font-size: 11px; } -#footer .lower a:link,#footer .lower a:visited { +#footer .lower a:link, #footer .lower a:visited { color: #fff; font-weight: 700; } -#footer .lower a:hover,#footer .lower a:active { +#footer .lower a:hover, #footer .lower a:active { color: #fff; font-weight: 700; } @@ -179,7 +179,7 @@ tr td.trow2:last-child { border-radius: 7px; } -.thead,.rounded_top { +.thead, .rounded_top { -moz-border-radius-topleft: 6px; -moz-border-radius-topright: 6px; -webkit-border-top-left-radius: 6px; -- cgit v1.2.3 From a9b152956e9435889a6d9251c89f06274f9389a0 Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 21:51:42 +0100 Subject: Update style.css --- MCServer/webadmin/files/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index c3f6849df..541cd389a 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -4,7 +4,7 @@ } body { - font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; -webkit-font-smoothing: antialiased; background: #fff; width: 100%; @@ -23,7 +23,7 @@ a:visited { text-decoration: none; } -a:hover,a:active { +a:hover, a:active { color: #000; text-decoration: underline; } @@ -168,11 +168,11 @@ h1 { top: expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px'); } -tr td.trow1:first-child,tr td.trow2:first-child { +tr td.trow1:first-child, tr td.trow2:first-child { border-left: 0; } -tr td.trow1:last-child,tr td.trow2:last-child { +tr td.trow1:last-child, tr td.trow2:last-child { border-right: 0; } -- cgit v1.2.3 From c105e6fa03e73d5f6684b6f5659f611c46278bac Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 22:09:11 +0100 Subject: Update login_template.html --- MCServer/webadmin/login_template.html | 172 ++++++++++++---------------------- 1 file changed, 62 insertions(+), 110 deletions(-) diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html index 4ab76b36b..a6a8dea44 100644 --- a/MCServer/webadmin/login_template.html +++ b/MCServer/webadmin/login_template.html @@ -1,118 +1,70 @@ /* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ - + - - MCServer WebAdmin - Login - - - - + MCServer WebAdmin - Login + + + -
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- - - - - - - - - -
-
- - MCServer WebAdmin - -
-
-
- -
-
-
-
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + + + + + + +
+
MCServer WebAdmin
+
+
+ +
+
+
+
-