netzke-basepack 0.5.4 → 0.5.5

data/.gitignore

@@ -5,4 +5,5 @@ doc
 Manifest
 test/app_root/vendor/plugins/netzke-core
 rdoc
-netzke-basepack.gemspec
+netzke-basepack.gemspec
+netzke-basepack-*.gem

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+= v0.5.5.1 - 2009-11-09
+* Compatibility with latest netzke-core
+
+= v0.5.5 - 2009-11-09
+* Compatibility with latest netzke-core
+* Regression: pressing "enter" was not submitting the form (FormPanel)
+* Regression: "Restore defaults" button was not working in FieldsConfigurator and PropertyEditor
+* Fix: excluding columns in FieldConfigurator was causing inconsistent column behavior (move/hide/resize)
+* Fix: resolving conflicts with Ext.form.FormPanel's <tt>submit</tt> and <tt>load</tt> methods
+* New: rudimentary FileUploadField support in FormPanel (it will do a normal, non-AJAX, form submit)
+* New: Netzke::Window widget, supports persistent moving/resizing.
+* New: (experimental) GridPanel's "Add in form" button now opens the new Window widget. Later all other windows will be slowly rewritten to do the same.
+
 = v0.5.4 - 2009-10-12
 * Dependencies updated
 

data/README.rdoc

@@ -5,35 +5,44 @@ Note that if you would like to modify this code or experiment with it, you may b
 
 = Prerequisites
 1. Rails >= 2.2
-2. Ext JS >= 3.0: its root *must* be accessible as RAILS_ROOT/public/extjs. You may symlink your Ext JS library here like this (from your app folder):
+2. Ext JS >= 3.0: its root by default must be accessible as RAILS_ROOT/public/extjs. You may symlink your Ext JS library here like this (from your app folder):
+
     cd public && ln -s ~/Developer/extjs/ext-3.0 extjs
 
 3. acts_as_list plugin must be installed: 
-    ./script/plugin install git://github.com/rails/acts_as_list.git
 
-4. mislav-will_paginate >= 2.3.0
-    gem sources -a http://gems.github.com/
-    sudo gem install mislav-will_paginate
+    ./script/plugin install git://github.com/rails/acts_as_list.git
 
 = Installation
-Install Netzke gems:
+The gem is hosted on gemcutter. If you haven't yet enabled gemcutter, run the following:
+
+    sudo gem install gemcutter && gem tumble
+
+Install the gem:
+
     gem install netzke-basepack
 
 Include it into environment.rb:
+
     config.gem "netzke-basepack"
 
 Include mapping for Netzke controller providing *.js and *.css (in routes.rb):
+
     map.netzke
 
 = Usage
 First, run the generators to have the necessary migrations:
+
     ./script/generate netzke_core
 
 Do the migrations:
+
     rake db:migrate
 
 The following example will provide you with a grid-based scaffold for ActiveRecord-model called Book. You may generate it like this:
+
     ./script/generate model Book title:string amount:integer
+
 (don't forget to re-run the migrations after it)
 
 In the controller declare the widget:
@@ -57,7 +66,7 @@ Declaring a widget in the controller provides you with a couple of helpers that
 
 1. books_class_definition will contain the JavaScript code defining the code for the JS class.
 2. books_widget_instance will declare a local JavaScript variable called 'book'.
-3. books_widget_render will provide the JavaScript code that calls the "render" method on the variable declared by books_widget_instance.
+3. books_widget_render will provide the JavaScript code that calls the "render" method on the variable declared by books_widget_instance; the widget will be rendered into a div with id "books-div".
 
 Use these helpers inside of the script-tag like the following (in the view):
 	
@@ -68,7 +77,7 @@ Use these helpers inside of the script-tag like the following (in the view):
     	<%= books_widget_render %>
     })
     </script>
-    <div id="books">the widget will be rendered in this div</div>
+    <div id="books-div">the widget will be rendered in this div</div>
 
 If your layout already calls yield :javascripts wrapped in the <script>-tag, you can have all javascript-code in one place on the page:
 
@@ -80,7 +89,7 @@ If your layout already calls yield :javascripts wrapped in the <script>-tag, you
     })
     <% end %>
     <p>... your page content here ...</p>
-    <div id="books">the widget will be rendered in this div</div>
+    <div id="books-div">the widget will be rendered in this div</div>
 
 == Dynamic loading of widgets
 TODO: this part will be covered later

data/Rakefile

@@ -1,22 +1,21 @@
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
+    gemspec.version = "0.5.5"
     gemspec.name = "netzke-basepack"
-    gemspec.summary = "Pre-built Netzke widgets for your RIA"
-    gemspec.description = "Pre-built Netzke widgets for your RIA"
+    gemspec.summary = "Pre-built Rails + ExtJS widgets for your RIA"
+    gemspec.description = "A set of full-featured extendible Netzke widgets (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA"
     gemspec.email = "sergei@playcode.nl"
     gemspec.homepage = "http://github.com/skozlov/netzke-basepack"
     gemspec.rubyforge_project = "netzke-basepack"
     gemspec.authors = ["Sergei Kozlov"]
-    gemspec.add_dependency("netzke-core", ">=0.4.4")
+    gemspec.add_dependency("netzke-core", ">=0.4.5.2")
     gemspec.add_dependency("searchlogic", ">=2.0.0")
     gemspec.add_dependency("will_paginate", ">=2.0.0")
   end
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/rdoctask'

data/TODO.rdoc

@@ -1,11 +1,13 @@
 == Priority
-* Make column/fields configuration fool-proof
 * Introduce three-state checkbox for SearchPanel
 * Add icons to buttons to actions (toolbars/menus)
 * On grid refresh, reset the dirty fields, so that the "Apply" button doesn't do anything
 
+== Foolproof
+* Should not be possible delete the "ID" field from grids/forms
+
 == Optimizations
-* Add indexes into tables
+* Check persistent_config-related queries (aren't they too many?)
 
 == One day
 * Replace xcheckbox with checkbox in FormPanel

data/javascripts/basepack.js

@@ -794,4 +794,35 @@ Ext.grid.HeaderDropZone.prototype.onNodeDrop = function(n, dd, e, data){
         return true;
     }
     return false;
-}
+}
+
+// Feedback Ghost
+Netzke.FeedbackGhost = function(){};
+Ext.apply(Netzke.FeedbackGhost.prototype, {
+  showFeedback: function(msg){
+    var createBox = function(s, l){
+        return ['<div class="msg">',
+                '<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>',
+                '<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc">', s, '</div></div></div>',
+                '<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>',
+                '</div>'].join('');
+    }
+
+    var showBox = function(msg, lvl){
+      if (!lvl) {lvl = 'notice'};
+      var msgCt = Ext.DomHelper.insertFirst(document.body, {'class':'netzke-feedback'}, true);
+      var m = Ext.DomHelper.append(msgCt, {html:createBox(msg,lvl)}, true);
+      m.slideIn('t').pause(2).ghost("b", {remove:true});
+    }
+
+    if (typeof msg != 'string') {
+      var compoundMsg = "";
+      Ext.each(msg, function(m){
+        compoundMsg += m.msg + '<br>';
+      });
+      if (compoundMsg != "") showBox(compoundMsg, null); // the second parameter will be level
+    } else {
+      showBox(msg);
+    }
+	}
+});

data/lib/app/models/netzke_auto_column.rb

@@ -48,9 +48,9 @@ class NetzkeAutoColumn < ActiveRecord::Base
 
   def self.widget=(widget)
     @@widget = widget
-    if Netzke::Base.session["netzke_auto_column_last_widget"] != @@widget.id_name
+    if Netzke::Base.session["netzke_auto_column_last_widget"] != @@widget.global_id
       rebuild_table
-      Netzke::Base.session["netzke_auto_column_last_widget"] = @@widget.id_name
+      Netzke::Base.session["netzke_auto_column_last_widget"] = @@widget.global_id
     end
   end
 end

data/lib/netzke-basepack.rb

@@ -19,4 +19,5 @@ ActiveSupport::Dependencies.load_once_paths.delete(File.join(File.dirname(__FILE
 # Include javascript & styles required by all basepack widgets. 
 # These files will get loaded at the initial load of the framework (along with Ext and Netzke-core).
 Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/basepack.js"
-Netzke::Base.config[:stylesheets] << "#{File.dirname(__FILE__)}/../stylesheets/basepack.css"
+Netzke::Base.config[:stylesheets] << "#{File.dirname(__FILE__)}/../stylesheets/basepack.css"
+Netzke::Base.config[:stylesheets] << Netzke::Base.config[:ext_location] + "/examples/form/file-upload.css"

data/lib/netzke/accordion_panel.rb

@@ -16,7 +16,7 @@ module Netzke
         :defaults => {:layout => 'fit'},
         :init_component => <<-END_OF_JAVASCRIPT.l,
           function(){
-            Ext.netzke.cache.#{short_widget_class_name}.superclass.initComponent.call(this);
+            #{js_full_class_name}.superclass.initComponent.call(this);
 
             // Set events
             this.items.each(function(i){
@@ -26,7 +26,8 @@ module Netzke
               // If not collapsed, add the active aggregatee (item) into it
               if (!i.collapsed) {
                 var preloadedItemConfig = this[i.widget.camelize(true) + "Config"];
-                i.add(new Ext.netzke.cache[preloadedItemConfig.widgetClassName](preloadedItemConfig));
+                var klass = this.classifyScopedName(preloadedItemConfig.scopedClassName);
+                i.add(new klass(preloadedItemConfig));
                 i.doLayout(); // always needed after adding a component
               }
             }, this);
@@ -41,7 +42,8 @@ module Netzke
             
             if (preloadedItemConfig){
               // preloaded widget only needs to be instantiated, as its class and configuration have already been loaded
-              panel.add(new Ext.netzke.cache[preloadedItemConfig.widgetClassName](preloadedItemConfig));
+              var klass = this.classifyScopedName(preloadedItemConfig.scopedClassName);
+              panel.add(new klass(preloadedItemConfig));
               panel.doLayout(); // always needed after adding a component
             } else {
               // load the widget from the server
@@ -89,7 +91,7 @@ module Netzke
       res = []
       config[:items].each_with_index do |item, i|
         res << {
-          # :id => item[:active] && id_name + '_active', # to mark the fit-panel which will contain the active widget
+          # :id => item[:active] && global_id + '_active', # to mark the fit-panel which will contain the active widget
           :title => item[:title] || (item[:name] && item[:name].to_s.humanize),
           :widget => item[:name], # to know which fit panel will load which widget
           :collapsed => !(item[:active] || false)

data/lib/netzke/basic_app.rb

@@ -11,233 +11,246 @@ module Netzke
   # * masquerade support
   # * AJAX activity indicator
   class BasicApp < Base
-    module ClassMethods
+    def self.include_js
+      res = []
+      ext_examples = Netzke::Base.config[:ext_location] + "/examples/"
+      res << ext_examples + "ux/StatusBar.js"
+      res << "#{File.dirname(__FILE__)}/basic_app_extras/statusbar_ext.js"
+    end
 
-      def js_base_class
-        "Ext.Viewport"
-      end
+    def self.js_base_class
+      "Ext.Viewport"
+    end
 
-      # Global BasicApp configuration
-      def config
-        set_default_config({
-          :logout_url => "/logout" # default logout url
-        })
-      end
-      
-      def include_js
-        res = []
-        ext_examples = Netzke::Base.config[:ext_location] + "/examples/"
-        res << ext_examples + "ux/StatusBar.js"
-        res << "#{File.dirname(__FILE__)}/basic_app_extras/statusbar_ext.js"
-      end
-      
-      # def include_css
-      #   res = []
-      #   res << Netzke::Base.config[:ext_location] + "/examples/ux/css/StatusBar.css"
-      #   res
-      # end
-      
-      def js_panels
-        # In status bar we want to show what we are masquerading as
-        if session[:masq_user]
-          user = User.find(session[:masq_user])
-          masq = %Q{user "#{user.login}"}
-        elsif session[:masq_role]
-          role = Role.find(session[:masq_role])
-          masq = %Q{role "#{role.name}"}
-        elsif session[:masq_world]
-          masq = %Q{World}
-        end
-                
-        [{
-          :id => 'main-panel',
-          :region => 'center',
-          :layout => 'fit'
-        },{
-          :id => 'main-toolbar',
-          :xtype => 'toolbar',
-          :region => 'north',
-          :height => 25
-          # :items => ["-"]
-        },{
-          :id => 'main-statusbar',
-          :xtype => 'statusbar',
-          :region => 'south',
-          :height => 22,
-          :statusAlign => 'right',
-          :busyText => 'Busy...',
-          :default_text => masq.nil? ? "Ready #{"(config mode)" if session[:config_mode]}" : "Masquerading as #{masq}",
-          :default_icon_cls => ""
-        }]
+    # Global BasicApp configuration
+    def self.config
+      set_default_config({
+        :logout_url => "/logout" # default logout url
+      })
+    end
+    
+    
+    # def self.include_css
+    #   res = []
+    #   res << Netzke::Base.config[:ext_location] + "/examples/ux/css/StatusBar.css"
+    #   res
+    # end
+    
+    def self.js_panels
+      # In status bar we want to show what we are masquerading as
+      if session[:masq_user]
+        user = User.find(session[:masq_user])
+        masq = %Q{user "#{user.login}"}
+      elsif session[:masq_role]
+        role = Role.find(session[:masq_role])
+        masq = %Q{role "#{role.name}"}
+      elsif session[:masq_world]
+        masq = %Q{World}
       end
-      
-      def js_extend_properties
-        {
-          :layout => 'border',
-
-          :panels => js_panels,
-          
-          :init_component => <<-END_OF_JAVASCRIPT.l,
-            function(){
-              this.items = this.panels; // a bit weird, but working; can't assign it straight
               
-              Ext.netzke.cache.BasicApp.superclass.initComponent.call(this);
+      [{
+        :id => 'main-panel',
+        :region => 'center',
+        :layout => 'fit'
+      },{
+        :id => 'main-toolbar',
+        :xtype => 'toolbar',
+        :region => 'north',
+        :height => 25
+        # :items => ["-"]
+      },{
+        :id => 'main-statusbar',
+        :xtype => 'statusbar',
+        :region => 'south',
+        :height => 22,
+        :statusAlign => 'right',
+        :busyText => 'Busy...',
+        :default_text => masq.nil? ? "Ready #{"(config mode)" if session[:config_mode]}" : "Masquerading as #{masq}",
+        :default_icon_cls => ""
+      }]
+    end
+    
+    def self.js_extend_properties
+      {
+        :layout => 'border',
 
-              // If we are given a token, load the corresponding widget, otherwise load the last loaded widget
-              var currentToken = Ext.History.getToken();
-              if (currentToken != "") {
-                this.processHistory(currentToken)
-              } else {
-                var lastLoaded = this.initialConfig.widgetToLoad; // passed from the server
-                if (lastLoaded) Ext.History.add(lastLoaded);
-              }
+        :panels => js_panels,
+        
+        :init_component => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            this.items = this.panels; // a bit weird, but working; can't assign it straight
+            
+            #{js_full_class_name}.superclass.initComponent.call(this);
 
-              Ext.History.on('change', this.processHistory, this);
-              
-              // Hosted menus
-              this.menus = {};
-              
-              // Setting the "busy" indicator for Ajax requests
-              Ext.Ajax.on('beforerequest', function(){this.findById('main-statusbar').showBusy()}, this);
-              Ext.Ajax.on('requestcomplete', function(){this.findById('main-statusbar').hideBusy()}, this);
-              Ext.Ajax.on('requestexception', function(){this.findById('main-statusbar').hideBusy()}, this);
+            // If we are given a token, load the corresponding widget, otherwise load the last loaded widget
+            var currentToken = Ext.History.getToken();
+            if (currentToken != "") {
+              this.processHistory(currentToken);
+            } else {
+              var lastLoaded = this.initialConfig.widgetToLoad; // passed from the server
+              if (lastLoaded) Ext.History.add(lastLoaded);
             }
-          END_OF_JAVASCRIPT
-          
-          :host_menu => <<-END_OF_JAVASCRIPT.l,
-            function(menu, owner){
-              var toolbar = this.findById('main-toolbar');
-              if (!this.menus[owner.id]) this.menus[owner.id] = [];
-              Ext.each(menu, function(item) {
-                // var newMenu = new Ext.Toolbar.Button(item);
-                // var position = toolbar.items.getCount() - 2;
-                // position = position < 0 ? 0 : position;
-                // toolbar.insertButton(position, newMenu);
 
-                toolbar.add(item);
-                // this.menus[owner.id].push(newMenu); // TODO: remember the menus from this owner in some other way
-            	}, this);
-          	}
-          END_OF_JAVASCRIPT
+            Ext.History.on('change', this.processHistory, this);
+            
+            // Hosted menus
+            this.menus = {};
+            
+            // Setting the "busy" indicator for Ajax requests
+            Ext.Ajax.on('beforerequest', function(){this.findById('main-statusbar').showBusy()}, this);
+            Ext.Ajax.on('requestcomplete', function(){this.findById('main-statusbar').hideBusy()}, this);
+            Ext.Ajax.on('requestexception', function(){this.findById('main-statusbar').hideBusy()}, this);
+            
+            // Initialize history
+            Ext.History.init();
+          }
+        END_OF_JAVASCRIPT
+        
+        :host_menu => <<-END_OF_JAVASCRIPT.l,
+          function(menu, owner){
+            var toolbar = this.findById('main-toolbar');
+            if (!this.menus[owner.id]) this.menus[owner.id] = [];
+            Ext.each(menu, function(item) {
+              // var newMenu = new Ext.Toolbar.Button(item);
+              // var position = toolbar.items.getCount() - 2;
+              // position = position < 0 ? 0 : position;
+              // toolbar.insertButton(position, newMenu);
 
-          :unhost_menu => <<-END_OF_JAVASCRIPT.l,
-            function(owner){
-              // var toolbar = this.findById('main-toolbar');
-              // if (this.menus[owner.id]) {
-              //   Ext.each(this.menus[owner.id], function(menu){
-              //     toolbar.items.remove(menu); // remove the item from the toolbar
-              //     menu.destroy(); // ... and destroy it
-              //   });
-              // }
-            }
-          END_OF_JAVASCRIPT
+              toolbar.add(item);
+              // this.menus[owner.id].push(newMenu); // TODO: remember the menus from this owner in some other way
+          	}, this);
+        	}
+        END_OF_JAVASCRIPT
 
-          :logout => <<-END_OF_JAVASCRIPT.l,
-            function(){
-              window.location = "#{config[:logout_url]}"
-            }
-          END_OF_JAVASCRIPT
+        :unhost_menu => <<-END_OF_JAVASCRIPT.l,
+          function(owner){
+            // var toolbar = this.findById('main-toolbar');
+            // if (this.menus[owner.id]) {
+            //   Ext.each(this.menus[owner.id], function(menu){
+            //     toolbar.items.remove(menu); // remove the item from the toolbar
+            //     menu.destroy(); // ... and destroy it
+            //   });
+            // }
+          }
+        END_OF_JAVASCRIPT
 
-          # Event handler for history change
-          :process_history => <<-END_OF_JAVASCRIPT.l,
-            function(token){
-              if (token){
-                this.loadAggregatee({id:token, container:'main-panel'});
-              } else {
-              }
-            }
-          END_OF_JAVASCRIPT
-          
-          :instantiate_aggregatee => <<-END_OF_JAVASCRIPT.l,
-            function(config){
-              this.findById('main-panel').instantiateChild(config);
-            }
-          END_OF_JAVASCRIPT
-          
-          # Loads widget by name
-          :app_load_widget => <<-END_OF_JAVASCRIPT.l,
-            function(name){
-              Ext.History.add(name);
-            }
-          END_OF_JAVASCRIPT
+        :on_login => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            window.location = "/login"
+          }
+        END_OF_JAVASCRIPT
+        
+        :on_logout => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            window.location = "#{config[:logout_url]}"
+          }
+        END_OF_JAVASCRIPT
 
-          # Loads widget by action
-          :load_widget_by_action => <<-END_OF_JAVASCRIPT.l,
-            function(action){
-              this.appLoadWidget(action.widget || action.name);
+        # Event handler for history change
+        :process_history => <<-END_OF_JAVASCRIPT.l,
+          function(token){
+            if (token){
+              this.loadAggregatee({id:token, container:'main-panel'});
+            } else {
+              Ext.getCmp('main-panel').removeChild();
             }
-          END_OF_JAVASCRIPT
-          
-          # Masquerade selector window
-          :show_masquerade_selector => <<-END_OF_JAVASCRIPT.l
-            function(){
-              var w = new Ext.Window({
-        				title: 'Masquerade as',
-        				modal: true,
-        				width: Ext.lib.Dom.getViewWidth() * 0.6,
-                height: Ext.lib.Dom.getViewHeight() * 0.6,
-                layout: 'fit',
-        	      closeAction :'destroy',
-                buttons: [{
-                  text: 'Select',
-                  handler : function(){
-                    if (role = w.getWidget().masquerade.role) {
-                      Ext.Msg.confirm("Masquerading as a role", "Individual preferences for all users with this role will get overwritten as you make changes. Continue?", function(btn){
-                        if (btn === 'yes') {
-                          w.close();
-                        }
-                      });
-                    } else {
-                      w.close();
-                    }
-                  },
-                  scope:this
-                },{
-                  text:'As World',
-                  handler:function(){
-                    Ext.Msg.confirm("Masquerading as World", "Caution! All settings that you will modify will be overwritten for all roles and all users. Are you sure you know what you're doing?", function(btn){
-                      if (btn === "yes") {
-                        this.masquerade = {world:true};
+          }
+        END_OF_JAVASCRIPT
+        
+        :instantiate_aggregatee => <<-END_OF_JAVASCRIPT.l,
+          function(config){
+            this.findById('main-panel').instantiateChild(config);
+          }
+        END_OF_JAVASCRIPT
+        
+        # Loads widget by name
+        :app_load_widget => <<-END_OF_JAVASCRIPT.l,
+          function(name){
+            Ext.History.add(name);
+          }
+        END_OF_JAVASCRIPT
+
+        # Loads widget by action
+        :load_widget_by_action => <<-END_OF_JAVASCRIPT.l,
+          function(action){
+            this.appLoadWidget(action.widget || action.name);
+          }
+        END_OF_JAVASCRIPT
+        
+        :on_toggle_config_mode => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            this.toggleConfigMode();
+          }
+        END_OF_JAVASCRIPT
+        
+        
+        # Masquerade selector window
+        :show_masquerade_selector => <<-END_OF_JAVASCRIPT.l
+          function(){
+            var w = new Ext.Window({
+      				title: 'Masquerade as',
+      				modal: true,
+      				width: Ext.lib.Dom.getViewWidth() * 0.6,
+              height: Ext.lib.Dom.getViewHeight() * 0.6,
+              layout: 'fit',
+      	      closeAction :'destroy',
+              buttons: [{
+                text: 'Select',
+                handler : function(){
+                  if (role = w.getWidget().masquerade.role) {
+                    Ext.Msg.confirm("Masquerading as a role", "Individual preferences for all users with this role will get overwritten as you make changes. Continue?", function(btn){
+                      if (btn === 'yes') {
                         w.close();
                       }
-                    }, this);
-                  },
-                  scope:this
-                },{
-                  text:'No masquerading',
-                  handler:function(){
-                    this.masquerade = {};
+                    });
+                  } else {
                     w.close();
-                  },
-                  scope:this
-                },{
-                  text:'Cancel',
-                  handler:function(){
-                    w.hide();
-                  },
-                  scope:this
-                }],
-                listeners : {close: {fn: function(){
-                  this.masqueradeAs(this.masquerade || w.getWidget().masquerade || {});
-                }, scope: this}}
-        			});
+                  }
+                },
+                scope:this
+              },{
+                text:'As World',
+                handler:function(){
+                  Ext.Msg.confirm("Masquerading as World", "Caution! All settings that you will modify will be overwritten for all roles and all users. Are you sure you know what you're doing?", function(btn){
+                    if (btn === "yes") {
+                      this.masquerade = {world:true};
+                      w.close();
+                    }
+                  }, this);
+                },
+                scope:this
+              },{
+                text:'No masquerading',
+                handler:function(){
+                  this.masquerade = {};
+                  w.close();
+                },
+                scope:this
+              },{
+                text:'Cancel',
+                handler:function(){
+                  w.hide();
+                },
+                scope:this
+              }],
+              listeners : {close: {fn: function(){
+                this.masqueradeAs(this.masquerade || w.getWidget().masquerade || {});
+              }, scope: this}}
+      			});
 
-        			w.show(null, function(){
-        			  this.loadAggregatee({id:"masqueradeSelector", container:w.id})
-        			}, this);
+      			w.show(null, function(){
+      			  this.loadAggregatee({id:"masqueradeSelector", container:w.id})
+      			}, this);
 
-            }
-          END_OF_JAVASCRIPT
-        }
-      end
+          }
+        END_OF_JAVASCRIPT
+      }
     end
     
-    extend ClassMethods
-        
     # Set the Logout button if Netzke::Base.user is set
     def menu
       res = []
-      user = Netzke::Base.user
+      user = User.find_by_id(session[:netzke_user_id])
       if !user.nil?
         user_name = user.respond_to?(:name) ? user.name : user.login # try to display user's name, fallback to login
         res << "->" <<
@@ -246,22 +259,13 @@ module Netzke
           :menu => user_menu
         }
       else
-        res << "->" <<
-        {
-          :text => "Login",
-          :handler => <<-END_OF_JAVASCRIPT.l,
-            function(){
-              window.location = "/login"
-            }
-          END_OF_JAVASCRIPT
-          :scope => this
-        }
+        res << "->" << :login
       end
       res
     end
 
     def user_menu
-      ['logout']
+      [:logout]
     end
 
     def initialize(*args)
@@ -281,8 +285,9 @@ module Netzke
     def actions
       { 
         :masquerade_selector => {:text => "Masquerade as ...", :fn => "showMasqueradeSelector"},
-        :toggle_config_mode => {:text => "#{session[:config_mode] ? "Leave" : "Enter"} config mode", :fn => "toggleConfigMode"},
-        :logout => {:text => "Log out", :fn => "logout"}
+        :toggle_config_mode => {:text => "#{session[:config_mode] ? "Leave" : "Enter"} config mode"},
+        :login => {:text => "Login"},
+        :logout => {:text => "Logout"}
       }
     end
     
@@ -297,20 +302,6 @@ module Netzke
       }
     end
 
-    # We rely on the FeedbackGhost (to not need to implement our own feedback management)
-    def initial_aggregatees
-      {:feedback_ghost => {:widget_class_name => "FeedbackGhost"}}
-    end
-
-    # Besides instantiating ourselves, also instantiate the FeedbackGhost
-    def js_widget_instance
-      <<-END_OF_JAVASCRIPT << super
-        new Ext.netzke.cache['FeedbackGhost']({id:'feedback_ghost'})
-        // Initialize history (can't say why it's not working well inside the appLoaded handler)
-        Ext.History.init();
-      END_OF_JAVASCRIPT
-    end
-
     #
     # Interface section
     #