Merge pull request overte-org#1155 from digisomni/fix/kick-pal

Update Pal.qml for new Ban button
MarkZuckherberg · Apr 5, 2021 · 1751a59 · 1751a59
2 parents fdb16bc + 8c92910
commit 1751a59
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
@@ -478,7 +478,7 @@ Rectangle {
                 visible: iAmAdmin;
                 role: "mute";
                 title: "SILENCE";
-                width: actionButtonWidth;
+                width: actionButtonWidth - 8;
                 movable: false;
                 resizable: false;
             }
@@ -608,7 +608,7 @@ Rectangle {
                     enabled: !nameCard.isReplicated;
                     anchors.verticalCenter: itemCell.verticalCenter;
                     anchors.left: parent.left;
-                    anchors.leftMargin: styleData.role === "kick" ? 4 : 18;
+                    anchors.leftMargin: styleData.role === "kick" ? 1 : 14;
                     width: 32;
                     height: 32;
                     onClicked: {
@@ -640,7 +640,7 @@ Rectangle {
                     enabled: !nameCard.isReplicated;
                     anchors.verticalCenter: itemCell.verticalCenter;
                     anchors.left: parent.left;
-                    anchors.leftMargin: actionButton.width + 14;
+                    anchors.leftMargin: actionButton.width + 3;
                     width: 32;
                     height: 32;
                     onClicked: {
@@ -755,7 +755,8 @@ Rectangle {
                 onClicked: letterbox(hifi.glyphs.question,
                                      "Admin Actions",
                                      "<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking &quot;UNMUTE&quot; on their toolbar.<br><br>" +
-                                     "<b>Ban</b> removes a user from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.");
+                                     "<b>Ban (left)</b> identifies a user by username (if applicable) and machine fingerprint, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.<br><br>" +
+                                     "<b>Hard Ban (right)</b> identifies a user by username (if applicable), machine fingerprint, and IP address, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.");
                 onEntered: adminHelpText.color = "#94132e";
                 onExited: adminHelpText.color = hifi.colors.redHighlight;
             }