From d912160da8f6ab4e63ad2c89ed3274b77ba44378 Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 15 Jun 2023 10:24:05 +0200
Subject: [PATCH 1/3] Add csrf_input to all forms

---
 .../templates/admin/confirm_remove_showcase_admin.html      | 1 +
 .../showcase/templates/admin/manage_showcase_admins.html    | 1 +
 .../showcase/templates/package/dataset_showcase_list.html   | 1 +
 ckanext/showcase/templates/showcase/add_datasets.html       | 1 +
 ckanext/showcase/templates/showcase/confirm_delete.html     | 1 +
 ckanext/showcase/templates/showcase/manage_datasets.html    | 2 ++
 .../showcase/templates/showcase/snippets/showcase_item.html | 6 +++++-
 7 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ckanext/showcase/templates/admin/confirm_remove_showcase_admin.html b/ckanext/showcase/templates/admin/confirm_remove_showcase_admin.html
index 342012b9..2f8c95fe 100644
--- a/ckanext/showcase/templates/admin/confirm_remove_showcase_admin.html
+++ b/ckanext/showcase/templates/admin/confirm_remove_showcase_admin.html
@@ -12,6 +12,7 @@
         <p>{{ _('Are you sure you want to remove this user as a Showcase Admin - {name}?').format(name=c.user_dict.name) }}</p>
         <p class="form-actions">
             <form action="{{ h.url_for(showcase_admin_remove_route) }}" method="post">
+            {{ h.csrf_input() if 'csrf_input' in h }}
             <input type="hidden" name="user" value="{{ c.user_id }}" />
             <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
             <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Remove') }}</button>
diff --git a/ckanext/showcase/templates/admin/manage_showcase_admins.html b/ckanext/showcase/templates/admin/manage_showcase_admins.html
index e129f4a5..9bd679a3 100644
--- a/ckanext/showcase/templates/admin/manage_showcase_admins.html
+++ b/ckanext/showcase/templates/admin/manage_showcase_admins.html
@@ -12,6 +12,7 @@ <h1 class="page-heading">
   </h1>
   {% block form %}
     <form class="dataset-form form-horizontal add-member-form" method='post'>
+      {{ h.csrf_input() if 'csrf_input' in h }}
       <div class="row-fluid">
         <div class="control-group control-medium">
           <label class="control-label" for="username">
diff --git a/ckanext/showcase/templates/package/dataset_showcase_list.html b/ckanext/showcase/templates/package/dataset_showcase_list.html
index 35f31591..b06c6e5f 100644
--- a/ckanext/showcase/templates/package/dataset_showcase_list.html
+++ b/ckanext/showcase/templates/package/dataset_showcase_list.html
@@ -5,6 +5,7 @@
 {% block primary_content_inner %}
     {% if h.check_access('ckanext_showcase_update') and c.showcase_dropdown %}
         <form method="post" class="form-horizontal" id="showcase-add">
+            {{ h.csrf_input() if 'csrf_input' in h }}
             <select id="field-add_showcase" name="showcase_added" data-module="autocomplete">
                 {% for option in c.showcase_dropdown %}
                     <option value="{{ option[0] }}"> {{ option[1] }}</option>
diff --git a/ckanext/showcase/templates/showcase/add_datasets.html b/ckanext/showcase/templates/showcase/add_datasets.html
index 956b4c9e..7a4d0fef 100644
--- a/ckanext/showcase/templates/showcase/add_datasets.html
+++ b/ckanext/showcase/templates/showcase/add_datasets.html
@@ -34,6 +34,7 @@ <h3 class="page-heading">
       {% block package_search_results_list %}
         {% if c.page.items %}
           <form method="POST" data-module="basic-form">
+            {{ h.csrf_input() if 'csrf_input' in h }}
             {#{% block errors %}{{ form.errors(error_summary) }}{% endblock %}#}
             <table class="table table-bordered table-header table-hover table-bulk-edit table-edit-hover" data-module="table-selectable-rows">
               <col width="8">
diff --git a/ckanext/showcase/templates/showcase/confirm_delete.html b/ckanext/showcase/templates/showcase/confirm_delete.html
index ad88eab2..82369a4b 100644
--- a/ckanext/showcase/templates/showcase/confirm_delete.html
+++ b/ckanext/showcase/templates/showcase/confirm_delete.html
@@ -16,6 +16,7 @@
                 <p>{{ _('Are you sure you want to delete showcase - {showcase_name}?').format(showcase_name=pkg.name) }}</p>
                 <p class="form-actions">
                     <form action="{{ h.url_for(showcase_delete_route, id=c.pkg_dict.name) }}" method="post">
+                        {{ h.csrf_input() if 'csrf_input' in h }}
                         <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
                         <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
                     </form>
diff --git a/ckanext/showcase/templates/showcase/manage_datasets.html b/ckanext/showcase/templates/showcase/manage_datasets.html
index e07372a2..92ac5add 100644
--- a/ckanext/showcase/templates/showcase/manage_datasets.html
+++ b/ckanext/showcase/templates/showcase/manage_datasets.html
@@ -37,6 +37,7 @@ <h3 class="page-heading">{{ _('Datasets available to add to this showcase') }}</
           {% block package_search_results_list %}
             {% if c.page.items %}
               <form method="POST" data-module="basic-form">
+                {{ h.csrf_input() if 'csrf_input' in h }}
                 {#{% block errors %}{{ form.errors(error_summary) }}{% endblock %}#}
                 <table class="table table-bordered table-header table-hover table-bulk-edit table-edit-hover" data-module="table-selectable-rows">
                   <col width="8">
@@ -96,6 +97,7 @@ <h3 class="dataset-heading">
               <h3 class="page-heading">{{ _('Datasets in this showcase') }}</h3>
               {% if c.showcase_pkgs %}
                   <form method="POST" data-module="basic-form">
+                    {{ h.csrf_input() if 'csrf_input' in h }}
                       <table class="table table-bordered table-header table-hover table-bulk-edit table-edit-hover" data-module="table-selectable-rows">
                           <col width="8">
                           <col width="120">
diff --git a/ckanext/showcase/templates/showcase/snippets/showcase_item.html b/ckanext/showcase/templates/showcase/snippets/showcase_item.html
index 85abedd0..a9b994ce 100644
--- a/ckanext/showcase/templates/showcase/snippets/showcase_item.html
+++ b/ckanext/showcase/templates/showcase/snippets/showcase_item.html
@@ -45,7 +45,11 @@ <h3 class="media-heading">{{ h.link_to(title|truncate(truncate_title), h.url_for
       </a>
     {% endblock %}
     {% if show_remove %}
-      <form method="post"><input type="hidden" value="{{ package.id }}" name="remove_showcase_id" /><input value="{{ _('Remove') }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove dataset from this showcase') }}"/></form>
+      <form method="post">
+        {{ h.csrf_input() if 'csrf_input' in h }}
+        <input type="hidden" value="{{ package.id }}" name="remove_showcase_id" />
+        <input value="{{ _('Remove') }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove dataset from this showcase') }}"/>
+      </form>
     {% endif %}
   {% endblock %}
 </li>

From c025ad6d1920c1e970b182ba6ecf49c177ce801c Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 15 Jun 2023 10:24:42 +0200
Subject: [PATCH 2/3] Fix BS5 class

---
 ckanext/showcase/templates/admin/manage_showcase_admins.html    | 2 +-
 ckanext/showcase/templates/showcase/snippets/showcase_item.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/showcase/templates/admin/manage_showcase_admins.html b/ckanext/showcase/templates/admin/manage_showcase_admins.html
index 9bd679a3..19127533 100644
--- a/ckanext/showcase/templates/admin/manage_showcase_admins.html
+++ b/ckanext/showcase/templates/admin/manage_showcase_admins.html
@@ -53,7 +53,7 @@ <h3 class="page-heading">{{ _('Showcase Admins') }}</h3>
           {{ h.linked_user(user_dict['id'], maxlength=20) }}
           {% set locale = h.dump_json({'content': _('Are you sure you want to remove this user from the Showcase Admin list?')}) %}
           <div class="btn-group pull-right">
-            <a class="btn btn-danger btn-small" href="{{ h.url_for(showcase_admin_remove_route, user=user_dict['id']) }}" data-module="confirm-action" data-module-i18n="{{ locale }}" title="{{ _('Remove') }}">{% block delete_button_text %}<i class="icon-remove"></i> {{ _('Remove') }}{% endblock %}</a>
+            <a class="btn btn-danger btn-sm" href="{{ h.url_for(showcase_admin_remove_route, user=user_dict['id']) }}" data-module="confirm-action" data-module-i18n="{{ locale }}" title="{{ _('Remove') }}">{% block delete_button_text %}<i class="icon-remove"></i> {{ _('Remove') }}{% endblock %}</a>
           </div>
         </td>
       </tr>
diff --git a/ckanext/showcase/templates/showcase/snippets/showcase_item.html b/ckanext/showcase/templates/showcase/snippets/showcase_item.html
index a9b994ce..d0f7466e 100644
--- a/ckanext/showcase/templates/showcase/snippets/showcase_item.html
+++ b/ckanext/showcase/templates/showcase/snippets/showcase_item.html
@@ -48,7 +48,7 @@ <h3 class="media-heading">{{ h.link_to(title|truncate(truncate_title), h.url_for
       <form method="post">
         {{ h.csrf_input() if 'csrf_input' in h }}
         <input type="hidden" value="{{ package.id }}" name="remove_showcase_id" />
-        <input value="{{ _('Remove') }}" type="submit" class="btn btn-danger btn-small media-edit" title="{{ _('Remove dataset from this showcase') }}"/>
+        <input value="{{ _('Remove') }}" type="submit" class="btn btn-danger btn-sm media-edit" title="{{ _('Remove dataset from this showcase') }}"/>
       </form>
     {% endif %}
   {% endblock %}

From 7b4a0fc5fd286137af5d9fa49c3cc64b7435953b Mon Sep 17 00:00:00 2001
From: pdelboca <patriciodelboca@gmail.com>
Date: Thu, 15 Jun 2023 11:09:12 +0200
Subject: [PATCH 3/3] Add trophy icon to nav bar

---
 ckanext/showcase/templates/package/read_base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/showcase/templates/package/read_base.html b/ckanext/showcase/templates/package/read_base.html
index e41d3263..a72655cc 100644
--- a/ckanext/showcase/templates/package/read_base.html
+++ b/ckanext/showcase/templates/package/read_base.html
@@ -3,5 +3,5 @@
 
 {% block content_primary_nav %}
   {{ super() }}
-  {{ h.build_nav_icon(showcase_dataset_showcase_list_route, _('Showcases'), id=pkg.name) }}
+  {{ h.build_nav_icon(showcase_dataset_showcase_list_route, _('Showcases'), id=pkg.name, icon='trophy') }}
 {% endblock %}