<div class="video-edit" [formGroup]="form">
<div ngbNav #nav="ngbNav" class="nav-tabs">
+ <ng-template #pluginSettingTemplate let-pluginSetting>
+ <div class="form-group" [hidden]="isPluginFieldHidden(pluginSetting)">
+ <my-dynamic-form-field [form]="pluginDataFormGroup" [formErrors]="formErrors['pluginData']" [setting]="pluginSetting.commonOptions"></my-dynamic-form-field>
+ </div>
+ </ng-template>
+
<ng-container ngbNavItem>
<a ngbNavLink i18n>Basic info</a>
</div>
<div class="form-group">
- <label i18n class="label-tags">Tags</label>
+ <label for="label-tags" i18n class="label-tags">Tags</label>
<my-help>
<ng-template ptTemplate="customHtml">
<my-help helpType="markdownText">
<ng-template ptTemplate="preHtml">
- <ng-container i18n>
- Video descriptions are truncated by default and require manual action to expand them.
- </ng-container>
+ <ng-container i18n>Video descriptions are truncated by default and require manual action to expand them.</ng-container>
+
+ <br />
+
+ <ng-container i18n>A timestamp (<i>00:05</i> for example) is automatically converted into a link to a part of the video.</ng-container>
</ng-template>
</my-help>
- <my-markdown-textarea [truncate]="250" formControlName="description" [markdownVideo]="true"></my-markdown-textarea>
-
- <div *ngIf="formErrors.description" class="form-error">
- {{ formErrors.description }}
- </div>
+ <my-markdown-textarea
+ formControlName="description" [markdownVideo]="videoToUpdate"
+ [formError]="formErrors.description" [truncate]="250"
+ ></my-markdown-textarea>
</div>
</div>
<my-help>
<ng-template ptTemplate="customHtml">
<ng-container i18n>
- <a href="https://chooser-beta.creativecommons.org/" target="_blank" rel="noopener noreferrer">Choose</a> the appropriate license for your work.
+ <a href="https://chooser-beta.creativecommons.org/" target="_blank" rel="noopener noreferrer">Choose</a> the appropriate licence for your work.
</ng-container>
</ng-template>
</my-help>
</ng-template>
</my-peertube-checkbox>
- <my-peertube-checkbox *ngIf="waitTranscodingEnabled" inputName="waitTranscoding" formControlName="waitTranscoding" helpPlacement="bottom-right">
+ <my-peertube-checkbox *ngIf="!hideWaitTranscoding" inputName="waitTranscoding" formControlName="waitTranscoding" helpPlacement="bottom-right">
<ng-template ptTemplate="label">
<ng-container i18n>Publish after transcoding</ng-container>
</ng-template>
<ng-template ptTemplate="help">
- <ng-container i18n>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</ng-container>
+ <ng-container i18n>The video may be unplayable during the transcoding process. It's the reason why we prefer to publish publicly the video after transcoding.</ng-container>
</ng-template>
</my-peertube-checkbox>
+ <ng-container
+ *ngFor="let pluginSetting of getPluginsFields('main')"
+ [ngTemplateOutlet]="pluginSettingTemplate" [ngTemplateOutletContext]="{ $implicit: pluginSetting }"
+ >
+ </ng-container>
</div>
</div>
</ng-template>
<div class="captions">
<div class="captions-header">
- <a (click)="openAddCaptionModal()" class="create-caption">
+ <button (click)="openAddCaptionModal()" class="peertube-create-button">
<my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Add another caption</ng-container>
- </a>
+ </button>
</div>
<div class="form-group" *ngFor="let videoCaption of videoCaptions">
[href]="videoCaption.captionPath"
>{{ videoCaption.language.label }}</a>
- <div i18n class="caption-entry-state">Already uploaded ✔</div>
+ <div i18n class="caption-entry-state">Already uploaded on {{ videoCaption.updatedAt | date }} ✔</div>
- <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</span>
+ <button i18n class="caption-entry-edit" (click)="openEditCaptionModal(videoCaption)">Edit</button>
+ <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</button>
</ng-container>
<ng-container *ngIf="videoCaption.action === 'CREATE'">
<div i18n class="caption-entry-state caption-entry-state-create">Will be created on update</div>
- <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel create</span>
+ <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel create</button>
+ </ng-container>
+
+ <ng-container *ngIf="videoCaption.action === 'UPDATE'">
+ <span class="caption-entry-label">{{ videoCaption.language.label }}</span>
+
+ <div i18n class="caption-entry-state caption-entry-state-create">Will be edited on update</div>
+
+ <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel edition</button>
</ng-container>
<ng-container *ngIf="videoCaption.action === 'REMOVE'">
<div i18n class="caption-entry-state caption-entry-state-delete">Will be deleted on update</div>
- <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel deletion</span>
+ <button i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Cancel deletion</button>
</ng-container>
</div>
</div>
<ng-template ngbNavContent>
<div class="row live-settings">
<div class="col-md-12">
- <div class="alert alert-info">
+ <div class="alert pt-alert-primary">
<my-live-documentation-link></my-live-documentation-link>
</div>
- <div class="form-group">
+ <div *ngIf="liveVideo.rtmpUrl" class="form-group">
<label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label>
- <my-input-toggle-hidden inputId="liveVideoRTMPUrl" [value]="liveVideo.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden>
+ <my-input-text inputId="liveVideoRTMPUrl" [value]="liveVideo.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text>
+ </div>
+
+ <div *ngIf="liveVideo.rtmpsUrl" class="form-group">
+ <label for="liveVideoRTMPSUrl" i18n>Live RTMPS Url</label>
+ <my-input-text inputId="liveVideoRTMPSUrl" [value]="liveVideo.rtmpsUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text>
</div>
<div class="form-group">
<label for="liveVideoStreamKey" i18n>Live stream key</label>
- <my-input-toggle-hidden inputId="liveVideoStreamKey" [value]="liveVideo.streamKey" [withCopy]="true" [readonly]="true"></my-input-toggle-hidden>
+ <my-input-text inputId="liveVideoStreamKey" [value]="liveVideo.streamKey" [withCopy]="true" [readonly]="true"></my-input-text>
<div class="form-group-description" i18n>⚠️ Never share your stream key with anyone.</div>
</div>
<div class="form-group">
- <my-peertube-checkbox inputName="liveVideoPermanentLive" formControlName="permanentLive">
- <ng-template ptTemplate="label">
- <ng-container i18n>This is a permanent live</ng-container>
- </ng-template>
+ <div class="peertube-radio-container">
+ <input type="radio" formControlName="permanentLive" id="permanentLiveFalse" [value]="false">
+ <label i18n for="permanentLiveFalse" class="radio">This is a normal live</label>
- <ng-container ngProjectAs="description">
- <span i18n>You can stream multiple times in a permanent live. The URL for your viewers won't change but you cannot save replays of your lives</span>
- </ng-container>
- </my-peertube-checkbox>
+ <span class="form-group-description" i18n>
+ You can stream only once in a normal live. If you enable replay, it will be saved under the same URL as your live
+ </span>
+ </div>
+
+ <div class="peertube-radio-container">
+ <input type="radio" formControlName="permanentLive" id="permanentLiveTrue" [value]="true">
+ <label i18n for="permanentLiveTrue" class="radio">This is a permanent/recurring live</label>
+
+ <span class="form-group-description" i18n>
+ You can stream multiple times in a permanent/recurring live. If you enable replays, they will be saved as separate videos
+ </span>
+ </div>
</div>
- <div class="form-group" *ngIf="isSaveReplayEnabled()">
+ <div class="form-group" *ngIf="isSaveReplayAllowed()">
<my-peertube-checkbox inputName="liveVideoSaveReplay" formControlName="saveReplay">
<ng-template ptTemplate="label">
<ng-container i18n>Automatically publish a replay when your live ends</ng-container>
</ng-container>
</my-peertube-checkbox>
</div>
+
+ <div class="form-group mx-4" *ngIf="isSaveReplayEnabled()">
+ <label i18n for="replayPrivacy">Privacy of the new replay</label>
+ <my-select-options
+ labelForId="replayPrivacy" [items]="videoPrivacies" [clearable]="false" formControlName="replayPrivacy"
+ ></my-select-options>
+ </div>
+
+ <div class="form-group" *ngIf="isLatencyModeEnabled()">
+ <label i18n for="latencyMode">Latency mode</label>
+ <my-select-options
+ labelForId="latencyMode" [items]="latencyModes" formControlName="latencyMode" [clearable]="true"
+ ></my-select-options>
+
+ <div *ngIf="formErrors.latencyMode" class="form-error">
+ {{ formErrors.latencyMode }}
+ </div>
+ </div>
</div>
</div>
</ng-template>
<div class="col-md-12 col-xl-8">
<div class="form-group">
- <label i18n for="previewfile">Video preview</label>
+ <label i18n for="previewfile">Video thumbnail</label>
<my-preview-upload
i18n-inputLabel inputLabel="Edit" inputName="previewfile" formControlName="previewfile"
</ng-container>
</ng-template>
</my-help>
+
<my-markdown-textarea
id="support" formControlName="support" markdownType="enhanced"
- [classes]="{ 'input-error': formErrors['support'] }"
+ [formError]="formErrors['support']"
></my-markdown-textarea>
- <div *ngIf="formErrors.support" class="form-error">
- {{ formErrors.support }}
- </div>
</div>
</div>
<div class="col-md-12 col-xl-4">
+
+ <div *ngIf="videoSource" class="form-group">
+ <label i18n for="filename">Filename</label>
+
+ <my-help>
+ <ng-template ptTemplate="preHtml">
+ <ng-container i18n>
+ Name of the uploaded file
+ </ng-container>
+ </ng-template>
+ </my-help>
+
+ <input type="text" [disabled]="true" id="filename" class="form-control" [value]="videoSource.filename" />
+ </div>
+
<div class="form-group originally-published-at">
<label i18n for="originallyPublishedAt">Original publication date</label>
<my-help>
</ng-template>
</ng-container>
- <ng-container ngbNavItem *ngIf="pluginFields.length !== 0">
+ <ng-container ngbNavItem *ngIf="getPluginsFields('plugin-settings').length !== 0">
<a ngbNavLink i18n>Plugin settings</a>
<ng-template ngbNavContent>
<div class="row plugin-settings">
<div class="col-md-12 col-xl-8">
- <div *ngFor="let pluginSetting of pluginFields" class="form-group" [hidden]="isPluginFieldHidden(pluginSetting)">
- <my-dynamic-form-field [form]="pluginDataFormGroup" [formErrors]="formErrors" [setting]="pluginSetting.commonOptions"></my-dynamic-form-field>
- </div>
+ <ng-container
+ *ngFor="let pluginSetting of getPluginsFields('plugin-settings')"
+ [ngTemplateOutlet]="pluginSettingTemplate" [ngTemplateOutletContext]="{ $implicit: pluginSetting }"
+ >
+ </ng-container>
</div>
</div>
</div>
<my-video-caption-add-modal
- #videoCaptionAddModal [existingCaptions]="getExistingCaptions()" [serverConfig]="serverConfig" (captionAdded)="onCaptionAdded($event)"
+ #videoCaptionAddModal [existingCaptions]="getExistingCaptions()" [serverConfig]="serverConfig" (captionAdded)="onCaptionEdited($event)"
></my-video-caption-add-modal>
projects / github / Chocobozzz / PeerTube.git / blobdiff