summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sublab_project/news/urls.py2
-rw-r--r--sublab_project/projects/migrations/0002_auto__add_field_project_image.py74
-rw-r--r--sublab_project/projects/models.py2
-rw-r--r--sublab_project/projects/templates/projects/project_detail.html10
-rw-r--r--sublab_project/projects/templates/projects/project_image.html14
-rw-r--r--sublab_project/projects/urls.py6
6 files changed, 106 insertions, 2 deletions
diff --git a/sublab_project/news/urls.py b/sublab_project/news/urls.py
index 574afd4..fbeb4f4 100644
--- a/sublab_project/news/urls.py
+++ b/sublab_project/news/urls.py
@@ -10,7 +10,7 @@ urlpatterns = patterns('',
url(r'^rss/$', NewsFeed(), name='news_feed'),
url(r'^atom/$', NewsFeedAtom(), name='news_feed_atom'),
url(r'^(?P<slug>[-\w]+)/$', DetailView.as_view(model=News), name='news_detail'),
- url(r'^(?P<slug>[-\w]+)/bild/$',
+ url(r'^(?P<slug>[-\w]+)/image/$',
DetailView.as_view(model=News, template_name='news/news_image.html'),
name='news_image'),
)
diff --git a/sublab_project/projects/migrations/0002_auto__add_field_project_image.py b/sublab_project/projects/migrations/0002_auto__add_field_project_image.py
new file mode 100644
index 0000000..394ed5b
--- /dev/null
+++ b/sublab_project/projects/migrations/0002_auto__add_field_project_image.py
@@ -0,0 +1,74 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Adding field 'Project.image'
+ db.add_column('projects_project', 'image', self.gf('sorl.thumbnail.fields.ImageField')(default='', max_length=100, blank=True), keep_default=False)
+
+
+ def backwards(self, orm):
+
+ # Deleting field 'Project.image'
+ db.delete_column('projects_project', 'image')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'projects.project': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Project'},
+ 'contact_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'contact_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'contact_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'date_created': ('django.db.models.fields.DateTimeField', [], {}),
+ 'date_updated': ('django.db.models.fields.DateTimeField', [], {}),
+ 'description': ('django.db.models.fields.TextField', [], {}),
+ 'description_html': ('django.db.models.fields.TextField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('sorl.thumbnail.fields.ImageField', [], {'max_length': '100', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+ }
+ }
+
+ complete_apps = ['projects']
diff --git a/sublab_project/projects/models.py b/sublab_project/projects/models.py
index eb496bf..063734f 100644
--- a/sublab_project/projects/models.py
+++ b/sublab_project/projects/models.py
@@ -2,6 +2,7 @@ import datetime
from django.contrib.auth.models import User
from django.db import models
+from sorl.thumbnail import ImageField
from utils import render_creole
@@ -17,6 +18,7 @@ class Project(models.Model):
contact_email = models.EmailField('E-Mail', blank=True)
contact_url = models.URLField('URL', blank=True)
contact_user = models.ForeignKey(User, verbose_name='Ansprechpartner')
+ image = ImageField('Bild', upload_to='projects', blank=True)
date_created = models.DateTimeField('Erstellungsdatum', editable=False)
date_updated = models.DateTimeField('Aktualisierungsdatum', editable=False)
diff --git a/sublab_project/projects/templates/projects/project_detail.html b/sublab_project/projects/templates/projects/project_detail.html
index 600b79c..5c0a6dd 100644
--- a/sublab_project/projects/templates/projects/project_detail.html
+++ b/sublab_project/projects/templates/projects/project_detail.html
@@ -1,9 +1,19 @@
{% extends 'base.html' %}
+{% load thumbnail %}
{% block title %}Projekt: {{ object.name }}{% endblock %}
{% block content %}
<h2 id="{{ object.slug }}">Projekt: {{ object.name }}</h2>
+ {% if object.image %}
+ <div class="imagecontent">
+ <a href="{% url project_image object.slug %}">
+ {% thumbnail object.image "200" upscale=False as image %}
+ <img src="{{ image.url }}" width="{{ image.width }}" height="{{ image.height }}" align="right" />
+ {% endthumbnail %}
+ </a>
+ </div>
+ {% endif %}
{{ object.description_html|safe }}
{% if object.contact_email %}
<p>E-Mail: {{ object.contact_email }}</p>
diff --git a/sublab_project/projects/templates/projects/project_image.html b/sublab_project/projects/templates/projects/project_image.html
new file mode 100644
index 0000000..65e82f3
--- /dev/null
+++ b/sublab_project/projects/templates/projects/project_image.html
@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+{% load thumbnail %}
+
+{% block title %}Bild: {{ object.name }}{% endblock %}
+
+{% block content %}
+ <h2>Bild: {{ object.name }}</h2>
+ <div>
+ {% thumbnail object.image "820" upscale=False as image %}
+ <img src="{{ image.url }}" style="max-width:{{ image.width }}px; max-height:{{ image.height }}px;" class="contentimage" />
+ {% endthumbnail %}
+ </div>
+ <p><a href="{{ object.get_absolute_url }}">Zurück zum Projekt</a></p>
+{% endblock content %}
diff --git a/sublab_project/projects/urls.py b/sublab_project/projects/urls.py
index b39e730..f3e4f61 100644
--- a/sublab_project/projects/urls.py
+++ b/sublab_project/projects/urls.py
@@ -9,7 +9,11 @@ urlpatterns = patterns('',
url('^rss/$', ProjectFeed()),
url('^atom/$', ProjectFeedAtom()),
url('^(?P<slug>[-\w]+)/$', DetailView.as_view(model=Project),
- name='projects_detail'),
+ name='projects_detail'),
+ url(r'^(?P<slug>[-\w]+)/image/$',
+ DetailView.as_view(model=Project,
+ template_name='projects/project_image.html'),
+ name='project_image'),
url('^(?P<slug>[-\w]+)/rss/$', ProjectNewsFeed()),
url('^(?P<slug>[-\w]+)/atom/$', ProjectNewsFeedAtom()),
)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 06:20:16 +0000