diff --git a/app/views/file_presenter/_generic.html.erb b/app/views/file_presenter/_generic.html.erb index a16ebbc..4d57860 100644 --- a/app/views/file_presenter/_generic.html.erb +++ b/app/views/file_presenter/_generic.html.erb @@ -1,9 +1,5 @@ - - Download - <%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %> - -
<%= generic.abstract %>
+<%= button(:download, _('Download'), [Noosfero.root, generic.public_filename].join, class:'download-link', option:'primary', size:'lg') %> diff --git a/public/designs/icons/awesome/style.scss b/public/designs/icons/awesome/style.scss index 9d0cda1..5cb4f21 100644 --- a/public/designs/icons/awesome/style.scss +++ b/public/designs/icons/awesome/style.scss @@ -140,6 +140,9 @@ $fa-font-path: "fonts"; .icon-down:before { @extend .fa-arrow-down:before; } +.icon-download:before { + @extend .fa-download:before; +} .icon-spread:before { @extend .fa-share:before; diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css index 1fe4e21..6eb0f6b 100644 --- a/public/designs/icons/tango/style.css +++ b/public/designs/icons/tango/style.css @@ -28,6 +28,7 @@ .icon-more { background-image: url(Tango/16x16/actions/add.png) } .icon-up { background-image: url(Tango/16x16/actions/go-up.png) } .icon-down { background-image: url(Tango/16x16/actions/go-down.png) } +.icon-download { background-image: url(Tango/16x16/actions/bottom.png) } .icon-left { background-image: url(Tango/16x16/actions/go-previous.png) } .icon-right { background-image: url(Tango/16x16/actions/go-next.png) } .icon-up-disabled { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); } diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 93783eb..9ed5794 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -4019,10 +4019,6 @@ div#article-parent { text-align: right; font-style: italic; } -.article-body-uploaded-file { - text-align: center; -} - /* ==> public/stylesheets/controller_events.css <== */ #agenda { position: relative; diff --git a/test/unit/article_block_test.rb b/test/unit/article_block_test.rb index a1ebc02..995e85a 100644 --- a/test/unit/article_block_test.rb +++ b/test/unit/article_block_test.rb @@ -64,7 +64,7 @@ class ArticleBlockTest < ActiveSupport::TestCase end person.boxes.first.blocks << block block.save! - + block.reload assert_equal [a],block.available_articles end @@ -80,7 +80,7 @@ class ArticleBlockTest < ActiveSupport::TestCase block = create(ArticleBlock, :article => a) env.boxes.first.blocks << block block.save! - + block.reload assert_equal [a],block.available_articles end @@ -140,7 +140,7 @@ class ArticleBlockTest < ActiveSupport::TestCase block.article = file block.save! - assert_tag_in_string instance_eval(&block.content), :tag => 'a', :content => 'test.txt' + assert_tag_in_string instance_eval(&block.content), :tag => 'a', :content => _('Download') end protected diff --git a/test/unit/blog_helper_test.rb b/test/unit/blog_helper_test.rb index 474703b..e659340 100644 --- a/test/unit/blog_helper_test.rb +++ b/test/unit/blog_helper_test.rb @@ -7,6 +7,8 @@ class BlogHelperTest < ActionView::TestCase include ActionView::Helpers::AssetTagHelper include ApplicationHelper + helper ApplicationHelper + def setup stubs(:show_date).returns('') @environment = Environment.default @@ -103,7 +105,7 @@ class BlogHelperTest < ActionView::TestCase result = display_post(file) assert_tag_in_string result, :tag => 'a', :attributes => { :href => file.public_filename }, - :content => file.filename + :content => _('Download') end should 'display image if post is an image' do -- libgit2 0.21.2