lipsiadmin_generators/attachment/templates/controller.rb
@@ -1,3 +1,10 @@
+2009-05-26
+ * Fixed validates_attachment_content_type_for, now accepts correctly regex
+ * Added a attachment_tag for autogenerate html for upload one file/image
+ * Added a attachemnts_tag autogenerate html for upload multiple file/image and order them
+ * Added a open_standard_grid for simplify use of ext window with ours grids.
+ * Improved attachment generator
+
2009-05-21
* Removed some grids defaults
* Added attacher_name in before_save
CHANGELOG
@@ -75,7 +75,7 @@ end
desc "Publish the API documentation"
task :pdoc => [:rdoc] do
- Rake::SshDirPublisher.new("root@lipsiasoft.net", "/mnt/www/apps/lipsiadmin/doc", "doc").upload
+ Rake::SshDirPublisher.new("root@lipsiasoft.net", "/mnt/www/apps/lipsiasoft/doc", "doc").upload
end
desc "Publish the release files to RubyForge."
Rakefile
@@ -347,8 +347,8 @@ module Lipsiadmin
valid_types = []
args.each do |variable|
case variable
- when String then valid_types << variable
when Hash then options.merge!(variable)
+ else valid_types << variable
end
end
attachment_definitions[name][:validations][:content_type] = lambda do |attachment, instance|
lib/data_base/attachment.rb
@@ -43,7 +43,6 @@ module Lipsiadmin
def options
@options ||= {
:whiny_thumbnails => false,
- :image_magick_path => nil,
:command_path => nil,
:log => true,
:swallow_stderr => true
@@ -83,9 +82,6 @@ module Lipsiadmin
end
def path_for_command(command)#:nodoc:
- if options[:image_magick_path]
- warn("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
- end
path = [options[:command_path] || options[:image_magick_path], command].compact
File.join(*path)
end
lib/data_base/attachment/attach.rb
@@ -2,7 +2,7 @@ module Lipsiadmin
module VERSION #:nodoc:
MAJOR = 4
MINOR = 1
- TINY = 3
+ TINY = 4
STRING = [MAJOR, MINOR, TINY].join('.')
end
lib/version.rb
@@ -157,8 +157,164 @@ module Lipsiadmin
config << { :text => I18n.t("backend.menus.help", :default => "Help"), :handler => "function() { Backend.app.openHelp() }".to_l }
return config.to_json
end
+
+ # Returns html for upload one image or generic file.
+ #
+ # Options can be one of the following:
+ #
+ # <tt>:image</tt>:: Indicate if the attachments are ONLY images.
+ #
+ # Examples:
+ #
+ # class Category < ActiveRecord::Base
+ # has_one_attachments :file, :dependent => :destroy
+ # ...
+ #
+ # Then in our view we can simply add this:
+ #
+ # attachments_tag(:category, :file)
+ #
+ # Remember that al labels can be translated. See Locales for Backend.
+ #
+ def attachment_tag(object_name, method, options={})
+ variable = instance_variable_get("@#{object_name}")
+ html = []
+ html << '<!-- Generated from Lipsiadmin -->'
+ html << '<ul id="' + "#{method}-order" + '" class="label">'
+
+ if attachment = variable.send(method)
+ # Create first the remove link
+ remove_link = link_to_remote(tl(:remove), :url => "/backend/attachments/#{attachment.id}",
+ :method => :delete,
+ :success => "$('#{method}_#{attachment.id}').remove();")
+
+ if options[:image]
+ fstyle = "float:left;margin:5px;margin-left:0px;"
+ fclass = "box-image"
+ ftag = '<div>' + image_tag(attachment.url(:thumb)) + '</div>'
+ ftag += '<div style="text-align:center;padding:5px;cursor:pointer">'
+ ftag += ' ' + remove_link
+ ftag += '</div>'
+ else
+ fstyle = "padding:5px;border-bottom:1px solid #DDE7F5;"
+ fclass = "box-file"
+ ftag = '<div style="float:left;cursor:pointer">'
+ ftag += ' ' + link_to(attachment.attached_file_name, attachment.url) + ' ' + number_to_human_size(attachment.attached_file_size)
+ ftag += '</div>'
+ ftag += '<div style="float:right;cursor:pointer">'
+ ftag += ' ' + remove_link
+ ftag += '</div>'
+ ftag += '<br style="clear:both" />'
+ end
+
+ html << '<li id="' + "#{method}_#{attachment.id}" + '" class="' + fclass + '" style="' + fstyle + '">'
+ html << ' ' + ftag
+ html << '</li>'
+ end # End of Loop
+
+ html << '</ul>'
+ html << '<br style="clear:both" />'
+
+ flbl = options[:image] ? :upload_image : :upload_file
+ html << '<div class="label-title">' + tl(flbl) + '</div>'
+ html << '<table>'
+ rowa = ' <tr class="attachment">'
+ rowa << ' <td>' + human_name_for(:attachment, :attached_file_name) + '</td>'
+ rowa << ' <td>' + file_field_tag("category[#{method}_attributes][file]", :style => "width:250px") + '</td>'
+ rowa << ' </tr>'
+ html << rowa
+ html << '</table>'
+ html.join("\n")
+ end
- # Open a new windows that can contain a grid that you can reuse
+ # Returns html for upload multiple images or generic files.
+ #
+ # Options can be one of the following:
+ #
+ # <tt>:image</tt>:: Indicate if the attachments are ONLY images.
+ # <tt>:order</tt>:: Indicate if user can order files.
+ #
+ # Examples:
+ #
+ # class Category < ActiveRecord::Base
+ # has_many_attachments :images, :dependent => :destroy
+ # validates_attachment_content_type_for :images, /^image/
+ # ...
+ #
+ # Then in our view we can simply add this:
+ #
+ # attachments_tag(:category, :images, :image => true, :order => true)
+ #
+ # Remember that al labels can be translated. See Locales for Backend.
+ #
+ def attachments_tag(object_name, method, options={})
+ variable = instance_variable_get("@#{object_name}")
+ html = []
+ html << '<!-- Generated from Lipsiadmin -->'
+ html << '<ul id="' + "#{method}-order" + '" class="label">'
+
+ for attachment in variable.send(method).all(:order => :position)
+ # Create first the remove link
+ remove_link = link_to_remote(tl(:remove), :url => "/backend/attachments/#{attachment.id}",
+ :method => :delete,
+ :success => "$('#{method}_#{attachment.id}').remove();")
+
+ if options[:image]
+ fstyle = "float:left;margin:5px;margin-left:0px;"
+ fstyle += "cursor:move;" if options[:order]
+ fclass = "box-image"
+ ftag = '<div>' + image_tag(attachment.url(:thumb)) + '</div>'
+ ftag += '<div style="text-align:center;padding:5px;cursor:pointer">'
+ ftag += ' ' + remove_link
+ ftag += '</div>'
+ else
+ fstyle = "padding:5px;border-bottom:1px solid #DDE7F5;"
+ fstyle += "cursor:move;" if options[:order]
+ fclass = "box-file"
+ ftag = '<div style="float:left;cursor:pointer">'
+ ftag += ' ' + link_to(attachment.attached_file_name, attachment.url) + ' ' + number_to_human_size(attachment.attached_file_size)
+ ftag += '</div>'
+ ftag += '<div style="float:right;cursor:pointer">'
+ ftag += ' ' + remove_link
+ ftag += '</div>'
+ ftag += '<br style="clear:both" />'
+ end
+
+ html << '<li id="' + "#{method}_#{attachment.id}" + '" class="' + fclass + '" style="' + fstyle + '">'
+ html << ' ' + ftag
+ html << '</li>'
+ end # End of Loop
+
+ html << '</ul>'
+ html << '<br style="clear:both" />'
+
+ if options[:order]
+ constraint = options[:image] ? "horizontal" : "vertical"
+ html << '<div id="' + "#{method}-message" + '" style="padding:5px"> </div>'
+ html << sortable_element("#{method}-order", :url => "/backend/attachments/order", :update => "#{method}-message", :constraint => constraint,
+ :complete => visual_effect(:highlight, "#{method}-message", :duration => 0.5))
+ end
+
+ flbl = options[:image] ? :upload_images : :upload_files
+ html << '<div class="label-title">'+ tl(flbl) +'</div>'
+ html << '<table>'
+ rowa = ' <tr class="attachment">'
+ rowa << ' <td>' + human_name_for(:attachment, :attached_file_name) + '</td>'
+ rowa << ' <td>' + file_field_tag("category[#{method}_attributes][][file]", :style => "width:250px") + '</td>'
+ rowa << ' <td>' + link_to_function(tl(:remove), "this.up('.attachment').remove()") + '</td>'
+ rowa << ' </tr>'
+ html << rowa
+ html << ' <tr id="' + "add-#{method}" + '">'
+ html << ' <td colspan="2"> </td>'
+ html << ' <td style="padding-top:15px">'
+ html << ' ' + link_to_function(tl(:add)) { |page| page.insert_html(:before, "add-#{method}", rowa) }
+ html << ' </td>'
+ html << ' </tr>'
+ html << '</table>'
+ html.join("\n")
+ end
+
+ # Build a new windows that can contain an existent grid
#
# The first argument name is used as the link text.
#
@@ -187,12 +343,11 @@ module Lipsiadmin
# # }
# # }).show();
# # return false;" href="#">Select a Category</a>
- #
- # open_grid "Select a Category", "/backend/categories.js", "gridPanel",
+ # build_grid "Select a Category", "/backend/categories.js", "gridPanel",
# :update => "$('post_category_ids').value = selections.collect(function(s) { return s.id }).join(',');" +
# "$('category_names').innerHTML = selections.collect(function(s) { return s.data['categories.name'] }).join(', ');"
#
- def open_grid(text, url, grid, options={})
+ def build_grid(text, url, grid, options={})
options[:before] = options[:before] + ";" if options[:before]
javascript = <<-JAVASCRIPT
#{options[:before]}
@@ -206,7 +361,56 @@ module Lipsiadmin
}
}).show()
JAVASCRIPT
- link_to_function(text, javascript)
+ link_to_function(text, javascript.gsub(/\n|\s+/, " "))
+ end
+ alias_method :open_grid, :build_grid
+
+ # Open a Standard window that can contain a standard existent grid
+ #
+ # Options can be one of the following:
+ #
+ # <tt>:grid</tt>:: The name of the grid var. Default "gridPanel"
+ # <tt>:url</tt>:: The url where the grid is stored. Default is autogenerated.
+ # <tt>:name</tt>:: The name of the link that open the window grid. Default a image.
+ #
+ # # Generates: <a onclick="
+ # # new Backend.window({
+ # # url: '/backend/categories.js',
+ # # grid: 'gridPanel',
+ # # listeners: {
+ # # selected: function(win, selections){
+ # # $('post_category_ids').value = selections.collect(function(s) { return s.id }).join(',');
+ # # $('category_names').innerHTML = selections.collect(function(s) { return s.data['categories.name'] }).join(', ');
+ # # }
+ # # }
+ # # }).show();
+ # # return false;" href="#">Select a Category</a>
+ # # Generates: new Backend.window({
+ # # url: '/backend/suppliers.js',
+ # # grid: 'gridPanel',
+ # # listeners: {
+ # # selected: function(win, selections){
+ # # $('warehouse_supplier_id').value = selections.first().id;
+ # # $('warehouse_supplier_name').innerHTML = selections.first().data['suppliers.name']
+ # # }
+ # # }
+ # # }).show(); return false;">
+ # # <img alt="New" src="/images/backend/new.gif?1242655402" style="vertical-align:bottom" /></a>
+ # # <input id="warehouse_supplier_id" name="warehouse[supplier_id]" type="hidden" value="16" />
+ # open_standard_grid :warehouse, :supplier, :id, :name
+ #
+ def open_standard_grid(object_name, ext_object, value, display, options={})
+ current_value = instance_variable_get("@#{object_name}").send(ext_object).send(display) rescue "Nessuno"
+ value_field = value.to_s.downcase == "id" ? "id" : "data['#{ext_object.to_s.pluralize}.#{value}']"
+ options[:grid] ||= "gridPanel"
+ options[:url] ||= "/backend/#{ext_object.to_s.pluralize}.js"
+ options[:name] ||= image_tag("backend/new.gif", :style => "vertical-align:bottom")
+ update_function = "$('#{object_name}_#{ext_object}_#{value}').value = selections.first().#{value_field}; " +
+ "$('#{object_name}_#{ext_object}_#{display}').innerHTML = selections.first().data['#{ext_object.to_s.pluralize}.#{display}']"
+
+ content_tag(:span, current_value, :id => "#{object_name}_#{ext_object}_#{display}" ) + ' ' +
+ build_grid(options[:name], options[:url], options[:grid], :update => update_function) +
+ hidden_field(object_name, "#{ext_object}_#{value}")
end
# Open a new windows that can contain a form that you can reuse
@@ -250,7 +454,7 @@ module Lipsiadmin
}
}).show()
JAVASCRIPT
- link_to_function(text, javascript)
+ link_to_function(text, javascript.gsub(/\n/, " "))
end
# This method call a remote_function and in the same time do a
lib/view/helpers/backend_helper.rb
@@ -6,7 +6,11 @@ class AttachmentGenerator < Rails::Generator::Base
unless options[:skip_migration]
m.migration_template("migration.rb", "db/migrate", :migration_file_name => "create_attachments")
end
+ m.append("config/routes.rb", " backend.resources :attachments, :collection => { :order => :post }", "map.namespace(:backend) do |backend|")
+ m.directory('app/controllers/backend')
+ m.directory('app/models')
m.template('model.rb', 'app/models/attachment.rb')
+ m.template('controller.rb', 'app/controllers/backend/attachments_controller.rb')
m.readme "../REMEMBER"
end
end
lipsiadmin_generators/attachment/attachment_generator.rb
@@ -1,10 +1,12 @@
class CreateAttachments < ActiveRecord::Migration
def self.up
create_table :attachments, :force => true do |t|
- t.string :attached_file_name, :attached_content_type
+ t.string :attached_file_name,
+ t.string :attached_content_type
t.integer :attached_file_size
- t.references :attacher, :polymorphic => true
+ t.references :attacher, :polymorphic => true
t.string :attacher_name
+ t.integer :position, :default => 1
t.timestamps
end
end
lipsiadmin_generators/attachment/templates/migration.rb
@@ -18,6 +18,16 @@ en:
list: "List"
new: "New"
help: "Help"
+ labels:
+ none: "Nothing"
+ add: "Add"
+ remove: "Remove"
+ upload_file: "Upload File"
+ upload_files: "Upload Files"
+ upload_image: "Upload Image"
+ upload_images: "Upload Images"
+ texts:
+ order_updated: Order updated!
javascripts:
buttons:
add: "Add"
lipsiadmin_generators/backend/templates/config/locales/backend/en.yml
@@ -17,6 +17,16 @@ it:
account: "Account"
list: "Elenco"
new: "Nuovo"
+ labels:
+ none: "Nessuno"
+ add: "Aggiungi"
+ remove: "Rimuovi"
+ upload_file: "Carica File"
+ upload_files: "Carica Files"
+ upload_image: "Carica Immagine"
+ upload_images: "Carica Immagini"
+ texts:
+ order_updated: L'ordine è stato aggiornato!
javascripts:
buttons:
add: "Aggiungi"
lipsiadmin_generators/backend/templates/config/locales/backend/it.yml
@@ -1,4 +1,5 @@
require 'digest/sha1'
+require 'openssl'
class Account < ActiveRecord::Base
# Virtual attribute for the unencrypted password
attr_accessor :password
lipsiadmin_generators/backend/templates/models/account.rb
74239e7aaaa7c5d9f6a69c7e181760687c1aee40
Davide D'Agostino
DAddYE@DAddYE.local
http://github.com/Lipsiasoft/lipsiadmin/commit/685814e735d54b062b605d3d753b619d2c3119ea
685814e735d54b062b605d3d753b619d2c3119ea
2009-05-26T13:46:06-07:00
2009-05-26T13:46:06-07:00
* Fixed validates_attachment_content_type_for, now accepts correctly regex
* Added a attachment_tag for autogenerate html for upload one file/image
* Added a attachemnts_tag autogenerate html for upload multiple file/image and order them
* Added a open_standard_grid for simplify use of ext window with ours grids.
933e6477871908a32eeacfaa876046feeb78e642
Davide D'Agostino
DAddYE@DAddYE.local