lipsiadmin 4.1.8 → 5.0.0

data/CHANGELOG

@@ -1,5 +1,44 @@
-2009-05-11
-  * Fiexed the attachment and attachments tags
+2009-06-05
+  * Dump to 5.0 Version
+  * Support to ExtJs 3.0
+  * Now we can browse with like "static" pages with back & next buttons of browsers [Ragunalth]
+  * Now we can call directly a page, usefull for do a manual refresh of a page but also for condivide links.
+  * Added a new method "un" for remove listners of extjs components
+  * Removed "l" method because we just have to_l for have literal json (ex: "function add(){...}".to_l)
+  * Removed unusued literals
+  * Refactored add method, now is possible to add components
+  * Renamed in ColumnModel add => add_column for conflict reason with add component
+  * Refactored Configuration (used for extjs)
+  * Fixed toolbar for add_buttons like "->" (ex: tbar.add_button :text => "->")
+  * Fixed a extra comma in attachment generator
+  * Fixed account grid generator
+  * Fixed attachment_table, now correctly include utility_scopes
+  * Fixed a little typo in ext controller component
+  * Maked ext columns compatible with extjs 3.0 and 2.0
+  * Added the possibility to add buttons with their menu
+  * Fixed Pdf generator now dude to limtis of previous version we don't put html to stdin but we made a tmp file
+  * Added Erb Templates in Pdf Generator
+  * Added mswin compatibility with Pdf Generator
+  * Fixed Ext DateTimeFiled with allowblank
+  * Removed the default allowBlank: true from Ext.form.DateTimeField
+  * Updated pdf mail builder according to new changes
+  * Removed from Controller Pdf Builder the layout for compatiblity with pdf mailer
+  * Changed simple_error_messages_for, now is localizable like default rails version
+  * Fixed path in in menu generation expecially when we use params
+  * Fixed a little issue when we regenerate locales for our models
+  * Fixed menu with empty urls and submenus
+  * Added a new option for column_model for render datetime to a date (:renderer => :time_to_date)
+  * Added a new option for column_model for render percentage (:renderer => :percentage)
+  * Fixed ext_date_select and ext_datetime_select to correctly render empty date(time) without the option :emptyToNow => true
+  * Fixed correctly the time in ext_datetime_select when :emptyToNow => true
+  * Change the box, now for render it (for uniformity reason) we need to use -box "My Box" do; some; end; instead of =box "My Box" ...
+  * Added AccountAccess caching, you can expire that using Lipsiadmin::AccountAccess::Base.cache[account.id] = nil
+  * Added Rake Tasks for start|stop|restart loops/background_workers
+  * Added handler :after => "myfn()" to open_form
+  * Added a new option to attachment_tag and attachments_tag for only upload files without manage the old ones
+  * Added the possiblity to personalize ttbar using only necessary buttons like ttbar [:edit, :delete] or [:add, :delete]
+  * Fixed a little bug in state_session generator
+  * Added few new images in backend
 
 2009-05-28
   * Refactored account_access now current_account (account logged) is aviable in our roles

data/lib/access_control/authentication.rb

@@ -56,7 +56,7 @@ module Lipsiadmin
           
           return allow && !deny
         end
-
+        
         # Returns a helper to pass in a <tt>before_filter</tt> for check if
         # an account are: <tt>logged_in?</tt> and <tt>allowed?</tt>
         # 

data/lib/access_control/base.rb

@@ -1,5 +1,6 @@
 module Lipsiadmin
   module AccessControl
+
     module Helper#:nodoc:
       def recognize_path(path)#:nodoc:
         case path
@@ -42,6 +43,8 @@ module Lipsiadmin
     #   - Access to all actions EXCEPT <tt>details</tt> of controller "/backend/accounts"
     # 
     class Base
+      @@cache = {}
+      cattr_accessor :cache
       
       class << self
         
@@ -58,13 +61,14 @@ module Lipsiadmin
         def roles
           @roles.nil? ? [] : @roles.collect(&:to_s)
         end
-        
+
+        # Returns maps (allowed && denied actions) for the given account
         def maps_for(account)
-          @mappers.collect { |m| m.call(account) }.
-                   reject  { |m| !m.allowed? }
+          @@cache[account.id] ||= @mappers.collect { |m| m.call(account) }.
+                                           reject  { |m| !m.allowed? }
+          @@cache[account.id]
         end
       end
-      
     end
     
     class Mapper
@@ -178,20 +182,23 @@ module Lipsiadmin
     class Menu
       include Helper
       include ActionController::UrlWriter
-      attr_reader :name, :options, :url, :items
+      attr_reader :name, :options, :items
       
       def initialize(name, path=nil, options={}, &block)#:nodoc:
         @name    = name
+        @url     = path
         @options = options
         @allowed = []
         @items   = []        
-        if path
-          @url     = recognize_path(path) 
-          @allowed << { :controller => @url[:controller] } if path
-        end
+        @allowed << { :controller => recognize_path(path)[:controller] } if @url
         yield self if block_given?
       end
       
+      # Return the url of this menu
+      def url
+        @url.is_a?(Hash) ? url_for(@url.merge(:only_path => true)) : @url
+      end
+      
       # Add a new submenu to the menu
       def add(name, path=nil, options={}, &block)
         @items << Menu.new(name, path, options, &block)
@@ -215,12 +222,12 @@ module Lipsiadmin
       
       # Return ExtJs Config for this menu
       def config
-        if @url.blank?
+        if @url.blank? && @items.empty?
           options = human_name
         else
           options = @options.merge(:text => human_name)
           options.merge!(:menu => @items.collect(&:config)) if @items.size > 0
-          options.merge!(:handler => "function(){ Backend.app.load('#{url_for(@url.merge(:only_path => true))}') }".to_l)
+          options.merge!(:handler => "function(){ Backend.app.load('#{url}') }".to_l) if !@url.blank?
         end
         options
       end

data/lib/controller/ext.rb

@@ -105,7 +105,9 @@ module Lipsiadmin
           options[:mapping] ||= options[:dataIndex].to_s.downcase.gsub(/[^a-z0-9]+/, '_').
                                                                   gsub(/-+$/, '_').
                                                                   gsub(/^-+$/, '_')
-
+          # Now is necessary for our columns an ID
+          options[:id] = options[:mapping]
+          
           @data << options
         end
 
@@ -125,8 +127,8 @@ module Lipsiadmin
         def store_fields
           @data.inject([]) do |fields, data|
             hash = { :name => data[:dataIndex], :mapping => data[:mapping] }
-            hash.merge!(:type => data[:renderer]) if data[:renderer] && 
-                                                     (data[:renderer] == :date || data[:renderer] == :datetime)
+            hash.merge!(:type => data[:renderer]) if  data[:renderer] && 
+                                                     (data[:renderer] == :date || data[:renderer] == :datetime || data[:renderer] == :time_to_date)
             fields << hash
             fields
           end

data/lib/controller/pdf_builder.rb

@@ -47,10 +47,14 @@ module Lipsiadmin
         # path to the pd4ml jarfile
         jars_path = Lipsiadmin::Utils::PdfBuilder::JARS_PATH
         
-        options[:landescape] ||= false
+        options[:landescape]   =  options[:landescape] ? "LANDESCAPE" : "PORTRAIT"
         options[:send_data]  ||= !filename.blank?
+        
+        # try to find erb extension
+        ext = File.exist?("#{RAILS_ROOT}/app/views/pdf/#{template}.html.erb") ? "erb" : "haml"
+        
         # encode the template
-        input = encode_entities(render(:template => "/pdf/#{template}.html.haml", :layout => "print"))
+        input = encode_entities(render(:template => "/pdf/#{template}.html.#{ext}"))
         
         # search for stylesheet links and make their paths absolute.
         input.gsub!('<link href="/javascripts', '<link href="' + RAILS_ROOT + '/public/javascripts')
@@ -60,12 +64,22 @@ module Lipsiadmin
         input.gsub!('src="/', 'src="' + RAILS_ROOT + '/public/')
         input.gsub!('url(','url('+RAILS_ROOT+'/public')
 
-        cmd = "java -Xmx512m -Djava.awt.headless=true -cp #{jars_path}/pd4ml.jar:.:#{jars_path} Pd4Ruby '#{input}' 950 A4 #{options[:landescape]}"
-
-        output = %x[cd #{Lipsiadmin::Utils::PdfBuilder::PD4RUBY_PATH} \n #{cmd}]
+        # write our temp file
+        t = Tempfile.new("pd4ml.html", "#{Rails.root}/tmp")
+        t.binmode
+        t.write(input)
+        t.flush
+        
+        # build the command
+        class_path = "#{jars_path}/pd4ml.jar:.:#{jars_path}"
+        class_path = "\"#{jars_path}/pd4ml.jar\";\"#{jars_path}\"" if RUBY_PLATFORM =~ /mswin/
+        cmd = "cd #{Lipsiadmin::Utils::PdfBuilder::PD4RUBY_PATH} && java -Xmx512m -Djava.awt.headless=true -cp #{class_path} Pd4Ruby --file \"#{t.path}\" --width 950 --orientation #{options[:landescape]} 2>&1"
+        
+        # grep the output
+        output = IO.popen(cmd) { |s| s.read }
 
         # raise error if process returned false (ie: a java error)
-        raise PdfError, "An unknonwn error occurred while generating pdf: cd #{Lipsiadmin::Utils::PdfBuilder::PD4RUBY_PATH} && #{cmd}" if $?.success? === false
+        raise PdfError, "An unknonwn error occurred while generating pdf" if $?.exitstatus == 127
         
         # return raw pdf binary-stream
         if options[:send_data]
@@ -76,6 +90,8 @@ module Lipsiadmin
           erase_results
           output
         end
+      # ensure
+      #         t.close
       end
 
       # Errors For PDF

data/lib/controller/responds_to_parent.rb

@@ -20,7 +20,7 @@ module Lipsiadmin
       def redirect_parent_to(location)
         responds_to_parent do
           render :update do |page|
-            page.load location, true
+            page.load location
           end
         end
       end

data/lib/data_base/attachment_table.rb

@@ -12,7 +12,6 @@ module Lipsiadmin
     # <tt>has_many_attachments</tt> can override/add styles/validations etc...
     # 
     class AttachmentTable < ActiveRecord::Base
-      
       def self.inherited(subclass)#:nodoc:
         super
         subclass.write_inheritable_attribute(:attachment_definitions, {}) if subclass.attachment_definitions.nil?

data/lib/lipsiadmin.rb

@@ -10,6 +10,7 @@ require 'view/helpers/backend_helper'
 require 'view/helpers/frontend_helper'
 require 'view/helpers/view_helper'
 require 'view/helpers/ext_helper'
+require 'view/helpers/pdf_helper'
 require 'controller/ext'
 require 'controller/pdf_builder'
 require 'controller/responds_to_parent'
@@ -41,6 +42,7 @@ ActionView::Base.class_eval do
   include Lipsiadmin::View::Helpers::FormTagHelper
   include Lipsiadmin::View::Helpers::DateHelper
   include Lipsiadmin::View::Helpers::CountrySelectHelper
+  include Lipsiadmin::View::Helpers::PdfHelper
 end
 
 ActionView::Helpers::FormBuilder.send(:include, Lipsiadmin::View::Helpers::FormBuilder)
@@ -57,6 +59,11 @@ ActionController::Base.class_eval do
   include Lipsiadmin::AccessControl::Authentication
 end
 
+ActionMailer::Base.class_eval do
+  include Lipsiadmin::Mailer::PdfBuilder
+  include Lipsiadmin::View::Helpers::PdfHelper  
+end
+
 # For Attachments
 File.send(:include, Lipsiadmin::Attachment::Upfile)
 

data/lib/mailer/pdf_builder.rb

@@ -52,11 +52,13 @@ module Lipsiadmin
         # path to the pd4ml jarfile
         jars_path = Lipsiadmin::Utils::PdfBuilder::JARS_PATH
 
-        # set the landescape
-        landescape = (body[:landescape].delete || false)
-        
+        body[:landescape] = body[:landescape] ? "LANDESCAPE" : "PORTRAIT"
+
+        # try to find erb extension
+        ext = File.exist?("#{RAILS_ROOT}/app/views/pdf/#{template}.html.erb") ? "erb" : "haml"
+
         # encode the template
-        input = encode_entities(render_message("/pdf/#{template}.html.haml", body))
+        input = encode_entities(render_message("/pdf/#{template}.html.#{ext}", body))
 
         # search for stylesheet links and make their paths absolute.
         input.gsub!('<link href="/javascripts', '<link href="' + RAILS_ROOT + '/public/javascripts')
@@ -66,15 +68,27 @@ module Lipsiadmin
         input.gsub!('src="/', 'src="' + RAILS_ROOT + '/public/')
         input.gsub!('url(','url('+RAILS_ROOT+'/public')
 
-        cmd = "java -Xmx512m -Djava.awt.headless=true -cp #{jars_path}/pd4ml.jar:.:#{jars_path} Pd4Ruby '#{input}' 950 A4 #{landescape}"
+        # write our temp file
+        t = Tempfile.new("pd4ml.html", "#{Rails.root}/tmp")
+        t.binmode
+        t.write(input)
+        t.flush
+
+        # build the command
+        class_path = "#{jars_path}/pd4ml.jar:.:#{jars_path}"
+        class_path = "\"#{jars_path}/pd4ml.jar\";\"#{jars_path}\"" if RUBY_PLATFORM =~ /mswin/
+        cmd = "cd #{Lipsiadmin::Utils::PdfBuilder::PD4RUBY_PATH} && java -Xmx512m -Djava.awt.headless=true -cp #{class_path} Pd4Ruby --file \"#{t.path}\" --width 950 --orientation #{body[:landescape]} 2>&1"
 
-        output = %x[cd #{Lipsiadmin::Utils::PdfBuilder::PD4RUBY_PATH} \n #{cmd}]
+        # grep the output
+        output = IO.popen(cmd) { |s| s.read }
 
         # raise error if process returned false (ie: a java error)
-        raise PdfError, "An unknonwn error occurred while generating pdf: cd #{Lipsiadmin::Utils::PdfBuilder::PD4RUBY_PATH} && #{cmd}" if $?.success? === false
+        raise PdfError, "An unknonwn error occurred while generating pdf" if $?.exitstatus == 127
 
-        #return raw pdf binary-stream
-        output                
+        # return raw pdf binary-stream
+        output
+      ensure
+        t.close
       end
     end
 

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Lipsiadmin
   module VERSION #:nodoc:
-    MAJOR = 4
-    MINOR = 1
-    TINY  = 8
+    MAJOR = 5
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/view/helpers/backend_helper.rb

@@ -4,17 +4,49 @@ module Lipsiadmin
       module BackendHelper
         # This method work like builtin Rails error_message_for but use an Ext.Message.show({..})
         def simple_error_messages_for(*params)
-          options = params.last.is_a?(Hash) ? params.pop.symbolize_keys : {}
-          objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
-          count   = objects.inject(0) {|sum, object| sum + object.errors.count }
+          options = params.extract_options!.symbolize_keys
+
+          if object = options.delete(:object)
+            objects = [object].flatten
+          else
+            objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
+          end
+
+          count  = objects.inject(0) {|sum, object| sum + object.errors.count }
           unless count.zero?
-            error_messages = objects.map {|object| object.errors.full_messages.map {|msg| "<li>#{msg}</li>" } }
-            return content_tag(:script, "Ext.Msg.show({
-                        title:Backend.locale.messages.alert.title,
-                        msg: '<ul>#{escape_javascript(error_messages.join)}</ul>',
-                        buttons: Ext.Msg.OK,
-                        minWidth: 400 
-                      });", :type => Mime::JS)
+            html = {}
+            [:id, :class].each do |key|
+              if options.include?(key)
+                value = options[key]
+                html[key] = value unless value.blank?
+              else
+                html[key] = 'errorExplanation'
+              end
+            end
+            options[:object_name] ||= params.first
+
+            I18n.with_options :locale => options[:locale], :scope => [:activerecord, :errors, :template] do |locale|
+              header_message = if options.include?(:header_message)
+                options[:header_message]
+              else
+                object_name = options[:object_name].to_s.gsub('_', ' ')
+                object_name = I18n.t(object_name, :default => object_name, :scope => [:activerecord, :models], :count => 1)
+                locale.t :header, :count => count, :model => object_name
+              end
+              message = options.include?(:message) ? options[:message] : locale.t(:body)
+              error_messages = objects.sum {|object| object.errors.full_messages.map {|msg| content_tag(:li, ERB::Util.html_escape(msg)) } }.join
+
+              contents = ''
+              contents << content_tag(:p, message) unless message.blank?
+              contents << content_tag(:ul, error_messages, :class => :list)
+              
+              content_tag(:script, "Ext.Msg.show({
+                          title: '#{header_message}',
+                          msg: '<ul>#{contents}</ul>',
+                          buttons: Ext.Msg.OK,
+                          minWidth: 400 
+                        });", :type => Mime::JS)
+            end
           else
             ''
           end
@@ -162,7 +194,8 @@ module Lipsiadmin
         # 
         # Options can be one of the following:
         # 
-        # <tt>:image</tt>::     Indicate if the attachments are ONLY images.
+        # <tt>:image</tt>::       Indicate if the attachments are ONLY images.
+        # <tt>:only_upload</tt>:: Indicate that is not necessary manage the old attachments.
         # 
         # Examples:
         # 
@@ -180,40 +213,43 @@ module Lipsiadmin
           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" />'
+          
+          unless options[:only_upload]
+            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" />'
+          end
 
           flbl = options[:image] ? :upload_image : :upload_file
           html << '<div class="label-title">' + tl(flbl) + '</div>'
@@ -231,8 +267,9 @@ module Lipsiadmin
         # 
         # 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.
+        # <tt>:image</tt>::       Indicate if the attachments are ONLY images.
+        # <tt>:only_upload</tt>:: Indicate that is not necessary manage the old attachments.
+        # <tt>:order</tt>::       Indicate if user can order files.
         # 
         # Examples:
         # 
@@ -251,50 +288,53 @@ module Lipsiadmin
           variable = instance_variable_get("@#{object_name}")
           html     = []
           html    << '<!-- Generated from Lipsiadmin -->'
-          html    << '<ul id="' + "#{method}-order" + '" class="label">'
+          unless options[:only_upload]
+            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" />'
+          
 
-          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" />'
+            if options[:order]
+              constraint = options[:image] ? "horizontal" : "vertical"
+              html << '<div id="' + "#{method}-message" + '" style="padding:5px">&nbsp;</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
-
-            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">&nbsp;</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>'
@@ -411,7 +451,8 @@ module Lipsiadmin
         # The third argument are callbacks that may be specified:
         # 
         # <tt>:before</tt>::     Called before request is initiated.
-        # <tt>:update</tt>::     Called after user press +save+ button.
+        # <tt>:after</tt>::      Called after  request is initiated.
+        # <tt>:on_save</tt>::    Called after user press +save+ button.
         #                        This call are performed in an handler where
         #                        you have access to one variables:
         #                        <tt>:win</tt>::  Backend.window
@@ -427,7 +468,7 @@ module Lipsiadmin
         #   #       }
         #   #     }).show();
         #   # return false;" href="#">Edit Post</a>
-        #   open_form "Edit Post", "/backend/posts/'+$('comment_post_id').value+'/edit", :update => "someFn();"
+        #   open_form "Edit Post", "/backend/posts/'+$('comment_post_id').value+'/edit", :update => "someFn(win);"
         #   
         def open_form(text, url, options={})
           options[:before] = options[:before] + ";" if options[:before]
@@ -437,11 +478,10 @@ module Lipsiadmin
               url: '#{url}', 
               form: true,
               listeners: {
-                saved: function(win){
-                  #{options[:update]}
-                }
+                saved: function(win){ #{options[:on_save]} },
+                close: function(panel){ #{options[:after]} }
               }
-            }).show()
+            }).show();
           JAVASCRIPT
           link_to_function(text, javascript.gsub(/\n/, " "))
         end
@@ -464,7 +504,7 @@ module Lipsiadmin
         # 
         #   Examples:
         # 
-        #     =box "My Title", "My Subtitle", :submit => true, :collapsible => true, :style => "padding:none", :start => :close do
+        #     -box "My Title", "My Subtitle", :submit => true, :collapsible => true, :style => "padding:none", :start => :close do
         #       my content
         # 
         # Defaults:
@@ -474,9 +514,9 @@ module Lipsiadmin
         # * :start => :close
         # 
         def box(title=nil, subtitle=nil, options={}, &block)
-          options[:style] ||= "width:99%;"
+          options[:style] ||= "width:100%;"
           options[:start] ||= :open
-          return <<-HTML
+          concat <<-HTML
             <div class="x-box" style="#{options[:style]}">
               <div class="x-box-tl">
                 <div class="x-box-tr">