diff options
| author | Badlop <badlop@process-one.net> | 2020-08-24 13:38:51 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2020-08-24 16:44:07 +0200 |
| commit | 864188ad654009c2e9d402345c2c77b75de1b493 (patch) | |
| tree | 25407668e0a75f906ef1e729be77ea0a81e103ff /src | |
| parent | ejabberdctl: Avoid bashisms (diff) | |
Mark dangerous buttons with CSS (#3363)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_web_admin.erl | 4 | ||||
| -rw-r--r-- | src/mod_offline.erl | 19 | ||||
| -rw-r--r-- | src/mod_roster.erl | 12 | ||||
| -rw-r--r-- | src/mod_shared_roster.erl | 2 |
4 files changed, 23 insertions, 14 deletions
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 2253d4cc7..970343982 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -949,7 +949,7 @@ user_info(User, Server, Query, Lang) -> [?C(LastActivity)] ++ UserItems ++ [?P, - ?INPUTT(<<"submit">>, <<"removeuser">>, + ?INPUTTD(<<"submit">>, <<"removeuser">>, ?T("Remove User"))]))]. user_parse_query(User, Server, Query) -> @@ -1105,7 +1105,7 @@ get_node(global, Node, [], Query, Lang) -> [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}], [?INPUTT(<<"submit">>, <<"restart">>, ?T("Restart")), ?C(<<" ">>), - ?INPUTT(<<"submit">>, <<"stop">>, ?T("Stop"))])]; + ?INPUTTD(<<"submit">>, <<"stop">>, ?T("Stop"))])]; get_node(Host, Node, [], _Query, Lang) -> Base = get_base_path(Host, Node, 4), MenuItems2 = make_menu_items(Host, Node, Base, Lang), diff --git a/src/mod_offline.erl b/src/mod_offline.erl index 1b859b993..395f84e81 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -1008,7 +1008,7 @@ user_queue(User, Server, Query, Lang) -> true -> FMsgs end)]), ?BR, - ?INPUTT(<<"submit">>, <<"delete">>, + ?INPUTTD(<<"submit">>, <<"delete">>, ?T("Delete Selected"))])]. user_queue_parse_query(LUser, LServer, Query) -> @@ -1070,14 +1070,17 @@ get_messages_subset2(Max, Length, MsgsAll) -> webadmin_user(Acc, User, Server, Lang) -> QueueLen = count_offline_messages(jid:nodeprep(User), jid:nameprep(Server)), - FQueueLen = [?AC(<<"queue/">>, - (integer_to_binary(QueueLen)))], + FQueueLen = ?C(integer_to_binary(QueueLen)), + FQueueView = ?AC(<<"queue/">>, + ?T("View Queue")), Acc ++ - [?XCT(<<"h3">>, ?T("Offline Messages:"))] ++ - FQueueLen ++ - [?C(<<" ">>), - ?INPUTT(<<"submit">>, <<"removealloffline">>, - ?T("Remove All Offline Messages"))]. + [?XCT(<<"h3">>, ?T("Offline Messages:")), + FQueueLen, + ?C(<<" | ">>), + FQueueView, + ?C(<<" | ">>), + ?INPUTTD(<<"submit">>, <<"removealloffline">>, + ?T("Remove All Offline Messages"))]. -spec delete_all_msgs(binary(), binary()) -> {atomic, any()}. delete_all_msgs(User, Server) -> diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 54abdefad..ef39733a1 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -997,7 +997,7 @@ user_roster(User, Server, Query, Lang) -> ?XAE(<<"td">>, [{<<"class">>, <<"valign">>}], - [?INPUTT(<<"submit">>, + [?INPUTTD(<<"submit">>, <<"remove", (ejabberd_web_admin:term_to_id(R#roster.jid))/binary>>, ?T("Remove"))])]) @@ -1117,9 +1117,15 @@ user_roster_item_parse_query(User, Server, Items, us_to_list({User, Server}) -> jid:encode({User, Server, <<"">>}). -webadmin_user(Acc, _User, _Server, Lang) -> +webadmin_user(Acc, User, Server, Lang) -> + QueueLen = length(get_roster(jid:nodeprep(User), jid:nameprep(Server))), + FQueueLen = ?C(integer_to_binary(QueueLen)), + FQueueView = ?AC(<<"roster/">>, ?T("View Roster")), Acc ++ - [?XE(<<"h3">>, [?ACT(<<"roster/">>, ?T("Roster"))])]. + [?XCT(<<"h3">>, ?T("Roster:")), + FQueueLen, + ?C(<<" | ">>), + FQueueView]. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -spec has_duplicated_groups([binary()]) -> boolean(). diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 232ef9e02..5663443de 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -935,7 +935,7 @@ list_shared_roster_groups(Host, Query, Lang) -> [?XAE(<<"form">>, [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}], [FGroups, ?BR, - ?INPUTT(<<"submit">>, <<"delete">>, + ?INPUTTD(<<"submit">>, <<"delete">>, ?T("Delete Selected"))])]. list_sr_groups_parse_query(Host, Query) -> |