diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 99258e1..25ecf5f 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -5,13 +5,13 @@ class EmbedController < ApplicationController
source = params[:source]
if !block.visible?
- render :template => 'shared/embed_denied.rhtml', :status => 403, :layout => "embed-block"
+ render :template => 'shared/embed_denied.rhtml', :status => 403, :layout => "embed"
else
locals = {:source => source, :block => block}
- render 'embed/index', :layout => 'embed-block', :locals => locals
+ render 'embed/index', :layout => 'embed', :locals => locals
end
rescue ActiveRecord::RecordNotFound
- render :template => 'shared/embed_not_found.rhtml', :status => 404, :layout => "embed-block"
+ render :template => 'shared/embed_not_found.rhtml', :status => 404, :layout => "embed"
end
end
diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb
index 4ce343a..6ee611a 100644
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -221,11 +221,13 @@ module BoxesHelper
#if block.respond_to?(:embedable)
if true
+
+ url = url_for :controller => 'embed', :action => 'embed_block', :id => block.id, :only_path => false;
+
html = content_tag('div',
- content_tag('h2', _('Embed code')) +
+ content_tag('h2', _('Embed block code')) +
content_tag('div', 'Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.', :style => 'margin-bottom: 1em;') +
- content_tag('textarea', '*This is the embed code for this block!*', :style => 'margin-bottom: 1em; width:100%; height:40%;') +
- thickbox_copy_to_clipboard_button(_('Copy to clipboard')) +
+ content_tag('textarea', block.embed_code(url), :style => 'margin-bottom: 1em; width:100%; height:40%;') +
thickbox_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
buttons << thickbox_inline_popup_icon(:embed, _('Embed code'), {}, "embed-code-box-#{block.id}") << html
diff --git a/app/models/block.rb b/app/models/block.rb
index 1d51c1c..f27959a 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -16,6 +16,10 @@ class Block < ActiveRecord::Base
named_scope :enabled, :conditions => { :enabled => true }
+ def embed_code(url)
+ html = ""
+ end
+
# Determines whether a given block must be visible. Optionally a
# context must be specified. context must be a hash, and
# may contain the following keys:
diff --git a/app/views/layouts/embed-block.rhtml b/app/views/layouts/embed-block.rhtml
deleted file mode 100644
index eac5f45..0000000
--- a/app/views/layouts/embed-block.rhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- Noosfero embed block
-
- <%= noosfero_stylesheets %>
- <%= noosfero_javascript %>
-
-
-
-
- <%= yield %>
-
-
-
-
-
-
-
diff --git a/app/views/layouts/embed.rhtml b/app/views/layouts/embed.rhtml
new file mode 100644
index 0000000..a7227d8
--- /dev/null
+++ b/app/views/layouts/embed.rhtml
@@ -0,0 +1,57 @@
+
+
+
+ Noosfero embed block
+
+
+ <%= noosfero_stylesheets %>
+ <%= noosfero_javascript %>
+
+
+
+
+
+
+ <%=
+ @plugins.dispatch(:body_beginning).collect do |content|
+ content.respond_to?(:call) ? content.call : content
+ end.join("\n")
+ %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index 9ae8f80..1450c6f 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -1,6 +1,5 @@
/******************SMALL ICONS********************/
.icon-embed { background-image: url(Tango/16x16/apps/utilities-terminal.png) }
-.icon-copy-to-clipboard { background-image: url(Tango/16x16/actions/gtk-copy.png) }
.icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) }
.icon-home { background-image: url(Tango/16x16/actions/go-home.png) }
.icon-home-not { background-image: url(mod/16x16/actions/go-home-not.png) }
diff --git a/public/javascripts/thickbox.js b/public/javascripts/thickbox.js
index d5694df..411e233 100644
--- a/public/javascripts/thickbox.js
+++ b/public/javascripts/thickbox.js
@@ -265,10 +265,6 @@ function tb_showIframe(){
jQuery("#TB_window").css({display:"block"});
}
-function tb_copy_to_clipboard() {
- alert('Text copied to clipboard!');
-}
-
function tb_remove() {
jQuery("#TB_imageOff").unbind("click");
jQuery("#TB_closeWindowButton").unbind("click");
--
libgit2 0.21.2