diff options
author | onefang | 2019-08-25 14:15:28 +1000 |
---|---|---|
committer | onefang | 2019-08-25 14:15:28 +1000 |
commit | 817dabf5cb07044c2fee331455a0bb961b13dd46 (patch) | |
tree | 899b55dac202b5198450e53e09b28a32a1564fb2 | |
parent | New web background image. (diff) | |
download | opensim-SC-817dabf5cb07044c2fee331455a0bb961b13dd46.zip opensim-SC-817dabf5cb07044c2fee331455a0bb961b13dd46.tar.gz opensim-SC-817dabf5cb07044c2fee331455a0bb961b13dd46.tar.bz2 opensim-SC-817dabf5cb07044c2fee331455a0bb961b13dd46.tar.xz |
Now with favicons.
-rw-r--r-- | OpenSim/Server/Handlers/Web/WebServerConnector.cs | 10 | ||||
-rw-r--r-- | example/web/SledjHamrIcon.png | bin | 0 -> 95362 bytes | |||
-rw-r--r-- | example/web/SledjHamrIconSmall.png | bin | 0 -> 8535 bytes | |||
-rw-r--r-- | example/web/about.html | 1 | ||||
-rw-r--r-- | example/web/help.html | 1 | ||||
-rw-r--r-- | example/web/loginpage.html | 1 | ||||
-rw-r--r-- | example/web/password_help.html | 1 | ||||
-rw-r--r-- | example/web/register.html | 1 | ||||
-rw-r--r-- | example/web/stats.html | 1 |
9 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Web/WebServerConnector.cs b/OpenSim/Server/Handlers/Web/WebServerConnector.cs index f06d4d8..11bf435 100644 --- a/OpenSim/Server/Handlers/Web/WebServerConnector.cs +++ b/OpenSim/Server/Handlers/Web/WebServerConnector.cs | |||
@@ -237,7 +237,7 @@ namespace OpenSim.Server.Handlers.Web | |||
237 | m_log.ErrorFormat("[WEB SERVICE]: INVALID PATH {0} != {1}", Path.GetFullPath(path), Path.GetFullPath(Util.webDir())); | 237 | m_log.ErrorFormat("[WEB SERVICE]: INVALID PATH {0} != {1}", Path.GetFullPath(path), Path.GetFullPath(Util.webDir())); |
238 | reply["int_response_code"] = 404; | 238 | reply["int_response_code"] = 404; |
239 | reply["content_type"] = "text/html"; | 239 | reply["content_type"] = "text/html"; |
240 | reply["str_response_string"] = "<html><title>404 Unknown page</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + | 240 | reply["str_response_string"] = "<html><title>404 Unknown page</title><head><link rel=\"shortcut icon\" href=\"SledjHamrIconSmall.png\"></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + |
241 | "404 error, can't find the " + reqpath + " page.<p> </p></body></html>"; | 241 | "404 error, can't find the " + reqpath + " page.<p> </p></body></html>"; |
242 | return reply; | 242 | return reply; |
243 | } | 243 | } |
@@ -398,7 +398,7 @@ namespace OpenSim.Server.Handlers.Web | |||
398 | m_log.ErrorFormat("[WEB SERVICE]: Unable to read {0}.", reqpath); | 398 | m_log.ErrorFormat("[WEB SERVICE]: Unable to read {0}.", reqpath); |
399 | reply["int_response_code"] = 404; | 399 | reply["int_response_code"] = 404; |
400 | reply["content_type"] = "text/html"; | 400 | reply["content_type"] = "text/html"; |
401 | reply["str_response_string"] = "<html><title>404 Unknown page</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + | 401 | reply["str_response_string"] = "<html><title>404 Unknown page</title><head><link rel=\"shortcut icon\" href=\"SledjHamrIconSmall.png\"></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + |
402 | "404 error, can't find the " + reqpath + " page.<p> </p></body></html>"; | 402 | "404 error, can't find the " + reqpath + " page.<p> </p></body></html>"; |
403 | } | 403 | } |
404 | } | 404 | } |
@@ -519,7 +519,7 @@ namespace OpenSim.Server.Handlers.Web | |||
519 | List< Hashtable > rows = m_database.Select("UserAccounts", | 519 | List< Hashtable > rows = m_database.Select("UserAccounts", |
520 | "CONCAT(FirstName,' ',LastName) as Name,UserTitle as Title,UserLevel as Level,UserFlags as Flags,PrincipalID as UUID", | 520 | "CONCAT(FirstName,' ',LastName) as Name,UserTitle as Title,UserLevel as Level,UserFlags as Flags,PrincipalID as UUID", |
521 | "", "Name"); | 521 | "", "Name"); |
522 | reply["str_response_string"] = "<html><title>member accounts</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + | 522 | reply["str_response_string"] = "<html><title>member accounts</title><head><link rel=\"shortcut icon\" href=\"SledjHamrIconSmall.png\"></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + |
523 | table(rows, new string[5] {"Name", "Title", "Level", "Flags", "UUID"}, "member accounts", | 523 | table(rows, new string[5] {"Name", "Title", "Level", "Flags", "UUID"}, "member accounts", |
524 | "account.html?doit=edit&token=" + fields["toke_n_munchie"].ToString(), "UUID") + "<p>" + button("my account") + "</p></body></html>"; | 524 | "account.html?doit=edit&token=" + fields["toke_n_munchie"].ToString(), "UUID") + "<p>" + button("my account") + "</p></body></html>"; |
525 | } | 525 | } |
@@ -539,7 +539,7 @@ namespace OpenSim.Server.Handlers.Web | |||
539 | m_log.ErrorFormat("[WEB SERVICE]: No such POST target {0}.", path); | 539 | m_log.ErrorFormat("[WEB SERVICE]: No such POST target {0}.", path); |
540 | reply["int_response_code"] = 404; | 540 | reply["int_response_code"] = 404; |
541 | reply["content_type"] = "text/html"; | 541 | reply["content_type"] = "text/html"; |
542 | reply["str_response_string"] = "<html><title>404 Unknown page</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + | 542 | reply["str_response_string"] = "<html><title>404 Unknown page</title><head><link rel=\"shortcut icon\" href=\"SledjHamrIconSmall.png\"></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + |
543 | "404 error, can't find the " + reqpath + " page.<p> </p></body></html>"; | 543 | "404 error, can't find the " + reqpath + " page.<p> </p></body></html>"; |
544 | // } | 544 | // } |
545 | } | 545 | } |
@@ -548,7 +548,7 @@ namespace OpenSim.Server.Handlers.Web | |||
548 | m_log.ErrorFormat("[WEB SERVICE]: UNKNOWN method {0} path {1}.", method, reqpath); | 548 | m_log.ErrorFormat("[WEB SERVICE]: UNKNOWN method {0} path {1}.", method, reqpath); |
549 | reply["int_response_code"] = 404; | 549 | reply["int_response_code"] = 404; |
550 | reply["content_type"] = "text/html"; | 550 | reply["content_type"] = "text/html"; |
551 | reply["str_response_string"] = "<html><title>Unknown method</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + | 551 | reply["str_response_string"] = "<html><title>Unknown method</title><head><link rel=\"shortcut icon\" href=\"SledjHamrIconSmall.png\"></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" + |
552 | "HUH! For " + reqpath + " page.<p> </p></body></html>"; | 552 | "HUH! For " + reqpath + " page.<p> </p></body></html>"; |
553 | } | 553 | } |
554 | 554 | ||
diff --git a/example/web/SledjHamrIcon.png b/example/web/SledjHamrIcon.png new file mode 100644 index 0000000..e3b50e1 --- /dev/null +++ b/example/web/SledjHamrIcon.png | |||
Binary files differ | |||
diff --git a/example/web/SledjHamrIconSmall.png b/example/web/SledjHamrIconSmall.png new file mode 100644 index 0000000..a1a6d72 --- /dev/null +++ b/example/web/SledjHamrIconSmall.png | |||
Binary files differ | |||
diff --git a/example/web/about.html b/example/web/about.html index b558e39..50ee1e2 100644 --- a/example/web/about.html +++ b/example/web/about.html | |||
@@ -1,6 +1,7 @@ | |||
1 | <html> | 1 | <html> |
2 | <title>About this grid</title> | 2 | <title>About this grid</title> |
3 | <head> | 3 | <head> |
4 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
4 | </head> | 5 | </head> |
5 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | 6 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> |
6 | This is a virtual world, usually called a grid, based on <a href="https://sledjhamr.org/cgit/opensim-SC/?h=SledjChisl">opensim-SC</a>. | 7 | This is a virtual world, usually called a grid, based on <a href="https://sledjhamr.org/cgit/opensim-SC/?h=SledjChisl">opensim-SC</a>. |
diff --git a/example/web/help.html b/example/web/help.html index 64194ca..e070b82 100644 --- a/example/web/help.html +++ b/example/web/help.html | |||
@@ -1,6 +1,7 @@ | |||
1 | <html> | 1 | <html> |
2 | <title>Help for this grid</title> | 2 | <title>Help for this grid</title> |
3 | <head> | 3 | <head> |
4 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
4 | </head> | 5 | </head> |
5 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | 6 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> |
6 | Include help for your grid here. | 7 | Include help for your grid here. |
diff --git a/example/web/loginpage.html b/example/web/loginpage.html index 5171747..2614211 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html | |||
@@ -1,6 +1,7 @@ | |||
1 | <html> | 1 | <html> |
2 | <title><!--#echo var="grid" --> splash page</title> | 2 | <title><!--#echo var="grid" --> splash page</title> |
3 | <head> | 3 | <head> |
4 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
4 | <meta http-equiv="refresh" content="120"> | 5 | <meta http-equiv="refresh" content="120"> |
5 | <style> | 6 | <style> |
6 | html, body | 7 | html, body |
diff --git a/example/web/password_help.html b/example/web/password_help.html index 129fb7d..db03fff 100644 --- a/example/web/password_help.html +++ b/example/web/password_help.html | |||
@@ -1,6 +1,7 @@ | |||
1 | <html> | 1 | <html> |
2 | <title>Password help for this grid</title> | 2 | <title>Password help for this grid</title> |
3 | <head> | 3 | <head> |
4 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
4 | </head> | 5 | </head> |
5 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | 6 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> |
6 | Include password help for your grid here. | 7 | Include password help for your grid here. |
diff --git a/example/web/register.html b/example/web/register.html index da46365..e721351 100644 --- a/example/web/register.html +++ b/example/web/register.html | |||
@@ -1,6 +1,7 @@ | |||
1 | <html> | 1 | <html> |
2 | <title>Account for this grid</title> | 2 | <title>Account for this grid</title> |
3 | <head> | 3 | <head> |
4 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
4 | </head> | 5 | </head> |
5 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | 6 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> |
6 | Include account registration help for your grid here. | 7 | Include account registration help for your grid here. |
diff --git a/example/web/stats.html b/example/web/stats.html index 1dce2f3..c806c03 100644 --- a/example/web/stats.html +++ b/example/web/stats.html | |||
@@ -1,6 +1,7 @@ | |||
1 | <html> | 1 | <html> |
2 | <title><!--#echo var="grid" --> stats page</title> | 2 | <title><!--#echo var="grid" --> stats page</title> |
3 | <head> | 3 | <head> |
4 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
4 | <meta http-equiv="refresh" content="120"> | 5 | <meta http-equiv="refresh" content="120"> |
5 | </head> | 6 | </head> |
6 | <body> | 7 | <body> |