1 files changed, 35 insertions, 27 deletions

diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.html
index 598bc485d..362a21905 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.html
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-attributes.component.html
@@ -1,54 +1,62 @@
-<div class="video-attribute">
-  <span i18n class="video-attribute-label">Privacy</span>
-  <span class="video-attribute-value">{{ video.privacy.label }}</span>
+<div class="attribute">
+  <span i18n class="attribute-label">Privacy</span>
+  <span class="attribute-value">{{ video.privacy.label }}</span>
 </div>
 
-<div *ngIf="video.isLocal === false" class="video-attribute">
-  <span i18n class="video-attribute-label">Origin</span>
-  <a class="video-attribute-value" target="_blank" rel="noopener noreferrer" [href]="getVideoUrl()">{{ video.originInstanceHost }}</a>
+<div *ngIf="video.isLocal === false" class="attribute">
+  <span i18n class="attribute-label">Origin</span>
+  <a
+    class="attribute-value" target="_blank" rel="noopener noreferrer"
+    routerLink="/search" [queryParams]="{ host: getVideoHost() }"
+  >{{ video.originInstanceHost }}</a>
+
+  <a
+    i18n-title title="Open the video on the origin instance" class="glyphicon glyphicon-new-window"
+    target="_blank" rel="noopener noreferrer" [href]="getVideoUrl()"
+  ></a>
 </div>
 
-<div *ngIf="!!video.originallyPublishedAt" class="video-attribute">
-  <span i18n class="video-attribute-label">Originally published</span>
-  <span class="video-attribute-value">{{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}</span>
+<div *ngIf="!!video.originallyPublishedAt" class="attribute">
+  <span i18n class="attribute-label">Originally published</span>
+  <span class="attribute-value">{{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}</span>
 </div>
 
-<div class="video-attribute">
-  <span i18n class="video-attribute-label">Category</span>
-  <span *ngIf="!video.category.id" class="video-attribute-value">{{ video.category.label }}</span>
+<div class="attribute">
+  <span i18n class="attribute-label">Category</span>
+  <span *ngIf="!video.category.id" class="attribute-value">{{ video.category.label }}</span>
   <a
-    *ngIf="video.category.id" class="video-attribute-value"
+    *ngIf="video.category.id" class="attribute-value"
     [routerLink]="[ '/search' ]" [queryParams]="{ categoryOneOf: [ video.category.id ] }"
   >{{ video.category.label }}</a>
 </div>
 
-<div class="video-attribute">
-  <span i18n class="video-attribute-label">Licence</span>
-  <span *ngIf="!video.licence.id" class="video-attribute-value">{{ video.licence.label }}</span>
+<div class="attribute">
+  <span i18n class="attribute-label">Licence</span>
+  <span *ngIf="!video.licence.id" class="attribute-value">{{ video.licence.label }}</span>
   <a
-    *ngIf="video.licence.id" class="video-attribute-value"
+    *ngIf="video.licence.id" class="attribute-value"
     [routerLink]="[ '/search' ]" [queryParams]="{ licenceOneOf: [ video.licence.id ] }"
   >{{ video.licence.label }}</a>
 </div>
 
-<div class="video-attribute">
-  <span i18n class="video-attribute-label">Language</span>
-  <span *ngIf="!video.language.id" class="video-attribute-value">{{ video.language.label }}</span>
+<div class="attribute">
+  <span i18n class="attribute-label">Language</span>
+  <span *ngIf="!video.language.id" class="attribute-value">{{ video.language.label }}</span>
   <a
-    *ngIf="video.language.id" class="video-attribute-value"
+    *ngIf="video.language.id" class="attribute-value"
     [routerLink]="[ '/search' ]" [queryParams]="{ languageOneOf: [ video.language.id ] }"
   >{{ video.language.label }}</a>
 </div>
 
-<div class="video-attribute video-attribute-tags">
-  <span i18n class="video-attribute-label">Tags</span>
+<div class="attribute attribute-tags">
+  <span i18n class="attribute-label">Tags</span>
   <a
     *ngFor="let tag of getVideoTags()"
-    class="video-attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
+    class="attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
   >{{ tag }}</a>
 </div>
 
-<div class="video-attribute" *ngIf="!video.isLive">
-  <span i18n class="video-attribute-label">Duration</span>
-  <span class="video-attribute-value">{{ video.duration | myDurationFormatter }}</span>
+<div class="attribute" *ngIf="!video.isLive">
+  <span i18n class="attribute-label">Duration</span>
+  <span class="attribute-value">{{ video.duration | myDurationFormatter }}</span>
 </div>