diff --git a/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list.html b/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list.html index 9f1dc11e53..4988b5b444 100644 --- a/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list.html +++ b/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list.html @@ -32,7 +32,7 @@ {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('community') }} {%- endblock page_body_tabs %} diff --git a/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_edit.html b/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_edit.html index cc42d31436..95985f7619 100644 --- a/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_edit.html +++ b/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_edit.html @@ -34,7 +34,7 @@ {%- endblock javascript %} {%- block body %} -{% from "weko_authors/macros/tabs_selector.html" import tabs_selector %} +{% from "weko_authors/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('author_list') }}
diff --git a/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_list.html b/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_list.html index 84f6b89465..76d2141779 100644 --- a/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_list.html +++ b/modules/weko-authors/weko_authors/templates/weko_authors/admin/author_list.html @@ -34,7 +34,7 @@ {%- endblock javascript %} {%- block body %} -{% from "weko_authors/macros/tabs_selector.html" import tabs_selector %} +{% from "weko_authors/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('author_list') }}
diff --git a/modules/weko-authors/weko_authors/templates/weko_authors/admin/prefix_list.html b/modules/weko-authors/weko_authors/templates/weko_authors/admin/prefix_list.html index ed01b57864..91cbdfc1c2 100644 --- a/modules/weko-authors/weko_authors/templates/weko_authors/admin/prefix_list.html +++ b/modules/weko-authors/weko_authors/templates/weko_authors/admin/prefix_list.html @@ -34,7 +34,7 @@ {%- endblock javascript %} {%- block body %} -{% from "weko_authors/macros/tabs_selector.html" import tabs_selector %} +{% from "weko_authors/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('prefix_list') }}
diff --git a/modules/weko-gridlayout/weko_gridlayout/templates/weko_gridlayout/pages/default_page.html b/modules/weko-gridlayout/weko_gridlayout/templates/weko_gridlayout/pages/default_page.html index cbc611f0c8..ac0a906c9d 100644 --- a/modules/weko-gridlayout/weko_gridlayout/templates/weko_gridlayout/pages/default_page.html +++ b/modules/weko-gridlayout/weko_gridlayout/templates/weko_gridlayout/pages/default_page.html @@ -32,7 +32,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('top',community_id) }} {%- endblock page_body_tabs%} diff --git a/modules/weko-index-tree/weko_index_tree/templates/weko_index_tree/tree_edit.html b/modules/weko-index-tree/weko_index_tree/templates/weko_index_tree/tree_edit.html index d71ecfd736..07a395bb6a 100644 --- a/modules/weko-index-tree/weko_index_tree/templates/weko_index_tree/tree_edit.html +++ b/modules/weko-index-tree/weko_index_tree/templates/weko_index_tree/tree_edit.html @@ -31,7 +31,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('edit_tree') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/edit.html b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/edit.html index 948cd62b5c..79b00cd3bc 100644 --- a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/edit.html +++ b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/edit.html @@ -45,7 +45,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('item') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/export.html b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/export.html index e11fc47445..c38ac8ce1e 100644 --- a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/export.html +++ b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/export.html @@ -37,7 +37,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('top', community_id) }} {%- endblock page_body_tabs %} diff --git a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/iframe/item_index.html b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/iframe/item_index.html index 911930d096..49507be8b3 100644 --- a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/iframe/item_index.html +++ b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/iframe/item_index.html @@ -38,7 +38,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('flow', community_id) }} {%- endblock page_body_tabs %} diff --git a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/item_index.html b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/item_index.html index 483f941959..7cd0b4774d 100644 --- a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/item_index.html +++ b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/item_index.html @@ -32,7 +32,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('item') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/ranking.html b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/ranking.html index c7a3f607ed..b30c7a5d1a 100644 --- a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/ranking.html +++ b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/ranking.html @@ -30,7 +30,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('rank') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/upload.html b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/upload.html index b9d4973258..ff2477e2e7 100644 --- a/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/upload.html +++ b/modules/weko-items-ui/weko_items_ui/templates/weko_items_ui/upload.html @@ -30,7 +30,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('item') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-itemtypes-ui/weko_itemtypes_ui/templates/weko_itemtypes_ui/mapping.html b/modules/weko-itemtypes-ui/weko_itemtypes_ui/templates/weko_itemtypes_ui/mapping.html index 68873d8a09..521693b24e 100644 --- a/modules/weko-itemtypes-ui/weko_itemtypes_ui/templates/weko_itemtypes_ui/mapping.html +++ b/modules/weko-itemtypes-ui/weko_itemtypes_ui/templates/weko_itemtypes_ui/mapping.html @@ -30,7 +30,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('item_type') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-plugins/weko_plugins/templates/weko_plugins/plugin_setting.html b/modules/weko-plugins/weko_plugins/templates/weko_plugins/plugin_setting.html index e106b860c5..54e0d183df 100644 --- a/modules/weko-plugins/weko_plugins/templates/weko_plugins/plugin_setting.html +++ b/modules/weko-plugins/weko_plugins/templates/weko_plugins/plugin_setting.html @@ -21,7 +21,7 @@ {%- extends config.WEKO_PLUGINS_BASE_TEMPLATE %} {%- block page_body_tabs %} - {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector with context %} {{ tabs_selector(plugin.identifier) }} {%- endblock page_body_tabs%} diff --git a/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/detail.html b/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/detail.html index d6f2654e5f..5810d933a1 100644 --- a/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/detail.html +++ b/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/detail.html @@ -52,7 +52,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('top',community_id) }} {%- endblock page_body_tabs%} diff --git a/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/file_details.html b/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/file_details.html index 3a287f60fb..a19f58f23a 100644 --- a/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/file_details.html +++ b/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/file_details.html @@ -48,7 +48,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('top',community_id) }} {%- endblock page_body_tabs%} diff --git a/modules/weko-search-ui/weko_search_ui/templates/weko_search_ui/search.html b/modules/weko-search-ui/weko_search_ui/templates/weko_search_ui/search.html index 8e960218b7..02888fa43f 100644 --- a/modules/weko-search-ui/weko_search_ui/templates/weko_search_ui/search.html +++ b/modules/weko-search-ui/weko_search_ui/templates/weko_search_ui/search.html @@ -57,7 +57,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('top',community_id) }} {%- endblock page_body_tabs%} diff --git a/modules/weko-theme/weko_theme/templates/weko_theme/admin/item_management_init.html b/modules/weko-theme/weko_theme/templates/weko_theme/admin/item_management_init.html index 2a8cc6fb76..b6ae512d94 100644 --- a/modules/weko-theme/weko_theme/templates/weko_theme/admin/item_management_init.html +++ b/modules/weko-theme/weko_theme/templates/weko_theme/admin/item_management_init.html @@ -38,7 +38,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/edit_tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('item_management') }} {%- endblock page_body_tabs%} @@ -55,7 +55,7 @@
diff --git a/modules/weko-theme/weko_theme/templates/weko_theme/edit.html b/modules/weko-theme/weko_theme/templates/weko_theme/edit.html index cab3f389c5..bea3b5b98d 100644 --- a/modules/weko-theme/weko_theme/templates/weko_theme/edit.html +++ b/modules/weko-theme/weko_theme/templates/weko_theme/edit.html @@ -29,7 +29,7 @@ {%- block body_center %}
diff --git a/modules/weko-theme/weko_theme/templates/weko_theme/frontpage.html b/modules/weko-theme/weko_theme/templates/weko_theme/frontpage.html index f70c24c364..e196e194a1 100644 --- a/modules/weko-theme/weko_theme/templates/weko_theme/frontpage.html +++ b/modules/weko-theme/weko_theme/templates/weko_theme/frontpage.html @@ -40,7 +40,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('top',community_id) }} {%- endblock page_body_tabs%} diff --git a/modules/weko-theme/weko_theme/templates/weko_theme/macros/tabs_selector.html b/modules/weko-theme/weko_theme/templates/weko_theme/macros/tabs_selector.html index 6b9fb8d2f8..8d17b4ae55 100644 --- a/modules/weko-theme/weko_theme/templates/weko_theme/macros/tabs_selector.html +++ b/modules/weko-theme/weko_theme/templates/weko_theme/macros/tabs_selector.html @@ -20,11 +20,16 @@ {% macro tabs_selector(tab_value='top',community_id='') %} {%- if community_id %} +
  • {{ _('Top') }}
  • + {%- if current_user.is_authenticated %}
  • {{ _('WorkFlow') }}
  • + {%- endif %} {%- else %}
  • {{ _('Top') }}
  • + {%- if current_user.is_authenticated %}
  • {{ _('WorkFlow') }}
  • + {%- endif %}
  • {{ _('Communities') }}
  • {%- endif %} diff --git a/modules/weko-theme/weko_theme/templates/weko_theme/page.html b/modules/weko-theme/weko_theme/templates/weko_theme/page.html index a90c319601..32c841c60b 100644 --- a/modules/weko-theme/weko_theme/templates/weko_theme/page.html +++ b/modules/weko-theme/weko_theme/templates/weko_theme/page.html @@ -25,7 +25,7 @@ {%- block body_center %} diff --git a/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_detail.html b/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_detail.html index a02e6498d1..4e9ddaa8f1 100644 --- a/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_detail.html +++ b/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_detail.html @@ -54,7 +54,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('flow', community_id) }} {%- endblock page_body_tabs %} diff --git a/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_list.html b/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_list.html index 5bebc1c0f6..f1cff06e05 100644 --- a/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_list.html +++ b/modules/weko-workflow/weko_workflow/templates/weko_workflow/activity_list.html @@ -36,7 +36,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} -{% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} +{% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('flow',community_id) }} {%- endblock page_body_tabs %} diff --git a/modules/weko-workflow/weko_workflow/templates/weko_workflow/index.html b/modules/weko-workflow/weko_workflow/templates/weko_workflow/index.html index b47cc9cdd2..ce40479727 100644 --- a/modules/weko-workflow/weko_workflow/templates/weko_workflow/index.html +++ b/modules/weko-workflow/weko_workflow/templates/weko_workflow/index.html @@ -21,7 +21,7 @@ {%- extends config.WEKO_WORKFLOW_BASE_TEMPLATE %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('flow') }} {%- endblock page_body_tabs%} diff --git a/modules/weko-workflow/weko_workflow/templates/weko_workflow/item_login_success.html b/modules/weko-workflow/weko_workflow/templates/weko_workflow/item_login_success.html index a1a5a698f3..5ded5255e9 100644 --- a/modules/weko-workflow/weko_workflow/templates/weko_workflow/item_login_success.html +++ b/modules/weko-workflow/weko_workflow/templates/weko_workflow/item_login_success.html @@ -36,7 +36,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} -{% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} +{% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('flow', community_id) }} {%- endblock page_body_tabs %} diff --git a/modules/weko-workflow/weko_workflow/templates/weko_workflow/workflow_list.html b/modules/weko-workflow/weko_workflow/templates/weko_workflow/workflow_list.html index 4d18ad245c..620dbb3a00 100644 --- a/modules/weko-workflow/weko_workflow/templates/weko_workflow/workflow_list.html +++ b/modules/weko-workflow/weko_workflow/templates/weko_workflow/workflow_list.html @@ -32,7 +32,7 @@ {%- endblock javascript %} {%- block page_body_tabs %} - {% from "weko_theme/macros/tabs_selector.html" import tabs_selector %} + {% from "weko_theme/macros/tabs_selector.html" import tabs_selector with context %} {{ tabs_selector('flow', community_id) }} {%- endblock page_body_tabs %}