From be8670d0afcd4d96a4be720bd010371dfaa3257d Mon Sep 17 00:00:00 2001 From: Carlos Vieira Date: Mon, 3 Nov 2014 13:00:10 -0200 Subject: [PATCH] Voltando para a barra cinza. --- CHANGES.md | 4 ++++ app/static/barra-brasil.js | 2 +- recipes/default/assets/barra-brasil.coffee | 19 +++---------------- recipes/default/barra-brasil-1.yaml | 5 +---- recipes/default/barra-brasil-final.yaml | 2 +- recipes/default/compile.sh | 4 ++-- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a795d8e..0393707 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,10 @@ * O footer está substituindo ao invés de acrescentando o HTML [caduvieira] +# 2.0.3 + +* Remoção da barra de outubro rosa. Não haverá barra para novembro azul pois o INCA não endossa. [caduvieira] + # 2.0.2 * Remoção da chamada ao estatística do SERPRO a pedido do próprio SERPRO pois eles informaram que não tem parque computacional para dar suporte. [caduvieira] diff --git a/app/static/barra-brasil.js b/app/static/barra-brasil.js index 27d4486..f81f384 100644 --- a/app/static/barra-brasil.js +++ b/app/static/barra-brasil.js @@ -1 +1 @@ -!function(){var a,r='
Brasil
Acesso à informação#CancerDeMama#OutubroRosa2014
';a=document.getElementById("barra-brasil"),a&&(a.removeAttribute("style"),a.innerHTML=r),window._barrabrasil={insere_css:function(a){var r,i,s,e;return s=document.createElement("style"),e=document.createAttribute("type"),e.nodeValue="text/css",i=document.createAttribute("media"),i.nodeValue="all",s.setAttributeNode(e),s.setAttributeNode(i),s.styleSheet?s.styleSheet.cssText=a:s.appendChild(document.createTextNode(a)),r=document.getElementsByTagName("head")[0],r.appendChild(s)}}}(),window._barrabrasil.insere_css('#barra-brasil div,#barra-brasil a,#barra-brasil ul,#barra-brasil li{margin:0;padding:0;border:0;font-size:100%;font-family:inherit;vertical-align:baseline}#barra-brasil ul{list-style:none}@font-face{font-family:"Open Sans";font-style:normal;font-weight:700;src:local("Open Sans Bold"),local("OpenSans-Bold"),url("//barra.brasil.gov.br/static/opensans-bold.woff") format("woff")}#barra-brasil{height:32px;background:#EC5C9A;font-weight:bold;font-size:12px;line-height:32px;font-family:"Open Sans",Arial,Helvetica,sans-serif;border-bottom:1px solid #dfdfdf}#barra-brasil a{text-decoration:none}div#wrapper-barra-brasil{position:relative;overflow:hidden;margin:0 auto;width:100%;max-width:960px;height:100%}#barra-brasil .brasil-flag{float:left;padding:7px 0 6px;width:115px;height:19px;border-right:2px solid #dfdfdf}#barra-brasil .brasil-flag .link-barra{display:block;padding-left:42px;width:43px;background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAATCAIAAAABJ4pRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABINJREFUeNqUVFtsFFUYPrfdmdnLbLe021baQqWUtdJKL5QiASPiNVqC0TYqUWLShJQmRH3RqPHFRKJvQqIPQNSAAcMDptGEiKjYpLZIkSqGXqjdFlppd3vb7c7Ozpxz/M+2wZD44snszOzJnP//vv///g9XnNiXtNISI1gYq4eUEu4CC7SyiLpJgtSOIJKg/1ySB3x+NmsvJLNpgVUwlAu08iIkzi2pUhHIAa/q1L9p7l6YWmmHEOSBWJD6LixwJ7DDAKR06c6imQOVYxoRyEV4BR3JBYfvqNqBtILrSGNEKgoCsVxWDMmxgAOADeDjQsP+oHbo1egk7B+Mju/vq7kwVYhohsAxoiogiIM5hBaSUIBFfS21WRcOSwUHOwgTqoJR+O0pv31u56XmUKrvt4o/RyNrjVRHw40iLdU9Hck4DPBQxOQKK/XQqQa7nGNb8UICSUoE4y4rCyweqh164b7Jk12N737x2NjtfMAeCDit268e7jj7yOqfX++p+ebvQk5coAB8BQIMroqaf7xt3p4TUATgxj0Y0wOVN96uHomE3I+Ob37zSJvUHURshjySIZ4JPLhp+IcPj3h1eSZ2zxu/R8cXDeThuSLJkGZSY/fGjGOrenG9xlz8vPnK/g0xEwprl52PH9ryUGRLk1lfXWqGCcE0lUqOjxeHVy01141V+5Mvlk+lOLmcAOwC6OpMo8FnqlOCh2j2taqRE1sHKk2LuFJq6NveumNd9f0Dt2IjC1aGVKwzdz1cUryaxSasW9Oo/dFfoaEB6jxdOl2Xt3BtwYw7Xh/VmQNNcNHj5fH3N40CQgnNAAUQMjgh+y/dpIblN9j14fHuHqEFvPUP5L3Svp4mHNtGmgbaVF1oWZNIi8GXextALUpEhLqnJ0o3f9fcEw9iD3RFCaUiMmvmG/lhI50VBQX6ujX5ju3+dHHm1Mmb9dGsxyRKSwylHNLRt2HvL42O4C5IhsLsgEII74+Hd1zY+s5AdMklguMnmkaLwn9RGgr7dSfLk5ZreGhJUdD0+oz0ZxSOMNQ1VdB4fscnw5VCiOUBpb7d91vcklBJJpDwXpwOn50qKdXs2tLZpoqJU99XxVPBbMayXRnOK/Dp5p5tZzpbu0cT+sErG9/6o2rW9iLKQbOget2jQbgay3UIJrlhlJSK6Yz3dKx4dD74Ut3Ivu2X5xe8CSvopdm1kdh7e7/sfO7Ho4PlrT0NvTMhTISaaRhUoImITr244Njz8WwSVKOMhBI1hdIBMQuXlARShxuvPbt+3k0gx9GMsDVp0c7emq8nSiSFjzkVlCuKfHl+Q0aQai21Gb4E7SA59wDWGLLBg+Kk6/lqrKw/4dtWOLfKn/74+r2t3fVX5/IwcyExIBAKFFWOhskyWVx4tG3GmUfKCFRbOHYBNjiC6hBkBTrQRl+mSLeHZkOYOXeMRxIFCb6SME5gYJiGvH7MPn0q5wBCgqkgF4xBEVfdhksTyMmNpFT/chJQJQbkgitE8o73gRe4HsRYe/RJy86IFYtU1pVzSqxC/J8F5fMz/z8CDAAkCSSg0qSX5AAAAABJRU5ErkJggg==") 8px center no-repeat;text-transform:uppercase;line-height:19px}#barra-brasil .acesso-info{position:absolute;left:130px}#barra-brasil .hashtag-barra-brasil span{padding-left:42px}#barra-brasil .hashtag-barra-brasil span a{color:#FFFBA2}#barra-brasil .list{position:absolute;top:0;right:0}#barra-brasil .list .first{border-left:2px solid #dfdfdf}#barra-brasil .list-item{display:inline-block;padding:0 15px 0 13px;height:32px;border-right:2px solid #dfdfdf}#barra-brasil .link-barra{color:#FFF}@media screen and (max-width: 668px){#barra-brasil .list{top:-100px}}@media screen and (min-width: 960px){#wrapper-barra-brasil{width:960px}}'); \ No newline at end of file +!function(){var a,r,i='
Brasil
Acesso à informação
';a=document.getElementById("barra-brasil"),a&&(a.removeAttribute("style"),a.innerHTML=i,r=document.getElementsByTagName("head")[0]),window._barrabrasil={insere_css:function(a){var i,e,l;return e=document.createElement("style"),l=document.createAttribute("type"),l.nodeValue="text/css",i=document.createAttribute("media"),i.nodeValue="all",e.setAttributeNode(l),e.setAttributeNode(i),e.styleSheet?e.styleSheet.cssText=a:e.appendChild(document.createTextNode(a)),r.appendChild(e)}}}(),window._barrabrasil.insere_css('#barra-brasil div,#barra-brasil a,#barra-brasil ul,#barra-brasil li{margin:0;padding:0;border:0;font-size:100%;font-family:inherit;vertical-align:baseline}#barra-brasil ul{list-style:none}@font-face{font-family:"Open Sans";font-style:normal;font-weight:700;src:local("Open Sans Bold"),local("OpenSans-Bold"),url("//barra.brasil.gov.br/static/opensans-bold.woff") format("woff")}#barra-brasil{height:32px;background:#f1f1f1;font-weight:bold;font-size:12px;line-height:32px;font-family:"Open Sans",Arial,Helvetica,sans-serif;border-bottom:1px solid #dfdfdf}#barra-brasil a{text-decoration:none}div#wrapper-barra-brasil{position:relative;overflow:hidden;margin:0 auto;width:100%;max-width:960px;height:100%}#barra-brasil .brasil-flag{float:left;padding:7px 0 6px;width:115px;height:19px;border-right:2px solid #dfdfdf}#barra-brasil .brasil-flag .link-barra{display:block;padding-left:42px;width:43px;background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAATCAIAAAABJ4pRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABINJREFUeNqUVFtsFFUYPrfdmdnLbLe021baQqWUtdJKL5QiASPiNVqC0TYqUWLShJQmRH3RqPHFRKJvQqIPQNSAAcMDptGEiKjYpLZIkSqGXqjdFlppd3vb7c7Ozpxz/M+2wZD44snszOzJnP//vv///g9XnNiXtNISI1gYq4eUEu4CC7SyiLpJgtSOIJKg/1ySB3x+NmsvJLNpgVUwlAu08iIkzi2pUhHIAa/q1L9p7l6YWmmHEOSBWJD6LixwJ7DDAKR06c6imQOVYxoRyEV4BR3JBYfvqNqBtILrSGNEKgoCsVxWDMmxgAOADeDjQsP+oHbo1egk7B+Mju/vq7kwVYhohsAxoiogiIM5hBaSUIBFfS21WRcOSwUHOwgTqoJR+O0pv31u56XmUKrvt4o/RyNrjVRHw40iLdU9Hck4DPBQxOQKK/XQqQa7nGNb8UICSUoE4y4rCyweqh164b7Jk12N737x2NjtfMAeCDit268e7jj7yOqfX++p+ebvQk5coAB8BQIMroqaf7xt3p4TUATgxj0Y0wOVN96uHomE3I+Ob37zSJvUHURshjySIZ4JPLhp+IcPj3h1eSZ2zxu/R8cXDeThuSLJkGZSY/fGjGOrenG9xlz8vPnK/g0xEwprl52PH9ryUGRLk1lfXWqGCcE0lUqOjxeHVy01141V+5Mvlk+lOLmcAOwC6OpMo8FnqlOCh2j2taqRE1sHKk2LuFJq6NveumNd9f0Dt2IjC1aGVKwzdz1cUryaxSasW9Oo/dFfoaEB6jxdOl2Xt3BtwYw7Xh/VmQNNcNHj5fH3N40CQgnNAAUQMjgh+y/dpIblN9j14fHuHqEFvPUP5L3Svp4mHNtGmgbaVF1oWZNIi8GXextALUpEhLqnJ0o3f9fcEw9iD3RFCaUiMmvmG/lhI50VBQX6ujX5ju3+dHHm1Mmb9dGsxyRKSwylHNLRt2HvL42O4C5IhsLsgEII74+Hd1zY+s5AdMklguMnmkaLwn9RGgr7dSfLk5ZreGhJUdD0+oz0ZxSOMNQ1VdB4fscnw5VCiOUBpb7d91vcklBJJpDwXpwOn50qKdXs2tLZpoqJU99XxVPBbMayXRnOK/Dp5p5tZzpbu0cT+sErG9/6o2rW9iLKQbOget2jQbgay3UIJrlhlJSK6Yz3dKx4dD74Ut3Ivu2X5xe8CSvopdm1kdh7e7/sfO7Ho4PlrT0NvTMhTISaaRhUoImITr244Njz8WwSVKOMhBI1hdIBMQuXlARShxuvPbt+3k0gx9GMsDVp0c7emq8nSiSFjzkVlCuKfHl+Q0aQai21Gb4E7SA59wDWGLLBg+Kk6/lqrKw/4dtWOLfKn/74+r2t3fVX5/IwcyExIBAKFFWOhskyWVx4tG3GmUfKCFRbOHYBNjiC6hBkBTrQRl+mSLeHZkOYOXeMRxIFCb6SME5gYJiGvH7MPn0q5wBCgqkgF4xBEVfdhksTyMmNpFT/chJQJQbkgitE8o73gRe4HsRYe/RJy86IFYtU1pVzSqxC/J8F5fMz/z8CDAAkCSSg0qSX5AAAAABJRU5ErkJggg==") 8px center no-repeat;text-transform:uppercase;line-height:19px}#barra-brasil .acesso-info{position:absolute;left:130px}#barra-brasil .list{position:absolute;top:0;right:0}#barra-brasil .list .first{border-left:2px solid #dfdfdf}#barra-brasil .list-item{display:inline-block;padding:0 15px 0 13px;height:32px;border-right:2px solid #dfdfdf}#barra-brasil .link-barra{color:#606060}@media screen and (max-width: 668px){#barra-brasil .list{top:-100px}}@media screen and (min-width: 960px){#wrapper-barra-brasil{width:960px}}'); \ No newline at end of file diff --git a/recipes/default/assets/barra-brasil.coffee b/recipes/default/assets/barra-brasil.coffee index 4f68900..9bc4f13 100755 --- a/recipes/default/assets/barra-brasil.coffee +++ b/recipes/default/assets/barra-brasil.coffee @@ -1,23 +1,10 @@ divBarra = document.getElementById("barra-brasil") if divBarra - divBarra.parentNode.removeChild(divBarra) + divBarra.removeAttribute "style" + # conteudoBarra definido no barra-brasil-1.yaml e atribuido pelo assetgen + divBarra.innerHTML = conteudoBarra head = document.getElementsByTagName("head")[0] - body = document.getElementsByTagName("body")[0] - - link = document.createElement("link") - href = document.createAttribute("href") - novaDiv = document.createElement("div") - idNovaDiv = document.createAttribute("id") - idNovaDiv.nodeValue = "barra-brasil" - novaDiv.setAttributeNode idNovaDiv - # conteudoBarra definido no barra-brasil-1.yaml e atribuido pelo assetgen - novaDiv.innerHTML = conteudoBarra - body.insertBefore(novaDiv, body.childNodes[0]) - - # src.nodeValue = "http://barra.brasil.gov.br/estilo-barra.css"; - # href.nodeValue = "http://189.9.137.173/estilo-barra.css"; - # href.nodeValue = "static/estilo-barra.css" window._barrabrasil = insere_css: (css) -> style = document.createElement("style") diff --git a/recipes/default/barra-brasil-1.yaml b/recipes/default/barra-brasil-1.yaml index df27815..7ab0400 100644 --- a/recipes/default/barra-brasil-1.yaml +++ b/recipes/default/barra-brasil-1.yaml @@ -7,12 +7,9 @@ generate: source: - assets/conteudo-barra.html - assets/barra-brasil.coffee - - assets/estatisticas.coffee #Parte da estatistica do Piwik + # - assets/estatisticas.coffee #Parte da estatistica do Piwik - raw: "})();" # fechamento do escopo da funcao anonima (ver template abaixo) template: | - var _paq = _paq || []; - _paq.push(['trackPageView']); - _paq.push(['enableLinkTracking']); (function(){ var conteudoBarra = '${source|trim}'; diff --git a/recipes/default/barra-brasil-final.yaml b/recipes/default/barra-brasil-final.yaml index 2f49933..fe73b08 100644 --- a/recipes/default/barra-brasil-final.yaml +++ b/recipes/default/barra-brasil-final.yaml @@ -6,7 +6,7 @@ generate: - barra-brasil.js: source: - build/barra-brasil-original.js # parte de comportamento - - build/footer-brasil.js # parte de comportamento + # - build/footer-brasil.js # parte de comportamento uglify.bin: uglifyjs css.embed: true diff --git a/recipes/default/compile.sh b/recipes/default/compile.sh index e1e89a7..f3e95aa 100644 --- a/recipes/default/compile.sh +++ b/recipes/default/compile.sh @@ -1,7 +1,7 @@ #!/bin/sh assetgen ./barra-brasil-1.yaml assetgen ./barra-brasil-2.yaml -assetgen ./footer-brasil-1.yaml -assetgen ./footer-brasil-2.yaml +#assetgen ./footer-brasil-1.yaml +#assetgen ./footer-brasil-2.yaml assetgen ./barra-brasil-final.yaml -- libgit2 0.21.2