Download as
Browse Code »

Commit ac306a5b691c8341cf28d9b7273060e3e31f44c5

Authored by dtygel
Committed by Braulio Bhavamitra
1 parent 2f07775b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Add download icon

Showing 6 changed files with 11 additions and 13 deletions   Show diff stats
app/views/file_presenter/_generic.html.erb
  Diff comments   View file @ac306a5
1   -<span class="download-link">
2   - <span>Download</span>
3   - <strong><%= link_to generic.filename, [Noosfero.root, generic.public_filename].join %></strong>
4   -</span>
5   -
6 1 <div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
7 2 <%= generic.abstract %>
8 3 </div>
9 4  
  5 +<%= button(:download, _('Download'), [Noosfero.root, generic.public_filename].join, class:'download-link', option:'primary', size:'lg') %>
... ...
public/designs/icons/awesome/style.scss
  Diff comments   View file @ac306a5
... ... @@ -140,6 +140,9 @@ $fa-font-path: &quot;fonts&quot;;
140 140 .icon-down:before {
141 141 @extend .fa-arrow-down:before;
142 142 }
  143 +.icon-download:before {
  144 + @extend .fa-download:before;
  145 +}
143 146  
144 147 .icon-spread:before {
145 148 @extend .fa-share:before;
... ...
public/designs/icons/tango/style.css
  Diff comments   View file @ac306a5
... ... @@ -28,6 +28,7 @@
28 28 .icon-more { background-image: url(Tango/16x16/actions/add.png) }
29 29 .icon-up { background-image: url(Tango/16x16/actions/go-up.png) }
30 30 .icon-down { background-image: url(Tango/16x16/actions/go-down.png) }
  31 +.icon-download { background-image: url(Tango/16x16/actions/bottom.png) }
31 32 .icon-left { background-image: url(Tango/16x16/actions/go-previous.png) }
32 33 .icon-right { background-image: url(Tango/16x16/actions/go-next.png) }
33 34 .icon-up-disabled { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
... ...
public/stylesheets/application.css
  Diff comments   View file @ac306a5
... ... @@ -4019,10 +4019,6 @@ div#article-parent {
4019 4019 text-align: right;
4020 4020 font-style: italic;
4021 4021 }
4022   -.article-body-uploaded-file {
4023   - text-align: center;
4024   -}
4025   -
4026 4022 /* ==> public/stylesheets/controller_events.css <== */
4027 4023 #agenda {
4028 4024 position: relative;
... ...
test/unit/article_block_test.rb
  Diff comments   View file @ac306a5
... ... @@ -64,7 +64,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
64 64 end
65 65 person.boxes.first.blocks << block
66 66 block.save!
67   -
  67 +
68 68 block.reload
69 69 assert_equal [a],block.available_articles
70 70 end
... ... @@ -80,7 +80,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
80 80 block = create(ArticleBlock, :article => a)
81 81 env.boxes.first.blocks << block
82 82 block.save!
83   -
  83 +
84 84 block.reload
85 85 assert_equal [a],block.available_articles
86 86 end
... ... @@ -140,7 +140,7 @@ class ArticleBlockTest &lt; ActiveSupport::TestCase
140 140 block.article = file
141 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 144 end
145 145  
146 146 protected
... ...
test/unit/blog_helper_test.rb
  Diff comments   View file @ac306a5
... ... @@ -7,6 +7,8 @@ class BlogHelperTest &lt; ActionView::TestCase
7 7 include ActionView::Helpers::AssetTagHelper
8 8 include ApplicationHelper
9 9  
  10 + helper ApplicationHelper
  11 +
10 12 def setup
11 13 stubs(:show_date).returns('')
12 14 @environment = Environment.default
... ... @@ -103,7 +105,7 @@ class BlogHelperTest &lt; ActionView::TestCase
103 105 result = display_post(file)
104 106 assert_tag_in_string result, :tag => 'a',
105 107 :attributes => { :href => file.public_filename },
106   - :content => file.filename
  108 + :content => _('Download')
107 109 end
108 110  
109 111 should 'display image if post is an image' do
... ...