From e0d827e29afc1b29eaf550deb0627c13088c0c65 Mon Sep 17 00:00:00 2001
From: Lucas Declercq <lucas.declercq@ineat-conseil.fr>
Date: Sat, 6 Oct 2018 19:18:00 +0200
Subject: Only show download button if downloadingEnabled is set to true

---
 client/src/app/videos/+video-edit/shared/video-edit.component.html | 5 +++++
 client/src/app/videos/+video-edit/shared/video-edit.component.ts   | 2 ++
 2 files changed, 7 insertions(+)

(limited to 'client/src/app/videos/+video-edit/shared')

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 33c766d87..46eb019b1 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
@@ -125,6 +125,11 @@
               i18n-labelText labelText="Enable video comments"
             ></my-peertube-checkbox>
 
+            <my-peertube-checkbox
+                    inputName="downloadingEnabled" formControlName="downloadingEnabled"
+                    i18n-labelText labelText="Disable downloading"
+            ></my-peertube-checkbox>
+
             <my-peertube-checkbox
               inputName="waitTranscoding" formControlName="waitTranscoding"
               i18n-labelText labelText="Wait transcoding before publishing the video"
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index eb9396d70..b09664376 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -80,6 +80,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
     const defaultValues = {
       nsfw: 'false',
       commentsEnabled: 'true',
+      downloadingEnabled: 'true',
       waitTranscoding: 'true',
       tags: []
     }
@@ -89,6 +90,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
       channelId: this.videoValidatorsService.VIDEO_CHANNEL,
       nsfw: null,
       commentsEnabled: null,
+      downloadingEnabled: null,
       waitTranscoding: null,
       category: this.videoValidatorsService.VIDEO_CATEGORY,
       licence: this.videoValidatorsService.VIDEO_LICENCE,
-- 
cgit v1.2.3


From 4ffdcfc63b8c804a0aea20609544c859ab57318b Mon Sep 17 00:00:00 2001
From: Lucas Declercq <lucas.declercq@ineat-conseil.fr>
Date: Mon, 8 Oct 2018 14:42:55 +0200
Subject: Fix some defaults values + indentation

---
 client/src/app/videos/+video-edit/shared/video-edit.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'client/src/app/videos/+video-edit/shared')

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 46eb019b1..70d535055 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
@@ -126,8 +126,8 @@
             ></my-peertube-checkbox>
 
             <my-peertube-checkbox
-                    inputName="downloadingEnabled" formControlName="downloadingEnabled"
-                    i18n-labelText labelText="Disable downloading"
+              inputName="downloadingEnabled" formControlName="downloadingEnabled"
+              i18n-labelText labelText="Disable downloading"
             ></my-peertube-checkbox>
 
             <my-peertube-checkbox
-- 
cgit v1.2.3


From 7f2cfe3a792856f7de6f1d13688aa3d06ec1bf70 Mon Sep 17 00:00:00 2001
From: Lucas Declercq <lucas.declercq@ineat-conseil.fr>
Date: Mon, 8 Oct 2018 14:45:22 +0200
Subject: Rename downloadingEnabled property to downloadEnabled

---
 client/src/app/videos/+video-edit/shared/video-edit.component.html | 2 +-
 client/src/app/videos/+video-edit/shared/video-edit.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'client/src/app/videos/+video-edit/shared')

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 70d535055..8c74a1ca6 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
@@ -126,7 +126,7 @@
             ></my-peertube-checkbox>
 
             <my-peertube-checkbox
-              inputName="downloadingEnabled" formControlName="downloadingEnabled"
+              inputName="downloadEnabled" formControlName="downloadEnabled"
               i18n-labelText labelText="Disable downloading"
             ></my-peertube-checkbox>
 
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index b09664376..1dae931e2 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -80,7 +80,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
     const defaultValues = {
       nsfw: 'false',
       commentsEnabled: 'true',
-      downloadingEnabled: 'true',
+      downloadEnabled: 'true',
       waitTranscoding: 'true',
       tags: []
     }
@@ -90,7 +90,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
       channelId: this.videoValidatorsService.VIDEO_CHANNEL,
       nsfw: null,
       commentsEnabled: null,
-      downloadingEnabled: null,
+      downloadEnabled: null,
       waitTranscoding: null,
       category: this.videoValidatorsService.VIDEO_CATEGORY,
       licence: this.videoValidatorsService.VIDEO_LICENCE,
-- 
cgit v1.2.3


From 457bb213b273a9b206cc5654eb085cede4e916ad Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 16 Jan 2019 16:05:40 +0100
Subject: Refactor how we use icons

Inject them in an angular component so we can easily change their color
---
 .../shared/video-caption-add-modal.component.html       |  2 +-
 .../videos/+video-edit/shared/video-edit.component.html |  2 +-
 .../videos/+video-edit/shared/video-edit.component.scss | 17 ++++-------------
 3 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'client/src/app/videos/+video-edit/shared')

diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html
index 30aefdbfc..19043eee6 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html
@@ -3,7 +3,7 @@
 
     <div class="modal-header">
       <h4 i18n class="modal-title">Add caption</h4>
-      <span class="close" aria-label="Close" role="button" (click)="hide()"></span>
+      <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon>
     </div>
 
     <div class="modal-body">
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 bd52d686a..092c0e862 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
@@ -143,7 +143,7 @@
 
           <div class="captions-header">
             <a (click)="openAddCaptionModal()" class="create-caption">
-              <span class="icon icon-add"></span>
+              <my-global-icon iconName="add"></my-global-icon>
               <ng-container i18n>Add another caption</ng-container>
             </a>
           </div>
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index 25db8e8ed..cc32fb254 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -42,7 +42,7 @@ my-peertube-checkbox {
     text-align: right;
 
     .create-caption {
-      @include create-button('../../../../assets/images/global/add.svg');
+      @include create-button;
     }
   }
 
@@ -100,13 +100,14 @@ my-peertube-checkbox {
     display: inline-block;
     margin-right: 25px;
 
-    color: #585858;
+    color: $grey-foreground-color;
     font-size: 15px;
   }
 
   .submit-button {
     @include peertube-button;
     @include orange-button;
+    @include button-with-icon(20px, 1px);
 
     display: inline-block;
 
@@ -119,16 +120,6 @@ my-peertube-checkbox {
       color: inherit;
       font-weight: $font-semibold;
     }
-
-    .icon.icon-validate {
-      @include icon(20px);
-
-      cursor: inherit;
-      position: relative;
-      top: -1px;
-      margin-right: 4px;
-      background-image: url('../../../../assets/images/global/validate.svg');
-    }
   }
 }
 
@@ -202,7 +193,7 @@ p-calendar {
       top: -1px;
       height: auto !important;
       vertical-align: middle !important;
-      fill: #585858 !important;
+      fill: $grey-foreground-color !important;
     }
 
     &:hover {
-- 
cgit v1.2.3


From 17bb716bc49b30cc8f22e32f73b9b53ab9ae560d Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 17 Jan 2019 11:16:08 +0100
Subject: Fix some styles

Video edit tags, dropdown actions font ...
---
 .../app/videos/+video-edit/shared/video-edit.component.scss | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'client/src/app/videos/+video-edit/shared')

diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index cc32fb254..bb775cb0a 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -23,10 +23,6 @@ my-peertube-checkbox {
     display: block;
   }
 
-  input, select {
-    font-size: 15px
-  }
-
   .label-tags + span {
     font-size: 15px;
   }
@@ -167,10 +163,10 @@ p-calendar {
   }
 
   tag {
-    background-color: var(--inputColor) !important;
+    background-color: $grey-background-color !important;
+    color: #000 !important;
     border-radius: 3px !important;
     font-size: 15px !important;
-    color: var(--mainForegroundColor) !important;
     height: 30px !important;
     line-height: 30px !important;
     margin: 0 5px 0 0 !important;
@@ -193,7 +189,10 @@ p-calendar {
       top: -1px;
       height: auto !important;
       vertical-align: middle !important;
-      fill: $grey-foreground-color !important;
+
+      path  {
+        fill: $grey-foreground-color !important;
+      }
     }
 
     &:hover {
-- 
cgit v1.2.3


From 501e961199578129629cf0567033d13efced9904 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 11 Feb 2019 12:00:19 +0100
Subject: Move enabled download/comments in advanced tab

---
 .../+video-edit/shared/video-edit.component.html     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'client/src/app/videos/+video-edit/shared')

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 7fd9af208..59ba15b53 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
@@ -120,16 +120,6 @@
               i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default."
             ></my-peertube-checkbox>
 
-            <my-peertube-checkbox
-              inputName="commentsEnabled" formControlName="commentsEnabled"
-              i18n-labelText labelText="Enable video comments"
-            ></my-peertube-checkbox>
-
-            <my-peertube-checkbox
-              inputName="downloadEnabled" formControlName="downloadEnabled"
-              i18n-labelText labelText="Download enabled"
-            ></my-peertube-checkbox>
-
             <my-peertube-checkbox
               *ngIf="waitTranscodingEnabled"
               inputName="waitTranscoding" formControlName="waitTranscoding"
@@ -221,6 +211,16 @@
               {{ formErrors.support }}
             </div>
           </div>
+
+          <my-peertube-checkbox
+            inputName="commentsEnabled" formControlName="commentsEnabled"
+            i18n-labelText labelText="Enable video comments"
+          ></my-peertube-checkbox>
+
+          <my-peertube-checkbox
+            inputName="downloadEnabled" formControlName="downloadEnabled"
+            i18n-labelText labelText="Enable download"
+          ></my-peertube-checkbox>
         </div>
       </ng-template>
     </ngb-tab>
-- 
cgit v1.2.3