>
<%= article_title(@page, :no_link => true) %>
<% if @page.allow_post_content?(user) %>
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index 2767675..dac6994 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -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
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index 9f602aa..e301cc7 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -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) }
+
diff --git a/public/designs/themes/base/article.css b/public/designs/themes/base/article.css
index c03c3a8..d6b13f2 100644
--- a/public/designs/themes/base/article.css
+++ b/public/designs/themes/base/article.css
@@ -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,
diff --git a/public/stylesheets/blocks/slideshow-block.css b/public/stylesheets/blocks/slideshow-block.css
index 92806e9..13b84c6 100644
--- a/public/stylesheets/blocks/slideshow-block.css
+++ b/public/stylesheets/blocks/slideshow-block.css
@@ -1,15 +1,73 @@
.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;
+}
diff --git a/public/stylesheets/controller_content_viewer.css b/public/stylesheets/controller_content_viewer.css
index 3567686..4f93055 100644
--- a/public/stylesheets/controller_content_viewer.css
+++ b/public/stylesheets/controller_content_viewer.css
@@ -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;
+}
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 135f8fc..b0e2c87 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -406,7 +406,7 @@ class ApplicationControllerTest < 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
diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb
index 16c9f9e..c2af2f7 100644
--- a/test/functional/profile_design_controller_test.rb
+++ b/test/functional/profile_design_controller_test.rb
@@ -285,15 +285,6 @@ class ProfileDesignControllerTest < 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' }
diff --git a/test/unit/block_test.rb b/test/unit/block_test.rb
index f85d299..beca2c7 100644
--- a/test/unit/block_test.rb
+++ b/test/unit/block_test.rb
@@ -22,12 +22,6 @@ class BlockTest < 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 < 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 < 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
diff --git a/test/unit/boxes_helper_test.rb b/test/unit/boxes_helper_test.rb
index 7adb36a..67805b8 100644
--- a/test/unit/boxes_helper_test.rb
+++ b/test/unit/boxes_helper_test.rb
@@ -41,7 +41,7 @@ class BoxesHelperTest < 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 < 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 < 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
diff --git a/test/unit/slideshow_block_test.rb b/test/unit/slideshow_block_test.rb
index 85dc9f9..63ce8ed 100644
--- a/test/unit/slideshow_block_test.rb
+++ b/test/unit/slideshow_block_test.rb
@@ -20,15 +20,35 @@ class SlideshowBlockTest < 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
diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb
index 319a460..c604d02 100644
--- a/test/unit/uploaded_file_test.rb
+++ b/test/unit/uploaded_file_test.rb
@@ -113,10 +113,34 @@ class UploadedFileTest < 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
--
libgit2 0.21.2