From 1450740275aa2170eef9bdd18174915bf40349b7 Mon Sep 17 00:00:00 2001 From: jpope Date: Tue, 7 Jan 2014 02:02:12 -0600 Subject: [PATCH 1/5] realign columns on mod user page --- mediagoblin/templates/mediagoblin/moderation/user.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html index 67c3ae27..a98d756b 100644 --- a/mediagoblin/templates/mediagoblin/moderation/user.html +++ b/mediagoblin/templates/mediagoblin/moderation/user.html @@ -43,7 +43,7 @@
-
+
{# If no user... #} {% if not user %}

{% trans %}Sorry, no such user found.{% endtrans %}

@@ -100,7 +100,7 @@ {% endif %}
{% if user %} -
+

{%- trans username=user.username -%} Active Reports on {{ username }} @@ -163,14 +163,14 @@

{% trans username=user.username -%} {{ username }}'s Privileges{% endtrans %}

-
+
- + {% for privilege in privileges %} @@ -201,7 +201,7 @@ -
+
From b216047f045b1ddf9403ef34fc4f2579f9d51bf7 Mon Sep 17 00:00:00 2001 From: jpope Date: Tue, 7 Jan 2014 02:19:46 -0600 Subject: [PATCH 2/5] adjust banned page --- mediagoblin/templates/mediagoblin/banned.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/banned.html b/mediagoblin/templates/mediagoblin/banned.html index 0b5a6884..151f2b9c 100644 --- a/mediagoblin/templates/mediagoblin/banned.html +++ b/mediagoblin/templates/mediagoblin/banned.html @@ -21,7 +21,7 @@ {% block mediagoblin_content %} {% trans %}Image of goblin stressing out{% endtrans %} + alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>

{% trans %}You have been banned{% endtrans %} {% if expiration_date %} From 7b40694e7b4316c9ea43d43f21d0eb8caf9e1771 Mon Sep 17 00:00:00 2001 From: jpope Date: Tue, 7 Jan 2014 02:20:58 -0600 Subject: [PATCH 3/5] adjust 404 page --- mediagoblin/templates/mediagoblin/error.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/error.html b/mediagoblin/templates/mediagoblin/error.html index c16b650f..a8412b24 100644 --- a/mediagoblin/templates/mediagoblin/error.html +++ b/mediagoblin/templates/mediagoblin/error.html @@ -21,7 +21,7 @@ {% block mediagoblin_content %} {% trans %}Image of goblin stressing out{% endtrans %} + alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>

{{ title }}

{{ err_msg|safe }}

From fe024f0be71e8c3ac581c2f515f9a31a22890e29 Mon Sep 17 00:00:00 2001 From: jpope Date: Tue, 7 Jan 2014 12:09:02 -0600 Subject: [PATCH 4/5] skeletonize frontpage welcome --- mediagoblin/static/css/base.css | 13 +++++ .../mediagoblin/bits/frontpage_welcome.html | 49 ++++++++++--------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 950954cb..3a38f405 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -161,6 +161,10 @@ a.logo { margin: 6px 8px 6px 0; } +.welcomeimage { + float: right; +} + .fine_print { font-size: 0.8em; } @@ -816,6 +820,7 @@ pre { .button_action, .button_action_highlight, .button_form { padding: 5px 14px; + margin-bottom: 0.5em; } } @@ -861,6 +866,14 @@ pre { .header_right { text-align: center; } + + .welcomeimage { + float: none; + display: inherit; + margin-left: auto; + margin-right: auto; + margin-top: 1em; + } } /* Exif display */ diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html index 4e55e618..9d157480 100644 --- a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html +++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html @@ -19,29 +19,34 @@ {% if request.user %}

{% trans %}Explore{% endtrans %}

{% else %} - -

{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}

-

{% trans %}This site is running MediaGoblin, an extraordinarily great piece of media hosting software.{% endtrans %}

- {% if auth %} -

{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}

- {% if allow_registration %} -

{% trans %}Don't have one yet? It's easy!{% endtrans %}

- +
+

{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}

+

{% trans %}This site is running MediaGoblin, an extraordinarily great piece of media hosting software.{% endtrans %}

+ {% if auth %} +

{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}

+ {% if allow_registration %} +

{% trans %}Don't have one yet? It's easy!{% endtrans %}

+ Create an account at this site + or + {%- endtrans %} {% endif %} - {% trans %} - >Create an account at this site - or - {%- endtrans %} - {% endif %} - {% endif %} - {% trans %} - Set up MediaGoblin on your own server - {%- endtrans %} - + {% endif %} + {% trans %} + Set up MediaGoblin on your own server + {%- endtrans %} +
+
+ +
+

{% endif %} From da4d97e0fd143d50e0c0c6b2a29038077b8b4e69 Mon Sep 17 00:00:00 2001 From: jpope Date: Tue, 7 Jan 2014 17:52:38 -0600 Subject: [PATCH 5/5] add a little button color and new media page layout --- mediagoblin/static/css/base.css | 51 +++++++++++++++++-- mediagoblin/templates/mediagoblin/base.html | 2 +- .../mediagoblin/user_pages/media.html | 24 ++++++--- 3 files changed, 66 insertions(+), 11 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 3a38f405..aa2987c1 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -202,6 +202,20 @@ footer { display:block; } +.media_pane { + border-bottom: 1px solid #333333; +} + +.media_sidebar { + border-left: 1px solid #333333; + padding-left: 1em; + padding-top: 1em; +} + +.media_comments { + padding-top: 1em; +} + /* common website elements */ .button_action, .button_action_highlight, .button_form { @@ -225,6 +239,17 @@ footer { color: #283F35; } +.button_info { + background-color: #508BB5; + border-color: #5899C7 #437699 #427496; + color: #C3C3C3; +} + +.button_warning { + background-color: #8A2D2D; + border-color: #913030 #451717 #431212; + color: #C3C3C3; +} .button_form { min-width: 99px; @@ -249,6 +274,13 @@ text-align: center; padding-top: 70px; } +.no_background { + background-image: none; + height: 0; + padding-top: 0; + display: inline-block; +} + .right_align { float: right; } @@ -278,13 +310,13 @@ text-align: center; } .media_sidebar h3 { - font-size: 1em; - margin: 0 0 5px; - border: none; + font-size: 1em; + margin: 0 0 5px; + border: none; } .media_sidebar p { - margin-left: 8px; + margin-left: 8px; } .alpha { @@ -874,6 +906,17 @@ pre { margin-right: auto; margin-top: 1em; } + + .media_sidebar { + border-left: none; + padding-left: 0; + padding-top: 1em; + margin-top: 1em; + } + + .media_comments { + border-bottom: 1px solid #333333; + } } /* Exif display */ diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index f60d5f10..d9f66e41 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -78,7 +78,7 @@ {% set notification_count = get_notification_count(request.user.id) %} {% if notification_count %} - + {{ notification_count }} {% endif %} ▼ diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 4c2323cf..abdd9599 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -46,7 +46,7 @@ {% include "mediagoblin/utils/prev_next.html" %}
-
+
{% block mediagoblin_media %} {% set display_media = request.app.public_store.file_url( @@ -70,12 +70,14 @@ {% endif %} {% endblock %}
+

{{ media.title }}

{% if request.user and (media.uploader == request.user.id or request.user.has_privilege('admin')) %} +
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.get_uploader.username, media_id=media.id) %} @@ -83,13 +85,18 @@ {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', user= media.get_uploader.username, media_id=media.id) %} - {% trans %}Delete{% endtrans %} - + {% trans %}Delete{% endtrans %} +
{% endif %} {% autoescape False %}

{{ media.description_html }}

{% endautoescape %} +
+
+ +
{% if comments and request.user and request.user.has_privilege('commenter') %} +
{% if app_config['allow_comments'] %} {{ render_pagination(request, pagination, media.url_for_self(request.urlgen)) }} + {% else %} +
{% endif %} -
-
+
+
+ +

{% trans %}Added{% endtrans %}

{%- trans formatted_time=timesince(media.created) -%} @@ -223,6 +234,7 @@ {% block mediagoblin_sidebar %} {% endblock %} -

+
+
{% endblock %}
{% trans %}Privilege{% endtrans %}{% trans %}User Has Privilege{% endtrans %}{% trans %}Granted{% endtrans %}