Download as
Browse Code »

Commit 09c13ca45041389995ff511510ce192f17ad09bf

Authored by Macartur Sousa
1 parent 7ea86128
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fixed block to be used by noosfero css

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
colab_spb/templates/discussion-message-preview.html
  Diff comments   View file @09c13ca
1 {% load i18n tz highlight %} 1 {% load i18n tz highlight %}
2 2
3 {% if result.fullname or result.modified or result.modified_by %} 3 {% if result.fullname or result.modified or result.modified_by %}
4 - <div class="message-discussion">  
5 <div class="quiet"> 4 <div class="quiet">
6 {% if result.modified %} 5 {% if result.modified %}
7 <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span> 6 <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span>
@@ -31,7 +30,6 @@ @@ -31,7 +30,6 @@
31 <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span> 30 <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
32 {% endif %} 31 {% endif %}
33 </div> 32 </div>
34 - </div>  
35 {% endif %} 33 {% endif %}
36 34
37 {% if result.title %} 35 {% if result.title %}
@@ -60,7 +58,6 @@ @@ -60,7 +58,6 @@
60 58
61 {% if result.description %} 59 {% if result.description %}
62 <!-- a striptags filter was raising an error here because using with highlight --> 60 <!-- a striptags filter was raising an error here because using with highlight -->
63 - <div class="message-discussion">  
64 <span class="quiet"> - {% if query %} 61 <span class="quiet"> - {% if query %}
65 {% highlight result.description with query max_length "110" %} 62 {% highlight result.description with query max_length "110" %}
66 {% else %} 63 {% else %}
@@ -71,5 +68,4 @@ @@ -71,5 +68,4 @@
71 {% endif %} 68 {% endif %}
72 {% endif %} 69 {% endif %}
73 </span> 70 </span>
74 - <div>  
75 {% endif %} 71 {% endif %}
colab_spb/templates/discussion.html
  Diff comments   View file @09c13ca
1 {% load i18n %} 1 {% load i18n %}
2 {% for listname, description, latest, most_relevant, number_of_users in lists %} 2 {% for listname, description, latest, most_relevant, number_of_users in lists %}
3 {% if latest or most_relevant %} 3 {% if latest or most_relevant %}
  4 + <div id='discussions-content'>
4 <div class="row"> 5 <div class="row">
5 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> 6 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
6 <h4>{% trans 'latest'|title %}</h4> 7 <h4>{% trans 'latest'|title %}</h4>
7 {% for thread in latest %} 8 {% for thread in latest %}
  9 + <div class="message-discussion">
8 {% include "discussion-message-preview.html" with result=thread.latest_message %} 10 {% include "discussion-message-preview.html" with result=thread.latest_message %}
  11 + </div>
9 {% endfor %} 12 {% endfor %}
10 <div class="text-right"> 13 <div class="text-right">
11 <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread"> 14 <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread">
@@ -17,7 +20,9 @@ @@ -17,7 +20,9 @@
17 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> 20 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
18 <h4>{% trans 'most relevant'|title %}</h4> 21 <h4>{% trans 'most relevant'|title %}</h4>
19 {% for thread in most_relevant %} 22 {% for thread in most_relevant %}
  23 + <div class="message-discussion">
20 {% include "discussion-message-preview.html" with result=thread %} 24 {% include "discussion-message-preview.html" with result=thread %}
  25 + </div>
21 {% endfor %} 26 {% endfor %}
22 <div class="text-right"> 27 <div class="text-right">
23 <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread"> 28 <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread">
@@ -26,5 +31,6 @@ @@ -26,5 +31,6 @@
26 </div> 31 </div>
27 </div> 32 </div>
28 </div> 33 </div>
  34 + </div>
29 {% endif %} 35 {% endif %}
30 {% endfor %} 36 {% endfor %}