Commit 2ba9718397ca600f53e9e0f8936b174a0e4b870c

Authored by Charles Oliveira
Committed by Sergio Oliveira
1 parent 92abb02e

Applied new proxy structure

colab/proxy/noosfero/__init__.py 0 → 100644
... ... @@ -0,0 +1,3 @@
  1 +
  2 +
  3 +default_app_config = 'colab.proxy.noosfero.apps.ProxyNoosferoAppConfig'
... ...
colab/proxy/noosfero/admin.py 0 → 100644
... ... @@ -0,0 +1,3 @@
  1 +from django.contrib import admin
  2 +
  3 +# Register your models here.
... ...
colab/proxy/noosfero/apps.py 0 → 100644
... ... @@ -0,0 +1,7 @@
  1 +
  2 +from ..utils.apps import ColabProxiedAppConfig
  3 +
  4 +
  5 +class ProxyNoosferoAppConfig(ColabProxiedAppConfig):
  6 + name = 'colab.proxy.noosfero'
  7 + verbose_name = 'Noosfero Proxy'
... ...
colab/proxy/noosfero/diazo.xml 0 → 100644
... ... @@ -0,0 +1,19 @@
  1 +<rules
  2 + xmlns="http://namespaces.plone.org/diazo"
  3 + xmlns:css="http://namespaces.plone.org/diazo/css"
  4 + xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  5 +
  6 + <before theme-children="/html/head" content-children="/html/head" />
  7 + <before css:theme-children="#main-content" css:content-children="body" />
  8 +
  9 + <merge attributes="class" css:theme="body" css:content="body" />
  10 + <!-- This breaks some noosfero icons -->
  11 + <drop css:theme="link[href='/static/third-party/font-awesome/css/font-awesome.min.css']" />
  12 + <!-- <drop css:theme="script[src='/static/third-party/jquery-2.0.3.min.js']" /> -->
  13 + <!-- <drop theme="/html/head/script" /> -->
  14 +
  15 + <drop css:content="#barra-brasil" />
  16 + <drop css:content="#theme-footer" />
  17 + <drop css:content="#homepage-link" />
  18 + <drop css:content=".header-content" />
  19 +</rules>
0 20 \ No newline at end of file
... ...
colab/proxy/noosfero/models.py 0 → 100644
... ... @@ -0,0 +1,3 @@
  1 +from django.db import models
  2 +
  3 +# Create your models here.
... ...
colab/proxy/noosfero/templates/proxy/noosfero.html 0 → 100644
... ... @@ -0,0 +1,12 @@
  1 +{% extends 'base.html' %}
  2 +{% load static %}
  3 +
  4 +{% block head_css %}
  5 +<style>
  6 +
  7 +</style>
  8 +{% endblock %}
  9 +
  10 +{% block head_js %}
  11 +<script>jQuery.noConflict();</script>
  12 +{% endblock %}
... ...
colab/proxy/noosfero/tests.py 0 → 100644
... ... @@ -0,0 +1,3 @@
  1 +from django.test import TestCase
  2 +
  3 +# Create your tests here.
... ...
colab/proxy/noosfero/urls.py 0 → 100644
... ... @@ -0,0 +1,10 @@
  1 +
  2 +from django.conf.urls import patterns, url
  3 +
  4 +from .views import NoosferoProxyView
  5 +
  6 +
  7 +urlpatterns = patterns('',
  8 + # Noosfero URLs
  9 + url(r'^social/(?P<path>.*)$', NoosferoProxyView.as_view()),
  10 +)
... ...
colab/proxy/noosfero/views.py 0 → 100644
... ... @@ -0,0 +1,9 @@
  1 +
  2 +from django.conf import settings
  3 +
  4 +from ..utils.views import ColabProxyView
  5 +
  6 +
  7 +class NoosferoProxyView(ColabProxyView):
  8 + app_label = 'noosfero'
  9 + diazo_theme_template = 'proxy/noosfero.html'
... ...
src/colab/local_settings-digital.py
... ... @@ -1,65 +0,0 @@
1   -
2   -import os
3   -import json
4   -
5   -from custom_settings import *
6   -
7   -SECRETS_FILE = '/home/colab/colab/secrets.json'
8   -
9   -if os.path.exists(SECRETS_FILE):
10   - secrets = json.load(file(SECRETS_FILE))
11   -
12   -
13   -DEBUG = False
14   -TEMPLATE_DEBUG = DEBUG
15   -
16   -ADMINS = (
17   - ('Paulo Meirelles', 'paulo@softwarelivre.org'),
18   -)
19   -
20   -MANAGERS = ADMINS
21   -
22   -COLAB_FROM_ADDRESS = '"Portal do Software Publico" <noreply@beta.softwarepublico.gov.br>'
23   -SERVER_EMAIL = COLAB_FROM_ADDRESS
24   -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
25   -EMAIL_HOST = 'localhost'
26   -EMAIL_PORT = 25
27   -EMAIL_SUBJECT_PREFIX = ''
28   -
29   -# Make this unique, and don't share it with anybody.
30   -SECRET_KEY = secrets.get('SECRET_KEY')
31   -
32   -SITE_URL = 'http://beta.softwarepublico.gov.br'
33   -BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
34   -
35   -ALLOWED_HOSTS = ['beta.softwarepublico.gov.br']
36   -
37   -INTERNAL_IPS = ('127.0.0.1', )
38   -
39   -DATABASES['default']['PASSWORD'] = secrets.get('COLAB_DB_PWD')
40   -DATABASES['default']['HOST'] = 'localhost'
41   -
42   -TRAC_ENABLED = True
43   -
44   -if TRAC_ENABLED:
45   - from trac_settings import *
46   - DATABASES['trac'] = TRAC_DATABASE
47   - DATABASES['trac']['PASSWORD'] = secrets.get('TRAC_DB_PWD')
48   - DATABASES['trac']['HOST'] = 'localhost'
49   -
50   -HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
51   -
52   -COLAB_TRAC_URL = 'http://localhost:5000/trac/'
53   -COLAB_CI_URL = 'http://localhost:8080/ci/'
54   -COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
55   -COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
56   -
57   -CONVERSEJS_ENABLED = False
58   -
59   -DIAZO_THEME = SITE_URL
60   -
61   -ROBOTS_NOINDEX = True
62   -
63   -RAVEN_CONFIG = {
64   - 'dsn': secrets.get('RAVEN_DSN', '') + '?timeout=30',
65   -}
src/proxy/diazo/gitlab.xml
... ... @@ -1,29 +0,0 @@
1   -<rules
2   - xmlns="http://namespaces.plone.org/diazo"
3   - xmlns:css="http://namespaces.plone.org/diazo/css"
4   - xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5   -
6   - <before theme-children="/html/head" content-children="/html/head" />
7   - <before css:theme-children="#main-content" css:content-children="body" />
8   -
9   - <merge attributes="class" css:theme="body" css:content="body" />
10   -
11   - <!-- Add gitlab properties -->
12   - <merge attributes="data-page" css:theme="body" css:content="body" />
13   - <merge attributes="data-project-id" css:theme="body" css:content="body" />
14   -
15   - <drop css:content="#top-panel" />
16   - <drop css:content=".navbar-gitlab" />
17   - <after theme-children="/html/head">
18   - <script>jQuery.noConflict();</script>
19   - <style>
20   - #breadcrumbs {
21   - border: 0 !important;
22   - }
23   -
24   - #right-top-nav {
25   - margin-right: 5em !important;
26   - }
27   - </style>
28   - </after>
29   -</rules>
src/proxy/diazo/noosfero.xml
... ... @@ -1,19 +0,0 @@
1   -<rules
2   - xmlns="http://namespaces.plone.org/diazo"
3   - xmlns:css="http://namespaces.plone.org/diazo/css"
4   - xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5   -
6   - <before theme-children="/html/head" content-children="/html/head" />
7   - <before css:theme-children="#main-content" css:content-children="body" />
8   -
9   - <merge attributes="class" css:theme="body" css:content="body" />
10   - <!-- This breaks some noosfero icons -->
11   - <drop css:theme="link[href='/static/third-party/font-awesome/css/font-awesome.min.css']" />
12   - <!-- <drop css:theme="script[src='/static/third-party/jquery-2.0.3.min.js']" /> -->
13   - <!-- <drop theme="/html/head/script" /> -->
14   -
15   - <drop css:content="#barra-brasil" />
16   - <drop css:content="#theme-footer" />
17   - <drop css:content="#homepage-link" />
18   - <drop css:content=".header-content" />
19   -</rules>
src/proxy/templates/proxy/gitlab.html
... ... @@ -1,47 +0,0 @@
1   -{% extends 'base.html' %}
2   -{% load static %}
3   -
4   -{% block head_css %}
5   -<style>
6   - /* Reset left and with for .modal-dialog style (like gitlab does),
7   - the bootstrap.css one makes it small */
8   - @media screen and (min-width: 768px) {
9   - .modal-dialog {
10   - left: auto;
11   - width: auto;
12   - }
13   - }
14   - div#main-content {
15   - margin-top: 65px;
16   - }
17   -
18   - div#main-content div.container {
19   - width: 1110px;
20   - }
21   - div#main-content div.flash-container{
22   - width: 85%;
23   - }
24   - #breadcrumbs {
25   - border: 0 !important;
26   - }
27   -
28   - #right-top-nav {
29   - margin-right: 5em !important;
30   - }
31   -</style>
32   -{% endblock %}
33   -
34   -{% block head_js %}
35   -<script type="text/javascript">
36   - $(function(){
37   - // bootstrap.css forces .hide {display:none!important}, and this makes
38   - // gitlab .hide elements NEVER have a display:block, so
39   - // instead of editing bootstrap.css, we just removed '.hide' css class and
40   - // toggled
41   - $('.hide').removeClass('hide').css('display', 'none');
42   - });
43   -</script>
44   -<script type="text/javascript" src="{% static 'third-party/bootstrap/js/bootstrap.min.js' %}"></script>
45   -<script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script>
46   -<script>jQuery.noConflict();</script>
47   -{% endblock %}
src/proxy/templates/proxy/noosfero.html
... ... @@ -1,12 +0,0 @@
1   -{% extends 'base.html' %}
2   -{% load static %}
3   -
4   -{% block head_css %}
5   -<style>
6   -
7   -</style>
8   -{% endblock %}
9   -
10   -{% block head_js %}
11   -<script>jQuery.noConflict();</script>
12   -{% endblock %}
src/static/img/fav.ico
No preview for this file type
src/static/img/logo.svg
... ... @@ -1,106 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
3   -<svg version="1.1" id="Camada_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
4   - width="918.073px" height="171.763px" viewBox="0 0 918.073 171.763" enable-background="new 0 0 918.073 171.763"
5   - xml:space="preserve">
6   -<g>
7   - <path fill="#303031" d="M26.602,125.433c0-3.994-1.322-5.483-9.86-7.673c-8.138-2.108-13.613-4.776-13.613-11.976
8   - c0-6.966,6.342-11.42,15.963-11.42c5.95,0,10.72,1.795,14.32,4.382l-3.207,4.846c-3.046-2.188-6.494-3.518-10.951-3.518
9   - c-6.415,0-8.695,1.956-8.695,5.242c0,3.441,2.502,4.696,10.566,6.968c7.91,2.19,13.225,4.62,13.225,12.594
10   - c0,9.005-8.608,12.604-17.609,12.604c-7.589,0-13.142-2.501-16.742-5.635l3.996-4.537c3.205,2.657,7.893,4.377,12.747,4.377
11   - C22.859,131.687,26.602,129.262,26.602,125.433z"/>
12   - <path fill="#303031" d="M64.79,94.364c11.737,0,17.927,8.446,17.927,21.521c0,12.75-6.346,21.596-18.003,21.596
13   - c-11.745,0-18.005-8.446-18.005-21.522C46.709,103.203,53.055,94.364,64.79,94.364z M64.79,100.152
14   - c-6.88,0-10.408,5.002-10.408,15.807c0,10.724,3.442,15.728,10.332,15.728c6.886,0,10.333-5.004,10.333-15.801
15   - C75.046,105.154,71.6,100.152,64.79,100.152z"/>
16   - <path fill="#303031" d="M130.886,80.118l-2.271,5.237c-2.661-1.176-5.714-1.716-8.844-1.716c-5.635,0-8.448,2.188-8.448,6.729
17   - v8.062h13.924l-0.783,5.559h-13.141v32.56h-7.207v-32.56H94.41V98.43h9.706v-7.98c0-7.668,6.416-12.606,15.259-12.606
18   - C123.997,77.843,127.596,78.708,130.886,80.118z"/>
19   - <path fill="#303031" d="M220.972,136.548h-9.789l-5.085-29.193h-0.309l-5.325,29.193h-9.55l-7.356-41.25h7.205l5.007,35.762h0.316
20   - l6.023-30.514h8.065l5.626,30.367h0.316l5.015-35.616h6.88L220.972,136.548z"/>
21   - <path fill="#303031" d="M269.618,127.23c0,3.287,1.015,4.538,3.285,5.242l-1.723,5.009c-3.677-0.472-6.577-2.112-7.832-5.795
22   - c-2.891,3.913-7.98,5.795-12.982,5.795c-8.3,0-13.62-5.086-13.62-12.753c0-8.535,7.125-13.306,19.639-13.306h6.033v-3.21
23   - c0-5.787-3.606-7.984-9.632-7.984c-2.738,0-6.578,0.631-10.803,2.11l-1.875-5.315c5.087-1.882,9.708-2.66,13.776-2.66
24   - c10.49,0,15.734,5.083,15.734,13.461V127.23z M262.419,126.375v-10.182h-5.644c-8.842,0-12.129,3.212-12.129,8.217
25   - c0,5.086,2.51,7.674,7.676,7.674C256.231,132.084,260.067,129.967,262.419,126.375z"/>
26   - <path fill="#303031" d="M312.995,136.548h-28.171v-5.56h9.473v-30.129h-9.473v-5.562h15.732l0.86,7.906
27   - c2.345-5.794,6.889-8.839,11.735-8.839c1.96,0,3.131,0.152,5.481,0.621l-1.333,7.128c-2.032-0.552-3.289-0.709-5.011-0.709
28   - c-5.16,0-9.386,5.244-10.795,10.953v18.631h11.502V136.548z"/>
29   - <path fill="#303031" d="M336.722,118.388c0.627,9.153,5.556,13.225,11.822,13.225c3.753,0,7.431-0.946,10.958-3.837l3.282,4.778
30   - c-3.837,3.046-9.074,4.928-14.402,4.928c-12.283,0-19.168-8.69-19.168-21.522c0-12.441,7.041-21.595,17.992-21.595
31   - c10.806,0,17.298,7.749,17.298,20.344c0,1.413-0.073,2.741-0.159,3.68H336.722z M336.722,113.069h20.818
32   - c-0.151-8.535-3.909-12.995-10.335-12.995C341.571,100.074,337.272,104.222,336.722,113.069z"/>
33   - <path fill="#303031" d="M392.605,133.568v19.018l-12.523,1.328V94.985h11.115l0.542,4.621c3.368-4.308,7.596-6.028,11.506-6.028
34   - c10.798,0,15.186,8.536,15.186,22.074c0,12.835-5.875,22.217-15.963,22.217C398.395,137.868,395.106,136.465,392.605,133.568z
35   - M405.514,115.801c0-10.331-2.349-12.99-6.339-12.99c-2.662,0-4.774,1.796-6.57,4.778v17.449c1.718,2.503,3.364,3.678,5.949,3.678
36   - C402.934,128.716,405.514,125.116,405.514,115.801z"/>
37   - <path fill="#303031" d="M439.817,94.985v28.412c0,3.99,1.567,5.239,4.155,5.239c2.502,0,5.243-1.718,6.965-4.456V94.985h12.513
38   - v41.563h-10.953l-0.547-4.861c-2.816,4.07-7.752,6.182-12.754,6.182c-8.069,0-11.9-5.007-11.9-12.909V94.985H439.817z
39   - M434.732,82.621l16.83-11.27l5.554,9.315l-18.625,8.295L434.732,82.621z"/>
40   - <path fill="#303031" d="M489.992,99.219c2.587-3.448,6.497-5.642,10.568-5.642c10.797,0,15.413,8.536,15.413,22.074
41   - c0,12.835-5.863,22.217-16.664,22.217c-4.152,0-7.825-1.788-10.25-5.079l-0.467,3.759h-11.12V78.476l12.52-1.329V99.219z
42   - M503.07,115.801c0-10.331-2.583-12.99-6.505-12.99c-2.656,0-4.769,1.796-6.573,4.778v17.449c1.572,2.431,3.367,3.753,5.949,3.753
43   - C500.329,128.791,503.07,125.116,503.07,115.801z"/>
44   - <path fill="#303031" d="M544.641,123.474c0,3.284,2.028,4.539,5.323,4.539c2.109,0,4.148-0.544,5.868-1.255l2.969,8.371
45   - c-2.811,1.493-6.728,2.739-12.048,2.739c-10.253,0-14.634-6.256-14.634-16.036V87.001h-12.211v-8.525h24.732V123.474z"/>
46   - <path fill="#303031" d="M605.73,136.548h-34.825v-8.535h11.732v-24.495h-11.343v-8.533h23.875v33.028h10.561V136.548z
47   - M581.472,80.193c0-3.99,3.13-7.043,7.434-7.043c4.308,0,7.44,3.054,7.44,7.043c0,3.986-3.133,7.044-7.44,7.044
48   - C584.602,87.237,581.472,84.179,581.472,80.193z"/>
49   - <path fill="#303031" d="M647.054,124.878l5.641,7.983c-3.915,3.131-9.314,5.007-15.417,5.007c-13.542,0-21.595-8.833-21.595-21.828
50   - s8.368-22.463,21.754-22.463c6.337,0,11.262,1.88,15.258,5.241l-5.401,7.516c-2.815-2.195-6.177-3.131-9.076-3.131
51   - c-5.556,0-9.393,3.522-9.393,12.837c0,9.152,4.147,11.973,9.393,11.973C641.037,128.013,644.162,127.075,647.054,124.878z"/>
52   - <path fill="#303031" d="M701.536,115.651c0,13.925-7.518,22.217-20.265,22.217c-12.758,0-20.282-8.133-20.282-22.143
53   - c0-13.228,7.524-22.148,20.282-22.148C694.099,93.577,701.536,102.339,701.536,115.651z M673.91,115.726
54   - c0,9.152,2.345,12.99,7.361,12.99c5.003,0,7.347-3.838,7.347-13.064c0-8.926-2.344-12.841-7.347-12.841
55   - C676.254,102.811,673.91,106.726,673.91,115.726z"/>
56   - <path fill="#303031" d="M171.029,134.433c-2.892,1.87-7.279,3.049-11.346,3.049c-9.075,0-14.084-5.242-14.084-12.753v-20.705h-9.4
57   - v-5.477h9.4V85.986l7.196-0.863v13.424h14.166l-0.865,5.477h-13.301v20.621c0,4.617,2.191,6.889,7.666,6.889
58   - c3.054,0,5.721-0.78,7.827-2.037L171.029,134.433z"/>
59   -</g>
60   -<g>
61   - <path fill="none" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M792.436,70.97"/>
62   - <polyline fill="none" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" points="856.139,162.973 845.647,98.644
63   - 749.203,129.521 725.561,70.848 725.315,8.268 "/>
64   -
65   - <line fill="none" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" x1="845.647" y1="98.644" x2="909.484" y2="88.677"/>
66   -
67   - <line fill="none" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" x1="683.014" y1="71.011" x2="792.436" y2="70.97"/>
68   - <g>
69   - <g>
70   -
71   - <line fill="none" stroke="#403D3A" stroke-width="2.0352" stroke-miterlimit="10" x1="682.807" y1="71.161" x2="631.075" y2="62.657"/>
72   -
73   - <line fill="none" stroke="#403D3A" stroke-width="2.0352" stroke-miterlimit="10" x1="590.583" y1="79.667" x2="631.075" y2="62.657"/>
74   - </g>
75   - </g>
76   - <g>
77   - <path fill="#E72F6C" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M690.577,71.161
78   - c0,4.303-3.528,7.774-7.77,7.774c-4.234,0-7.771-3.471-7.771-7.774s3.537-7.771,7.771-7.771
79   - C687.048,63.39,690.577,66.858,690.577,71.161z"/>
80   - <path fill="#B4CC05" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M642.853,62.657
81   - c0,6.521-5.366,11.784-11.778,11.784c-6.414,0-11.788-5.263-11.788-11.784c0-6.521,5.374-11.781,11.788-11.781
82   - C637.487,50.876,642.853,56.136,642.853,62.657z"/>
83   - <path fill="#B4CC05" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M855.94,100.467
84   - c0,6.521-5.368,11.781-11.781,11.781c-6.427,0-11.792-5.261-11.792-11.781c0-6.522,5.365-11.79,11.792-11.79
85   - C850.572,88.677,855.94,93.944,855.94,100.467z"/>
86   - <path fill="#B4CC05" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M725.272,1.018
87   - c4.297,0,7.77,3.538,7.77,7.77c0,4.237-3.473,7.771-7.77,7.771c-4.307,0-7.773-3.535-7.773-7.771
88   - C717.499,4.555,720.965,1.018,725.272,1.018z"/>
89   - <path fill="#B4CC05" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M855.94,155.199
90   - c4.296,0,7.763,3.535,7.763,7.773c0,4.234-3.467,7.772-7.763,7.772c-4.315,0-7.78-3.538-7.78-7.772
91   - C848.16,158.734,851.625,155.199,855.94,155.199z"/>
92   - <path fill="#E72F6C" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M909.282,80.909
93   - c4.304,0,7.773,3.54,7.773,7.768c0,4.244-3.47,7.777-7.773,7.777c-4.306,0-7.774-3.533-7.774-7.777
94   - C901.507,84.449,904.976,80.909,909.282,80.909z"/>
95   - <path fill="#E72F6C" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M792.234,53.642
96   - c9.699,0,17.52,7.978,17.52,17.519c0,9.545-7.82,17.516-17.52,17.516s-17.518-7.971-17.518-17.516
97   - C774.716,61.62,782.535,53.642,792.234,53.642z"/>
98   - <path fill="#303031" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M748.905,121.867
99   - c4.297,0,7.771,3.54,7.771,7.774c0,4.232-3.474,7.772-7.771,7.772c-4.311,0-7.774-3.54-7.774-7.772
100   - C741.13,125.407,744.594,121.867,748.905,121.867z"/>
101   - <path fill="#303031" stroke="#303031" stroke-width="2.0352" stroke-miterlimit="10" d="M725.272,63.117
102   - c4.297,0,7.77,3.542,7.77,7.771c0,4.233-3.473,7.772-7.77,7.772c-4.307,0-7.773-3.539-7.773-7.772
103   - C717.499,66.658,720.965,63.117,725.272,63.117z"/>
104   - </g>
105   -</g>
106   -</svg>