Merge branch 'mezuro-integration'

Sergio Oliveira
2 parents 05417135 2cd97c75
Showing 11 changed files with 48 additions and 0 deletions Show diff stats
colab/plugins/mezuro/__init__.py
colab/plugins/mezuro/admin.py
colab/plugins/mezuro/apps.py
colab/plugins/mezuro/diazo.xml
colab/plugins/mezuro/migrations/__init__.py
colab/plugins/mezuro/models.py
colab/plugins/mezuro/templates/proxy/mezuro.html
colab/plugins/mezuro/tests.py
colab/plugins/mezuro/urls.py
colab/plugins/mezuro/views.py
colab/urls.py
@@ -0,0 +1 @@
+default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
 \ No newline at end of file
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,6 @@
+from django.utils.translation import ugettext_lazy as _
+from ..utils.apps import ColabProxiedAppConfig
+
+class ProxyMezuroAppConfig(ColabProxiedAppConfig):
+    name = 'colab.plugins.mezuro'
+    verbose_name = 'Mezuro Proxy'
@@ -0,0 +1,18 @@
+<rules
+    xmlns="http://namespaces.plone.org/diazo"
+    xmlns:css="http://namespaces.plone.org/diazo/css"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <before theme-children="/html/head" content-children="/html/head" />
+    <before css:theme-children="#main-content" css:content-children="body" />
+
+    <merge attributes="class" css:theme="body" css:content="body" />
+
+    <!-- Add mezuro properties -->
+    <merge attributes="data-page" css:theme="body" css:content="body" />
+    <merge attributes="data-project-id" css:theme="body" css:content="body" />
+
+    <drop css:content=".navbar" /> <!-- Mezuro's navbar links are part of Colab's menu -->
+    <drop css:theme="script[src$='bootstrap.min.js']" /> <!-- Fixes top menu dropdown by removing Colab's bootstrap JS -->
+    <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 -->
+</rules>
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1 @@
+{% extends 'base.html' %}
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, url
+from .views import MezuroProxyView
+
+urlpatterns = patterns('',
+    # Gitlab URLs
+    url(r'^(?P<path>.*)$', MezuroProxyView.as_view(), name='mezuro'),
+)
@@ -0,0 +1,5 @@
+from ..utils.views import ColabProxyView
+
+class MezuroProxyView(ColabProxyView):
+    app_label = 'mezuro'
+    diazo_theme_template = 'proxy/mezuro.html'
@@ -37,6 +37,7 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^trac/', include('colab.plugins.trac.urls')),
     url(r'^gitlab/', include('colab.plugins.gitlab.urls')),
+    url(r'^mezuro/', include('colab.plugins.mezuro.urls')),
     url(r'^social/', include('colab.plugins.noosfero.urls')),
     url(r'^ci/', include('colab.plugins.jenkins.urls')),
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+from django.utils.translation import ugettext_lazy as _
	2	+from ..utils.apps import ColabProxiedAppConfig
	3	+
	4	+class ProxyMezuroAppConfig(ColabProxiedAppConfig):
	5	+ name = 'colab.plugins.mezuro'
	6	+ verbose_name = 'Mezuro Proxy'
@@ -0,0 +1,18 @@		@@ -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,3 @@		@@ -0,0 +1,3 @@
	1	+from django.db import models
	2	+
	3	+# Create your models here.
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+from django.conf.urls import patterns, url
	2	+from .views import MezuroProxyView
	3	+
	4	+urlpatterns = patterns('',
	5	+ # Gitlab URLs
	6	+ url(r'^(?P<path>.*)$', MezuroProxyView.as_view(), name='mezuro'),
	7	+)
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+from ..utils.views import ColabProxyView
	2	+
	3	+class MezuroProxyView(ColabProxyView):
	4	+ app_label = 'mezuro'
	5	+ diazo_theme_template = 'proxy/mezuro.html'
	@@ -37,6 +37,7 @@ urlpatterns = patterns('',		@@ -37,6 +37,7 @@ urlpatterns = patterns('',
37		37
38	url(r'^trac/', include('colab.plugins.trac.urls')),	38	url(r'^trac/', include('colab.plugins.trac.urls')),
39	url(r'^gitlab/', include('colab.plugins.gitlab.urls')),	39	url(r'^gitlab/', include('colab.plugins.gitlab.urls')),
		40	+ url(r'^mezuro/', include('colab.plugins.mezuro.urls')),
40	url(r'^social/', include('colab.plugins.noosfero.urls')),	41	url(r'^social/', include('colab.plugins.noosfero.urls')),
41	url(r'^ci/', include('colab.plugins.jenkins.urls')),	42	url(r'^ci/', include('colab.plugins.jenkins.urls')),
42		43