Просмотр исходного кода

Merge pull request #3957 from weseek/feat/GW-6473-6497-mark-the-user

Feat/gw 6473 6497 mark the user
Shun Miyazawa 4 лет назад
Родитель
Сommit
b08efc93ac
2 измененных файлов с 17 добавлено и 12 удалено
  1. 11 12
      src/client/js/components/Admin/Users/UserMenu.jsx
  2. 6 0
      src/client/styles/scss/_user.scss

+ 11 - 12
src/client/js/components/Admin/Users/UserMenu.jsx

@@ -82,18 +82,17 @@ class UserMenu extends React.Component {
     const { user } = this.props;
 
     return (
-      <Fragment>
-        <UncontrolledDropdown id="userMenu" size="sm">
-          <DropdownToggle caret color="secondary" outline>
-            <i className="icon-settings"></i>
-          </DropdownToggle>
-          <DropdownMenu positionFixed>
-            {this.renderEditMenu()}
-            {user.status !== 4 && this.renderStatusMenu()}
-            {user.status === 2 && this.renderAdminMenu()}
-          </DropdownMenu>
-        </UncontrolledDropdown>
-      </Fragment>
+      <UncontrolledDropdown id="userMenu" size="sm">
+        <DropdownToggle caret color="secondary" outline>
+          <i className="icon-settings" />
+          {(!user.isInvitationEmailSended && user.status === 5) && <i className="fa fa-circle text-danger grw-usermenu-notification-icon" />}
+        </DropdownToggle>
+        <DropdownMenu positionFixed>
+          {this.renderEditMenu()}
+          {user.status !== 4 && this.renderStatusMenu()}
+          {user.status === 2 && this.renderAdminMenu()}
+        </DropdownMenu>
+      </UncontrolledDropdown>
     );
   }
 

+ 6 - 0
src/client/styles/scss/_user.scss

@@ -34,6 +34,12 @@ $easeInOutCubic: cubic-bezier(0.65, 0, 0.35, 1);
   }
 }
 
+.grw-usermenu-notification-icon {
+  position: absolute;
+  top: -4px;
+  left: 30px;
+}
+
 .draft-list-item {
   .icon-container {
     .icon-copy,