Download as
Browse Code »

Commit 1e41fe24c8c198b5bf5edd4b72f3e9d93838aeb4

Authored by Carlos Coêlho
Committed by Macartur Sousa
1 parent 09fa243f
Exists in spb-release/3.0 and in 2 other branches fix_cache_count_spb, layout-fix

Updated SPB theme 

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Showing 7 changed files with 123 additions and 169 deletions   Show diff stats
colab/static/css/footer.css
  Diff comments   View file @1e41fe2
1 1 /*Footer*/
2 2  
3 3  
4   -#footer-content{
  4 +.footer-content{
5 5 background: rgb(213,213,213);
6 6 padding: 50px 0;
7 7 font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
... ... @@ -37,51 +37,54 @@
37 37 padding-bottom: 3px
38 38 }
39 39  
40   -#footer-gov{
  40 +.footer-gov{
41 41 background: #0042b2;
42 42 }
43 43  
44   -#footer-gov > .container{
  44 +.footer-gov > .container{
45 45 padding: 2em 0;
46 46 }
47 47  
48   -#footer-gov .institucionais a{
  48 +.footer-gov .institucionais a{
49 49 display:table-cell;
50 50 vertical-align: middle;
  51 + float: right;
51 52 }
52 53  
53   -#footer-gov a:hover{
  54 +.footer-gov a:hover{
54 55 text-decoration: none;
55 56 }
56 57  
57   -#footer-gov span{
  58 +.footer-gov span{
58 59 display: none;
59 60 }
60 61  
61   -#logo-sgpr img, #logo-acesso img{
  62 +.footer-gov .logo-sgpr img, .logo-acesso img{
  63 + padding-top: 10px;
62 64 padding-right: 15%;
  65 + padding-bottom: 10px;
63 66 }
64 67  
65   -#logo-brasil img{
  68 +.footer-gov .logo-brasil img{
66 69 padding-right: 0;
67 70 }
68 71  
69   -#go-top{
  72 +.go-top{
70 73 font-size: 13px;
71 74 height: 2em;
72 75 }
73 76  
74   -#go-top a{
  77 +.go-top a{
75 78 color: #717782;
76 79 line-height: 2em;
77 80 }
78 81  
79   -#go-top .icon-chevron-up{
  82 +.go-top .icon-chevron-up{
80 83 padding-right: 10px;
81 84 text-decoration: none;
82 85 }
83 86  
84   -#spb-definitions{
  87 +.spb-definitions{
85 88 font-size: 10px;
86 89 padding: 10px 0;
87 90 }
... ...
colab/static/css/header.css
  Diff comments   View file @1e41fe2
... ... @@ -146,10 +146,6 @@
146 146 font-family: 'Open Sans', Arial, Helvetica, sans-serif;
147 147 }
148 148  
149   -#menu-spb.collapse{
150   - padding-left: 0;
151   -}
152   -
153 149 #menu-spb > li > a{
154 150 padding: 5px 15px 5px 5px;
155 151 }
... ... @@ -173,8 +169,8 @@
173 169 background: none;
174 170 }
175 171  
176   -.navbar-header.nav-spb .navbar-toggle{
177   - padding: 7px 10px;
  172 +#quick-links{
  173 + padding-right: 10px
178 174 }
179 175  
180 176 #quick-links > li > a{
... ... @@ -199,7 +195,7 @@
199 195 margin: auto;
200 196 }
201 197  
202   -.navbar-header.nav-spb .navbar-toggle{
  198 +.navbar-header.logo .navbar-toggle{
203 199 float: left;
204 200 margin: 0;
205 201 }
... ...
colab/static/css/screen.css
  Diff comments   View file @1e41fe2
... ... @@ -452,8 +452,3 @@ span.highlighted {
452 452 .chart > p > label {
453 453 margin: 0 2px;
454 454 }
455   -
456   -.row {
457   - margin-left: 0;
458   - margin-right: 0;
459   -}
... ...
colab/static/img/brasil.png
View file @1e41fe2

14 KB | W: | H:

6.53 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
colab/templates/base.html
  Diff comments   View file @1e41fe2
1 1 <!DOCTYPE html>
2   -{% load i18n browserid conversejs gravatar proxy %}
  2 +{% load i18n %}
3 3 {% load static from staticfiles %}
4 4  
5 5 <html>
... ... @@ -23,15 +23,6 @@
23 23 href="{% static 'third-party/font-awesome/css/font-awesome.min.css' %}"
24 24 type="text/css" media="screen" />
25 25  
26   - {% if ribbon %}
27   - <!-- Fork me Ribbons -->
28   - <link rel="stylesheet" href="{% static 'third-party/ribbon/gh-fork-ribbon.css' %}">
29   - <!--[if lt IE 9]>
30   - <link rel="stylesheet" href="{% static 'third-party/ribbon/gh-fork-ribbon.ie.css' %}">
31   - <![endif]-->
32   - {% endif %}
33   -
34   -
35 26 <!-- JQuery 2+ won't work for IE < 9 -->
36 27 <script type="text/javascript" src="{% static 'third-party/jquery-2.0.3.min.js' %}"></script>
37 28 <script type="text/javascript" src="{% static 'third-party/jquery.debouncedresize.js' %}"></script>
... ... @@ -43,10 +34,6 @@
43 34 {% block head_js %}{% endblock %}
44 35 {% block head_css %}{% endblock %}
45 36  
46   - {% if not is_mobile %}
47   - {% conversejs_static %}
48   - {% endif %}
49   -
50 37 <link rel="stylesheet" href="{% static 'css/screen.css' %}"
51 38 type="text/css" media="screen" />
52 39  
... ... @@ -55,20 +42,6 @@
55 42  
56 43 <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
57 44 <body data-no-turbolink>
58   - {% if BROWSERID_ENABLED %}
59   - {% browserid_info %}
60   - {% endif %}
61   -
62   - {% block ribbon %}
63   - {% if ribbon %}
64   - <div class="github-fork-ribbon-wrapper left-bottom">
65   - <div class="github-fork-ribbon">
66   - <a href="{{ ribbon.url }}">{{ ribbon.text }}</a>
67   - </div>
68   - </div>
69   - {% endif %}
70   - {% endblock %}
71   -
72 45 {% block navbar %}
73 46  
74 47 {% include "header.html" %}
... ... @@ -107,19 +80,8 @@
107 80  
108 81 {% endblock %}
109 82  
110   - {% if not is_mobile %}
111   - {% conversejs_chatpanel %}
112   - {% conversejs_initialize %}
113   - {% endif %}
114   -
115 83 {% include "tz/set_utc_offset.html" %}
116 84  
117   - {% if BROWSERID_ENABLED %}
118   - <script src="https://login.persona.org/include.js"></script>
119   - <script src="{% static 'browserid/api.js' %}"></script>
120   - <script src="{% static 'browserid/browserid.js' %}"></script>
121   - {% endif %}
122   -
123 85 {% block footer_js %}{% endblock %}
124 86 </body>
125 87 </html>
... ...
colab/templates/footer.html
  Diff comments   View file @1e41fe2
1   -{% load i18n browserid conversejs gravatar proxy %}
  1 +{% load i18n %}
2 2 {% load static from staticfiles %}
3 3  
4 4 <footer>
5   - <div id="go-top" class="container">
6   - <a class="pull-right" href="#header"><i class="icon-chevron-up"></i>Voltar ao topo</a>
7   - </div><!-- end of go-top -->
8   - <div id="footer-content">
  5 +<div class="row">
  6 + <div class="container">
  7 + <div class="pull-right go-top">
  8 + <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>Voltar ao topo</a>
  9 + </div>
  10 + </div><!-- end go-top -->
  11 + <div class="col-lg-12 offset footer-content">
9 12 <div class="container">
10 13 <div class="row">
11   - <dl class="col-md-3 footer-links">
12   - <dt>{% trans "Topics" %}</dt>
13   - <dd><a href="/social/spb/o-que-e-o-software-publico" title="SPB">{% trans "SPB" %}</a></dd>
14   - <dd><a href="http://pagina.softwarepublico.gov.br/sisp" title="SISP-SPB">{% trans "SISP-SPB" %}</a></dd>
15   - <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/avaliaspb/wiki/Sobre" title="AvaliaSPB">{% trans "AvaliaSPB" %}</a></dd>
16   - <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">{% trans "4CMBr" %}</a></dd>
17   - <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/xowiki/" title="5cQualiBr" href="#">{% trans "5cQualiBr" %}</a></dd>
  14 + <dl class="col-md-2 col-md-offset-1 footer-links">
  15 + <dt>Assuntos</dt>
  16 + <dd><a href="/social/spb/publique-seu-software" title="Publique seu software">Publique seu software</a></dd>
  17 + <dd><a href="http://www.softwarepublico.gov.br/mpv/" title="Prestadores de serviço">Prestadores de serviço</a></dd>
  18 + <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="Espaço dos municípios">Espaço dos municípios</a></dd>
18 19 </dl>
19   - <dl class="col-md-3 footer-links">
20   - <dt>{% trans "Services" %}</dt>
21   - <dd class="portalservicos-item">
22   - <a title="Perguntas frequentes" href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
  20 + <dl class="col-md-2 footer-links">
  21 + <dt>Software Público</dt>
  22 + <dd class="portalspb-item">
  23 + <a title="Entenda o que é" href="/social/spb/entenda-o-que-e">Entenda o que é</a>
  24 + </dd>
  25 + <dd class="portalspb-item">
  26 + <a title="Eventos" href="/social/profile/spb/events">Eventos</a>
23 27 </dd>
24   - <dd class="portalservicos-item">
25   - <a title="Contato" href="/social/spb/contato">{% trans "Contact" %}</a>
  28 + <dd class="portalspb-item">
  29 + <a title="Prêmios" href="/social/spb/premios">Prêmios</a>
26 30 </dd>
  31 + <dd class="portalspb-item">
  32 + <a title="Publicações" href="/social/spb/publicacoes">Publicações</a>
  33 + </dd>
  34 + </dl>
  35 + <dl class="col-md-2 footer-links">
  36 + <dt>Serviços</dt>
  37 + <dd>
  38 + <a href="/social/spb/ajuda#faq" title="FAQ">FAQ</a>
  39 + </dd>
  40 + <dd>
  41 + <a href="/social/spb/contato" title="Contato">Contato</a>
  42 + </dd>
  43 + <dd>
  44 + <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" title="Relatar erros">Relatar erros</a>
  45 + </dd>
27 46 </dl>
28   - <dl class="col-md-3 footer-links">
  47 + <dl class="col-md-2 footer-links">
29 48 <dt>RSS</dt>
30   - <dd><a href="#" title="O que é?">{% trans "What is it?" %}</a></dd>
31   - <dd><a href="#" title="Assine">{% trans "Subscribe" %}</a></dd>
  49 + <dd><a href="#" title="O que é?">O que é</a></dd>
  50 + <dd><a href="#" title="Assine">Assine</a></dd>
32 51 </dl>
33   - <dl class="col-md-3 footer-links">
34   - <dt>{% trans "Navigation" %}</dt>
35   - <dd><a href="#">{% trans "Accessibility" %}</a></dd>
36   - <dd><a href="/social/spb/mapa-do-site">{% trans "Site map" %}</a></dd>
37   - <dd><a href="#">Versão em Português</a></dd>
  52 + <dl class="col-md-2 footer-links">
  53 + <dt>Navegação</dt>
  54 + <dd><a href="#">Acessibilidade</a></dd>
  55 + <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd>
38 56 </dl>
39 57 </div>
40 58 </div>
41   - </div><!-- end of footer-links -->
42   - <div id="footer-gov">
  59 + </div><!-- end footer-content -->
  60 + <div class="row footer-gov">
43 61 <div class="container">
44   - <div class="row">
45   - <div class="col-md-7">
46   - <a id="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="../img/acesso-a-informacao.png" ><span>Acesso a Informação</span></a>
47   - </div>
48   - <div class="col-md-5 institucionais">
49   - <div class="pull-right">
50   - <a id="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank">
51   - <img class="img-responsive" src="../img/sgpr.png" >
52   - <span>{% trans "Republic Presidency General Secretary" %}</span>
53   - </a>
54   - <a id="logo-brasil" href="http://www.brasil.gov.br/" target="_blank">
55   - <img class="img-responsive" src="../img/brasil.png" >
56   - <span>{% trans "Brazil - Federal Government" %}</span>
57   - </a>
58   - </div>
59   - </div>
  62 + <div class="col-md-7">
  63 + <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="{% static 'img/acesso-a-informacao.png' %}" ><span>Acesso a Informação</span></a>
  64 + </div>
  65 + <div class="col-md-5 institucionais">
  66 + <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>Brasil - Governo Federal</span></a>
  67 + <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>Secretaria-geral da Presidência da República</span></a>
60 68 </div>
61 69 </div>
62   - </div><!-- end of footer-gov -->
63   - <div id="spb-definitions">
  70 + </div><!-- end footer-gov -->
  71 + <div class="row spb-definitions">
64 72 <div class="container">
65   - <div id="about-pspb">{% trans "This is a BETA version and it's hosted at University of Brasilia" %}</div>
66   - <div id="about-noosfero">{% trans "This site makes use of the social network platform" %} <a href="http://noosfero.org/">Noosfero</a>, {% trans "licensed under" %}<a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> {% trans "version 3 or above" %}.
67   - </div><!-- end id="about-noosfero" -->
  73 + <div id="about-pspb">Essa versão é BETA e está hospedada na Universidade de Brasília</div>
  74 + <div id="about-noosfero">Este site utiliza a plataforma para redes sociais <a href="http://noosfero.org/">Noosfero</a>, licenciado sob a <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> versão 3 ou superior.
  75 + </div>
68 76 </div>
69   - </div><!-- end of spb-definitions -->
  77 + </div><!-- end spb-definitions -->
70 78 </footer>
... ...
colab/templates/header.html
  Diff comments   View file @1e41fe2
1   -{% load i18n browserid conversejs gravatar proxy %}
  1 +{% load i18n gravatar proxy %}
2 2 {% load static from staticfiles %}
3 3  
4 4 <header>
5 5 <div class="navbar navbar-static-top">
6   - <!-- begin barra-brasil -->
7   - <div id="barra-brasil">
8   - <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">{% trans "Brazilian Government Portal" %}</a>
9   - </div>
10   - <script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
11   - <!-- end of barra-brasil -->
  6 +<!-- begin of barra-brasil -->
  7 +<div id="barra-brasil">
  8 + <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a>
  9 +</div>
  10 +<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
  11 +<!-- end of barra-brasil -->
12 12 <div id="first-nav">
13 13 <div class="container">
14 14 <div class="row">
15 15 <div class="col-md-12">
16 16 <ul id="accessibility" class="nav navbar-nav hidden-xs hidden-sm">
17 17 <li>
18   - <a id="link-conteudo" href="#main-content" accesskey="1">{% trans "Go to content" %} <span class="label label-primary">1</span></a>
  18 + <a id="link-conteudo" href="#main-content" accesskey="1">Ir para o conteúdo <span class="label label-primary">1</span></a>
19 19 </li>
20 20 <li>
21   - <a id="link-navegacao" href="#menu-spb" accesskey="2">{% trans "Go to menu" %} <span class="label label-primary">2</span></a>
  21 + <a id="link-navegacao" href="#menu-spb" accesskey="2">Ir para o menu <span class="label label-primary">2</span></a>
22 22 </li>
23   - <li> <a id="link-buscar" accesskey="3" href="#header-searchbox" title="Go to search">{% trans "Go to search" %} <span class="label label-primary">3</span></a>
  23 + <li> <a id="link-buscar" accesskey="3" href="#header-searchbox" title="Go to search">Ir para a busca <span class="label label-primary">3</span></a>
24 24 </li>
25 25 <li>
26   - <a id="link-rodape" href="#link-top" accesskey="4">{% trans "Go to bottom" %} <span class="label label-primary">4</span></a>
  26 + <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
27 27 </li>
28 28 </ul> <!-- end of accesskeys -->
29 29 <ul id="portal-siteactions" class="nav navbar-nav navbar-right">
30 30 <li id="siteaction-accessibility">
31   - <a href="/software-publico-brasileiro/acessibilidade"><span>{% trans "Accessibility" %}</span></a>
  31 + <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>
32 32 </li>
33 33 <li id="siteaction-contraste">
34   - <a href="#"><span>{% trans "High contrast" %}</span></a>
  34 + <a href="#"><span>Alto Contraste</span></a>
35 35 </li>
36 36 <li id="siteaction-mapadosite">
37   - <a href="/social/spb/mapa-do-site"><span>{% trans "Site map" %}</span></a>
  37 + <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
38 38 </li>
39 39 <!-- begin of user-menu -->
40 40 {% if not user.is_authenticated %}
41 41 <li class="dropdown hidden-xs hidden-lg">
42   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Access" %} <b class="caret"></b></a>
  42 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
43 43 <ul class="dropdown-menu">
44 44 {% trans 'Login' as login_text %}
45   - {% if BROWSERID_ENABLED %}
46   - <li>{% browserid_login text=login_text %}</li>
47   - {% else %}
48 45 <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
49 46 <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
50   - {% endif %}
51 47 </ul>
52 48 </li>
53 49 {% trans 'Login' as login_text %}
54   - {% if BROWSERID_ENABLED %}
55   - <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
56   - {% else %}
57 50 <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
58 51 <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
59   - {% endif %}
60 52 {% else %}
61 53 <li id="user-menu" class="dropdown">
62 54 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -71,10 +63,7 @@
71 63 <div>
72 64 <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
73 65 {% trans 'Logout' as logout_text %}
74   - {% if BROWSERID_ENABLED %}
75   - {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
76   - {% else %}
77   - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a> {% endif %}
  66 + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
78 67 </div>
79 68 </div>
80 69 </li>
... ... @@ -110,37 +99,38 @@
110 99 </div><!-- end of first-nav -->
111 100 <div id="second-nav">
112 101 <div class="container">
113   - <ul id="quick-links-sm" class="hidden-md hidden-lg">
114   - <li id="link-faq">
115   - <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
116   - </li>
117   - <li id="link-contact">
118   - <a href="/social/spb/contato">{% trans "Contact" %}</a>
119   - </li>
120   - </ul>
121   - <div class="navbar-header nav-spb">
122   - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
123   - <span class="icon-bar"></span>
124   - <span class="icon-bar"></span>
125   - <span class="icon-bar"></span>
126   - </button>
  102 + <div class="row">
  103 + <ul id="quick-links-sm" class="hidden-md hidden-lg">
  104 + <li id="link-faq">
  105 + <a href="/social/spb/ajuda">FAQ</a>
  106 + </li>
  107 + <li id="link-contact">
  108 + <a href="/social/spb/contato">Contato</a>
  109 + </li>
  110 + </ul>
  111 + <div class="navbar-header logo">
  112 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
  113 + <span class="icon-bar"></span>
  114 + <span class="icon-bar"></span>
  115 + <span class="icon-bar"></span>
  116 + </button>
  117 + </div>
  118 + <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
  119 + <li>
  120 + <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
  121 + </li>
  122 + {% proxy_menu %}
  123 + </ul>
  124 + <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
  125 + <li id="link-faq">
  126 + <a href="/social/spb/ajuda">Perguntas Frequentes</a>
  127 + </li>
  128 + <li id="link-contact">
  129 + <a href="/social/spb/contato">Contato</a>
  130 + </li>
  131 + </ul>
127 132 </div>
128   - <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
129   - <li>
130   - <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
131   - </li>
132   - {% proxy_menu %}
133   - </ul>
134   - <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
135   - <li id="link-faq">
136   - <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
137   - </li>
138   - <li id="link-contact">
139   - <a href="/social/spb/contato">{% trans "Contact" %}</a>
140   - </li>
141   - </ul>
142 133 </div>
143 134 </div>
144 135 </div>
145 136 </header>
146   -
... ...