Download as
Browse Code »

Commit 9b89d389d7bc120d341b26fae57e92bcdb3f70e7

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent e38b8396
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem966: image description is clipped on image gallery

Showing 4 changed files with 17 additions and 4 deletions   Show diff stats
app/views/content_viewer/_uploaded_file.rhtml
  Diff comments   View file @9b89d38
1 <% if uploaded_file.image? %> 1 <% if uploaded_file.image? %>
2 - <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb)), uploaded_file.view_url %> </div> 2 + <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb), :title => uploaded_file.abstract), uploaded_file.view_url %> </div>
3 <% else %> 3 <% else %>
4 <%= render :partial => 'article', :object => uploaded_file %> 4 <%= render :partial => 'article', :object => uploaded_file %>
5 <% end %> 5 <% end %>
app/views/content_viewer/image_gallery.rhtml
  Diff comments   View file @9b89d38
@@ -2,14 +2,13 @@ @@ -2,14 +2,13 @@
2 <%= @page.body %> 2 <%= @page.body %>
3 </div> 3 </div>
4 4
5 -  
6 <div class="image-gallery"> 5 <div class="image-gallery">
7 <p><%= button(:slideshow, _('View slideshow'), @page.url.merge(:slideshow => true))%></p> 6 <p><%= button(:slideshow, _('View slideshow'), @page.url.merge(:slideshow => true))%></p>
8 <ul> 7 <ul>
9 <% @images.each do |a| %> 8 <% @images.each do |a| %>
10 <li class="image-gallery-item"> 9 <li class="image-gallery-item">
11 <%= render :partial => partial_for_class(a.class), :object => a %> 10 <%= render :partial => partial_for_class(a.class), :object => a %>
12 - <span><%= a.abstract %></span> 11 + <span><%= a.abstract && a.abstract.first(40) %></span>
13 </li> 12 </li>
14 <% end %> 13 <% end %>
15 </ul> 14 </ul>
public/stylesheets/folder.css
  Diff comments   View file @9b89d38
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 11
12 .image-gallery-item { 12 .image-gallery-item {
13 width: 142px; 13 width: 142px;
14 - height: 154px; 14 + height: 170px;
15 list-style: none; 15 list-style: none;
16 margin: 5px; 16 margin: 5px;
17 float: left; 17 float: left;
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @9b89d38
@@ -835,4 +835,18 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase @@ -835,4 +835,18 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
835 get :view_page, :profile => profile.identifier, :page => blog_post.explode_path 835 get :view_page, :profile => profile.identifier, :page => blog_post.explode_path
836 assert_no_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{b.id}/} 836 assert_no_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{b.id}/}
837 end 837 end
  838 +
  839 + should 'show only first 40 chars of abstract in image gallery' do
  840 + login_as(profile.identifier)
  841 + folder = Folder.create!(:name => 'gallery', :profile => profile, :view_as => 'image_gallery')
  842 + file = UploadedFile.create!(:profile => profile, :parent => folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
  843 +
  844 + file.abstract = 'a long abstract bigger then 40 chars for testing'
  845 + file.save!
  846 +
  847 + get :view_page, :profile => profile.identifier, :page => folder.explode_path
  848 +
  849 + assert_tag :tag => 'li', :attributes => {:class => 'image-gallery-item'}, :child => {:tag => 'span', :content => 'a long abstract bigger then 40 chars for'}
  850 + end
  851 +
838 end 852 end