From 72fc58b15c7d53eac4cd3c7a9a1cf9c8d11cb339 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 20 Oct 2014 10:41:13 -0400 Subject: [PATCH] Bug 12653: Text file clean up _README.txt has 4 newlines removed. _COPYING.txt has 2 empty lines at the end of the file removed. This was done by copying the smallest file in an existing theme directory. TEST PLAN --------- 1) Compare files. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be differences. 2) Apply patch 3) Compare files again. diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt -- there will be no differences. 4) git reset --hard origin/master 5) Apply the patch affecting the .t files. 6) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting xt/author/icondirectories.t to fail 7) Apply this patch. 8) Prove things. prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t -- expecting success. Signed-off-by: Bernardo Gonzalez Kriegel This patch fixes some issues with files on itemtypes dirs. No koha-qa erros. Signed-off-by: Katrin Fischer Signed-off-by: Chris Cormack --- .../prog/img/itemtypeimg/crystal-clear/_COPYING.txt | 2 -- .../prog/img/itemtypeimg/crystal-clear/_README.txt | 8 ++++---- .../opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt | 2 -- .../opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt | 8 ++++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt b/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt index 4ac0469503..b3aa599967 100644 --- a/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt +++ b/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt @@ -118,5 +118,3 @@ No Warranty 16. In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the library as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the library (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the library to operate with any other software), even if such holder or other party has been advised of the possibility of such damages. - - diff --git a/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt b/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt index 6d8d1c4a74..4d119eb6e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt +++ b/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt @@ -1,9 +1,9 @@ -The Crystal Clear icon set was created by +The Crystal Clear icon set was created by Everaldo Coelho, http://www.everaldo.com/ Submitted: Oct 11 2003 Updated: Jun 16 2007 -Icons were acquired from Wikimedia Commons, +Icons were acquired from Wikimedia Commons, http://commons.wikimedia.org/wiki/Crystal_Clear, 30 Jan 2010. The images were renamed, organized and re-sized to create this packager in a @@ -12,7 +12,7 @@ Icon Library. This package was created by the Open Icon Library, http://openiconlibrary.sourceforge.net/ and is available for download there.T -All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. +All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. See COPYING.txt or http://www.everaldo.com/crystal/?action=license for details. @@ -24,4 +24,4 @@ books-closed.png books-open-cd.png books-open.png -All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. \ No newline at end of file +All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt b/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt index 4ac0469503..b3aa599967 100644 --- a/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt +++ b/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt @@ -118,5 +118,3 @@ No Warranty 16. In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the library as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the library (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the library to operate with any other software), even if such holder or other party has been advised of the possibility of such damages. - - diff --git a/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt b/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt index 6d8d1c4a74..4d119eb6e7 100644 --- a/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt +++ b/koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt @@ -1,9 +1,9 @@ -The Crystal Clear icon set was created by +The Crystal Clear icon set was created by Everaldo Coelho, http://www.everaldo.com/ Submitted: Oct 11 2003 Updated: Jun 16 2007 -Icons were acquired from Wikimedia Commons, +Icons were acquired from Wikimedia Commons, http://commons.wikimedia.org/wiki/Crystal_Clear, 30 Jan 2010. The images were renamed, organized and re-sized to create this packager in a @@ -12,7 +12,7 @@ Icon Library. This package was created by the Open Icon Library, http://openiconlibrary.sourceforge.net/ and is available for download there.T -All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. +All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. See COPYING.txt or http://www.everaldo.com/crystal/?action=license for details. @@ -24,4 +24,4 @@ books-closed.png books-open-cd.png books-open.png -All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. \ No newline at end of file +All Icons are free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. \ No newline at end of file -- 2.39.5