Download as
Browse Code »

Commit 4bee61eea82e2060b01e8b18f26938f987cc66d5

Authored by Braulio Bhavamitra
2 parents b403cda3 899e050f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'product-tabs-for-plugins' into 'master' 

Product's tabs for plugins

Reopened from !21

See merge request !442
Showing 4 changed files with 37 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @4bee61e
... ... @@ -46,6 +46,8 @@ module ApplicationHelper
46 46  
47 47 include CatalogHelper
48 48  
  49 + include PluginsHelper
  50 +
49 51 def locale
50 52 (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
51 53 end
... ...
app/helpers/plugins_helper.rb 0 → 100644
  Diff comments   View file @4bee61e
... ... @@ -0,0 +1,9 @@
  1 +module PluginsHelper
  2 +
  3 + def plugins_product_tabs
  4 + @plugins.dispatch(:product_tabs, @product).map do |tab|
  5 + {:title => tab[:title], :id => tab[:id], :content => instance_eval(&tab[:content])}
  6 + end
  7 + end
  8 +
  9 +end
... ...
app/views/manage_products/show.html.erb
  Diff comments   View file @4bee61e
... ... @@ -24,6 +24,8 @@
24 24 <br style='clear: both'/>
25 25  
26 26 <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty? && !@product.price_described? ) %>
  27 + <% plugins_tabs = plugins_product_tabs %>
  28 +
27 29 <div class='ui-tabs' id='product-<%= @product.id %>-tabs'>
28 30 <ul>
29 31 <% if !@product.description.blank? || @allowed_user %>
... ... @@ -35,19 +37,32 @@
35 37 <% if @product.price_described? || @allowed_user %>
36 38 <li class='tab'><a href='#product-price-details'><%= _('Price composition') %></a></li>
37 39 <% end %>
  40 +
  41 + <% plugins_tabs.each do |tab| %>
  42 + <li class='tab'><a href='#<%=tab[:id]%>'><%= tab[:title] %></a></li>
  43 + <% end %>
  44 +
38 45 </ul>
  46 +
39 47 <div id='product-description'>
40 48 <%= render :partial => 'manage_products/display_description' %>
41 49 </div>
  50 +
42 51 <div id='product-inputs'>
43 52 <%= render :partial => 'manage_products/display_inputs' %>
44 53 </div>
  54 +
45 55 <% if @product.price_described? || @allowed_user %>
46 56 <div id='product-price-details'>
47 57 <%= render :partial => 'manage_products/display_price_details' %>
48 58 <%= render :partial => 'manage_products/price_details_button' %>
49 59 </div>
50 60 <% end %>
  61 +
  62 + <% plugins_tabs.each do |tab| %>
  63 + <div id='<%=tab[:id]%>'><%= raw tab[:content] %></div>
  64 + <% end %>
  65 +
51 66 </div>
52 67 <% end %>
53 68  
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @4bee61e
... ... @@ -256,7 +256,16 @@ class Noosfero::Plugin
256 256 nil
257 257 end
258 258  
259   - # -> Adds content to catalog item
  259 + # -> Adds tabs to the products
  260 + # returns = { :title => title, :id => id, :content => content }
  261 + # title = name that will be displayed.
  262 + # id = div id.
  263 + # content = lambda block that creates html code.
  264 + def product_tabs product
  265 + nil
  266 + end
  267 +
  268 + # -> Adds content to calalog item
260 269 # returns = lambda block that creates html code
261 270 def catalog_item_extras(item)
262 271 nil
... ... @@ -422,7 +431,7 @@ class Noosfero::Plugin
422 431 def upload_files_extra_fields(article)
423 432 nil
424 433 end
425   -
  434 +
426 435 # -> Adds fields to the signup form
427 436 # returns = proc that creates html code
428 437 def signup_extra_contents
... ...