From 7ca1f4d96f0bb9c49ba5d8ecf1c6137aba55deb6 Mon Sep 17 00:00:00 2001
From: JhonSGIzquierdo <metalprime57@gmail.com>
Date: Wed, 24 Apr 2024 14:50:49 -0500
Subject: [PATCH 1/3] :wrench: chore(IPI-2.3): A2-453 -  Story 1 - Visual
 Changes

---
 .../WEB-INF/global/macros/deliverableMacros.ftl      |  5 ++++-
 .../src/main/webapp/WEB-INF/global/macros/forms.ftl  |  2 +-
 .../deliverables/deliverableDissemination.js         |  2 +-
 marlo-web/src/main/webapp/global/css/global.css      | 12 ++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
index d4c3541218..ebec107f8a 100644
--- a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
@@ -404,8 +404,11 @@
           <input type="hidden" name="${customName}[${index}].project.id" value="${(cluster.project.id)!0}" clusterIdParticipant="${(cluster.project.id)!0}"/>
           <div class="form-group row" clusterIdParticipant="${(cluster.project.id)!0}">
             <div class="col-md-2">
-              <div class="text-area-container">
+              <div class="text-area-container text-flex-column">
               [@customForm.text name=(list[index].project.acronym)!"" /]
+              [#if action.isSubmit(cluster.project.id)]
+                <p style="font-style: italic; font-size: 10px;">Cluster submitted.</p>
+              [/#if]
               </div>
               <br>
             </div>
diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/forms.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/forms.ftl
index d0353011e3..08320bc51d 100644
--- a/marlo-web/src/main/webapp/WEB-INF/global/macros/forms.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/forms.ftl
@@ -16,7 +16,7 @@
     [#if editable]
       [#-- Condition to add input group to field --]
       [#if inputGroupText != ""]<div class="input-group"><span class="input-group-addon">${inputGroupText}</span>[/#if]
-      <input type="${type}" id="${name}" name="${name}" value="${customValue}" class="form-control input-sm ${className} ${required?string('required','optional')}" [#if readOnly] readonly="readonly"[/#if] [#if disabled]disabled="disabled"[/#if] [#if placeholder?has_content]placeholder="[@s.text name=placeholder /]"[/#if]"/>
+      <input type="${type}" id="${name}" name="${name}" value="${customValue}" class="form-control input-sm ${className} ${required?string('required','optional')} ${disabled?string('fieldDisabled', '')}" [#if readOnly] readonly="readonly"[/#if] [#if disabled]disabled="disabled"[/#if] [#if placeholder?has_content]placeholder="[@s.text name=placeholder /]"[/#if]"/>
       [#if inputGroupText != ""]</div>[/#if]
       [#-- End condition --]
     [#else]
diff --git a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js
index f6d0ba97e0..63e968a042 100644
--- a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js
+++ b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js
@@ -308,7 +308,7 @@ if(remainingYouth == 0 && remainingAfrican == 0 && remainingFemales == 0 && rema
   $('input[name="deliverable.deliverableInfo.remainingPending"]').val('false');
 }
 else{
-  $('.remaining-container').css('color', '#FFC300');
+  $('.remaining-container').css('color', '#ECB00C');
   $('.doneParticipant').css('display', 'none');
   $('.alertParticipant').css('display', 'flex');
   $('input[name="deliverable.deliverableInfo.remainingPending"]').val('true');
diff --git a/marlo-web/src/main/webapp/global/css/global.css b/marlo-web/src/main/webapp/global/css/global.css
index 0ada4ecbf3..36b17b1f8c 100644
--- a/marlo-web/src/main/webapp/global/css/global.css
+++ b/marlo-web/src/main/webapp/global/css/global.css
@@ -365,6 +365,13 @@ div.fieldFocus {
 	margin: 20px 0 !important;
 }
 
+div input.fieldDisabled {
+	background-color: #eee !important;
+	opacity: 1 !important;
+	color: #5A5A5A !important;
+	border: none !important;
+}
+
 /* Table default style*/
 table.default {
 	margin: 0px 0 !important;
@@ -7376,6 +7383,11 @@ img.fileIcon {
 	width: 100%;
 }
 
+.text-flex-column{
+	display: flex;
+	flex-flow: column;
+}
+
 .commentNumberContainer {
 	display: none;
 	flex-flow: column;

From 4c6afa2ac359eafb4f2a62e024778d4797928921 Mon Sep 17 00:00:00 2001
From: JhonSGIzquierdo <metalprime57@gmail.com>
Date: Wed, 24 Apr 2024 16:20:40 -0500
Subject: [PATCH 2/3] :wrench: chore(IPI-2.3): A2-455 - A2-456 - Modal

---
 .../crp/views/projects/projectDeliverable.ftl | 23 ++++++++++++-------
 .../crp/css/projects/projectDeliverable.css   | 13 ++++++-----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl
index dd8d57d140..6cd34f676c 100644
--- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl
@@ -101,12 +101,16 @@
 
 <section class="container">
 
-  <div class="modal-deliverable modal-evidences" style="display: none">
+  <div class="modal-deliverable ui-dialog modal-evidences" style="display: none">
     <div class="content-modal">
-      <div class="button-exit close-modal-evidences">
-        <div class="x-close-modal" ></div>
+      <div class="ui-dialog-titlebar">
+        <p class="title-modal-evidences">Remove cluster</p>
+        <div class="button-exit close-modal-evidences">
+          <div class="x-close-modal" ></div>
+        </div>
       </div>
-      <p class="title-modal-evidences">Remove cluster</p>
+
+      
       <div class="text-modal-evidences">
         <p>It is not possible to remove the shared cluster from the list, this cluster has already been submitted and has trainees related.</p>
         <br>
@@ -124,12 +128,15 @@
     </div>              
   </div>
 
-  <div class=" modal-deliverable modal-indicator" style="display: none">
+  <div class=" modal-deliverable ui-dialog modal-indicator" style="display: none">
     <div class="content-modal">
-      <div class="button-exit close-modal-indicator">
-        <div class="x-close-modal" ></div>
+      <div class="ui-dialog-titlebar">
+        <p class="title-modal-evidences title-modal-indicator">Remove Indicator</p>
+        <div class="button-exit close-modal-indicator">
+          <div class="x-close-modal" ></div>
+        </div>
       </div>
-      <p class="title-modal-evidences title-modal-indicator">Remove Indicator</p>
+      
       <div class="text-modal-evidences text-modal-indicator">
         <p>It is not possible to remove the indicator from the list, since this deliverable has shared clusters that have already been submitted and have related trainees.</p>
 
diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
index 3610253c18..de578985d8 100644
--- a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
+++ b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
@@ -1012,17 +1012,18 @@ div.fieldFocus-deliverable {
   right: 0;
   border-radius: 0px 3px 0px 8px;
   cursor: pointer;
-  margin: -23px -40px 0px 0px;
+  margin: -23px 0px 0px 0px;
 }
 
 .title-modal-evidences{
   font-size: 19px;
   font-weight: 600;
-  margin-top: -8px;
+  padding: .6em 1em .6em 1em;
 }
 
 .text-modal-evidences{
   margin-top: 25px;
+  padding: .6em 1em .6em 1em;
 }
 
 .text-modal-evidences p{
@@ -1033,21 +1034,21 @@ div.fieldFocus-deliverable {
   background-color: #fff;
   width: 600px;
   max-width: 100%;
-  padding: 30px 50px;
   border-radius: 15px;
   border: 2px solid rgba(43, 166, 203, 1);
-  /* text-align: center; */
+  overflow: hidden;
 }
 
 .container-buttons-evidences{
   float: right;
   display: flex;
+  padding: .6em 1em .6em 1em;
 }
 
 .button-pdf-modal{
   background-color: #ffffff;
-  min-width: 160px;
-  height: 40px;
+  min-width: 100px;
+  height: 30px;
   text-align: center;
   display: flex;
   align-items: center;

From ba7cf969b0ae6891b2c6ea48f2914c57fa1b7613 Mon Sep 17 00:00:00 2001
From: JhonSGIzquierdo <metalprime57@gmail.com>
Date: Wed, 24 Apr 2024 16:25:05 -0500
Subject: [PATCH 3/3] :wrench: chore(IPI-2.3): Button close

---
 .../src/main/webapp/crp/css/projects/projectDeliverable.css  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
index de578985d8..4359f005be 100644
--- a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
+++ b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
@@ -996,7 +996,10 @@ div.fieldFocus-deliverable {
 
 
 .button-exit{
- float: right;
+  position: absolute;
+  float: inline-end;
+  top: 50px;
+  right: 10px;
  font-size: 18px;
  cursor: pointer;
 }