aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/app.module.ts2
-rw-r--r--client/src/app/core/confirm/confirm.component.ts2
-rw-r--r--client/src/app/core/core.module.ts2
-rw-r--r--client/src/app/shared/search/search.component.html2
-rw-r--r--client/src/app/shared/shared.module.ts12
-rw-r--r--client/src/app/videos/video-edit/video-edit.component.scss5
-rw-r--r--client/src/app/videos/video-edit/video-update.component.html2
-rw-r--r--client/src/app/videos/video-watch/video-magnet.component.ts2
-rw-r--r--client/src/app/videos/video-watch/video-report.component.ts2
-rw-r--r--client/src/app/videos/video-watch/video-share.component.ts2
-rw-r--r--client/src/app/videos/video-watch/video-watch.component.html6
-rw-r--r--client/src/app/videos/videos.module.ts4
12 files changed, 22 insertions, 21 deletions
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 534651cea..7d1760fcd 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -3,6 +3,8 @@ import { BrowserModule } from '@angular/platform-browser';
3import { removeNgStyles, createNewHosts } from '@angularclass/hmr'; 3import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
4 4
5import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta'; 5import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta';
6// TODO: remove, we need this to avoid error in ng2-smart-table
7import 'rxjs/add/operator/toPromise';
6import 'bootstrap-loader'; 8import 'bootstrap-loader';
7 9
8import { ENV_PROVIDERS } from './environment'; 10import { ENV_PROVIDERS } from './environment';
diff --git a/client/src/app/core/confirm/confirm.component.ts b/client/src/app/core/confirm/confirm.component.ts
index 14b4ef324..ae42ff68a 100644
--- a/client/src/app/core/confirm/confirm.component.ts
+++ b/client/src/app/core/confirm/confirm.component.ts
@@ -1,6 +1,6 @@
1import { Component, HostListener, OnInit, ViewChild } from '@angular/core'; 1import { Component, HostListener, OnInit, ViewChild } from '@angular/core';
2 2
3import { ModalDirective } from 'ng2-bootstrap/modal'; 3import { ModalDirective } from 'ngx-bootstrap/modal';
4 4
5import { ConfirmService } from './confirm.service'; 5import { ConfirmService } from './confirm.service';
6 6
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 9a5ee5221..81c8f2da6 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -4,7 +4,7 @@ import { HttpModule } from '@angular/http';
4import { RouterModule } from '@angular/router'; 4import { RouterModule } from '@angular/router';
5 5
6import { SimpleNotificationsModule } from 'angular2-notifications'; 6import { SimpleNotificationsModule } from 'angular2-notifications';
7import { ModalModule } from 'ng2-bootstrap/modal'; 7import { ModalModule } from 'ngx-bootstrap/modal';
8 8
9import { AuthService } from './auth'; 9import { AuthService } from './auth';
10import { ConfigService } from './config'; 10import { ConfigService } from './config';
diff --git a/client/src/app/shared/search/search.component.html b/client/src/app/shared/search/search.component.html
index b3afc9598..0c7b5038a 100644
--- a/client/src/app/shared/search/search.component.html
+++ b/client/src/app/shared/search/search.component.html
@@ -3,7 +3,7 @@
3 <button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdownToggle> 3 <button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdownToggle>
4 {{ getStringChoice(searchCriterias.field) }} <span class="caret"></span> 4 {{ getStringChoice(searchCriterias.field) }} <span class="caret"></span>
5 </button> 5 </button>
6 <ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav" dropdownMenu> 6 <ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav" *dropdownMenu>
7 <li *ngFor="let choice of choiceKeys" class="dropdown-item" role="menu-item"> 7 <li *ngFor="let choice of choiceKeys" class="dropdown-item" role="menu-item">
8 <a class="dropdown-item" href="#" (click)="choose($event, choice)">{{ getStringChoice(choice) }}</a> 8 <a class="dropdown-item" href="#" (click)="choose($event, choice)">{{ getStringChoice(choice) }}</a>
9 </li> 9 </li>
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 84cc86c64..8ffaf964b 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -6,10 +6,10 @@ import { RouterModule } from '@angular/router';
6 6
7import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; 7import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
8import { KeysPipe } from 'angular-pipes/src/object/keys.pipe'; 8import { KeysPipe } from 'angular-pipes/src/object/keys.pipe';
9import { DropdownModule } from 'ng2-bootstrap/dropdown'; 9import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
10import { ProgressbarModule } from 'ng2-bootstrap/progressbar'; 10import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
11import { PaginationModule } from 'ng2-bootstrap/pagination'; 11import { PaginationModule } from 'ngx-bootstrap/pagination';
12import { ModalModule } from 'ng2-bootstrap/modal'; 12import { ModalModule } from 'ngx-bootstrap/modal';
13import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; 13import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
14import { Ng2SmartTableModule } from 'ng2-smart-table'; 14import { Ng2SmartTableModule } from 'ng2-smart-table';
15 15
@@ -27,7 +27,7 @@ import { VideoAbuseService } from './video-abuse';
27 HttpModule, 27 HttpModule,
28 RouterModule, 28 RouterModule,
29 29
30 DropdownModule.forRoot(), 30 BsDropdownModule.forRoot(),
31 ModalModule.forRoot(), 31 ModalModule.forRoot(),
32 PaginationModule.forRoot(), 32 PaginationModule.forRoot(),
33 ProgressbarModule.forRoot(), 33 ProgressbarModule.forRoot(),
@@ -49,7 +49,7 @@ import { VideoAbuseService } from './video-abuse';
49 HttpModule, 49 HttpModule,
50 RouterModule, 50 RouterModule,
51 51
52 DropdownModule, 52 BsDropdownModule,
53 FileUploadModule, 53 FileUploadModule,
54 ModalModule, 54 ModalModule,
55 PaginationModule, 55 PaginationModule,
diff --git a/client/src/app/videos/video-edit/video-edit.component.scss b/client/src/app/videos/video-edit/video-edit.component.scss
index 11ee3297e..92b731191 100644
--- a/client/src/app/videos/video-edit/video-edit.component.scss
+++ b/client/src/app/videos/video-edit/video-edit.component.scss
@@ -20,11 +20,6 @@
20 display: block; 20 display: block;
21} 21}
22 22
23.name_file {
24 display: inline-block;
25 margin-left: 10px;
26}
27
28.form-group { 23.form-group {
29 margin-bottom: 10px; 24 margin-bottom: 10px;
30} 25}
diff --git a/client/src/app/videos/video-edit/video-update.component.html b/client/src/app/videos/video-edit/video-update.component.html
index 665a952d0..2e10d5bf7 100644
--- a/client/src/app/videos/video-edit/video-update.component.html
+++ b/client/src/app/videos/video-edit/video-update.component.html
@@ -1,4 +1,4 @@
1<h3>Update {{ video.name }}</h3> 1<h3>Update {{ video?.name }}</h3>
2 2
3<div *ngIf="error" class="alert alert-danger">{{ error }}</div> 3<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
4 4
diff --git a/client/src/app/videos/video-watch/video-magnet.component.ts b/client/src/app/videos/video-watch/video-magnet.component.ts
index 8bee848a4..894fa45fc 100644
--- a/client/src/app/videos/video-watch/video-magnet.component.ts
+++ b/client/src/app/videos/video-watch/video-magnet.component.ts
@@ -1,6 +1,6 @@
1import { Component, Input, ViewChild } from '@angular/core'; 1import { Component, Input, ViewChild } from '@angular/core';
2 2
3import { ModalDirective } from 'ng2-bootstrap/modal'; 3import { ModalDirective } from 'ngx-bootstrap/modal';
4 4
5import { Video } from '../shared'; 5import { Video } from '../shared';
6 6
diff --git a/client/src/app/videos/video-watch/video-report.component.ts b/client/src/app/videos/video-watch/video-report.component.ts
index c4cf936ce..528005b84 100644
--- a/client/src/app/videos/video-watch/video-report.component.ts
+++ b/client/src/app/videos/video-watch/video-report.component.ts
@@ -1,7 +1,7 @@
1import { Component, Input, OnInit, ViewChild } from '@angular/core'; 1import { Component, Input, OnInit, ViewChild } from '@angular/core';
2import { FormBuilder, FormGroup } from '@angular/forms'; 2import { FormBuilder, FormGroup } from '@angular/forms';
3 3
4import { ModalDirective } from 'ng2-bootstrap/modal'; 4import { ModalDirective } from 'ngx-bootstrap/modal';
5import { NotificationsService } from 'angular2-notifications'; 5import { NotificationsService } from 'angular2-notifications';
6 6
7import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared'; 7import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared';
diff --git a/client/src/app/videos/video-watch/video-share.component.ts b/client/src/app/videos/video-watch/video-share.component.ts
index 0b85052cd..aa921afc2 100644
--- a/client/src/app/videos/video-watch/video-share.component.ts
+++ b/client/src/app/videos/video-watch/video-share.component.ts
@@ -1,6 +1,6 @@
1import { Component, Input, ViewChild } from '@angular/core'; 1import { Component, Input, ViewChild } from '@angular/core';
2 2
3import { ModalDirective } from 'ng2-bootstrap/modal'; 3import { ModalDirective } from 'ngx-bootstrap/modal';
4 4
5import { Video } from '../shared'; 5import { Video } from '../shared';
6 6
diff --git a/client/src/app/videos/video-watch/video-watch.component.html b/client/src/app/videos/video-watch/video-watch.component.html
index 2a6b15dc9..19e9bd9ed 100644
--- a/client/src/app/videos/video-watch/video-watch.component.html
+++ b/client/src/app/videos/video-watch/video-watch.component.html
@@ -78,7 +78,7 @@
78 <span class="glyphicon glyphicon-option-horizontal"></span> More 78 <span class="glyphicon glyphicon-option-horizontal"></span> More
79 </button> 79 </button>
80 80
81 <ul dropdownMenu id="more-menu" role="menu" aria-labelledby="single-button"> 81 <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
82 <li *ngIf="canUserUpdateVideo()" role="menuitem"> 82 <li *ngIf="canUserUpdateVideo()" role="menuitem">
83 <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.id ]"> 83 <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.id ]">
84 <span class="glyphicon glyphicon-pencil"></span> Update 84 <span class="glyphicon glyphicon-pencil"></span> Update
@@ -142,8 +142,8 @@
142 </div> 142 </div>
143</div> 143</div>
144 144
145<template [ngIf]="video !== null"> 145<ng-template [ngIf]="video !== null">
146 <my-video-share #videoShareModal [video]="video"></my-video-share> 146 <my-video-share #videoShareModal [video]="video"></my-video-share>
147 <my-video-magnet #videoMagnetModal [video]="video"></my-video-magnet> 147 <my-video-magnet #videoMagnetModal [video]="video"></my-video-magnet>
148 <my-video-report #videoReportModal [video]="video"></my-video-report> 148 <my-video-report #videoReportModal [video]="video"></my-video-report>
149</template> 149</ng-template>
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/videos/videos.module.ts
index fa37ad966..4f2839c85 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/videos/videos.module.ts
@@ -1,5 +1,7 @@
1import { NgModule } from '@angular/core'; 1import { NgModule } from '@angular/core';
2 2
3// import { TagInputModule } from 'ng2-tag-input';
4
3import { VideosRoutingModule } from './videos-routing.module'; 5import { VideosRoutingModule } from './videos-routing.module';
4import { VideosComponent } from './videos.component'; 6import { VideosComponent } from './videos.component';
5import { VideoAddComponent, VideoUpdateComponent } from './video-edit'; 7import { VideoAddComponent, VideoUpdateComponent } from './video-edit';
@@ -16,6 +18,8 @@ import { SharedModule } from '../shared';
16 18
17@NgModule({ 19@NgModule({
18 imports: [ 20 imports: [
21 // TagInputModule,
22
19 VideosRoutingModule, 23 VideosRoutingModule,
20 SharedModule 24 SharedModule
21 ], 25 ],