aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorDeeJayBro <maricrafterminecraft@gmail.com>2018-07-12 12:43:42 -0500
committerRigel Kent <par@rigelk.eu>2018-07-12 19:43:42 +0200
commit4503cb2a894d9fb2b838cab0a9af8b3923e18a56 (patch)
tree008bedae409ec657ed439e47d3243c15d49e53ac /client/src
parentb63e428e8bf1ed1457ab1888350809bd78ce4d2f (diff)
downloadPeerTube-4503cb2a894d9fb2b838cab0a9af8b3923e18a56.tar.gz
PeerTube-4503cb2a894d9fb2b838cab0a9af8b3923e18a56.tar.zst
PeerTube-4503cb2a894d9fb2b838cab0a9af8b3923e18a56.zip
QR Code (#802)
Adding QR-Code to the Share modal. fixes #683
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/videos/+video-watch/modal/video-share.component.html5
-rw-r--r--client/src/app/videos/+video-watch/modal/video-share.component.scss4
-rw-r--r--client/src/app/videos/+video-watch/video-watch.module.ts4
3 files changed, 12 insertions, 1 deletions
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html
index 26ab5144a..74a3a57d4 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.html
@@ -36,6 +36,11 @@
36 The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). 36 The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
37 </div> 37 </div>
38 38
39 <div class="form-group qr-code-group">
40 <label i18n>QR-Code</label>
41 <ngx-qrcode qrc-element-type="url" [qrc-value]="getVideoUrl()" qrc-errorCorrectionLevel="Q"></ngx-qrcode>
42 </div>
43
39 <div class="form-group inputs"> 44 <div class="form-group inputs">
40 <span i18n class="action-button action-button-cancel" (click)="hide()"> 45 <span i18n class="action-button action-button-cancel" (click)="hide()">
41 Cancel 46 Cancel
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/videos/+video-watch/modal/video-share.component.scss
index 184e09027..c7f30bec5 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.scss
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.scss
@@ -1,3 +1,7 @@
1.action-button-cancel { 1.action-button-cancel {
2 margin-right: 0 !important; 2 margin-right: 0 !important;
3} 3}
4
5.qr-code-group {
6 text-align: center;
7}
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 63128926e..4af993043 100644
--- a/client/src/app/videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/videos/+video-watch/video-watch.module.ts
@@ -16,13 +16,15 @@ import { VideoShareComponent } from './modal/video-share.component'
16import { VideoWatchRoutingModule } from './video-watch-routing.module' 16import { VideoWatchRoutingModule } from './video-watch-routing.module'
17 17
18import { VideoWatchComponent } from './video-watch.component' 18import { VideoWatchComponent } from './video-watch.component'
19import { NgxQRCodeModule } from 'ngx-qrcode2'
19 20
20@NgModule({ 21@NgModule({
21 imports: [ 22 imports: [
22 VideoWatchRoutingModule, 23 VideoWatchRoutingModule,
23 SharedModule, 24 SharedModule,
24 ClipboardModule, 25 ClipboardModule,
25 TooltipModule.forRoot() 26 TooltipModule.forRoot(),
27 NgxQRCodeModule
26 ], 28 ],
27 29
28 declarations: [ 30 declarations: [