aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2014-08-11 20:42:49 +0400
committerBoris Bobrov <breton@cynicmansion.ru>2016-01-28 22:04:42 +0100
commit4dd814a945e3cbb6c2e904844398223be9d86f49 (patch)
tree0b75b05e1324a3d03f83fbd66019c274fe5c748b
parenta186505a8acc433626f4222550de1c344f4f5559 (diff)
downloadmediagoblin-4dd814a945e3cbb6c2e904844398223be9d86f49.tar.lz
mediagoblin-4dd814a945e3cbb6c2e904844398223be9d86f49.tar.xz
mediagoblin-4dd814a945e3cbb6c2e904844398223be9d86f49.zip
moved styles to a css file; more fixes to templates
-rw-r--r--mediagoblin/static/css/base.css36
-rw-r--r--mediagoblin/templates/mediagoblin/moderation/media_panel.html12
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/processing_panel.html42
3 files changed, 48 insertions, 42 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index f8726708..e84f51f3 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -754,6 +754,42 @@ table.media_panel th {
padding-bottom: 4px;
text-align: left;
}
+.thumb-overlay-status {
+ position: absolute;
+ margin: auto;
+ top: 0; bottom: 0; left: 0; right: 0;
+ width: 180px;
+ height: 20px;
+ display: inline;
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.8);
+}
+
+.thumb-processing {
+ color: black;
+ font-weight: bold;
+}
+
+.thumb-failed {
+ color: red;
+ font-weight: bold;
+}
+
+.thumb-wrapper {
+ position: relative;
+/* for proportional thumb resizing */
+ width: auto;
+ height: auto;
+ display: inline-block;
+}
+
+.thumb-wrapper img {
+ max-height: 180px;
+ max-width: 180px;
+}
+.media_panel td {
+ vertical-align: middle;
+}
/* moderator panels */
diff --git a/mediagoblin/templates/mediagoblin/moderation/media_panel.html b/mediagoblin/templates/mediagoblin/moderation/media_panel.html
index 888e4feb..94d4a1a0 100644
--- a/mediagoblin/templates/mediagoblin/moderation/media_panel.html
+++ b/mediagoblin/templates/mediagoblin/moderation/media_panel.html
@@ -43,8 +43,18 @@
</tr>
{% for media_entry in processing_entries %}
<tr>
+ <td>
+ <div class="thumb-wrapper">
+ <img src="{{ media_entry.thumb_url }}" alt="{{ media_entry.title }}" />
+ <div class="thumb-overlay-status thumb-processing">Processing...</div>
+ </div>
+ </td>
<td>{{ media_entry.id }}</td>
- <td>{{ media_entry.get_actor.username }}</td>
+ <td>
+ <a href="{{ request.urlgen('mediagoblin.moderation.users_detail', user=media_entry.get_actor.username) }}">
+ {{ media_entry.get_actor.username }}
+ </a>
+ </td>
<td>{{ media_entry.title }}</td>
<td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.transcoding_progress %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
index 9fc741f5..d803e51c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
@@ -29,50 +29,10 @@
{% trans %}You can track the state of media being processed for your gallery here.{% endtrans %}
</p>
-<style>
- .thumb-overlay-status {
- position: absolute;
- margin: auto;
- top: 0; bottom: 0; left: 0; right: 0;
- width: 180px;
- height: 20px;
- display: inline;
- text-align: center;
- }
-
- .thumb-processing {
- color: black;
- font-weight: bold;
- background-color: rgba(255, 255, 255, 0.8);
- }
-
- .thumb-failed {
- color: red;
- font-weight: bold;
- background-color: rgba(127, 0, 0, 0.5);
- }
-
- .thumb-wrapper {
- position: relative;
- /* for proportional thumb resizing */
- width: auto;
- height: auto;
- display: inline-block;
- }
-
- .thumb-wrapper img {
- max-height: 180px;
- max-width: 180px;
- }
- .media_panel td {
- vertical-align: middle;
- }
-</style>
-
{% if entries.count() %}
<table class="media_panel processing">
<tr>
- <th>ID</th>
+ <th>Thumbnail</th>
<th>Title</th>
<th>When submitted</th>
<th>Transcoding progress</th>