Download as
Browse Code »

Commit 41a4252f47beee3252b518940240b084592e3eb5

Authored by Carlos Coêlho
1 parent 5559e5f2
Exists in master and in 53 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, 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_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, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Dropdown menu for threads 

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Showing 3 changed files with 18 additions and 4 deletions   Show diff stats
src/colab-spb-theme-plugin/colab_spb_theme/static/css/screen.css
  Diff comments   View file @41a4252
@@ -574,3 +574,7 @@ form.signup { @@ -574,3 +574,7 @@ form.signup {
574 font-family: Arial; 574 font-family: Arial;
575 padding-top: 7px; 575 padding-top: 7px;
576 } 576 }
  577 +
  578 +a.btn {
  579 + margin: 2px 0 2px 0;
  580 +}
src/colab-spb-theme-plugin/colab_spb_theme/templates/accounts/user_detail.html
  Diff comments   View file @41a4252
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 27
28 {% if request.user == user_ or request.user.is_superuser %} 28 {% if request.user == user_ or request.user.is_superuser %}
29 <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "edit profile"|title %}</a> 29 <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "edit profile"|title %}</a>
30 - <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;Inscrições nas listas de discussão</a> 30 + <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;Inscreva-se nas listas de discussão</a>
31 {% endif %} 31 {% endif %}
32 32
33 {% if request.user.is_active %} 33 {% if request.user.is_active %}
src/colab-spb-theme-plugin/colab_spb_theme/templates/header.html
  Diff comments   View file @41a4252
@@ -134,9 +134,19 @@ @@ -134,9 +134,19 @@
134 </div> 134 </div>
135 <div id="sobre"> 135 <div id="sobre">
136 <ul> 136 <ul>
137 - <li id="softwarepublico-groups" class="softwarepublico-item">  
138 - <a href="{% url 'thread_list' %}" title="Listas de discussão">Listas de discussão</a>  
139 - </li> 137 + {% if not user.is_authenticated %}
  138 + <li id="softwarepublico-groups" class="softwarepublico-item">
  139 + <a href="{% url 'thread_list' %}" title="Listas de discussão">Listas de discussão</a>
  140 + </li>
  141 + {% else %}
  142 + <li class="dropdown softwarepublico-item">
  143 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Listas de discussão <b class="caret"></b></a>
  144 + <ul class="dropdown-menu">
  145 + <li><a href="{% url 'thread_list' %}">Acesse todas as listas</a></li>
  146 + <li><a href="{% url 'user_list_subscriptions' user %}">Inscreva-se nas listas</a></li>
  147 + </ul>
  148 + </li>
  149 + {% endif %}
140 {% plugins_menu %} 150 {% plugins_menu %}
141 <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item"> 151 <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item">
142 <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a> 152 <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a>