aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+videos/+video-edit/shared/video-edit.component.html3
-rw-r--r--client/src/app/menu/menu.component.scss1
-rw-r--r--client/src/app/shared/shared-video-live/live-documentation-link.component.html4
-rw-r--r--client/src/app/shared/shared-video-live/live-documentation-link.component.ts10
-rw-r--r--client/src/app/shared/shared-video-live/live-stream-information.component.html4
-rw-r--r--client/src/app/shared/shared-video-live/shared-video-live.module.ts7
6 files changed, 27 insertions, 2 deletions
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
index 0c60ec4ec..d75f37074 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
@@ -210,6 +210,9 @@
210 <ng-template ngbNavContent> 210 <ng-template ngbNavContent>
211 <div class="row live-settings"> 211 <div class="row live-settings">
212 <div class="col-md-12"> 212 <div class="col-md-12">
213 <div class="alert alert-info">
214 <my-live-documentation-link></my-live-documentation-link>
215 </div>
213 216
214 <div class="form-group"> 217 <div class="form-group">
215 <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label> 218 <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label>
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 89dc26e87..f369fa17a 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -192,6 +192,7 @@ menu {
192 .logged-in-username { 192 .logged-in-username {
193 font-size: 13px; 193 font-size: 13px;
194 color: #C6C6C6; 194 color: #C6C6C6;
195 margin-top: 3px;
195 } 196 }
196 } 197 }
197 } 198 }
diff --git a/client/src/app/shared/shared-video-live/live-documentation-link.component.html b/client/src/app/shared/shared-video-live/live-documentation-link.component.html
new file mode 100644
index 000000000..0c54c7044
--- /dev/null
+++ b/client/src/app/shared/shared-video-live/live-documentation-link.component.html
@@ -0,0 +1,4 @@
1<div i18n>
2 See <a href="https://docs.joinpeertube.org/#/use-create-upload-video?id=publish-a-live-in-peertube-gt-v3" target="_blank" rel="noopener noreferrer">the documentation</a>
3 to learn how to use the PeerTube live streaming feature.
4</div>
diff --git a/client/src/app/shared/shared-video-live/live-documentation-link.component.ts b/client/src/app/shared/shared-video-live/live-documentation-link.component.ts
new file mode 100644
index 000000000..be4006ce8
--- /dev/null
+++ b/client/src/app/shared/shared-video-live/live-documentation-link.component.ts
@@ -0,0 +1,10 @@
1import { Component } from '@angular/core'
2
3@Component({
4 selector: 'my-live-documentation-link',
5 templateUrl: './live-documentation-link.component.html',
6 styleUrls: [ ]
7})
8export class LiveDocumentationLinkComponent {
9
10}
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html
index 8d9467fe5..e7b00cd01 100644
--- a/client/src/app/shared/shared-video-live/live-stream-information.component.html
+++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html
@@ -11,6 +11,10 @@
11 <div class="badge badge-info" *ngIf="live.saveReplay" i18n>Replay will be saved</div> 11 <div class="badge badge-info" *ngIf="live.saveReplay" i18n>Replay will be saved</div>
12 </div> 12 </div>
13 13
14 <div class="alert alert-info">
15 <my-live-documentation-link></my-live-documentation-link>
16 </div>
17
14 <div class="form-group"> 18 <div class="form-group">
15 <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label> 19 <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label>
16 <my-input-toggle-hidden id="liveVideoRTMPUrl" [value]="live.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> 20 <my-input-toggle-hidden id="liveVideoRTMPUrl" [value]="live.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden>
diff --git a/client/src/app/shared/shared-video-live/shared-video-live.module.ts b/client/src/app/shared/shared-video-live/shared-video-live.module.ts
index c35c2caa3..f5e153ac9 100644
--- a/client/src/app/shared/shared-video-live/shared-video-live.module.ts
+++ b/client/src/app/shared/shared-video-live/shared-video-live.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'
3import { SharedFormModule } from '../shared-forms' 3import { SharedFormModule } from '../shared-forms'
4import { SharedGlobalIconModule } from '../shared-icons' 4import { SharedGlobalIconModule } from '../shared-icons'
5import { SharedMainModule } from '../shared-main/shared-main.module' 5import { SharedMainModule } from '../shared-main/shared-main.module'
6import { LiveDocumentationLinkComponent } from './live-documentation-link.component'
6import { LiveStreamInformationComponent } from './live-stream-information.component' 7import { LiveStreamInformationComponent } from './live-stream-information.component'
7import { LiveVideoService } from './live-video.service' 8import { LiveVideoService } from './live-video.service'
8 9
@@ -14,11 +15,13 @@ import { LiveVideoService } from './live-video.service'
14 ], 15 ],
15 16
16 declarations: [ 17 declarations: [
17 LiveStreamInformationComponent 18 LiveStreamInformationComponent,
19 LiveDocumentationLinkComponent
18 ], 20 ],
19 21
20 exports: [ 22 exports: [
21 LiveStreamInformationComponent 23 LiveStreamInformationComponent,
24 LiveDocumentationLinkComponent
22 ], 25 ],
23 26
24 providers: [ 27 providers: [