From a2daf519860e53834219a0598b866e2aac66e0e7 Mon Sep 17 00:00:00 2001 From: Lucas Gass <lucas@bywatersolutions.com> Date: Thu, 3 Nov 2022 17:46:15 +0000 Subject: [PATCH] Bug 32028: Add page-section to various admin pages This patch adds the page section to div to the following administration pages: admin/cash_registers.tt admin/cities.tt admin/credit_types.tt admin/debit_types.tt admin/patron-attr-types.tt admin/restrictions.tt plugins/plugins-home.tt To test go the following pages and make sure everything looks good: Administration > Cash registers. You must enable the sys pref 'UseCashRegisters' Administration > Cities and towns. Administration > Credit types Administration > Debit types Administration > Patron restrictions Adminstration > Patron attribute types Administration > Manage plugins Signed-off-by: David Nind <david@davidnind.com> --- .../prog/en/modules/admin/cash_registers.tt | 72 +++--- .../prog/en/modules/admin/cities.tt | 28 +-- .../prog/en/modules/admin/credit_types.tt | 102 ++++---- .../prog/en/modules/admin/debit_types.tt | 116 ++++----- .../en/modules/admin/patron-attr-types.tt | 112 ++++----- .../prog/en/modules/admin/restrictions.tt | 66 +++--- .../prog/en/modules/plugins/plugins-home.tt | 220 +++++++++--------- 7 files changed, 366 insertions(+), 350 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt index 73a62f5ccc..4acc81a23e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -166,44 +166,46 @@ Cash registers › Administration › Koha </h3> [% IF cash_registers.count %] - <table id="table_cash_registers"> - <thead> - <th>Name</th> - <th>Description</th> - <th>Library</th> - <th>Library default</th> - <th>Initial float</th> - <th class="noExport">Actions</th> - </thead> - <tbody> - [% FOREACH cash_register IN cash_registers %] - [% IF cash_register.branch_default %] - <tr class="default"> - [% ELSE %] - <tr> - [% END %] - <td>[% cash_register.name | html %]</td> - <td>[% cash_register.description | html %]</td> - <td>[% cash_register.library.branchname | html %]</td> - <td>[% IF cash_register.branch_default %]Yes[% ELSE %]No[% END %]</td> - <td>[% cash_register.starting_float | $Price %]</td> - [% IF cash_register.archived == '0' %] - <td class="actions"> - <a class="btn btn-default btn-xs" href="cash_registers.pl?op=add_form&id=[% cash_register.id | uri %]"><i class="fa fa-pencil"></i> Edit</a> - [% IF cash_register.branch_default %] - <a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Drop default</a> + <div class="page-section"> + <table id="table_cash_registers"> + <thead> + <th>Name</th> + <th>Description</th> + <th>Library</th> + <th>Library default</th> + <th>Initial float</th> + <th class="noExport">Actions</th> + </thead> + <tbody> + [% FOREACH cash_register IN cash_registers %] + [% IF cash_register.branch_default %] + <tr class="default"> + [% ELSE %] + <tr> + [% END %] + <td>[% cash_register.name | html %]</td> + <td>[% cash_register.description | html %]</td> + <td>[% cash_register.library.branchname | html %]</td> + <td>[% IF cash_register.branch_default %]Yes[% ELSE %]No[% END %]</td> + <td>[% cash_register.starting_float | $Price %]</td> + [% IF cash_register.archived == '0' %] + <td class="actions"> + <a class="btn btn-default btn-xs" href="cash_registers.pl?op=add_form&id=[% cash_register.id | uri %]"><i class="fa fa-pencil"></i> Edit</a> + [% IF cash_register.branch_default %] + <a class="btn btn-default btn-xs" href="cash_registers.pl?op=drop_default&id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Drop default</a> + [% ELSE %] + <a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Make default</a> + [% END %] + <a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Archive</a> + </td> [% ELSE %] - <a class="btn btn-default btn-xs" href="cash_registers.pl?op=make_default&id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Make default</a> + <td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&id=[% cash_register.id | uri %]"><i class="fa fa-trash-restore"></i> Restore</a></td> [% END %] - <a class="btn btn-default btn-xs" href="cash_registers.pl?op=archive&id=[% cash_register.id | uri %]"><i class="fa fa-archive"></i> Archive</a> - </td> - [% ELSE %] - <td class="actions"><a class="btn btn-default btn-xs" href="cash_registers.pl?op=unarchive&id=[% cash_register.id | uri %]"><i class="fa fa-trash-restore"></i> Restore</a></td> + </tr> [% END %] - </tr> - [% END %] - </tbody> - </table> + </tbody> + </table> + </div><!-- /.page-section --> [% ELSE %] <div class="dialog message">There are no cash registers defined. <a href="/cgi-bin/koha/admin/cash_registers.pl?op=add_form">Start adding cash registers</a>.</div> [% END # /cash_register.count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index c05f3d7992..f78cd0f819 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -181,19 +181,21 @@ [% END %] [% IF cities_count > 0 %] - <div class="table_cities_table_controls"></div> - <table id="table_cities"> - <thead> - <tr> - <th>City ID</th> - <th>City</th> - <th>State</th> - <th>ZIP/Postal code</th> - <th>Country</th> - <th data-class-name="actions noExport">Actions</th> - </tr> - </thead> - </table> + <div class="page-section"> + <div class="table_cities_table_controls"></div> + <table id="table_cities"> + <thead> + <tr> + <th>City ID</th> + <th>City</th> + <th>State</th> + <th>ZIP/Postal code</th> + <th>Country</th> + <th data-class-name="actions noExport">Actions</th> + </tr> + </thead> + </table> + </div><!-- /.page-section --> [% ELSE %] <div class="dialog message"> There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt index 66588da1b7..55184158de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -162,59 +162,61 @@ <h1>Account credit types</h1> [% IF credit_types.count %] - <table id="table_credit_types"> - <thead> - <th>Archived</th> - <th>System</th> - <th>Code</th> - <th>Description</th> - <th>Available for</th> - <th>Credit number enabled</th> - <th>Library limitations</th> - <th class="noExport">Actions</th> - </thead> - <tbody> - [% FOREACH credit_type IN credit_types %] - <tr> - <td>[% credit_type.archived | html %]</td> - <td>[% credit_type.is_system | html %]</td> - <td>[% credit_type.code | html %]</td> - <td>[% credit_type.description | html %]</td> - <td>[% IF credit_type.can_be_added_manually %]Manual credit[% END %]</td> - <td>[% IF credit_type.credit_number_enabled %]Yes[% ELSE %]No[% END %]</td> - <td> - [% IF credit_type.library_limits.count > 0 %] - [% library_limits_str = "" %] - [% FOREACH library IN credit_type.library_limits %] - [%- IF loop.first -%] - [% library_limits_str = library.branchname _ " (" _ library.branchcode _ ")" %] - [% ELSE %] - [% library_limits_str = library_limits_str _ "\n" _ library.branchname _ " (" _ library.branchcode _ ")" %] + <div class="page-section"> + <table id="table_credit_types"> + <thead> + <th>Archived</th> + <th>System</th> + <th>Code</th> + <th>Description</th> + <th>Available for</th> + <th>Credit number enabled</th> + <th>Library limitations</th> + <th class="noExport">Actions</th> + </thead> + <tbody> + [% FOREACH credit_type IN credit_types %] + <tr> + <td>[% credit_type.archived | html %]</td> + <td>[% credit_type.is_system | html %]</td> + <td>[% credit_type.code | html %]</td> + <td>[% credit_type.description | html %]</td> + <td>[% IF credit_type.can_be_added_manually %]Manual credit[% END %]</td> + <td>[% IF credit_type.credit_number_enabled %]Yes[% ELSE %]No[% END %]</td> + <td> + [% IF credit_type.library_limits.count > 0 %] + [% library_limits_str = "" %] + [% FOREACH library IN credit_type.library_limits %] + [%- IF loop.first -%] + [% library_limits_str = library.branchname _ " (" _ library.branchcode _ ")" %] + [% ELSE %] + [% library_limits_str = library_limits_str _ "\n" _ library.branchname _ " (" _ library.branchcode _ ")" %] + [% END %] [% END %] + <span class="library_limitation" title="[% library_limits_str | html %]"> + [% limits_count = credit_type.library_limits.count %] + [% tnx('{count} library limitation', '{count} library limitations', limits_count, { count => limits_count }) %] + [% ELSE %] + <span>No library limitation</span> + [% END %] + </td> + <td class="actions"> + [% IF !credit_type.archived %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code | uri %]&type=credit"><i class="fa fa-pencil"></i> Edit</a> + [% END %] + [% IF !credit_type.is_system && !credit_type.archived %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> [% END %] - <span class="library_limitation" title="[% library_limits_str | html %]"> - [% limits_count = credit_type.library_limits.count %] - [% tnx('{count} library limitation', '{count} library limitations', limits_count, { count => limits_count }) %] - [% ELSE %] - <span>No library limitation</span> - [% END %] - </td> - <td class="actions"> - [% IF !credit_type.archived %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code | uri %]&type=credit"><i class="fa fa-pencil"></i> Edit</a> - [% END %] - [% IF !credit_type.is_system && !credit_type.archived %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> - [% END %] - [% IF !credit_type.is_system && credit_type.archived %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> - [% END %] - </td> - </tr> - [% END %] - </tbody> - </table> + [% IF !credit_type.is_system && credit_type.archived %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> + [% END %] + </td> + </tr> + [% END %] + </tbody> + </table> + </div><!-- /.page-section --> [% ELSE %] <div class="dialog message"> There are no account credit types defined. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 518602ccbf..546e51e00e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -153,65 +153,67 @@ <h1>Account debit types</h1> [% IF debit_types.count %] - <table id="table_debit_types"> - <thead> - <th>Archived</th> - <th>System</th> - <th>Code</th> - <th>Description</th> - <th>Default amount</th> - <th>Available for</th> - <th>Library limitations</th> - <th class="noExport">Actions</th> - </thead> - <tbody> - [% FOREACH debit_type IN debit_types %] - <tr> - <td>[% debit_type.archived | html %]</td> - <td>[% debit_type.is_system | html %]</td> - <td>[% debit_type.code | html %]</td> - <td>[% debit_type.description | html %]</td> - <td>[% debit_type.default_amount | $Price %]</td> - <td>[% IF debit_type.can_be_invoiced && debit_type.can_be_sold %] - <i class="fa fa-id-card-o"></i> Invoicing, <i class="fa fa-shopping-cart"></i> Sale - [% ELSIF debit_type.can_be_invoiced %] - <i class="fa fa-id-card-o"></i> Invoicing - [% ELSIF debit_type.can_be_sold %] - <i class="fa fa-shopping-cart"></i> Sale - [% END %] - </td> - <td> - [% IF debit_type.library_limits.count > 0 %] - [% library_limits_str = "" %] - [% FOREACH library IN debit_type.library_limits %] - [%- IF loop.first -%] - [% library_limits_str = library.branchname _ " (" _ library.branchcode _ ")" %] - [% ELSE %] - [% library_limits_str = library_limits_str _ "\n" _ library.branchname _ " (" _ library.branchcode _ ")" %] - [% END %] + <div class="page-section"> + <table id="table_debit_types"> + <thead> + <th>Archived</th> + <th>System</th> + <th>Code</th> + <th>Description</th> + <th>Default amount</th> + <th>Available for</th> + <th>Library limitations</th> + <th class="noExport">Actions</th> + </thead> + <tbody> + [% FOREACH debit_type IN debit_types %] + <tr> + <td>[% debit_type.archived | html %]</td> + <td>[% debit_type.is_system | html %]</td> + <td>[% debit_type.code | html %]</td> + <td>[% debit_type.description | html %]</td> + <td>[% debit_type.default_amount | $Price %]</td> + <td>[% IF debit_type.can_be_invoiced && debit_type.can_be_sold %] + <i class="fa fa-id-card-o"></i> Invoicing, <i class="fa fa-shopping-cart"></i> Sale + [% ELSIF debit_type.can_be_invoiced %] + <i class="fa fa-id-card-o"></i> Invoicing + [% ELSIF debit_type.can_be_sold %] + <i class="fa fa-shopping-cart"></i> Sale [% END %] - <span class="library_limitation" title="[% library_limits_str | html %]"> - [% IF debit_type.library_limits.count > 1 %] - <span>[% debit_type.library_limits.count | html %] library limitations</span> - [% ELSE %] - <span>[% debit_type.library_limits.count | html %] library limitation</span> + </td> + <td> + [% IF debit_type.library_limits.count > 0 %] + [% library_limits_str = "" %] + [% FOREACH library IN debit_type.library_limits %] + [%- IF loop.first -%] + [% library_limits_str = library.branchname _ " (" _ library.branchcode _ ")" %] + [% ELSE %] + [% library_limits_str = library_limits_str _ "\n" _ library.branchname _ " (" _ library.branchcode _ ")" %] + [% END %] [% END %] - [% ELSE %] - <span>No limitation</span> - [% END %] - </td> - <td class="actions"> - [% IF !debit_type.is_system && !debit_type.archived %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code | uri %]&type=debit"><i class="fa fa-pencil"></i> Edit</a> - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> - [% ELSIF debit_type.archived %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> - [% END %] - </td> - </tr> - [% END %] - </tbody> - </table> + <span class="library_limitation" title="[% library_limits_str | html %]"> + [% IF debit_type.library_limits.count > 1 %] + <span>[% debit_type.library_limits.count | html %] library limitations</span> + [% ELSE %] + <span>[% debit_type.library_limits.count | html %] library limitation</span> + [% END %] + [% ELSE %] + <span>No limitation</span> + [% END %] + </td> + <td class="actions"> + [% IF !debit_type.is_system && !debit_type.archived %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code | uri %]&type=debit"><i class="fa fa-pencil"></i> Edit</a> + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> + [% ELSIF debit_type.archived %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> + [% END %] + </td> + </tr> + [% END %] + </tbody> + </table> + </div><!-- /.page-section --> [% ELSE %] <div class="dialog message"> There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new debit type</a> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 2a4e1e2ffc..b35a242c11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -291,65 +291,67 @@ Patron attribute types › Administration › Koha — it was already absent from the database.</div> [% END %] [% IF ( available_attribute_types ) %] - [% FOREACH attribute IN available_attribute_types %] + [% FOREACH attribute IN available_attribute_types %] [% IF attribute.class %] <h4>[% attribute.lib | html %]</h4> [% END %] - <table class="patron_attributes_types" id="patron_attr[% attribute.class | html %]"> - <thead> - <tr> - <th>Code</th> - <th>Description</th> - <th>Library limitation</th> - <th>Authorized value category</th> - <th>Mandatory</th> - <th class="NoSort noExport">Actions</th> - </tr> - </thead> - <tbody> - [% FOREACH item IN attribute.items %] - <tr> - <td>[% item.code | html %]</td> - <td>[% item.description | html %]</td> - <td> - [% SET libraries = item.library_limits %] - [% IF ( libraries && libraries.count > 0 ) %] - [% branches_str = "" %] - [% FOREACH branch IN libraries %] - [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] - [% END %] - <span title="[% branches_str | html %]"> - [% IF libraries.count > 1 %] - <span>[% libraries.count | html %] library limitations</span> - [% ELSE %] - <span>[% libraries.count | html %] library limitation</span> + <div class="page-section"> + <table class="patron_attributes_types" id="patron_attr[% attribute.class | html %]"> + <thead> + <tr> + <th>Code</th> + <th>Description</th> + <th>Library limitation</th> + <th>Authorized value category</th> + <th>Mandatory</th> + <th class="NoSort noExport">Actions</th> + </tr> + </thead> + <tbody> + [% FOREACH item IN attribute.items %] + <tr> + <td>[% item.code | html %]</td> + <td>[% item.description | html %]</td> + <td> + [% SET libraries = item.library_limits %] + [% IF ( libraries && libraries.count > 0 ) %] + [% branches_str = "" %] + [% FOREACH branch IN libraries %] + [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] [% END %] - </span> - [% ELSE %] - No limitation - [% END %] - </td> - <td> - [% IF ( CAN_user_parameters_manage_auth_values ) %] - <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% item.authorised_value_category | uri %]">[% item.authorised_value_category | html %]</a></td> - [% ELSE %] - [% item.authorised_value_category | html %] - [% END %] - <td> - [% IF ( item.mandatory ) -%] - <span>Yes</span> - [% ELSE -%] - <span>No</span> - [% END %] - </td> - <td class="actions"> - <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&code=[% item.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> - <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&code=[% item.code | uri %]"><i class="fa fa-trash"></i> Delete</a> - </td> - </tr> - [% END %] - </tbody> - </table> + <span title="[% branches_str | html %]"> + [% IF libraries.count > 1 %] + <span>[% libraries.count | html %] library limitations</span> + [% ELSE %] + <span>[% libraries.count | html %] library limitation</span> + [% END %] + </span> + [% ELSE %] + No limitation + [% END %] + </td> + <td> + [% IF ( CAN_user_parameters_manage_auth_values ) %] + <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% item.authorised_value_category | uri %]">[% item.authorised_value_category | html %]</a></td> + [% ELSE %] + [% item.authorised_value_category | html %] + [% END %] + <td> + [% IF ( item.mandatory ) -%] + <span>Yes</span> + [% ELSE -%] + <span>No</span> + [% END %] + </td> + <td class="actions"> + <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&code=[% item.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> + <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&code=[% item.code | uri %]"><i class="fa fa-trash"></i> Delete</a> + </td> + </tr> + [% END %] + </tbody> + </table> + </div><!-- ./page-section --> [% END %] [% ELSE %] <p>There are no saved patron attribute types.</p> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt index 5a225b2294..c298c725f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -165,40 +165,42 @@ You Searched for [% searchfield | html %]</span> [% END %] [% IF restrictions %] - <table id="restriction_types"> - <thead> - <tr> - <th scope="col">Code</th> - <th scope="col">Label</th> - <th scope="col">Default</th> - <th scope="col">Actions</th> - </tr> - </thead> - <tbody> - [% FOREACH restriction IN restrictions %] + <div class="page-section"> + <table id="restriction_types"> + <thead> <tr> - <td> - [% restriction.code | html %] - </td> - <td> - [% PROCESS restriction_type_description %] - </td> - <td> - [% IF restriction.is_default %]Yes[% END %] - </td> - <td class="actions"> - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=add_form&code=[% restriction.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> - [% IF !restriction.is_system && !restriction.is_default %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=delete_confirm&code=[% restriction.code | uri %]"><i class="fa fa-trash"></i> Delete</a> - [% END %] - [% IF !restriction.is_system && !restriction.is_default %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=make_default&code=[% restriction.code | uri %]"><i class="fa fa-archive"></i> Make default</a> - [% END %] - </td> + <th scope="col">Code</th> + <th scope="col">Label</th> + <th scope="col">Default</th> + <th scope="col">Actions</th> </tr> - [% END %] - </tbody> - </table> + </thead> + <tbody> + [% FOREACH restriction IN restrictions %] + <tr> + <td> + [% restriction.code | html %] + </td> + <td> + [% PROCESS restriction_type_description %] + </td> + <td> + [% IF restriction.is_default %]Yes[% END %] + </td> + <td class="actions"> + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=add_form&code=[% restriction.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> + [% IF !restriction.is_system && !restriction.is_default %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=delete_confirm&code=[% restriction.code | uri %]"><i class="fa fa-trash"></i> Delete</a> + [% END %] + [% IF !restriction.is_system && !restriction.is_default %] + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=make_default&code=[% restriction.code | uri %]"><i class="fa fa-archive"></i> Make default</a> + [% END %] + </td> + </tr> + [% END %] + </tbody> + </table> + </div><!-- /.page-section --> [% ELSE %] <div class="dialog alert">No restrictions have been defined. <a href="/cgi-bin/koha/admin/restrictions.pl?op=add_form">Create a new restriction</a>.</div> [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt index ce2d1ded3f..fd55daf828 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -74,27 +74,29 @@ [% IF search_results %] <h2>Search results</h2> - <table class="table table-striped"> - <thead> - <tr> - <th>Name</th> - <th>Description</th> - <th>Organization</th> - <th>Latest version</th> - <th> </th> - </tr> - </thead> - - [% FOREACH sr IN search_results %] - <tr> - <td><a href="[% sr.result.html_url | url %]" target="_new">[% sr.result.name | html %]</a></td> - <td>[% sr.result.description | html %]</td> - <td>[% sr.repo.name | html %]</td> - <td>[% sr.result.tag_name | html %]</td> - <td><a class="btn btn-default btn-sm btn-install-plugin" href="/cgi-bin/koha/plugins/plugins-upload.pl?op=Upload&uploadfile=[% sr.result.install_name | uri %]&uploadlocation=[% sr.result.install_url | uri %]"><i class="fa fa-download"></i> Install</a></td> - </tr> - [% END %] - </table> + <div class="page-section"> + <table class="table table-striped"> + <thead> + <tr> + <th>Name</th> + <th>Description</th> + <th>Organization</th> + <th>Latest version</th> + <th> </th> + </tr> + </thead> + + [% FOREACH sr IN search_results %] + <tr> + <td><a href="[% sr.result.html_url | url %]" target="_new">[% sr.result.name | html %]</a></td> + <td>[% sr.result.description | html %]</td> + <td>[% sr.repo.name | html %]</td> + <td>[% sr.result.tag_name | html %]</td> + <td><a class="btn btn-default btn-sm btn-install-plugin" href="/cgi-bin/koha/plugins/plugins-upload.pl?op=Upload&uploadfile=[% sr.result.install_name | uri %]&uploadlocation=[% sr.result.install_url | uri %]"><i class="fa fa-download"></i> Install</a></td> + </tr> + [% END %] + </table> + </div><!-- /.page-section --> [% END %] [% UNLESS ( plugins ) %] @@ -116,105 +118,107 @@ [% END %] [% END %] [% ELSE %] - <table id="installed_plugins"> - <thead> - <tr> - <th>Name</th> - <th>Description</th> - <th>Author</th> - <th>Plugin version</th> - <th>Minimum Koha version</th> - <th>Maximum Koha version</th> - <th>Last updated</th> - [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] - <th class="noExport">Actions</th> - [% END %] - </tr> - </thead> - - [% FOREACH plugin IN plugins %] - [% IF plugin.error %] - <tr class="warn"> - <td> - <strong>[% plugin.name | html %]</strong> - <span class="label label-warning">ERRORS</span> - </td> - [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] - <td colspan="7">Error found whilst attempting to load plugin</td> - [% ELSE %] - <td colspan="6">Error found whilst attempting to load plugin</td> - [% END %] - </tr> - [% ELSE %] - <tr> - <td> - <strong>[% plugin.metadata.name | html %]</strong> - [% IF ( plugin.is_enabled ) %] - <span class="label label-primary">ENABLED</span> - [% ELSE %] - <span class="label label-default">DISABLED</span> + <div class="page-section"> + <table id="installed_plugins"> + <thead> + <tr> + <th>Name</th> + <th>Description</th> + <th>Author</th> + <th>Plugin version</th> + <th>Minimum Koha version</th> + <th>Maximum Koha version</th> + <th>Last updated</th> + [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] + <th class="noExport">Actions</th> [% END %] - </td> - <td> - [% plugin.metadata.description | html %] + </tr> + </thead> - [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %] - <div class="dialog alert"> - Warning: This plugin was written for a newer version of Koha. Use at your own risk. - </div> + [% FOREACH plugin IN plugins %] + [% IF plugin.error %] + <tr class="warn"> + <td> + <strong>[% plugin.name | html %]</strong> + <span class="label label-warning">ERRORS</span> + </td> + [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] + <td colspan="7">Error found whilst attempting to load plugin</td> + [% ELSE %] + <td colspan="6">Error found whilst attempting to load plugin</td> [% END %] + </tr> + [% ELSE %] + <tr> + <td> + <strong>[% plugin.metadata.name | html %]</strong> + [% IF ( plugin.is_enabled ) %] + <span class="label label-primary">ENABLED</span> + [% ELSE %] + <span class="label label-default">DISABLED</span> + [% END %] + </td> + <td> + [% plugin.metadata.description | html %] - [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %] - <div class="dialog alert"> - Warning: This plugin was written for an older version of Koha. Use at your own risk. - </div> - [% END %] - </td> - <td>[% plugin.metadata.author | html %]</td> - <td>[% plugin.metadata.version | html %]</td> - <td>[% plugin.metadata.minimum_version | html %]</td> - <td>[% plugin.metadata.maximum_version | html %]</td> - <td>[% plugin.metadata.date_updated | $KohaDates %]</td> - [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] - <td class="actions"> - <div class="btn-group dropup"> - <a class="btn btn-default btn-xs dropdown-toggle" id="pluginactions[% plugin.class | html %]" role="button" data-toggle="dropdown" href="#"> - Actions <b class="caret"></b> - </a> - <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]"> - [% IF ( CAN_user_plugins_report ) %] - [% IF plugin.can('report') %] - <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table fa-fw"></i> Run report</a></li> + [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %] + <div class="dialog alert"> + Warning: This plugin was written for a newer version of Koha. Use at your own risk. + </div> + [% END %] + + [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %] + <div class="dialog alert"> + Warning: This plugin was written for an older version of Koha. Use at your own risk. + </div> + [% END %] + </td> + <td>[% plugin.metadata.author | html %]</td> + <td>[% plugin.metadata.version | html %]</td> + <td>[% plugin.metadata.minimum_version | html %]</td> + <td>[% plugin.metadata.maximum_version | html %]</td> + <td>[% plugin.metadata.date_updated | $KohaDates %]</td> + [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] + <td class="actions"> + <div class="btn-group dropup"> + <a class="btn btn-default btn-xs dropdown-toggle" id="pluginactions[% plugin.class | html %]" role="button" data-toggle="dropdown" href="#"> + Actions <b class="caret"></b> + </a> + <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]"> + [% IF ( CAN_user_plugins_report ) %] + [% IF plugin.can('report') %] + <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table fa-fw"></i> Run report</a></li> + [% END %] [% END %] - [% END %] - [% IF ( CAN_user_plugins_tool ) %] - [% IF plugin.can('tool') %] - <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=tool"><i class="fa fa-wrench fa-fw"></i> Run tool</a></li> + [% IF ( CAN_user_plugins_tool ) %] + [% IF plugin.can('tool') %] + <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=tool"><i class="fa fa-wrench fa-fw"></i> Run tool</a></li> + [% END %] [% END %] - [% END %] - [% IF ( CAN_user_plugins_configure ) %] - [% IF plugin.can('configure') %] - <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog fa-fw"></i> Configure</a></li> + [% IF ( CAN_user_plugins_configure ) %] + [% IF plugin.can('configure') %] + <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog fa-fw"></i> Configure</a></li> + [% END %] [% END %] - [% END %] - [% IF ( CAN_user_plugins_manage ) %] - <li><a class="uninstall_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-uninstall.pl?class=[% plugin.class | html %]"><i class="fa fa-trash fa-fw"></i> Uninstall</a></li> - [% IF ( plugin.is_enabled ) %] - <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=disable"><i class="fa fa-pause fa-fw"></i> Disable</a></li> - [% ELSE %] - <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=enable"><i class="fa fa-play fa-fw"></i> Enable</a></li> + [% IF ( CAN_user_plugins_manage ) %] + <li><a class="uninstall_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-uninstall.pl?class=[% plugin.class | html %]"><i class="fa fa-trash fa-fw"></i> Uninstall</a></li> + [% IF ( plugin.is_enabled ) %] + <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=disable"><i class="fa fa-pause fa-fw"></i> Disable</a></li> + [% ELSE %] + <li><a class="enable_plugin" data-plugin-name="[% plugin.metadata.name | html %]" href="/cgi-bin/koha/plugins/plugins-enable.pl?class=[% plugin.class | html %]&method=enable"><i class="fa fa-play fa-fw"></i> Enable</a></li> + [% END %] [% END %] - [% END %] - </ul> - </div> - </td> + </ul> + </div> + </td> + [% END %] + </tr> [% END %] - </tr> [% END %] - [% END %] - </table> + </table> + </div><!-- /.page-section --> [% END %] </div> -- 2.30.2