aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMahdiTurki <mahditurki123@yahoo.fr>2020-04-27 12:37:18 +0100
committerChocobozzz <me@florianbigard.com>2020-12-14 09:57:41 +0100
commitbd49f8e988429447747e34533df5eab5b7bed210 (patch)
tree173112cce1ee70dc5dfe27ba32c3c8130f2e7fe6
parent49c4dd7ec32e210537e98aca11a391c025224c0f (diff)
downloadPeerTube-bd49f8e988429447747e34533df5eab5b7bed210.tar.gz
PeerTube-bd49f8e988429447747e34533df5eab5b7bed210.tar.zst
PeerTube-bd49f8e988429447747e34533df5eab5b7bed210.zip
Change button
-rw-r--r--client/src/app/+about/about-follows/about-follows.component.html14
-rw-r--r--client/src/app/+about/about-follows/about-follows.component.scss6
-rw-r--r--client/src/app/+about/about-follows/about-follows.component.ts12
3 files changed, 21 insertions, 11 deletions
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 @@
9 {{ follower }} 9 {{ follower }}
10 </a> 10 </a>
11 11
12 <a id="showMore" href="javascript:;" *ngIf="!showMoreFollowers" (click)="loadAllFollowers()" (click)= "showMoreFollowers=true">Show full list</a> 12 <a i18n class="showMore" *ngIf="!showMoreFollowers" (click)="loadAllFollowers()" (click)= "showMoreFollowers=true">Show full list</a>
13 </div> 13 </div>
14 14
15 <div class="col-xl-6 col-md-12"> 15 <div class="col-xl-6 col-md-12">
@@ -17,11 +17,19 @@
17 17
18 <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div> 18 <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div>
19 19
20<<<<<<< HEAD
21||||||| parent of 932e04c48 (Change button)
22 <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
23
24=======
25 <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
26
27>>>>>>> 932e04c48 (Change button)
20 <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer"> 28 <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer">
21 {{ following }} 29 {{ following }}
22 </a> 30 </a>
23 31
24 <a id="showMore" href="javascript:;" *ngIf="!showMoreFollowings" (click)="loadAllFollowings()" (click)= "showMoreFollowings=true">Show full list</a> 32 <a i18n class="showMore" *ngIf="!showMoreFollowings" (click)="loadAllFollowings()" (click)= "showMoreFollowings=true">Show full list</a>
25 </div> 33 </div>
26 34
27</div> 35</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 {
17 justify-content: flex-start; 17 justify-content: flex-start;
18} 18}
19 19
20#showMore { 20.showMore {
21 color: black; 21 @include peertube-button-link;
22 padding: 0;
23 text-align: left;
22} 24}
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 {
14 followers: string[] = [] 14 followers: string[] = []
15 followings: string[] = [] 15 followings: string[] = []
16 16
17 showMoreFollowers = false; 17 showMoreFollowers = false
18 showMoreFollowings = false; 18 showMoreFollowings = false
19 19
20 followersPagination: ComponentPagination = { 20 followersPagination: ComponentPagination = {
21 currentPage: 1, 21 currentPage: 1,
@@ -49,7 +49,7 @@ export class AboutFollowsComponent implements OnInit {
49 } 49 }
50 50
51 loadAllFollowings () { 51 loadAllFollowings () {
52 while(hasMoreItems(this.followingsPagination)) { 52 while (hasMoreItems(this.followingsPagination)) {
53 this.followingsPagination.currentPage += 1 53 this.followingsPagination.currentPage += 1
54 54
55 this.loadMoreFollowings() 55 this.loadMoreFollowings()
@@ -57,10 +57,10 @@ export class AboutFollowsComponent implements OnInit {
57 } 57 }
58 58
59 loadAllFollowers () { 59 loadAllFollowers () {
60 while(hasMoreItems(this.followersPagination)) { 60 while (hasMoreItems(this.followersPagination)) {
61 this.followersPagination.currentPage += 1 61 this.followersPagination.currentPage += 1
62 62
63 this.loadMoreFollowers(); 63 this.loadMoreFollowers()
64 } 64 }
65 } 65 }
66 66