Bug 12190: fold the "Creators" system preference tab into "Tools"

The "Creators" tab in the system preferences editor had only one
preference.  In order to consolidate the display as well as to
address the issue that "creators" doesn't have much of a connection
to "patron cards", the ImageLimit system preference is moved to
the Tools tab by this patch.

To test:

[1] Verify that the ImageLimit preference now shows up in the
    Tools tab in the system preference editor (along with an
    existing Tools preference, MaxItemsForBatch.
[2] Verify that the sysprefs editor no longer has a "Creators"
    tab.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
index af23ab7..3b2e2f7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
@@ -5,7 +5,6 @@
 [% IF ( authorities ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
 [% IF ( cataloguing ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Cataloging</a></li>
 [% IF ( circulation ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
-[% IF ( creators ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
 [% IF ( enhanced_content ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced content</a></li>
 [% IF ( i18n_l10n ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Internationalization and localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
 [% IF ( local_use ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/systempreferences.pl">Local use</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/creators.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/creators.pref
deleted file mode 100644 (file)
index bb92b8f..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/creators.pref
+++ /dev/null
@@ -1,7 +0,0 @@
-Creators:
-    Patron Cards:
-        -
-            - Limit the number of creator images stored in the database to
-            - pref: ImageLimit
-              class: Integer
-            - images.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref
index 1d1e884..636a9f6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref
@@ -1,6 +1,13 @@
 Tools:
-    -
-        - Process up to
-        - pref: MaxItemsForBatch
-          class: integer
-        - items in a single modification or deletion batch.
+    Batch item modification:
+        -
+            - Process up to
+            - pref: MaxItemsForBatch
+              class: integer
+            - items in a single modification or deletion batch.
+    Patron cards:
+        -
+            - Limit the number of creator images stored in the database to
+            - pref: ImageLimit
+              class: Integer
+            - images.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index 302e961..98dbb97 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -20,7 +20,6 @@
     <li><strong>Authorities:</strong> holds preference related to handling authority records.</li>
     <li><strong>Cataloging:</strong> holds preferences that control the cataloging functions. This is where you choose your MARC flavor, set up Z39.50 and barcoding.</li>
     <li><strong>Circulation:</strong> holds preferences that control circulation functions such as holds and fines.</li>
-    <li><strong>Creators:</strong> this tab contains preferences related to modules that create objects.</li>
     <li><strong>Enhanced Content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client. This is where you can turn on cover images, FRBR and tagging.</li>
     <li><strong>I18N/L10N:</strong> holds preferences related to internationalization and localization such as date formats and languages.</li>
     <li><strong>Local Use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>
@@ -35,4 +34,4 @@
        
 <p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
        
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]