Merge branch 'release/2.1.0' into develop

[oweals/peertube.git] / client / src / app / +accounts / accounts.component.html

diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 036e794d268bae2f5fd2d9ded01d7f216fe36383..915bee0a2383c64caa17114b71bb46b8d0b3a767 100644 (file)
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -7,22 +7,42 @@
       <div class="actor-info">
         <div class="actor-names">
           <div class="actor-display-name">{{ account.displayName }}</div>
-          <div class="actor-name">{{ account.nameWithHost }}</div>
-
-          <span *ngIf="user?.blocked" [ngbTooltip]="user.blockedReason" class="badge badge-danger" i18n>Banned</span>
-
-          <my-user-moderation-dropdown buttonSize="small" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()">
-          </my-user-moderation-dropdown>
+          <div class="actor-name">{{ account.nameWithHost }}
+
+          <button [cdkCopyToClipboard]="account.nameWithHostForced" (click)="activateCopiedMessage()"
+                  class="btn btn-outline-secondary btn-sm copy-button"
+          >
+            <span class="glyphicon glyphicon-copy"></span>
+          </button>
+
+          </div>
+          <span *ngIf="accountUser?.blocked" [ngbTooltip]="accountUser.blockedReason" class="badge badge-danger" i18n>Banned</span>
+          <span *ngIf="account.mutedByUser" class="badge badge-danger" i18n>Muted</span>
+          <span *ngIf="account.mutedServerByUser" class="badge badge-danger" i18n>Instance muted</span>
+          <span *ngIf="account.mutedByInstance" class="badge badge-danger" i18n>Muted by your instance</span>
+          <span *ngIf="account.mutedServerByInstance" class="badge badge-danger" i18n>Instance muted by your instance</span>
+
+          <my-user-moderation-dropdown
+            buttonSize="small" [account]="account" [user]="accountUser" placement="bottom-left auto"
+            (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()"
+          ></my-user-moderation-dropdown>
+        </div>
+        <div class="actor-followers" [title]="accountFollowerTitle">
+          {{ subscribersDisplayFor(naiveAggregatedSubscribers) }}
         </div>
-        <div i18n class="actor-followers">{{ account.followersCount }} subscribers</div>
+      </div>
+
+      <div class="right-buttons">
+        <a *ngIf="isAccountManageable" routerLink="/my-account" class="btn btn-outline-tertiary mr-2" i18n>Manage</a>
+        <my-subscribe-button *ngIf="videoChannels" [account]="account" [videoChannels]="videoChannels"></my-subscribe-button>
       </div>
     </div>
 
     <div class="links">
-      <a i18n routerLink="videos" routerLinkActive="active" class="title-page">Videos</a>
-
       <a i18n routerLink="video-channels" routerLinkActive="active" class="title-page">Video channels</a>
 
+      <a i18n routerLink="videos" routerLinkActive="active" class="title-page">Videos</a>
+
       <a i18n routerLink="about" routerLinkActive="active" class="title-page">About</a>
     </div>
   </div>