From 157c60267e0c0e464f89779a190d8b2d11d5a4be Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 01:54:41 +0100 Subject: [PATCH 1/8] Several small changes (reordering/restyling) for media descriptions and comments --- mediagoblin/static/css/base.css | 6 +++- mediagoblin/static/images/icon_comment.png | Bin 0 -> 283 bytes .../mediagoblin/user_pages/media.html | 28 ++++++------------ 3 files changed, 14 insertions(+), 20 deletions(-) create mode 100644 mediagoblin/static/images/icon_comment.png diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 0dadacd0..b026a819 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -245,8 +245,12 @@ text-align: center; font-size: 0.9em; } +.comment_content { + margin-bottom: 30px; +} + .comment_content p { - margin-bottom: 4px; + margin-bottom: 0px; } /* media galleries */ diff --git a/mediagoblin/static/images/icon_comment.png b/mediagoblin/static/images/icon_comment.png new file mode 100644 index 0000000000000000000000000000000000000000..76860a92bd0ab52278b5e295c6f0e879946397a1 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3HF~3v%Lt6icy_X9x!n)NrJ90QsB+9+AZi z42;qs%-H+g?(yEr+qAXP8FD1G)j8!4co8J;eV zAsQ3+_9^lmau9JzpS3EE(R2OAlU_11jO}W3m=0=gP?;h1X1!A(L)UBBZJe`ZeY6*@ zO?>iX@0kl{uBrGlO#3l+`V!`|Z#*~2G%_+wnw6u)!=Q3HN6Y4kz0;h7$9Wt~omYHX z_j;Ra;F};<}!!PC{xWt~$(69AdxWe)%V literal 0 HcmV?d00001 diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 11fa72cf..17beffb2 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -47,28 +47,22 @@

{{ media.title }}

- + {% autoescape False %} +

{{ media.description_html }}

+ {% endautoescape %}

{% trans date=media.created.strftime("%Y-%m-%d"), user_url=request.urlgen( 'mediagoblin.user_pages.user_home', user=media.uploader().username), username=media.uploader().username -%} - Uploaded on {{ date }} by {{ username }} + By {{ username }} on {{ date }} {%- endtrans %}

- - {% autoescape False %} -

{{ media.description_html }}

- {% endautoescape %} - -
-

{% trans %}Comments{% endtrans %}

- +

{% if request.user %}

{% trans %}Post a comment{% endtrans %}

{% endif %} - {% if comments %} {% for comment in comments %} {% set comment_author = comment.author() %} @@ -79,14 +73,10 @@
{% endif %} -
- {% autoescape False %} - {{ comment.content_html }} +
{% autoescape False %}{{ comment.content_html }} {% endautoescape %} -
- -
— - + {{ comment_author['username'] }} {% trans %}at{% endtrans %} @@ -94,7 +84,7 @@ comment = comment['_id'], user = media.uploader().username, media = media._id) }}#comment"> - {{ comment.created.strftime("%Y-%m-%d %I:%M%p") }} + {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
From 726afba3bb4446b07db869b5e770ade35a527299 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:06:33 +0100 Subject: [PATCH 2/8] Text changes to front page, as described in ticket #637 --- mediagoblin/templates/mediagoblin/root.html | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index e3ca9726..43d973d1 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -24,30 +24,21 @@

{% trans %}Explore{% endtrans %}

{% else %}
-

{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}

-
    -
  • {% trans %}The perfect place for your media!{% endtrans %}
    • -
  • {% trans %}A place for people to collaborate and show off original and derived creations!{% endtrans %}
    • -
  • {% trans %}Free, as in freedom. (We’re a GNU project, after all.){% endtrans %}
    • -
  • {% trans %}Aiming to make the world a better place through decentralization and (eventually, coming soon!) federation!{% endtrans %}
    • -
  • {% trans %}Built for extensibility. (Multiple media types coming soon to the software, including video support!){% endtrans %}
    • -
  • {% trans %}Powered by people like you. (You can help us improve this software!){% endtrans %}
    • -
- +

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

+

{% trans %}Your finest source for all goblin-related media.{% endtrans %}

+

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

{% if allow_registration %} -

{% trans %}Excited to join us?{% endtrans %}

+

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

{% trans register_url=request.urlgen('mediagoblin.auth.register') -%} - Create a free account + Create an account at this site or Set up MediaGoblin on your own server {%- endtrans %} {% endif %}
-
-
{% endif %}

{% trans %}Most recent media{% endtrans %}

From d1bee08d5a142c2ddd7f060c45e43e968b7a1bcb Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:14:19 +0100 Subject: [PATCH 3/8] Text changes to forgot-paddword page --- .../templates/mediagoblin/auth/forgot_password.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html index b95a4dcb..57de425c 100644 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html @@ -20,20 +20,15 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} -
{{ csrf_token }} -
-

{% trans %}Enter your username or email{% endtrans %}

- +

{% trans %}Forgot your password?{% endtrans %}

{{ wtforms_util.render_divs(fp_form) }}
- +
-
{% endblock %} - From b4b10a222df3cf36a70a3d354a5d0f40326ae290 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:15:52 +0100 Subject: [PATCH 4/8] Add translation brackety things to forgot-password page, I forgot those --- mediagoblin/templates/mediagoblin/auth/forgot_password.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html index 57de425c..c7f01678 100644 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html @@ -27,7 +27,7 @@

{% trans %}Forgot your password?{% endtrans %}

{{ wtforms_util.render_divs(fp_form) }}
- +
From 560af7ba4342ac89b0a96594ac22944e27547445 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:19:35 +0100 Subject: [PATCH 5/8] Text edits and rearrangements to login.html --- .../templates/mediagoblin/auth/login.html | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 61c5a203..756f67c0 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -30,7 +30,17 @@ {% trans %}Logging in failed!{% endtrans %} {% endif %} + {% if allow_registration %} +

+ {% trans %}Don't have an account yet?{% endtrans %} + {%- trans %}Create one here!{% endtrans %} +

+ {% endif %} {{ wtforms_util.render_divs(login_form) }} +

+ + {% trans %}Forgot your password?{% endtrans %} +

@@ -38,20 +48,6 @@ {% endif %} - {% if allow_registration %} -

- {% trans %}Don't have an account yet?{% endtrans %} -
- - {%- trans %}Create one here!{% endtrans %} -

-

- {% trans %}Forgot your password?{% endtrans %} -
- - {%- trans %}Change it!{% endtrans %} -

- {% endif %} {% endblock %} From 1b36a8e80c09307a2c4ddf8cc8bfe786a9d86f7d Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:20:26 +0100 Subject: [PATCH 6/8] On second thought, let's use this title for forgot_password.html --- mediagoblin/templates/mediagoblin/auth/forgot_password.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html index c7f01678..9b821426 100644 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html @@ -24,7 +24,7 @@ method="POST" enctype="multipart/form-data"> {{ csrf_token }}
-

{% trans %}Forgot your password?{% endtrans %}

+

{% trans %}Recover password{% endtrans %}

{{ wtforms_util.render_divs(fp_form) }}
From 80c9a7ee51590923a3b9f7a07419679af4a368d8 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:30:07 +0100 Subject: [PATCH 7/8] Small style changes to navigation buttons --- mediagoblin/static/css/base.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index b026a819..23a7e6c5 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -290,11 +290,14 @@ img.media_icon{ /* navigation */ .navigation_button{ - width: 139px; + width: 135px; display: block; float: left; text-align: center; - background-color: #222; + background-color: #1d1d1d; + border: 1px solid; + border-color: #2c2c2c #232323 #1a1a1a; + border-radius: 3px; text-decoration: none; padding: 12px 0pt; font-size: 2em; @@ -306,7 +309,7 @@ p.navigation_button{ } .navigation_left{ - margin-right: 2px; + margin-right: 6px; } /* messages */ From da76a8cbaa06ba63533f60051c66f08cd0e7baf4 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 4 Nov 2011 02:34:00 +0100 Subject: [PATCH 8/8] Tiny padding change to vertically center navigation button arrows --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 23a7e6c5..afd10207 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -299,7 +299,7 @@ img.media_icon{ border-color: #2c2c2c #232323 #1a1a1a; border-radius: 3px; text-decoration: none; - padding: 12px 0pt; + padding: 8px 0px 14px; font-size: 2em; margin: 0 0 20px }