Merge Request #62
← To merge requests
From
mezuro:mezuro-integration
into
softwarepublico:master
Mezuro visual integration
Criado um plugin para o Mezuro e depois foram corrigidos os conflitos de JavaScript.
Aparentemente o arquivo colab/plugins/mezuro/urls.py
não está fazendo efeito. Tive que fazer a definição de URLs em colab/urls.py
.
Exemplo de configuração de plugin a ser usada: https://beta.softwarepublico.gov.br/gitlab/mezuro/colab/wikis/plugin_configuration
Este MR fecha a issue: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/44
Commits (5)
-
Shorter regexp for dropping bootstrap.min.js and a more generic one for JQuery in a way that it should not change if Colab updates its JQuery version.
-
bootstrap js dropped from colab so the menus works jquery js dropped from colab so accordion can load Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>
-
Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>
-
Without this, Colab was unable to request assets or any other sub page from Mezuro. This is not the correct fix. The right place to set the url is on: colab/plugins/mezuro/urls.py. But this is not working yet. Notice that we've also identified a bug on the ReverseProxy, which is not repecting the upstream port always trying to request from port 80. Signed off by: Gustavo Jaruga <darksshades@hotmail.com>
-
Signed off by: Gustavo Jaruga <darksshades@hotmail.com>
Showing
11 changed files
Show diff stats
... | ... | @@ -0,0 +1,18 @@ |
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 mezuro 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=".navbar" /> <!-- Mezuro's navbar links are part of Colab's menu --> | |
16 | + <drop css:theme="script[src$='bootstrap.min.js']" /> <!-- Fixes top menu dropdown by removing Colab's bootstrap JS --> | |
17 | + <drop css:theme="script[src*='jquery']:not([src*='cookie']):not([src*='debouncedresize'])" /> <!-- Fixes accordion conflict by removing Colab's JQuery. But keeps the JS for cookie and debouncedresize --> | |
18 | +</rules> | ... | ... |
... | ... | @@ -0,0 +1 @@ |
1 | +{% extends 'base.html' %} | ... | ... |
colab/urls.py
... | ... | @@ -37,6 +37,7 @@ urlpatterns = patterns('', |
37 | 37 | |
38 | 38 | url(r'^trac/', include('colab.plugins.trac.urls')), |
39 | 39 | url(r'^gitlab/', include('colab.plugins.gitlab.urls')), |
40 | + url(r'^mezuro/', include('colab.plugins.mezuro.urls')), | |
40 | 41 | url(r'^social/', include('colab.plugins.noosfero.urls')), |
41 | 42 | url(r'^ci/', include('colab.plugins.jenkins.urls')), |
42 | 43 | ... | ... |