Download as
Browse Code »

Commit 607350acdf6be99b16900f243e0e902284fb1fe6

Authored by Sergio Oliveira
1 parent 87966e6e
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Customizing planet template and fixing translation

Showing 6 changed files with 103 additions and 4 deletions   Show diff stats
src/colab/static/css/screen.css
  Diff comments   View file @607350a
... ... @@ -176,6 +176,7 @@ label.avatar-placeholder {
176 176 color: #fff;
177 177 margin-right: 5px;
178 178 line-height: 2;
  179 + white-space: nowrap;
179 180 }
180 181  
181 182 .tag:hover,
... ... @@ -345,3 +346,19 @@ form#set-custom-xmpp-status .custom-xmpp-status {
345 346 #available-chatrooms .available-chatroom {
346 347 margin-left: 1px;
347 348 }
  349 +
  350 +.blog-post-item h3 a {
  351 + text-decoration: none;
  352 +}
  353 +
  354 +.blog-post-item h3 {
  355 + margin-bottom: 0.5em;
  356 +}
  357 +
  358 +.blog-post-item .post-meta {
  359 + margin-bottom: 2em;
  360 +}
  361 +
  362 +.blog-post-item .tags {
  363 + margin-top: 1em;
  364 +}
... ...
src/planet/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @607350a
... ... @@ -7,7 +7,7 @@ msgid ""
7 7 msgstr ""
8 8 "Project-Id-Version: PACKAGE VERSION\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2013-07-24 15:40-0300\n"
  10 +"POT-Creation-Date: 2013-07-24 18:36-0300\n"
11 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -25,6 +25,18 @@ msgstr &quot;anterior&quot;
25 25 msgid "next"
26 26 msgstr "próxima"
27 27  
  28 +#: templates/feedzilla/_post_template.html:9
  29 +msgid "From"
  30 +msgstr "De"
  31 +
  32 +#: templates/feedzilla/_post_template.html:9
  33 +msgid "on"
  34 +msgstr "em"
  35 +
  36 +#: templates/feedzilla/_post_template.html:17
  37 +msgid "Read original"
  38 +msgstr "Ler original"
  39 +
28 40 #: templates/feedzilla/base.html:6
29 41 msgid "Planet"
30 42 msgstr "Planet"
... ... @@ -38,5 +50,18 @@ msgid &quot;Tags&quot;
38 50 msgstr "Tags"
39 51  
40 52 #: templates/feedzilla/base.html:22
41   -msgid "Blogs"
42   -msgstr "Blogs"
  53 +msgid "Source Blogs"
  54 +msgstr "Blogs Fonte"
  55 +
  56 +#: templates/feedzilla/tag.html:5
  57 +#, python-format
  58 +msgid "Posts with &laquo;%(tag)s&raquo; label"
  59 +msgstr ""
  60 +
  61 +#: templates/feedzilla/tag.html:14
  62 +msgid "No posts with such label"
  63 +msgstr ""
  64 +
  65 +#, fuzzy
  66 +#~ msgid "Blogs fonte"
  67 +#~ msgstr "Blogs"
... ...
src/planet/templates/feedzilla/_post_template.html 0 → 100644
  Diff comments   View file @607350a
... ... @@ -0,0 +1,30 @@
  1 +{% load tagging_tags %}
  2 +{% load i18n %}
  3 +
  4 +<div class="blog-post-item">
  5 + <a name="post-{{ post.pk }}"></a>
  6 +
  7 + <h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
  8 +
  9 + <div class="post-meta">{% trans "From" %} <a href="{{ post.feed.site_url }}">{{ post.feed.author_or_title }}</a> {% trans "on" %} {{ post.created }}</div>
  10 +
  11 +
  12 + <div class="content">
  13 + {{ post.summary|safe }}
  14 + </div>
  15 +
  16 + <div>
  17 + <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b>
  18 + </div>
  19 +
  20 + {% if post.tags %}
  21 + <div class="tags">
  22 + <span><b>Tags:</b>
  23 + {% tags_for_object post as tags %}
  24 + {% for tag in tags %}
  25 + <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a>
  26 + {% endfor %}
  27 + </span>
  28 + </div>
  29 + {% endif %}
  30 +</div>
... ...
src/planet/templates/feedzilla/base.html
  Diff comments   View file @607350a
... ... @@ -19,7 +19,7 @@
19 19 {% feedzilla_tag_cloud %}
20 20 </div>
21 21 <div class="box">
22   - <h3>{% trans 'Blogs' %}</h3>
  22 + <h3>{% trans 'Source Blogs' %}</h3>
23 23 {% feedzilla_donor_list %}
24 24 </div>
25 25 </div>
... ...
src/planet/templates/feedzilla/index.html 0 → 100644
  Diff comments   View file @607350a
... ... @@ -0,0 +1,11 @@
  1 +{% extends 'feedzilla/base.html' %}
  2 +{% load i18n %}
  3 +
  4 +{% block feedzilla_content %}
  5 + {% for post in page.object_list %}
  6 + {% include 'feedzilla/_post_template.html' %}
  7 + <hr>
  8 + {% endfor %}
  9 +
  10 + {% include "pagination.html" %}
  11 +{% endblock %}
... ...
src/planet/templates/feedzilla/tag.html 0 → 100644
  Diff comments   View file @607350a
... ... @@ -0,0 +1,16 @@
  1 +{% extends 'feedzilla/base.html' %}
  2 +{% load i18n %}
  3 +
  4 +{% block feedzilla_content %}
  5 +<h3>{% block title %}{% blocktrans %}Posts with &laquo;{{ tag }}&raquo; label{% endblocktrans %}{% endblock title %}</h3>
  6 +<hr>
  7 +{% if page.object_list %}
  8 + {% for post in page.object_list %}
  9 + {% include 'feedzilla/_post_template.html' %}
  10 + <hr>
  11 + {% endfor %}
  12 + {% include "pagination.html" %}
  13 +{% else %}
  14 + <p>{% trans "No posts with such label" %}</p>
  15 +{% endif %}
  16 +{% endblock %}
... ...