diff --git a/recipes/default/assets/barra-brasil.coffee b/recipes/default/assets/barra-brasil.coffee index 137e612..c3b1d4c 100755 --- a/recipes/default/assets/barra-brasil.coffee +++ b/recipes/default/assets/barra-brasil.coffee @@ -26,141 +26,3 @@ style.appendChild document.createTextNode(css) head.appendChild style - - if 'undefined' != typeof window.jQuery - - jQuery(document).ready ($) -> - - $.isVersion = (left, oper, right) -> - if left - pre = /pre/i - replace = /[^\d]+/g - oper = oper || "==" - right = right || $().jquery - l = left.replace(replace, '') - r = right.replace(replace, '') - l_len = l.length - r_len = r.length - l_pre = pre.test(left) - r_pre = pre.test(right) - l = if r_len > l_len then parseInt(l) * 10 ** (r_len - l_len) else parseInt(l) - r = if l_len > r_len then parseInt(r) * 10 ** (l_len - r_len) else parseInt(r) - switch oper - when '==' - return true == (l == r and l_pre == r_pre) - when '>=' - return true == (l >= r and (!l_pre or l_pre == r_pre)) - when '<=' - return true == (l <= r and (!r_pre or r_pre == l_pre)) - when '>' - return true == (l > r or l == r and r_pre) - when '<' - return true == (l < r or l == r and l_pre) - false - - if jQuery.isVersion('1.7','<=',jQuery.fn.jquery) or (jQuery.fn.jquery.startsWith('1.10')) or (jQuery.fn.jquery.startsWith('1.11')) or (jQuery.fn.jquery.startsWith('1.12')) or (jQuery.fn.jquery.startsWith('1.13')) - animateAedes = undefined - calcSpeed = undefined - makeNewPosition = undefined - maxX = undefined - maxY = undefined - minX = undefined - minY = undefined - precisaGirar = undefined - - makeNewPosition = -> - newX = undefined - newY = undefined - newX = Math.floor((maxX - minX) * Math.random()) + minX - newY = Math.floor((maxY - minY) * Math.random()) + minY - { - left: newX - top: newY - } - - precisaGirar = (newq, oldq, mosquito) -> - newq.left > oldq.left and !mosquito.hasClass('flipAE') or newq.left < oldq.left and mosquito.hasClass('flipAE') - - animateAedes = (mosquito) -> - angle = undefined - newq = undefined - oldq = undefined - origAngle = undefined - speed = undefined - if !mosquito[0] - return console.log('Morreu.') - newq = makeNewPosition() - oldq = mosquito.offset() - origAngle = mosquito[0].angle or 0 - angle = Math.atan2(newq.top - (oldq.top), newq.left - (oldq.left)) / Math.PI * 180 - 90 - if precisaGirar(newq, oldq, mosquito) - mosquito.removeClass('flyAE').addClass 'rotateAE' - setTimeout (-> - if newq.left > oldq.left - mosquito.addClass 'flipAE' - else - mosquito.removeClass 'flipAE' - mosquito.removeClass('rotateAE').addClass 'flyAE' - return - ), 60 - speed = calcSpeed(oldq, newq) - mosquito.animate { - left: newq.left - top: newq.top - }, speed, -> - setTimeout (-> - animateAedes mosquito - return - ), 100 - return - return - - calcSpeed = (prev, next) -> - dist = undefined - x = undefined - y = undefined - x = Math.abs(prev.left - (next.left)) - y = Math.abs(prev.top - (next.top)) - dist = Math.sqrt(x * x + y * y) - Math.log(dist / 10 + 1) * 900 - - $('head').append '' - minY = 20 - maxY = 200 - minX = 50 - maxX = $(document.body).width() - 100 - jQuery(document).ready ($) -> - i = undefined - i = 0 - while i < 3 - setTimeout (-> - mosquito = undefined - mosquito = $('').appendTo(document.body) - mosquito.css left: makeNewPosition().left + 'px' - mosquito.click -> - if !$('#aegypti-intervencao').length - $(document.body).append '
Não adianta apenas matar o mosquito. Não podemos deixar ele nascer. E isso depende de todos nós.Fechar
' - $('#aegypti-intervencao #aegypti-banner').focus() - $('#aegypti-intervencao a').on 'click', -> - $(this).parent().fadeOut() - $('.aegypti').css 'display', 'none' - return - else - $('#aegypti-intervencao').fadeIn() - $('#aegypti-intervencao #aegypti-banner').focus() - mosquito.remove() - mosquito[0] = null - false - mosquito.mouseover -> - mosquito.stop() - return - mosquito.mouseout -> - animateAedes mosquito - return - animateAedes mosquito - return - ), (i * 2) ** 2 * 1000 - i++ - return - return diff --git a/recipes/default/barra-brasil-1.yaml b/recipes/default/barra-brasil-1.yaml index 526a186..4f67e4c 100644 --- a/recipes/default/barra-brasil-1.yaml +++ b/recipes/default/barra-brasil-1.yaml @@ -13,6 +13,26 @@ generate: (function(){ var conteudoBarra = '${source|trim}'; +- barra-brasil-1-en.js: + source: + - assets/conteudo-barra-en.html + - assets/barra-brasil.coffee + # - assets/estatisticas.coffee #Parte da estatistica do Piwik + - raw: "})();" # fechamento do escopo da funcao anonima (ver template abaixo) + template: | + (function(){ + var conteudoBarra = '${source|trim}'; + +- barra-brasil-1-fr.js: + source: + - assets/conteudo-barra-fr.html + - assets/barra-brasil.coffee + # - assets/estatisticas.coffee #Parte da estatistica do Piwik + - raw: "})();" # fechamento do escopo da funcao anonima (ver template abaixo) + template: | + (function(){ + var conteudoBarra = '${source|trim}'; + - estilo-barra.css: source: - assets/estilo-barra.scss diff --git a/recipes/default/barra-brasil-2.yaml b/recipes/default/barra-brasil-2.yaml index 3d09a61..eff277d 100644 --- a/recipes/default/barra-brasil-2.yaml +++ b/recipes/default/barra-brasil-2.yaml @@ -9,6 +9,18 @@ generate: - build/barra-brasil-css.js # codigo de insercao do css uglify.bin: uglifyjs +- barra-brasil-original-en.js: + source: + - build/barra-brasil-1-en.js # parte de comportamento + - build/barra-brasil-css.js # codigo de insercao do css + uglify.bin: uglifyjs + +- barra-brasil-original-fr.js: + source: + - build/barra-brasil-1-fr.js # parte de comportamento + - build/barra-brasil-css.js # codigo de insercao do css + uglify.bin: uglifyjs + css.embed: true css.embed.only: true output.directory: build diff --git a/recipes/default/barra-brasil-final.yaml b/recipes/default/barra-brasil-final.yaml index 7bca99b..4637c25 100644 --- a/recipes/default/barra-brasil-final.yaml +++ b/recipes/default/barra-brasil-final.yaml @@ -9,19 +9,51 @@ generate: - build/footer-brasil-original.js # parte de comportamento uglify.bin: uglifyjs +- barra-brasil_sem_licenca-en.js: + source: + - build/barra-brasil-original-en.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + uglify.bin: uglifyjs + +- barra-brasil_sem_licenca-fr.js: + source: + - build/barra-brasil-original-fr.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + uglify.bin: uglifyjs + - barra-brasil.js: compress: false uglify.bin: uglifyjs css.compress: false source: - - ../../app/templates/default/barra-brasil_sem_licenca.js + - build/barra-brasil_sem_licenca.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-en.js: + compress: false + uglify.bin: uglifyjs + css.compress: false + source: + - build/barra-brasil_sem_licenca-en.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-fr.js: + compress: false + uglify.bin: uglifyjs + css.compress: false + source: + - build/barra-brasil_sem_licenca-fr.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} css.embed: true css.embed.only: true -output.directory: ../../app/templates/default +output.directory: build output.hashed: false output.manifest: build/assets.json diff --git a/recipes/garrafa/barra-brasil-1.yaml b/recipes/garrafa/barra-brasil-1.yaml index b9a8ddc..4d74f6c 100644 --- a/recipes/garrafa/barra-brasil-1.yaml +++ b/recipes/garrafa/barra-brasil-1.yaml @@ -35,7 +35,7 @@ generate: - estilo-barra.css: source: - - assets/estilo-barra.scss + - ../default/assets/estilo-barra.scss - assets/estilo-campanha.scss depends: - assets/imagens/* @@ -55,7 +55,7 @@ js.compress: false js.uglify.bin: uglifyjs output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/garrafa/barra-brasil-2.yaml b/recipes/garrafa/barra-brasil-2.yaml index 615ed45..afad69d 100644 --- a/recipes/garrafa/barra-brasil-2.yaml +++ b/recipes/garrafa/barra-brasil-2.yaml @@ -26,7 +26,7 @@ css.embed: true css.embed.only: true output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/garrafa/barra-brasil-final.yaml b/recipes/garrafa/barra-brasil-final.yaml index 19fc287..7f69fc4 100644 --- a/recipes/garrafa/barra-brasil-final.yaml +++ b/recipes/garrafa/barra-brasil-final.yaml @@ -55,7 +55,7 @@ css.embed: true css.embed.only: true output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/garrafa/footer-brasil-1.yaml b/recipes/garrafa/footer-brasil-1.yaml index d1b1c07..0cf61b3 100644 --- a/recipes/garrafa/footer-brasil-1.yaml +++ b/recipes/garrafa/footer-brasil-1.yaml @@ -6,7 +6,7 @@ generate: - footer-brasil-1.js: source: - - assets/conteudo-footer.html + - ../default/assets/conteudo-footer.html - assets/footer-brasil.coffee - raw: "})();" # fechamento do escopo da funcao anonima (ver template abaixo) template: | @@ -15,7 +15,7 @@ generate: - estilo-footer.css: source: - - assets/estilo-footer.scss + - ../default/assets/estilo-footer.scss depends: - assets/imagens/* embed.path.root: assets @@ -34,7 +34,7 @@ js.compress: false js.uglify.bin: uglifyjs output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/garrafa/footer-brasil-2.yaml b/recipes/garrafa/footer-brasil-2.yaml index 94d8c3f..e81d2fe 100644 --- a/recipes/garrafa/footer-brasil-2.yaml +++ b/recipes/garrafa/footer-brasil-2.yaml @@ -13,7 +13,7 @@ css.embed: true css.embed.only: true output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/pneu/barra-brasil-1.yaml b/recipes/pneu/barra-brasil-1.yaml index b9a8ddc..d8d81d2 100644 --- a/recipes/pneu/barra-brasil-1.yaml +++ b/recipes/pneu/barra-brasil-1.yaml @@ -35,9 +35,10 @@ generate: - estilo-barra.css: source: - - assets/estilo-barra.scss + - ../default/assets/estilo-barra.scss - assets/estilo-campanha.scss depends: + - ../default/assets/imagens/* - assets/imagens/* embed.path.root: assets embed.url.base: imagens/ @@ -55,7 +56,7 @@ js.compress: false js.uglify.bin: uglifyjs output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/pneu/barra-brasil-2.yaml b/recipes/pneu/barra-brasil-2.yaml index 615ed45..afad69d 100644 --- a/recipes/pneu/barra-brasil-2.yaml +++ b/recipes/pneu/barra-brasil-2.yaml @@ -26,7 +26,7 @@ css.embed: true css.embed.only: true output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/pneu/barra-brasil-final.yaml b/recipes/pneu/barra-brasil-final.yaml index 19fc287..7f69fc4 100644 --- a/recipes/pneu/barra-brasil-final.yaml +++ b/recipes/pneu/barra-brasil-final.yaml @@ -55,7 +55,7 @@ css.embed: true css.embed.only: true output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/pneu/footer-brasil-1.yaml b/recipes/pneu/footer-brasil-1.yaml index d1b1c07..d3f78e2 100644 --- a/recipes/pneu/footer-brasil-1.yaml +++ b/recipes/pneu/footer-brasil-1.yaml @@ -6,7 +6,7 @@ generate: - footer-brasil-1.js: source: - - assets/conteudo-footer.html + - ../default/assets/conteudo-footer.html - assets/footer-brasil.coffee - raw: "})();" # fechamento do escopo da funcao anonima (ver template abaixo) template: | @@ -15,8 +15,9 @@ generate: - estilo-footer.css: source: - - assets/estilo-footer.scss + - ../default/assets/estilo-footer.scss depends: + - ../default/assets/imagens/* - assets/imagens/* embed.path.root: assets embed.url.base: imagens/ @@ -34,7 +35,7 @@ js.compress: false js.uglify.bin: uglifyjs output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false diff --git a/recipes/pneu/footer-brasil-2.yaml b/recipes/pneu/footer-brasil-2.yaml index 94d8c3f..e81d2fe 100644 --- a/recipes/pneu/footer-brasil-2.yaml +++ b/recipes/pneu/footer-brasil-2.yaml @@ -13,7 +13,7 @@ css.embed: true css.embed.only: true output.directory: build output.hashed: false -output.manifest: assets.json +output.manifest: build/assets.json profile.dev: css.compress: false -- libgit2 0.21.2