🔧 chore(Institutions-Actors): update banner info and title

CCAFS · Feb 7, 2025 · e648647 · e648647
1 parent e2b1f5b
commit e648647
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties
@@ -4693,6 +4693,7 @@ projectInnovations.anticipatedUsers.actors=Actors
 projectInnovations.anticipatedUsers.actors.readText=Actors
 projectInnovations.anticipatedUsers.actors.help=In the context of One CGIAR, <b>youth</b> are those between 15 and 24 years old, considered key to innovation and transformation in agricultural systems.
 projectInnovations.anticipatedUsers.actors.help.readText=In the context of One CGIAR, <b>youth</b> are those between 15 and 24 years old, considered key to innovation and transformation in agricultural systems.
+projectInnovations.anticipatedUsers.actors.typeActor=Type of actor
 projectInnovations.anticipatedUsers.actors.women=Women
 projectInnovations.anticipatedUsers.actors.women.readText=Women
 projectInnovations.anticipatedUsers.actors.men=Men

diff --git a/marlo-web/src/main/resources/global.properties b/marlo-web/src/main/resources/global.properties
@@ -4786,6 +4786,7 @@ projectInnovations.anticipatedUsers.actors=Actors
 projectInnovations.anticipatedUsers.actors.readText=Actors
 projectInnovations.anticipatedUsers.actors.help=In the context of One CGIAR, <b>youth</b> are those between 15 and 24 years old, considered key to innovation and transformation in agricultural systems.
 projectInnovations.anticipatedUsers.actors.help.readText=In the context of One CGIAR, <b>youth</b> are those between 15 and 24 years old, considered key to innovation and transformation in agricultural systems.
+projectInnovations.anticipatedUsers.actors.typeActor=Type of actor
 projectInnovations.anticipatedUsers.actors.women=Women
 projectInnovations.anticipatedUsers.actors.women.readText=Women
 projectInnovations.anticipatedUsers.actors.men=Men

diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/innovationTemplates.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/innovationTemplates.ftl
@@ -335,6 +335,9 @@
                 [#-- Organizations --]
                 <div class="col-md-6 organizationsBlock">
                   <label for="innovation.allianceOrganizations">[@s.text name="projectInnovations.anticipatedUsers.organizations" /]:[@customForm.req required=true /]</label>
+                  <label class="note--2">
+                    <p>[@s.text name="study.generalInformation.ppapartner.note"][@s.param] <a href="[@s.url namespace="/projects" action='${crpSession}/partners'][@s.param name='projectID']${(projectID)!}[/@s.param][#include "/WEB-INF/global/pages/urlGlobalParams.ftl" /][/@s.url]" target="__BLANK">&nbsp;clicking here</a>[/@][/@]</p>
+                  </label>
                   [#-- list of items --]
                   <div class="organizationsList">
                     [#list (element.allianceOrganizations)![] as organization]
@@ -753,7 +756,7 @@
     [@customForm.input name="${customName}.id" value=((element.id)?string)!"" editable=false display=false /]
     [#-- Dropdown Actors - Type --]
     <div class="col-md-12">
-      [@customForm.select name="${customName}.actor.id" showTitle=false  i18nkey="projectInnovations.actors" listName="actorList" keyFieldName="id" displayFieldName="name" required=false editable=true /]
+      [@customForm.select name="${customName}.actor.id" i18nkey="projectInnovations.anticipatedUsers.actors.typeActor" listName="actorList" keyFieldName="id" displayFieldName="name" required=false editable=true /]
     </div>
 
     [#local sexAgeNotApply = ((element.sexAgeNotApply??) && (element.sexAgeNotApply == true))! /]
@@ -806,7 +809,7 @@
     [#-- Input Organization name --]
     <div class="col-md-12">
       <label>[@s.text name="projectInnovations.anticipatedUsers.organizations.name" /]:</label>
-      [@customForm.select name="${customName}.institution.id" showTitle=false  i18nkey="projectInnovations.anticipatedUsers.organizations" listName="institutions" keyFieldName="id" displayFieldName="composedName" required=false editable=true /]
+      [@customForm.select name="${customName}.institution.id" showTitle=false  i18nkey="projectInnovations.anticipatedUsers.organizations" listName="institutions" keyFieldName="id" displayFieldName="composedNameType" required=false editable=true /]
     </div>
     [#-- Checkbox - is a co-development --]
     <div class="col-md-12">