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/template.lua | 143 +++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 48 deletions(-) (limited to 'MCServer/webadmin/template.lua') 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

" - Content = Content .. "

Plugins:

" - Content = Content .. "

Players:


"; - return Content, SubTitle end @@ -83,20 +64,47 @@ function ShowPage(WebAdmin, TemplateRequest) Output([[ - - -]] .. Title .. [[ - - + ]] .. Title .. [[ + + + + + -
-
- MCServer -
- + ]]) -- cgit v1.2.3 From ba5ff77290d16ba750114a06f9b7b04ef0c1fc79 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Thu, 23 Oct 2014 21:57:37 +0200 Subject: Update template.lua --- MCServer/webadmin/template.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'MCServer/webadmin/template.lua') diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index 1b2f18246..fe04c00ca 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -168,10 +168,7 @@ if (document.getElementById) onload = function () {
FusionCare Web Developement - Powered By MC Server. - - - Theme created by Justin S. + Copyright © MCServer Team 2014.
-- 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/template.lua') 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/template.lua') 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 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/template.lua') 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 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/template.lua') 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 b98d0c51de87244b0a573914a30bb12bc9dd1b0f Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 28 Oct 2014 22:12:57 +0100 Subject: Update template.lua more to come --- MCServer/webadmin/template.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'MCServer/webadmin/template.lua') diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index b3c84dee2..38c2046d6 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -82,13 +82,12 @@ function ShowPage(WebAdmin, TemplateRequest) Output([[ /* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ - + -]] .. Title .. [[ - - - - + ]] .. Title .. [[ + + +
-- cgit v1.2.3 From 8604978d5079b8646bc4227253ccb172a3569c6b Mon Sep 17 00:00:00 2001 From: Arian Date: Tue, 4 Nov 2014 00:17:14 +0100 Subject: Update template.lua --- MCServer/webadmin/template.lua | 151 ++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 70 deletions(-) (limited to 'MCServer/webadmin/template.lua') diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index 38c2046d6..2811d16f8 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -91,38 +91,46 @@ function ShowPage(WebAdmin, TemplateRequest)
-
-
-
- -
-
- -
+
+
+
+ +
+
+ +
-
- - - + + + +
- - - - - - - - + + +
Menu
Home
Server Management
+
+ + + + - - -
+ + + + + + + + + + + + + + + -
Menu
Home
Server Management
]]) @@ -142,48 +150,51 @@ function ShowPage(WebAdmin, TemplateRequest) end - Output([[
-		 - - - - - - - -
]] .. SubTitle .. [[
-]] .. PageContent .. [[ -
-
-
- + Output([[ +
+ 		+ + + + + + + + + +
]] .. SubTitle .. [[
]] .. PageContent .. [[
+
+
+
- + + ]]) return table.concat(SiteContent) -- cgit v1.2.3 From 0fa8c881a6967ea0c97da4852854102da5cd94c0 Mon Sep 17 00:00:00 2001 From: Ambushed91 Date: Wed, 5 Nov 2014 14:20:03 +0100 Subject: Update V1.0.9 Removed Time, Scroll-Able Header, Resized contention --- MCServer/webadmin/template.lua | 49 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'MCServer/webadmin/template.lua') diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index 2811d16f8..4d3934da8 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -81,7 +81,7 @@ function ShowPage(WebAdmin, TemplateRequest) end Output([[ -/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ + ]] .. Title .. [[ @@ -90,7 +90,7 @@ function ShowPage(WebAdmin, TemplateRequest) -
+
@@ -110,27 +110,27 @@ function ShowPage(WebAdmin, TemplateRequest)
-
-
- - - -
- - - - - - - - - - - - - - -
Menu
Home
Server Management
+
+
+ + + +
+ + + + + + + + + + + + + + +
Menu
Home
Server Management
]]) @@ -173,7 +173,6 @@ function ShowPage(WebAdmin, TemplateRequest)
- ]]) -- cgit v1.2.3