summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Franke <nobody@nowhere.ws>2012-01-09 08:23:29 +0100
committerChristian Franke <nobody@nowhere.ws>2012-01-09 08:23:29 +0100
commit75200e3504bd5f48f3c77cc7299ec32fbae1d3e7 (patch)
tree00f44574ee5b7ffc53f8a9b9ba414c47565b0dcd
parenteadf24cd3ee99d4107f21e654a9d2821724dd64a (diff)
slight improvements to news_image
-rw-r--r--conf/dev_settings.py2
-rw-r--r--sublab_project/news/templates/news/news_image.html2
-rw-r--r--sublab_project/static/css/sublab.css8
3 files changed, 3 insertions, 9 deletions
diff --git a/conf/dev_settings.py b/conf/dev_settings.py
index 6d3c702..64ef83e 100644
--- a/conf/dev_settings.py
+++ b/conf/dev_settings.py
@@ -28,3 +28,5 @@ LOGGING['loggers'].update({
})
SESSION_ENGINE = 'django.contrib.sessions.backends.db'
+
+THUMBNAIL_DEBUG = True
diff --git a/sublab_project/news/templates/news/news_image.html b/sublab_project/news/templates/news/news_image.html
index 3c490c6..cac6bdc 100644
--- a/sublab_project/news/templates/news/news_image.html
+++ b/sublab_project/news/templates/news/news_image.html
@@ -7,7 +7,7 @@
<h2>Bild: {{ object.title }}</h2>
<div>
{% thumbnail object.image "820" upscale=False as image %}
- <img src="{{ image.url }}" width="{{ image.width }}" height="{{ image.height }}" align="left" />
+ <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 Artikel</a></p>
diff --git a/sublab_project/static/css/sublab.css b/sublab_project/static/css/sublab.css
index a08bfec..b4f6127 100644
--- a/sublab_project/static/css/sublab.css
+++ b/sublab_project/static/css/sublab.css
@@ -149,14 +149,6 @@ img.webcamthumb {
border: 2px solid #444;
}
-img.bigimage {
- width: 100%;
- max-width: 640px;
- margin-left: auto;
- margin-right: auto;
- display: block;
- }
-
.floatright {
float: right;
}