Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

* src/web/ejabberd_http.erl: Now web interface is compliant to

Browse Source 
XHTML 1.0 Transitional (thanks to Sander Devrieze)
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 444
This commit is contained in:
Alexey Shchepin 2005-11-26 18:56:39 +00:00
parent 6d0fa1b95c
commit 53ddd788ef
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-26 Alexey Shchepin <alexey@sevcom.net>
* src/web/ejabberd_http.erl: Now web interface is compliant to
XHTML 1.0 Transitional (thanks to Sander Devrieze)
* src/web/ejabberd_web_admin.erl: Likewise
2005-11-25 Alexey Shchepin <alexey@sevcom.net> 2005-11-25 Alexey Shchepin <alexey@sevcom.net>
* doc/Makefile: Now really added * doc/Makefile: Now really added

3
src/web/ejabberd_http.erl
View File

@ -42,7 +42,8 @@
"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"). "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n").
-define(HTML_DOCTYPE, -define(HTML_DOCTYPE,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"). "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n").
start(SockData, Opts) -> start(SockData, Opts) ->

51
src/web/ejabberd_web_admin.erl
View File

@ -60,7 +60,8 @@ make_xhtml(Els, global, Lang) ->
{"xml:lang", Lang}, {"xml:lang", Lang},
{"lang", Lang}], {"lang", Lang}],
[{xmlelement, "head", [], [{xmlelement, "head", [],
[{xmlelement, "meta", [{"http-equiv", "Content-Type"}, [?XCT("title", "ejabberd Web Interface"),
{xmlelement, "meta", [{"http-equiv", "Content-Type"},
{"content", "text/html; charset=utf-8"}], []}, {"content", "text/html; charset=utf-8"}], []},
{xmlelement, "link", [{"href", "/admin/style.css"}, {xmlelement, "link", [{"href", "/admin/style.css"},
{"type", "text/css"}, {"type", "text/css"},
@ -105,7 +106,8 @@ make_xhtml(Els, Host, Lang) ->
{"xml:lang", Lang}, {"xml:lang", Lang},
{"lang", Lang}], {"lang", Lang}],
[{xmlelement, "head", [], [{xmlelement, "head", [],
[{xmlelement, "meta", [{"http-equiv", "Content-Type"}, [?XCT("title", "ejabberd Web Interface"),
{xmlelement, "meta", [{"http-equiv", "Content-Type"},
{"content", "text/html; charset=utf-8"}], []}, {"content", "text/html; charset=utf-8"}], []},
{xmlelement, "link", [{"href", Base ++ "style.css"}, {xmlelement, "link", [{"href", Base ++ "style.css"},
{"type", "text/css"}, {"type", "text/css"},
@ -624,7 +626,7 @@ process_admin(Host,
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?XAC("textarea", [{"name", "acls"}, [?XAC("textarea", [{"name", "acls"},
{"rows", "16"}, {"rows", "16"},
{"cols", "80"}], {"cols", "80"}],
@ -669,7 +671,7 @@ process_admin(Host,
nothing -> [] nothing -> []
end ++ end ++
[?XE("p", [?ACT("../acls-raw/", "raw")])] ++ [?XE("p", [?ACT("../acls-raw/", "raw")])] ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[acls_to_xhtml(ACLs), [acls_to_xhtml(ACLs),
?BR, ?BR,
?INPUTT("submit", "delete", "Delete Selected"), ?INPUTT("submit", "delete", "Delete Selected"),
@ -737,7 +739,7 @@ process_admin(Host,
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?XAC("textarea", [{"name", "access"}, [?XAC("textarea", [{"name", "access"},
{"rows", "16"}, {"rows", "16"},
{"cols", "80"}], {"cols", "80"}],
@ -777,7 +779,7 @@ process_admin(Host,
nothing -> [] nothing -> []
end ++ end ++
[?XE("p", [?ACT("../access-raw/", "raw")])] ++ [?XE("p", [?ACT("../access-raw/", "raw")])] ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[access_rules_to_xhtml(AccessRules, Lang), [access_rules_to_xhtml(AccessRules, Lang),
?BR, ?BR,
?INPUTT("submit", "delete", "Delete Selected") ?INPUTT("submit", "delete", "Delete Selected")
@ -818,7 +820,7 @@ process_admin(Host,
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[access_rule_to_xhtml(Rules), [access_rule_to_xhtml(Rules),
?BR, ?BR,
?INPUTT("submit", "submit", "Submit") ?INPUTT("submit", "submit", "Submit")
@ -877,7 +879,7 @@ process_admin(Host,
list_last_activity(Host, Lang, true, Month) list_last_activity(Host, Lang, true, Month)
end, end,
make_xhtml([?XCT("h1", "Users last activity")] ++ make_xhtml([?XCT("h1", "Users last activity")] ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?CT("Period: "), [?CT("Period: "),
?XAE("select", [{"name", "period"}], ?XAE("select", [{"name", "period"}],
lists:map( lists:map(
@ -1256,7 +1258,7 @@ list_users(Host, Query, Lang, URLFunc) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?XE("table", [?XE("table",
[?XE("tr", [?XE("tr",
[?XC("td", ?T("User") ++ ":"), [?XC("td", ?T("User") ++ ":"),
@ -1431,7 +1433,7 @@ user_info(User, Server, Query, Lang) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?XCT("h3", "Connected Resources:")] ++ FResources ++ [?XCT("h3", "Connected Resources:")] ++ FResources ++
[?XCT("h3", "Password:")] ++ FPassword ++ [?XCT("h3", "Password:")] ++ FPassword ++
[?XCT("h3", "Offline messages:")] ++ FQueueLen ++ [?XCT("h3", "Offline messages:")] ++ FQueueLen ++
@ -1498,7 +1500,7 @@ user_queue(User, Server, Query, Lang) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?XE("table", [?XE("table",
[?XE("thead", [?XE("thead",
[?XE("tr", [?XE("tr",
@ -1508,7 +1510,16 @@ user_queue(User, Server, Query, Lang) ->
?XCT("td", "To"), ?XCT("td", "To"),
?XCT("td", "Packet") ?XCT("td", "Packet")
])]), ])]),
?XE("tbody", FMsgs)]), ?XE("tbody",
if
FMsgs == [] ->
[?XE("tr",
[?XAC("td", [{"colspan", "4"}], " ")]
)];
true ->
FMsgs
end
)]),
?BR, ?BR,
?INPUTT("submit", "delete", "Delete Selected") ?INPUTT("submit", "delete", "Delete Selected")
])]. ])].
@ -1615,7 +1626,7 @@ user_roster(User, Server, Query, Lang, Admin) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
FItems ++ FItems ++
[?P, [?P,
?INPUT("text", "newjid", ""), ?C(" "), ?INPUT("text", "newjid", ""), ?C(" "),
@ -1832,7 +1843,7 @@ get_node(global, Node, [], Query, Lang) ->
?LI([?ACT("ports/", "Listened Ports Management")]), ?LI([?ACT("ports/", "Listened Ports Management")]),
?LI([?ACT("stats/", "Statistics")]) ?LI([?ACT("stats/", "Statistics")])
]), ]),
?XAE("form", [{"method", "post"}], ?XAE("form", [{"action", ""}, {"method", "post"}],
[?INPUTT("submit", "restart", "Restart"), [?INPUTT("submit", "restart", "Restart"),
?C(" "), ?C(" "),
?INPUTT("submit", "stop", "Stop")]) ?INPUTT("submit", "stop", "Stop")])
@ -1891,7 +1902,7 @@ get_node(global, Node, ["db"], Query, Lang) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[?XAE("table", [], [?XAE("table", [],
[?XE("thead", [?XE("thead",
[?XE("tr", [?XE("tr",
@ -1914,7 +1925,7 @@ get_node(global, Node, ["db"], Query, Lang) ->
get_node(global, Node, ["backup"], Query, Lang) -> get_node(global, Node, ["backup"], Query, Lang) ->
Res = node_backup_parse_query(Node, Query), Res = node_backup_parse_query(Node, Query),
[?XC("h1", ?T("Backup Management at ") ++ atom_to_list(Node)), [?XC("h1", ?T("Backup Management at ") ++ atom_to_list(Node)),
?XAE("form", [{"method", "post"}], ?XAE("form", [{"action", ""}, {"method", "post"}],
[?XAE("table", [], [?XAE("table", [],
[?XE("tbody", [?XE("tbody",
[?XE("tr", [?XE("tr",
@ -1974,7 +1985,7 @@ get_node(global, Node, ["ports"], Query, Lang) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[node_ports_to_xhtml(NewPorts, Lang)]) [node_ports_to_xhtml(NewPorts, Lang)])
]; ];
@ -1997,7 +2008,7 @@ get_node(Host, Node, ["modules"], Query, Lang) when is_list(Host) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[node_modules_to_xhtml(NewModules, Lang)]) [node_modules_to_xhtml(NewModules, Lang)])
]; ];
@ -2390,7 +2401,7 @@ list_shared_roster_groups(Host, Query, Lang) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[FGroups, [FGroups,
?BR, ?BR,
?INPUTT("submit", "delete", "Delete Selected") ?INPUTT("submit", "delete", "Delete Selected")
@ -2490,7 +2501,7 @@ shared_roster_group(Host, Group, Query, Lang) ->
error -> [?CT("bad format"), ?P]; error -> [?CT("bad format"), ?P];
nothing -> [] nothing -> []
end ++ end ++
[?XAE("form", [{"method", "post"}], [?XAE("form", [{"action", ""}, {"method", "post"}],
[FGroup, [FGroup,
?BR, ?BR,
?INPUTT("submit", "submit", "Submit") ?INPUTT("submit", "submit", "Submit")