Download as
Browse Code »

Commit 2ca87f91eb75289e40c4713c41215843ee3d5c65

Authored by Rodrigo Souto
1 parent 7852f785
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Treating article mime type on cms

Showing 3 changed files with 11 additions and 3 deletions   Show diff stats
app/views/cms/view.rhtml
  Diff comments   View file @2ca87f9
@@ -42,10 +42,10 @@ @@ -42,10 +42,10 @@
42 42
43 <% @articles.each do |article| article = FilePresenter.for article %> 43 <% @articles.each do |article| article = FilePresenter.for article %>
44 <tr> 44 <tr>
45 - <td> 45 + <td class="article-name">
46 <%= link_to_article(article) %> 46 <%= link_to_article(article) %>
47 </td> 47 </td>
48 - <td> 48 + <td class="article-mime">
49 <%= article.respond_to?(:short_description) ? 49 <%= article.respond_to?(:short_description) ?
50 article.short_description : 50 article.short_description :
51 article.class.short_description %> 51 article.class.short_description %>
lib/file_presenter.rb
  Diff comments   View file @2ca87f9
@@ -43,7 +43,7 @@ class FilePresenter @@ -43,7 +43,7 @@ class FilePresenter
43 end 43 end
44 44
45 def short_description 45 def short_description
46 - _("File (%s)") % content_type 46 + _("File (%s)") % content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
47 end 47 end
48 48
49 # Define the css classes to style the page fragment with the file related 49 # Define the css classes to style the page fragment with the file related
public/stylesheets/application.css
  Diff comments   View file @2ca87f9
@@ -3171,6 +3171,14 @@ table.cms-articles .icon:hover { @@ -3171,6 +3171,14 @@ table.cms-articles .icon:hover {
3171 background: #eeeeec; 3171 background: #eeeeec;
3172 border: 1px solid #d3d7cf; 3172 border: 1px solid #d3d7cf;
3173 } 3173 }
  3174 +
  3175 +.controller-cms .article-mime {
  3176 + max-width: 90px;
  3177 + overflow: hidden;
  3178 + text-overflow: ellipsis;
  3179 + white-space: nowrap;
  3180 +}
  3181 +
3174 .controller-cms .article-controls { 3182 .controller-cms .article-controls {
3175 white-space: nowrap; 3183 white-space: nowrap;
3176 } 3184 }