Add download icon

dtygel · Braulio Bhavamitra
1 parent 2f07775b
Showing 6 changed files with 11 additions and 13 deletions Show diff stats
app/views/file_presenter/_generic.html.erb
public/designs/icons/awesome/style.scss
public/designs/icons/tango/style.css
public/stylesheets/application.css
test/unit/article_block_test.rb
test/unit/blog_helper_test.rb
-<span class="download-link">
-  <span>Download</span>
-  <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
-</span>
-
 <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
   <%= generic.abstract %>
 </div>
+<%= button(:download, _('Download'), [Noosfero.root, generic.public_filename].join, class:'download-link', option:'primary', size:'lg') %>
@@ -140,6 +140,9 @@ $fa-font-path: &quot;fonts&quot;;
 .icon-down:before {
   @extend .fa-arrow-down:before;
 }
+.icon-download:before {
+  @extend .fa-download:before;
+}
 .icon-spread:before {
   @extend .fa-share:before;
@@ -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); }
@@ -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;
@@ -64,7 +64,7 @@ class ArticleBlockTest &lt; 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 &lt; 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 &lt; 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
@@ -7,6 +7,8 @@ class BlogHelperTest &lt; 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 &lt; 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
	@@ -64,7 +64,7 @@ class ArticleBlockTest < ActiveSupport::TestCase		@@ -64,7 +64,7 @@ class ArticleBlockTest < ActiveSupport::TestCase
64	end	64	end
65	person.boxes.first.blocks << block	65	person.boxes.first.blocks << block
66	block.save!	66	block.save!
67	-	67	+
68	block.reload	68	block.reload
69	assert_equal [a],block.available_articles	69	assert_equal [a],block.available_articles
70	end	70	end
	@@ -80,7 +80,7 @@ class ArticleBlockTest < ActiveSupport::TestCase		@@ -80,7 +80,7 @@ class ArticleBlockTest < ActiveSupport::TestCase
80	block = create(ArticleBlock, :article => a)	80	block = create(ArticleBlock, :article => a)
81	env.boxes.first.blocks << block	81	env.boxes.first.blocks << block
82	block.save!	82	block.save!
83	-	83	+
84	block.reload	84	block.reload
85	assert_equal [a],block.available_articles	85	assert_equal [a],block.available_articles
86	end	86	end
	@@ -140,7 +140,7 @@ class ArticleBlockTest < ActiveSupport::TestCase		@@ -140,7 +140,7 @@ class ArticleBlockTest < ActiveSupport::TestCase
140	block.article = file	140	block.article = file
141	block.save!	141	block.save!
142		142
143	- assert_tag_in_string instance_eval(&block.content), :tag => 'a', :content => 'test.txt'	143	+ assert_tag_in_string instance_eval(&block.content), :tag => 'a', :content => _('Download')
144	end	144	end
145		145
146	protected	146	protected