mirror of https://github.com/Chocobozzz/PeerTube
hide RSS for comments, normalize video-channel edit with account edit
parent
c9ad38f4cb
commit
8227643bce
|
@ -18,7 +18,7 @@ import { NgbTabset } from '@ng-bootstrap/ng-bootstrap'
|
||||||
styleUrls: [ './edit-custom-config.component.scss' ]
|
styleUrls: [ './edit-custom-config.component.scss' ]
|
||||||
})
|
})
|
||||||
export class EditCustomConfigComponent extends FormReactive implements OnInit, AfterViewChecked {
|
export class EditCustomConfigComponent extends FormReactive implements OnInit, AfterViewChecked {
|
||||||
@ViewChild('tabs') private tabs: NgbTabset
|
@ViewChild('tabs') tabs: NgbTabset
|
||||||
|
|
||||||
initDone = false
|
initDone = false
|
||||||
customConfig: CustomConfig
|
customConfig: CustomConfig
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
<div class="form-row mt-5"> <!-- video settings grid -->
|
<div class="form-row mt-5"> <!-- video settings grid -->
|
||||||
<div class="form-group col-12 col-lg-4 col-xl-3">
|
<div class="form-group col-12 col-lg-4 col-xl-3">
|
||||||
|
<div class="anchor" id="video-settings"></div> <!-- video settings anchor -->
|
||||||
<div i18n class="account-title">VIDEO SETTINGS</div>
|
<div i18n class="account-title">VIDEO SETTINGS</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
<my-actor-avatar-info
|
|
||||||
*ngIf="isCreation() === false && videoChannelToUpdate"
|
|
||||||
[actor]="videoChannelToUpdate" (avatarChange)="onAvatarChange($event)"
|
|
||||||
></my-actor-avatar-info>
|
|
||||||
|
|
||||||
<div i18n class="form-sub-title" *ngIf="isCreation() === true">Create a video channel</div>
|
<div i18n class="form-sub-title" *ngIf="isCreation() === true">Create a video channel</div>
|
||||||
|
|
||||||
<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
|
<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
|
||||||
|
@ -24,6 +19,18 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-row"> <!-- channel grid -->
|
||||||
|
<div class="form-group col-12 col-lg-4 col-xl-3">
|
||||||
|
<div i18n class="video-channel-title">CHANNEL</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
|
||||||
|
|
||||||
|
<my-actor-avatar-info
|
||||||
|
*ngIf="isCreation() === false && videoChannelToUpdate"
|
||||||
|
[actor]="videoChannelToUpdate" (avatarChange)="onAvatarChange($event)"
|
||||||
|
></my-actor-avatar-info>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label i18n for="display-name">Display name</label>
|
<label i18n for="display-name">Display name</label>
|
||||||
<input
|
<input
|
||||||
|
@ -50,7 +57,7 @@
|
||||||
<label for="support">Support</label>
|
<label for="support">Support</label>
|
||||||
<my-help
|
<my-help
|
||||||
helpType="markdownEnhanced" i18n-preHtml preHtml="Short text to tell people how they can support your channel (membership platform...).<br /><br />
|
helpType="markdownEnhanced" i18n-preHtml preHtml="Short text to tell people how they can support your channel (membership platform...).<br /><br />
|
||||||
When you will upload a video in this channel, the video support field will be automatically filled by this text."
|
When you will upload a video in this channel, the video support field will be automatically filled by this text."
|
||||||
></my-help>
|
></my-help>
|
||||||
<my-markdown-textarea
|
<my-markdown-textarea
|
||||||
id="support" formControlName="support" textareaWidth="500px" [previewColumn]="true" markdownType="enhanced"
|
id="support" formControlName="support" textareaWidth="500px" [previewColumn]="true" markdownType="enhanced"
|
||||||
|
@ -68,5 +75,13 @@ When you will upload a video in this channel, the video support field will be au
|
||||||
></my-peertube-checkbox>
|
></my-peertube-checkbox>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-row"> <!-- submit placement block -->
|
||||||
|
<div class="col-md-7 col-xl-5"></div>
|
||||||
|
<div class="col-md-5 col-xl-5 d-inline-flex">
|
||||||
<input type="submit" value="{{ getFormButtonTitle() }}" [disabled]="!form.valid">
|
<input type="submit" value="{{ getFormButtonTitle() }}" [disabled]="!form.valid">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
@import '_variables';
|
@import '_variables';
|
||||||
@import '_mixins';
|
@import '_mixins';
|
||||||
|
|
||||||
|
.video-channel-title {
|
||||||
|
@include settings-big-title;
|
||||||
|
}
|
||||||
|
|
||||||
.form-sub-title {
|
.form-sub-title {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
}
|
}
|
||||||
|
@ -18,7 +22,8 @@ my-actor-avatar-info {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type=text] {
|
input {
|
||||||
|
&[type=text] {
|
||||||
@include peertube-input-text(340px);
|
@include peertube-input-text(340px);
|
||||||
|
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -27,6 +32,18 @@ input[type=text] {
|
||||||
width: auto;
|
width: auto;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&[type=submit] {
|
||||||
|
@include peertube-button;
|
||||||
|
@include orange-button;
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
font-weight: $font-regular;
|
||||||
|
font-size: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
textarea {
|
textarea {
|
||||||
|
@ -35,11 +52,14 @@ textarea {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my-markdown-textarea ::ng-deep {
|
||||||
|
.root {
|
||||||
|
@media screen and (max-width: 1400px) {
|
||||||
|
flex-direction: column !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.peertube-select-container {
|
.peertube-select-container {
|
||||||
@include peertube-select-container(340px);
|
@include peertube-select-container(340px);
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type=submit] {
|
|
||||||
@include peertube-button;
|
|
||||||
@include orange-button;
|
|
||||||
}
|
|
||||||
|
|
|
@ -37,13 +37,13 @@
|
||||||
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
|
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account">
|
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-settings">
|
||||||
<my-global-icon iconName="video-lang"></my-global-icon>
|
<my-global-icon iconName="video-lang"></my-global-icon>
|
||||||
<ng-container i18n>Videos: {{ videoLanguages.join(', ') }}</ng-container>
|
<ng-container i18n>Videos: {{ videoLanguages.join(', ') }}</ng-container>
|
||||||
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
|
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account">
|
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-settings">
|
||||||
<my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy === 'display' }" iconName="sensitive"></my-global-icon>
|
<my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy === 'display' }" iconName="sensitive"></my-global-icon>
|
||||||
<my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy !== 'display' }" iconName="unsensitive"></my-global-icon>
|
<my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy !== 'display' }" iconName="unsensitive"></my-global-icon>
|
||||||
<ng-container i18n>Sensitive: {{ nsfwPolicy }}</ng-container>
|
<ng-container i18n>Sensitive: {{ nsfwPolicy }}</ng-container>
|
||||||
|
|
|
@ -17,8 +17,20 @@
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.title-block .title-page {
|
.title-block {
|
||||||
|
.title-page {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
my-feed {
|
||||||
|
display: inline-block;
|
||||||
|
margin-left: 5px;
|
||||||
|
opacity: 0;
|
||||||
|
transition: ease-in .2s opacity;
|
||||||
|
}
|
||||||
|
&:hover my-feed {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#dropdownSortComments {
|
#dropdownSortComments {
|
||||||
|
@ -28,11 +40,6 @@
|
||||||
transform: translateY(-7%);
|
transform: translateY(-7%);
|
||||||
}
|
}
|
||||||
|
|
||||||
my-feed {
|
|
||||||
display: inline-block;
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 600px) {
|
@media screen and (max-width: 600px) {
|
||||||
.view-replies {
|
.view-replies {
|
||||||
margin-left: 46px;
|
margin-left: 46px;
|
||||||
|
|
Loading…
Reference in New Issue