From: MahdiTurki <mahditurki123@yahoo.fr>
Date: Mon, 27 Apr 2020 11:37:18 +0000 (+0100)
Subject: Change button
X-Git-Tag: v3.0.0-rc.1~36
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=bd49f8e988429447747e34533df5eab5b7bed210;p=github%2FChocobozzz%2FPeerTube.git

Change button
---

diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html
index fbca9f3b0..50e00b651 100644
--- a/client/src/app/+about/about-follows/about-follows.component.html
+++ b/client/src/app/+about/about-follows/about-follows.component.html
@@ -9,7 +9,7 @@
       {{ follower }}
     </a>
 
-    <a id="showMore" href="javascript:;" *ngIf="!showMoreFollowers" (click)="loadAllFollowers()" (click)= "showMoreFollowers=true">Show full list</a> 
+    <a i18n class="showMore" *ngIf="!showMoreFollowers" (click)="loadAllFollowers()" (click)= "showMoreFollowers=true">Show full list</a>
   </div>
 
   <div class="col-xl-6 col-md-12">
@@ -17,11 +17,19 @@
 
     <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div>
 
+<<<<<<< HEAD
+||||||| parent of 932e04c48 (Change button)
+    <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
+    
+=======
+    <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
+
+>>>>>>> 932e04c48 (Change button)
     <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer">
       {{ following }}
     </a>
-    
-    <a id="showMore" href="javascript:;" *ngIf="!showMoreFollowings" (click)="loadAllFollowings()" (click)= "showMoreFollowings=true">Show full list</a>   
+
+    <a i18n class="showMore" *ngIf="!showMoreFollowings" (click)="loadAllFollowings()" (click)= "showMoreFollowings=true">Show full list</a>
   </div>
 
 </div>
diff --git a/client/src/app/+about/about-follows/about-follows.component.scss b/client/src/app/+about/about-follows/about-follows.component.scss
index 32a015e89..f01484702 100644
--- a/client/src/app/+about/about-follows/about-follows.component.scss
+++ b/client/src/app/+about/about-follows/about-follows.component.scss
@@ -17,6 +17,8 @@ a {
   justify-content: flex-start;
 }
 
-#showMore {
-  color: black;
+.showMore {
+  @include peertube-button-link;
+  padding: 0;
+  text-align: left;
 }
diff --git a/client/src/app/+about/about-follows/about-follows.component.ts b/client/src/app/+about/about-follows/about-follows.component.ts
index d88974b59..e5526248c 100644
--- a/client/src/app/+about/about-follows/about-follows.component.ts
+++ b/client/src/app/+about/about-follows/about-follows.component.ts
@@ -14,8 +14,8 @@ export class AboutFollowsComponent implements OnInit {
   followers: string[] = []
   followings: string[] = []
 
-  showMoreFollowers = false;
-  showMoreFollowings = false;
+  showMoreFollowers = false
+  showMoreFollowings = false
 
   followersPagination: ComponentPagination = {
     currentPage: 1,
@@ -49,7 +49,7 @@ export class AboutFollowsComponent implements OnInit {
   }
 
   loadAllFollowings () {
-    while(hasMoreItems(this.followingsPagination)) {
+    while (hasMoreItems(this.followingsPagination)) {
       this.followingsPagination.currentPage += 1
 
       this.loadMoreFollowings()
@@ -57,10 +57,10 @@ export class AboutFollowsComponent implements OnInit {
   }
 
   loadAllFollowers () {
-    while(hasMoreItems(this.followersPagination)) {
+    while (hasMoreItems(this.followersPagination)) {
       this.followersPagination.currentPage += 1
-      
-      this.loadMoreFollowers();
+
+      this.loadMoreFollowers()
     }
   }