diff --git a/addons/survey/static/src/fonts/OFL.txt b/addons/survey/static/src/fonts/AlexBrush-Regular-ofl.txt similarity index 100% rename from addons/survey/static/src/fonts/OFL.txt rename to addons/survey/static/src/fonts/AlexBrush-Regular-ofl.txt diff --git a/addons/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf b/addons/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf deleted file mode 100644 index ad99585d291..00000000000 Binary files a/addons/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf and /dev/null differ diff --git a/addons/survey/static/src/fonts/Cochin-LT-Std-Roman.ttf b/addons/survey/static/src/fonts/Cochin-LT-Std-Roman.ttf deleted file mode 100644 index fbc448ad5c6..00000000000 Binary files a/addons/survey/static/src/fonts/Cochin-LT-Std-Roman.ttf and /dev/null differ diff --git a/addons/survey/static/src/fonts/HomepageBaukasten-Bold.otf b/addons/survey/static/src/fonts/HomepageBaukasten-Bold.otf deleted file mode 100644 index e19c0a1efd8..00000000000 Binary files a/addons/survey/static/src/fonts/HomepageBaukasten-Bold.otf and /dev/null differ diff --git a/addons/survey/static/src/fonts/HomepageBaukasten-Book.otf b/addons/survey/static/src/fonts/HomepageBaukasten-Book.otf deleted file mode 100644 index b282fa7da70..00000000000 Binary files a/addons/survey/static/src/fonts/HomepageBaukasten-Book.otf and /dev/null differ diff --git a/addons/survey/static/src/fonts/IbarraRealNova-Bold.ttf b/addons/survey/static/src/fonts/IbarraRealNova-Bold.ttf new file mode 100644 index 00000000000..e0b2aa646ef Binary files /dev/null and b/addons/survey/static/src/fonts/IbarraRealNova-Bold.ttf differ diff --git a/addons/survey/static/src/fonts/IbarraRealNova-Regular.ttf b/addons/survey/static/src/fonts/IbarraRealNova-Regular.ttf new file mode 100644 index 00000000000..deae31966fd Binary files /dev/null and b/addons/survey/static/src/fonts/IbarraRealNova-Regular.ttf differ diff --git a/addons/survey/static/src/fonts/IbarraRealNova-ofl.txt b/addons/survey/static/src/fonts/IbarraRealNova-ofl.txt new file mode 100644 index 00000000000..85efe029383 --- /dev/null +++ b/addons/survey/static/src/fonts/IbarraRealNova-ofl.txt @@ -0,0 +1,93 @@ +Copyright 2007 The Ibarra Real Nova Project Authors (https://github.com/googlefonts/ibarrareal) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +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 THE +COPYRIGHT HOLDER 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. diff --git a/addons/survey/static/src/fonts/Trueno-ofl.txt b/addons/survey/static/src/fonts/Trueno-ofl.txt new file mode 100644 index 00000000000..1249a28359b --- /dev/null +++ b/addons/survey/static/src/fonts/Trueno-ofl.txt @@ -0,0 +1,94 @@ +Copyright (c) 2011, The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat). +Copyright (c) 2015, Jasper @ Cannot Into Space Fonts. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +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 THE +COPYRIGHT HOLDER 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. diff --git a/addons/survey/static/src/fonts/Trueno-wml2.otf b/addons/survey/static/src/fonts/Trueno-wml2.otf new file mode 100644 index 00000000000..82a39527e3c Binary files /dev/null and b/addons/survey/static/src/fonts/Trueno-wml2.otf differ diff --git a/addons/survey/static/src/fonts/TruenoBd.otf b/addons/survey/static/src/fonts/TruenoBd.otf new file mode 100644 index 00000000000..789dada6d54 Binary files /dev/null and b/addons/survey/static/src/fonts/TruenoBd.otf differ diff --git a/addons/survey/static/src/scss/survey_reports.scss b/addons/survey/static/src/scss/survey_reports.scss index 825a91de43b..906a3078b1b 100644 --- a/addons/survey/static/src/scss/survey_reports.scss +++ b/addons/survey/static/src/scss/survey_reports.scss @@ -5,25 +5,25 @@ @font-face { font-family: "certification-serif"; - src: url("/survey/static/src/fonts/Cochin-LT-Std-Roman.ttf") format("truetype"); + src: url("/survey/static/src/fonts/IbarraRealNova-Regular.ttf") format("truetype"); font-weight: normal; } @font-face { font-family: "certification-serif"; - src: url("/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf") format("truetype"); + src: url("/survey/static/src/fonts/IbarraRealNova-Bold.ttf") format("truetype"); font-weight: bold; } @font-face { font-family: "certification-modern"; - src: url("/survey/static/src/fonts/HomepageBaukasten-Book.otf") format("opentype"); + src: url("/survey/static/src/fonts/Trueno-wml2.otf") format("opentype"); font-weight: normal; } @font-face { font-family: "certification-modern"; - src: url("/survey/static/src/fonts/HomepageBaukasten-Bold.otf") format("opentype"); + src: url("/survey/static/src/fonts/TruenoBd.otf") format("opentype"); font-weight: bold; } diff --git a/addons/survey/views/survey_report_templates.xml b/addons/survey/views/survey_report_templates.xml index d00ffaf3fd0..a6d5ecda214 100644 --- a/addons/survey/views/survey_report_templates.xml +++ b/addons/survey/views/survey_report_templates.xml @@ -78,6 +78,7 @@ +

by