Moving Tags tab into Enhanced Content to reduce the number

of tabs in sysprefs

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 1dd54f6..5b7793d 100755 (executable)
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -199,13 +199,13 @@ my %tabsysprefs;
     $tabsysprefs{QueryRemoveStopwords}="Searching";
 
 # EnhancedContent
-    $tabsysprefs{AmazonContent}="EnhancedContent";
-    $tabsysprefs{AWSAccessKeyID}="EnhancedContent";
-    $tabsysprefs{AmazonLocale}="EnhancedContent";
-    $tabsysprefs{AmazonAssocTag}="EnhancedContent";
-    $tabsysprefs{AmazonSimilarItems}="EnhancedContent";
-    $tabsysprefs{OPACAmazonContent}="EnhancedContent";
-    $tabsysprefs{OPACAmazonSimilarItems}="EnhancedContent";
+   $tabsysprefs{AmazonContent}="EnhancedContent";
+   $tabsysprefs{AWSAccessKeyID}="EnhancedContent";
+   $tabsysprefs{AmazonLocale}="EnhancedContent";
+   $tabsysprefs{AmazonAssocTag}="EnhancedContent";
+   $tabsysprefs{AmazonSimilarItems}="EnhancedContent";
+   $tabsysprefs{OPACAmazonContent}="EnhancedContent";
+   $tabsysprefs{OPACAmazonSimilarItems}="EnhancedContent";
 # Baker & Taylor 
    $tabsysprefs{BakerTaylorBookstoreURL} = 'EnhancedContent';
    $tabsysprefs{BakerTaylorEnabled}      = 'EnhancedContent';
@@ -219,6 +219,14 @@ my %tabsysprefs;
    $tabsysprefs{PINESISBN}="EnhancedContent";
    $tabsysprefs{ThingISBN}="EnhancedContent";
    $tabsysprefs{OPACFRBRizeEditions}="EnhancedContent";
+# Tags
+   $tabsysprefs{TagsEnabled}            = 'EnhancedContent';
+   $tabsysprefs{TagsExternalDictionary} = 'EnhancedContent';
+   $tabsysprefs{TagsInputOnDetail}      = 'EnhancedContent';
+   $tabsysprefs{TagsInputOnList}        = 'EnhancedContent';
+   $tabsysprefs{TagsShowOnDetail}       = 'EnhancedContent';
+   $tabsysprefs{TagsShowOnList}         = 'EnhancedContent';
+   $tabsysprefs{TagsModeration}         = 'EnhancedContent';
 
 # OPAC
     $tabsysprefs{BiblioDefaultView}="OPAC";
@@ -285,15 +293,6 @@ my %tabsysprefs;
    $tabsysprefs{'OAI-PMH:Set'}       = "OAI-PMH";
    $tabsysprefs{'OAI-PMH:Subset'}    = "OAI-PMH";
 
-# Tags
-   $tabsysprefs{TagsEnabled}            = 'Tags';
-   $tabsysprefs{TagsExternalDictionary} = 'Tags';
-   $tabsysprefs{TagsInputOnDetail}      = 'Tags';
-   $tabsysprefs{TagsInputOnList}        = 'Tags';
-   $tabsysprefs{TagsShowOnDetail}       = 'Tags';
-   $tabsysprefs{TagsShowOnList}         = 'Tags';
-   $tabsysprefs{TagsModeration}         = 'Tags';
-
 sub StringSearch  {
     my ($searchstring,$type)=@_;
     my $dbh = C4::Context->dbh;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
index e7c6866..e077103 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
@@ -13,7 +13,6 @@
 <!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Patrons">Patrons</a></li>
 <!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Searching">Searching</a></li>
 <!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/systempreferences.pl?tab=StaffClient">Staff Client</a></li>
-<!-- TMPL_IF NAME="Tags" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Tags" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Tags">Tags</a></li>
 <!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
 </ul>
 </div>