Commit f78858b3 authored by fred's avatar fred

add new 'matos' application

parent 86bd3c7c
......@@ -5,3 +5,4 @@
/emissions
panikdb.sqlite3
local_settings.py
/matos
......@@ -133,6 +133,7 @@ INSTALLED_APPS = (
'django_bootstrap_staticfiles',
'emissions',
'newsletter',
'matos',
'panikdb.aa',
'panikdb.customtags',
)
......
......@@ -545,6 +545,16 @@ ul.messages {
box-shadow: 0px 0px 5px black;
}
#piece-details {
float: right;
margin: 1em;
}
#piece-details img {
padding: 5px;
max-width: 200px;
border: 1px solid #666;
}
[class^="icon-"]:after, [class*=" icon-"]:after,
[class^="icon-"]:before, [class*=" icon-"]:before {
......
......@@ -15,6 +15,7 @@ from emissions.views import FacetedSearchView
from emissions.urls import urlpatterns as emissions_urlpatterns
from emissions.models import Emission, Episode, NewsItem
from newsletter.urls import management_patterns as newsletter_urlpatterns
from matos.urls import urlpatterns as matos_urlpatterns
from urls_utils import decorated_includes
......@@ -32,6 +33,9 @@ urlpatterns = patterns('',
url(r'^emissions/',
decorated_includes(login_required, include(emissions_urlpatterns))),
url(r'^matos/',
decorated_includes(login_required, include(matos_urlpatterns))),
url(r'^newsletters/add$', 'panikdb.views.newsletter_create', name='newsletter-create'),
url(r'^newsletters/',
decorated_includes(login_required, include(newsletter_urlpatterns))),
......
......@@ -8,3 +8,4 @@ django-jquery
django-datetime-widget
django-bootstrap-staticfiles
git+http://git.domainepublic.net/git/django-panik-emissions.git
git+http://git.domainepublic.net/git/django-panik-matos.git
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment