IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
layout if the saved one fails for any reason.
This commit is contained in:
Dave Page 2015-03-05 11:13:15 +00:00
parent 7441d98c49
commit caff78053b
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
web/pgadmin/browser/templates/browser/js/browser.js
View File

@ -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);
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);
buildDefaultLayout()
}
}

7
web/pgadmin/browser/views.py
View File

@ -51,12 +51,7 @@ def index():
# Add browser stylesheets
stylesheets.append(url_for('static', filename='css/codemirror/codemirror.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/wcDockerSkeleton.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'))

16
web/pgadmin/static/css/wcDocker/wcDocker.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
web/pgadmin/static/css/wcDocker/wcDocker.css → web/pgadmin/static/css/wcDocker/wcDockerSkeleton.css
View File

@ -352,4 +352,4 @@ html, body {
.wcIFrameMoving {
pointer-events: none;
}
}