noosfero | 2 new commits pushed to repository

[Antonio Terceiro]

Antonio Terceiro pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/f3577c1b29363d9b8de8aa9e4b853518ceb0dd76">f3577c1b</a> by Daniela Feitosa
Fix: link to add more files on upload of files

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/63f475de6734cd3e1bc1f7a0890a0a821450c4bc">63f475de</a> by Antonio Terceiro
Merge branch 'add-more-files' into 'master'

Add more files

See merge request !508

- - - - -


Changes:

=====================================
app/helpers/cms_helper.rb
=====================================
--- a/app/helpers/cms_helper.rb
+++ b/app/helpers/cms_helper.rb
@@ -9,12 +9,6 @@ module CmsHelper
     mime_type.gsub('/', '_').gsub('-', '')
   end
 
-  def add_upload_file_field(name, locals)
-    button_to_function :add, name, nil do |page|
-      page.insert_html :bottom, :uploaded_files, CGI::escapeHTML(render(:partial => 'upload_file', :locals => locals, :object => UploadedFile.new))
-    end
-  end
-
   def pagination_links(collection, options={})
     options = {:previous_label => '« ', :next_label => ' »', :page_links => false}.merge(options)
     will_paginate(collection, options)

=====================================
app/views/cms/_upload_file.html.erb
=====================================
--- a/app/views/cms/_upload_file.html.erb
+++ b/app/views/cms/_upload_file.html.erb
@@ -1,2 +1 @@
 <p><%= file_field_tag('uploaded_files[]', :size => size) %></p>
-<%= javascript_tag("jQuery('#uploaded_files')[0].scrollTop = jQuery('#uploaded_files')[0].scrollHeight") %>

=====================================
app/views/cms/_upload_file_form.html.erb
=====================================
--- a/app/views/cms/_upload_file_form.html.erb
+++ b/app/views/cms/_upload_file_form.html.erb
@@ -13,7 +13,7 @@
 <%= hidden_field_tag('back_to', @back_to) %>
 
 <% button_bar do %>
-  <%= add_upload_file_field(_('More files'), {:size => size}) %>
+  <%= button_to_function :add, _('More files'), "add_new_file_fields()" %>
   <% if @back_to %>
     <%= submit_button :save, _('Upload'), :cancel => @back_to %>
   <% else %>

=====================================
public/javascripts/application.js
=====================================
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1128,4 +1128,11 @@ function stop_fetching(element){
   jQuery('.fetching-overlay', element).remove();
 }
 
+function add_new_file_fields() {
+  var cloned = jQuery('#uploaded_files p:last').clone();
+  cloned.find("input[type='file']").val('');
+  cloned.appendTo('#uploaded_files');
+  jQuery('body').scrollTo(cloned);
+}
+
 window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150316/3c06fbc0/attachment.html>