Download as
Browse Code »

Commit d99faa27fa0fb063b0b06132458b9367e48a7869

Authored by Tallys Martins
1 parent 52f0d711
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

Added community buttons to profile page

Showing 2 changed files with 27 additions and 1 deletions   Show diff stats
views/blocks/software_information.html.erb
  Diff comments   View file @d99faa2
... ... @@ -12,7 +12,7 @@
12 12 <%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
13 13 </span>
14 14 <div class='admin-link'>
15   - <% if current_user && block.owner.admins.include?(current_user.person) %>
  15 + <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
16 16 <%= link_to _('Control panel'), block.owner.admin_url %>
17 17 <% end %>
18 18 </div>
... ...
views/profile/index.html.erb 0 → 100644
  Diff comments   View file @d99faa2
... ... @@ -0,0 +1,26 @@
  1 +<h1><%= h profile.name %></h1>
  2 +
  3 +<% if @action %>
  4 + <%= render :partial => 'private_profile' %>
  5 +<% else %>
  6 + <% unless profile.description.blank? %>
  7 + <div class='public-profile-description'>
  8 + <%= profile.description %>
  9 + </div>
  10 + <% end %>
  11 +<% end %>
  12 +
  13 +<div class="page-profile-header">
  14 + <%= render "blocks/profile_info_actions/join_leave_community" %>
  15 + <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
  16 + <div class="control-panel-button">
  17 + <%= button :control_panel, _('Control Panel'), profile.admin_url %>
  18 + </div>
  19 + <% end %>
  20 +</div>
  21 +
  22 +<% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
  23 + <table class='profile'>
  24 +
  25 + </table>
  26 +<% end %>
... ...