diff --git a/addons/survey/static/src/fonts/AlexBrush-Regular.ttf b/addons/survey/static/src/fonts/AlexBrush-Regular.ttf new file mode 100644 index 00000000000..f82156c8683 Binary files /dev/null and b/addons/survey/static/src/fonts/AlexBrush-Regular.ttf differ diff --git a/addons/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf b/addons/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf new file mode 100644 index 00000000000..ad99585d291 Binary files /dev/null and b/addons/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf 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 new file mode 100644 index 00000000000..fbc448ad5c6 Binary files /dev/null and b/addons/survey/static/src/fonts/Cochin-LT-Std-Roman.ttf differ diff --git a/addons/survey/static/src/fonts/ETHOS-REGULAR.OTF b/addons/survey/static/src/fonts/ETHOS-REGULAR.OTF deleted file mode 100755 index 7069cc84eed..00000000000 Binary files a/addons/survey/static/src/fonts/ETHOS-REGULAR.OTF and /dev/null differ diff --git a/addons/survey/static/src/fonts/HomepageBaukasten-Bold.otf b/addons/survey/static/src/fonts/HomepageBaukasten-Bold.otf new file mode 100644 index 00000000000..e19c0a1efd8 Binary files /dev/null and b/addons/survey/static/src/fonts/HomepageBaukasten-Bold.otf differ diff --git a/addons/survey/static/src/fonts/HomepageBaukasten-Book.otf b/addons/survey/static/src/fonts/HomepageBaukasten-Book.otf new file mode 100644 index 00000000000..b282fa7da70 Binary files /dev/null and b/addons/survey/static/src/fonts/HomepageBaukasten-Book.otf differ diff --git a/addons/survey/static/src/fonts/MrDeHaviland-Regular.ttf b/addons/survey/static/src/fonts/MrDeHaviland-Regular.ttf deleted file mode 100644 index 20e834459a5..00000000000 Binary files a/addons/survey/static/src/fonts/MrDeHaviland-Regular.ttf and /dev/null differ diff --git a/addons/survey/static/src/fonts/MrDeHaviland-ofl.txt b/addons/survey/static/src/fonts/OFL.txt similarity index 95% rename from addons/survey/static/src/fonts/MrDeHaviland-ofl.txt rename to addons/survey/static/src/fonts/OFL.txt index f0f0a57a045..0dcdf166dbb 100644 --- a/addons/survey/static/src/fonts/MrDeHaviland-ofl.txt +++ b/addons/survey/static/src/fonts/OFL.txt @@ -1,5 +1,5 @@ -Copyright (c) 2011 Alejandro Paul (sudtipos@sudtipos.com), -with Reserved Font Name "Mr De Haviland" +Copyright (c) 2011 TypeSETit, LLC (typesetit@att.net), +with Reserved Font Name "Alex Brush" 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: @@ -19,7 +19,7 @@ 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, +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 diff --git a/addons/survey/static/src/fonts/Oswald-Light.ttf b/addons/survey/static/src/fonts/Oswald-Light.ttf deleted file mode 100644 index b210bd7f906..00000000000 Binary files a/addons/survey/static/src/fonts/Oswald-Light.ttf and /dev/null differ diff --git a/addons/survey/static/src/img/certification_bg_classic.svg b/addons/survey/static/src/img/certification_bg_classic.svg new file mode 100644 index 00000000000..8200a51c496 --- /dev/null +++ b/addons/survey/static/src/img/certification_bg_classic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/addons/survey/static/src/img/certification_bg_classic_blue.jpg b/addons/survey/static/src/img/certification_bg_classic_blue.jpg deleted file mode 100644 index 4145476d85d..00000000000 Binary files a/addons/survey/static/src/img/certification_bg_classic_blue.jpg and /dev/null differ diff --git a/addons/survey/static/src/img/certification_bg_classic_default.jpg b/addons/survey/static/src/img/certification_bg_classic_default.jpg deleted file mode 100644 index b638bad1ea5..00000000000 Binary files a/addons/survey/static/src/img/certification_bg_classic_default.jpg and /dev/null differ diff --git a/addons/survey/static/src/img/certification_bg_classic_gold.jpg b/addons/survey/static/src/img/certification_bg_classic_gold.jpg deleted file mode 100644 index 6e2fdba0921..00000000000 Binary files a/addons/survey/static/src/img/certification_bg_classic_gold.jpg and /dev/null differ diff --git a/addons/survey/static/src/img/certification_bg_modern.png b/addons/survey/static/src/img/certification_bg_modern.png deleted file mode 100644 index c0046186d4a..00000000000 Binary files a/addons/survey/static/src/img/certification_bg_modern.png and /dev/null differ diff --git a/addons/survey/static/src/img/certification_bg_modern.svg b/addons/survey/static/src/img/certification_bg_modern.svg new file mode 100644 index 00000000000..7059b40ad5b --- /dev/null +++ b/addons/survey/static/src/img/certification_bg_modern.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/addons/survey/static/src/img/certification_seal.svg b/addons/survey/static/src/img/certification_seal.svg deleted file mode 100644 index 2b0b580323c..00000000000 --- a/addons/survey/static/src/img/certification_seal.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/addons/survey/static/src/img/classic-ornament-blue.svg b/addons/survey/static/src/img/classic-ornament-blue.svg new file mode 100644 index 00000000000..2d9afd1b027 --- /dev/null +++ b/addons/survey/static/src/img/classic-ornament-blue.svg @@ -0,0 +1 @@ + diff --git a/addons/survey/static/src/img/classic-ornament-gold.svg b/addons/survey/static/src/img/classic-ornament-gold.svg new file mode 100644 index 00000000000..c022db048ff --- /dev/null +++ b/addons/survey/static/src/img/classic-ornament-gold.svg @@ -0,0 +1 @@ + diff --git a/addons/survey/static/src/img/classic-ornament-purple.svg b/addons/survey/static/src/img/classic-ornament-purple.svg new file mode 100644 index 00000000000..79eca989d35 --- /dev/null +++ b/addons/survey/static/src/img/classic-ornament-purple.svg @@ -0,0 +1 @@ + diff --git a/addons/survey/static/src/img/classic-seal.png b/addons/survey/static/src/img/classic-seal.png new file mode 100644 index 00000000000..3000564f2bd Binary files /dev/null and b/addons/survey/static/src/img/classic-seal.png differ diff --git a/addons/survey/static/src/img/modern-seal-blue.svg b/addons/survey/static/src/img/modern-seal-blue.svg new file mode 100644 index 00000000000..636537b4c9b --- /dev/null +++ b/addons/survey/static/src/img/modern-seal-blue.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/addons/survey/static/src/img/modern-seal-gold.svg b/addons/survey/static/src/img/modern-seal-gold.svg new file mode 100644 index 00000000000..75e6883be39 --- /dev/null +++ b/addons/survey/static/src/img/modern-seal-gold.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/addons/survey/static/src/img/modern-seal-purple.svg b/addons/survey/static/src/img/modern-seal-purple.svg new file mode 100644 index 00000000000..902dadd2e65 --- /dev/null +++ b/addons/survey/static/src/img/modern-seal-purple.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/addons/survey/static/src/img/watermark.png b/addons/survey/static/src/img/watermark.png index 91ec26fc9ac..cac7c4fbc87 100644 Binary files a/addons/survey/static/src/img/watermark.png and b/addons/survey/static/src/img/watermark.png differ diff --git a/addons/survey/static/src/scss/survey_reports.scss b/addons/survey/static/src/scss/survey_reports.scss index 2cdb5a0a89c..bbae25ad1ef 100644 --- a/addons/survey/static/src/scss/survey_reports.scss +++ b/addons/survey/static/src/scss/survey_reports.scss @@ -1,196 +1,339 @@ @font-face { - font-family: certification-cursive; - src: url(/survey/static/src/fonts/MrDeHaviland-Regular.ttf); + font-family: "certification-cursive"; + src: url("/survey/static/src/fonts/AlexBrush-Regular.ttf") format("truetype"); } + @font-face { - font-family: certification-serif; - src: url(/survey/static/src/fonts/ETHOS-REGULAR.OTF); + font-family: "certification-serif"; + src: url("/survey/static/src/fonts/Cochin-LT-Std-Roman.ttf") format("truetype"); + font-weight: normal; } + @font-face { - font-family: certification-modern; - src: url(/survey/static/src/fonts/Oswald-Light.ttf); + font-family: "certification-serif"; + src: url("/survey/static/src/fonts/Cochin-LT-Std-Bold.ttf") format("truetype"); + font-weight: bold; +} + +@font-face { + font-family: "certification-modern"; + src: url("/survey/static/src/fonts/HomepageBaukasten-Book.otf") format("opentype"); + font-weight: normal; +} + +@font-face { + font-family: "certification-modern"; + src: url("/survey/static/src/fonts/HomepageBaukasten-Bold.otf") format("opentype"); + font-weight: bold; +} + +$lightgrey: #f2f2f2; +$font-muted: #6b6d70; +$font-color: #282f33; +$white: #ffffff; +$purple: #875A7B; +$gold: #d7a520; +$blue: #263e86; + +* { + box-sizing: border-box; +} + +body { + zoom: 117.2%; } #o_survey_certification.certification-wrapper { - width: 250mm; - height: 280mm; + width: 297mm; + height: 210mm; + background-color: $purple; + position: relative; display: flex; - background-size: 100% 100%; - background-color: #875A7B; + margin-left: -15px; + margin-right: -15px; &.blue { - background-color: #4761e2; + background-color: $blue; } &.gold { - background-color: #af881a; + background-color: $gold; + } + + .test-entry { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: url(/survey/static/src/img/watermark.png); + background-size: 20%; + background-position: center; + z-index: 4; } .certification { position: relative; - width: 100%; - height: 100%; + text-align: center; - .test-entry { - top: 0px; - left: 0px; + .certification-failed p{ + margin-top: 30mm; + } + + .certification-seal { position: absolute; - content: ''; - height: 610px; - width: 860px; - background: url(/survey/static/src/img/watermark.png) no-repeat; - background-size: 100% 100%; - background-position: center; - } - } - - &.classic { - padding: 5mm; - background-image: url(/survey/static/src/img/certification_bg_classic_default.jpg); - color: #3e2e3a; - - &.blue { - background-image: url(/survey/static/src/img/certification_bg_classic_blue.jpg); - color: #272d4f; + background-size: 100%; } - &.gold { - background-image: url(/survey/static/src/img/certification_bg_classic_gold.jpg); - color: #5A4721; - } - - .certification { - padding: 20mm; - font-family: certification-serif, serif; - font-family: Times; - text-align: center; - color: inherit; - - .certification-name-label { - padding: 5mm 0 8mm; - } - - .certification-name { - font-size: 45pt; - line-height: 0.9; - text-transform: uppercase; - letter-spacing: 0.2mm; - } - - .user-name { - padding-bottom: 6mm; - padding-top: 3mm; - font-family: certification-cursive, cursive; - letter-spacing: -0.2mm; - word-spacing: 0.2mm; + .certification-top { + h1 { font-size: 60pt; - } + text-transform: uppercase; + line-height: 24pt; - hr { - border-color: inherit; - margin: 15mm auto; - opacity: 0.6; - width: 50mm; - - &.small { - margin: 2mm auto; - } - } - - .certification-description, .certification-date { - padding: 5mm 40mm 10mm; - } - - .certificate-signature { - position: absolute; - bottom: 10mm; - right: 10mm; - left: 10mm; - font-size: 14pt; - - img { - max-width: 40mm; - max-height: 40mm; - } + span { + font-size: 20pt; + } } } - } - &.modern { - background-image: url(/survey/static/src/img/certification_bg_modern.png); + .certification-content { + p { + font-size: 16pt; + color: $font-muted; - .certification { - padding-left: 40mm; - padding-right: 40mm; - font-family: certification-modern, sans-serif; - color: #223541; - - .certification-bg-dark { - display: inline-block; - background-color: #223541; - background: rgba(34, 53, 65, 0.1); - } - - .certification-top { - .certification-bg-dark { - margin-bottom: 10mm; - padding: 20mm 6mm 5mm; - text-align: center; - width: 56mm; - } - - .certification-company-wrapper { - padding: 1mm 2mm; - - img { - max-width: 40mm; - max-height: 30mm; - } + .user-name { + font-family: certification-cursive, cursive; + font-size: 50pt; + line-height: 2; + color: $font-color; + border-bottom: 1pt solid $font-color; } .certification-name { + font-size: 18pt; + line-height: 1.5; text-transform: uppercase; - font-size: 40pt; - line-height: 0.9; + color: $font-color; + } + } + } + + .certification-bottom { + position: absolute; + bottom: 15mm; + + .certification-date-wrapper { + width: 80mm; + padding: 10mm; + text-align: center; + + .certification-date { + border-bottom: 1pt solid $font-color; + } + } + + .certification-company { + position: absolute; + top: 0; + bottom: 0; + width: 33%; + text-align: center; + + img { + max-width: 100%; + max-height: 100%; + } + } + } + .certification-number { + color: $font-muted; + position: absolute; + font-size: 10pt; + } + } + +// Classic Template + &.classic { + + &.blue .certification { + color: $blue; + + .certification-top { + &:before, &:after { + background-image: url("/survey/static/src/img/classic-ornament-blue.svg"); + } + } + + .certification-content p .certification-name { + color: $blue; + } + } + + &.gold .certification { + color: $gold; + + .certification-top { + &:before, &:after{ + background-image: url("/survey/static/src/img/classic-ornament-gold.svg"); + } + } + .certification-content p .certification-name { + color: $gold; + } + } + + .certification { + background-image: url("/survey/static/src/img/certification_bg_classic.svg"); + background-repeat: no-repeat; + background-size: cover; + font-family: "certification-serif", serif; + width: 295mm; + height: 208mm; + margin: 1mm; + color: $purple; + + .certification-top { + padding-top: 10mm; + + &:before, &:after { + content: ''; + display: block; + width: 108mm; + height: 16mm; + margin: 0 auto; + background-image: url("/survey/static/src/img/classic-ornament-purple.svg"); + background-repeat: no-repeat; + } + + &:before { + margin-bottom: 10mm; + } + + &:after { + -webkit-transform: scaleY(-1); + transform: scaleY(-1); + margin-bottom: 5mm; + } + } + .certification-content { + margin-bottom: 10mm; + + p .certification-name { + color: $purple; } } .certification-bottom { - padding: 60mm 0 10mm; - font-size: 16pt; + width: 295mm; + bottom: 20mm; + + .certification-date-wrapper { + margin-left: 40mm; + font-size: 18pt; + color: $font-muted; + + span { + font-size: 18pt; + } - .user-name { - margin-bottom: 20mm; - font-family: certification-cursive, cursive; - font-size: 50pt; } - .certification-bottom-group { - position: absolute; - bottom: 0; - right: 40mm; - left: 40mm; - top: 220mm; + .certification-seal { + top: 50%; + left: 50%; + -webkit-transform: translate(-50% , -50%); + transform: translate(-50% , -50%); + width: 24mm; + height: 24mm; + background: url(/survey/static/src/img/classic-seal.png) no-repeat; + } - > div { - display: inline-block; - height: 100%; - float: left; - bottom: 0; - top: 0; - } + .certification-company { + padding-left: 10mm; + right: 35mm; + } - .certification-bg-dark { - width: 56mm; - max-height: 100%; - } - - .certification-date { - padding-right: 30mm; - padding-left: 15mm; - } + .certification-number { + bottom: -15mm; + left: 50%; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); } } } } -} + +// Modern Template + &.modern { + background-image: url("/survey/static/src/img/certification_bg_modern.svg"); + background-repeat: no-repeat; + background-size: cover; + + &.blue .certification .certification-seal { + background-image: url("/survey/static/src/img/modern-seal-blue.svg"); + } + + &.gold .certification .certification-seal { + background-image: url("/survey/static/src/img/modern-seal-gold.svg"); + } + + .certification { + font-family: "certification-modern", sans-serif; + width: 272mm; + height: 185mm; + margin: 12.5mm; + background-color: $lightgrey; + text-align: center; + + .certification-seal { + top: -7mm; + right: 20mm; + width: 22mm; + height: 42mm; + background-image: url("/survey/static/src/img/modern-seal-purple.svg"); + background-repeat: no-repeat; + } + + .certification-top { + padding-top: 28mm; + padding-bottom: 10mm; + color: $font-color; + + h1 b { + font-weight: bold; + } + } + + .certification-bottom { + width: 272mm; + + .certification-date-wrapper { + margin-left: 40mm; + text-transform: uppercase; + + .certification-date { + font-size: 18pt; + color: $font-color; + } + + span { + font-size: 14pt; + color: $font-muted; + } + + } + + .certification-company { + right: 30mm; + } + } + + .certification-number { + bottom: -6mm; + right:0; + text-align: right; + } + } + } +} \ No newline at end of file diff --git a/addons/survey/views/survey_report_templates.xml b/addons/survey/views/survey_report_templates.xml index 3f3d3767693..1db6273962c 100644 --- a/addons/survey/views/survey_report_templates.xml +++ b/addons/survey/views/survey_report_templates.xml @@ -5,71 +5,79 @@
-
+
-
- + +
+
+

This certificate is presented to +
+ +
by for successfully completing +
+

+
+
+

Certification Failed

-
-
-
This Certificate is Presented to
-
- -
- is proud to award this certificate to - for graduating . -
+
+
+ Date
-
-
Certification Failed
+
+
-
-
-
-
Date
-
-
-
- Certification Seal -
-
+
Certification n°1234567890
+