From 3156950e0aa01826305208f1ca4f4ff16b04ec32 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 5 Apr 2016 11:44:22 -0400 Subject: [PATCH] Bug 16206: Corrections to templates related new EDI feature There are some issues with the template changes introduced by the EDI feature in Bug 7736. This patch makes the following changes: - Use Font Awesome icon on the Acquisitions basket page instead of a Glyphicon. - Use Font Awesome icon on the Acquisitions basket group page instead of a Glyphicon. - For consistency's sake, use the phrase "Library EANs" instead of "EDI EANs" in menus and the Library EANs page. - On the EDI accounts page: - Correct the markup of the title tag. - Improve the breadcrumbs to eliminate redundancy. - Use Font Awesome icon instead of Glyphicon for the "New account" button. - Change or remove "maxlength" attribute of form fields to match table structure. - Move the contents of some title attributes into a visible hint. - Use 'checked="checked"' instead of 'checked'. Koha templates use XTHML-style attributes. - Correct template variable in account deletion confirmation dialog. Before this patch the vendor name was not correctly displayed. - Show a message if there are no accounts defined rather than an empty table. - Remove use of "highlight" class from table rows (Bug 15927). - Correct parameter name in link to vendor details page (should be booksellerid instead of supplierid). - Correct the markup of the deletion confirmation dialog (Bug 15785). - Use Bootstrap-style buttons for "edit" and "delete," with Font Awesome icons. - On the Library EANs page: - Correct the markup of the title tag. - Make capitalization of "EAN" consistent. - Use Font Awesome icon instead of Glyphicon for the "New EAN" button. - Show a message if there are no EANs defined rather than an empty table. - Change or remove "maxlength" attribute of form fields to match table structure. - Remove use of "highlight" class from table rows (Bug 15927). - Correct the markup of the deletion confirmation dialog (Bug 15785). - Use Bootstrap-style buttons for "edit" and "delete," with Font Awesome icons. To test, apply the patch and review the affected templates. Confirm that pages look correct and work correctly. Signed-off-by: Bernardo Gonzalez Kriegel All seems to work and looks well, add/edit/delete EDI accounts and Library EANs works Ok No errors Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher --- .../prog/en/includes/admin-menu.inc | 2 +- .../prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 2 +- .../prog/en/modules/admin/admin-home.tt | 4 +- .../prog/en/modules/admin/edi_accounts.tt | 83 ++++++++++--------- .../prog/en/modules/admin/edi_ean_accounts.tt | 40 +++++---- 6 files changed, 71 insertions(+), 62 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc index 8a21712c93..781da2a2af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -56,7 +56,7 @@
  • Budgets
  • Funds
  • EDI accounts
    • -
  • EDI eans
    • +
  • Library EANs
    • [% IF CAN_user_plugins %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 9ab28bed08..5aec704c87 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -184,7 +184,7 @@ [% END %]
    Export this basket as CSV
    [% IF ediaccount %] -
    Create edifact order
    +
    Create edifact order
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index e2dac37b56..1950fcea00 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -144,7 +144,7 @@ function submitForm(form) {
    Reopen this basket group
    Export this basket group as CSV
    Print this basket group in PDF
    -
    Generate edifact order
    +
    Generate edifact order
    [% ELSE %]
    Delete basket group
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 32bca5a45f..bd951bc178 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -98,9 +98,9 @@
    Funds
    Define funds within your budgets
    -
    EDI Accounts
    +
    EDI accounts
    Manage vendor EDI accounts for import/export
    -
    EDI EANs
    +
    Library EANs
    Manage library EDI EANs
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index 03c171dc7d..41cb13f0c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -2,13 +2,13 @@ Koha › Administration › EDI accounts [% IF acct_form %] [% IF account %] - ’ Modify account + › Modify account [% ELSE %] - ’ Add new account + › Add new account [% END %] [% END %] [% IF delete_confirm %] - ’ Confirm deletion of account + › Confirm deletion of account [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -19,18 +19,17 @@ @@ -42,7 +41,7 @@ [% IF display %] @@ -95,7 +94,7 @@ [% END %]
  • - +
  • [% transport_types = [ @@ -116,27 +115,25 @@
  • - +
  • - +
  • - +
  • - + +
    The download directory specifies the directory on the ftp site from which quotes and invoices are downloaded.
  • - + +
    The upload directory specifies the directory on the ftp site to which orders are uploaded.
  • @@ -156,12 +153,12 @@
  • - +
  • [% IF account.quotes_enabled %] - + [% ELSE %] [% END %] @@ -169,7 +166,7 @@
  • [% IF account.orders_enabled %] - + [% ELSE %] [% END %] @@ -177,7 +174,7 @@
  • [% IF account.invoices_enabled %] - + [% ELSE %] [% END %] @@ -185,18 +182,21 @@
  • [% IF account.responses_enabled %] - + [% ELSE %] [% END %]
  • - + [% IF account.auto_orders %] - + [% ELSE %] [% END %] +
    + With automatic ordering quotes generate orders without staff intervention. +
    • @@ -214,7 +214,7 @@ - + @@ -230,13 +230,15 @@
    Vendor[% account.vendor %][% account.vendor.name %]
    Description
    - +
    - +
    + [% END %] [% IF display %] +[% IF ( ediaccounts ) %]

    Vendor EDI accounts

    @@ -248,8 +250,8 @@ - - + + @@ -260,11 +262,9 @@ [% FOREACH account IN ediaccounts %] - [% IF loop.even %] - [% ELSE %] - [% END %] + - + @@ -306,12 +306,17 @@ [% ELSE %] [% END %] - [% END %]
    Remote host Username PasswordDownload DirectoryUpload DirectoryDownload directoryUpload directory Qualifier SAN QuotesActions
    [% account.id %][% account.vendor.name %][% account.vendor.name %] [% account.description %] [% account.transport %] [% account.host %]N - Edit | Delete + + Edit Delete
    + [% ELSE %] +
    + There are no EDI accounts. +
    + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index 308ebe4949..1a07a02b12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -1,14 +1,14 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Administration › EDI EANs +<title>Koha › Administration › Library EANs [% IF ean_form %] [% IF ean %] - ’ Modify library EAN + › Modify library EAN [% ELSE %] - ’ Add new library EAN + › Add new library EAN [% END %] [% END %] [% IF delete_confirm %] - ’ Confirm deletion of EAN + › Confirm deletion of EAN [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -20,15 +20,14 @@ [% END %] [% IF display %] +[% IF ( eans ) %]

    Library EANs

    @@ -138,7 +138,7 @@ [% FOREACH ean IN eans %] - [% IF loop.even %][% ELSE %][% END %] + @@ -149,14 +149,18 @@ [% END %] [% END %] - [% END %]
    Actions
    [% ean.branch.branchname %] [% ean.description %] [% ean.ean %] - Edit - | - Delete + + Edit + Delete
    +[% ELSE %] +
    + There are no library EANs. +
    +[% END %] [% END %] -- 2.39.5