From 017ba1c32a8f5f43dcf769692ad2ffea497aee5e Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sun, 5 Oct 2014 11:08:10 +0200 Subject: Made WebAdmin design more modern --- MCServer/webadmin/files/style.css | 496 +++++++++++++++++++----------------- MCServer/webadmin/template.lua | 63 ++--- MCServer/webadmin/template_orig.lua | 137 ++++++++++ 3 files changed, 431 insertions(+), 265 deletions(-) create mode 100644 MCServer/webadmin/template_orig.lua (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index e7ffe3999..a1d9993de 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1,326 +1,354 @@ -/* reset CSS */ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; +body, html +{ + font-family: "Open Sans"; padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; + margin: 0; + font-weight: 400; + background-color: #fbe9e7; + color: rgba(0, 0, 0, 0.87); +} + +.light { font-weight: 300; } +.bold { font-weight: 600; } + +#wrapper +{ + background-color: #ff5722; + margin: 40px auto; + width: 99%; + max-width: 1200px; + box-sizing: border-box; + -moz-box-sizing: border-box; + box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.15); + color: rgba(0, 0, 0, 0.87); +} + +.title +{ + font-size: 30pt; + padding: 10px 40px; + text-decoration: none; + color: white; + text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3); + display: block; } -body { - line-height: 1; + +#sidebar +{ + float: left; + width: 20%; } -ol, ul { + +.sideNav +{ list-style: none; -} -blockquote, q { - quotes: none; + background-color: #fafafa; + margin: 20px 0; + padding: 5px 0; + width: 100%; + box-shadow: 1px 0px 10px rgba(0, 0, 0, 0.2); } -/* remember to define focus styles! */ -:focus { - outline: 0; +.sideNav li +{ + padding: 10px; + color: rgba(0, 0, 0, 0.54); } -/* remove textarea resize at Safari */ -textarea { - resize: none; +.sideNav li.link +{ + padding-left: 30px; } -/* remember to highlight inserts somehow! */ -ins { +.sideNav li.link a +{ text-decoration: none; + color: rgba(0, 0, 0, 0.87); } -del { - text-decoration: line-through; -} - -/* tables still need 'cellspacing="0"' in the markup */ -table { - border-collapse: collapse; - border-spacing: 0; -} - -/* - Origional from http://www.perspectived.com/ - Modified by Ben Phelps - Made for FakeTruth - MCServer -*/ - -/* Basic ---------------------------------------- */ - -.clear { clear: both; } - -body { - background: white; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #646464; - text-align: center; +#container +{ + margin: 0; + padding: 0; + overflow: hidden; + background-color: #f5f5f5; } -#wrapper { - text-align: left; - width: 930px; - margin: 0 auto; +#main +{ + float: right; + width: 80%; + padding: 0 15px 20px 15px; + box-sizing: border-box; + -moz-box-sizing: border-box; } -/* Logo ---------------------------------------- */ - -h1 { - margin: 15px 0 10px 5px; - width: 180px; - height: 36px; - background: url(logo.png) no-repeat left top; +.clear +{ + clear: both; } -h1 a { - display: block; - width: 225px; - height: 28px; +table +{ + width: 100%; + border-collapse: collapse; } -h1 span { display: none; } - -a { - color: #646464; +table td +{ + padding: 5px; } -/* Container ---------------------------------------- */ - -#containerHolder { - background: #eee; +table th +{ + border-bottom: 1px solid rgba(0, 0, 0, 0.12); padding: 5px; + text-align: center; } - -#container { - background: #fff url(background.gif) repeat-y left top; - border: 1px solid #ddd; - width: 918px; - +table tr:nth-child(odd) +{ + background-color: rgba(0, 0, 0, 0.015); } -#connectHolder { - background: #eee; - padding: 5px; - margin-bottom:8px; +p +{ + margin: 8px 0; + padding: 8px 3px; } - -#connect { - border: 1px solid #ddd; - background-color: #fff; - padding:5px; - width: 908px; +a +{ + text-decoration: none; + color: #0277bd; + -webkit-transition: color 0.1s linear; + -moz-transition: color 0.1s linear; + transition: color 0.1s linear; } -.pics { - height: 375px; - width: 600px; -} - -.pics img { - padding: 5px; - border: 1px solid #ddd; - background-color: #eee; - width: 600px; - height: 375px; - margin-left: 15px; +a:hover +{ + color: #01579b; } -/* Login -------------------------------------- */ - -#loginLogo { - margin: 0 auto; - margin-top:100px; - width: 180px; - height: 36px; - background-image: url(logo.png); +.welcome-msg +{ + color: rgba(0, 0, 0, 0.54); } -#loginHolder { - background: #eee; - padding: 5px; - width: 310px; - margin: 0 auto; - height: 90px; - margin-top:20px; +.username +{ + text-transform: capitalize; + color: rgba(0, 0, 0, 0.87); } -#login { - padding:10px; - width: 288px; - height: 68px; - border: 1px solid #ddd; - background:#fff; - text-align: left; +a:hover +{ + color: black; } - -/* Sidebar ---------------------------------------- */ - -#sidebar { - width: 179px; - float: left; +input, select +{ + padding: 8px; } -#sidebar .sideNav { width: 179px; } +form +{ + padding: 4px; +} -#sidebar .sideNav li { border-bottom: 1px solid #ddd; width: 179px; } +.info input[type="submit"], .info button, .info input[type="button"], +.warn input[type="submit"], .warn button, .warn input[type="button"], +.err input[type="submit"], .err button, .err input[type="button"] +{ + float: right; +} -#sidebar .sideNav li a { +.err +{ + color: white; display: block; - color: #646464; - background: #f6f6f6; - text-decoration: none; - height: 29px; - line-height: 29px; - padding: 0 19px; - width: 141px; + background-color: #e51c23 !important; + padding: 15px; + line-height: 30px; + min-height: 30px; } -#sidebar .sideNav li a:hover { background: #fdfcf6; } - -#sidebar .sideNav li a.active, #sidebar .sideNav li a.active:hover { - background: #f0f7fa; - color: #c66653; +.err:before +{ + content: "ERROR: "; } -/* Breadcrumb ---------------------------------------- */ - -h2 { - width: 718px; - float: right; - color: #646464; - font-size: 16px; - line-height: 16px; - font-weight: bold; - margin: 20px 0 0 0; - padding: 0 0 10px 0; - border-bottom: 1px solid #ddd; +.warn +{ + color: white; + display: block; + background-color: #ff5722 !important; + padding: 15px; + line-height: 30px; + min-height: 30px; } -h2 a { - color: #646464; - text-decoration: none; +.warn:before +{ + content: "WARNING: "; } -h2 a.active { color: #c66653; } +.info +{ + color: white; + display: block; + background-color: #5677fc !important; + padding: 15px; + line-height: 30px; + min-height: 30px; +} -h2 a:hover { text-decoration: underline; } +.info:before +{ + content: "INFORMATION: "; +} -/* Content ---------------------------------------- */ +#footer .fleft +{ + float: left; +} -#main { - width: 700px; +#footer .fright +{ float: right; - padding: 0 19px 0 0; + text-align: right; } -#main p { - +#footer +{ + margin: 0; padding: 10px; + font-size: 9pt; + color: rgba(255, 255, 255, 0.8); + box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2) inset; +} +#footer a +{ + text-transform: none; + color: white; } -h3 { - font-size: 14px; - line-height: 14px; - font-weight: bold; - color: #5494af; - padding: 0 0 0 10px; - margin: 20px 0 10px; +input[type="submit"], button, input[type="button"] +{ + background-color: #ffc107; + padding: 8px 15px 8px 15px; + margin: 0 2px; + display: inline-block; + text-align: center; + color: black; + box-shadow: 0px 2px 3px rgba(0,0,0,0.2); + border: none; + outline: none; + cursor: pointer; } -h4 { - padding: 0 0 0 10px; - margin: 20px 0 10px; +input[type="submit"]:hover, button:hover, input[type="button"]:hover +{ + background-color: #ffca28; } -#main ul { - padding: 0 0 0 10px; - list-style-type: circle; - list-style-position: inside; +input[type="submit"]:active, button:active, input[type="button"]:active +{ + background-color: #ffd54f; + -webkit-transform: translateY(1px); + -moz-transform: translateY(1px); + transform: translateY(1px); } -#main table { - border-top: 1px solid #ddd; - width: 700px; +hr +{ + border: none; + height: 1px; + background-color: rgba(0, 0, 0, 0.12); } -#main table tr th { - text-align: left; - background: #f6f6f6; - padding: 0px 20px; - height: 20px; - line-height: 20px; - border-bottom: 1px solid #ddd; +h4 +{ + padding-bottom: 10px; + margin-bottom: 12px; + border-bottom: 1px solid rgba(0, 0, 0, 0.12); } -#main table tr td { - background: #f6f6f6; - padding: 0px 20px; - height: 29px; - line-height: 29px; - border-bottom: 1px solid #ddd; + +/**** PAGE SPECIFIC CSS ****/ + +/* remove the * for disabling: */ + +.page-core-server-settings table td +{ + text-align: center; + width: 25%; } -#main table tr.odd td { - background: #fbfbfb; +.page-core-server-settings.no-param table td:nth-child(1) a, +.page-core-server-settings.param-tab-general table td:nth-child(1) a +{ + font-weight: 600; + color: rgba(0, 0, 0, 0.87); } -#main table tr:hover td { background: #fdfcf6; } +.page-core-server-settings.param-tab-monsters table td:nth-child(2) a +{ + font-weight: 600; + color: rgba(0, 0, 0, 0.87); +} -#main table .action { - text-align: right; - padding: 0 20px 0 10px; +.page-core-server-settings.param-tab-worlds table td:nth-child(3) a +{ + font-weight: 600; + color: rgba(0, 0, 0, 0.87); } -#main table tr .action a { margin: 0 0 0 10px; text-decoration: none; color: #9b9b9b; } -#main table tr:hover .action .edit { color: #c5a059; } -#main table tr:hover .action .delete { color: #a02b2b; } -#main table tr:hover .action .view { color: #55a34a; } +.page-core-server-settings.param-tab-world table td:nth-child(4) a +{ + font-weight: 600; + color: rgba(0, 0, 0, 0.87); +} -#main table tr:hover .action a:hover { text-decoration: underline; } +.page-core-permissions form table tr, +.page-core-permissions form table td, +.page-core-permissions form table th +{ + border: none; + background-color: transparent; +} -fieldset { - border: 1px solid #ddd; - padding: 19px; - margin: 0 0 20px 0; - background: #fbfbfb; +.page-core-permissions form table tr:nth-child(1) th +{ + width: 35%; } -form p { margin: 0 0 14px 0; float: left; width: 100%; } +.page-core-permissions form table tr:nth-child(1) td +{ + width: 65%; +} -label { - display: block; +.page-core-permissions form table td input +{ width: 100%; - margin: 0 0 7px 0; - line-height: 12px; + box-sizing: border-box; + -moz-box-sizing: border-box; + margin: 0; } -/* Footer ---------------------------------------- */ +#ChatDiv +{ + margin-bottom: 10px; +} -#footer { - margin: 10px 0 30px 0; - font-size: 11px; - line-height: 11px; - color: #9B9B9B; - padding: 0 0 0 5px; +#ChatMessage +{ + width: 100%; + box-sizing: border-box; + -moz-box-sizing: border-box; } -#footer a { color: #9B9B9B; } -#footer a:hover { text-decoration: none; } +/**/ \ No newline at end of file diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index a7480f83e..84a50b055 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -70,25 +70,33 @@ function ShowPage(WebAdmin, TemplateRequest) PageContent, SubTitle = GetDefaultPage() end + local reqParamsClass = "" + + for key,value in pairs(TemplateRequest.Request.Params) do + reqParamsClass = reqParamsClass .. " param-" .. string.lower(string.gsub(key, "[^a-zA-Z0-9]+", "-") .. "-" .. string.gsub(value, "[^a-zA-Z0-9]+", "-")) + end + + if (string.gsub(reqParamsClass, "%s", "") == "") then + reqParamsClass = " no-param" + end + Output([[ ]] .. Title .. [[ - + + - -
- -

- MCServer -

-
-
-
- + +
- ]]) +]]) return table.concat(SiteContent) end diff --git a/MCServer/webadmin/template_orig.lua b/MCServer/webadmin/template_orig.lua new file mode 100644 index 000000000..a7480f83e --- /dev/null +++ b/MCServer/webadmin/template_orig.lua @@ -0,0 +1,137 @@ +-- Use a table for fast concatenation of strings +local SiteContent = {} +function Output(String) + table.insert(SiteContent, String) +end + + + + + +function GetTableSize(Table) + local Size = 0 + for key,value in pairs(Table) do + Size = Size + 1 + end + return Size +end + + + + + +function GetDefaultPage() + local PM = cRoot:Get():GetPluginManager() + + local SubTitle = "Current Game" + local Content = "" + + Content = Content .. "

Server Name:

" + Content = Content .. "

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

" + + Content = Content .. "

Plugins:

" + Content = Content .. "

Players:


"; + + return Content, SubTitle +end + + + + + +function ShowPage(WebAdmin, TemplateRequest) + SiteContent = {} + local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path) + local Title = "MCServer WebAdmin" + local MemoryUsageKiB = cRoot:GetPhysicalRAMUsage() + local NumChunks = cRoot:Get():GetTotalChunkCount() + local PluginPage = WebAdmin:GetPage(TemplateRequest.Request) + local PageContent = PluginPage.Content + local SubTitle = PluginPage.PluginName + if (PluginPage.TabName ~= "") then + SubTitle = PluginPage.PluginName .. " - " .. PluginPage.TabName + end + if (PageContent == "") then + PageContent, SubTitle = GetDefaultPage() + end + + Output([[ + + + + +]] .. Title .. [[ + + + + +
+ +

+ MCServer +

+
+
+ + + +

Welcome ]] .. TemplateRequest.Request.Username .. [[

+
+

]] .. SubTitle .. [[

+ ]] .. PageContent .. [[ +
+ + +
+ +
+ +
+ + + +
+ + + + ]]) + + return table.concat(SiteContent) +end -- cgit v1.2.3 From 3baacce51e05ea4cc6d7352475b08a35ba8bc2a0 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sun, 5 Oct 2014 11:14:16 +0200 Subject: Added license --- MCServer/webadmin/files/style.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index a1d9993de..3c8c8750f 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1,3 +1,19 @@ +/* + * Copyright 2014 WebFreak001 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + body, html { font-family: "Open Sans"; -- cgit v1.2.3 From 828ded593cad10018dce226541bf782e6f2f545e Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sun, 5 Oct 2014 11:24:54 +0200 Subject: Added newline --- MCServer/webadmin/files/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index 3c8c8750f..5860c00e1 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -366,5 +366,4 @@ h4 -moz-box-sizing: border-box; } - -/**/ \ No newline at end of file +/**/ -- cgit v1.2.3 From cea0707ad5144e698fec6bf6a02174c7f1fd58cd Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sun, 5 Oct 2014 11:35:29 +0200 Subject: Removed my license, added me to CONTRIBUTORS --- MCServer/webadmin/files/style.css | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index 5860c00e1..211f9f9a3 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1,19 +1,3 @@ -/* - * Copyright 2014 WebFreak001 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - body, html { font-family: "Open Sans"; -- cgit v1.2.3 From 7aa81de2c67a3347720c9a5772832577b92a81d6 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sun, 5 Oct 2014 11:48:44 +0200 Subject: added font callback --- MCServer/webadmin/files/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css index 211f9f9a3..7f01b34b2 100644 --- a/MCServer/webadmin/files/style.css +++ b/MCServer/webadmin/files/style.css @@ -1,6 +1,6 @@ body, html { - font-family: "Open Sans"; + font-family: "Open Sans", Tahoma, sans-serif; padding: 0; margin: 0; font-weight: 400; -- cgit v1.2.3 From d3f31b5046ebd2dacfcbeb96f900e12d2bddcad9 Mon Sep 17 00:00:00 2001 From: win32re Date: Sat, 11 Oct 2014 17:40:33 +0200 Subject: Update template.html --- MCServer/webadmin/template.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index 822f73857..50eaa486b 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -51,7 +51,7 @@ table { border-top: 1px solid #ddd; width: 700px; - } + } table tr th { text-align: left; @@ -71,17 +71,23 @@ border: 1px solid #ddd; border-radius: 3px; } - #main table tr.odd td { + + #main table tr.odd td { background: #fbfbfb; } - table tr:hover td { background: #fdfcf6; } + table tr:hover td { + background: #fdfcf6; + } + table .action { text-align: right; padding: 0 20px 0 10px; } - table tr .action a { color: #9b9b9b; } + table tr .action a { + color: #9b9b9b; + } #cssmenu{ height:10px; display:table; padding:0; margin: 0 auto; border:1px #707070 solid; border-radius:5px; } #cssmenu > ul {list-style:inside none; padding:0; margin:0;} -- cgit v1.2.3 From 9bb2b43e9e6994f247659ee48b2225c456f1dde5 Mon Sep 17 00:00:00 2001 From: win32re Date: Sat, 11 Oct 2014 17:57:56 +0200 Subject: More template changes. --- MCServer/webadmin/template.html | 261 ++++++++++++++++++++-------------------- 1 file changed, 130 insertions(+), 131 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index 50eaa486b..addc1806c 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -1,135 +1,134 @@ - - {TITLE} | {PLUGIN_NAME} - - - - - - - -
- Login: {USERNAME}
-
- -
- -
- {CONTENT} -
-

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

Web Design by Tiger

-
- + footer { + font-family: helvetica; + font-size: 10px; + text-align: center; + border-top: 1px #000 dotted; + padding: 1px 0px 1px 0px; + } + + table { + border-collapse: collapse; + border-spacing: 10; + } + + table { + border-top: 1px solid #ddd; + width: 700px; + } + + table tr th { + text-align: left; + background: #f6f6f6; + padding: 0px 20px; + height: 25px; + line-height: 25px; + border: 1px solid #ddd; + border-radius: 3px; + } + + table tr td { + background: #f6f6f6; + padding: 0px 20px; + height: 29px; + line-height: 29px; + border: 1px solid #ddd; + border-radius: 3px; + } + + #main table tr.odd td { + background: #fbfbfb; + } + + table tr:hover td { + background: #fdfcf6; + } + + table .action { + text-align: right; + padding: 0 20px 0 10px; + } + + table tr .action a { + color: #9b9b9b; + } + + #cssmenu{ height:10px; display:table; padding:0; margin: 0 auto; border:1px #707070 solid; border-radius:5px; } + #cssmenu > ul {list-style:inside none; padding:0; margin:0;} + #cssmenu > ul > li {list-style:inside none; padding:0; margin:0; float:left; display:block; position:relative;} + #cssmenu > ul > li > a{ outline:none; display:block; position:relative; color:#E8E8E8; padding:10px 10px; font:bold 13px/100% Arial, Helvetica, sans-serif; text-align:center; text-decoration:none; text-shadow:1px 1px 0 rgba(0,0,0, 0.4); } + #cssmenu > ul > li:first-child > a{border-radius:5px 0 0 5px;} + /* #cssmenu > ul > li > a:after{ content:''; position:absolute; border-right:1px solid #FFFFFF; top:-1px; bottom:-1px; right:-2px; z-index:99; } */ + #cssmenu ul li.has-sub:hover > a:after{top:0; bottom:0;} + #cssmenu > ul > li.has-sub > a:before{ content:''; position:absolute; top:18px; right:6px; border:5px solid transparent; border-top:5px solid #707070; } + #cssmenu > ul > li.has-sub:hover > a:before{top:19px;} + #cssmenu ul li.has-sub:hover > a{ background:#3f3f3f; border-color:#707070; padding-bottom:13px; padding-top:13px; top:-1px; z-index:999; } + #cssmenu ul li.has-sub:hover > ul, #cssmenu ul li.has-sub:hover > div{display:block;} + #cssmenu ul li.has-sub > a:hover{background:#3f3f3f; border-color:#3f3f3f;} + #cssmenu ul li > ul, #cssmenu ul li > div{ display:none; width:auto; position:absolute; top:38px; padding:10px 0; background:#3f3f3f; border-radius:0 0 5px 5px; z-index:999; } + #cssmenu ul li > ul{width:200px;} + #cssmenu ul li > ul li{display:block; list-style:inside none; padding:0; margin:0; position:relative;} + #cssmenu ul li > ul li a{ outline:none; display:block; position:relative; margin:0; padding:8px 20px; font:10pt Arial, Helvetica, sans-serif; color:#fff; text-decoration:none; text-shadow:1px 1px 0 rgba(0,0,0, 0.5); } + #cssmenu, #cssmenu > ul > li > ul > li a:hover{ background:#C8C8C8;} + #cssmenu > ul > li > a { border-right:1px solid #707070; color:#FFFFFF; } + #cssmenu > ul > li > a:after { border-color:#707070; } + #cssmenu > ul > li > a:hover { background:#B8B8B8; } + + + + + + +
+ Login: {USERNAME}
+
+ +
+ +
+ {CONTENT} +
+

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

Web Design by Tiger

+
+ -- cgit v1.2.3 From 59efc7cfd26e3165fde727b4651650054402bae3 Mon Sep 17 00:00:00 2001 From: win32re Date: Sat, 11 Oct 2014 18:07:10 +0200 Subject: Fixed indentation. --- MCServer/webadmin/template.html | 261 ++++++++++++++++++++-------------------- 1 file changed, 131 insertions(+), 130 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index addc1806c..53037be0d 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -1,134 +1,135 @@ - - {TITLE} | {PLUGIN_NAME} - - - - - - -
- Login: {USERNAME}
-
- -
- -
- {CONTENT} -
-

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

Web Design by Tiger

-
- + #maincontent { + padding: 0px 25px 10px 25px; + } + + #wrapper { + min-width: 850px; + width: 75%; + margin: 10px auto; + background-color: white; + border: 4px #888888 solid; + border-radius: 10px; + font-family: Calibri, Trebuchet MS; + } + + header { + text-align:center; + padding: 10px; 0px; + } + + span { + text-align: right; + float: right; + border-left: 2px #C8C8C8 solid; + border-bottom: 2px #C8C8C8 solid; + padding: 2px 10px; + } + + footer { + font-family: helvetica; + font-size: 10px; + text-align: center; + border-top: 1px #000 dotted; + padding: 1px 0px 1px 0px; + } + + table { + border-collapse: collapse; + border-spacing: 10; + } + + table { + border-top: 1px solid #ddd; + width: 700px; + } + + table tr th { + text-align: left; + background: #f6f6f6; + padding: 0px 20px; + height: 25px; + line-height: 25px; + border: 1px solid #ddd; + border-radius: 3px; + } + + table tr td { + background: #f6f6f6; + padding: 0px 20px; + height: 29px; + line-height: 29px; + border: 1px solid #ddd; + border-radius: 3px; + } + + #main table tr.odd td { + background: #fbfbfb; + } + + table tr:hover td { + background: #fdfcf6; + } + + table .action { + text-align: right; + padding: 0 20px 0 10px; + } + + table tr .action a { + color: #9b9b9b; + } + + #cssmenu{ height:10px; display:table; padding:0; margin: 0 auto; border:1px #707070 solid; border-radius:5px; } + #cssmenu > ul {list-style:inside none; padding:0; margin:0;} + #cssmenu > ul > li {list-style:inside none; padding:0; margin:0; float:left; display:block; position:relative;} + #cssmenu > ul > li > a{ outline:none; display:block; position:relative; color:#E8E8E8; padding:10px 10px; font:bold 13px/100% Arial, Helvetica, sans-serif; text-align:center; text-decoration:none; text-shadow:1px 1px 0 rgba(0,0,0, 0.4); } + #cssmenu > ul > li:first-child > a{border-radius:5px 0 0 5px;} + /* #cssmenu > ul > li > a:after{ content:''; position:absolute; border-right:1px solid #FFFFFF; top:-1px; bottom:-1px; right:-2px; z-index:99; } */ + #cssmenu ul li.has-sub:hover > a:after{top:0; bottom:0;} + #cssmenu > ul > li.has-sub > a:before{ content:''; position:absolute; top:18px; right:6px; border:5px solid transparent; border-top:5px solid #707070; } + #cssmenu > ul > li.has-sub:hover > a:before{top:19px;} + #cssmenu ul li.has-sub:hover > a{ background:#3f3f3f; border-color:#707070; padding-bottom:13px; padding-top:13px; top:-1px; z-index:999; } + #cssmenu ul li.has-sub:hover > ul, #cssmenu ul li.has-sub:hover > div{display:block;} + #cssmenu ul li.has-sub > a:hover{background:#3f3f3f; border-color:#3f3f3f;} + #cssmenu ul li > ul, #cssmenu ul li > div{ display:none; width:auto; position:absolute; top:38px; padding:10px 0; background:#3f3f3f; border-radius:0 0 5px 5px; z-index:999; } + #cssmenu ul li > ul{width:200px;} + #cssmenu ul li > ul li{display:block; list-style:inside none; padding:0; margin:0; position:relative;} + #cssmenu ul li > ul li a{ outline:none; display:block; position:relative; margin:0; padding:8px 20px; font:10pt Arial, Helvetica, sans-serif; color:#fff; text-decoration:none; text-shadow:1px 1px 0 rgba(0,0,0, 0.5); } + #cssmenu, #cssmenu > ul > li > ul > li a:hover{ background:#C8C8C8;} + #cssmenu > ul > li > a { border-right:1px solid #707070; color:#FFFFFF; } + #cssmenu > ul > li > a:after { border-color:#707070; } + #cssmenu > ul > li > a:hover { background:#B8B8B8; } + + + + + + +
+ Login: {USERNAME} +
+
+ +
+ +
+ {CONTENT} +
+

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

Web Design by Tiger

+
+ -- cgit v1.2.3 From 0c4894b99ebf8a679a744424452e901e2ef8a8d3 Mon Sep 17 00:00:00 2001 From: win32re Date: Sat, 11 Oct 2014 18:11:56 +0200 Subject: Update template.html --- MCServer/webadmin/template.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index 53037be0d..e0c7e3597 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -116,10 +116,12 @@
- Login: {USERNAME} + + Login: {USERNAME} +
- +
-- cgit v1.2.3 From d9a50dd2eeec80f197b6024b2293d2a71060bc85 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 11 Oct 2014 17:15:38 +0100 Subject: Fixed remaining indent and replaced tiger with webfreak. --- MCServer/webadmin/template.html | 214 ++++++++++++++++++++-------------------- 1 file changed, 107 insertions(+), 107 deletions(-) (limited to 'MCServer/webadmin') diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index e0c7e3597..8bfcc0fbe 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -3,112 +3,112 @@ {TITLE} | {PLUGIN_NAME} @@ -133,7 +133,7 @@
-- cgit v1.2.3 From 20dfd9ba3e832a369696c3a28caa62024dc9e0ba Mon Sep 17 00:00:00 2001 From: archshift Date: Sat, 11 Oct 2014 13:36:43 -0700 Subject: Webadmin: use images already in files/ instead of inline image data This also probably means that the browser will be able to cache the images better, and not have to repeatedly download them al a part of the HTML. --- MCServer/webadmin/(original).html | 8 ++++---- MCServer/webadmin/template.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'MCServer/webadmin') 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} -
- -

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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(+) (limited to 'MCServer/webadmin') 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(+) (limited to 'MCServer/webadmin') 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(+) (limited to 'MCServer/webadmin') 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(+) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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(-) (limited to 'MCServer/webadmin') 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
+
+
+ +
+
+
+
-