Download as
Browse Code »

Commit 12711b6ec4a27d02482764752675bc6fa6608f18

Authored by David Silva
2 parents f9886d76 767785fd
Exists in master and in 16 other branches add_you_are_here_breadcrumbs_label, backup_not_prod, button_suspension_points_remove, disable_email_dev, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_models_translations, fix_no_license, fix_validations_and_tests, header_fix, margin_fix, remove_secondary_email_from_user, sisp_dev_master, software_catalog_style_fix, thread_dropdown

Merge branch 'sisp_rebased_master' into 'master' 

Sisp rebased master

See merge request !114
Showing 15 changed files with 555 additions and 290 deletions   Show diff stats
cookbooks/colab/templates/00-custom_settings.py.erb
  Diff comments   View file @12711b6
... ... @@ -28,6 +28,9 @@ SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
28 28  
29 29 SITE_URL = "<%= node['config']['site_url'] %>"
30 30  
  31 +SPB_HOST = "<%= node['config']['external_hostname'] %>"
  32 +SISP_HOST = "<%= node['config']['sisp_external_hostname'] %>"
  33 +
31 34 ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>",
32 35 "<%= node['config']['sisp_external_hostname'] %>"]
33 36  
... ...
cookbooks/colab/templates/spb.py.erb
  Diff comments   View file @12711b6
... ... @@ -5,6 +5,7 @@ name = &quot;colab_spb&quot;
5 5 verbose_name = "SPB Plugin"
6 6  
7 7 middlewares = ['colab_spb.middleware.ForceLangMiddleware']
  8 +context_processors = ['colab_spb.context_processors.multiportal_url']
8 9  
9 10 urls = {
10 11 "include":"colab_spb.urls",
... ...
src/colab-spb-plugin/setup.py
  Diff comments   View file @12711b6
... ... @@ -15,7 +15,7 @@ version = open(&#39;VERSION&#39;).read().strip()
15 15  
16 16 setup(
17 17 name='colab-spb-plugin',
18   - version='0.2.3',
  18 + version='0.2.5',
19 19 author='Macartur Sousa',
20 20 author_email='macartur.sc@gmail.com',
21 21 url='https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-plugin/',
... ...
src/colab-spb-plugin/src/colab_spb/context_processors.py 0 → 100644
  Diff comments   View file @12711b6
... ... @@ -0,0 +1,6 @@
  1 +from django.conf import settings
  2 +
  3 +
  4 +def multiportal_url(request):
  5 + return {'SISP_HOST': getattr(settings, 'SISP_HOST', False),
  6 + 'SPB_HOST': getattr(settings, 'SPB_HOST', False),}
... ...
src/colab-spb-theme-plugin/Makefile
  Diff comments   View file @12711b6
1 1 PACKAGE = colab-spb-theme
2   -VERSION = 0.3.4
  2 +VERSION = 0.3.6
3 3 DISTDIR = dist
4 4 PACKAGE_NAME = $(PACKAGE)-$(VERSION)
5 5 TARBALL = $(PACKAGE_NAME).tar.gz
... ...
src/colab-spb-theme-plugin/colab_spb_theme/static/css/header.css
  Diff comments   View file @12711b6
... ... @@ -408,3 +408,27 @@ header .thumbnail {
408 408 min-width: 80px;
409 409 max-width: 80px;
410 410 }
  411 +
  412 +header #spb-header-quick-access,
  413 +header #sisp-header-quick-access {
  414 + border-bottom: 1px solid #d9dbde;
  415 + padding-bottom: 18px;
  416 +}
  417 +
  418 +header #spb-header-quick-access p,
  419 +header #sisp-header-quick-access p {
  420 + color: #54606d;
  421 + font-size: 11px;
  422 + margin-top:-8px;
  423 +}
  424 +
  425 +header #spb-header-quick-access a,
  426 +header #sisp-header-quick-access a {
  427 + color: #2C65CD;
  428 + font-weight: bold;
  429 +}
  430 +
  431 +header #spb-header-content,
  432 +header #sisp-header-content {
  433 + padding-top: 13px;
  434 +}
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/footer.html
  Diff comments   View file @12711b6
1   -{% load i18n %}
2   -{% load static from staticfiles %}
3   -
4   -<footer>
5   - <div id="btn-top" class="container">
6   - <div class="pull-right go-top">
7   - <a id="link-top" href="#link-rodape">Voltar para o topo</a>
8   - </div>
9   - </div>
10   - <div id="footer" role="contentinfo">
11   - <a name="afooter" id="afooter"></a>
12   - <div id="doormat-container" class="columns-4">
13   - <div class="doormatColumn column-0">
14   - <dl class="doormatSection">
15   - <dt class="doormatSectionHeader">Assuntos</dt>
16   - <dd class="doormatSectionBody">
17   - <a href="/social/spb/publique-seu-software" class="external-link">Publique seu software</a>
18   - </dd>
19   - <dd class="doormatSectionBody">
20   - <a href="http://antigo.softwarepublico.gov.br/mpv/" class="external-link">Prestadores de serviço</a>
21   - </dd>
22   - <dd class="doormatSectionBody">
23   - <a href="http://antigo.softwarepublico.gov.br/4cmbr/xowiki/Principal" class="external-link">Espaços dos municípios</a>
24   - </dd>
25   - </dl>
26   - </div>
27   - <div class="doormatColumn column-1">
28   - <dl class="doormatSection">
29   - <dt class="doormatSectionHeader">Software Público</dt>
30   - <dd class="doormatSectionBody">
31   - <a href="/social/spb/entenda-o-que-e" class="external-link">Entenda o que é</a>
32   - </dd>
33   - <dd class="doormatSectionBody">
34   - <a href="/social/profile/spb/events" class="external-link">Eventos</a>
35   - </dd>
36   - <dd class="doormatSectionBody">
37   - <a href="/social/spb/premios" class="external-link">Prêmios</a>
38   - </dd>
39   - <dd class="doormatSectionBody">
40   - <a href="/social/spb/publicacoes" class="external-link">Publicações</a>
41   - </dd>
42   - </dl>
43   - </div>
44   - <div class="doormatColumn column-2">
45   - <dl class="doormatSection">
46   - <dt class="doormatSectionHeader">Serviços</dt>
47   - <dd class="doormatSectionBody">
48   - <a href="/social/spb/ajuda#faq" class="external-link">FAQ</a>
49   - </dd>
50   - <dd class="doormatSectionBody">
51   - <a href="/social/spb/contato" class="external-link">Contato</a>
52   - </dd>
53   - <dd class="doormatSectionBody">
54   - <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" class="external-link">Relatar erros</a>
55   - </dd>
56   - </dl>
57   - </div>
58   - <div class="doormatColumn column-3">
59   - <dl class="doormatSection">
60   - <dt class="doormatSectionHeader">RSS</dt>
61   - <dd class="doormatSectionBody">
62   - <a href="/social/spb/rss/o-que-e" class="external-link">O que é?</a>
63   - </dd>
64   - <dd class="doormatSectionBody">
65   - <a href="/rss/colab/latest" class="external-link">Assine</a>
66   - </dd>
67   - </dl>
68   - <dl class="doormatSection">
69   - <dt class="doormatSectionHeader">Navegação</dt>
70   - <dd class="doormatSectionBody">
71   - <a href="/social/spb/acessibilidade" class="external-link">Acessibilidade</a>
72   - </dd>
73   - <dd class="doormatSectionBody">
74   - <a href="/social/spb/mapa-do-site" class="external-link">Mapa do site</a>
75   - </dd>
76   - </dl>
77   - </div>
78   - </div>
79   - <div class="clear"></div>
80   - <!-- <div id="footer-brasil" class="footer-logos">
81   - <div>
82   - <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso">
83   - <img src="{% static 'img/acesso-a-informacao.png' %}" alt="Acesso a Informação"></a>
84   - <a href="http://www.brasil.gov.br/" class="logo-brasil">
85   - <img src="{% static 'img/brasil.png' %}" alt="Brasil - Governo Federal"></a>
86   - </div>
87   - </div> -->
88   - <div class="footer-logos">
89   -
90   -
91   - <div>
92   -
93   - <a href="http://www.acessoainformacao.gov.br/">
94   - <span class="logo-acesso-footer"></span>
95   - </a>
96   -
97   -
98   - <a href="http://www.brasil.gov.br/">
99   - <span class="logo-brasil-footer"></span>
100   - </a>
101   -
102   -
103   - </div>
104   -
105   - </div>
106   - </div>
107   - <div id="extra-footer">
108   - <p>
109   - Desenvolvido com os projetos de software livre
110   - <a href="http://github.com/colab/colab">Colab</a>,
111   - <a href="http://gitlab.com">Gitlab</a>,
112   - <a href="http://www.gnu.org/software/mailman/">Mailman</a> e
113   - <a href="http://noosfero.org">Noosfero</a>
114   - </p>
115   - </div>
116   -</footer>
  1 +{% if SISP_HOST in request.META.HTTP_HOST|stringformat:"s" %}
  2 + {% include 'footer_sisp.html' %}
  3 +{% else %}
  4 + {% include 'footer_spb.html' %}
  5 +{% endif %}
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/footer_sisp.html 0 → 100644
  Diff comments   View file @12711b6
... ... @@ -0,0 +1,111 @@
  1 +{% load i18n %}
  2 +{% load static from staticfiles %}
  3 +
  4 +<footer>
  5 + <div id="btn-top" class="container">
  6 + <div class="pull-right go-top">
  7 + <a id="link-top" href="#link-rodape">Voltar para o topo</a>
  8 + </div>
  9 + </div>
  10 + <div id="footer" role="contentinfo">
  11 + <a name="afooter" id="afooter"></a>
  12 + <div id="doormat-container" class="columns-4">
  13 + <div class="doormatColumn column-0">
  14 + <dl class="doormatSection">
  15 + <dt class="doormatSectionHeader">Assuntos</dt>
  16 + <dd class="doormatSectionBody">
  17 + <a href="/social/sisp/publique-seu-software" class="external-link">Publique seu software</a>
  18 + </dd>
  19 + <!--
  20 + <dd class="doormatSectionBody">
  21 + <a href="http://antigo.softwarepublico.gov.br/mpv/" class="external-link">Prestadores de serviço</a>
  22 + </dd>
  23 + -->
  24 + </dl>
  25 + </div>
  26 + <div class="doormatColumn column-1">
  27 + <dl class="doormatSection">
  28 + <dt class="doormatSectionHeader">Portal do SISP</dt>
  29 + <dd class="doormatSectionBody">
  30 + <a href="/social/sisp/entenda-o-que-e" class="external-link">Entenda o que é</a>
  31 + </dd>
  32 + <!--
  33 + <dd class="doormatSectionBody">
  34 + <a href="/social/profile/sisp/events" class="external-link">Eventos</a>
  35 + </dd>
  36 + -->
  37 + </dl>
  38 + </div>
  39 + <div class="doormatColumn column-2">
  40 + <dl class="doormatSection">
  41 + <dt class="doormatSectionHeader">Serviços</dt>
  42 + <dd class="doormatSectionBody">
  43 + <a href="/social/sisp/ajuda#faq" class="external-link">FAQ</a>
  44 + </dd>
  45 + <dd class="doormatSectionBody">
  46 + <a href="/social/sisp/contato" class="external-link">Contato</a>
  47 + </dd>
  48 + <!--
  49 + <dd class="doormatSectionBody">
  50 + <a href="/archives/thread/sisp-usuarios/relatar-erros#msg-1635" class="external-link">Relatar erros</a>
  51 + </dd>
  52 + -->
  53 + </dl>
  54 + </div>
  55 + <div class="doormatColumn column-3">
  56 + <dl class="doormatSection">
  57 + <dt class="doormatSectionHeader">RSS</dt>
  58 + <dd class="doormatSectionBody">
  59 + <a href="/social/sisp/rss/o-que-e" class="external-link">O que é?</a>
  60 + </dd>
  61 + <dd class="doormatSectionBody">
  62 + <a href="/rss/colab/latest" class="external-link">Assine</a>
  63 + </dd>
  64 + </dl>
  65 + <dl class="doormatSection">
  66 + <dt class="doormatSectionHeader">Navegação</dt>
  67 + <dd class="doormatSectionBody">
  68 + <a href="/social/sisp/acessibilidade" class="external-link">Acessibilidade</a>
  69 + </dd>
  70 + <dd class="doormatSectionBody">
  71 + <a href="/social/sisp/mapa-do-site" class="external-link">Mapa do site</a>
  72 + </dd>
  73 + </dl>
  74 + </div>
  75 + </div>
  76 + <div class="clear"></div>
  77 + <!-- <div id="footer-brasil" class="footer-logos">
  78 + <div>
  79 + <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso">
  80 + <img src="{% static 'img/acesso-a-informacao.png' %}" alt="Acesso a Informação"></a>
  81 + <a href="http://www.brasil.gov.br/" class="logo-brasil">
  82 + <img src="{% static 'img/brasil.png' %}" alt="Brasil - Governo Federal"></a>
  83 + </div>
  84 + </div> -->
  85 + <div class="footer-logos">
  86 +
  87 +
  88 + <div>
  89 +
  90 + <a href="http://www.acessoainformacao.gov.br/">
  91 + <span class="logo-acesso-footer"></span>
  92 + </a>
  93 +
  94 +
  95 + <a href="http://www.brasil.gov.br/">
  96 + <span class="logo-brasil-footer"></span>
  97 + </a>
  98 +
  99 +
  100 + </div>
  101 +
  102 + </div>
  103 + </div>
  104 + <div id="extra-footer">
  105 + <p>
  106 + Desenvolvido com os projetos de software livre
  107 + <a href="http://github.com/colab/colab">Colab</a> e
  108 + <a href="http://noosfero.org">Noosfero</a>
  109 + </p>
  110 + </div>
  111 +</footer>
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/footer_spb.html 0 → 100644
  Diff comments   View file @12711b6
... ... @@ -0,0 +1,116 @@
  1 +{% load i18n %}
  2 +{% load static from staticfiles %}
  3 +
  4 +<footer>
  5 + <div id="btn-top" class="container">
  6 + <div class="pull-right go-top">
  7 + <a id="link-top" href="#link-rodape">Voltar para o topo</a>
  8 + </div>
  9 + </div>
  10 + <div id="footer" role="contentinfo">
  11 + <a name="afooter" id="afooter"></a>
  12 + <div id="doormat-container" class="columns-4">
  13 + <div class="doormatColumn column-0">
  14 + <dl class="doormatSection">
  15 + <dt class="doormatSectionHeader">Assuntos</dt>
  16 + <dd class="doormatSectionBody">
  17 + <a href="/social/spb/publique-seu-software" class="external-link">Publique seu software</a>
  18 + </dd>
  19 + <dd class="doormatSectionBody">
  20 + <a href="http://antigo.softwarepublico.gov.br/mpv/" class="external-link">Prestadores de serviço</a>
  21 + </dd>
  22 + <dd class="doormatSectionBody">
  23 + <a href="http://antigo.softwarepublico.gov.br/4cmbr/xowiki/Principal" class="external-link">Espaços dos municípios</a>
  24 + </dd>
  25 + </dl>
  26 + </div>
  27 + <div class="doormatColumn column-1">
  28 + <dl class="doormatSection">
  29 + <dt class="doormatSectionHeader">Software Público</dt>
  30 + <dd class="doormatSectionBody">
  31 + <a href="/social/spb/entenda-o-que-e" class="external-link">Entenda o que é</a>
  32 + </dd>
  33 + <dd class="doormatSectionBody">
  34 + <a href="/social/profile/spb/events" class="external-link">Eventos</a>
  35 + </dd>
  36 + <dd class="doormatSectionBody">
  37 + <a href="/social/spb/premios" class="external-link">Prêmios</a>
  38 + </dd>
  39 + <dd class="doormatSectionBody">
  40 + <a href="/social/spb/publicacoes" class="external-link">Publicações</a>
  41 + </dd>
  42 + </dl>
  43 + </div>
  44 + <div class="doormatColumn column-2">
  45 + <dl class="doormatSection">
  46 + <dt class="doormatSectionHeader">Serviços</dt>
  47 + <dd class="doormatSectionBody">
  48 + <a href="/social/spb/ajuda#faq" class="external-link">FAQ</a>
  49 + </dd>
  50 + <dd class="doormatSectionBody">
  51 + <a href="/social/spb/contato" class="external-link">Contato</a>
  52 + </dd>
  53 + <dd class="doormatSectionBody">
  54 + <a href="/archives/thread/spb-usuarios/relatar-erros#msg-1635" class="external-link">Relatar erros</a>
  55 + </dd>
  56 + </dl>
  57 + </div>
  58 + <div class="doormatColumn column-3">
  59 + <dl class="doormatSection">
  60 + <dt class="doormatSectionHeader">RSS</dt>
  61 + <dd class="doormatSectionBody">
  62 + <a href="/social/spb/rss/o-que-e" class="external-link">O que é?</a>
  63 + </dd>
  64 + <dd class="doormatSectionBody">
  65 + <a href="/rss/colab/latest" class="external-link">Assine</a>
  66 + </dd>
  67 + </dl>
  68 + <dl class="doormatSection">
  69 + <dt class="doormatSectionHeader">Navegação</dt>
  70 + <dd class="doormatSectionBody">
  71 + <a href="/social/spb/acessibilidade" class="external-link">Acessibilidade</a>
  72 + </dd>
  73 + <dd class="doormatSectionBody">
  74 + <a href="/social/spb/mapa-do-site" class="external-link">Mapa do site</a>
  75 + </dd>
  76 + </dl>
  77 + </div>
  78 + </div>
  79 + <div class="clear"></div>
  80 + <!-- <div id="footer-brasil" class="footer-logos">
  81 + <div>
  82 + <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso">
  83 + <img src="{% static 'img/acesso-a-informacao.png' %}" alt="Acesso a Informação"></a>
  84 + <a href="http://www.brasil.gov.br/" class="logo-brasil">
  85 + <img src="{% static 'img/brasil.png' %}" alt="Brasil - Governo Federal"></a>
  86 + </div>
  87 + </div> -->
  88 + <div class="footer-logos">
  89 +
  90 +
  91 + <div>
  92 +
  93 + <a href="http://www.acessoainformacao.gov.br/">
  94 + <span class="logo-acesso-footer"></span>
  95 + </a>
  96 +
  97 +
  98 + <a href="http://www.brasil.gov.br/">
  99 + <span class="logo-brasil-footer"></span>
  100 + </a>
  101 +
  102 +
  103 + </div>
  104 +
  105 + </div>
  106 + </div>
  107 + <div id="extra-footer">
  108 + <p>
  109 + Desenvolvido com os projetos de software livre
  110 + <a href="http://github.com/colab/colab">Colab</a>,
  111 + <a href="http://gitlab.com">Gitlab</a>,
  112 + <a href="http://www.gnu.org/software/mailman/">Mailman</a> e
  113 + <a href="http://noosfero.org">Noosfero</a>
  114 + </p>
  115 + </div>
  116 +</footer>
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/header.html
  Diff comments   View file @12711b6
1   -{% load i18n gravatar plugins %}
2   -{% load static from staticfiles %}
3   -
4   -<header>
5   -<div class="colab-style">
6   - <div id="barra-brasil">
7   - <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; ">Software Público Brasileiro</a>
8   - </div>
9   - <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
10   - <div id="header" role="banner">
11   - <div>
12   - <ul id="accessibility">
13   - <li>
14   - <a accesskey="1" href="#acontent" id="link-conteudo">
15   - Ir para o conteúdo
16   - <span>1</span>
17   - </a>
18   - </li>
19   - <li>
20   - <a accesskey="2" href="#sobre" id="link-navegacao">
21   - Ir para o menu
22   - <span>2</span>
23   - </a>
24   - </li>
25   - <li>
26   - <a accesskey="3" href="#nolivesearchGadget" id="link-buscar">
27   - Ir para a busca
28   - <span>3</span>
29   - </a>
30   - </li>
31   - <li class="last-item">
32   - <a accesskey="4" href="#afooter" id="link-rodape">
33   - Ir para o rodapé
34   - <span>4</span>
35   - </a>
36   - </li>
37   - </ul>
38   - <!-- <ul id="language">
39   - <li class="language-es">
40   - <a href="#">Espa&#241;ol</a>
41   - </li>
42   - <li class="language-en">
43   - <a href="#">English</a>
44   - </li>
45   - </ul>-->
46   - <div id="second-nav">
47   - <ul id="portal-siteactions">
48   - <li id="siteaction-accessibility">
49   - <a href="/social/spb/acessibilidade" title="Acessibilidade" accesskey="5">
50   - Acessibilidade
51   - </a>
52   - </li>
53   - <li id="siteaction-contraste">
54   - <a href="#" title="Alto Contraste" accesskey="6">
55   - Alto Contraste
56   - </a>
57   - </li>
58   - <li id="siteaction-mapadosite">
59   - <a href="/social/spb/mapa-do-site" title="Mapa do Site" accesskey="7">
60   - Mapa do Site
61   - </a>
62   - </li>
63   - </ul>
64   - <ul id="login-menu">
65   - {% if not user.is_authenticated %}
66   - <li class="login-item"><a href="{% url 'signup' %}">Cadastre-se</a></li>
67   - <li class="login-item last-item"><a href="{% url 'login' %}">Entrar</a></li>
68   - {% else %}
69   - <li id="user-menu" class="dropdown softwarepublico-item">
70   - <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email %} <b class="caret"></b>&nbsp;&nbsp;</a>
71   - <ul id="login-menu-box" class="dropdown-menu" role="menu">
72   - <li class="last-item">
73   - <div class="wrapper">
74   - <div class="thumbnail">{% gravatar user.email %}</div>
75   - <div class="user-info">
76   - <span><b>{{ user.get_full_name }}</b></span>
77   - <span class="quiet">{{ user.email }}</span>
78   - </div>
79   - <div>
80   - <a class="btn btn-default btn-spb-profile pull-left" href="{% url 'user_profile' user.username %}">Meu perfil</a>
81   - <a class="btn btn-default pull-right" href="{% url 'logout' %}">Sair</a>
82   - </div>
83   - </div>
84   - </li>
85   - </ul>
86   - </li>
87   - {% endif %}
88   - </ul>
89   - </div>
90   - <div id="logo">
91   - <a id="portal-logo" title="" href="/">
92   - <span id="portal-title-1">Portal do</span>
93   - <h1 id="portal-title" class="corto">Software Público Brasileiro</h1>
94   - <span id="portal-description">MINISTÉRIO DO PLANEJAMENTO, ORÇAMENTO E GESTÃO</span>
95   - </a>
96   - </div>
97   - <div id="portal-searchbox">
98   - <form id="nolivesearchGadget_form" action="{% url 'haystack_search' %}">
99   - <fieldset class="LSBox"><legend class="hiddenStructure">Buscar no portal</legend>
100   - <label class="hiddenStructure" for="nolivesearchGadget">Buscar no portal</label>
101   - <input name="q" type="text" size="18" value="{{ request.GET.q }}" title="Buscar no portal" placeholder="Buscar no portal" class="searchField" id="nolivesearchGadget">
102   - <input name="order" value="latest" type="hidden">
103   - <input class="searchButton" type="submit" value="Buscar no portal">
104   - </fieldset>
105   - </form>
106   - </div>
107   - <div id="social-icons">
108   - <ul>
109   - <li id="portalredes-facebook" class="portalredes-item">
110   - <a href="#">Facebook</a>
111   - </li>
112   - <li id="portalredes-googleplus" class="portalredes-item">
113   - <a href="#">Google+</a>
114   - </li>
115   - <li id="portalredes-instagram" class="portalredes-item">
116   - <a href="#">Instagram</a>
117   - </li>
118   - <li id="portalredes-twitter" class="portalredes-item">
119   - <a href="#">Twitter</a>
120   - </li>
121   - <li id="portalredes-youtube" class="portalredes-item">
122   - <a href="#">YouTube</a>
123   - </li>
124   - <li id="portalredes-soundcloud" class="portalredes-item">
125   - <a href="#">SoundCloud</a>
126   - </li>
127   - <li id="portalredes-slideshare" class="portalredes-item">
128   - <a href="#">Slideshare</a>
129   - </li>
130   - <li id="portalredes-rss" class="portalredes-item last-item">
131   - <a href="#">RSS</a>
132   - </li>
133   - </ul>
134   - </div>
135   - </div>
136   - <div id="sobre">
137   - <ul>
138   - {% if not user.is_authenticated %}
139   - <li id="softwarepublico-groups" class="softwarepublico-item">
140   - <a href="{% url 'thread_list' %}" title="Listas de discussão">Listas de discussão</a>
141   - </li>
142   - {% else %}
143   - <li class="dropdown softwarepublico-item">
144   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Listas de discussão <b class="caret"></b></a>
145   - <ul class="dropdown-menu">
146   - <li><a href="{% url 'thread_list' %}">Acesse todas as listas</a></li>
147   - <li><a href="{% url 'user_list_subscriptions' user %}">Inscreva-se nas listas</a></li>
148   - </ul>
149   - </li>
150   - {% endif %}
151   - {% plugins_menu %}
152   - <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item">
153   - <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a>
154   - </li>
155   - <li id="softwarepublico-contato" class="softwarepublico-item">
156   - <a href="/social/spb/contato" title="Contato">Contato</a>
157   - </li>
158   - </ul>
159   - </div>
160   - </div>
161   -</div>
162   -</header>
163   -
164   -{% block main_content %}
165   - <a name="acontent" id="acontent"></a>
166   -{% endblock %}
  1 +{% if SISP_HOST in request.META.HTTP_HOST|stringformat:"s" %}
  2 + {% include 'header_sisp.html' with SPB_PORTAL='http://'|add:SPB_HOST %}
  3 +{% else %}
  4 + {% include 'header_spb.html' with SISP_PORTAL='http://'|add:SISP_HOST %}
  5 +{% endif %}
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/header_sisp.html 0 → 100644
  Diff comments   View file @12711b6
... ... @@ -0,0 +1,119 @@
  1 +{% load i18n gravatar plugins %}
  2 +{% load static from staticfiles %}
  3 +
  4 +<header>
  5 +<div class="colab-style">
  6 + <div id="barra-brasil">
  7 + <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; ">Software Público Brasileiro</a>
  8 + </div>
  9 + <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
  10 + <div id="header" role="banner">
  11 + <div id="sisp-header-quick-access">
  12 + <p class='pull-right'>Acesso rápido: <a href="{{ SPB_PORTAL }}">Software Público Brasileiro</a></p>
  13 + </div>
  14 + <div id="sisp-header-content">
  15 + <ul id="accessibility">
  16 + <li>
  17 + <a accesskey="1" href="#acontent" id="link-conteudo">
  18 + Ir para o conteúdo
  19 + <span>1</span>
  20 + </a>
  21 + </li>
  22 + <li>
  23 + <a accesskey="2" href="#sobre" id="link-navegacao">
  24 + Ir para o menu
  25 + <span>2</span>
  26 + </a>
  27 + </li>
  28 + <!-- <li>
  29 + <a accesskey="3" href="#nolivesearchGadget" id="link-buscar">
  30 + Ir para a busca
  31 + <span>3</span>
  32 + </a>
  33 + </li> -->
  34 + <li class="last-item">
  35 + <a accesskey="3" href="#afooter" id="link-rodape">
  36 + Ir para o rodapé
  37 + <span>3</span>
  38 + </a>
  39 + </li>
  40 + </ul>
  41 + <!-- <ul id="language">
  42 + <li class="language-es">
  43 + <a href="#">Espa&#241;ol</a>
  44 + </li>
  45 + <li class="language-en">
  46 + <a href="#">English</a>
  47 + </li>
  48 + </ul>-->
  49 + <div id="second-nav">
  50 + <ul id="portal-siteactions">
  51 + <li id="siteaction-accessibility">
  52 + <a href="/social/sisp/acessibilidade" title="Acessibilidade" accesskey="5">
  53 + Acessibilidade
  54 + </a>
  55 + </li>
  56 + <li id="siteaction-contraste">
  57 + <a href="#" title="Alto Contraste" accesskey="6">
  58 + Alto Contraste
  59 + </a>
  60 + </li>
  61 + <li id="siteaction-mapadosite">
  62 + <a href="/social/sisp/mapa-do-site" title="Mapa do Site" accesskey="7">
  63 + Mapa do Site
  64 + </a>
  65 + </li>
  66 + </ul>
  67 + </div>
  68 + <div id="logo">
  69 + <a id="portal-logo" title="" href="/">
  70 + <span id="portal-title-1">Portal do</span>
  71 + <h1 id="portal-title" class="corto">SISP</h1>
  72 + <span id="portal-description">MINISTÉRIO DO PLANEJAMENTO, ORÇAMENTO E GESTÃO</span>
  73 + </a>
  74 + </div>
  75 + <div id="social-icons">
  76 + <ul>
  77 + <li id="portalredes-facebook" class="portalredes-item">
  78 + <a href="#">Facebook</a>
  79 + </li>
  80 + <li id="portalredes-googleplus" class="portalredes-item">
  81 + <a href="#">Google+</a>
  82 + </li>
  83 + <li id="portalredes-instagram" class="portalredes-item">
  84 + <a href="#">Instagram</a>
  85 + </li>
  86 + <li id="portalredes-twitter" class="portalredes-item">
  87 + <a href="#">Twitter</a>
  88 + </li>
  89 + <li id="portalredes-youtube" class="portalredes-item">
  90 + <a href="#">YouTube</a>
  91 + </li>
  92 + <li id="portalredes-soundcloud" class="portalredes-item">
  93 + <a href="#">SoundCloud</a>
  94 + </li>
  95 + <li id="portalredes-slideshare" class="portalredes-item">
  96 + <a href="#">Slideshare</a>
  97 + </li>
  98 + <li id="portalredes-rss" class="portalredes-item last-item">
  99 + <a href="#">RSS</a>
  100 + </li>
  101 + </ul>
  102 + </div>
  103 + </div>
  104 + <div id="sobre">
  105 + <ul>
  106 + <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item">
  107 + <a href="/social/sisp/ajuda" title="Perguntas frequentes">Perguntas frequentes</a>
  108 + </li>
  109 + <li id="softwarepublico-contato" class="softwarepublico-item">
  110 + <a href="/social/sisp/contato" title="Contato">Contato</a>
  111 + </li>
  112 + </ul>
  113 + </div>
  114 + </div>
  115 +</div>
  116 +
  117 +{% block main_content %}
  118 + <a name="acontent" id="acontent"></a>
  119 +{% endblock %}
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/header_spb.html 0 → 100644
  Diff comments   View file @12711b6
... ... @@ -0,0 +1,157 @@
  1 +{% load i18n gravatar plugins %}
  2 +{% load static from staticfiles %}
  3 +
  4 +<header>
  5 +<div class="colab-style">
  6 + <div id="barra-brasil">
  7 + <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; ">Software Público Brasileiro</a>
  8 + </div>
  9 + <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
  10 + <div id="header" role="banner">
  11 + <div id="spb-header-quick-access">
  12 + <p class='pull-right'>Acesso rápido: <a href="{{ SISP_PORTAL }}">Portal do SISP</a></p>
  13 + </div>
  14 + <div id="spb-header-content">
  15 + <ul id="accessibility">
  16 + <li>
  17 + <a accesskey="1" href="#acontent" id="link-conteudo">
  18 + Ir para o conteúdo
  19 + <span>1</span>
  20 + </a>
  21 + </li>
  22 + <li>
  23 + <a accesskey="2" href="#sobre" id="link-navegacao">
  24 + Ir para o menu
  25 + <span>2</span>
  26 + </a>
  27 + </li>
  28 + <li>
  29 + <a accesskey="3" href="#nolivesearchGadget" id="link-buscar">
  30 + Ir para a busca
  31 + <span>3</span>
  32 + </a>
  33 + </li>
  34 + <li class="last-item">
  35 + <a accesskey="4" href="#afooter" id="link-rodape">
  36 + Ir para o rodapé
  37 + <span>4</span>
  38 + </a>
  39 + </li>
  40 + </ul>
  41 + <!-- <ul id="language">
  42 + <li class="language-es">
  43 + <a href="#">Espa&#241;ol</a>
  44 + </li>
  45 + <li class="language-en">
  46 + <a href="#">English</a>
  47 + </li>
  48 + </ul>-->
  49 + <div id="second-nav">
  50 + <ul id="portal-siteactions">
  51 + <li id="siteaction-accessibility">
  52 + <a href="/social/spb/acessibilidade" title="Acessibilidade" accesskey="5">
  53 + Acessibilidade
  54 + </a>
  55 + </li>
  56 + <li id="siteaction-contraste">
  57 + <a href="#" title="Alto Contraste" accesskey="6">
  58 + Alto Contraste
  59 + </a>
  60 + </li>
  61 + <li id="siteaction-mapadosite">
  62 + <a href="/social/spb/mapa-do-site" title="Mapa do Site" accesskey="7">
  63 + Mapa do Site
  64 + </a>
  65 + </li>
  66 + </ul>
  67 + <ul id="login-menu">
  68 + {% if not user.is_authenticated %}
  69 + <li class="login-item"><a href="{% url 'signup' %}">Cadastre-se</a></li>
  70 + <li class="login-item last-item"><a href="{% url 'login' %}">Entrar</a></li>
  71 + {% else %}
  72 + <li id="user-menu" class="dropdown softwarepublico-item">
  73 + <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email %} <b class="caret"></b>&nbsp;&nbsp;</a>
  74 + <ul id="login-menu-box" class="dropdown-menu" role="menu">
  75 + <li class="last-item">
  76 + <div class="wrapper">
  77 + <div class="thumbnail">{% gravatar user.email %}</div>
  78 + <div class="user-info">
  79 + <span><b>{{ user.get_full_name }}</b></span>
  80 + <span class="quiet">{{ user.email }}</span>
  81 + </div>
  82 + <div>
  83 + <a class="btn btn-default btn-spb-profile pull-left" href="{% url 'user_profile' user.username %}">Meu perfil</a>
  84 + <a class="btn btn-default pull-right" href="{% url 'logout' %}">Sair</a>
  85 + </div>
  86 + </div>
  87 + </li>
  88 + </ul>
  89 + </li>
  90 + {% endif %}
  91 + </ul>
  92 + </div>
  93 + <div id="logo">
  94 + <a id="portal-logo" title="" href="/">
  95 + <span id="portal-title-1">Portal do</span>
  96 + <h1 id="portal-title" class="corto">Software Público Brasileiro</h1>
  97 + <span id="portal-description">MINISTÉRIO DO PLANEJAMENTO, ORÇAMENTO E GESTÃO</span>
  98 + </a>
  99 + </div>
  100 + <div id="portal-searchbox">
  101 + <form id="nolivesearchGadget_form" action="{% url 'haystack_search' %}">
  102 + <fieldset class="LSBox"><legend class="hiddenStructure">Buscar no portal</legend>
  103 + <label class="hiddenStructure" for="nolivesearchGadget">Buscar no portal</label>
  104 + <input name="q" type="text" size="18" value="{{ request.GET.q }}" title="Buscar no portal" placeholder="Buscar no portal" class="searchField" id="nolivesearchGadget">
  105 + <input class="searchButton" type="submit" value="Buscar no portal">
  106 + </fieldset>
  107 + </form>
  108 + </div>
  109 + <div id="social-icons">
  110 + <ul>
  111 + <li id="portalredes-facebook" class="portalredes-item">
  112 + <a href="#">Facebook</a>
  113 + </li>
  114 + <li id="portalredes-googleplus" class="portalredes-item">
  115 + <a href="#">Google+</a>
  116 + </li>
  117 + <li id="portalredes-instagram" class="portalredes-item">
  118 + <a href="#">Instagram</a>
  119 + </li>
  120 + <li id="portalredes-twitter" class="portalredes-item">
  121 + <a href="#">Twitter</a>
  122 + </li>
  123 + <li id="portalredes-youtube" class="portalredes-item">
  124 + <a href="#">YouTube</a>
  125 + </li>
  126 + <li id="portalredes-soundcloud" class="portalredes-item">
  127 + <a href="#">SoundCloud</a>
  128 + </li>
  129 + <li id="portalredes-slideshare" class="portalredes-item">
  130 + <a href="#">Slideshare</a>
  131 + </li>
  132 + <li id="portalredes-rss" class="portalredes-item last-item">
  133 + <a href="#">RSS</a>
  134 + </li>
  135 + </ul>
  136 + </div>
  137 + </div>
  138 + <div id="sobre">
  139 + <ul>
  140 + <li id="softwarepublico-groups" class="softwarepublico-item">
  141 + <a href="{% url 'thread_list' %}" title="Listas de discussão">Listas de discussão</a>
  142 + </li>
  143 + {% plugins_menu %}
  144 + <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item">
  145 + <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a>
  146 + </li>
  147 + <li id="softwarepublico-contato" class="softwarepublico-item">
  148 + <a href="/social/spb/contato" title="Contato">Contato</a>
  149 + </li>
  150 + </ul>
  151 + </div>
  152 + </div>
  153 +</div>
  154 +
  155 +{% block main_content %}
  156 + <a name="acontent" id="acontent"></a>
  157 +{% endblock %}
... ...
src/pkg-rpm/colab-deps/colab-deps.spec
  Diff comments   View file @12711b6
1 1 Summary: Collaboration platform for communities (Python dependencies)
2 2 Name: colab-deps
3   -Version: 1.12.7
  3 +Version: 1.12.9
4 4 Release: 1
5 5 Source0: colab-deps-%{version}.tar.gz
6 6 License: Various
... ...
src/pkg-rpm/colab-spb-theme/colab-spb-theme.spec
  Diff comments   View file @12711b6
1 1  
2 2 Name: colab-spb-theme
3   -Version: 5.0a0
4   -Release: 9.1
  3 +Version: 0.3.6
  4 +Release: 1
5 5 Summary: SPB-specific Colab theme
6 6 License: GPL-3.0
7 7 Group: Applications/Publishing
... ...
src/pkg-rpm/colab/colab.spec
  Diff comments   View file @12711b6
... ... @@ -5,7 +5,7 @@
5 5 Summary: Collaboration platform for communities
6 6 Name: %{name}
7 7 Version: %{version}
8   -Release: 4
  8 +Release: 6
9 9 Source0: %{name}-%{version}.tar.gz
10 10 License: GPLv2
11 11 Group: Development/Tools
... ... @@ -14,8 +14,8 @@ Prefix: %{_prefix}
14 14 Vendor: Sergio Oliveira <sergio@tracy.com.br>
15 15 Url: https://github.com/colab/colab
16 16 BuildArch: noarch
17   -BuildRequires: colab-deps >= 1.12.7, python-virtualenv
18   -Requires: colab-deps >= 1.12.7, solr, mailman-api >= 0.3rc3
  17 +BuildRequires: colab-deps >= 1.12.9, python-virtualenv
  18 +Requires: colab-deps >= 1.12.9, solr, mailman-api >= 0.3rc3
19 19  
20 20 %description
21 21 Integrated software development platform.
... ...