Download as
Browse Code »

Commit be8670d0afcd4d96a4be720bd010371dfaa3257d

Authored by Carlos Vieira
1 parent 2e5fbf06
Exists in master

Voltando para a barra cinza.

Showing 6 changed files with 12 additions and 24 deletions   Show diff stats
CHANGES.md
  Diff comments   View file @be8670d
... ... @@ -4,6 +4,10 @@
4 4  
5 5 * O footer está substituindo ao invés de acrescentando o HTML [caduvieira]
6 6  
  7 +# 2.0.3
  8 +
  9 +* Remoção da barra de outubro rosa. Não haverá barra para novembro azul pois o INCA não endossa. [caduvieira]
  10 +
7 11 # 2.0.2
8 12  
9 13 * 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]
... ...
app/static/barra-brasil.js
  Diff comments   View file @be8670d
1   -!function(){var a,r='<div id="wrapper-barra-brasil"><div class="brasil-flag"><a href="http://brasil.gov.br" class="link-barra">Brasil</a></div><span class="acesso-info"><a href="http://brasil.gov.br/barra#acesso-informacao" class="link-barra">Acesso &agrave; informa&ccedil;&atilde;o</a><span class="hashtag-barra-brasil"><span><a href="http://www1.inca.gov.br/wcm/outubro-rosa/2014/" class="link-barra">#CancerDeMama</a></span><span><a href="http://www1.inca.gov.br/wcm/outubro-rosa/2014/" class="link-barra">#OutubroRosa2014</a></span></span></span><ul class="list"><li class="list-item first"><a href="http://brasil.gov.br/barra#participe" class="link-barra">Participe</a></li><li class="list-item"><a href="http://www.servicos.gov.br/" class="link-barra">Servi&ccedil;os</a></li><li class="list-item"><a href="http://www.planalto.gov.br/legislacao" class="link-barra">Legisla&ccedil;&atilde;o</a></li><li class="list-item last last-item"><a href="http://brasil.gov.br/barra#orgaos-atuacao-canais" class="link-barra">Canais</a></li></ul></div>';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}}');
2 1 \ No newline at end of file
  2 +!function(){var a,r,i='<div id="wrapper-barra-brasil"><div class="brasil-flag"><a href="http://brasil.gov.br" class="link-barra">Brasil</a></div><span class="acesso-info"><a href="http://brasil.gov.br/barra#acesso-informacao" class="link-barra">Acesso &agrave; informa&ccedil;&atilde;o</a></span><ul class="list"><li class="list-item first"><a href="http://brasil.gov.br/barra#participe" class="link-barra">Participe</a></li><li class="list-item"><a href="http://www.servicos.gov.br/" class="link-barra">Servi&ccedil;os</a></li><li class="list-item"><a href="http://www.planalto.gov.br/legislacao" class="link-barra">Legisla&ccedil;&atilde;o</a></li><li class="list-item last last-item"><a href="http://brasil.gov.br/barra#orgaos-atuacao-canais" class="link-barra">Canais</a></li></ul></div>';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}}');
3 3 \ No newline at end of file
... ...
recipes/default/assets/barra-brasil.coffee
  Diff comments   View file @be8670d
1 1 divBarra = document.getElementById("barra-brasil")
2 2 if divBarra
3   - divBarra.parentNode.removeChild(divBarra)
  3 + divBarra.removeAttribute "style"
  4 + # conteudoBarra definido no barra-brasil-1.yaml e atribuido pelo assetgen
  5 + divBarra.innerHTML = conteudoBarra
4 6 head = document.getElementsByTagName("head")[0]
5   - body = document.getElementsByTagName("body")[0]
6   -
7   - link = document.createElement("link")
8   - href = document.createAttribute("href")
9 7  
10   - novaDiv = document.createElement("div")
11   - idNovaDiv = document.createAttribute("id")
12   - idNovaDiv.nodeValue = "barra-brasil"
13   - novaDiv.setAttributeNode idNovaDiv
14   - # conteudoBarra definido no barra-brasil-1.yaml e atribuido pelo assetgen
15   - novaDiv.innerHTML = conteudoBarra
16   - body.insertBefore(novaDiv, body.childNodes[0])
17   -
18   - # src.nodeValue = "http://barra.brasil.gov.br/estilo-barra.css";
19   - # href.nodeValue = "http://189.9.137.173/estilo-barra.css";
20   - # href.nodeValue = "static/estilo-barra.css"
21 8 window._barrabrasil =
22 9 insere_css: (css) ->
23 10 style = document.createElement("style")
... ...
recipes/default/barra-brasil-1.yaml
  Diff comments   View file @be8670d
... ... @@ -7,12 +7,9 @@ generate:
7 7 source:
8 8 - assets/conteudo-barra.html
9 9 - assets/barra-brasil.coffee
10   - - assets/estatisticas.coffee #Parte da estatistica do Piwik
  10 + # - assets/estatisticas.coffee #Parte da estatistica do Piwik
11 11 - raw: "})();" # fechamento do escopo da funcao anonima (ver template abaixo)
12 12 template: |
13   - var _paq = _paq || [];
14   - _paq.push(['trackPageView']);
15   - _paq.push(['enableLinkTracking']);
16 13 (function(){
17 14 var conteudoBarra = '${source|trim}';
18 15  
... ...
recipes/default/barra-brasil-final.yaml
  Diff comments   View file @be8670d
... ... @@ -6,7 +6,7 @@ generate:
6 6 - barra-brasil.js:
7 7 source:
8 8 - build/barra-brasil-original.js # parte de comportamento
9   - - build/footer-brasil.js # parte de comportamento
  9 + # - build/footer-brasil.js # parte de comportamento
10 10 uglify.bin: uglifyjs
11 11  
12 12 css.embed: true
... ...
recipes/default/compile.sh
  Diff comments   View file @be8670d
1 1 #!/bin/sh
2 2 assetgen ./barra-brasil-1.yaml
3 3 assetgen ./barra-brasil-2.yaml
4   -assetgen ./footer-brasil-1.yaml
5   -assetgen ./footer-brasil-2.yaml
  4 +#assetgen ./footer-brasil-1.yaml
  5 +#assetgen ./footer-brasil-2.yaml
6 6 assetgen ./barra-brasil-final.yaml
7 7  
... ...