diff --git a/application/helpers/userstatistics_helper.php b/application/helpers/userstatistics_helper.php index 59d7493ed62..9b13ccbd5bc 100644 --- a/application/helpers/userstatistics_helper.php +++ b/application/helpers/userstatistics_helper.php @@ -51,7 +51,7 @@ function createChart($iQuestionID, $iSurveyID, $type = null, $lbl, $gdata, $graw $chartfontfile = 'DejaVuSans.ttf'; if (array_key_exists($sLanguageCode, $alternatechartfontfile)) { $neededfontfile = $alternatechartfontfile[$sLanguageCode]; - if (is_file($rootdir."/fonts/".$neededfontfile)) { + if (is_file($rootdir."/assets/fonts/".$neededfontfile)) { $chartfontfile = $neededfontfile; } else { Yii::app()->setFlashMessage(sprintf(gT('The fonts file %s was not found in /fonts directory. Please, see the txt file for your language in fonts directory to generate the charts.'), $neededfontfile), 'error'); diff --git a/assets/fonts/font-src/FreeSans - CREDITS b/assets/fonts/FreeSans - CREDITS similarity index 100% rename from assets/fonts/font-src/FreeSans - CREDITS rename to assets/fonts/FreeSans - CREDITS diff --git a/assets/fonts/font-src/FreeSans.ttf b/assets/fonts/FreeSans.ttf similarity index 100% rename from assets/fonts/font-src/FreeSans.ttf rename to assets/fonts/FreeSans.ttf diff --git a/assets/fonts/font-src/TlwgTypist - Thai.ttf.txt b/assets/fonts/TlwgTypist - Thai.ttf.txt similarity index 65% rename from assets/fonts/font-src/TlwgTypist - Thai.ttf.txt rename to assets/fonts/TlwgTypist - Thai.ttf.txt index abdb5d84426..b236ec79a8c 100644 --- a/assets/fonts/font-src/TlwgTypist - Thai.ttf.txt +++ b/assets/fonts/TlwgTypist - Thai.ttf.txt @@ -2,4 +2,4 @@ For package size reasons the TlwgTypist font to show Thai characters in the stat is not included with LimeSurvey. Please download it from http://linux.thai.net/projects/fonts-tlwg , -unzip and put the TlwgTypist.tff file into the /fonts directory of your LimeSurvey installation. +unzip and put the TlwgTypist.tff file into the /assets/fonts/ directory of your LimeSurvey installation. diff --git a/assets/fonts/font-src/UnBatang - Korean.ttf.txt b/assets/fonts/UnBatang - Korean.ttf.txt similarity index 65% rename from assets/fonts/font-src/UnBatang - Korean.ttf.txt rename to assets/fonts/UnBatang - Korean.ttf.txt index 40ec6c30920..cac9bf6c06e 100644 --- a/assets/fonts/font-src/UnBatang - Korean.ttf.txt +++ b/assets/fonts/UnBatang - Korean.ttf.txt @@ -2,4 +2,4 @@ For package size reasons the UnBatang font to show Chinese characters in the sta is not included with LimeSurvey. Please download it from http://kldp.net/projects/unfonts/ , -unzip and put the UnBatang.tff file into the /fonts directory of your LimeSurvey installation. +unzip and put the UnBatang.tff file into the /assets/fonts directory of your LimeSurvey installation. diff --git a/assets/fonts/fireflysung - Chinese.ttf.txt b/assets/fonts/fireflysung - Chinese.ttf.txt new file mode 100644 index 00000000000..d7d0c8b9550 --- /dev/null +++ b/assets/fonts/fireflysung - Chinese.ttf.txt @@ -0,0 +1,6 @@ +For package size reasons the Firefly Sung font to show Chinese characters in the statistics graphs +is not included with LimeSurvey. + +Please download it http://www.study-area.org/apt/firefly-font/fireflysung-1.3.0.tar.gz , +unzip and put the fireflysung.tff file into the /assets/fonts directory of your LimeSurvey installation. + diff --git a/assets/fonts/font-src/DejaVuSans - CREDITS b/assets/fonts/font-src/DejaVuSans - CREDITS deleted file mode 100644 index 198297b855e..00000000000 --- a/assets/fonts/font-src/DejaVuSans - CREDITS +++ /dev/null @@ -1,116 +0,0 @@ -DejaVu fonts 2.33 (c)2004-2011 DejaVu fonts team ------------------------------------------------- - -The DejaVu fonts are a font family based on the Bitstream Vera Fonts -(http://gnome.org/fonts/). Its purpose is to provide a wider range of -characters (see status.txt for more information) while maintaining the -original look and feel. - -DejaVu fonts are based on Bitstream Vera fonts version 1.10. - -Fonts are published in source form as SFD files (Spline Font Database from -FontForge - http://fontforge.sf.net/) and in compiled form as TTF files -(TrueType fonts). - -For more information go to http://dejavu.sourceforge.net/. - ------------------------------------------------- -Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. -Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) - -Bitstream Vera Fonts Copyright ------------------------------- - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is -a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute the -Font Software, including without limitation the rights to use, copy, merge, -publish, distribute, and/or sell copies of the Font Software, and to permit -persons to whom the Font Software is furnished to do so, subject to the -following conditions: - -The above copyright and trademark notices and this permission notice shall -be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and -additional glyphs or characters may be added to the Fonts, only if the fonts -are renamed to names not containing either the words "Bitstream" or the word -"Vera". - -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Bitstream -Vera" names. - -The Font Software may be sold as part of a larger software package but no -copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME -FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING -ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE -FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font Software -without prior written authorization from the Gnome Foundation or Bitstream -Inc., respectively. For further information, contact: fonts at gnome dot -org. - -Arev Fonts Copyright ------------------------------- - -Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and -associated documentation files (the "Font Software"), to reproduce -and distribute the modifications to the Bitstream Vera Font Software, -including without limitation the rights to use, copy, merge, publish, -distribute, and/or sell copies of the Font Software, and to permit -persons to whom the Font Software is furnished to do so, subject to -the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Tavmjong Bah" or the word "Arev". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Tavmjong Bah Arev" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the name of Tavmjong Bah shall not -be used in advertising or otherwise to promote the sale, use or other -dealings in this Font Software without prior written authorization -from Tavmjong Bah. For further information, contact: tavmjong @ free -. fr. - -$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ diff --git a/assets/fonts/font-src/DejaVuSans.ttf b/assets/fonts/font-src/DejaVuSans.ttf deleted file mode 100644 index 27cff476ef3..00000000000 Binary files a/assets/fonts/font-src/DejaVuSans.ttf and /dev/null differ diff --git a/assets/fonts/font-src/fireflysung - Chinese.ttf.txt b/assets/fonts/font-src/fireflysung - Chinese.ttf.txt deleted file mode 100644 index 8a9754577e9..00000000000 --- a/assets/fonts/font-src/fireflysung - Chinese.ttf.txt +++ /dev/null @@ -1,6 +0,0 @@ -For package size reasons the Firefly Sung font to show Chinese characters in the statistics graphs -is not included with LimeSurvey. - -Please download it from http://sourceforge.jp/projects/sfnet_chinesepuppy/downloads/ChineseSupport/Fonts/fireflysung-1.3.0.tar.gz/ , -unzip and put the fireflysung.tff file into the /fonts directory of your LimeSurvey installation. - diff --git a/assets/fonts/font-src/migmix-1p-regular - Japanese.ttf.txt b/assets/fonts/migmix-1p-regular - Japanese.ttf.txt similarity index 65% rename from assets/fonts/font-src/migmix-1p-regular - Japanese.ttf.txt rename to assets/fonts/migmix-1p-regular - Japanese.ttf.txt index 47689128e9a..e490957dd07 100644 --- a/assets/fonts/font-src/migmix-1p-regular - Japanese.ttf.txt +++ b/assets/fonts/migmix-1p-regular - Japanese.ttf.txt @@ -2,4 +2,4 @@ For package size reasons the migmix-1p-regular.ttf font to show Japanese charact is not included with LimeSurvey. Please download it from http://mix-mplus-ipa.sourceforge.jp/migmix/ , -unzip and put the migmix-1p-regular.ttf file into the /fonts directory of your LimeSurvey installation. +unzip and put the migmix-1p-regular.ttf file into the /assets/fonts directory of your LimeSurvey installation.