diff --git a/ckanext/feedback/assets/css/admin.css b/ckanext/feedback/assets/css/admin.css index 72941b7e..590728be 100644 --- a/ckanext/feedback/assets/css/admin.css +++ b/ckanext/feedback/assets/css/admin.css @@ -140,3 +140,9 @@ input[name="tab-menu"] { .management-heading a { color: #333; } + +.text-truncate { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} diff --git a/ckanext/feedback/assets/js/approval_and_delete.js b/ckanext/feedback/assets/js/approval_and_delete.js index 82c630fe..268bd08e 100644 --- a/ckanext/feedback/assets/js/approval_and_delete.js +++ b/ckanext/feedback/assets/js/approval_and_delete.js @@ -16,7 +16,7 @@ function getCheckedCheckboxes(name, approval) { } function processAction(action, isApproval) { - const form = document.getElementById('comments-form'); + const form = document.getElementById('feedbacks-form'); form.setAttribute("action", action); const resourceCommentWaiting = getCheckedCheckboxes('resource-comments-checkbox', 'False'); diff --git a/ckanext/feedback/templates/admin/approval_and_delete.html b/ckanext/feedback/templates/admin/approval_and_delete.html index fca0c2b4..80f058d8 100644 --- a/ckanext/feedback/templates/admin/approval_and_delete.html +++ b/ckanext/feedback/templates/admin/approval_and_delete.html @@ -33,86 +33,157 @@

{{ _('Approval and Delete') }}

-
-
- {% set approval_action=h.url_for( "feedback.approve_target" ) %} - {% set delete_action=h.url_for( "feedback.delete_target" ) %} - - -
-
- {% if page.collection %} -
-
-
-
-
{{ _('Dataset') }}
-
{{ _('Resource') }}
-
{{ _('Type') }}
-
{{ _('Post Content') }}
-
{{ _('Status') }}
-
+ + {% if h.is_base_public_folder_bs3() %} +
+ {% set approval_action=h.url_for( "feedback.approve_target" ) %} + {% set delete_action=h.url_for( "feedback.delete_target" ) %} + + +
+
+ {% if page.collection %} +
+
+
{{ _('Dataset') }}
+
{{ _('Resource') }}
+
{{ _('Type') }}
+
{{ _('Post Content') }}
+
{{ _('Status') }}
+
{% for feedback in page.collection %} -
-
+
+
{% if feedback.feedback_type == 'リソースコメント' %} - + {% elif feedback.feedback_type == '利活用申請' %} - + {% elif feedback.feedback_type == '利活用コメント' %} - + + {% endif %} +
+ {{ feedback.package_title }} + {{ feedback.resource_name }} + {% if feedback.feedback_type == 'リソースコメント' %} +
+ +
{{ _('Resource Comment') }}
+
+ {{ feedback.content }} + {% elif feedback.feedback_type == '利活用申請' %} +
+ +
{{ _('Utilization') }}
+
+ {{ feedback.content }} + {% elif feedback.feedback_type == '利活用コメント' %} +
+ + + + +
{{ _('Utilization Comment') }}
+
+ {{ feedback.content }} + {% endif %} +
+ {% if feedback.is_approved %} + {{ _('Approved') }} + {% else %} + {{ _('Waiting') }} {% endif %}
- + {% endfor %} + {% block page_pagination_bs3 %} + {{ page.pager() }} + {% endblock %} + {% else %} +

{{ _('There are no applications.') }}

+ {% endif %} +
+ {% else %} +
+ {% set approval_action=h.url_for( "feedback.approve_target" ) %} + {% set delete_action=h.url_for( "feedback.delete_target" ) %} + + +
+
+ {% if page.collection %} +
+
+
{{ _('Dataset') }}
+
{{ _('Resource') }}
+
{{ _('Type') }}
+
{{ _('Post Content') }}
+
{{ _('Status') }}
+
+ {% for feedback in page.collection %} +
+
{% if feedback.feedback_type == 'リソースコメント' %} -
- -
{{ _('Resource Comment') }}
-
- {{ feedback.content }} + {% elif feedback.feedback_type == '利活用申請' %} -
- -
{{ _('Utilization') }}
-
- {{ feedback.content }} + {% elif feedback.feedback_type == '利活用コメント' %} -
- - - - -
{{ _('Utilization Comment') }}
-
- {{ feedback.content }} + {% endif %} -
- {% if feedback.is_approved %} - {{ _('Approved') }} - {% else %} - {{ _('Waiting') }} - {% endif %} +
+ {{ feedback.package_title }} + {{ feedback.resource_name }} + {% if feedback.feedback_type == 'リソースコメント' %} +
+ +
{{ _('Resource Comment') }}
+ {{ feedback.content }} + {% elif feedback.feedback_type == '利活用申請' %} +
+ +
{{ _('Utilization') }}
+
+ {{ feedback.content }} + {% elif feedback.feedback_type == '利活用コメント' %} +
+ + + + +
{{ _('Utilization Comment') }}
+
+ {{ feedback.content }} + {% endif %} +
+ {% if feedback.is_approved %} + {{ _('Approved') }} + {% else %} + {{ _('Waiting') }} + {% endif %}
{% endfor %} {% block page_pagination %} {{ page.pager() }} {% endblock %} -
- {% else %} -

{{ _('There are no applications.') }}

- {% endif %} -
+ {% else %} +

{{ _('There are no applications.') }}

+ {% endif %} +
+ {% endif %}
@@ -151,7 +222,11 @@

{{ filter_item.label }} {{ filter_item.count }} - {% if filter_item.active %}x{% endif %} + {% if not h.is_base_public_folder_bs3() %} + {% if filter_item.active %} + x + {% endif %} + {% endif %} {% endfor %}