Move 3rd party client code into vendor/ directories for ease of maintenance.

web/pgadmin/browser/__init__.py

@@ -39,14 +39,14 @@ class BrowserModule(PgAdminModule):
         stylesheets = []
         # Add browser stylesheets
         for (endpoint, filename) in [
-            ('static', 'css/codemirror/codemirror.css'),
-            ('static', 'js/codemirror/addon/dialog/dialog.css'),
-            ('static', 'css/jQuery-contextMenu/jquery.contextMenu.css' if current_app.debug
+            ('static', 'vendor/codemirror/codemirror.css'),
+            ('static', 'vendor/codemirror/addon/dialog/dialog.css'),
+            ('static', 'vendor/jQuery-contextMenu/jquery.contextMenu.css' if current_app.debug
             else 'css/jQuery-contextMenu/jquery.contextMenu.min.css'),
-            ('static', 'css/wcDocker/wcDocker.css' if current_app.debug
-            else 'css/wcDocker/wcDocker.min.css'),
+            ('static', 'vendor/wcDocker/wcDocker.css' if current_app.debug
+            else 'vendor/wcDocker/wcDocker.min.css'),
             ('browser.static', 'css/browser.css'),
-            ('browser.static', 'css/aciTree/css/aciTree.css')
+            ('browser.static', 'vendor/aciTree/css/aciTree.css')
         ]:
             stylesheets.append(url_for(endpoint, filename=filename))
         stylesheets.append(url_for('browser.browser_css'))
@@ -58,8 +58,8 @@ class BrowserModule(PgAdminModule):
             'name': 'alertify',
             'path': url_for(
                 'static',
-                filename='js/alertifyjs/alertify' if current_app.debug
-                else 'js/alertifyjs/alertify.min'
+                filename='vendor/alertifyjs/alertify' if current_app.debug
+                else 'vendor/alertifyjs/alertify.min'
             ),
             'exports': 'alertify',
             'preloaded': True
@@ -68,9 +68,9 @@ class BrowserModule(PgAdminModule):
             'name': 'jqueryui.position',
             'path': url_for(
                 'static',
-                filename='js/jQuery-contextMenu/jquery.ui.position' if \
+                filename='vendor/jQuery-contextMenu/jquery.ui.position' if \
                     current_app.debug else \
-                    'js/jQuery-contextMenu/jquery.ui.position.min'
+                    'vendor/jQuery-contextMenu/jquery.ui.position.min'
             ),
             'deps': ['jquery'],
             'exports': 'jQuery.ui.position',
@@ -80,9 +80,9 @@ class BrowserModule(PgAdminModule):
             'name': 'jquery.contextmenu',
             'path': url_for(
                 'static',
-                filename='js/jQuery-contextMenu/jquery.contextMenu' if \
+                filename='vendor/jQuery-contextMenu/jquery.contextMenu' if \
                     current_app.debug else \
-                    'js/jQuery-contextMenu/jquery.contextMenu.min'
+                    'vendor/jQuery-contextMenu/jquery.contextMenu.min'
             ),
             'deps': ['jquery', 'jqueryui.position'],
             'exports': 'jQuery.contextMenu',
@@ -92,7 +92,7 @@ class BrowserModule(PgAdminModule):
             'name': 'jquery.aciplugin',
             'path': url_for(
                 'browser.static',
-                filename='js/aciTree/jquery.aciPlugin.min'
+                filename='vendor/aciTree/jquery.aciPlugin.min'
             ),
             'deps': ['jquery'],
             'exports': 'aciPluginClass',
@@ -102,8 +102,8 @@ class BrowserModule(PgAdminModule):
             'name': 'jquery.acitree',
             'path': url_for(
                 'browser.static',
-                filename='js/aciTree/jquery.aciTree' if
-                current_app.debug else 'js/aciTree/jquery.aciTree.min'
+                filename='vendor/aciTree/jquery.aciTree' if
+                current_app.debug else 'vendor/aciTree/jquery.aciTree.min'
             ),
             'deps': ['jquery', 'jquery.aciplugin'],
             'exports': 'aciPluginClass.plugins.aciTree',
@@ -113,7 +113,7 @@ class BrowserModule(PgAdminModule):
             'name': 'jquery.acisortable',
             'path': url_for(
                 'browser.static',
-                filename='js/aciTree/jquery.aciSortable.min'
+                filename='vendor/aciTree/jquery.aciSortable.min'
             ),
             'deps': ['jquery', 'jquery.aciplugin'],
             'exports': 'aciPluginClass.plugins.aciSortable',
@@ -124,7 +124,7 @@ class BrowserModule(PgAdminModule):
             'name': 'jquery.acifragment',
             'path': url_for(
                 'browser.static',
-                filename='js/aciTree/jquery.aciFragment.min'
+                filename='vendor/aciTree/jquery.aciFragment.min'
             ),
             'deps': ['jquery', 'jquery.aciplugin'],
             'exports': 'aciPluginClass.plugins.aciFragment',
@@ -135,8 +135,8 @@ class BrowserModule(PgAdminModule):
             'name': 'wcdocker',
             'path': url_for(
                 'static',
-                filename='js/wcDocker/wcDocker' if current_app.debug
-                else 'js/wcDocker/wcDocker.min'
+                filename='vendor/wcDocker/wcDocker' if current_app.debug
+                else 'vendor/wcDocker/wcDocker.min'
             ),
             'deps': ['jquery.contextmenu'],
             'exports': '',

web/pgadmin/browser/server_groups/servers/templates/css/servers.css

@@ -12,7 +12,7 @@
 }
 
 .icon-server-connecting {
-  background-image: url('{{ url_for('browser.static', filename='css/aciTree/image/load-node.gif')}}') !important;
+  background-image: url('{{ url_for('browser.static', filename='vendor/aciTree/image/load-node.gif')}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;

web/pgadmin/browser/static/vendor/aciTree/jquery.aciFragment.min.js

@@ -1,15 +1,15 @@
-
-/*
- * aciFragment jQuery Plugin v1.1.0
- * http://acoderinsights.ro
- *
- * Copyright (c) 2013 Dragos Ursu
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Require jQuery Library >= v1.7.1 http://jquery.com
- * + aciPlugin >= v1.1.1 https://github.com/dragosu/jquery-aciPlugin
- *
- * Date: Apr Fri 26 18:00 2013 +0200
- */
-
-(function(e,t,n){var r={anchor:"anchor",poolDelay:250,scroll:{duration:"medium",easing:"linear"}};var i={__extend:function(){e.extend(this._instance,{lastHash:null,lastParsed:null,parsed:{},anchor:true,timeOut:null,"native":"onhashchange"in t&&(t.document.documentMode===n||t.document.documentMode>7)})},init:function(){var n=this;if(this.wasInit()){return}if(this._instance.native){e(t).bind("hashchange"+this._instance.nameSpace,function(){n._trigger()})}else{this._change()}this._instance.anchor=true;this._trigger();this._super()},_trigger:function(){this._instance.jQuery.trigger("acifragment",[this,this._instance.anchor]);this._instance.anchor=false},_change:function(){var e=this;var n=t.location.hash;if(n!=this._instance.lastHash){this._trigger();this._instance.lastHash=n}this._instance.timeOut=t.setTimeout(function(){e._change()},this._instance.options.poolDelay)},scroll:function(){var n=this.get(this._instance.options.anchor);if(n&&n.length){var r=e("#"+n+":first");if(!r.length){r=e('[name="'+n+'"]:first')}if(r.length){var i=r.get(0).getBoundingClientRect();var s=e(t).scrollLeft()+i.left,o=e(t).scrollTop()+i.top;if(this._instance.options.scroll){e("html,body").stop(true).animate({scrollLeft:s,scrollTop:o},this._instance.options.scroll)}else{t.scrollTo(s,o)}}}},click:function(e,t){var n=e.attr("href");if(n){var r=this.parse(n);this.update(r);if(t&&this.hasAnchor(r)){this.scroll()}}},parse:function(e){var n=e.indexOf("#"),r={};if(n!=-1){e=e.substr(n+1);var i=e.split("&"),s;for(var o in i){s=i[o].split("=");if(s.length>1){r[t.decodeURIComponent(s[0])]=t.decodeURIComponent(s[1])}else{r[this._instance.options.anchor]=t.decodeURIComponent(s[0])}}}return r},hasAnchor:function(e){return e[this._instance.options.anchor]&&e[this._instance.options.anchor].length>0},setAnchor:function(e){this.set(this._instance.options.anchor,e)},getAnchor:function(e){return this.get(this._instance.options.anchor,e)},parseHash:function(){var e=t.location.hash;if(e==this._instance.lastParsed){return this._instance.parsed}var n=this.parse(e);this._instance.parsed=n;this._instance.lastParsed=e;return n},get:function(e,r){var i=this.parseHash();if(i[e]!==null&&i[e]!==n&&t.String(i[e]).length){return i[e]}else{return r}},replace:function(e,r){var i=[];for(var s in e){if(e[s]!==null&&e[s]!==n&&t.String(e[s]).length){i[i.length]=t.encodeURIComponent(s)+"="+t.encodeURIComponent(e[s])}}if(!r&&this.hasAnchor(e)){this._instance.anchor=true}var o=t.location.hash;if(i.length){t.location.hash="#"+i.join("&")}else if(t.history&&t.history.pushState){t.history.pushState("",t.document.title,t.location.pathname+t.location.search)}else{t.location.hash=""}if(t.location.hash==o){this._trigger()}},update:function(e){var t=this.parseHash();for(var n in e){t[n]=e[n]}if(this.hasAnchor(e)){this._instance.anchor=true}this.replace(t,true)},set:function(e,t){var n=this.parseHash();n[e]=t;if(e==this._instance.options.anchor){this._instance.anchor=true}this.replace(n,true)},destroy:function(){if(!this.wasInit()){return}if(this._instance.native){e(t).unbind(this._instance.nameSpace)}t.clearTimeout(this._instance.timeOut);this._super()}};aciPluginClass.plugins.aciFragment=aciPluginClass.aciPluginUi.extend(i,"aciFragment");aciPluginClass.publish("aciFragment",r)})(jQuery,this);
+
+/*
+ * aciFragment jQuery Plugin v1.1.0
+ * http://acoderinsights.ro
+ *
+ * Copyright (c) 2013 Dragos Ursu
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Require jQuery Library >= v1.7.1 http://jquery.com
+ * + aciPlugin >= v1.1.1 https://github.com/dragosu/jquery-aciPlugin
+ *
+ * Date: Apr Fri 26 18:00 2013 +0200
+ */
+
+(function(e,t,n){var r={anchor:"anchor",poolDelay:250,scroll:{duration:"medium",easing:"linear"}};var i={__extend:function(){e.extend(this._instance,{lastHash:null,lastParsed:null,parsed:{},anchor:true,timeOut:null,"native":"onhashchange"in t&&(t.document.documentMode===n||t.document.documentMode>7)})},init:function(){var n=this;if(this.wasInit()){return}if(this._instance.native){e(t).bind("hashchange"+this._instance.nameSpace,function(){n._trigger()})}else{this._change()}this._instance.anchor=true;this._trigger();this._super()},_trigger:function(){this._instance.jQuery.trigger("acifragment",[this,this._instance.anchor]);this._instance.anchor=false},_change:function(){var e=this;var n=t.location.hash;if(n!=this._instance.lastHash){this._trigger();this._instance.lastHash=n}this._instance.timeOut=t.setTimeout(function(){e._change()},this._instance.options.poolDelay)},scroll:function(){var n=this.get(this._instance.options.anchor);if(n&&n.length){var r=e("#"+n+":first");if(!r.length){r=e('[name="'+n+'"]:first')}if(r.length){var i=r.get(0).getBoundingClientRect();var s=e(t).scrollLeft()+i.left,o=e(t).scrollTop()+i.top;if(this._instance.options.scroll){e("html,body").stop(true).animate({scrollLeft:s,scrollTop:o},this._instance.options.scroll)}else{t.scrollTo(s,o)}}}},click:function(e,t){var n=e.attr("href");if(n){var r=this.parse(n);this.update(r);if(t&&this.hasAnchor(r)){this.scroll()}}},parse:function(e){var n=e.indexOf("#"),r={};if(n!=-1){e=e.substr(n+1);var i=e.split("&"),s;for(var o in i){s=i[o].split("=");if(s.length>1){r[t.decodeURIComponent(s[0])]=t.decodeURIComponent(s[1])}else{r[this._instance.options.anchor]=t.decodeURIComponent(s[0])}}}return r},hasAnchor:function(e){return e[this._instance.options.anchor]&&e[this._instance.options.anchor].length>0},setAnchor:function(e){this.set(this._instance.options.anchor,e)},getAnchor:function(e){return this.get(this._instance.options.anchor,e)},parseHash:function(){var e=t.location.hash;if(e==this._instance.lastParsed){return this._instance.parsed}var n=this.parse(e);this._instance.parsed=n;this._instance.lastParsed=e;return n},get:function(e,r){var i=this.parseHash();if(i[e]!==null&&i[e]!==n&&t.String(i[e]).length){return i[e]}else{return r}},replace:function(e,r){var i=[];for(var s in e){if(e[s]!==null&&e[s]!==n&&t.String(e[s]).length){i[i.length]=t.encodeURIComponent(s)+"="+t.encodeURIComponent(e[s])}}if(!r&&this.hasAnchor(e)){this._instance.anchor=true}var o=t.location.hash;if(i.length){t.location.hash="#"+i.join("&")}else if(t.history&&t.history.pushState){t.history.pushState("",t.document.title,t.location.pathname+t.location.search)}else{t.location.hash=""}if(t.location.hash==o){this._trigger()}},update:function(e){var t=this.parseHash();for(var n in e){t[n]=e[n]}if(this.hasAnchor(e)){this._instance.anchor=true}this.replace(t,true)},set:function(e,t){var n=this.parseHash();n[e]=t;if(e==this._instance.options.anchor){this._instance.anchor=true}this.replace(n,true)},destroy:function(){if(!this.wasInit()){return}if(this._instance.native){e(t).unbind(this._instance.nameSpace)}t.clearTimeout(this._instance.timeOut);this._super()}};aciPluginClass.plugins.aciFragment=aciPluginClass.aciPluginUi.extend(i,"aciFragment");aciPluginClass.publish("aciFragment",r)})(jQuery,this);

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

@@ -327,8 +327,8 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) {
         '#dockerContainer', {
         allowContextMenu: true,
         allowCollapse: false,
-        themePath: '../static/css/wcDocker/Themes',
-        theme: 'pgadmin'
+        themePath: '../static/css/',
+        theme: 'webcabin.overrides.css'
       });
       if (obj.docker) {
         // Initialize all the panels

web/pgadmin/misc/file_manager/__init__.py

@@ -130,7 +130,7 @@ class FileManagerModule(PgAdminModule):
 
     def get_own_stylesheets(self):
         return [
-            url_for('static', filename='css/jquery.dropzone/dropzone.css'),
+            url_for('static', filename='vendor/jquery.dropzone/dropzone.css'),
             url_for('file_manager.static', filename='css/file_manager.css')
         ]
 

web/pgadmin/misc/file_manager/templates/file_manager/index.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.dropzone/dropzone.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='vendor/jquery.dropzone/dropzone.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('file_manager.index') }}utility.js"></script>
 </head>
 <body>
@@ -33,7 +33,7 @@
     </div>
     <div class="fileinfo">
     <span class="activity">
-      <img src="{{ url_for('browser.static', filename='css/aciTree/image/load-root.gif') }}">
+      <img src="{{ url_for('browser.static', filename='vendor/aciTree/image/load-root.gif') }}">
     </span>
         <div class="file_listing"></div>
         <div class="upload_file dropzone"></div>

web/pgadmin/static/js/npm.js

@@ -1,13 +0,0 @@
-// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
-require('../../js/transition.js')
-require('../../js/alert.js')
-require('../../js/button.js')
-require('../../js/carousel.js')
-require('../../js/collapse.js')
-require('../../js/dropdown.js')
-require('../../js/modal.js')
-require('../../js/tooltip.js')
-require('../../js/popover.js')
-require('../../js/scrollspy.js')
-require('../../js/tab.js')
-require('../../js/affix.js')