From: Badlop <badlop@process-one.net>
Date: Tue, 27 Aug 2019 10:29:05 +0000 (+0200)
Subject: Fix some links to Guide in WebAdmin and add new ones (#3003)
X-Git-Tag: 19.09~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e50ecf9e96ae1a6e4295b2c36135120d4cc70f12;p=ejabberd

Fix some links to Guide in WebAdmin and add new ones (#3003)
---

diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
index 8d28d4447..c168cae19 100644
--- a/src/ejabberd_web_admin.erl
+++ b/src/ejabberd_web_admin.erl
@@ -450,7 +450,7 @@ process_admin(_Host, #request{path = [<<"additions.js">>]}, _) ->
 process_admin(global, #request{path = [<<"vhosts">>], lang = Lang}, AJID) ->
     Res = list_vhosts(Lang, AJID),
     make_xhtml((?H1GL((translate:translate(Lang, ?T("Virtual Hosts"))),
-		      <<"virtualhosting">>, ?T("Virtual Hosting")))
+		      <<"virtual-hosting">>, ?T("Virtual Hosting")))
 		 ++ Res,
 	       global, Lang, AJID);
 process_admin(Host,  #request{path = [<<"users">>], q = Query,
@@ -485,8 +485,8 @@ process_admin(Host, #request{path = [<<"last-activity">>],
 		list_last_activity(Host, Lang, false, Month);
 	    _ -> list_last_activity(Host, Lang, true, Month)
 	  end,
-    make_xhtml([?XCT(<<"h1">>, ?T("Users Last Activity"))]
-		 ++
+    PageH1 = ?H1GL(translate:translate(Lang, ?T("Users Last Activity")), <<"mod-last">>, <<"mod_last">>),
+    make_xhtml(PageH1 ++
 		 [?XAE(<<"form">>,
 		       [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
 		       [?CT(?T("Period: ")),
@@ -516,8 +516,8 @@ process_admin(Host, #request{path = [<<"last-activity">>],
 	       Host, Lang, AJID);
 process_admin(Host, #request{path = [<<"stats">>], lang = Lang}, AJID) ->
     Res = get_stats(Host, Lang),
-    make_xhtml([?XCT(<<"h1">>, ?T("Statistics"))] ++ Res,
-	       Host, Lang, AJID);
+    PageH1 = ?H1GL(translate:translate(Lang, ?T("Statistics")), <<"mod-stats">>, <<"mod_stats">>),
+    make_xhtml(PageH1 ++ Res, Host, Lang, AJID);
 process_admin(Host, #request{path = [<<"user">>, U],
 			     q = Query, lang = Lang}, AJID) ->
     case ejabberd_auth:user_exists(U, Host) of
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 805e72481..4de0b2205 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -458,8 +458,9 @@ web_page_main(_, #request{path=[<<"muc">>], lang = Lang} = _Request) ->
 			  fun(Host, Acc) ->
 				  Acc + mod_muc:count_online_rooms(Host)
 			  end, 0, find_hosts(global)),
-    Res = [?XCT(<<"h1">>, ?T("Multi-User Chat")),
-	   ?XCT(<<"h3">>, ?T("Statistics")),
+    PageTitle = translate:translate(Lang, ?T("Multi-User Chat")),
+    Res = ?H1GL(PageTitle, <<"mod-muc">>, <<"mod_muc">>) ++
+	  [?XCT(<<"h3">>, ?T("Statistics")),
 	   ?XAE(<<"table">>, [],
 		[?XE(<<"tbody">>, [?TDTD(?T("Total rooms"), OnlineRoomsNumber)
 				  ])
@@ -531,8 +532,9 @@ make_rooms_page(Host, Lang, {Sort_direction, Sort_column}) ->
 	  end,
 	  1,
 	  Titles),
-    [?XCT(<<"h1">>, ?T("Multi-User Chat")),
-     ?XCT(<<"h2">>, ?T("Chatrooms")),
+    PageTitle = translate:translate(Lang, ?T("Multi-User Chat")),
+    ?H1GL(PageTitle, <<"mod-muc">>, <<"mod_muc">>) ++
+    [?XCT(<<"h2">>, ?T("Chatrooms")),
      ?XE(<<"table">>,
 	 [?XE(<<"thead">>,
 	      [?XE(<<"tr">>, Titles_TR)]
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 07d71bfdc..496e15ea0 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -994,9 +994,8 @@ user_queue(User, Server, Query, Lang) ->
 	      end,
     Hdrs = get_messages_subset(User, Server, HdrsAll),
     FMsgs = format_user_queue(Hdrs),
-    [?XC(<<"h1">>,
-	 (str:format(translate:translate(Lang, ?T("~s's Offline Messages Queue")),
-		     [us_to_list(US)])))]
+    PageTitle = str:format(translate:translate(Lang, ?T("~s's Offline Messages Queue")), [us_to_list(US)]),
+    (?H1GL(PageTitle, <<"mod-offline">>, <<"mod_offline">>))
       ++ [?XREST(?T("Submitted"))] ++
 	[?XAE(<<"form">>,
 	      [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 426589319..6446a368d 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -1004,8 +1004,8 @@ user_roster(User, Server, Query, Lang) ->
 					end,
 					SItems)))])]
 	     end,
-    [?XC(<<"h1">>,
-	 (<<(translate:translate(Lang, ?T("Roster of ")))/binary, (us_to_list(US))/binary>>))]
+    PageTitle = str:format(translate:translate(Lang, ?T("Roster of ~s")), [us_to_list(US)]),
+    (?H1GL(PageTitle, <<"mod-roster">>, <<"mod_roster">>))
       ++
       case Res of
 	ok -> [?XREST(?T("Submitted"))];
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index 097639456..afa0a49bf 100644
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -780,7 +780,7 @@ list_shared_roster_groups(Host, Query, Lang) ->
 				      [?INPUTT(<<"submit">>, <<"addnew">>,
 					       ?T("Add New"))])])]))])),
     (?H1GL((translate:translate(Lang, ?T("Shared Roster Groups"))),
-	   <<"mod_shared_roster">>, <<"mod_shared_roster">>))
+	   <<"mod-shared-roster">>, <<"mod_shared_roster">>))
       ++
       case Res of
 	ok -> [?XREST(?T("Submitted"))];
@@ -874,7 +874,7 @@ shared_roster_group(Host, Group, Query, Lang) ->
 					     <<"20">>,
 					     list_to_binary(FDisplayedGroups))])])])])),
     (?H1GL((translate:translate(Lang, ?T("Shared Roster Groups"))),
-	   <<"mod_shared_roster">>, <<"mod_shared_roster">>))
+	   <<"mod-shared-roster">>, <<"mod_shared_roster">>))
       ++
       [?XC(<<"h2">>, <<(translate:translate(Lang, ?T("Group ")))/binary, Group/binary>>)] ++
 	case Res of