aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJef van Schendel <mail@jefvanschendel.nl>2012-03-06 00:35:55 +0100
committerJef van Schendel <mail@jefvanschendel.nl>2012-03-06 00:35:55 +0100
commitb01a3b938666569cc021698ce854fb534e4d85e3 (patch)
tree751e09954c8aa1ec4b4c11ac18c6981aecfeca7d
parentfe53180359b03cfacfb45286fdc4c30cbfd9289f (diff)
downloadmediagoblin-b01a3b938666569cc021698ce854fb534e4d85e3.tar.lz
mediagoblin-b01a3b938666569cc021698ce854fb534e4d85e3.tar.xz
mediagoblin-b01a3b938666569cc021698ce854fb534e4d85e3.zip
Revert thumbnail gallery change: switch back to tables
-rw-r--r--mediagoblin/static/css/base.css5
-rw-r--r--mediagoblin/templates/mediagoblin/utils/object_gallery.html36
2 files changed, 23 insertions, 18 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 9302db1b..1ba226f0 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -339,14 +339,13 @@ textarea#comment_content {
/* media galleries */
.media_thumbnail {
- display: inline-block;
+ float: left;
padding: 0px;
width: 180px;
overflow: hidden;
- margin: 0px 5px 10px 5px;
+ margin: 0px 4px 10px;
text-align: center;
font-size: 0.875em;
- list-style: none;
}
.media_thumbnail a {
diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index 6b5988fb..81506a84 100644
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -19,23 +19,29 @@
{% from "mediagoblin/utils/pagination.html" import render_pagination %}
{% macro media_grid(request, media_entries, col_number=5) %}
- <ul class="thumb_gallery">
+ <table class="thumb_gallery">
{% for row in gridify_cursor(media_entries, col_number) %}
- {% for entry in row %}
- {% set entry_url = entry.url_for_self(request.urlgen) %}
- <li class="media_thumbnail">
- <a href="{{ entry_url }}">
- <img src="{{ request.app.public_store.file_url(
- entry.media_files['thumb']) }}" />
- </a>
- {% if entry.title %}
- <br />
- <a href="{{ entry_url }}">{{ entry.title }}</a>
- {% endif %}
- </li>
- {% endfor %}
+ <tr class="thumb_row
+ {%- if loop.first %} thumb_row_first
+ {%- elif loop.last %} thumb_row_last{% endif %}">
+ {% for entry in row %}
+ {% set entry_url = entry.url_for_self(request.urlgen) %}
+ <td class="media_thumbnail thumb_entry
+ {%- if loop.first %} thumb_entry_first
+ {%- elif loop.last %} thumb_entry_last{% endif %}">
+ <a href="{{ entry_url }}">
+ <img src="{{ request.app.public_store.file_url(
+ entry.media_files['thumb']) }}" />
+ </a>
+ {% if entry.title %}
+ <br />
+ <a href="{{ entry_url }}">{{ entry.title }}</a>
+ {% endif %}
+ </td>
+ {% endfor %}
+ </tr>
{% endfor %}
- </ul>
+ </table>
{%- endmacro %}
{#