From f040efb473f4417acabf0220e654837ee8970258 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 9 Mar 2015 13:14:20 +0000 Subject: [PATCH] Make the jQuery-contextMenu control globally available as it's used by wcDocker. --- web/pgadmin/browser/views.py | 6 +++--- .../static/css/jQuery-contextMenu/jquery.contextMenu.css | 0 .../static/js/jQuery-contextMenu/jquery.contextMenu.js | 0 .../static/js/jQuery-contextMenu/jquery.ui.position.js | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename web/pgadmin/{browser => }/static/css/jQuery-contextMenu/jquery.contextMenu.css (100%) rename web/pgadmin/{browser => }/static/js/jQuery-contextMenu/jquery.contextMenu.js (100%) rename web/pgadmin/{browser => }/static/js/jQuery-contextMenu/jquery.ui.position.js (100%) diff --git a/web/pgadmin/browser/views.py b/web/pgadmin/browser/views.py index 660ee817e..54103a9b4 100644 --- a/web/pgadmin/browser/views.py +++ b/web/pgadmin/browser/views.py @@ -58,9 +58,9 @@ def index(): stylesheets.append(url_for('static', filename='css/wcDocker/wcDockerSkeleton.min.css')) stylesheets.append(url_for('static', filename='css/wcDocker/theme.css')) + stylesheets.append(url_for('static', filename='css/jQuery-contextMenu/jQuery.contextMenu.css')) stylesheets.append(url_for('browser.static', filename='css/browser.css')) stylesheets.append(url_for('browser.static', filename='css/aciTree/css/aciTree.css')) - stylesheets.append(url_for('browser.static', filename='css/jQuery-contextMenu/jQuery.contextMenu.css')) stylesheets.append(url_for('browser.browser_css')) # Add browser scripts @@ -72,11 +72,11 @@ def index(): else: scripts.append(url_for('static', filename='js/wcDocker/wcDocker.min.js')) + scripts.append(url_for('static', filename='js/jQuery-contextMenu/jquery.ui.position.js')) + scripts.append(url_for('static', filename='js/jQuery-contextMenu/jQuery.contextMenu.js')) scripts.append(url_for('browser.static', filename='js/aciTree/jquery.aciPlugin.min.js')) scripts.append(url_for('browser.static', filename='js/aciTree/jquery.aciTree.dom.js')) scripts.append(url_for('browser.static', filename='js/aciTree/jquery.aciTree.min.js')) - scripts.append(url_for('browser.static', filename='js/jQuery-contextMenu/jquery.ui.position.js')) - scripts.append(url_for('browser.static', filename='js/jQuery-contextMenu/jQuery.contextMenu.js')) scripts.append(url_for('browser.browser_js')) for module in modules_and_nodes: diff --git a/web/pgadmin/browser/static/css/jQuery-contextMenu/jquery.contextMenu.css b/web/pgadmin/static/css/jQuery-contextMenu/jquery.contextMenu.css similarity index 100% rename from web/pgadmin/browser/static/css/jQuery-contextMenu/jquery.contextMenu.css rename to web/pgadmin/static/css/jQuery-contextMenu/jquery.contextMenu.css diff --git a/web/pgadmin/browser/static/js/jQuery-contextMenu/jquery.contextMenu.js b/web/pgadmin/static/js/jQuery-contextMenu/jquery.contextMenu.js similarity index 100% rename from web/pgadmin/browser/static/js/jQuery-contextMenu/jquery.contextMenu.js rename to web/pgadmin/static/js/jQuery-contextMenu/jquery.contextMenu.js diff --git a/web/pgadmin/browser/static/js/jQuery-contextMenu/jquery.ui.position.js b/web/pgadmin/static/js/jQuery-contextMenu/jquery.ui.position.js similarity index 100% rename from web/pgadmin/browser/static/js/jQuery-contextMenu/jquery.ui.position.js rename to web/pgadmin/static/js/jQuery-contextMenu/jquery.ui.position.js