diff options
Diffstat (limited to 'client/src/app/+admin/config/edit-custom-config')
3 files changed, 23 insertions, 9 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 5aa6fda3c..ef24e5b24 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -21,7 +21,7 @@ | |||
21 | <div class="form-group"> | 21 | <div class="form-group"> |
22 | <label i18n for="instanceShortDescription">Short description</label> | 22 | <label i18n for="instanceShortDescription">Short description</label> |
23 | <textarea | 23 | <textarea |
24 | id="instanceShortDescription" formControlName="shortDescription" | 24 | id="instanceShortDescription" formControlName="shortDescription" class="small" |
25 | [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }" | 25 | [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }" |
26 | ></textarea> | 26 | ></textarea> |
27 | <div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div> | 27 | <div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div> |
@@ -130,14 +130,26 @@ | |||
130 | <div i18n class="inner-form-title">You and your instance</div> | 130 | <div i18n class="inner-form-title">You and your instance</div> |
131 | 131 | ||
132 | <div class="form-group"> | 132 | <div class="form-group"> |
133 | <label i18n for="instanceAdministrator">Who is behind the instance? </label> | 133 | <label i18n for="instanceAdministrator">Who is behind the instance?</label> |
134 | <div class="label-small-info">A single person? A non profit? A company?</div> | 134 | <div class="label-small-info">A single person? A non profit? A company?</div> |
135 | 135 | ||
136 | <my-markdown-textarea | ||
137 | id="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true" | ||
138 | [classes]="{ 'input-error': formErrors['instance.administrator'] }" | ||
139 | ></my-markdown-textarea> | ||
140 | |||
141 | <div *ngIf="formErrors.instance.administrator" class="form-error">{{ formErrors.instance.administrator }}</div> | ||
142 | </div> | ||
143 | |||
144 | <div class="form-group"> | ||
145 | <label i18n for="instanceCreationReason">Why did you create this instance?</label> | ||
146 | <div class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div> | ||
147 | |||
136 | <textarea | 148 | <textarea |
137 | id="instanceAdministrator" formControlName="administrator" | 149 | id="instanceCreationReason" formControlName="creationReason" class="small" |
138 | [ngClass]="{ 'input-error': formErrors['instance.administrator'] }" | 150 | [ngClass]="{ 'input-error': formErrors['instance.creationReason'] }" |
139 | ></textarea> | 151 | ></textarea> |
140 | <div *ngIf="formErrors.instance.administrator" class="form-error">{{ formErrors.instance.administrator }}</div> | 152 | <div *ngIf="formErrors.instance.creationReason" class="form-error">{{ formErrors.instance.creationReason }}</div> |
141 | </div> | 153 | </div> |
142 | 154 | ||
143 | <div class="form-group"> | 155 | <div class="form-group"> |
@@ -145,7 +157,7 @@ | |||
145 | <div class="label-small-info">It's important to know for users who want to register on your instance</div> | 157 | <div class="label-small-info">It's important to know for users who want to register on your instance</div> |
146 | 158 | ||
147 | <textarea | 159 | <textarea |
148 | id="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" | 160 | id="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" class="small" |
149 | [ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }" | 161 | [ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }" |
150 | ></textarea> | 162 | ></textarea> |
151 | <div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div> | 163 | <div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div> |
@@ -156,7 +168,7 @@ | |||
156 | <div class="label-small-info">With you own funds? With users donations? Advertising?</div> | 168 | <div class="label-small-info">With you own funds? With users donations? Advertising?</div> |
157 | 169 | ||
158 | <textarea | 170 | <textarea |
159 | id="instanceBusinessModel" formControlName="businessModel" | 171 | id="instanceBusinessModel" formControlName="businessModel" class="small" |
160 | [ngClass]="{ 'input-error': formErrors['instance.businessModel'] }" | 172 | [ngClass]="{ 'input-error': formErrors['instance.businessModel'] }" |
161 | ></textarea> | 173 | ></textarea> |
162 | <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div> | 174 | <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div> |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss index 68f1b01b7..2b4d0da2c 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss | |||
@@ -44,8 +44,8 @@ textarea { | |||
44 | 44 | ||
45 | display: block; | 45 | display: block; |
46 | 46 | ||
47 | &#instanceShortDescription { | 47 | &.small { |
48 | height: 100px; | 48 | height: 75px; |
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index 3119ab040..e6f56bc97 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -100,6 +100,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
100 | 100 | ||
101 | terms: null, | 101 | terms: null, |
102 | codeOfConduct: null, | 102 | codeOfConduct: null, |
103 | |||
104 | creationReason: null, | ||
103 | moderationInformation: null, | 105 | moderationInformation: null, |
104 | administrator: null, | 106 | administrator: null, |
105 | maintenanceLifetime: null, | 107 | maintenanceLifetime: null, |