Merge branch 'development' of github.com:UtrechtUniversity/yoda-rules…

…et into development
UtrechtUniversity · Sep 27, 2023 · bcea45d · bcea45d
2 parents 294b948 + 687e9f1
commit bcea45d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/json_landing_page.py b/json_landing_page.py
@@ -312,7 +312,6 @@ def json_landing_page_create_json_landing_page(callback, rodsZone, template_name
     # tm.globals['custom_function'] = custom_function
     tm.globals['persistent_identifier_to_uri'] = persistent_identifier_to_uri
     landing_page = tm.render(
-        no_active_embargo=no_active_embargo,
         title=title,
         description=description,
         datatype=datatype,
@@ -326,6 +325,8 @@ def json_landing_page_create_json_landing_page(callback, rodsZone, template_name
         contributors=contributors,
         contacts=contacts,
         publication_date=publication_date,
+        embargo_end_date=embargo_end_date,
+        no_active_embargo=no_active_embargo,
         data_access_restriction=data_access_restriction,
         license=license,
         license_uri=license_uri,

diff --git a/templates/landingpage.html.j2 b/templates/landingpage.html.j2
@@ -213,8 +213,8 @@
 
                 var mymap = L.map('map{{ loop.index }}').fitBounds(bounds, {'maxZoom': 5});
 
-                L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                        attribution: '&amp;copy <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
+                L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>',
                         maxZoom: 18
                 }).addTo(mymap);
 
@@ -324,6 +324,16 @@
                                 <span>{{ last_modified_date }}</span>
                             </div>
                         </div>
+                        {% if embargo_end_date %}
+                        <div class="row">
+                            <div class="col-sm-2">
+                                <label>Embargo End Date</label>
+                            </div>
+                            <div class="col-sm-10">
+                                <span>{{ embargo_end_date }}</span>
+                            </div>
+                        </div>
+                        {% endif %}
                     </div>
 
                     {% for pack in related_resources %}