Merge pull request #260 from StanczakDominik/post-overwatch-feedback-…

…fixes Post Overwatch feedback fixes
beyond-all-reason · Apr 15, 2024 · dd36525 · dd36525
2 parents 1cf0260 + 4f5f3b6
commit dd36525
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lib/teiserver_web/templates/admin/user/index.html.heex b/lib/teiserver_web/templates/admin/user/index.html.heex
@@ -1,5 +1,4 @@
 <% bsname = view_colour()
-is_admin = allow?(@conn, "Admin")
 is_moderator = allow?(@conn, "Moderator") %>
 
 <script type="text/javascript" charset="utf-8">
@@ -56,12 +55,12 @@ is_moderator = allow?(@conn, "Moderator") %>
           <thead>
             <tr>
               <th colspan="2">Name</th>
-              <%= if is_admin do %>
+              <%= if is_moderator do %>
                 <th>Email</th>
               <% end %>
               <th>Client</th>
               <th>Status</th>
-              <%= if is_admin do %>
+              <%= if is_moderator do %>
                 <th>HW</th>
                 <th>CHB</th>
               <% end %>
@@ -84,7 +83,7 @@ is_moderator = allow?(@conn, "Moderator") %>
                   <%= central_component("icon", icon: user.icon) %>
                 </td>
                 <td><%= user.name %></td>
-                <%= if is_admin do %>
+                <%= if is_moderator do %>
                   <td><%= user.email %></td>
                 <% end %>
                 <td><%= user.data["lobby_client"] %></td>
@@ -93,7 +92,7 @@ is_moderator = allow?(@conn, "Moderator") %>
                   <TeiserverWeb.UserComponents.status_icon user={user} />
                 </td>
 
-                <%= if is_admin do %>
+                <%= if is_moderator do %>
                   <td>
                     <%= if user.data["hw_hash"] != "" and user.data["hw_hash"] != nil do %>
                       <i class="fa-fw far fa-check"></i>
@@ -103,7 +102,7 @@ is_moderator = allow?(@conn, "Moderator") %>
                   </td>
 
                   <td>
-                    <%= if user.data["chobby_hash"] != "" and user.data["chobby_hash"] != nil do %>
+                    <%= if user.data["lobby_hash"] != "" and user.data["lobby_hash"] != nil do %>
                       <i class="fa-fw far fa-check"></i>
                     <% else %>
                       &nbsp;

diff --git a/lib/teiserver_web/templates/admin/user/tab_overview.html.heex b/lib/teiserver_web/templates/admin/user/tab_overview.html.heex
@@ -113,7 +113,7 @@
   ) %>
 
   <%= central_component("menu_card",
-    icon: "fa-solid fa-eye}",
+    icon: "fa-solid fa-eye",
     name: "overwatch",
     text: "Overwatch",
     icon_class: "fa-solid",

diff --git a/lib/teiserver_web/templates/moderation/action/new_with_user.html.heex b/lib/teiserver_web/templates/moderation/action/new_with_user.html.heex
@@ -366,7 +366,7 @@ bsname = view_colour() %>
         $('#action_restriction_All_lobbies').prop('checked', true);
         $('#action_restriction_Matchmaking').prop('checked', true);
         $('#action_restriction_Community').prop('checked', true);
-        $('#action_reason').val('[CoC](<https://www.beyondallreason.info/code-of-conduct>) C3 - please rename (use the Account button in the top right, then go to Recover/Change) to a name not in breach of the Code of Conduct and use the #open-ticket discord channel to notify the moderation team and have the restriction lifted. The discord can be accessed at #{discord_link} ');
+        $('#action_reason').val('[CoC](<https://www.beyondallreason.info/code-of-conduct>) B3 - **Nicknames and clan tags must not be offensive or inappropriate. Impersonation of other players and real-life figures is also forbidden.** Please rename (use the Account button in the top right, then go to Recover/Change) to a name not in breach of the Code of Conduct and use the #open-ticket discord channel to notify the moderation team and have the restriction lifted. The discord can be accessed at #{discord_link} ');
         $('#action_expires').val('1100 years');
       "}
                   >