From 2967b56df6046099786ee5af5db92f0ce0674b2c Mon Sep 17 00:00:00 2001 From: Loic Date: Wed, 18 Feb 2015 14:56:03 +0200 Subject: [PATCH 1/3] [#1123] Update page prettifying --- akvo/rsr/static/rsr/v3/css/src/main.css | 14 ++ akvo/rsr/static/rsr/v3/css/src/main.scss | 20 +++ akvo/templates/update_main.html | 166 +++++++++++------------ 3 files changed, 117 insertions(+), 83 deletions(-) diff --git a/akvo/rsr/static/rsr/v3/css/src/main.css b/akvo/rsr/static/rsr/v3/css/src/main.css index e7bce91650..ec6d9fed24 100755 --- a/akvo/rsr/static/rsr/v3/css/src/main.css +++ b/akvo/rsr/static/rsr/v3/css/src/main.css @@ -68,6 +68,9 @@ a, a:link, a:visited { color: #ff5500; } /****************** Miscellanous Typography ********************/ +img { + max-width: 100%; } + .noItem { color: rgba(44, 42, 116, 0.2); font-weight: bold; } @@ -1030,6 +1033,17 @@ div.textBlock { -webkit-border-radius: 5px; border-radius: 5px; } +/* Update Page */ +.updateMain h1 { + color: #00a79d; + margin-top: 0; } +.updateMain .asideUpList .row { + padding: 15px 0; } + .updateMain .asideUpList .row:nth-of-type(2n+1) { + background-color: rgba(0, 167, 157, 0.1); } + .updateMain .asideUpList .row h5 { + margin-top: 0; } + /* Cookie */ #cookie-law { position: fixed; diff --git a/akvo/rsr/static/rsr/v3/css/src/main.scss b/akvo/rsr/static/rsr/v3/css/src/main.scss index 18ee399534..6e25982ae0 100755 --- a/akvo/rsr/static/rsr/v3/css/src/main.scss +++ b/akvo/rsr/static/rsr/v3/css/src/main.scss @@ -49,6 +49,7 @@ a, a:link, a:visited { } /****************** Miscellanous Typography ********************/ +img {max-width:100%;} .noItem { color: rgba($akvoPurple, 0.2); font-weight: bold; @@ -1276,6 +1277,25 @@ div.textBlock { } } +/* Update Page */ +.updateMain { + h1 { + color: $rsrGreen; + margin-top: 0; + } + .asideUpList { + .row { + padding:15px 0; + &:nth-of-type(2n+1) { + background-color: rgba($rsrGreen,0.1); + } + h5 { + margin-top: 0; + } + } + } +} + /* Cookie */ #cookie-law { diff --git a/akvo/templates/update_main.html b/akvo/templates/update_main.html index c805abdf32..e978631b35 100644 --- a/akvo/templates/update_main.html +++ b/akvo/templates/update_main.html @@ -1,96 +1,96 @@ {% extends "base.html" %} - {% load i18n markup_tags rsr_utils bootstrap3 embed_video_tags %} - {% block title %}{{update.title}}{% endblock %} - {% block maincontent %} - -
- {% include "partials/project_header.html" with project=update.project %} -
-
-
-
-
-
-

{{update.title}} - {% if user == update.user and not update.edit_window_has_expired %} - - {% bootstrap_icon "pencil" %} Edit - {% endif %} -

-

{{update.created_at|date:"d-M-Y"}}

-
-
-
-

- {% if update.user.avatar %} - {% img update.user 50 50 update.user.get_full_name %} - {% endif %} - by {{update.user.first_name}} {{update.user.last_name}} via {{update.get_update_method_display}} -

-
- {% if update.video %} -

{% video update.video '600x450' %}

-

- {% if update.video_caption %} - "{{ update.video_caption }}"{% if update.video_credit %}
{% endif %} - {% endif %} - {% if update.video_credit %}{% trans 'Video credit' %}: {{ update.video_credit }}{% endif %} -

+
+ {% include "partials/project_header.html" with project=update.project %} +
+
+
+

{{update.title}} + {% if user == update.user and not update.edit_window_has_expired %} + + {% bootstrap_icon "pencil" %} Edit + {% endif %} +

+
{{update.created_at|date:"d-M-Y"}}
+
+
+

+ {% if update.user.avatar %} + {% img update.user 50 50 update.user.get_full_name %} {% endif %} - {% if update.photo %} -

{% img update 600 450 update.title %}

-

- {% if update.photo_caption %} - "{{ update.photo_caption }}"{% if update.photo_credit %}
{% endif %} - {% endif %} - {% if update.photo_credit %}{% trans 'Photo credit' %}: {{ update.photo_credit }}{% endif %} + by{{u.user.first_name}} {{u.user.last_name}} via {{update.get_update_method_display}}

- {% endif %} - {% autoescape off %} -

{{ update.text|force_escape|urlize|apply_markup:"markdown" }}

- {% endautoescape %}
-
- {% if other_updates %} -
+
+ {% if other_updates %} + - {% endif %} -
-
-
+
+ {% endfor %} + + {% endif %}
- - -{% endblock %} + +{% endblock %} \ No newline at end of file From d004c565a6f7e5cf32b782b725096d8ca9a8c4ec Mon Sep 17 00:00:00 2001 From: Loic Date: Wed, 18 Feb 2015 16:23:03 +0200 Subject: [PATCH 2/3] [#1123] Fix user name code --- akvo/templates/update_main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akvo/templates/update_main.html b/akvo/templates/update_main.html index e978631b35..a8d17500cc 100644 --- a/akvo/templates/update_main.html +++ b/akvo/templates/update_main.html @@ -72,7 +72,7 @@

{% trans "Latest updates from this project" %}

{{u.title}}
-
by{{u.user.first_name}} {{u.user.last_name}} +
by{{update.user.first_name}} {{update.user.last_name}} {% if u.user.approved_organisations %} {% with org=u.user.approved_organisations.0 %} ( {{org.long_name}} ) From cf022cb08ba331ce9f936da2955aabaef37363c0 Mon Sep 17 00:00:00 2001 From: Kasper Brandt Date: Wed, 18 Feb 2015 15:26:49 +0100 Subject: [PATCH 3/3] [#1123] Fixed user names --- akvo/templates/update_main.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akvo/templates/update_main.html b/akvo/templates/update_main.html index a8d17500cc..5646dd6ecd 100644 --- a/akvo/templates/update_main.html +++ b/akvo/templates/update_main.html @@ -20,7 +20,7 @@

{{update.title}} {% if update.user.avatar %} {% img update.user 50 50 update.user.get_full_name %} {% endif %} - by{{u.user.first_name}} {{u.user.last_name}} via {{update.get_update_method_display}} + by{{update.user.first_name}} {{update.user.last_name}} via {{update.get_update_method_display}}

@@ -72,7 +72,7 @@

{% trans "Latest updates from this project" %}

{{u.title}}
-
by{{update.user.first_name}} {{update.user.last_name}} +
by{{u.user.first_name}} {{u.user.last_name}} {% if u.user.approved_organisations %} {% with org=u.user.approved_organisations.0 %} ( {{org.long_name}} )