Download as
Browse Code »

Commit 7385f3c549fe97cd25a6ac7450a878e26319723b

Authored by Sergio Oliveira
1 parent 5bea757a
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

Updating planet layout

Showing 5 changed files with 61 additions and 70 deletions   Show diff stats
src/planet/templates/common/pagination.html
  Diff comments   View file @7385f3c
1 1 {% load i18n %}
2 2 {% if page.paginator.num_pages > 1 %}
3   -<div class="pagination">
  3 +<div class="text-center">
  4 + <ul class="pagination">
4 5 {% if page.has_previous %}
5   - <a href="{{ alterpath }}{{ page.previous_page_url }}">&laquo; {% trans "previous" %}</a>
6   - {% else %}
7   - <span class="control">&laquo; {% trans "previous" %}</span>
  6 + <li><a href="{{ alterpath }}{{ page.previous_page_url }}">&laquo;</a></li>
8 7 {% endif %}
9 8  
10 9 {% if page.paginator.frame_start_page > 1 %}
11   - <a href="{{ alterpath }}{{ page.first_page_url }}">1</a>
12   - {% if page.paginator.frame_start_page > 2 %}
13   - <span class="control">...</span>
14   - {% endif %}
  10 + <li><a href="{{ alterpath }}{{ page.first_page_url }}">1</a></li>
  11 + {% endif %}
  12 + {% if page.paginator.frame_start_page > 2 %}
  13 + <li class="disabled"><a href="#">...</a></li>
15 14 {% endif %}
16 15  
17 16 {% for number, url in page.paginator.frame %}
18 17 {% if not url %}..{% else %}
19   - <a {% ifequal page.number number%}class="active"{% endifequal %} href="{{ alterpath }}{{ url }}">{{ number }}</a>
  18 + <li {% ifequal page.number number%}class="active"{% endifequal %}><a href="{{ alterpath }}{{ url }}">{{ number }}</a></li>
20 19 {% endif %}
21 20 {% endfor %}
22 21  
23 22 {% if page.paginator.frame_end_page != page.paginator.num_pages %}
24   - {% if page.paginator.frame_end_page != page.paginator.num_pages|add:"-1" %}
25   - <span class="control">...</span>
26   - {% endif %}
27   - <a href="{{ alterpath }}{{ page.last_page_url }}">{{ page.paginator.num_pages }}</a>
  23 + {% if page.paginator.frame_end_page != page.paginator.num_pages|add:"-1" %}
  24 + <li class="disabled"><a href="#">...</a></li>
  25 + {% endif %}
  26 + <li><a href="{{ alterpath }}{{ page.last_page_url }}">{{ page.paginator.num_pages }}</a></li>
28 27 {% endif %}
29 28  
30 29 {% if page.has_next %}
31   - <a href="{{ alterpath }}{{ page.next_page_url }}">{% trans "next" %} &raquo;</a>
32   - {% else %}
33   - <span class="control">{% trans "next" %} &raquo;</span>
  30 + <li><a href="{{ alterpath }}{{ page.next_page_url }}">&raquo;</a></li>
34 31 {% endif %}
35   -
36   - <div class="clear"></div>
  32 + </ul>
37 33 </div>
38 34 {% endif %}
... ...
src/planet/templates/feedzilla/base.html
  Diff comments   View file @7385f3c
... ... @@ -5,21 +5,24 @@
5 5 <h2>{% trans 'Planet' %}</h2>
6 6 <hr/>
7 7  
8   - <div class="row">
9   - {% block feedzilla_content %}{% endblock %}
  8 + <div id="planet" class="row">
  9 + <div class="col-lg-9">
  10 + {% block feedzilla_content %}{% endblock %}
  11 + </div>
10 12  
11 13 <div class="col-lg-3">
12 14 <div class="well">
13   - <a href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
14   - </div>
15   - <div class="well">
16 15 <h3>{% trans 'Tags' %}</h3>
17   - {% include_tagcloud 'feedzilla.post' %}
  16 + {% feedzilla_tag_cloud %}
18 17 </div>
19 18 <div class="well">
20 19 <h3>{% trans 'Source Blogs' %}</h3>
21 20 {% feedzilla_donor_list %}
  21 + <div class="text-center">
  22 + <a class="btn btn-primary" href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
  23 + </div>
22 24 </div>
23 25 </div>
24 26 </div>
  27 +
25 28 {% endblock %}
... ...
src/planet/templates/feedzilla/index.html
  Diff comments   View file @7385f3c
... ... @@ -3,17 +3,16 @@
3 3  
4 4 {% block feedzilla_content %}
5 5  
6   -<div class="col-lg-9">
7   - {% for post in page.object_list %}
8   - {% include 'feedzilla/_post_template.html' %}
9   - <hr>
10   - {% empty %}
11   - <h2>{% trans 'There&#39;s no RSS registered' %}</h2>
12   - <h3>{% trans 'Please' %}
13   -<a href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
14   - {% trans 'to submit a blog' %}</h3>
15   - {% endfor %}
16   -
17   - {% include "pagination.html" %}
18   -</div>
  6 +{% for post in page.object_list %}
  7 + {% include 'feedzilla/_post_template.html' %}
  8 + <hr>
  9 + {% empty %}
  10 + <h2>{% trans 'There is no RSS registered' %}</h2>
  11 + <h3>{% trans 'Please' %}
  12 + href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
  13 + {% trans 'to submit a blog' %}</h3>
  14 +{% endfor %}
  15 +
  16 +{% include "common/pagination.html" %}
  17 +
19 18 {% endblock %}
... ...
src/static/css/screen.css
  Diff comments   View file @7385f3c
... ... @@ -70,38 +70,6 @@ body {
70 70 margin-right: 5px;
71 71 }
72 72  
73   -.tag {
74   - text-decoration: none;
75   - background-color: #2183b3;
76   - padding: 2px 4px;
77   - border-radius: 5px;
78   - font-size: 85%;
79   - color: #fff;
80   - margin-right: 4px;
81   - margin-left: 4px;
82   - line-height: 2;
83   - white-space: nowrap;
84   -}
85   -
86   -.tag:hover,
87   -.tag:focus {
88   - background-color: #21b6e6;
89   - color: #fff;
90   -}
91   -
92   -.tag-cloud .size-1 {
93   - font-size: 90%;
94   -}
95   -.tag-cloud .size-2 {
96   - font-size: 100%;
97   -}
98   -.tag-cloud .size-3 {
99   - font-size: 130%;
100   -}
101   -.tag-cloud .size-4 {
102   - font-size: 150%;
103   -}
104   -
105 73 .subject,
106 74 .subject a {
107 75 color: #000;
... ... @@ -349,3 +317,28 @@ ul.unstyled-list .glyphicon-chevron-right {
349 317 border: none;
350 318 }
351 319 /* End of Converse JS*/
  320 +
  321 +
  322 +/* Feedzilla */
  323 +
  324 +#planet .well h3 {
  325 + margin-top: 0;
  326 +}
  327 +
  328 +.tag-cloud .size-1 {
  329 + font-size: 0.9em;
  330 +}
  331 +
  332 +.tag-cloud .size-2 {
  333 + font-size: 1.2em;
  334 +}
  335 +
  336 +.tag-cloud .size-3 {
  337 + font-size: 1.4em;
  338 +}
  339 +
  340 +.tag-cloud .size-4 {
  341 + font-size: 1.6em;
  342 +}
  343 +
  344 +/* end Feedzilla */
... ...
src/super_archives/templates/message-preview.html
  Diff comments   View file @7385f3c
... ... @@ -13,7 +13,7 @@
13 13  
14 14 {% if doc.mailinglist %}
15 15 <a href="{% url 'super_archives.views.list_messages' %}?list={{ doc.mailinglist }}">
16   - <span class="tag">{{ doc.mailinglist }}</span>
  16 + <span class="label label-primary">{{ doc.mailinglist }}</span>
17 17 </a>
18 18 {% endif %}
19 19  
... ...