[Git][noosfero/noosfero][master] 2 commits: folder: let word wrap work (do not short filenames)
Bráulio Bhavamitra
gitlab at gitlab.com
Tue Jun 16 17:34:13 BRT 2015
Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero
Commits:
5cdd7db7 by Braulio Bhavamitra at 2015-06-16T17:19:04Z
folder: let word wrap work (do not short filenames)
This also removes short_filename as it is now unused
- - - - -
4eb04441 by Bráulio Bhavamitra at 2015-06-16T20:34:13Z
Merge branch 'folder-with-full-filenames' into 'master'
folder: let word wrap work (do not short filenames)
See merge request !503
- - - - -
7 changed files:
- app/helpers/folder_helper.rb
- app/models/uploaded_file.rb
- app/views/shared/_content_item.html.erb
- − lib/short_filename.rb
- plugins/context_content/views/blocks/context_content.html.erb
- test/unit/application_helper_test.rb
- − test/unit/short_filename_test.rb
Changes:
=====================================
app/helpers/folder_helper.rb
=====================================
--- a/app/helpers/folder_helper.rb
+++ b/app/helpers/folder_helper.rb
@@ -1,8 +1,5 @@
-require 'short_filename'
-
module FolderHelper
- include ShortFilename
include ArticleHelper
def list_contents(configure={})
@@ -10,8 +7,8 @@ module FolderHelper
configure[:list_type] ||= :folder
if !configure[:contents].blank?
configure[:contents] = configure[:contents].paginate(
- :order => "updated_at DESC",
- :per_page => 10,
+ :order => "name ASC",
+ :per_page => 30,
:page => params[:npage]
)
=====================================
app/models/uploaded_file.rb
=====================================
--- a/app/models/uploaded_file.rb
+++ b/app/models/uploaded_file.rb
@@ -1,5 +1,3 @@
-require 'short_filename'
-
# Article type that handles uploaded files.
#
# Limitation: only file metadata are versioned. Only the latest version
@@ -14,8 +12,6 @@ class UploadedFile < Article
track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent
- include ShortFilename
-
def title
if self.name.present? then self.name else self.filename end
end
=====================================
app/views/shared/_content_item.html.erb
=====================================
--- a/app/views/shared/_content_item.html.erb
+++ b/app/views/shared/_content_item.html.erb
@@ -4,8 +4,8 @@
<%= display_content_icon(content) %>
</div>
<span class="item-description">
- <%= link_to(short_filename_upper_ext(content.name), content.url) %>
+ <%= link_to(content.name, content.url) %>
</span>
<span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
</div>
-</div>
\ No newline at end of file
+</div>
=====================================
lib/short_filename.rb deleted
=====================================
--- a/lib/short_filename.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module ShortFilename
-
- def short_filename(filename, limit_chars = 43)
- extname = File.extname(filename)
- basename = File.basename(filename,extname)
- return shrink(basename, extname, limit_chars) + extname
- end
-
- def short_filename_upper_ext(filename, limit_chars = 43)
- extname = File.extname(filename)
- display_name = shrink(File.basename(filename, extname), extname, limit_chars)
- return extname.present? ? (display_name + ' - ' + extname.upcase.delete(".")) : display_name
- end
-
- def shrink(filename, extname, limit_chars)
- return filename if filename.size <= limit_chars
- str_complement = '(...)'
- return filename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement
- end
-
-end
=====================================
plugins/context_content/views/blocks/context_content.html.erb
=====================================
--- a/plugins/context_content/views/blocks/context_content.html.erb
+++ b/plugins/context_content/views/blocks/context_content.html.erb
@@ -6,7 +6,7 @@
<%= instance_eval(&block.content_image(content)) if block.show_image %>
</div>
<% if block.show_name %>
- <div class="name"><%= short_filename(content.name, 30) %></div>
+ <div class="name"><%= content.name %></div>
<% end %>
</a>
</span>
=====================================
test/unit/application_helper_test.rb
=====================================
--- a/test/unit/application_helper_test.rb
+++ b/test/unit/application_helper_test.rb
@@ -564,18 +564,6 @@ class ApplicationHelperTest < ActionView::TestCase
assert_equal environment.theme, current_theme
end
- should 'trunc to 15 chars the big filename' do
- assert_equal 'AGENDA(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15)
- end
-
- should 'trunc to default limit the big filename' do
- assert_equal 'AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3')
- end
-
- should 'does not trunc short filename' do
- assert_equal 'filename.mp3', short_filename('filename.mp3')
- end
-
should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do
env = Environment.default
env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false)
=====================================
test/unit/short_filename_test.rb deleted
=====================================
--- a/test/unit/short_filename_test.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require_relative "../test_helper"
-
-class NoosferoFilenamesTest < ActiveSupport::TestCase
-
- include ShortFilename
-
- should 'trunc to 15 chars the big filename' do
- assert_equal 'AGENDA(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15)
- end
-
- should 'trunc to default limit the big filename' do
- assert_equal 'AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3')
- end
-
- should 'does not trunc short filename' do
- assert_equal 'filename.mp3', short_filename('filename.mp3')
- end
-
- should 'highlight the file extansion' do
- assert_equal 'AGENDA(...) - MP3', short_filename_upper_ext('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15)
-
- assert_equal 'AGENDA - MP3', short_filename_upper_ext('AGENDA.mp3',15)
- end
-
- should 'return the full filename if its size is smaller than the limit' do
- assert_equal 'AGENDA', shrink('AGENDA', 'mp3', 15)
- end
-
- should 'shrink the filename if its size is bigger than the limit' do
- assert_equal 'AGENDA(...)', shrink('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA', 'mp3', 14)
- end
-
-end
-
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/53ccf36239a9705b909eed55596b9b3e3da0c658...4eb04441ac32130531564fa4f6dbb932db68509a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150616/06487752/attachment.html>
More information about the Noosfero-dev
mailing list