[Git][noosfero/noosfero][master] 2 commits: Add download icon

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
ac306a5b by dtygel at 2015-08-10T16:56:59Z
Add download icon

- - - - -
b9225f6a by Braulio Bhavamitra at 2015-08-10T17:46:09Z
Merge branch 'download-icon' into noosfero

- - - - -


6 changed files:

- 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


Changes:

=====================================
app/views/file_presenter/_generic.html.erb
=====================================
--- a/app/views/file_presenter/_generic.html.erb
+++ b/app/views/file_presenter/_generic.html.erb
@@ -1,9 +1,5 @@
-<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') %>


=====================================
public/designs/icons/awesome/style.scss
=====================================
--- 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;


=====================================
public/designs/icons/tango/style.css
=====================================
--- 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); }


=====================================
public/stylesheets/application.css
=====================================
--- 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;


=====================================
test/unit/article_block_test.rb
=====================================
--- 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


=====================================
test/unit/blog_helper_test.rb
=====================================
--- 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



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/815c8f6a04c1ee64180ee98ca3144da838dbe994...b9225f6a67f16b98f419cba8adee1ae8d53ca1b0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150810/94cc0020/attachment.html>