Update to use the new skeleton CSS from wcDocker, and restore a default

layout if the saved one fails for any reason.

web/pgadmin/browser/templates/browser/js/browser.js

@@ -2,6 +2,13 @@
 var docker
 var editor
 var tree
+var dashboardPanel
+var propertiesPanel
+var statisticsPanel
+var dependenciesPanel
+var dependentsPanel
+var sqlPanel
+var browserPanel
 
 // Store the main browser layout
 $(window).bind('unload', function() { 
@@ -54,6 +61,17 @@ function buildIFramePanel(docker, name, title, width, height, showTitle, isClose
     });
 }
 
+// Build the default layout
+function buildDefaultLayout() {
+    dashboardPanel = docker.addPanel('pnl_dashboard', wcDocker.DOCK_TOP, propertiesPanel);
+    propertiesPanel = docker.addPanel('pnl_properties', wcDocker.DOCK_STACKED, dashboardPanel);
+    statisticsPanel = docker.addPanel('pnl_statistics', wcDocker.DOCK_STACKED, dashboardPanel);
+    dependenciesPanel = docker.addPanel('pnl_dependencies', wcDocker.DOCK_STACKED, dashboardPanel);
+    dependentsPanel = docker.addPanel('pnl_dependents', wcDocker.DOCK_STACKED, dashboardPanel);
+    sqlPanel = docker.addPanel('pnl_sql', wcDocker.DOCK_BOTTOM, sqlPanel);
+    browserPanel = docker.addPanel('pnl_browser', wcDocker.DOCK_LEFT, browserPanel);
+}
+
 // Setup the browser
 $(document).ready(function(){
 
@@ -114,17 +132,17 @@ ALTER TABLE tickets_detail \n\
         
         var layout = '{{ layout }}';
         
-        // Restore the layout if there is one
+        // Try to restore the layout if there is one
         if (layout != '') {
-            docker.restore(layout)
+            try {
+                docker.restore(layout)
+            }
+            catch(err) {
+                docker.clear()
+                buildDefaultLayout()
+            }
         } else {
-            var dashboardPanel = docker.addPanel('pnl_dashboard', wcDocker.DOCK_TOP, propertiesPanel);
+            buildDefaultLayout()
-            var propertiesPanel = docker.addPanel('pnl_properties', wcDocker.DOCK_STACKED, dashboardPanel);
-            var statisticsPanel = docker.addPanel('pnl_statistics', wcDocker.DOCK_STACKED, dashboardPanel);
-            var dependenciesPanel = docker.addPanel('pnl_dependencies', wcDocker.DOCK_STACKED, dashboardPanel);
-            var dependentsPanel = docker.addPanel('pnl_dependents', wcDocker.DOCK_STACKED, dashboardPanel);
-            var sqlPanel = docker.addPanel('pnl_sql', wcDocker.DOCK_BOTTOM, sqlPanel);
-            var browserPanel = docker.addPanel('pnl_browser', wcDocker.DOCK_LEFT, browserPanel);
         }
     }
     

web/pgadmin/browser/views.py

@@ -51,12 +51,7 @@ def index():
         
     # Add browser stylesheets
     stylesheets.append(url_for('static', filename='css/codemirror/codemirror.css'))
-    
+    stylesheets.append(url_for('static', filename='css/wcDocker/wcDockerSkeleton.css'))
-    if config.DEBUG:
-        stylesheets.append(url_for('static', filename='css/wcDocker/wcDocker.css'))
-    else:
-        stylesheets.append(url_for('static', filename='css/wcDocker/wcDocker.min.css'))
-        
     stylesheets.append(url_for('static', filename='css/wcDocker/theme.css'))
     stylesheets.append(url_for('browser.static', filename='css/browser.css'))
     stylesheets.append(url_for('browser.static', filename='css/aciTree/css/aciTree.css'))