aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/jobs/shared/job.service.ts2
-rw-r--r--client/src/app/account/account-settings/account-settings.component.scss1
-rw-r--r--client/src/app/app.component.ts5
-rw-r--r--client/src/app/videos/+video-edit/shared/video-description.component.html2
-rw-r--r--client/src/app/videos/+video-edit/shared/video-description.component.ts5
-rw-r--r--client/src/sass/application.scss6
-rw-r--r--client/src/sass/include/_mixins.scss1
7 files changed, 15 insertions, 7 deletions
diff --git a/client/src/app/+admin/jobs/shared/job.service.ts b/client/src/app/+admin/jobs/shared/job.service.ts
index a19d278c9..1c0915b5e 100644
--- a/client/src/app/+admin/jobs/shared/job.service.ts
+++ b/client/src/app/+admin/jobs/shared/job.service.ts
@@ -25,7 +25,7 @@ export class JobService {
25 params = this.restService.addRestGetParams(params, pagination, sort) 25 params = this.restService.addRestGetParams(params, pagination, sort)
26 26
27 return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + state, { params }) 27 return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + '/' + state, { params })
28 .map(res => this.restExtractor.convertResultListDateToHuman(res)) 28 .map(res => this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'updatedAt' ]))
29 .map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData)) 29 .map(res => this.restExtractor.applyToResultListData(res, this.prettyPrintData))
30 .catch(err => this.restExtractor.handleError(err)) 30 .catch(err => this.restExtractor.handleError(err))
31 } 31 }
diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/account/account-settings/account-settings.component.scss
index aaf9d79f0..1cc00ca49 100644
--- a/client/src/app/account/account-settings/account-settings.component.scss
+++ b/client/src/app/account/account-settings/account-settings.component.scss
@@ -26,6 +26,7 @@
26 @include peertube-button-file(160px); 26 @include peertube-button-file(160px);
27 27
28 margin-top: 10px; 28 margin-top: 10px;
29 margin-bottom: 5px;
29} 30}
30 31
31.file-max-size { 32.file-max-size {
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 584640290..d2678096f 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,6 +1,7 @@
1import { Component, OnInit } from '@angular/core' 1import { Component, OnInit } from '@angular/core'
2import { NavigationEnd, Router } from '@angular/router' 2import { NavigationEnd, Router } from '@angular/router'
3import { AuthService, ServerService } from '@app/core' 3import { AuthService, ServerService } from '@app/core'
4import { isInMobileView } from '@app/shared/misc/utils'
4 5
5@Component({ 6@Component({
6 selector: 'my-app', 7 selector: 'my-app',
@@ -49,14 +50,14 @@ export class AppComponent implements OnInit {
49 this.serverService.loadVideoPrivacies() 50 this.serverService.loadVideoPrivacies()
50 51
51 // Do not display menu on small screens 52 // Do not display menu on small screens
52 if (window.innerWidth < 600) { 53 if (isInMobileView()) {
53 this.isMenuDisplayed = false 54 this.isMenuDisplayed = false
54 } 55 }
55 56
56 this.router.events.subscribe( 57 this.router.events.subscribe(
57 e => { 58 e => {
58 // User clicked on a link in the menu, change the page 59 // User clicked on a link in the menu, change the page
59 if (e instanceof NavigationEnd && window.innerWidth < 600) { 60 if (e instanceof NavigationEnd && isInMobileView()) {
60 this.isMenuDisplayed = false 61 this.isMenuDisplayed = false
61 } 62 }
62 } 63 }
diff --git a/client/src/app/videos/+video-edit/shared/video-description.component.html b/client/src/app/videos/+video-edit/shared/video-description.component.html
index 5d05467be..989292c47 100644
--- a/client/src/app/videos/+video-edit/shared/video-description.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-description.component.html
@@ -3,7 +3,7 @@
3 id="description" name="description"> 3 id="description" name="description">
4</textarea> 4</textarea>
5 5
6<tabset #staticTabs class="previews"> 6<tabset *ngIf="arePreviewsDisplayed()" #staticTabs class="previews">
7 <tab heading="Truncated description preview" [innerHTML]="truncatedDescriptionHTML"></tab> 7 <tab heading="Truncated description preview" [innerHTML]="truncatedDescriptionHTML"></tab>
8 <tab heading="Complete description preview" [innerHTML]="descriptionHTML"></tab> 8 <tab heading="Complete description preview" [innerHTML]="descriptionHTML"></tab>
9</tabset> 9</tabset>
diff --git a/client/src/app/videos/+video-edit/shared/video-description.component.ts b/client/src/app/videos/+video-edit/shared/video-description.component.ts
index 34dbc21a6..eba345412 100644
--- a/client/src/app/videos/+video-edit/shared/video-description.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-description.component.ts
@@ -2,6 +2,7 @@ import { Component, forwardRef, Input, OnInit } from '@angular/core'
2import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' 2import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
3import 'rxjs/add/operator/debounceTime' 3import 'rxjs/add/operator/debounceTime'
4import 'rxjs/add/operator/distinctUntilChanged' 4import 'rxjs/add/operator/distinctUntilChanged'
5import { isInMobileView } from '@app/shared/misc/utils'
5import { Subject } from 'rxjs/Subject' 6import { Subject } from 'rxjs/Subject'
6import { MarkdownService } from '../../shared' 7import { MarkdownService } from '../../shared'
7import truncate from 'lodash-es/truncate' 8import truncate from 'lodash-es/truncate'
@@ -59,6 +60,10 @@ export class VideoDescriptionComponent implements ControlValueAccessor, OnInit {
59 this.descriptionChanged.next(this.description) 60 this.descriptionChanged.next(this.description)
60 } 61 }
61 62
63 arePreviewsDisplayed () {
64 return isInMobileView() === false
65 }
66
62 private updateDescriptionPreviews () { 67 private updateDescriptionPreviews () {
63 if (!this.description) return 68 if (!this.description) return
64 69
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 82c4bca74..5363b759b 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -312,7 +312,7 @@ p-datatable {
312 .tab-link { 312 .tab-link {
313 display: flex !important; 313 display: flex !important;
314 align-items: center; 314 align-items: center;
315 height: 30px !important; 315 min-height: 30px !important;
316 padding: 0 15px; 316 padding: 0 15px;
317 } 317 }
318 318
@@ -373,8 +373,8 @@ table {
373 373
374 &, &.expanded { 374 &, &.expanded {
375 .margin-content { 375 .margin-content {
376 margin-left: 10px; 376 margin-left: 15px;
377 margin-right: 10px; 377 margin-right: 15px;
378 } 378 }
379 379
380 .sub-menu { 380 .sub-menu {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 1237e675d..eb3b1d283 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -259,6 +259,7 @@
259 font-weight: $font-regular; 259 font-weight: $font-regular;
260 margin-left: 5px; 260 margin-left: 5px;
261 cursor: pointer; 261 cursor: pointer;
262 display: inline;
262 } 263 }
263} 264}
264 265