diff --git a/CONTRIBUTORS b/CONTRIBUTORS new file mode 100644 index 000000000..ebb5f37ed --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1,11 @@ +Many people have contributed to MCServer, and this list attempts to broadcast at least some of them. + +faketruth (founder) +xoft +keyboard +STR_Warrior +mgueydan +tigerw +bearbin + +If you feel you have contributed enough to be included in this list, just put in a PR including yourself. diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..566c55b46 --- /dev/null +++ b/LICENSE @@ -0,0 +1,13 @@ + Copyright MCServer Contributors + + 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. diff --git a/MCServer/webadmin/(original).html b/MCServer/webadmin/(original).html new file mode 100644 index 000000000..239a255e5 --- /dev/null +++ b/MCServer/webadmin/(original).html @@ -0,0 +1,375 @@ + + + + +{TITLE} + + + + + + +
+ +

{TITLE}

+ +
+
+ + + + +

Welcome {USERNAME}

+ +
+

{PLUGIN_NAME}

+ + {CONTENT} + +
+ + +
+
+ +
+ + + +
+ + + diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index a607c3f53..b2e3fa1eb 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -1,376 +1,152 @@ - - + + - - -{TITLE} + {TITLE} | {PLUGIN_NAME} + + - + 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:37px; display:table; padding:0; margin: 0 auto; border:1px #b05a0d 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; padding:12px 20px; 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; 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 #fff; } + #cssmenu > ul > li.has-sub:hover > a:before{top:19px;} + #cssmenu ul li.has-sub:hover > a{ background:#3f3f3f; border-color:#3f3f3f; 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:#ff9812; background:-moz-linear-gradient(top, #ff9812 0%, #e17310 100%); background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9812), color-stop(100%,#e17310)); background:-webkit-linear-gradient(top, #ff9812 0%,#e17310 100%); background:-o-linear-gradient(top, #ff9812 0%,#e17310 100%); background:-ms-linear-gradient(top, #ff9812 0%,#e17310 100%); background:linear-gradient(top, #ff9812 0%,#e17310 100%); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr ='#ff9812', endColorstr='#e17310',GradientType=0); } + #cssmenu > ul > li > a{border-right:1px solid #b05a0d; color:#fff;} + #cssmenu > ul > li > a:after{border-color:#ffa32b;} + #cssmenu > ul > li > a:hover{background:#e17310;} + + + + +
- -

{TITLE}

- -
-
- - - - -

Welcome {USERNAME}

- -
-

{PLUGIN_NAME}

- - {CONTENT} - -
- - -
-
- -
- - - -
- - +
+ +

MCServer, the Minecraft Server coded in C++!

+
+ +
+

Welcome {USERNAME}, to the Control Panel! :D

+ {CONTENT} +
+ + + diff --git a/README.md b/README.md index 7b57c3234..88827bbc0 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ To install MCServer, you can either download the repository and compile it, or d Compilation instructions are available in the COMPILING file. -Linux builds can be downloaded from [the Berboe CI server](http://ci.berboe.co.uk) and windows from xoft's [nightly build service](mc-server.xoft.cz). +Linux builds can be downloaded from [the Berboe CI server](http://ci.berboe.co.uk) and windows from xoft's [nightly build service](http://mc-server.xoft.cz). After you've extracted the files, simply run the MCServer executable.