Adding new features to SlideshowBlock, and blocks in general

* added option to shuffle images * added navigation buttons * other changes: * Removed "toggle visibility" button and action in BoxOrganizer Controller * Bock#visible? now receives an optional context so that blocks can decide where they must be shown or not * BoxesHelper now passes the context into the Block#visible? method * Added title to Uploaded files and displaying it instead of the description when viewing files (ActionItem1358)

Adding new features to SlideshowBlock, and blocks in general
* added option to shuffle images * added navigation buttons * other changes: * Removed "toggle visibility" button and action in BoxOrganizer Controller * Bock#visible? now receives an optional context so that blocks can decide where they must be shown or not * BoxesHelper now passes the context into the Block#visible? method * Added title to Uploaded files and displaying it instead of the description when viewing files (ActionItem1358)
Antonio Terceiro
1 parent 6602995b
Showing 24 changed files with 323 additions and 95 deletions Show diff stats
app/controllers/box_organizer_controller.rb
app/helpers/boxes_helper.rb
app/helpers/content_viewer_helper.rb
app/models/block.rb
app/models/slideshow_block.rb
app/models/uploaded_file.rb
app/views/blocks/slideshow.rhtml
app/views/box_organizer/_slideshow_block.rhtml
app/views/box_organizer/edit.rhtml
app/views/cms/_uploaded_file.rhtml
app/views/content_viewer/_uploaded_file.rhtml
app/views/content_viewer/image_gallery.rhtml
app/views/content_viewer/view_page.rhtml
lib/tasks/release.rake
public/designs/icons/tango/style.css
public/designs/themes/base/article.css
public/stylesheets/blocks/slideshow-block.css
public/stylesheets/controller_content_viewer.css
test/functional/application_controller_test.rb
test/functional/profile_design_controller_test.rb
@@ -100,13 +100,6 @@ class BoxOrganizerController &lt; ApplicationController
     end
   end
-  def toggle_visibility
-    @block = boxes_holder.blocks.find(params[:id])
-    @block.visible = !@block.visible?
-    @block.save
-    redirect_to :action => 'index'
-  end
-
   protected :boxes_editor?
 end
@@ -59,10 +59,11 @@ module BoxesHelper
   end
   def display_box_content(box, main_content)
-    box_decorator.select_blocks(box.blocks).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
+    context = { :article => @page }
+    box_decorator.select_blocks(box.blocks, context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
   end
-  def select_blocks(arr)
+  def select_blocks(arr, context)
     arr
   end
@@ -83,7 +84,7 @@ module BoxesHelper
     end
     options = {
-      :class => classes = ['block', block.css_classes ].uniq.join(' '),
+      :class => classes = ['block', block_css_classes(block) ].uniq.join(' '),
       :id => "block-#{block.id}"
     }
     if ( block.respond_to? 'help' )
@@ -134,8 +135,8 @@ module BoxesHelper
     def self.block_edit_buttons(block)
       ''
     end
-    def self.select_blocks(arr)
-      arr.select(&:visible?)
+    def self.select_blocks(arr, context)
+      arr.select { |block| block.visible?(context) }
     end
   end
@@ -201,7 +202,6 @@ module BoxesHelper
     end
     if !block.main?
-      buttons << icon_button(:eyes, _('Toggle block visibility'), {:action => 'toggle_visibility', :id => block.id})
       buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
     end
@@ -217,8 +217,18 @@ module BoxesHelper
   end
   def import_blocks_stylesheets(options = {})
-    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + b.css_class_name}.uniq
+    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block_css_class_name(b)}.uniq
     stylesheet_import(@blocks_css_files, options)
   end
+  def block_css_class_name(block)
+    block.class.name.underscore.gsub('_', '-')
+  end
+  def block_css_classes(block)
+    classes = block_css_class_name(block)
+    classes += ' invisible-block' if block.display == 'never'
+    classes
+  end
+
+
 end
@@ -13,7 +13,7 @@ module ContentViewerHelper
   end
   def article_title(article, args = {})
-    title = article.abstract if article.kind_of?(UploadedFile) && article.image?
+    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
     title = content_tag('h1', title, :class => 'title')
     if article.belongs_to_blog?
@@ -35,4 +35,9 @@ module ContentViewerHelper
     link_to( number_of_comments(article), article.url.merge(:anchor => 'comments_list') )
   end
+  def image_label(image)
+    text = image.title || image.abstract
+    text && (text.first(40) + (text.size > 40 ? '…' : ''))
+  end
+
 end
@@ -11,14 +11,46 @@ class Block &lt; ActiveRecord::Base
   belongs_to :box
   acts_as_having_settings
-  settings_items :visible, :type => :boolean, :default => true
   named_scope :enabled, :conditions => { :enabled => true }
-  def visible?
-    visible
+  # Determines whether a given block must be visible. Optionally a
+  # <tt>context</tt> must be specified. <tt>context</tt> must be a hash, and
+  # may contain the following keys:
+  #
+  # * <tt>:article</tt>: the article being viewed currently
+  def visible?(context = nil)
+    if settings[:visible] == false || display == 'never'
+      return false
+    end
+    if context && context[:article] && display == 'home_page_only'
+      return context[:article] == owner.home_page
+    end
+    true
+  end
+
+  # The condition for displaying a block. It can assume the following values:
+  #
+  # * <tt>'always'</tt>: the block is always displayed
+  # * <tt>'never'</tt>: the block is hidden (it does not appear for visitors)
+  # * <tt>'home_page_only'</tt> the block is displayed only when viewing the
+  #   homepage of its owner.
+  def display
+    if settings[:visible] == false
+      'never'
+    else
+      settings[:display] || 'always'
+    end
+  end
+
+  # Sets the <tt>value</tt> attribute.
+  def display=(value)
+    settings[:display] = value
+    # clear the old setting
+    settings[:visible] = nil
   end
+
   # returns the description of the block, used when the user sees a list of
   # blocks to choose one to include in the design.
   #
@@ -66,16 +98,6 @@ class Block &lt; ActiveRecord::Base
     box ? box.owner : nil
   end
-  def css_class_name
-    self.class.name.underscore.gsub('_', '-')
-  end
-
-  def css_classes
-    classes = css_class_name
-    classes += ' invisible-block' unless visible?
-    classes
-  end
-
   def default_title
     ''
   end
@@ -2,9 +2,11 @@ class SlideshowBlock &lt; Block
   settings_items :gallery_id, :type => 'integer'
   settings_items :interval, :type => 'integer', :default => 4
+  settings_items :shuffle, :type => 'boolean', :default => false
+  settings_items :navigation, :type => 'boolean', :default => false
   def self.description
-    _('Display images from gallery as slideshow')
+    _('Slideshow block')
   end
   def gallery
@@ -12,35 +14,18 @@ class SlideshowBlock &lt; Block
   end
   def content
+    block = self
     if gallery
       images = gallery.images
-      block_id = id
-      block_title = title
-      lambda do
-        block_title(block_title) +
-        content_tag('div',
-          images.map do |i|
-            link_to(
-              content_tag('div', '', :style => "background-image: url(#{i.public_filename(:thumb)})"),
-              (i.external_link || i.view_url), :target => '_blank'
-            )
-          end.join("\n"),
-          :class => 'slideshow-container'
-        )
+      if shuffle
+        images = images.shuffle
       end
-    else
       lambda do
-        content_tag('em', _('Please select a gallery to display its images.'))
+        render :file => 'blocks/slideshow', :locals => { :block => block, :images => images }
       end
-    end
-  end
-
-  def footer
-    if gallery
-      block_id = id
-      interval_sec = interval * 1000
+    else
       lambda do
-        javascript_tag("jQuery('#block-#{block_id} .slideshow-container').cycle({fx: 'fade', timeout: #{interval_sec}})")
+        render :file => 'blocks/slideshow', :locals => { :block => block, :images => nil }
       end
     end
   end
@@ -4,6 +4,13 @@
 # of the file itself is kept. (FIXME?)
 class UploadedFile < Article
+  settings_items :title, :type => 'string'
+  validates_size_of :title, :maximum => 60, :if => (lambda { |file| !file.title.blank? })
+
+  def display_title
+    title.blank? ? name : title
+  end
+
   def self.max_size
     UploadedFile.attachment_options[:max_size]
   end
@@ -74,11 +81,14 @@ class UploadedFile &lt; Article
             :class => 'gallery-navigation'
           )
         end.to_s +
-        tag('img', :src => article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%')
+        tag('img', :src => article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') +
+          content_tag('p', article.abstract, :class => 'uploaded-file-description')
+
       end
     else
       lambda do
-        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name)))
+        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name))) +
+          content_tag('p', article.abstract, :class => 'uploaded-file-description')
       end
     end
   end
@@ -0,0 +1,49 @@
+<%= block_title(block.title) %>
+<% if images %>
+  <% description = images.any? { |img| !img.abstract.blank? } %>
+  <div class='slideshow-border<%= (description ? ' with-descriptions' : '')%>'>
+    <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)) %>
+          <% if !img.abstract.blank? %>
+            <span class='image-description'><%= img.abstract %></span>
+          <% end %>
+        </a>
+      <% end %>
+    </div>
+    <% if block.navigation %>
+      <div class='slideshow-block-navigation'>
+        <%= link_to _('Previous'), '#', :class => 'icon-media-prev'  %>
+        <% if block.interval > 0 %>
+          <%= link_to '&nbsp;', '#', :class => 'icon-media-pause', :onclick => "togglePlayback('#block-#{block.id} .slideshow-container', this); return false;" %>
+        <% end %>
+        <%= link_to _('Next'), '#', :class => 'icon-media-next'  %>
+      </div>
+    <% end %>
+  </div>
+  <script type="text/javascript">
+    (function($) {
+     var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
+     <% if block.navigation %>
+       options.prev = '#block-<%= block.id %> .icon-media-prev';
+       options.next = '#block-<%= block.id %> .icon-media-next';
+     <% end %>
+      $('#block-<%= block.id %> .slideshow-container').cycle(options);
+    })(jQuery);
+
+    function togglePlayback(slideshow, button) {
+      var $ = jQuery;
+      if (button.className == 'icon-media-pause') {
+        button.className = 'icon-media-play';
+        $(slideshow).cycle('pause');
+      } else {
+        button.className = 'icon-media-pause';
+        $(slideshow).cycle('resume');
+      }
+    }
+  </script>
+<% else %>
+  <em><%= _('Please, edit this block and select an image gallery.') %></em>
+<% end %>
+
@@ -3,4 +3,8 @@
   [ _('%{gallery} (%{count} images)') % {:gallery => item.path, :count => item.images.count}, item.id ]
 }) %>
-<%= labelled_form_field _('Seconds between image transitions'), select('block', 'interval', [1, 2, 3, 4, 5, 10, 20, 30, 60] ) %>
+<%= 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'), '' %>
+
+<%= labelled_form_field check_box(:block, :navigation) + _('Display navigation buttons'), '' %>
@@ -6,6 +6,18 @@
   <%= render :partial => partial_for_class(@block.class) %>
+  <%= labelled_form_field _('Display this block:'), '' %>
+  <div style='margin-left: 10px'>
+    <%= radio_button(:block, :display, 'always') %>
+    <%= label_tag('block_display_always', _('In all pages')) %>
+    <br/>
+    <%= radio_button(:block, :display, 'home_page_only') %>
+    <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
+    <br/>
+    <%= radio_button(:block, :display, 'never') %>
+    <%= label_tag('block_display_never', _("Don't display")) %>
+  </div>
+
   <% button_bar do %>
     <%= submit_button(:save, _('Save')) %>
     <%= lightbox_close_button(_('Cancel')) %>
-<%= labelled_form_field(_('Describe this file:'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>
+<%= labelled_form_field(_('Title'), text_field(:article, :title, :maxlength => 60)) %>
+<%= labelled_form_field(_('Description'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>
 <% if @article.image? %>
   <%= f.text_field(:external_link, :size => 64) %>
 <% end %>
 <% if uploaded_file.image? %>
-  <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb), :alt => uploaded_file.abstract), uploaded_file.view_url %> </div>
+  <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb), :alt => uploaded_file.display_title), uploaded_file.view_url %> </div>
+  <span><%= image_label(uploaded_file) %></span>
 <% else %>
   <%= render :partial => 'article', :object => uploaded_file %>
 <% end %>
-
@@ -8,7 +8,6 @@
       <% @images.each do |a| %>
         <% content_tag('li', :title => a.abstract, :class => 'image-gallery-item' ) do %>
           <%= render :partial => partial_for_class(a.class), :object => a %>
-          <span><%= a.abstract && (a.abstract.first(40) + (a.abstract.size > 40 ? '…' : ''))%></span>
         <% end %>
       <% end %>
     </ul>
@@ -19,7 +19,7 @@
 </div>
 <% end %>
-<div>
+<div<%= " class='logged-in'" if user %>>
   <%= article_title(@page, :no_link => true) %>
   <div id="article-actions">
     <% if @page.allow_post_content?(user) %>
@@ -10,7 +10,7 @@ namespace :noosfero do
   end
   version = Noosfero::VERSION
-  desc 'checks if there is already a tag for the curren version'
+  desc 'checks if there is already a tag for the current version'
   task :check_tag do
     sh "git tag | grep '^#{version}$' >/dev/null" do |ok, res|
       if ok
@@ -64,3 +64,8 @@
 .icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png)           }
 .icon-photos          { background-image: url(Tango/16x16/devices/camera-photo.png) }
+.icon-media-pause      { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
+.icon-media-play       { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-media-prev       { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
+.icon-media-next       { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
+
@@ -16,8 +16,12 @@ hr.pre-posts, hr.sep-posts {
   overflow: visible;
 }
+#article .logged-in h1 {
+  margin-top: 25px;
+}
+
 #article-actions {
-  top: -18px;
+  top: -28px;
 }
 #article-actions a.button,
 .slideshow-block .slideshow-container {
-  margin: auto;
+  margin-bottom: 10px;
+}
+
+.slideshow-block .slideshow-container a {
+  width: 100%;
+  display: block;
+  text-decoration: none;
+}
+.slideshow-block .slideshow-container a:hover {
+  text-decoration: none;
 }
 .slideshow-block .slideshow-container div {
-  width: 130px;
   height: 130px;
   background-position: 50% 50%;
   background-repeat: no-repeat;
-  margin: auto;
+}
+
+.slideshow-block .with-descriptions {
+  border: 1px solid #ddd;
+}
+
+.slideshow-block .image-description {
+  display: block;
+  padding: 10px;
+  height: 34px;
+  overflow: hidden;
+  border-top: 1px solid #ddd;
+  background-color: white;
+  color: black;
 }
 .msie .slideshow-block .slideshow-container div {
   cursor: pointer;
 }
+
+.slideshow-block {
+  text-align: center;
+}
+
+.slideshow-block .slideshow-block-navigation {
+  margin: 8px 0px;
+}
+.slideshow-block .slideshow-block-navigation a {
+  background-color: white;
+  background-repeat: no-repeat;
+  border: 1px solid #ddd;
+  padding: 2px;
+  text-decoration: none;
+  font-variant: small-caps;
+  font-size: 10px;
+}
+.slideshow-block .slideshow-block-navigation a:hover {
+  text-decoration: none;
+  border-color: #999;
+}
+
+.slideshow-block .slideshow-block-navigation .icon-media-prev {
+  padding-left: 18px;
+  background-position: left;
+}
+.slideshow-block .slideshow-block-navigation .icon-media-next {
+  padding-right: 18px;
+  background-position: right;
+  
+}
+.slideshow-block .slideshow-block-navigation .icon-media-pause,
+.slideshow-block .slideshow-block-navigation .icon-media-play {
+  background-position: 50% 50%;
+  display: inline-block;
+  width: 16px;
+}
@@ -65,3 +65,10 @@ div#article-parent {
 #article .gallery-navigation .total-of-images {
   font-weight: bold;
 }
+
+#article .uploaded-file-description {
+  background: #f6f6f6;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  padding: 1em;
+}
@@ -406,7 +406,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
     p = create_user_full('test_user').person
     @controller.expects(:profile).at_least_once.returns(p)
     b = p.blocks[1]
-    b.expects(:visible).returns(false)
+    b.expects(:visible?).returns(false)
     b.save!
     get :index, :profile => p.identifier
@@ -285,15 +285,6 @@ class ProfileDesignControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'input', :attributes => { :id => 'type_blogarchivesblock', :value => 'BlogArchivesBlock' }
   end
-  should 'toggle block visibility' do
-    state = @b1.visible?
-    get :toggle_visibility, :id => @b1.id, :profile => holder.identifier
-    block = Block.find(@b1.id)
-
-    assert_equal block, assigns(:block)
-    assert_equal !state, block.visible?
-  end
-
   should 'offer to create feed reader block' do
     get :add_block, :profile => 'designtestuser'
     assert_tag :tag => 'input', :attributes => { :id => 'type_feedreaderblock', :value => 'FeedReaderBlock' }
@@ -22,12 +22,6 @@ class BlockTest &lt; Test::Unit::TestCase
     assert_nil Block.new.owner
   end
-  should 'generate CSS class name' do
-    block = Block.new
-    block.class.expects(:name).returns('SomethingBlock')
-    assert_equal 'something-block', block.css_class_name
-  end
-
   should 'provide no footer by default' do
     assert_nil Block.new.footer
   end
@@ -52,12 +46,18 @@ class BlockTest &lt; Test::Unit::TestCase
     assert_equal 'my title', b.view_title
   end
-  should 'have a visible setting' do
+  should 'be backwards compatible with old "visible" setting' do
     b = Block.new
-    assert b.visible?
-    b.visible = false
-    b.save
+    b.settings[:visible] = false
     assert !b.visible?
+    assert_equal 'never', b.display
+  end
+
+  should 'clean old "visible setting" when display is set' do
+    b = Block.new
+    b.settings[:visible] = false
+    b.display = 'never'
+    assert_nil b.settings[:visible]
   end
   should 'be cacheable' do
@@ -80,4 +80,24 @@ class BlockTest &lt; Test::Unit::TestCase
     assert_not_includes Block.enabled, block2
   end
+  should 'be displayed everywhere by default' do
+    assert_equal true, Block.new.visible?
+  end
+
+  should 'not display when set to hidden' do
+    assert_equal false, Block.new(:display => 'never').visible?
+    assert_equal false, Block.new(:display => 'never').visible?(:article => Article.new)
+  end
+
+  should 'be able to be displayed only in the homepage' do
+    profile = Profile.new
+    home_page = Article.new
+    profile.home_page = home_page
+    block = Block.new(:display => 'home_page_only')
+    block.stubs(:owner).returns(profile)
+
+    assert_equal true, block.visible?(:article => home_page)
+    assert_equal false, block.visible?(:article => Article.new)
+  end
+
 end
@@ -41,7 +41,7 @@ class BoxesHelperTest &lt; Test::Unit::TestCase
     p = create_user_with_blocks
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
-    b.visible = false; b.save!
+    b.display = 'never'; b.save!
     box = b.box
     box.expects(:blocks).returns([b])
     expects(:display_block).with(b, '')
@@ -55,7 +55,7 @@ class BoxesHelperTest &lt; Test::Unit::TestCase
     p = create_user_with_blocks
     b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
-    b.visible = false; b.save!
+    b.display = 'never'; b.save!
     box = b.box
     box.expects(:blocks).returns([b])
     expects(:display_block).with(b, '').never
@@ -85,4 +85,13 @@ class BoxesHelperTest &lt; Test::Unit::TestCase
     assert_tag_in_string insert_boxes('main content'), :tag => "div", :attributes => { :id => 'profile-footer' }, :content => 'my custom footer'
   end
+  should 'calculate CSS class names correctly' do
+    assert_equal 'slideshow-block', block_css_class_name(SlideshowBlock.new)
+    assert_equal 'main-block', block_css_class_name(MainBlock.new)
+  end
+
+  should 'add invisible CSS class name for invisible blocks' do
+    assert !block_css_classes(Block.new(:display => 'always')).split.any? { |item| item == 'invisible-block'}
+    assert block_css_classes(Block.new(:display => 'never')).split.any? { |item| item == 'invisible-block'}
+  end
 end
@@ -20,15 +20,35 @@ class SlideshowBlockTest &lt; ActiveSupport::TestCase
     assert_equal 4, slideshow.interval
   end
-  should 'not invoke javascript when has no gallery' do
-    slideshow_block = SlideshowBlock.new()
-    assert_nil slideshow_block.footer
+  should 'list in the same order' do
+    gallery = mock
+    images = []
+    images.expects(:shuffle).never
+    gallery.stubs(:images).returns(images)
+
+    block = SlideshowBlock.new
+    block.stubs(:gallery).returns(gallery)
+    block.content
   end
-  should 'invoke javascript when has gallery' do
-    gallery = fast_create(Folder, :profile_id => profile.id)
-    slideshow_block = SlideshowBlock.new(:gallery_id => gallery.id)
-    assert_not_nil slideshow_block.footer
+  should 'list in random order' do
+    gallery = mock
+    images = []
+    shuffled = []
+    gallery.stubs(:images).returns(images)
+    images.expects(:shuffle).once.returns(shuffled)
+
+    block = SlideshowBlock.new(:shuffle => true)
+    block.stubs(:gallery).returns(gallery)
+    block.content
+  end
+
+  should 'not shuffle by default' do
+    assert_equal false, SlideshowBlock.new.shuffle
+  end
+
+  should 'not display navigation by default' do
+    assert_equal false, SlideshowBlock.new.navigation
   end
 end
@@ -113,10 +113,34 @@ class UploadedFileTest &lt; Test::Unit::TestCase
     p = create_user('test_user').person
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => p)
-    stubs(:content_tag)
+    stubs(:content_tag).returns('link')
     expects(:link_to).with(file.name, file.url, :class => file.css_class_name)
     instance_eval(&file.to_html)
   end
+  should 'have title' do
+    assert_equal 'my title', UploadedFile.new(:title => 'my title').title
+  end
+
+  should 'limit title to 140 characters' do
+    upload = UploadedFile.new
+
+    upload.title = '+' * 61; upload.valid?
+    assert upload.errors[:title]
+
+    upload.title = '+' * 60; upload.valid?
+    assert !upload.errors[:title]
+
+  end
+
+  should 'always provide a display title' do
+    upload = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
+    assert_equal 'test.txt',  upload.display_title
+    upload.title = 'My text file'
+    assert_equal 'My text file', upload.display_title
+    upload.title = ''
+    assert_equal 'test.txt', upload.display_title
+  end
+
 end
	@@ -100,13 +100,6 @@ class BoxOrganizerController < ApplicationController		@@ -100,13 +100,6 @@ class BoxOrganizerController < ApplicationController
100	end	100	end
101	end	101	end
102		102
103	- def toggle_visibility
104	- @block = boxes_holder.blocks.find(params[:id])
105	- @block.visible = !@block.visible?
106	- @block.save
107	- redirect_to :action => 'index'
108	- end
109	-
110	protected :boxes_editor?	103	protected :boxes_editor?
111		104
112	end	105	end
	@@ -11,14 +11,46 @@ class Block < ActiveRecord::Base		@@ -11,14 +11,46 @@ class Block < ActiveRecord::Base
11	belongs_to :box	11	belongs_to :box
12		12
13	acts_as_having_settings	13	acts_as_having_settings
14	- settings_items :visible, :type => :boolean, :default => true
15		14
16	named_scope :enabled, :conditions => { :enabled => true }	15	named_scope :enabled, :conditions => { :enabled => true }
17		16
18	- def visible?
19	- visible	17	+ # Determines whether a given block must be visible. Optionally a
		18	+ # <tt>context</tt> must be specified. <tt>context</tt> must be a hash, and
		19	+ # may contain the following keys:
		20	+ #
		21	+ # * <tt>:article</tt>: the article being viewed currently
		22	+ def visible?(context = nil)
		23	+ if settings[:visible] == false \|\| display == 'never'
		24	+ return false
		25	+ end
		26	+ if context && context[:article] && display == 'home_page_only'
		27	+ return context[:article] == owner.home_page
		28	+ end
		29	+ true
		30	+ end
		31	+
		32	+ # The condition for displaying a block. It can assume the following values:
		33	+ #
		34	+ # * <tt>'always'</tt>: the block is always displayed
		35	+ # * <tt>'never'</tt>: the block is hidden (it does not appear for visitors)
		36	+ # * <tt>'home_page_only'</tt> the block is displayed only when viewing the
		37	+ # homepage of its owner.
		38	+ def display
		39	+ if settings[:visible] == false
		40	+ 'never'
		41	+ else
		42	+ settings[:display] \|\| 'always'
		43	+ end
		44	+ end
		45	+
		46	+ # Sets the <tt>value</tt> attribute.
		47	+ def display=(value)
		48	+ settings[:display] = value
		49	+ # clear the old setting
		50	+ settings[:visible] = nil
20	end	51	end
21		52
		53	+
22	# returns the description of the block, used when the user sees a list of	54	# returns the description of the block, used when the user sees a list of
23	# blocks to choose one to include in the design.	55	# blocks to choose one to include in the design.
24	#	56	#
	@@ -66,16 +98,6 @@ class Block < ActiveRecord::Base		@@ -66,16 +98,6 @@ class Block < ActiveRecord::Base
66	box ? box.owner : nil	98	box ? box.owner : nil
67	end	99	end
68		100
69	- def css_class_name
70	- self.class.name.underscore.gsub('_', '-')
71	- end
72	-
73	- def css_classes
74	- classes = css_class_name
75	- classes += ' invisible-block' unless visible?
76	- classes
77	- end
78	-
79	def default_title	101	def default_title
80	''	102	''
81	end	103	end
@@ -0,0 +1,49 @@		@@ -0,0 +1,49 @@
	1	+<%= block_title(block.title) %>
	2	+<% if images %>
	3	+ <% description = images.any? { \|img\| !img.abstract.blank? } %>
	4	+ <div class='slideshow-border<%= (description ? ' with-descriptions' : '')%>'>
	5	+ <div class='slideshow-container'>
	6	+ <% images.each do \|img\| %>
	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)) %>
	9	+ <% if !img.abstract.blank? %>
	10	+ <span class='image-description'><%= img.abstract %></span>
	11	+ <% end %>
	12	+ </a>
	13	+ <% end %>
	14	+ </div>
	15	+ <% if block.navigation %>
	16	+ <div class='slideshow-block-navigation'>
	17	+ <%= link_to _('Previous'), '#', :class => 'icon-media-prev' %>
	18	+ <% if block.interval > 0 %>
	19	+ <%= link_to ' ', '#', :class => 'icon-media-pause', :onclick => "togglePlayback('#block-#{block.id} .slideshow-container', this); return false;" %>
	20	+ <% end %>
	21	+ <%= link_to _('Next'), '#', :class => 'icon-media-next' %>
	22	+ </div>
	23	+ <% end %>
	24	+ </div>
	25	+ <script type="text/javascript">
	26	+ (function($) {
	27	+ var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
	28	+ <% if block.navigation %>
	29	+ options.prev = '#block-<%= block.id %> .icon-media-prev';
	30	+ options.next = '#block-<%= block.id %> .icon-media-next';
	31	+ <% end %>
	32	+ $('#block-<%= block.id %> .slideshow-container').cycle(options);
	33	+ })(jQuery);
	34	+
	35	+ function togglePlayback(slideshow, button) {
	36	+ var $ = jQuery;
	37	+ if (button.className == 'icon-media-pause') {
	38	+ button.className = 'icon-media-play';
	39	+ $(slideshow).cycle('pause');
	40	+ } else {
	41	+ button.className = 'icon-media-pause';
	42	+ $(slideshow).cycle('resume');
	43	+ }
	44	+ }
	45	+ </script>
	46	+<% else %>
	47	+ <em><%= _('Please, edit this block and select an image gallery.') %></em>
	48	+<% end %>
	49	+
	@@ -3,4 +3,8 @@		@@ -3,4 +3,8 @@
3	[ _('%{gallery} (%{count} images)') % {:gallery => item.path, :count => item.images.count}, item.id ]	3	[ _('%{gallery} (%{count} images)') % {:gallery => item.path, :count => item.images.count}, item.id ]
4	}) %>	4	}) %>
5		5
6	-<%= labelled_form_field _('Seconds between image transitions'), select('block', 'interval', [1, 2, 3, 4, 5, 10, 20, 30, 60] ) %>	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]}) %>
		7	+
		8	+<%= labelled_form_field check_box(:block, :shuffle) + _('Show images in random order'), '' %>
		9	+
		10	+<%= labelled_form_field check_box(:block, :navigation) + _('Display navigation buttons'), '' %>
	@@ -6,6 +6,18 @@		@@ -6,6 +6,18 @@
6		6
7	<%= render :partial => partial_for_class(@block.class) %>	7	<%= render :partial => partial_for_class(@block.class) %>
8		8
		9	+ <%= labelled_form_field _('Display this block:'), '' %>
		10	+ <div style='margin-left: 10px'>
		11	+ <%= radio_button(:block, :display, 'always') %>
		12	+ <%= label_tag('block_display_always', _('In all pages')) %>
		13	+ <br/>
		14	+ <%= radio_button(:block, :display, 'home_page_only') %>
		15	+ <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
		16	+ <br/>
		17	+ <%= radio_button(:block, :display, 'never') %>
		18	+ <%= label_tag('block_display_never', _("Don't display")) %>
		19	+ </div>
		20	+
9	<% button_bar do %>	21	<% button_bar do %>
10	<%= submit_button(:save, _('Save')) %>	22	<%= submit_button(:save, _('Save')) %>
11	<%= lightbox_close_button(_('Cancel')) %>	23	<%= lightbox_close_button(_('Cancel')) %>
1	-<%= labelled_form_field(_('Describe this file:'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>	1	+<%= labelled_form_field(_('Title'), text_field(:article, :title, :maxlength => 60)) %>
		2	+<%= labelled_form_field(_('Description'), text_area(:article, :abstract, :rows => 3, :cols => 64)) %>
2	<% if @article.image? %>	3	<% if @article.image? %>
3	<%= f.text_field(:external_link, :size => 64) %>	4	<%= f.text_field(:external_link, :size => 64) %>
4	<% end %>	5	<% end %>
1	<% if uploaded_file.image? %>	1	<% if uploaded_file.image? %>
2	- <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb), :alt => uploaded_file.abstract), uploaded_file.view_url %> </div>	2	+ <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb), :alt => uploaded_file.display_title), uploaded_file.view_url %> </div>
		3	+ <span><%= image_label(uploaded_file) %></span>
3	<% else %>	4	<% else %>
4	<%= render :partial => 'article', :object => uploaded_file %>	5	<%= render :partial => 'article', :object => uploaded_file %>
5	<% end %>	6	<% end %>
6	-
	@@ -19,7 +19,7 @@		@@ -19,7 +19,7 @@
19	</div>	19	</div>
20	<% end %>	20	<% end %>
21		21
22	-<div>	22	+<div<%= " class='logged-in'" if user %>>
23	<%= article_title(@page, :no_link => true) %>	23	<%= article_title(@page, :no_link => true) %>
24	<div id="article-actions">	24	<div id="article-actions">
25	<% if @page.allow_post_content?(user) %>	25	<% if @page.allow_post_content?(user) %>
	@@ -10,7 +10,7 @@ namespace :noosfero do		@@ -10,7 +10,7 @@ namespace :noosfero do
10	end	10	end
11		11
12	version = Noosfero::VERSION	12	version = Noosfero::VERSION
13	- desc 'checks if there is already a tag for the curren version'	13	+ desc 'checks if there is already a tag for the current version'
14	task :check_tag do	14	task :check_tag do
15	sh "git tag \| grep '^#{version}$' >/dev/null" do \|ok, res\|	15	sh "git tag \| grep '^#{version}$' >/dev/null" do \|ok, res\|
16	if ok	16	if ok
	@@ -64,3 +64,8 @@		@@ -64,3 +64,8 @@
64	.icon-slideshow { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }	64	.icon-slideshow { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }
65	.icon-photos { background-image: url(Tango/16x16/devices/camera-photo.png) }	65	.icon-photos { background-image: url(Tango/16x16/devices/camera-photo.png) }
66		66
		67	+.icon-media-pause { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
		68	+.icon-media-play { background-image: url(Tango/16x16/actions/media-playback-start.png) }
		69	+.icon-media-prev { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
		70	+.icon-media-next { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
		71	+