diff options
| author | TheRandomMelon <[email protected]> | 2017-01-08 20:03:03 -0600 |
|---|---|---|
| committer | TheRandomMelon <[email protected]> | 2017-01-08 20:03:03 -0600 |
| commit | 7d176cf6473400c2532d1eed5900ce057a550f2f (patch) | |
| tree | 782dc72649ccfa4ff09461de6ea111beeb2a2849 /ShiftOS.Server | |
| parent | ce3fa2c4004e7e5143ff5fdcc84b8c746d29f8a0 (diff) | |
| parent | 5ba9d870cdf0abeff4f18e4db9bf9ed0c5416cb1 (diff) | |
| download | shiftos_thereturn-7d176cf6473400c2532d1eed5900ce057a550f2f.tar.gz shiftos_thereturn-7d176cf6473400c2532d1eed5900ce057a550f2f.tar.bz2 shiftos_thereturn-7d176cf6473400c2532d1eed5900ce057a550f2f.zip | |
Merge branch 'master' of https://github.com/shiftos-game/ShiftOS
Diffstat (limited to 'ShiftOS.Server')
| -rw-r--r-- | ShiftOS.Server/Properties/Resources.resx | 6 | ||||
| -rw-r--r-- | ShiftOS.Server/Resources/404.html (renamed from ShiftOS.Server/Resources/NotFound.txt) | 6 | ||||
| -rw-r--r-- | ShiftOS.Server/Resources/index.html (renamed from ShiftOS.Server/Resources/Home.txt) | 15 |
3 files changed, 13 insertions, 14 deletions
diff --git a/ShiftOS.Server/Properties/Resources.resx b/ShiftOS.Server/Properties/Resources.resx index cd10c06..dacce92 100644 --- a/ShiftOS.Server/Properties/Resources.resx +++ b/ShiftOS.Server/Properties/Resources.resx @@ -119,9 +119,9 @@ </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="Home" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Home.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <value>..\Resources\index.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> <data name="NotFound" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\NotFound.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + <value>..\Resources\404.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> -</root>
\ No newline at end of file +</root> diff --git a/ShiftOS.Server/Resources/NotFound.txt b/ShiftOS.Server/Resources/404.html index cd65829..8f998fc 100644 --- a/ShiftOS.Server/Resources/NotFound.txt +++ b/ShiftOS.Server/Resources/404.html @@ -1,9 +1,11 @@ -<html> +<!DOCTYPE html> +<html lang="en" dir="ltr> <head> <title>Multi-User Domain • Administration Panel - Page not found.</title> + <meta charset="UTF-8"> </head> <body> <h1>This page wasn't found.</h1> <p>We couldn't find this page...</p> </body> -</html>
\ No newline at end of file +</html> diff --git a/ShiftOS.Server/Resources/Home.txt b/ShiftOS.Server/Resources/index.html index 41c8995..27fa97c 100644 --- a/ShiftOS.Server/Resources/Home.txt +++ b/ShiftOS.Server/Resources/index.html @@ -1,17 +1,16 @@ -<html> +<!DOCTYPE html> +<html lang="en" dir="ltr"> <head> <title>ShiftOS Multi-User Domain • Admin Panel</title> - - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"/> - - <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> + <meta charset="UTF-8"> + <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"/> + <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> </head> <body> <nav class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> <a class="navbar-brand" href="/">MUD Admin Panel</a> - <ul class="nav navbar-nav"> <li><a href="/chats">Chat manager</a></li> <li><a href="/status" class="active">System status</a></li> @@ -20,12 +19,10 @@ </nav> <div class="container"> - {BODY} - <footer> <p>MUD server on {IP_ADDR}:{PORT}</p> </footer> </div> </body> -</html>
\ No newline at end of file +</html> |