Skip to content

Commit

Permalink
Merge branch 'mezuro-integration'
Browse files Browse the repository at this point in the history
  • Loading branch information
seocam committed Jun 22, 2015
2 parents 0541713 + 2cd97c7 commit 48a7207
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 0 deletions.
1 change: 1 addition & 0 deletions colab/plugins/mezuro/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
default_app_config = 'colab.plugins.mezuro.apps.ProxyMezuroAppConfig'
3 changes: 3 additions & 0 deletions colab/plugins/mezuro/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
6 changes: 6 additions & 0 deletions colab/plugins/mezuro/apps.py
Original file line number Diff line number Diff line change
@@ -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'
18 changes: 18 additions & 0 deletions colab/plugins/mezuro/diazo.xml
Original file line number Diff line number Diff line change
@@ -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>
Empty file.
3 changes: 3 additions & 0 deletions colab/plugins/mezuro/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.db import models

# Create your models here.
1 change: 1 addition & 0 deletions colab/plugins/mezuro/templates/proxy/mezuro.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{% extends 'base.html' %}
3 changes: 3 additions & 0 deletions colab/plugins/mezuro/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
7 changes: 7 additions & 0 deletions colab/plugins/mezuro/urls.py
Original file line number Diff line number Diff line change
@@ -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'),
)
5 changes: 5 additions & 0 deletions colab/plugins/mezuro/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from ..utils.views import ColabProxyView

class MezuroProxyView(ColabProxyView):
app_label = 'mezuro'
diazo_theme_template = 'proxy/mezuro.html'
1 change: 1 addition & 0 deletions colab/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

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')),

Expand Down

0 comments on commit 48a7207

Please sign in to comment.