Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Align numbers in WebAdmin tables to the right

This commit is contained in:
Badlop 2021-05-19 14:51:56 +02:00
parent 58a623778f
commit d94bae241c
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/ejabberd_web_admin.erl
View File

@ -585,8 +585,12 @@ list_vhosts2(Lang, Hosts) ->
[?XE(<<"thead">>, [?XE(<<"thead">>,
[?XE(<<"tr">>, [?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Host")), [?XCT(<<"td">>, ?T("Host")),
?XCT(<<"td">>, ?T("Registered Users")), ?XACT(<<"td">>,
?XCT(<<"td">>, ?T("Online Users"))])]), [{<<"class">>, <<"alignright">>}],
?T("Registered Users")),
?XACT(<<"td">>,
[{<<"class">>, <<"alignright">>}],
?T("Online Users"))])]),
?XE(<<"tbody">>, ?XE(<<"tbody">>,
(lists:map(fun (Host) -> (lists:map(fun (Host) ->
OnlineUsers = OnlineUsers =
@ -598,9 +602,11 @@ list_vhosts2(Lang, Hosts) ->
[?AC(<<"../server/", Host/binary, [?AC(<<"../server/", Host/binary,
"/">>, "/">>,
Host)]), Host)]),
?XC(<<"td">>, ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(RegisteredUsers))), (pretty_string_int(RegisteredUsers))),
?XC(<<"td">>, ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(OnlineUsers)))]) (pretty_string_int(OnlineUsers)))])
end, end,
SHosts)))])]. SHosts)))])].
@ -706,7 +712,9 @@ list_given_users(Host, Users, Prefix, Lang, URLFunc) ->
[?XE(<<"thead">>, [?XE(<<"thead">>,
[?XE(<<"tr">>, [?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("User")), [?XCT(<<"td">>, ?T("User")),
?XCT(<<"td">>, ?T("Offline Messages")), ?XACT(<<"td">>,
[{<<"class">>, <<"alignright">>}],
?T("Offline Messages")),
?XCT(<<"td">>, ?T("Last Activity"))])]), ?XCT(<<"td">>, ?T("Last Activity"))])]),
?XE(<<"tbody">>, ?XE(<<"tbody">>,
(lists:map(fun (_SU = {Server, User}) -> (lists:map(fun (_SU = {Server, User}) ->
@ -749,7 +757,9 @@ list_given_users(Host, Users, Prefix, Lang, URLFunc) ->
misc:url_encode(User), misc:url_encode(User),
Server})), Server})),
(us_to_list(US)))]), (us_to_list(US)))]),
?XE(<<"td">>, FQueueLen), ?XAE(<<"td">>,
[{<<"class">>, <<"alignright">>}],
FQueueLen),
?XC(<<"td">>, FLast)]) ?XC(<<"td">>, FLast)])
end, end,
Users)))]). Users)))]).
@ -808,16 +818,24 @@ get_stats(global, Lang) ->
[?XE(<<"tbody">>, [?XE(<<"tbody">>,
[?XE(<<"tr">>, [?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Registered Users:")), [?XCT(<<"td">>, ?T("Registered Users:")),
?XC(<<"td">>, (pretty_string_int(RegisteredUsers)))]), ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(RegisteredUsers)))]),
?XE(<<"tr">>, ?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Online Users:")), [?XCT(<<"td">>, ?T("Online Users:")),
?XC(<<"td">>, (pretty_string_int(OnlineUsers)))]), ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(OnlineUsers)))]),
?XE(<<"tr">>, ?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Outgoing s2s Connections:")), [?XCT(<<"td">>, ?T("Outgoing s2s Connections:")),
?XC(<<"td">>, (pretty_string_int(OutS2SNumber)))]), ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(OutS2SNumber)))]),
?XE(<<"tr">>, ?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Incoming s2s Connections:")), [?XCT(<<"td">>, ?T("Incoming s2s Connections:")),
?XC(<<"td">>, (pretty_string_int(InS2SNumber)))])])])]; ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(InS2SNumber)))])])])];
get_stats(Host, Lang) -> get_stats(Host, Lang) ->
OnlineUsers = OnlineUsers =
length(ejabberd_sm:get_vh_session_list(Host)), length(ejabberd_sm:get_vh_session_list(Host)),
@ -827,10 +845,14 @@ get_stats(Host, Lang) ->
[?XE(<<"tbody">>, [?XE(<<"tbody">>,
[?XE(<<"tr">>, [?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Registered Users:")), [?XCT(<<"td">>, ?T("Registered Users:")),
?XC(<<"td">>, (pretty_string_int(RegisteredUsers)))]), ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(RegisteredUsers)))]),
?XE(<<"tr">>, ?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Online Users:")), [?XCT(<<"td">>, ?T("Online Users:")),
?XC(<<"td">>, (pretty_string_int(OnlineUsers)))])])])]. ?XAC(<<"td">>,
[{<<"class">>, <<"alignright">>}],
(pretty_string_int(OnlineUsers)))])])])].
list_online_users(Host, _Lang) -> list_online_users(Host, _Lang) ->
Users = [{S, U} Users = [{S, U}
@ -1183,8 +1205,12 @@ get_node(global, Node, [<<"db">>], Query, Lang) ->
[?XE(<<"tr">>, [?XE(<<"tr">>,
[?XCT(<<"td">>, ?T("Name")), [?XCT(<<"td">>, ?T("Name")),
?XCT(<<"td">>, ?T("Storage Type")), ?XCT(<<"td">>, ?T("Storage Type")),
?XCT(<<"td">>, ?T("Elements")), ?XACT(<<"td">>,
?XCT(<<"td">>, ?T("Memory"))])]), [{<<"class">>, <<"alignright">>}],
?T("Elements")),
?XACT(<<"td">>,
[{<<"class">>, <<"alignright">>}],
?T("Memory"))])]),
?XE(<<"tbody">>, ?XE(<<"tbody">>,
(Rows ++ (Rows ++
[?XE(<<"tr">>, [?XE(<<"tr">>,