Bug 14676: (QA followup) Make title, breadcrumbs and labels consistent

It does so by slightly changing the naming schema, in line with bug 14667
changes.

It also corrects a minor bug in the breadcrumbs for printer profiles.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
index 971c0d2..b59c7ac 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Manage patron card batches</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Batches &rsaquo; [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]Create[% END %]</title>
     [% INCLUDE 'doc-head-close.inc' %]
     [% INCLUDE 'greybox.inc' %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
@@ -158,11 +158,11 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
-        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Manage patron card batches</a> &rsaquo;
+        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Batches</a> &rsaquo;
         [% IF batch_id %]
-            Manage batch number [% batch_id %]
+            Edit ([% batch_id %])
         [% ELSE %]
-            Create new batch
+            Create
         [% END %]
     </div>
     <div id="doc3" class="yui-t2">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
index c021708..a761ad3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Layout &rsaquo; [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %]</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <script type="text/JavaScript" language="JavaScript">
         //<![CDATA[
@@ -113,8 +113,8 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
-        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Manage patron card layouts</a> &rsaquo;
-        [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout
+        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Layouts</a> &rsaquo;
+        [% IF ( layout_id ) %]Edit ([% layout_name %])[% ELSE %]Create[% END %]
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
index 76acd15..f72180f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Profiles &rsaquo; [% IF ( profile_id ) %]Edit ([% profile_id %])[% ELSE %]Create[% END%]</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <script type="text/javascript">
         //<![CDATA[
@@ -43,8 +43,8 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
-        <a href="/cgi-bin/koha/patroncards/manage.pl?label_element=profile">Printer profiles</a> &rsaquo;
-        Edit Printer Profile
+        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Profiles</a> &rsaquo;
+        [% IF ( profile_id ) %]Edit ([% profile_id %])[% ELSE %]Create[% END%]
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -57,7 +57,7 @@
                         </div>
                     </div>
                         <div class="yui-g">
-                            <h3>Edit printer profile</h3>
+                            <h3>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id %])[% END %]</h3>
                                 <div class="yui-g first">
                                     <form name="input" action="/cgi-bin/koha/patroncards/edit-profile.pl" method="get">
                                     <fieldset class="rows"><legend>Profile settings</legend>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
index 99beb58..7fe3e1c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Templates</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Templates &rsaquo; [% IF (template_id) %]Edit ([% template_id %])[% ELSE %]Create[% END %]</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <script type="text/javascript">
         //<![CDATA[
@@ -43,8 +43,8 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
-        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Patron card templates</a> &rsaquo;
-        Edit patron card template
+        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Templates</a> &rsaquo;
+        [% IF (template_id) %]Edit ([% template_id %])[% ELSE %]Create[% END %]
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -58,7 +58,7 @@
                     </div>
                     <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get">
                     <div class="yui-g">
-                        <h3>Edit patron card template</h3>
+                        <h3>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id %])[% END %]</h3>
                         <div class="yui-u first">
                             <fieldset class="rows">
                                 <ol>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
index b59f5cd..137bd50 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Patron card creator &rsaquo; Manage images</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; Images</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <script type="text/javascript">
         //<![CDATA[
@@ -51,7 +51,7 @@
     <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
     <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
     <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
-    Manage images
+    Images
 </div>
 <div id="doc3" class="yui-t2">
     <div id="bd">
@@ -173,8 +173,5 @@
                 </div>
             </div>
         </div>
-        <div class="yui-b noprint">
-            [% INCLUDE 'patroncards-menu.inc' %]
-        </div>
     </div>
     [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
index 1193188..b026da1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
@@ -12,7 +12,7 @@
 [%-  END -%]
 [% END %]
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Patron cards &rsaquo; Manage patron card elements</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Patron card creator &rsaquo; [% PROCESS translate_card_element element=card_element_title %]</title>
     [% INCLUDE 'doc-head-close.inc' %]
     [% INCLUDE 'greybox.inc' %]
     <script type="text/javascript">
@@ -115,7 +115,7 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
-        Manage card [% PROCESS translate_card_element element=card_element_title %]
+        [% PROCESS translate_card_element element=card_element_title %]
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -128,7 +128,7 @@
                             <div class="hint">Current library: [% LoginBranchname %]</div>
                             [% IF ( table_loop ) %]
                             <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element %]">
-                            <h2>Currently Available [% PROCESS translate_card_element element=card_element_title %]</h2>
+                            <h2>Currently available [% PROCESS translate_card_element element=card_element_title %]</h2>
                             <table>
                                 [% FOREACH table_loo IN table_loop %]
                                 [% IF ( table_loo.header_fields ) %]
@@ -175,8 +175,5 @@
                     </div>
                 </div>
             </div>
-            <div class="yui-b">
-                [% INCLUDE 'patroncards-menu.inc' %]
-            </div>
         </div>
     [% INCLUDE 'intranet-bottom.inc' %]