From 368a487b3fb5147d6a9862875b3388eb2a0f93f7 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:27:45 -0500
Subject: [PATCH 1/4] Move helpText to LicenseDropdown component

---
 .../QuickEditModal/EditSourceModal.vue        |  4 +---
 .../frontend/shared/views/LicenseDropdown.vue | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
index 839f19a896..3f0a1bc108 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
@@ -62,11 +62,9 @@
             box
             :required="isEditable"
             :disabled="!isEditable"
+            :helpText="helpText"
           />
         </div>
-        <p v-if="helpText" class="help" style="margin-bottom: 8px">
-          {{ helpText }}
-        </p>
       </div>
       <div class="form-item">
         <div class="input-container">
diff --git a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
index 5c48b116ad..6a1e9f0748 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
@@ -26,7 +26,10 @@
         />
       </template>
     </DropdownWrapper>
-    <p>
+    <p v-if="helpText" class="help">
+      {{ helpText }}
+    </p>
+    <p style="position: relative; top: -15px">
       <KButton
         class="info-link"
         appearance="basic-link"
@@ -36,7 +39,7 @@
       />
     </p>
     <div 
-      v-for="(licenseItem, index) in licences" 
+      v-for="(licenseItem, index) in licencesList" 
       v-show="showAboutLicense" 
       :key="index" 
       class="mb-4 mt-3"
@@ -135,6 +138,10 @@
         type: Boolean,
         default: false,
       },
+      helpText: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {
@@ -206,7 +213,7 @@
           ? getLicenseDescriptionValidators().map(translateValidator)
           : [];
       },
-      licences() {
+      licencesList() {
         return LicensesList.filter(license => license.id).map(license => ({
           ...license,
           name: this.translateConstant(license.license_name),
@@ -277,4 +284,13 @@
     }
   }
 
+  .help {
+    position: relative;
+    top: -25px;
+    left: 10px;
+    margin-bottom: 0;
+    font-size: 12px;
+    color: var(--v-text-lighten4);
+  }
+
 </style>

From a188b3151733798e9cb92238954a7232e8d986ad Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:06:43 -0500
Subject: [PATCH 2/4] Add comment explaining hardcoded styling

---
 .../contentcuration/frontend/shared/views/LicenseDropdown.vue    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
index 6a1e9f0748..2cc7f653a1 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
@@ -284,6 +284,7 @@
     }
   }
 
+  // Positions help text beneath the license dropdown
   .help {
     position: relative;
     top: -25px;

From ea652fc64700281f62c5052cbec90ddbb1595d30 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:30:05 -0500
Subject: [PATCH 3/4] add help text for disabled inputs to edit details page

---
 .../components/edit/DetailsTabView.vue        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 7812086201..a30c059072 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -270,6 +270,9 @@
                 <HelpTooltip :text="$tr('authorToolTip')" top :small="false" />
               </template>
             </VCombobox>
+            <p v-if="disableSourceEdits" class="help">
+              {{  helpTextString.$tr('cannotEditPublic') }}
+            </p>
 
             <!-- Provider -->
             <VCombobox
@@ -323,6 +326,7 @@
               :descriptionPlaceholder="getPlaceholder('license_description')"
               @focus="trackClick('License')"
               @descriptionFocus="trackClick('License description')"
+              :helpText="disableSourceEdits ? helpTextString.$tr('cannotEditPublic') : ''"
             />
 
             <!-- Copyright Holder -->
@@ -344,6 +348,9 @@
               @input="copyright_holder = $event"
               @focus="trackClick('Copyright holder')"
             />
+            <p v-if="disableSourceEdits" class="help">
+              {{  helpTextString.$tr('cannotEditPublic') }}
+            </p>
           </VFlex>
         </template>
       </VLayout>
@@ -409,6 +416,8 @@
     nonUniqueValue,
   } from 'shared/constants';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
+  import { crossComponentTranslator } from 'shared/i18n';
+  import EditSourceModal from '../QuickEditModal/EditSourceModal.vue';
 
   function getValueFromResults(results) {
     if (results.length === 0) {
@@ -547,6 +556,7 @@
         valid: true,
         diffTracker: {},
         changed: false,
+        helpTextString: crossComponentTranslator(EditSourceModal),
       };
     },
     computed: {
@@ -991,4 +1001,13 @@
     }
   }
 
+  // Positions help text underneath 
+  p.help {
+    position: relative;
+    top: -20px;
+    left: 10px;
+    margin-bottom: 14px;
+    font-size: 12px;
+    color: var(--v-text-lighten4);
+  }
 </style>

From 6982d4daeda7e3fef82b9d789ddb0a8f51010b47 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Fri, 20 Sep 2024 12:17:03 -0500
Subject: [PATCH 4/4] Fix lintint

---
 .../channelEdit/components/edit/DetailsTabView.vue    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index a30c059072..8c18d1fc70 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -271,7 +271,7 @@
               </template>
             </VCombobox>
             <p v-if="disableSourceEdits" class="help">
-              {{  helpTextString.$tr('cannotEditPublic') }}
+              {{ helpTextString.$tr('cannotEditPublic') }}
             </p>
 
             <!-- Provider -->
@@ -324,9 +324,9 @@
               :disabled="disableSourceEdits"
               :placeholder="getPlaceholder('license')"
               :descriptionPlaceholder="getPlaceholder('license_description')"
+              :helpText="disableSourceEdits ? helpTextString.$tr('cannotEditPublic') : ''"
               @focus="trackClick('License')"
               @descriptionFocus="trackClick('License description')"
-              :helpText="disableSourceEdits ? helpTextString.$tr('cannotEditPublic') : ''"
             />
 
             <!-- Copyright Holder -->
@@ -349,7 +349,7 @@
               @focus="trackClick('Copyright holder')"
             />
             <p v-if="disableSourceEdits" class="help">
-              {{  helpTextString.$tr('cannotEditPublic') }}
+              {{ helpTextString.$tr('cannotEditPublic') }}
             </p>
           </VFlex>
         </template>
@@ -391,6 +391,7 @@
   import FileUpload from '../../views/files/FileUpload';
   import SubtitlesList from '../../views/files/supplementaryLists/SubtitlesList';
   import { isImportedContent, isDisableSourceEdits, importedChannelLink } from '../../utils';
+  import EditSourceModal from '../QuickEditModal/EditSourceModal.vue';
   import AccessibilityOptions from './AccessibilityOptions.vue';
   import LevelsOptions from 'shared/views/contentNodeFields/LevelsOptions';
   import CategoryOptions from 'shared/views/contentNodeFields/CategoryOptions';
@@ -417,7 +418,6 @@
   } from 'shared/constants';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
   import { crossComponentTranslator } from 'shared/i18n';
-  import EditSourceModal from '../QuickEditModal/EditSourceModal.vue';
 
   function getValueFromResults(results) {
     if (results.length === 0) {
@@ -1001,7 +1001,7 @@
     }
   }
 
-  // Positions help text underneath 
+  // Positions help text underneath
   p.help {
     position: relative;
     top: -20px;
@@ -1010,4 +1010,5 @@
     font-size: 12px;
     color: var(--v-text-lighten4);
   }
+
 </style>