Merge pull request #165 from eea/case_study_layout

Update case study - refs #277447
eea · Sep 26, 2024 · 9a849ff · 9a849ff
2 parents b48b112 + 9971a1f
commit 9a849ff
Show file tree

Hide file tree

Showing 9 changed files with 522 additions and 452 deletions.
diff --git a/eea/climateadapt/behaviors/acemeasure.py b/eea/climateadapt/behaviors/acemeasure.py
@@ -66,8 +66,8 @@ class IAceMeasure(form.Schema, IImageScaleTraversable):
         fields=[
             "publication_date",
             "title",
-            "long_description",
             "description",
+            "long_description",
             "climate_impacts",
             "keywords",
             "sectors",
@@ -161,6 +161,7 @@ class IAceMeasure(form.Schema, IImageScaleTraversable):
 
     directives.widget("keywords", vocabulary="eea.climateadapt.keywords")
     keywords = Tuple(
+        title=_(u"Keywords"),
         description=_(
             "Describe and tag this item with relevant keywords. "
             "Press Enter after writing your keyword. "
@@ -236,7 +237,7 @@ class IAceMeasure(form.Schema, IImageScaleTraversable):
 
     dexteritytextindexer.searchable("success_limitations")
     success_limitations = RichText(
-        title=_("Success / limitations"),
+        title=_("Success and limiting factors"),
         required=False,
         default=unicode(""),
         description=_(
@@ -249,7 +250,7 @@ class IAceMeasure(form.Schema, IImageScaleTraversable):
 
     dexteritytextindexer.searchable("cost_benefit")
     cost_benefit = RichText(
-        title=_("Cost / Benefit"),
+        title=_("Costs and benefits"),
         required=False,
         default=unicode(""),
         description=_(
@@ -282,7 +283,7 @@ class IAceMeasure(form.Schema, IImageScaleTraversable):
 
     dexteritytextindexer.searchable("implementation_time")
     implementation_time = RichText(
-        title=_("Implementation Time"),
+        title=_("Implementation time"),
         required=False,
         default=None,
         description=_(

diff --git a/eea/climateadapt/behaviors/adaptationoption.py b/eea/climateadapt/behaviors/adaptationoption.py
@@ -273,15 +273,15 @@ class IAdaptationOption(IAceMeasure, IBlocks):
                                             "@id": "8b66f602-4098-4083-ae4e-0d45a6061c41",
                                             "field": {
                                                 "id": "success_limitations",
-                                                "title": "Success / limitations",
+                                                "title": "Success and limiting factors",
                                                 "widget": "richtext",
                                             },
                                         },
                                         {
                                             "@id": "07bf6b42-bdef-4505-8a80-369d4f096d34",
                                             "field": {
                                                 "id": "cost_benefit",
-                                                "title": "Cost / Benefit",
+                                                "title": "Costs and benefits",
                                                 "widget": "richtext",
                                             },
                                         },
@@ -297,7 +297,7 @@ class IAdaptationOption(IAceMeasure, IBlocks):
                                             "@id": "6f100215-d407-4049-be3e-8c15c45f48b9",
                                             "field": {
                                                 "id": "implementation_time",
-                                                "title": "Implementation Time",
+                                                "title": "Implementation time",
                                                 "widget": "richtext",
                                             },
                                         },

diff --git a/eea/climateadapt/behaviors/casestudy.py b/eea/climateadapt/behaviors/casestudy.py
diff --git a/eea/climateadapt/behaviors/volto_layout.py b/eea/climateadapt/behaviors/volto_layout.py
diff --git a/eea/climateadapt/configure.zcml b/eea/climateadapt/configure.zcml
@@ -321,6 +321,11 @@
     component=".vocabulary.ObjectProvidesVocabulary"
   />
 
+  <utility
+    name="updating_notes_vocabulary"
+    component=".vocabulary.UpdatingNotesVocabularyFactory"
+  />
+
   <utility
     name="eea.climateadapt.faceted_elements_voc"
     component=".vocabulary.faceted_elements"

diff --git a/eea/climateadapt/profiles.zcml b/eea/climateadapt/profiles.zcml
@@ -474,4 +474,12 @@
     provides="Products.GenericSetup.interfaces.EXTENSION"
   />
 
+  <genericsetup:registerProfile
+    name="eeaclimateadapt_to_76"
+    title="Upgrade profile for eea.climateadapt v76"
+    description=""
+    directory="profiles/upgrades/to_76"
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+  />
+
 </configure>
diff --git a/eea/climateadapt/profiles/upgrades/to_76/catalog.xml b/eea/climateadapt/profiles/upgrades/to_76/catalog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<object name="portal_catalog">
+  <index name="updating_notes" meta_type="KeywordIndex">
+    <indexed_attr value="updating_notes"/>
+  </index>
+</object>
diff --git a/eea/climateadapt/upgrades/configure.zcml b/eea/climateadapt/upgrades/configure.zcml
@@ -2,6 +2,16 @@
   xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
   i18n_domain="eea.climateadapt">
 
+  <genericsetup:upgradeSteps
+    source="75"
+    destination="76"
+    profile="eea.climateadapt:default">
+    <genericsetup:upgradeDepends
+      title="Update profile eeaclimate to v76"
+      import_profile="eea.climateadapt:eeaclimateadapt_to_76"
+    />
+  </genericsetup:upgradeSteps>
+
   <genericsetup:upgradeSteps
     source="74"
     destination="75"

diff --git a/eea/climateadapt/vocabulary.py b/eea/climateadapt/vocabulary.py
@@ -392,18 +392,18 @@ def __call__(self, context, query=None):
 _relevance = [
     (
         "IMPL_AS_CCA",
-        _("Case developed and implemented as a Climate Change Adaptation Measure."),
+        _("Case developed and implemented as a climate change adaptation measure."),
     ),
     (
         "PARTFUND_AS_CCA",
         _(
-            "Case developed and implemented and partially funded as a Climate Change Adaptation measure."
+            "Case partially developed, implemented and funded as a climate change adaptation measure."
         ),
     ),
     (
         "OTHER_POL_OBJ",
         _(
-            "Case mainly developed and implemented because of other policy objectives, but with significant consideration of Climate Change Adaptation aspects"
+            "Case mainly developed and implemented because of other policy objectives, but with significant consideration of climate change adaptation aspects."
         ),
     ),
 ]
@@ -703,6 +703,7 @@ def __call__(self, context, query=None):
 SpecialTagsVocabularyFactory = KeywordsVocabulary("special_tags")
 KeywordsVocabularyFactory = KeywordsVocabulary("keywords")
 ObjectProvidesVocabulary = KeywordsVocabulary("object_provides")
+UpdatingNotesVocabularyFactory = KeywordsVocabulary("updating_notes")
 
 _governance = [
     ("TRANS", "Transnational region (stretching across country borders)"),