Merge branch 'stable'

Antonio Terceiro
2 parents a831c754 297ad5e9
Showing 23 changed files with 125 additions and 33 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/tags_helper.rb
app/models/article.rb
app/models/slideshow_block.rb
app/models/uploaded_file.rb
app/views/blocks/profile_image.rhtml
app/views/blocks/profile_info.rhtml
app/views/blocks/slideshow.rhtml
app/views/box_organizer/_slideshow_block.rhtml
app/views/cms/_tiny_mce_article.rhtml
app/views/cms/publish.rhtml
app/views/cms/upload_files.rhtml
app/views/layouts/application-ng.rhtml
app/views/layouts/application.rhtml
app/views/layouts/slideshow.rhtml
app/views/profile/index.rhtml
app/views/profile_editor/index.rhtml
db/migrate/20100413231206_strip_html_from_tag_names.rb
db/schema.rb
@@ -459,7 +459,7 @@ module ApplicationHelper
   # #profile_image) or only its name below.
   def profile_add_link( profile, image=false, size=:portrait, tag='li')
     the_class = profile.members.include?(user) ? 'profile_member' : ''
-    name = profile.short_name
+    name = h(profile.short_name)
     if image
       display = content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
                 content_tag( 'span', name, :class => 'org' ) +
@@ -492,7 +492,7 @@ module ApplicationHelper
     content_tag tag,
         link_to(
             content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', name, :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+            content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
             city + profile_sex_icon( profile ) + profile_cat_icons( profile ),
             profile.url,
             :onclick => 'document.location.href = this.href', # work-arround for ie.
@@ -505,7 +505,7 @@ module ApplicationHelper
   # displays a link to the community homepage with its image (as generated by
   # #profile_image) and its name and number of members beside it.
   def community_image_link( profile, size=:portrait, tag='li' )
-    name = profile.name
+    name = h(profile.name)
     content_tag tag,
         link_to(
             content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
@@ -14,7 +14,7 @@ module ContentViewerHelper
   def article_title(article, args = {})
     title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
-    title = content_tag('h1', title, :class => 'title')
+    title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog?
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
@@ -57,7 +57,7 @@ module TagsHelper
         display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""
         link_to tag + display_count, destination, :style => style
       else
-        link_to tag , destination, :style => style,
+        link_to h(tag) , destination, :style => style,
           :title => n_( 'one item', '%d items', count ) % count
       end
@@ -348,7 +348,11 @@ class Article &lt; ActiveRecord::Base
   def sanitize_tag_list
     sanitizer = HTML::FullSanitizer.new
-    self.tag_list.names.map!{|i| sanitizer.sanitize(i) }
+    self.tag_list.names.map!{|i| strip_tag_name sanitizer.sanitize(i) }
+  end
+
+  def strip_tag_name(tag_name)
+    tag_name.gsub(/[<>]/, '')
   end
 end
@@ -4,13 +4,27 @@ class SlideshowBlock &lt; Block
   settings_items :interval, :type => 'integer', :default => 4
   settings_items :shuffle, :type => 'boolean', :default => false
   settings_items :navigation, :type => 'boolean', :default => false
+  settings_items :image_size, :type => 'string', :default => 'thumb'
   def self.description
     _('Slideshow')
   end
   def gallery
-    gallery_id ? Folder.find(gallery_id) : nil
+    gallery_id ? Folder.find(:first, :conditions => { :id => gallery_id }) : nil
+  end
+
+  def public_filename_for(image)
+    check_filename(image, image_size) || check_filename(image, 'thumb')
+  end
+
+  def check_filename(image, size)
+    filename = image.public_filename(size)
+    if File.exists?(File.join(Rails.root, 'public', filename))
+      filename
+    else
+      nil
+    end
   end
   def block_images
@@ -21,7 +21,7 @@ class UploadedFile &lt; Article
   #  :min_size => 2.megabytes
   #  :max_size => 5.megabytes
   has_attachment :storage => :file_system,
-    :thumbnails => { :icon => [24,24], :thumb => '130x130>', :display => '640X480>' },
+    :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
     :max_size => 5.megabytes # remember to update validate message below
@@ -11,7 +11,7 @@
 </div>
 <% if show_name %>
-  <p><%= block.owner.short_name %></p>
+  <p><%= h block.owner.short_name %></p>
 <% end %>
 <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
 <div class="vcard">
-<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= block.owner.short_name %></h2>
+<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= h block.owner.short_name %></h2>
 <div class="profile-info-picture">
   <div class="profile-info-picture-inner1">
@@ -5,7 +5,7 @@
     <div class='slideshow-container'>
       <% images.each do |img| %>
         <a href="<%= url_for(img.external_link.blank? ? img.view_url: img.external_link) %>">
-          <%= content_tag('div', '', :style => "background-image: url(#{img.public_filename(:thumb)})", :title => (img.abstract.blank? ? '' : img.abstract)) %>
+          <%= content_tag('div', '', :style => "background-image: url(#{block.public_filename_for(img)})", :title => (img.abstract.blank? ? '' : img.abstract)) %>
           <% if !img.abstract.blank? %>
             <span class='image-description'><%= img.abstract %></span>
           <% end %>
@@ -3,6 +3,8 @@
   [ _('%{gallery} (%{count} images)') % {:gallery => item.path, :count => item.images.reject{|image| image.folder?}.count}, item.id ]
 }) %>
+<%= labelled_form_field(_('Image size'), select('block', 'image_size', [[_('Miniatura'), 'thumb'],[_('Slideshow size'), 'slideshow']])) %>
+
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
 <%= labelled_form_field check_box(:block, :shuffle) + _('Show images in random order'), '' %>
@@ -2,7 +2,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<div style='margin-left: 20px;'>
+<div>
   <% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %>
     <div>
       <%= _('Title') %>: <%= @article.name %>
@@ -14,16 +14,24 @@
   </div>
 <% end %>
-<% form_tag do%>
- <%= hidden_field_tag :back_to, @back_to %>
- <% @groups.each do |group| %>
-    <%= labelled_check_box group.name, 'marked_groups[][group_id]', group.id, @marked_groups.include?(group) %><br />
-    <%= labelled_text_field _('Title') + ': ', 'marked_groups[][name]', @article.name, :style => 'width: 100%' %>
-    <hr />
-  <% end %>
-  <% button_bar do %>
-    <%= submit_button 'spread', _('Publish') %>
+<!-- Workaroud while the publish feature isn't ready for Events -->
+<% unless @article.is_a?(Event) %>
+  <% form_tag do%>
+    <%= hidden_field_tag :back_to, @back_to %>
+    <% @groups.each do |group| %>
+      <%= labelled_check_box group.name, 'marked_groups[][group_id]', group.id, @marked_groups.include?(group) %><br />
+      <%= labelled_text_field _('Title') + ': ', 'marked_groups[][name]', @article.name, :style => 'width: 100%' %>
+      <hr />
+    <% end %>
+
+    <% button_bar do %>
+      <%= submit_button 'spread', _('Publish') %>
+    <% end %>
   <% end %>
+<% else %>
+  <div class='atention'>
+    <%= _("This option is temporarily disabled.") %>
+  </div>
 <% end %>
@@ -20,5 +20,5 @@
 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
 <% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
-  <%= render :partial => 'upload_file_form', :locals => { :size => '50'} %>
+  <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
 <% end %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
   <head>
-    <title><%= page_title %></title>
+    <title><%= h page_title %></title>
     <%= meta_tags_for_article(@page) %>
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
   <head>
-    <title><%= page_title %></title>
+    <title><%= h page_title %></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="description" content="<%= @environment.name %>" />
     <meta name="keywords" content="Noosfero, Community, Open Source" />
@@ -11,7 +11,7 @@
     %></title>
     <%= stylesheet_import "slideshow" %>
-    <%= javascript_include_tag 'sliderjs', 'pikachoose', :cache => 'cache-slideshow' %>
+    <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose', :cache => 'cache-slideshow' %>
     <script type="text/javascript">
       $(document).ready(function (){
         $("#slideshow").PikaChoose({
 <%= render :partial => 'shared/disabled_enterprise' %>
-<h1><%= profile.name %></h1>
+<h1><%= h profile.name %></h1>
 <% if @action %>
   <%= render :partial => 'private_profile' %>
 <div id="profile-editor-index">
   <h1 class="block-title">
-    <span class='control-panel-title'><%= profile.short_name %></span>
+    <span class='control-panel-title'><%= h profile.short_name %></span>
     <span class='control-panel-sep'>&#150;</span>
     <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
   </h1>
@@ -0,0 +1,12 @@
+class StripHtmlFromTagNames < ActiveRecord::Migration
+  def self.up
+    Tag.all(:conditions => "name LIKE '%<%' OR name LIKE '%>%'").each do |tag|
+      tag.name = tag.name.gsub(/[<>]/, '')
+      tag.save
+    end
+  end
+
+  def self.down
+    say "WARNING: cannot undo this migration"
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20100326171758) do
+ActiveRecord::Schema.define(:version => 20100413231206) do
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -2536,7 +2536,7 @@ div#activation_enterprise div {
   width: 40%;
   height: 630px;
   border: none;
-  margin: 115px 20px 0px 0px;
+  margin: 104px 20px 0px 0px;
   padding: 0px;
   overflow: hidden;
 }
@@ -2546,12 +2546,11 @@ div#activation_enterprise div {
 }
 .controller-cms div.with_media_panel {
-  width: 57%;
   float: left;
 }
-.controller-cms div.no_media_panel {
-  margin-left: 200px;
-  margin-right: 200px;
+
+div.with_media_panel .formfield input {
+  width: 100%;
 }
 /* ==> public/stylesheets/controller_contact.css <== */
@@ -842,4 +842,21 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal [ published ], profile.articles.published
   end
+
+  should 'sanitize tags after save article' do
+    article = fast_create(Article, :slug => 'article-with-tags', :profile_id => profile.id)
+    article.tags << Tag.new(:name => "TV Web w<script type='javascript'></script>")
+    assert_match /[<>]/, article.tags.last.name
+    article.save!
+    assert_no_match /[<>]/, article.tags.last.name
+  end
+
+  should 'strip HTML from tag names after save article' do
+    article = fast_create(Article, :slug => 'article-with-tags', :profile_id => profile.id)
+    article.tags << Tag.new(:name => "TV Web w<script type=...")
+    assert_match /</, article.tags.last.name
+    article.save!
+    assert_no_match /</, article.tags.last.name
+  end
+
 end
@@ -15,6 +15,10 @@ class SlideshowBlockTest &lt; ActiveSupport::TestCase
     assert_equal gallery, slideshow_block.gallery
   end
+  should 'not crash if referencing unexisting folder' do
+    assert_nil SlideshowBlock.new(:gallery_id => -999).gallery
+  end
+
   should 'default interval between transitions is 4 seconds' do
     slideshow = SlideshowBlock.new
     assert_equal 4, slideshow.interval
@@ -61,4 +65,36 @@ class SlideshowBlockTest &lt; ActiveSupport::TestCase
     assert_not_includes block.block_images, folder
   end
+  should 'display "thumb" size by default' do
+    assert_equal 'thumb', SlideshowBlock.new.image_size
+  end
+
+  should 'set different image size' do
+    block = SlideshowBlock.new(:image_size => 'slideshow')
+    assert_equal 'slideshow', block.image_size
+  end
+
+  should 'decide correct public filename for image' do
+    image = mock
+    image.expects(:public_filename).with('slideshow').returns('/bli/slideshow.png')
+    File.expects(:exists?).with("#{Rails.root}/public/bli/slideshow.png").returns(true)
+
+    assert_equal '/bli/slideshow.png', SlideshowBlock.new(:image_size => 'slideshow').public_filename_for(image)
+  end
+
+  should 'fallback to existing size in case the requested size does not exist' do
+    block = SlideshowBlock.new(:image_size => 'slideshow')
+
+    image = mock
+    # "slideshow" size does not exist
+    image.expects(:public_filename).with('slideshow').returns('/bli/slideshow.png')
+    File.expects(:exists?).with("#{Rails.root}/public/bli/slideshow.png").returns(false) # <<<<<
+
+    # thumb size does exist
+    image.expects(:public_filename).with('thumb').returns('/bli/thumb.png')
+    File.expects(:exists?).with("#{Rails.root}/public/bli/thumb.png").returns(true) # <<<<<
+
+    assert_equal '/bli/thumb.png', block.public_filename_for(image)
+  end
+
 end
	@@ -459,7 +459,7 @@ module ApplicationHelper		@@ -459,7 +459,7 @@ module ApplicationHelper
459	# #profile_image) or only its name below.	459	# #profile_image) or only its name below.
460	def profile_add_link( profile, image=false, size=:portrait, tag='li')	460	def profile_add_link( profile, image=false, size=:portrait, tag='li')
461	the_class = profile.members.include?(user) ? 'profile_member' : ''	461	the_class = profile.members.include?(user) ? 'profile_member' : ''
462	- name = profile.short_name	462	+ name = h(profile.short_name)
463	if image	463	if image
464	display = content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +	464	display = content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
465	content_tag( 'span', name, :class => 'org' ) +	465	content_tag( 'span', name, :class => 'org' ) +
	@@ -492,7 +492,7 @@ module ApplicationHelper		@@ -492,7 +492,7 @@ module ApplicationHelper
492	content_tag tag,	492	content_tag tag,
493	link_to(	493	link_to(
494	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +	494	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
495	- content_tag( 'span', name, :class => ( profile.class == Person ? 'fn' : 'org' ) ) +	495	+ content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
496	city + profile_sex_icon( profile ) + profile_cat_icons( profile ),	496	city + profile_sex_icon( profile ) + profile_cat_icons( profile ),
497	profile.url,	497	profile.url,
498	:onclick => 'document.location.href = this.href', # work-arround for ie.	498	:onclick => 'document.location.href = this.href', # work-arround for ie.
	@@ -505,7 +505,7 @@ module ApplicationHelper		@@ -505,7 +505,7 @@ module ApplicationHelper
505	# displays a link to the community homepage with its image (as generated by	505	# displays a link to the community homepage with its image (as generated by
506	# #profile_image) and its name and number of members beside it.	506	# #profile_image) and its name and number of members beside it.
507	def community_image_link( profile, size=:portrait, tag='li' )	507	def community_image_link( profile, size=:portrait, tag='li' )
508	- name = profile.name	508	+ name = h(profile.name)
509	content_tag tag,	509	content_tag tag,
510	link_to(	510	link_to(
511	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +	511	content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
	@@ -14,7 +14,7 @@ module ContentViewerHelper		@@ -14,7 +14,7 @@ module ContentViewerHelper
14	def article_title(article, args = {})	14	def article_title(article, args = {})
15	title = article.display_title if article.kind_of?(UploadedFile) && article.image?	15	title = article.display_title if article.kind_of?(UploadedFile) && article.image?
16	title = article.title if title.blank?	16	title = article.title if title.blank?
17	- title = content_tag('h1', title, :class => 'title')	17	+ title = content_tag('h1', h(title), :class => 'title')
18	if article.belongs_to_blog?	18	if article.belongs_to_blog?
19	unless args[:no_link]	19	unless args[:no_link]
20	title = content_tag('h1', link_to(article.name, article.url), :class => 'title')	20	title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
	@@ -57,7 +57,7 @@ module TagsHelper		@@ -57,7 +57,7 @@ module TagsHelper
57	display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""	57	display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""
58	link_to tag + display_count, destination, :style => style	58	link_to tag + display_count, destination, :style => style
59	else	59	else
60	- link_to tag , destination, :style => style,	60	+ link_to h(tag) , destination, :style => style,
61	:title => n_( 'one item', '%d items', count ) % count	61	:title => n_( 'one item', '%d items', count ) % count
62	end	62	end
63		63
	@@ -4,13 +4,27 @@ class SlideshowBlock < Block		@@ -4,13 +4,27 @@ class SlideshowBlock < Block
4	settings_items :interval, :type => 'integer', :default => 4	4	settings_items :interval, :type => 'integer', :default => 4
5	settings_items :shuffle, :type => 'boolean', :default => false	5	settings_items :shuffle, :type => 'boolean', :default => false
6	settings_items :navigation, :type => 'boolean', :default => false	6	settings_items :navigation, :type => 'boolean', :default => false
		7	+ settings_items :image_size, :type => 'string', :default => 'thumb'
7		8
8	def self.description	9	def self.description
9	_('Slideshow')	10	_('Slideshow')
10	end	11	end
11		12
12	def gallery	13	def gallery
13	- gallery_id ? Folder.find(gallery_id) : nil	14	+ gallery_id ? Folder.find(:first, :conditions => { :id => gallery_id }) : nil
		15	+ end
		16	+
		17	+ def public_filename_for(image)
		18	+ check_filename(image, image_size) \|\| check_filename(image, 'thumb')
		19	+ end
		20	+
		21	+ def check_filename(image, size)
		22	+ filename = image.public_filename(size)
		23	+ if File.exists?(File.join(Rails.root, 'public', filename))
		24	+ filename
		25	+ else
		26	+ nil
		27	+ end
14	end	28	end
15		29
16	def block_images	30	def block_images
	@@ -21,7 +21,7 @@ class UploadedFile < Article		@@ -21,7 +21,7 @@ class UploadedFile < Article
21	# :min_size => 2.megabytes	21	# :min_size => 2.megabytes
22	# :max_size => 5.megabytes	22	# :max_size => 5.megabytes
23	has_attachment :storage => :file_system,	23	has_attachment :storage => :file_system,
24	- :thumbnails => { :icon => [24,24], :thumb => '130x130>', :display => '640X480>' },	24	+ :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
25	:thumbnail_class => Thumbnail,	25	:thumbnail_class => Thumbnail,
26	:max_size => 5.megabytes # remember to update validate message below	26	:max_size => 5.megabytes # remember to update validate message below
27		27
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	</div>	11	</div>
12		12
13	<% if show_name %>	13	<% if show_name %>
14	- <p><%= block.owner.short_name %></p>	14	+ <p><%= h block.owner.short_name %></p>
15	<% end %>	15	<% end %>
16		16
17	<% if !user.nil? and user.has_permission?('edit_profile', profile) %>	17	<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
1	<div class="vcard">	1	<div class="vcard">
2		2
3	-<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= block.owner.short_name %></h2>	3	+<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= h block.owner.short_name %></h2>
4		4
5	<div class="profile-info-picture">	5	<div class="profile-info-picture">
6	<div class="profile-info-picture-inner1">	6	<div class="profile-info-picture-inner1">
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<div class='slideshow-container'>	5	<div class='slideshow-container'>
6	<% images.each do \|img\| %>	6	<% images.each do \|img\| %>
7	<a href="<%= url_for(img.external_link.blank? ? img.view_url: img.external_link) %>">	7	<a href="<%= url_for(img.external_link.blank? ? img.view_url: img.external_link) %>">
8	- <%= content_tag('div', '', :style => "background-image: url(#{img.public_filename(:thumb)})", :title => (img.abstract.blank? ? '' : img.abstract)) %>	8	+ <%= content_tag('div', '', :style => "background-image: url(#{block.public_filename_for(img)})", :title => (img.abstract.blank? ? '' : img.abstract)) %>
9	<% if !img.abstract.blank? %>	9	<% if !img.abstract.blank? %>
10	<span class='image-description'><%= img.abstract %></span>	10	<span class='image-description'><%= img.abstract %></span>
11	<% end %>	11	<% end %>
	@@ -3,6 +3,8 @@		@@ -3,6 +3,8 @@
3	[ _('%{gallery} (%{count} images)') % {:gallery => item.path, :count => item.images.reject{\|image\| image.folder?}.count}, item.id ]	3	[ _('%{gallery} (%{count} images)') % {:gallery => item.path, :count => item.images.reject{\|image\| image.folder?}.count}, item.id ]
4	}) %>	4	}) %>
5		5
		6	+<%= labelled_form_field(_('Image size'), select('block', 'image_size', [[_('Miniatura'), 'thumb'],[_('Slideshow size'), 'slideshow']])) %>
		7	+
6	<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {\|item\| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>	8	<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {\|item\| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
7		9
8	<%= labelled_form_field check_box(:block, :shuffle) + _('Show images in random order'), '' %>	10	<%= labelled_form_field check_box(:block, :shuffle) + _('Show images in random order'), '' %>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<%= render :file => 'shared/tiny_mce' %>	3	<%= render :file => 'shared/tiny_mce' %>
4		4
5	-<div style='margin-left: 20px;'>	5	+<div>
6	<% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %>	6	<% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %>
7	<div>	7	<div>
8	<%= _('Title') %>: <%= @article.name %>	8	<%= _('Title') %>: <%= @article.name %>