summaryrefslogtreecommitdiff
path: root/sublab_project
diff options
context:
space:
mode:
Diffstat (limited to 'sublab_project')
-rw-r--r--sublab_project/news/admin.py3
-rw-r--r--sublab_project/projects/admin.py1
-rw-r--r--sublab_project/settings.py2
-rw-r--r--sublab_project/static/img/logo_large.pngbin0 -> 84331 bytes
-rw-r--r--sublab_project/static/img/logo_medium.pngbin0 -> 25164 bytes
-rw-r--r--sublab_project/templates/flatpages/default.html5
6 files changed, 11 insertions, 0 deletions
diff --git a/sublab_project/news/admin.py b/sublab_project/news/admin.py
index ffead60..0a145f5 100644
--- a/sublab_project/news/admin.py
+++ b/sublab_project/news/admin.py
@@ -6,6 +6,9 @@ from news.models import News
class NewsAdmin(admin.ModelAdmin):
prepopulated_fields = {'slug': ('title',)}
list_display = ('title', 'date_created', 'date_updated')
+ list_filter = ('author',)
+ search_fields = ['title', 'content']
+ date_hierarchy = 'date_updated'
def save_model(self, request, obj, form, change):
if not obj.id:
diff --git a/sublab_project/projects/admin.py b/sublab_project/projects/admin.py
index 74fd29a..e612bc4 100644
--- a/sublab_project/projects/admin.py
+++ b/sublab_project/projects/admin.py
@@ -6,6 +6,7 @@ from projects.models import Project
class ProjectAdmin(admin.ModelAdmin):
prepopulated_fields = {'slug': ('name',)}
list_display = ('name', 'date_created', 'date_updated')
+ search_fields = ['name', 'description', 'contact_email', 'contact_url']
admin.site.register(Project, ProjectAdmin)
diff --git a/sublab_project/settings.py b/sublab_project/settings.py
index d5f7cad..a3d63e7 100644
--- a/sublab_project/settings.py
+++ b/sublab_project/settings.py
@@ -101,6 +101,7 @@ MIDDLEWARE_CLASSES = (
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
+ 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
)
ROOT_URLCONF = 'sublab_project.urls'
@@ -123,6 +124,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
+ 'django.contrib.flatpages',
'south',
'gunicorn',
'news',
diff --git a/sublab_project/static/img/logo_large.png b/sublab_project/static/img/logo_large.png
new file mode 100644
index 0000000..150f66f
--- /dev/null
+++ b/sublab_project/static/img/logo_large.png
Binary files differ
diff --git a/sublab_project/static/img/logo_medium.png b/sublab_project/static/img/logo_medium.png
new file mode 100644
index 0000000..18afec6
--- /dev/null
+++ b/sublab_project/static/img/logo_medium.png
Binary files differ
diff --git a/sublab_project/templates/flatpages/default.html b/sublab_project/templates/flatpages/default.html
new file mode 100644
index 0000000..1632bc6
--- /dev/null
+++ b/sublab_project/templates/flatpages/default.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block title %}{{ flatpage.title }}{% endblock%}
+
+{% block content %}{{ flatpage.content }}{% endblock%}