padrino-admin 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/padrino-admin.rb

@@ -5,7 +5,8 @@ require 'padrino-gen'
 require 'padrino-helpers'
 
 Dir[File.dirname(__FILE__) + '/padrino-admin/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,orm,generators,middleware,utils}/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,orm,middleware,utils}/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/padrino-admin/generators/{actions,admin_app,admin_page,admin_uploader}.rb'].each {|file| require file }
 
 ##
 # We need to apply Padrino::Admin::Utils::Extensions
@@ -22,7 +23,7 @@ Padrino::Application.send(:access_control=, Class.new(Padrino::AccessControl::Ba
 ##
 # If CarrierWave is defined we set the root directory
 # 
-CarrierWave.root = Padrino.root if defined?(CarrierWave)
+CarrierWave.root = Padrino.root("public") if defined?(CarrierWave)
 
 ##
 # Extend Abastract Form builder

data/lib/padrino-admin/access_control.rb

@@ -1,6 +1,7 @@
 module Padrino
 
-  class AccessControlError < StandardError; end
+  class AccessControlError < StandardError #:nodoc:
+  end
 
   ##
   # This module give to a padrino application an access control functionality like:

data/lib/padrino-admin/generators/admin_app.rb

@@ -33,6 +33,7 @@ module Padrino
 
           self.behavior = :revoke if options[:destroy]
           directory("app/", destination_root(options[:path]))
+          directory("assets/", destination_root("public", options[:path]))
 
           Padrino::Generators::Model.dup.start([
             "account", "name:string", "surname:string", "email:string", "crypted_password:string", "salt:string", "role:string",

data/lib/padrino-admin/generators/app/app.rb.tt

@@ -1,11 +1,22 @@
 class Admin < Padrino::Application
   configure do
+    ##
     # Application-specific configuration options
-    # set :sessions, false     # Enabled by default
-    # set :log_to_file, true   # Log to file instead of stdout (default is stdout in development)
-    # set :reload, false       # Reload application files (default in development)
-    # disable :padrino_helpers # Disables padrino markup helpers (enabled by default)
-    # disable :flash           # Disables rack-flash (enabled by default)
+    # 
+    # set :raise_errors, true     # Show exceptions (default for development)
+    # set :public, "foo/bar"      # Location for static assets (default root/public)
+    # set :sessions, false        # Enabled by default
+    # set :reload, false          # Reload application files (default in development)
+    # set :default_builder, "foo" # Set a custom form builder (default 'StandardFormBuilder')
+    # set :locale, :en            # Set the current I18n.locale (default :en)
+    # set :translations, "bar"    # Set path for I18n translations (default your_app/locales)
+    # enable :autolocale          # Auto Set locale if url match /:lang/foo/bar (disabled by default)
+    # disable :padrino_helpers    # Disables padrino markup helpers (enabled by default if present)
+    # disable :padrino_mailer     # Disables padrino mailer (enabled by default if present)
+    # disable :flash              # Disables rack-flash (enabled by default)
+    # enable  :authentication     # Enable padrino-admin authentication (disabled by default)
+    # layout :foo                 # Layout can be in views/layouts/foo.ext or views/foo.ext (:application is default)
+    # 
     layout false
     enable  :authentication
     disable :store_location

data/lib/padrino-admin/generators/app/views/javascripts/admin.js.erb

@@ -99,7 +99,8 @@ Admin.app = function(){
         // s.type = 'text/javascript';
         // // Now we can append the child.
         // hd.appendChild(s);
-        Ext.Ajax.request({ url: url, nocache:true });
+        Admin.app.mask();
+        Ext.Ajax.request({ url: url, nocache:true, callback:this.unmask, scope:this });
       } else if (ext == 'html'){
         this.loadWidget(url);
       } else {
@@ -120,6 +121,7 @@ Admin.app = function(){
       if (win){
         win.toFront();
       } else {
+        Admin.app.mask();
         var win = new Admin.window({ id: id });
         win.show(); win.hide();
         win.load({
@@ -233,6 +235,7 @@ Admin.app = function(){
         this.addItem(this.tabPanel);
       }
 
+      Admin.app.unmask();
       this.fireEvent('contentLoaded');
     },//inspectContent