rails_db_admin 2.1.2 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3585669877d1680f37b6daf89d11effe18c6f4ed
+  data.tar.gz: 17cecfddcfb176df82f5e8f2957f018b8189aa4c
+SHA512:
+  metadata.gz: fa9a5af45478f74855a41a557c6bf59fe4f54b064e480e18d56be5852db33a95d16d718eb4bbe2eed24d1ca8e7f56007165ddadc509b86b9be306dc9a61b478d
+  data.tar.gz: f19151aeec5d273e695e3cf61ce77d63b67510a268f4e3b7e55fa08e6366493d1a7b9286da095bc29e6467d7a3466b9153e58b8e8247454f3252fe65674fc408

data/app/controllers/rails_db_admin/erp_app/desktop/base_controller.rb

@@ -26,20 +26,22 @@ module RailsDbAdmin
               tables << {:name => table, :display => table} unless table.blank?
             end
 
-            tables = tables.select { |table| table[:name] =~ Regexp.new("^#{params[:name]}.", Regexp::IGNORECASE)}
+            tables = tables.select do |table|
+              (table[:name] =~ Regexp.new("^#{params[:name]}.", Regexp::IGNORECASE)) || table[:name] == params[:name]
+            end
             tables.sort! { |a, b| a[:name].downcase <=> b[:name].downcase }
 
             tables.each do |table|
               result_hash << {:isTable => true,
-                              :text => table[:display],
                               :id => table[:display],
-                              :iconCls => 'icon-data',
+                              :text => table[:display],
+                              :iconCls => 'icon-db-table',
                               :leaf => false}
             end
           else
             columns = @database_connection_class.connection.columns(params[:node])
             columns.each do |column|
-              result_hash << {:text => "#{column.name} : #{column.type}", :iconCls => 'icon-gear', :leaf => true}
+              result_hash << {:text => "#{column.name} : #{column.type}", :iconCls => 'icon-db-column', :leaf => true}
             end
           end
 

data/app/controllers/rails_db_admin/erp_app/desktop/queries_controller.rb

@@ -37,7 +37,7 @@ module RailsDbAdmin
           queries = []
 
           queries = names.collect do |name|
-            {:text => name, :id => name, :iconCls => 'icon-document', :leaf => true}
+            {:text => name, :id => name, :iconCls => 'icon-sql', :leaf => true}
           end unless names.empty?
 
           render :json => queries

data/db/migrate/20131112013053_add_rails_db_admin_missing_indexes.rb

@@ -0,0 +1,17 @@
+class AddRailsDbAdminMissingIndexes < ActiveRecord::Migration
+  def up
+
+    if indexes(:reports).select {|index| index.name == 'reports_internal_identifier_idx'}.empty?
+      add_index :reports, :internal_identifier, :name => 'reports_internal_identifier_idx'
+    end
+
+  end
+
+  def down
+
+    unless indexes(:reports).select {|index| index.name == 'reports_internal_identifier_idx'}.empty?
+      remove_index :reports, :internal_identifier
+    end
+
+  end
+end

data/lib/rails_db_admin.rb

@@ -1,6 +1,5 @@
 #compass libraries
 require 'erp_app'
-require 'erp_forms'
 
 require "rails_db_admin/extensions/railties/action_view/base"
 require "rails_db_admin/version"

data/lib/rails_db_admin/engine.rb

@@ -5,7 +5,7 @@ module RailsDbAdmin
     config.rails_db_admin = RailsDbAdmin::Config
     
     initializer "rails_db_admin.merge_public" do |app|
-      app.middleware.insert_before Rack::Lock, ::ActionDispatch::Static, "#{root}/public"
+      app.middleware.insert_before Rack::Runtime, ::ActionDispatch::Static, "#{root}/public"
     end
 
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)

data/lib/rails_db_admin/extjs/json_column_builder.rb

@@ -13,9 +13,9 @@ module RailsDbAdmin
         end
         if add_fake_id
           grid_columns << {:header => "fake_id",
-                             :type => "number",
-                             :dataIndex => "fake_id",
-                             :hidden => true}
+                           :type => "number",
+                           :dataIndex => "fake_id",
+                           :hidden => true}
         end
         grid_columns
       end
@@ -34,10 +34,10 @@ module RailsDbAdmin
 
       def self.build_readonly_column(column_name)
         {
-          :header => column_name,
-          :type => 'string',
-          :dataIndex  => column_name,
-          :width => 150
+            :header => column_name,
+            :type => 'string',
+            :dataIndex => column_name,
+            :width => 150
         }
       end
 
@@ -46,21 +46,21 @@ module RailsDbAdmin
 
       def self.build_boolean_column(column_name)
         {
-          :header => column_name,
-          :type => 'boolean',
-          :dataIndex  => column_name,
-          :width => 150,
-          :editor => {:xtype => 'booleancolumneditor'},
-          :renderer => NonEscapeJsonString.new("Compass.ErpApp.Desktop.Applications.RailsDbAdmin.renderBooleanColumn")
+            :header => column_name,
+            :type => 'boolean',
+            :dataIndex => column_name,
+            :width => 150,
+            :editor => {:xtype => 'booleancolumneditor'},
+            :renderer => NonEscapeJsonString.new("Compass.ErpApp.Desktop.Applications.RailsDbAdmin.renderBooleanColumn")
         }
       end
 
       def self.build_date_column(column_name)
         hash = {
-          :header => column_name,
-          :type => 'date',
-          :dataIndex  => column_name,
-          :width => 150,
+            :header => column_name,
+            :type => 'date',
+            :dataIndex => column_name,
+            :width => 150,
         }
         hash[:editor] = {:xtype => 'textfield'} if (column_name != "created_at" && column_name != "updated_at")
 
@@ -69,10 +69,10 @@ module RailsDbAdmin
 
       def self.build_datetime_column(column_name)
         hash = {
-          :header => column_name,
-          :type => 'date',
-          :dataIndex  => column_name,
-          :width => 150,
+            :header => column_name,
+            :type => 'date',
+            :dataIndex => column_name,
+            :width => 150,
         }
         hash[:editor] = {:xtype => 'textfield'} if (column_name != "created_at" && column_name != "updated_at")
 
@@ -81,30 +81,30 @@ module RailsDbAdmin
 
       def self.build_string_column(column_name)
         {
-          :header => column_name,
-          :type => 'string',
-          :dataIndex  => column_name,
-          :width => 150,
-          :editor => {:xtype => 'textfield'}
+            :header => column_name,
+            :type => 'string',
+            :dataIndex => column_name,
+            :width => 150,
+            :editor => {:xtype => 'textfield'}
         }
       end
 
       def self.build_text_column(column_name)
         {
-          :header => column_name,
-          :type => 'string',
-          :dataIndex  => column_name,
-          :width => 150,
-          :editor => {:xtype => 'textarea'}
+            :header => column_name,
+            :type => 'string',
+            :dataIndex => column_name,
+            :width => 150,
+            :editor => {:xtype => 'textarea'}
         }
       end
 
       def self.build_integer_column(column_name)
         hash = {
-          :header => column_name,
-          :type => 'number',
-          :dataIndex  => column_name,
-          :width => 150,
+            :header => column_name,
+            :type => 'number',
+            :dataIndex => column_name,
+            :width => 150,
         }
         hash[:editor] = {:xtype => 'textfield'} if column_name != "id"
 
@@ -113,10 +113,10 @@ module RailsDbAdmin
 
       def self.build_decimal_column(column_name)
         hash = {
-          :header => column_name,
-          :type => 'float',
-          :dataIndex  => column_name,
-          :width => 150,
+            :header => column_name,
+            :type => 'float',
+            :dataIndex => column_name,
+            :width => 150,
         }
         hash[:editor] = {:xtype => 'textfield'} if column_name != "id"
 
@@ -125,15 +125,25 @@ module RailsDbAdmin
 
       def self.build_float_column(column_name)
         hash = {
-          :header => column_name,
-          :type => 'float',
-          :dataIndex  => column_name,
-          :width => 150,
+            :header => column_name,
+            :type => 'float',
+            :dataIndex => column_name,
+            :width => 150,
         }
         hash[:editor] = {:xtype => 'textfield'} if column_name != "id"
 
         hash
       end
+
+      def self.build_hstore_column(column_name)
+        {
+            :header => column_name,
+            :type => 'string',
+            :dataIndex => column_name,
+            :width => 150
+        }
+      end
+
     end
   end
 end

data/lib/rails_db_admin/table_support.rb

@@ -2,7 +2,7 @@ module RailsDbAdmin
   class TableSupport
 
     def initialize(database_connection_class)
-     @connection = database_connection_class.connection
+      @connection = database_connection_class.connection
     end
 
     def columns(table)
@@ -25,7 +25,7 @@ module RailsDbAdmin
       data[0].delete('fake_id')
       data[1].delete('fake_id')
       data.map! do |item|
-        item.each do |k,v|
+        item.each do |k, v|
           item[k] = v.to_s
         end
         item
@@ -72,27 +72,27 @@ module RailsDbAdmin
     end
 
     def primary_key(table)
-      [@connection.primary_key(table),nil]
+      [@connection.primary_key(table), nil]
     end
 
     def primary_key?(table)
       @connection.supports_primary_key? && !@connection.primary_key(table).nil?
     end
 
-	  
-	  def table_contains_column(table, column_name)
-	    
-	    column_names = columns(table).map{|column| column.name.to_sym}
-	    
-	    column_names.include?(column_name)
-	  end
-	
+
+    def table_contains_column(table, column_name)
+
+      column_names = columns(table).map { |column| column.name.to_sym }
+
+      column_names.include?(column_name)
+    end
+
     def clean_nulls!(table, data)
       if data.class == Array
-        data.each {|x| clean_nulls!(table, x)}
+        data.each { |x| clean_nulls!(table, x) }
       end
 
-      data.collect do |k,v|
+      data.collect do |k, v|
         if v == "" || v == 0
           column = columns(table).collect do |x|
             if (x.name == k)
@@ -117,7 +117,16 @@ module RailsDbAdmin
         # records << record
 
         # simplifying the above with to_hash.symbolize_keys
-        records << row.to_hash.symbolize_keys
+        row_data = row.to_hash.symbolize_keys
+
+        # any hashes need to be converted to json strings
+        row_data.each do |k, v|
+          if v.is_a?(Hash)
+            row_data[k] = v.to_json
+          end
+        end
+
+        records << row_data
       end
 
       records.reverse
@@ -128,7 +137,7 @@ module RailsDbAdmin
     #calls
     def self.arel_attr data, arel_table
       cln_hsh = {}
-      data.each do |k,v|
+      data.each do |k, v|
         cln_hsh[arel_table[k.to_sym]] = v
       end
       cln_hsh

data/lib/rails_db_admin/version.rb

@@ -1,9 +1,13 @@
 module RailsDbAdmin
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 1
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
+
+  def self.version
+    RailsDbAdmin::VERSION::STRING
+  end
 end

data/public/javascripts/erp_app/desktop/applications/rails_db_admin/database_combo.js

@@ -1,27 +1,26 @@
-Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin.DatabaseComboBox",{
-    extend:"Ext.form.field.ComboBox",
-    alias:'widget.railsdbadmin_databasecombo',
-    initComponent: function() {
+Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin.DatabaseComboBox", {
+    extend: "Ext.form.field.ComboBox",
+    alias: 'widget.railsdbadmin_databasecombo',
+    initComponent: function () {
 
-        var databaseJsonStore = new Ext.data.Store({
-            timeout:60000,
+        var databaseJsonStore = Ext.create('Ext.data.Store', {
+            timeout: 60000,
             proxy: {
                 type: 'ajax',
-                url :'/rails_db_admin/erp_app/desktop/base/databases',
+                url: '/rails_db_admin/erp_app/desktop/base/databases',
                 reader: {
                     type: 'json',
                     root: 'databases'
                 }
             },
-            fields: [{
-                name:'value'
-            },{
-                name:'display'
-            }]
+            fields: [
+                'value',
+                'display'
+            ]
         });
 
         var me = this;
-        databaseJsonStore.on('load', function(store) {
+        databaseJsonStore.on('load', function (store) {
             me.setValue(store.first().get('value'));
         });
 
@@ -29,25 +28,29 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin.DatabaseComboBox",{
         this.callParent(arguments);
     },
 
-    constructor : function(config) {
+    constructor: function (config) {
         config = Ext.apply({
-            id:'databaseCombo',
-            valueField:'value',
-            displayField:'display',
-            triggerAction:'all',
-            editable:false,
-            forceSelection:true,
+            id: 'databaseCombo',
+            fieldStyle: {
+                borderRadius: '0px !important'
+            },
+            valueField: 'value',
+            displayField: 'display',
+            triggerAction: 'all',
+            editable: false,
+            forceSelection: true,
             queryMode: 'local',
-            listeners:{
-                'select':function(combo, record, index){
-                  // switch databases                  
-                  combo.initialConfig.module.connectToDatatbase();
+            listeners: {
+                'select': function (combo, record, index) {
+                    // switch databases
+                    combo.initialConfig.module.connectToDatatbase();
                 },
-                render:function(combo){
+                render: function (combo) {
                     combo.getStore().load();
                 }
             }
         }, config);
+
         this.callParent([config]);
     }
 });

data/public/javascripts/erp_app/desktop/applications/rails_db_admin/module.js

@@ -1,102 +1,113 @@
 Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
-    extend:"Ext.ux.desktop.Module",
-    id:'rails_db_admin-win',
+    extend: "Ext.ux.desktop.Module",
+    id: 'rails_db_admin-win',
 
-    queriesTreePanel:function () {
-        return this.accordion.down('.railsdbadmin_queriestreemenu');
+    getWindow: function () {
+        return this.app.getDesktop().getWindow('rails_db_admin');
     },
 
-    setWindowStatus:function (status) {
-        this.window.setStatus(status);
+    queriesTreePanel: function () {
+        return this.accordion.down('.railsdbadmin_queriestreemenu');
     },
 
-    clearWindowStatus:function () {
-        this.window.clearStatus();
+    setWindowStatus: function (status) {
+        this.getWindow().setStatus(status);
     },
 
-    getTableData:function (table) {
-        var self = this;
+    clearWindowStatus: function () {
+        this.getWindow().clearStatus();
+    },
 
-        var grid = Ext.create('Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel', {
-            title:table,
-            setupUrl:'/rails_db_admin/erp_app/desktop/base/setup_table_grid/' + table,
-            dataUrl:'/rails_db_admin/erp_app/desktop/base/table_data/' + table,
-            editable:true,
-            page:true,
-            pageSize:25,
-            displayMsg:'Displaying {0} - {1} of {2}',
-            emptyMsg:'Empty',
-            loadErrorMessage:'Tables Without Ids Can Not Be Edited',
-            closable:true,
-            params:{
-                database:self.getDatabase()
-            },
-            grid_listeners:{
-                validateedit:{
-                    fn:function (editor, e) {
-                        this.store.proxy.setOldModel(e.record);
-                    }
-                }
-            },
-            proxy:{
-                type:'rest',
-                url:'/rails_db_admin/erp_app/desktop/base/table_data/' + table,
-                //private var to store the previous model in an
-                //update operation
-                oldModel:null,
-                setOldModel:function (old_model) {
-                    this.oldModel = old_model.copy();
-                },
-                update:function (operation, callback, scope) {
-                    operation.records.push(this.oldModel);
-                    Ext.data.proxy.Rest.superclass.update.call(this, operation, callback, scope);
-                },
-                reader:{
-                    type:'json',
-                    successProperty:'success',
-                    root:'data',
-                    messageProperty:'message'
+    getTableData: function (table) {
+        var self = this,
+            id = 'ext-' + table + '-data';
+
+        var grid = self.container.down('#' + id);
+
+        if (Ext.isEmpty(grid)) {
+            grid = Ext.create('Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel', {
+                id: id,
+                title: table,
+                setupUrl: '/rails_db_admin/erp_app/desktop/base/setup_table_grid/' + table,
+                dataUrl: '/rails_db_admin/erp_app/desktop/base/table_data/' + table,
+                editable: true,
+                page: true,
+                pageSize: 25,
+                displayMsg: 'Displaying {0} - {1} of {2}',
+                emptyMsg: 'Empty',
+                loadErrorMessage: 'Tables Without Ids Can Not Be Edited',
+                closable: true,
+                params: {
+                    database: self.getDatabase()
                 },
-                writer:{
-                    type:'json',
-                    writeAllFields:true,
-                    root:'data'
+                grid_listeners: {
+                    validateedit: {
+                        fn: function (editor, e) {
+                            this.store.proxy.setOldModel(e.record);
+                        }
+                    }
                 },
-                listeners:{
-                    exception:function (proxy, response, operation) {
-                        var msg;
-                        if (operation.getError() === undefined) {
-                            var responseObject = Ext.JSON.decode(response.responseText);
-                            msg = responseObject.exception;
-                        } else {
-                            msg = operation.getError();
+                proxy: {
+                    type: 'rest',
+                    url: '/rails_db_admin/erp_app/desktop/base/table_data/' + table,
+                    //private var to store the previous model in an
+                    //update operation
+                    oldModel: null,
+                    setOldModel: function (old_model) {
+                        this.oldModel = old_model.copy();
+                    },
+                    update: function (operation, callback, scope) {
+                        operation.records.push(this.oldModel);
+                        Ext.data.proxy.Rest.superclass.update.call(this, operation, callback, scope);
+                    },
+                    reader: {
+                        type: 'json',
+                        successProperty: 'success',
+                        root: 'data',
+                        messageProperty: 'message'
+                    },
+                    writer: {
+                        type: 'json',
+                        writeAllFields: true,
+                        root: 'data'
+                    },
+                    listeners: {
+                        exception: function (proxy, response, operation) {
+                            var msg;
+                            if (operation.getError() === undefined) {
+                                var responseObject = Ext.JSON.decode(response.responseText);
+                                msg = responseObject.exception;
+                            } else {
+                                msg = operation.getError();
+                            }
+                            Ext.MessageBox.show({
+                                title: 'REMOTE EXCEPTION',
+                                msg: msg,
+                                icon: Ext.MessageBox.ERROR,
+                                buttons: Ext.Msg.OK
+                            });
                         }
-                        Ext.MessageBox.show({
-                            title:'REMOTE EXCEPTION',
-                            msg:msg,
-                            icon:Ext.MessageBox.ERROR,
-                            buttons:Ext.Msg.OK
-                        });
                     }
                 }
-            }
-        });
+            });
 
-        this.container.add(grid);
-        this.container.setActiveTab(this.container.items.length - 1);
+            self.container.add(grid);
+        }
+
+        self.container.setActiveTab(grid);
     },
 
-    selectTopFifty:function (table) {
+    selectTopFifty: function (table) {
         this.setWindowStatus('Selecting Top 50 from ' + table + '...');
         var self = this;
 
         Ext.Ajax.request({
-            url:'/rails_db_admin/erp_app/desktop/queries/select_top_fifty/' + table,
-            timeout:60000,
-            params:{
-                database:self.getDatabase()
+            url: '/rails_db_admin/erp_app/desktop/queries/select_top_fifty/' + table,
+            timeout: 60000,
+            params: {
+                database: self.getDatabase()
             },
-            success:function (responseObject) {
+            success: function (responseObject) {
                 self.clearWindowStatus();
                 var response = Ext.decode(responseObject.responseText);
                 var sql = response.sql;
@@ -105,17 +116,21 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 var data = response.data;
 
                 var readOnlyDataGrid = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.ReadOnlyTableDataGrid', {
-                    region:'center',
-                    columns:columns,
-                    fields:fields,
-                    data:data
+                    region: 'south',
+                    split: true,
+                    columns: columns,
+                    fields: fields,
+                    data: data,
+                    collapseDirection: 'bottom',
+                    height: '50%',
+                    collapsible: true
                 });
 
                 var queryPanel = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.QueryPanel', {
-                    module:self,
-                    closable:true,
-                    sqlQuery:sql,
-                    southRegion:readOnlyDataGrid
+                    module: self,
+                    closable: true,
+                    sqlQuery: sql,
+                    southRegion: readOnlyDataGrid
                 });
 
                 self.container.add(queryPanel);
@@ -124,51 +139,60 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 //queryPanel.gridContainer.add(readOnlyDataGrid);
                 //queryPanel.gridContainer.getLayout().setActiveItem(0);
             },
-            failure:function () {
+            failure: function () {
                 self.clearWindowStatus();
                 Ext.Msg.alert('Status', 'Error loading grid');
             }
         });
     },
 
-    addNewQueryTab:function () {
+
+    addConsolePanel: function () {
+        this.container.add({
+            xtype: 'compass_ae_console_panel',
+            module: this
+        });
+        this.container.setActiveTab(this.container.items.length - 1);
+
+    },
+
+    addNewQueryTab: function () {
         this.container.add({
-            xtype:'railsdbadmin_querypanel',
-            module:this
+            xtype: 'railsdbadmin_querypanel',
+            module: this
         });
         this.container.setActiveTab(this.container.items.length - 1);
     },
 
-    connectToDatatbase:function () {
+    connectToDatatbase: function () {
         var database = this.getDatabase();
         var tablestreePanelStore = this.accordion.down('.railsdbadmin_tablestreemenu').store;
         var queriesTreePanelStore = this.accordion.down('.railsdbadmin_queriestreemenu').store;
 
         tablestreePanelStore.setProxy({
-            type:'ajax',
-            url:'/rails_db_admin/erp_app/desktop/base/tables',
-            extraParams:{
-                database:database
+            type: 'ajax',
+            url: '/rails_db_admin/erp_app/desktop/base/tables',
+            extraParams: {
+                database: database
             }
         });
         tablestreePanelStore.load();
 
         queriesTreePanelStore.setProxy({
-            type:'ajax',
-            url:'/rails_db_admin/erp_app/desktop/queries/saved_queries_tree',
-            extraParams:{
-                database:database
+            type: 'ajax',
+            url: '/rails_db_admin/erp_app/desktop/queries/saved_queries_tree',
+            extraParams: {
+                database: database
             }
         });
         queriesTreePanelStore.load();
     },
 
-    getDatabase:function () {
-        var database = Ext.getCmp('databaseCombo').getValue();
-        return database;
+    getDatabase: function () {
+        return Ext.getCmp('databaseCombo').getValue();
     },
 
-    deleteQuery:function (queryName) {
+    deleteQuery: function (queryName) {
         var self = this;
         Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this query?', function (btn) {
             if (btn === 'no') {
@@ -178,22 +202,22 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 self.setWindowStatus('Deleting ' + queryName + '...');
                 var database = self.getDatabase();
                 Ext.Ajax.request({
-                    url:'/rails_db_admin/erp_app/desktop/queries/delete_query/',
-                    params:{
-                        database:database,
-                        query_name:queryName
+                    url: '/rails_db_admin/erp_app/desktop/queries/delete_query/',
+                    params: {
+                        database: database,
+                        query_name: queryName
                     },
-                    success:function (responseObject) {
+                    success: function (responseObject) {
                         self.clearWindowStatus();
                         var response = Ext.decode(responseObject.responseText);
                         if (response.success) {
                             Ext.Msg.alert('Error', 'Query deleted');
                             var queriesTreePanelStore = self.accordion.down('.railsdbadmin_queriestreemenu').store;
                             queriesTreePanelStore.setProxy({
-                                type:'ajax',
-                                url:'/rails_db_admin/erp_app/desktop/queries/saved_queries_tree',
-                                extraParams:{
-                                    database:database
+                                type: 'ajax',
+                                url: '/rails_db_admin/erp_app/desktop/queries/saved_queries_tree',
+                                extraParams: {
+                                    database: database
                                 }
                             });
                             queriesTreePanelStore.load();
@@ -203,7 +227,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                         }
 
                     },
-                    failure:function () {
+                    failure: function () {
                         self.clearWindowStatus();
                         Ext.Msg.alert('Status', 'Error deleting query');
                     }
@@ -212,17 +236,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
         });
     },
 
-    displayAndExecuteQuery:function (queryName) {
+    displayAndExecuteQuery: function (queryName) {
         this.setWindowStatus('Executing ' + queryName + '...');
         var self = this;
         var database = this.getDatabase();
         Ext.Ajax.request({
-            url:'/rails_db_admin/erp_app/desktop/queries/open_and_execute_query/',
-            params:{
-                database:database,
-                query_name:queryName
+            url: '/rails_db_admin/erp_app/desktop/queries/open_and_execute_query/',
+            params: {
+                database: database,
+                query_name: queryName
             },
-            success:function (responseObject) {
+            success: function (responseObject) {
                 var response = Ext.decode(responseObject.responseText);
                 var query = response.query;
 
@@ -235,17 +259,20 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                     var data = response.data;
 
                     var readOnlyDataGrid = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.ReadOnlyTableDataGrid', {
-                        region:'center',
-                        columns:columns,
-                        fields:fields,
-                        data:data
+                        region: 'south',
+                        columns: columns,
+                        fields: fields,
+                        data: data,
+                        collapseDirection: 'bottom',
+                        height: '50%',
+                        collapsible: true
                     });
 
-                    var queryPanel = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.QueryPanel', {
-                        module:self,
-                        sqlQuery:query,
-                        southRegion:readOnlyDataGrid,
-                        closable:true
+                    queryPanel = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.QueryPanel', {
+                        module: self,
+                        sqlQuery: query,
+                        southRegion: readOnlyDataGrid,
+                        closable: true
                     });
 
                     self.container.add(queryPanel);
@@ -254,9 +281,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 else {
                     Ext.Msg.alert('Error', response.exception);
                     queryPanel = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.QueryPanel', {
-                        module:self,
-                        closable:true,
-                        sqlQuery:query
+                        module: self,
+                        closable: true,
+                        sqlQuery: query
                     });
 
                     self.container.add(queryPanel);
@@ -264,7 +291,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 }
 
             },
-            failure:function () {
+            failure: function () {
                 self.clearWindowStatus();
                 Ext.Msg.alert('Status', 'Error loading query');
             }
@@ -273,44 +300,45 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
 
     //************ Reporting ************************************************
 
-    editReport : function(reportObj){
+    editReport: function (reportObj) {
         var me = this;
 
         me.container.add({
-            title:reportObj.title,
-            xtype:'railsdbadmin_reportpanel',
-            module:me,
-            query:reportObj.query,
-            reportId:reportObj.id,
-            template:reportObj.template,
-            internalIdentifier:reportObj.internalIdentifier,
-            closable:true
+            title: reportObj.title,
+            xtype: 'railsdbadmin_reportpanel',
+            module: me,
+            query: reportObj.query,
+            reportId: reportObj.id,
+            template: reportObj.template,
+            internalIdentifier: reportObj.internalIdentifier,
+            closable: true
         });
         me.container.setActiveTab(me.container.items.length - 1);
     },
 
     //***********************************************************************
 
-    init:function () {
+    init: function () {
         this.launcher = {
-            text:'RailsDbAdmin',
-            iconCls:'icon-rails_db_admin',
-            handler:this.createWindow,
-            scope:this
+            text: 'Database Tools',
+            iconCls: 'icon-rails_db_admin',
+            handler: this.createWindow,
+            scope: this
+
         };
     },
 
-    displayQuery:function (queryName) {
+    displayQuery: function (queryName) {
         this.setWindowStatus('Retrieving ' + queryName + '...');
         var self = this;
         var database = this.getDatabase();
         Ext.Ajax.request({
-            url:'/rails_db_admin/erp_app/desktop/queries/open_query/',
-            params:{
-                database:database,
-                query_name:queryName
+            url: '/rails_db_admin/erp_app/desktop/queries/open_query/',
+            params: {
+                database: database,
+                query_name: queryName
             },
-            success:function (responseObject) {
+            success: function (responseObject) {
                 var response = Ext.decode(responseObject.responseText);
                 var query = response.query;
 
@@ -320,9 +348,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                     self.clearWindowStatus();
 
                     queryPanel = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.QueryPanel', {
-                        module:self,
-                        closable:true,
-                        sqlQuery:query
+                        module: self,
+                        closable: true,
+                        sqlQuery: query
                     });
 
                     self.container.add(queryPanel);
@@ -331,9 +359,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 else {
                     Ext.Msg.alert('Error', response.exception);
                     queryPanel = Ext.create('Compass.ErpApp.Desktop.Applications.RailsDbAdmin.QueryPanel', {
-                        module:self,
-                        closable:true,
-                        sqlQuery:query
+                        module: self,
+                        closable: true,
+                        sqlQuery: query
                     });
 
                     self.container.add(queryPanel);
@@ -341,100 +369,133 @@ Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin", {
                 }
 
             },
-            failure:function () {
+            failure: function () {
                 self.clearWindowStatus();
                 Ext.Msg.alert('Status', 'Error loading query');
             }
         });
     },
 
-    createWindow:function () {
+
+    openIframeInTab: function (title, url) {
+        var self = this;
+
+        var item = Ext.create('Ext.panel.Panel', {
+            iframeId: 'tutorials_iframe',
+            closable: true,
+            layout: 'fit',
+            title: title,
+            html: '<iframe id="themes_iframe" height="100%" width="100%" frameBorder="0" src="' + url + '"></iframe>'
+        });
+
+        self.container.add(item);
+        self.container.setActiveTab(item);
+    },
+
+    createWindow: function () {
+
         var self = this;
         var desktop = this.app.getDesktop();
         var win = desktop.getWindow('rails_db_admin');
         if (!win) {
             this.container = Ext.create('Ext.tab.Panel', {
-                region:'center',
-                margins:'0 0 0 0',
-                border:false,
-                minsize:300
+                itemId: 'centerRegion',
+                region: 'center',
+                margins: '0 0 0 0',
+                border: false,
+                minsize: 300
             });
 
             this.accordion = Ext.create('Ext.panel.Panel', {
-                region:'west',
-                margins:'0 0 0 0',
-                cmargins:'0 0 0 0',
-                width:300,
-                collapsible:true,
-                layout:'accordion',
-                items:[
+                dockedItems: [
+                    {
+                        xtype: 'toolbar',
+                        dock: 'top',
+                        items: [
+                            {
+                                text: 'Database:'
+                            },
+                            {
+                                xtype: 'railsdbadmin_databasecombo',
+                                module: self
+                            }
+                        ]
+                    }
+                ],
+                ui: 'rounded-panel',
+                region: 'west',
+                margins: '0 0 0 0',
+                cmargins: '0 0 0 0',
+                width: 300,
+                collapsible: true,
+                header: false,
+                split: true,
+                layout: 'accordion',
+                items: [
+                    {
+                        xtype: 'railsdbadmin_tablestreemenu',
+                        module: this
+                    },
+                    {
+                        xtype: 'railsdbadmin_queriestreemenu',
+                        module: this
+                    },
                     {
-                        xtype:'railsdbadmin_tablestreemenu',
-                        module:this
-                    }, {
-                        xtype:'railsdbadmin_queriestreemenu',
-                        module:this
-                    }, {
-                        xtype:'railsdbadmin_reportstreepanel',
-                        module:this
+                        xtype: 'railsdbadmin_reportstreepanel',
+                        module: this
                     }
                 ]
             });
 
             win = desktop.createWindow({
-                id:'rails_db_admin',
-                title:'RailsDBAdmin',
-                autoDestroy:true,
-                width:1200,
-                height:550,
-                iconCls:'icon-rails_db_admin',
-                shim:false,
-                animCollapse:false,
-                constrainHeader:true,
-                layout:'border',
-                tbar:{
-                    items:[
-                        {
-                            text:'Database:'
-                        },
-                        {
-                            xtype:'railsdbadmin_databasecombo',
-                            module:self
-                        }
-                    ]
-                },
-                items:[this.accordion, this.container]
+                id: 'rails_db_admin',
+                title: 'RailsDBAdmin',
+                width: 1200,
+                height: 550,
+                maximized: true,
+                iconCls: 'icon-rails_db_admin-light',
+                shim: false,
+                animCollapse: false,
+                constrainHeader: true,
+                layout: 'border',
+                items: [this.accordion, this.container]
             });
 
-            this.window = win;
+            win.addListener('render', function (win) {
+                win.down('#centerRegion').add({
+                    xtype: 'railsdbadmin_splash_screen',
+                    module: self,
+                    closable: true
+                });
+
+                win.down('#centerRegion').setActiveTab(win.down('#centerRegion').items.length - 1);
+            });
         }
         win.show();
     }
 });
 
 Ext.define("Compass.ErpApp.Desktop.Applications.RailsDbAdmin.BooleanEditor", {
-    extend:"Ext.form.ComboBox",
-    alias:'widget.booleancolumneditor',
-    initComponent:function () {
-        var trueFalseStore = Ext.create('Ext.data.ArrayStore', {
-            fields:['display', 'value'],
-            data:[
+    extend: "Ext.form.ComboBox",
+    alias: 'widget.booleancolumneditor',
+    initComponent: function () {
+        this.store = Ext.create('Ext.data.ArrayStore', {
+            fields: ['display', 'value'],
+            data: [
                 ['False', '0'],
                 ['True', '1']
             ]
         });
 
-        this.store = trueFalseStore;
-
         this.callParent(arguments);
     },
-    constructor:function (config) {
+    constructor: function (config) {
         config = Ext.apply({
-            valueField:'value',
-            displayField:'display',
-            triggerAction:'all',
-            forceSelection:true,
-            mode:'local'
+            valueField: 'value',
+            displayField: 'display',
+            triggerAction: 'all',
+            forceSelection: true,
+            mode: 'local'
         }, config);
 
         this.callParent([config]);