Download as
Browse Code »

Commit 1da8268c03f9e85e05f3212571f9e3e2b3ca4264

Authored by Francisco Marcelo de Araújo Lima Júnior
1 parent b6d443cb
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

improvements on embed block

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @1da8268
@@ -219,10 +219,8 @@ module BoxesHelper @@ -219,10 +219,8 @@ module BoxesHelper
219 buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), {}, "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}") 219 buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), {}, "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
220 end 220 end
221 221
222 - #if block.respond_to?(:embedable)  
223 - if true  
224 -  
225 - url = url_for :controller => 'embed', :action => 'embed_block', :id => block.id, :only_path => false; 222 + if block.respond_to?(:embedable)
  223 + url = url_for :controller => 'embed', :action => 'index', :id => block.id, :only_path => false;
226 224
227 html = content_tag('div', 225 html = content_tag('div',
228 content_tag('h2', _('Embed block code')) + 226 content_tag('h2', _('Embed block code')) +
app/models/block.rb
  Diff comments   View file @1da8268
@@ -16,6 +16,10 @@ class Block &lt; ActiveRecord::Base @@ -16,6 +16,10 @@ class Block &lt; ActiveRecord::Base
16 16
17 named_scope :enabled, :conditions => { :enabled => true } 17 named_scope :enabled, :conditions => { :enabled => true }
18 18
  19 + def embedable
  20 + true
  21 + end
  22 +
19 def embed_code(url) 23 def embed_code(url)
20 html = "<iframe src='#{url}?source=SOURCE_NAME' frameborder='0' allowfullscreen ></iframe>" 24 html = "<iframe src='#{url}?source=SOURCE_NAME' frameborder='0' allowfullscreen ></iframe>"
21 end 25 end