diff --git a/app/views/content_viewer/_addthis.html.erb b/app/views/content_viewer/_addthis.html.erb new file mode 100644 index 0000000..a529024 --- /dev/null +++ b/app/views/content_viewer/_addthis.html.erb @@ -0,0 +1,8 @@ +
+ + <%= addthis_image_tag %> +
diff --git a/app/views/content_viewer/_addthis.rhtml b/app/views/content_viewer/_addthis.rhtml deleted file mode 100644 index a529024..0000000 --- a/app/views/content_viewer/_addthis.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -
- - <%= addthis_image_tag %> -
diff --git a/app/views/embed/not_found.html.erb b/app/views/embed/not_found.html.erb new file mode 100644 index 0000000..49785b8 --- /dev/null +++ b/app/views/embed/not_found.html.erb @@ -0,0 +1,6 @@ +
+

+ <%= _('You may have clicked an expired link or mistyped the address.') %> + <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %> +

+
diff --git a/app/views/embed/not_found.rhtml b/app/views/embed/not_found.rhtml deleted file mode 100644 index 49785b8..0000000 --- a/app/views/embed/not_found.rhtml +++ /dev/null @@ -1,6 +0,0 @@ -
-

- <%= _('You may have clicked an expired link or mistyped the address.') %> - <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %> -

-
diff --git a/app/views/embed/unavailable.html.erb b/app/views/embed/unavailable.html.erb new file mode 100644 index 0000000..6fb5d5e --- /dev/null +++ b/app/views/embed/unavailable.html.erb @@ -0,0 +1,3 @@ +
+

<%= _('Embed unavailable.') %>

+
diff --git a/app/views/embed/unavailable.rhtml b/app/views/embed/unavailable.rhtml deleted file mode 100644 index 6fb5d5e..0000000 --- a/app/views/embed/unavailable.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -
-

<%= _('Embed unavailable.') %>

-
diff --git a/app/views/layouts/embed.html.erb b/app/views/layouts/embed.html.erb new file mode 100644 index 0000000..c750346 --- /dev/null +++ b/app/views/layouts/embed.html.erb @@ -0,0 +1,35 @@ + + + + Noosfero embed block + + <%= noosfero_stylesheets %> + <%= noosfero_javascript %> + + +
+
+
+
+
+
+
+
+ <%= yield %> +
+
+
+
+
+
+
+
+ + + + + diff --git a/app/views/layouts/embed.rhtml b/app/views/layouts/embed.rhtml deleted file mode 100644 index c750346..0000000 --- a/app/views/layouts/embed.rhtml +++ /dev/null @@ -1,35 +0,0 @@ - - - - Noosfero embed block - - <%= noosfero_stylesheets %> - <%= noosfero_javascript %> - - -
-
-
-
-
-
-
-
- <%= yield %> -
-
-
-
-
-
-
-
- - - - - diff --git a/app/views/shared/_select_categories_top.html.erb b/app/views/shared/_select_categories_top.html.erb new file mode 100644 index 0000000..b0ccf76 --- /dev/null +++ b/app/views/shared/_select_categories_top.html.erb @@ -0,0 +1,26 @@ +<% categories_selected ||= nil %> +<% title ||= nil %> + +<% extend CategoriesHelper %> + +<%= content_tag "h#{title_size}", title, :class => "box-title" %> + +<%= hidden_field_tag "#{object_name}[category_ids][]", nil %> + +
+<% unless categories_selected.nil? %> +
+
<%= _('Selected categories:') %>
+ <% categories_selected.each do |cat| %> +
+ <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %> + <%= selected_category_link(cat) %> +
+ <% end %> +
+<% end %> +
+ <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %> +
+ +
diff --git a/app/views/shared/_select_categories_top.rhtml b/app/views/shared/_select_categories_top.rhtml deleted file mode 100644 index b0ccf76..0000000 --- a/app/views/shared/_select_categories_top.rhtml +++ /dev/null @@ -1,26 +0,0 @@ -<% categories_selected ||= nil %> -<% title ||= nil %> - -<% extend CategoriesHelper %> - -<%= content_tag "h#{title_size}", title, :class => "box-title" %> - -<%= hidden_field_tag "#{object_name}[category_ids][]", nil %> - -
-<% unless categories_selected.nil? %> -
-
<%= _('Selected categories:') %>
- <% categories_selected.each do |cat| %> -
- <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %> - <%= selected_category_link(cat) %> -
- <% end %> -
-<% end %> -
- <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %> -
- -
diff --git a/app/views/shared/_select_subcategories.html.erb b/app/views/shared/_select_subcategories.html.erb new file mode 100644 index 0000000..19533c9 --- /dev/null +++ b/app/views/shared/_select_subcategories.html.erb @@ -0,0 +1,16 @@ +<% if !categories.nil? && !categories.empty? && !@object.nil? %> +
+
<%= _('Click to select a category') %>
+ + <% categories.select{|i| @object.accept_category?(i)}.each do |category| %> + + <%= link_to_remote category.name, + { :update => "select-categories", + :url => { :action => "update_categories", :category_id => category.id, :id => @object}, + :loaded => visual_effect(:highlight, "select-categories") + }, + :class => 'select-subcategory-link', + :id => "select-category-#{category.id}-link" + %> + <% end %> +<% end %> diff --git a/app/views/shared/_select_subcategories.rhtml b/app/views/shared/_select_subcategories.rhtml deleted file mode 100644 index 19533c9..0000000 --- a/app/views/shared/_select_subcategories.rhtml +++ /dev/null @@ -1,16 +0,0 @@ -<% if !categories.nil? && !categories.empty? && !@object.nil? %> -
-
<%= _('Click to select a category') %>
- - <% categories.select{|i| @object.accept_category?(i)}.each do |category| %> - - <%= link_to_remote category.name, - { :update => "select-categories", - :url => { :action => "update_categories", :category_id => category.id, :id => @object}, - :loaded => visual_effect(:highlight, "select-categories") - }, - :class => 'select-subcategory-link', - :id => "select-category-#{category.id}-link" - %> - <% end %> -<% end %> -- libgit2 0.21.2