Hey Joe,
So long as we're fine not actually updating existing installations by
removing the <br/> I'm fine with this patch ... otherwise we'll have to
do a database update to push this change out to others. Of course, they
can always just remove the <br/> manually from the syspref description.
Josh
On Thu, Aug 07, 2008 at 11:02:19AM -0500, Joe Atzberger wrote:
> The template HTML-escapes the descriptions now (as it should).
> So we can't make them prettier w/ HTML inserted.
> ---
> installer/data/mysql/en/mandatory/sysprefs.sql | 4 ++--
> installer/data/mysql/updatedatabase.pl | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
> b/installer/data/mysql/en/mandatory/sysprefs.sql
> index a579169..0c255bd 100755
> --- a/installer/data/mysql/en/mandatory/sysprefs.sql
> +++ b/installer/data/mysql/en/mandatory/sysprefs.sql
> @@ -189,12 +189,12 @@ INSERT INTO `systempreferences`
> (variable,value,explanation,options,type) VALUES
>
> -- Tags and BakerTaylor (note field order differs from above)
> INSERT INTO `systempreferences` (variable,value,options,explanation,type)
> VALUES
> - ('BakerTaylorBookstoreURL','','','URL template for \"My Libary
> Bookstore\" links, to which the \"key\" value is appended, and \"https://\";
> is prepended. It should include your hostname and \"Parent Number\". Make
> this variable empty to turn MLB links off.<br /> Example:
> ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&parentNum=10923&key=',''),
> + ('BakerTaylorBookstoreURL','','','URL template for \"My Libary
> Bookstore\" links, to which the \"key\" value is appended, and \"https://\";
> is prepended. It should include your hostname and \"Parent Number\". Make
> this variable empty to turn MLB links off. Example:
> ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&parentNum=10923&key=',''),
> ('BakerTaylorEnabled','0','','Enable or disable all Baker & Taylor
> features.','YesNo'),
> ('BakerTaylorPassword','','','Baker & Taylor Password for Content Cafe
> (external content)','Textarea'),
> ('BakerTaylorUsername','','','Baker & Taylor Username for Content Cafe
> (external content)','Textarea'),
> ('TagsEnabled','1','','Enables or disables all tagging features. This
> is the main switch for tags.','YesNo'),
> - ('TagsExternalDictionary',NULL,'','Path on server to local ispell
> executable, used to set $Lingua::Ispell::path <br />This dictionary is used
> as a \"whitelist\" of pre-allowed tags.',''),
> + ('TagsExternalDictionary',NULL,'','Path on server to local ispell
> executable, used to set $Lingua::Ispell::path This dictionary is used as a
> \"whitelist\" of pre-allowed tags.',''),
> ('TagsInputOnDetail','1','','Allow users to input tags from the detail
> page.', 'YesNo'),
> ('TagsInputOnList', '0','','Allow users to input tags from the search
> results list.', 'YesNo'),
> ('TagsModeration', NULL,'','Require tags from patrons to be approved
> before becoming visible.','YesNo'),
> diff --git a/installer/data/mysql/updatedatabase.pl
> b/installer/data/mysql/updatedatabase.pl
> index c200878..0e75586 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -1379,12 +1379,12 @@ if (C4::Context->preference("Version") <
> TransformToNum($DBversion)) {
> #);
> $dbh->do(q#
> INSERT INTO `systempreferences` VALUES
> - ('BakerTaylorBookstoreURL','','','URL template for \"My Libary
> Bookstore\" links, to which the \"key\" value is appended, and \"https://\";
> is prepended. It should include your hostname and \"Parent Number\". Make
> this variable empty to turn MLB links off.<br /> Example:
> ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&parentNum=10923&key=',''),
> + ('BakerTaylorBookstoreURL','','','URL template for \"My Libary
> Bookstore\" links, to which the \"key\" value is appended, and \"https://\";
> is prepended. It should include your hostname and \"Parent Number\". Make
> this variable empty to turn MLB links off. Example:
> ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&parentNum=10923&key=',''),
> ('BakerTaylorEnabled','0','','Enable or disable all Baker &
> Taylor features.','YesNo'),
> ('BakerTaylorPassword','','','Baker & Taylor Password for
> Content Cafe (external content)','Textarea'),
> ('BakerTaylorUsername','','','Baker & Taylor Username for
> Content Cafe (external content)','Textarea'),
> ('TagsEnabled','1','','Enables or disables all tagging
> features. This is the main switch for tags.','YesNo'),
> - ('TagsExternalDictionary',NULL,'','Path on server to local
> ispell executable, used to set $Lingua::Ispell::path <br />This dictionary is
> used as a \"whitelist\" of pre-allowed tags.',''),
> + ('TagsExternalDictionary',NULL,'','Path on server to local
> ispell executable, used to set $Lingua::Ispell::path This dictionary is used
> as a \"whitelist\" of pre-allowed tags.',''),
> ('TagsInputOnDetail','1','','Allow users to input tags from the
> detail page.', 'YesNo'),
> ('TagsInputOnList', '0','','Allow users to input tags from the
> search results list.', 'YesNo'),
> ('TagsModeration', NULL,'','Require tags from patrons to be
> approved before becoming visible.','YesNo'),
> --
> 1.5.5.GIT
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches@lists.koha.org
> http://lists.koha.org/mailman/listinfo/koha-patches
_______________________________________________
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
