aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/app.component.scss5
-rw-r--r--client/src/app/videos/+video-watch/video-share.component.html18
-rw-r--r--client/src/app/videos/+video-watch/video-share.component.scss3
-rw-r--r--client/src/app/videos/+video-watch/video-share.component.ts12
-rw-r--r--client/src/app/videos/+video-watch/video-watch.module.ts4
5 files changed, 37 insertions, 5 deletions
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 008c6d1f0..c0ec2025d 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -86,3 +86,8 @@ footer {
86 margin-top: $footer-margin; 86 margin-top: $footer-margin;
87 height: $footer-height; 87 height: $footer-height;
88} 88}
89
90simple-notifications {
91 position: relative;
92 z-index: 1500;
93}
diff --git a/client/src/app/videos/+video-watch/video-share.component.html b/client/src/app/videos/+video-watch/video-share.component.html
index 36ec38d88..52ee36a2e 100644
--- a/client/src/app/videos/+video-watch/video-share.component.html
+++ b/client/src/app/videos/+video-watch/video-share.component.html
@@ -12,12 +12,26 @@
12 <div class="modal-body"> 12 <div class="modal-body">
13 <div class="form-group"> 13 <div class="form-group">
14 <label>URL</label> 14 <label>URL</label>
15 <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoUrl()" /> 15 <div class="input-group">
16 <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoUrl()" />
17 <div class="input-group-btn" placement="bottom right">
18 <button [ngxClipboard]="urlInput" (click)="activateCopiedMessage()" type="button" class="btn btn-default btn-search">
19 <span class="glyphicon glyphicon-copy"></span>
20 </button>
21 </div>
22 </div>
16 </div> 23 </div>
17 24
18 <div class="form-group"> 25 <div class="form-group">
19 <label>Embed</label> 26 <label>Embed</label>
20 <input #shareInput (click)="shareInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoIframeCode()" /> 27 <div class="input-group">
28 <input #shareInput (click)="shareInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoIframeCode()" />
29 <div class="input-group-btn" placement="bottom right">
30 <button [ngxClipboard]="shareInput" (click)="activateCopiedMessage()" type="button" class="btn btn-default btn-search">
31 <span class="glyphicon glyphicon-copy"></span>
32 </button>
33 </div>
34 </div>
21 </div> 35 </div>
22 36
23 <div *ngIf="notSecure()" class="alert alert-warning"> 37 <div *ngIf="notSecure()" class="alert alert-warning">
diff --git a/client/src/app/videos/+video-watch/video-share.component.scss b/client/src/app/videos/+video-watch/video-share.component.scss
new file mode 100644
index 000000000..519631792
--- /dev/null
+++ b/client/src/app/videos/+video-watch/video-share.component.scss
@@ -0,0 +1,3 @@
1.btn-search {
2 padding: 4.1px 12px;
3}
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 4df9adf29..0664c28be 100644
--- a/client/src/app/videos/+video-watch/video-share.component.ts
+++ b/client/src/app/videos/+video-watch/video-share.component.ts
@@ -1,17 +1,21 @@
1import { Component, Input, ViewChild } from '@angular/core' 1import { Component, Input, ViewChild } from '@angular/core'
2
3import { NotificationsService } from 'angular2-notifications'
4
2import { ModalDirective } from 'ngx-bootstrap/modal' 5import { ModalDirective } from 'ngx-bootstrap/modal'
3import { VideoDetails } from '../../shared/video/video-details.model' 6import { VideoDetails } from '../../shared/video/video-details.model'
4 7
5@Component({ 8@Component({
6 selector: 'my-video-share', 9 selector: 'my-video-share',
7 templateUrl: './video-share.component.html' 10 templateUrl: './video-share.component.html',
11 styleUrls: [ './video-share.component.scss' ]
8}) 12})
9export class VideoShareComponent { 13export class VideoShareComponent {
10 @Input() video: VideoDetails = null 14 @Input() video: VideoDetails = null
11 15
12 @ViewChild('modal') modal: ModalDirective 16 @ViewChild('modal') modal: ModalDirective
13 17
14 constructor () { 18 constructor (private notificationsService: NotificationsService) {
15 // empty 19 // empty
16 } 20 }
17 21
@@ -37,4 +41,8 @@ export class VideoShareComponent {
37 notSecure () { 41 notSecure () {
38 return window.location.protocol === 'http:' 42 return window.location.protocol === 'http:'
39 } 43 }
44
45 activateCopiedMessage () {
46 this.notificationsService.success('Success', 'Copied')
47 }
40} 48}
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts
index 0b1dd5c15..18319de1a 100644
--- a/client/src/app/videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/videos/+video-watch/video-watch.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'
3import { VideoWatchRoutingModule } from './video-watch-routing.module' 3import { VideoWatchRoutingModule } from './video-watch-routing.module'
4import { MarkdownService } from '../shared' 4import { MarkdownService } from '../shared'
5import { SharedModule } from '../../shared' 5import { SharedModule } from '../../shared'
6import { ClipboardModule } from 'ngx-clipboard'
6 7
7import { VideoWatchComponent } from './video-watch.component' 8import { VideoWatchComponent } from './video-watch.component'
8import { VideoReportComponent } from './video-report.component' 9import { VideoReportComponent } from './video-report.component'
@@ -12,7 +13,8 @@ import { VideoDownloadComponent } from './video-download.component'
12@NgModule({ 13@NgModule({
13 imports: [ 14 imports: [
14 VideoWatchRoutingModule, 15 VideoWatchRoutingModule,
15 SharedModule 16 SharedModule,
17 ClipboardModule
16 ], 18 ],
17 19
18 declarations: [ 20 declarations: [