jro_apps/redmine Commit - r182:0d55613359d9

replaced deprecated human_size by number_to_human_size...

Jean-Philippe Lang -

r182:0d55613359d9

parent child

Context file:

r182:0d55613359d9

Collapse all files

app/views/documents/show.rhtml +2 -2

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
             </div>
             <h2><%= @document.title %></h2>
             <p><em><%= @document.category.name %><br />
             <%= format_date @document.created_on %></em></p>
             <%= textilizable @document.description %>
             <br />
             <h3><%= l(:label_attachment_plural) %></h3>
             <ul class="documents">
             <% for attachment in @attachments %>
                 <li>
                     <div class="contextual">
                     <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
                     </div>
                     <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
-                    (<%= human_size attachment.filesize %>)<br />
+                    (<%= number_to_human_size attachment.filesize %>)<br />
                     <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
                     <%= lwr(:label_download, attachment.downloads) %>
                 </li>
             <% end %>
             </ul>
             <br />
             <% if authorize_for('documents', 'add_attachment') %>
               <% form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") do %>
                 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
                 <%= image_to_function "add.png", "addFileField();return false" %></label>
-                <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+                <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>

app/views/issues/_pdf.rfpdf +1 -1

             <%	pdf.SetFont('Arial','B',11)
                	pdf.Cell(190,10, "#{issue.project.name} - #{issue.tracker.name} # #{issue.long_id} - #{issue.subject}")
                 pdf.Ln
                 y0 = pdf.GetY
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_status) + ":","LT")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, issue.status.name,"RT")
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_priority) + ":","LT")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, issue.priority.name,"RT")
                 pdf.Ln
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_author) + ":","L")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, issue.author.name,"R")
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_category) + ":","L")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, (issue.category ? issue.category.name : "-"),"R")
                 pdf.Ln
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_created_on) + ":","L")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, format_date(issue.created_on),"R")
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, (issue.assigned_to ? issue.assigned_to.name : "-"),"R")
                 pdf.Ln
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, format_date(issue.updated_on),"RB")
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_due_date) + ":","LB")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(60,5, format_date(issue.due_date),"RB")
                 pdf.Ln
             	for custom_value in issue.custom_values
             	    pdf.SetFont('Arial','B',9)
             	    pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
             	    pdf.SetFont('Arial','',9)
             	    pdf.MultiCell(155,5, (show_value custom_value),"R")
             	end
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_subject) + ":","LTB")
                 pdf.SetFont('Arial','',9)
                 pdf.Cell(155,5, issue.subject,"RTB")
                 pdf.Ln
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(35,5, l(:field_description) + ":")
                 pdf.SetFont('Arial','',9)
                 pdf.MultiCell(155,5, issue.description,"BR")
                 pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
             	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
                 pdf.Ln
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(190,5, l(:label_history), "B")
                 pdf.Ln
             	for journal in issue.journals.find(:all, :include => :user, :order => "journals.created_on desc")
             		pdf.SetFont('Arial','B',8)
             	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
             	    pdf.Ln
             		pdf.SetFont('Arial','I',8)
             		for detail in journal.details
             			pdf.Cell(190,5, "- " + show_detail(detail, true))
             			pdf.Ln
             		end
             		if journal.notes?
             			pdf.SetFont('Arial','',8)
             			pdf.MultiCell(190,5, journal.notes)
             		end
             		pdf.Ln
             	end
                 pdf.SetFont('Arial','B',9)
                 pdf.Cell(190,5, l(:label_attachment_plural), "B")
             	pdf.Ln
             	for attachment in issue.attachments
             		pdf.SetFont('Arial','',8)
             	    pdf.Cell(80,5, attachment.filename)
-            		pdf.Cell(20,5, human_size(attachment.filesize),0,0,"R")
+            		pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
             		pdf.Cell(20,5, format_date(attachment.created_on),0,0,"R")
             		pdf.Cell(70,5, attachment.author.name,0,0,"R")
             		pdf.Ln
             	end
             %>

app/views/issues/show.rhtml +2 -2

             <div class="contextual">
             <%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
             </div>
             <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
             <div class="box">
             <table width="100%">
             <tr>
                 <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
                 <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
                 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td>
                 <td><b><%=l(:field_start_date)%> :</b></td><td><%= format_date(@issue.start_date) %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td>
                 <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>
                 <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
             </tr>
             <tr>
                 <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>
                 <td></td><td></td>
             </tr>
             <tr>
             <% n = 0
             for custom_value in @custom_values %>
                 <td><b><%= custom_value.custom_field.name %> :</b></td><td><%=h show_value custom_value %></td>
             <% n = n + 1
                if (n > 1)
                     n = 0 %>
                     </tr><tr>
              <%end
             end %>
             </tr>
             </table>
             <hr />
             <br />
             <b><%=l(:field_description)%> :</b><br /><br />
             <%= textilizable @issue.description %>
             <br />
             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
             </div>
             <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
               <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
               <%=l(:label_change_status)%> :
               <select name="new_status_id">
               <%= options_from_collection_for_select @status_options, "id", "name" %>
               </select>
               <%= submit_tag l(:button_change) %>
               <% end %>
             <% end %>
             &nbsp;
             </div>
             <div id="history" class="box">
             <h3><%=l(:label_history)%>
             <% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
             <%= render :partial => 'history', :locals => { :journals => @journals } %>
             <% if @journals_count > @journals.length %>
                 <p><center><small>[ <%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %> ]</small></center></p>
             <% end %>
             </div>
             <div class="box">
             <h3><%=l(:label_attachment_plural)%></h3>
             <table width="100%">
             <% for attachment in @issue.attachments %>
             <tr>
-            <td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= human_size(attachment.filesize) %>)</td>
+            <td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
             <td><%= format_date(attachment.created_on) %></td>
             <td><%= attachment.author.display_name %></td>
             <td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %></div></td>
             </tr>
             <% end %>
             </table>
             <br />
             <% if authorize_for('issues', 'add_attachment') %>
               <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
               <p id="attachments_p"><label><%=l(:label_attachment_new)%>
               <%= image_to_function "add.png", "addFileField();return false" %></label>
-              <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+              <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>
             </div>
             <% if authorize_for('issues', 'add_note') %>
               <div class="box">
               <h3><%= l(:label_add_note) %></h3>
               <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
               <p><label for="notes"><%=l(:field_notes)%></label>
                 <%= text_area_tag 'notes', '', :cols => 60, :rows => 10  %></p>
               <%= submit_tag l(:button_add) %>
               <% end %>
               </div>
             <% end %>

app/views/projects/add_document.rhtml +1 -1

             <h2><%=l(:label_document_new)%></h2>
             <% form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) do %>
             <%= render :partial => 'documents/form' %>
             <div class="box">
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <%= submit_tag l(:button_create) %>
             <% end %>

app/views/projects/add_file.rhtml +1 -1

             <h2><%=l(:label_attachment_new)%></h2>
             <%= error_messages_for 'attachment' %>
             <div class="box">
             <% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
             <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
             <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <%= submit_tag l(:button_add) %>
             <% end %>

app/views/projects/add_issue.rhtml +1 -1

             <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
             <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do |f| %>
             <%= error_messages_for 'issue' %>
             <div class="box">
             <!--[form:issue]-->
             <%= hidden_field_tag 'tracker_id', @tracker.id %>
             <div class="splitcontentleft">
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <div class="clear">
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <!--[eoform:issue]-->
             </div>
             <%= submit_tag l(:button_create) %>
             <% end %>
             <% if Setting.text_formatting == 'textile' %>
             <%= javascript_include_tag 'jstoolbar' %>
             <script type="text/javascript">
             //<![CDATA[
             if (document.getElementById) {
             	if (document.getElementById('issue_description')) {
             		var commentTb = new jsToolBar(document.getElementById('issue_description'));
             		commentTb.draw();
             	}
             }
             //]]>
             </script>
             <% end %>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <% end %>

app/views/projects/list_files.rhtml +1 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_attachment_plural)%></h2>
             <% delete_allowed = authorize_for('versions', 'destroy_file') %>
             <table class="list">
               <thead><tr>
                 <th><%=l(:field_version)%></th>
                 <th><%=l(:field_filename)%></th>
                 <th><%=l(:label_date)%></th>
                 <th><%=l(:field_filesize)%></th>
                 <th>D/L</th>
                 <th>MD5</th>
                 <% if delete_allowed %><th></th><% end %>
               </tr></thead>
               <tbody>
             <% for version in @versions %>
               <% unless version.attachments.empty? %>
               <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
               <% for file in version.attachments %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td></td>
                 <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
                 <td align="center"><%= format_date(file.created_on) %></td>
-                <td align="center"><%= human_size(file.filesize) %></td>
+                <td align="center"><%= number_to_human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>
                 <td align="center"><small><%= file.digest %></small></td>
                 <% if delete_allowed %>
                 <td align="center">
                     <div class="contextual">
                     <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
                     </div>
                 </td>
                 <% end %>
               </tr>
               <% end
               reset_cycle %>
               <% end %>
             <% end %>
               </tbody>
             </table>

app/views/repositories/_dir_list.rhtml +2 -2

             <table class="list">
             <thead><tr>
             <th><%= l(:field_name) %></th>
             <th><%= l(:field_filesize) %></th>
             <th><%= l(:label_revision) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:label_date) %></th>
             </tr></thead>
             <tbody>
             <% total_size = 0
             @entries.each do |entry| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => ("icon " + (entry.is_dir? ? 'icon-folder' : 'icon-file')) %></td>
-            <td align="right"><%= human_size(entry.size) unless entry.is_dir? %></td>
+            <td align="right"><%= number_to_human_size(entry.size) unless entry.is_dir? %></td>
             <td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>
             <td align="center"><em><%=h entry.lastrev.author %></em></td>
             <td align="center"><%= format_time(entry.lastrev.time) %></td>
             </tr>
             <% total_size += entry.size
             end %>
             </tbody>
             </table>
-            <p class="textright"><em><%= l(:label_total) %>: <%= human_size(total_size) %></em></p>
  No newline at end of file
+            <p class="textright"><em><%= l(:label_total) %>: <%= number_to_human_size(total_size) %></em></p>
  No newline at end of file

app/views/repositories/revisions.rhtml +1 -1

             <div class="contextual">
             <% form_tag do %>
             <p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
             <%= submit_tag 'OK' %></p>
             <% end %>
             </div>
             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %></h2>
             <% if @entry.is_file? %>
             <h3><%=h @entry.name %></h3>
-            <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= human_size @entry.size %>)</p>
+            <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= number_to_human_size @entry.size %>)</p>
             <% end %>
             <h3>Revisions</h3>
             <table class="list">
             <thead><tr>
             <th>#</th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_description) %></th>
             <th></th>
             </tr></thead>
             <tbody>
             <% @revisions.each do |revision| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <th align="center"><%= link_to revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier %></th>
             <td align="center"><em><%=h revision.author %></em></td>
             <td align="center"><%= format_time(revision.time) %></td>
             <td style="width:70%"><%= textilizable(revision.message) %></td>
             <td align="center"><%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier if @entry.is_file? && revision != @revisions.last %></td>
             </tr>
             <% end %>
             </tbody>
             </table>
             <p><%= lwr(:label_modification, @revisions.length) %></p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages