',
+ ' <%=required ? "required" : ""%> />',
+ ' <% if (helpMessage && helpMessage.length) { %>',
+ ' <%=helpMessage%>',
+ ' <% } %>',
+ '
'
+ ].join("\n")),
+ render: function() {
+ // Clear first
+ if(this.$picker && this.$picker.hasOwnProperty('destroy')) {
+ this.$picker('destroy');
+ }
+
+ var field = _.defaults(this.field.toJSON(), this.defaults),
+ attributes = this.model.toJSON(),
+ attrArr = field.name.split('.'),
+ name = attrArr.shift(),
+ path = attrArr.join('.'),
+ rawValue = this.keyPathAccessor(attributes[name], path),
+ data = _.extend(field, {
+ rawValue: rawValue,
+ value: this.formatter.fromRaw(rawValue, this.model),
+ attributes: attributes,
+ formatter: this.formatter
+ }),
+ evalF = function(f, d, m) {
+ return (_.isFunction(f) ? !!f.apply(d, [m]) : !!f);
+ };
+
+ // Evaluate the disabled, visible, and required option
+ _.extend(data, {
+ disabled: evalF(data.disabled, data, this.model),
+ visible: evalF(data.visible, data, this.model),
+ required: evalF(data.required, data, this.model)
+ });
+
+ // Clean up first
+ this.$el.empty();
+
+ if (!data.visible)
+ this.$el.addClass(Backform.hiddenClassname);
+
+ this.$el.html(this.template(data)).addClass(field.name);
+
+ // Creating default Color picker
+ this.$picker = this.$el.find("input").spectrum({
+ allowEmpty: data.allowEmpty,
+ preferredFormat: data.colorFormat,
+ disabled: data.disabled,
+ hideAfterPaletteSelect:true,
+ clickoutFiresChange: true,
+ showButtons: data.showButtons,
+ showPaletteOnly: data.showPalette,
+ togglePaletteOnly: data.showPalette,
+ togglePaletteMoreText: gettext('More'),
+ togglePaletteLessText: gettext('Less'),
+ color: data.value || data.defaultColor,
+ // Predefined palette colors
+ palette: [
+ ["#000","#444","#666","#999","#ccc","#eee","#f3f3f3","#fff"],
+ ["#f00","#f90","#ff0","#0f0","#0ff","#00f","#90f","#f0f"],
+ ["#f4cccc","#fce5cd","#fff2cc","#d9ead3","#d0e0e3","#cfe2f3","#d9d2e9","#ead1dc"],
+ ["#ea9999","#f9cb9c","#ffe599","#b6d7a8","#a2c4c9","#9fc5e8","#b4a7d6","#d5a6bd"],
+ ["#e06666","#f6b26b","#ffd966","#93c47d","#76a5af","#6fa8dc","#8e7cc3","#c27ba0"],
+ ["#c00","#e69138","#f1c232","#6aa84f","#45818e","#3d85c6","#674ea7","#a64d79"],
+ ["#900","#b45f06","#bf9000","#38761d","#134f5c","#0b5394","#351c75","#741b47"],
+ ["#600","#783f04","#7f6000","#274e13","#0c343d","#073763","#20124d","#4c1130"]
+ ]
+
+ });
+ this.updateInvalid();
+ return this;
+ }
+ });
+
return Backform;
}));
diff --git a/web/pgadmin/tools/datagrid/__init__.py b/web/pgadmin/tools/datagrid/__init__.py
index ba58009d2..c37e5d381 100644
--- a/web/pgadmin/tools/datagrid/__init__.py
+++ b/web/pgadmin/tools/datagrid/__init__.py
@@ -26,7 +26,7 @@ from pgadmin.utils.ajax import make_json_response, bad_request, \
from config import PG_DEFAULT_DRIVER
from pgadmin.utils.preferences import Preferences
-
+from pgadmin.model import Server
class DataGridModule(PgAdminModule):
"""
@@ -216,6 +216,23 @@ def panel(trans_id, is_query_tool, editor_title):
else:
new_browser_tab = 'false'
+ # Fetch the server details
+ #
+ bgcolor = None
+ fgcolor = None
+ if str(trans_id) in session['gridData']:
+ # Fetch the object for the specified transaction id.
+ # Use pickle.loads function to get the command object
+ session_obj = session['gridData'][str(trans_id)]
+ trans_obj = pickle.loads(session_obj['command_obj'])
+ s = Server.query.filter_by(id=trans_obj.sid).first()
+ if s and s.bgcolor:
+ # If background is set to white means we do not have to change the
+ # title background else change it as per user specified background
+ if s.bgcolor != '#ffffff':
+ bgcolor = s.bgcolor
+ fgcolor = s.fgcolor or 'black'
+
return render_template(
"datagrid/index.html", _=gettext, uniqueId=trans_id,
is_query_tool=is_query_tool,
@@ -224,7 +241,9 @@ def panel(trans_id, is_query_tool, editor_title):
is_linux=is_linux_platform,
is_new_browser_tab=new_browser_tab,
server_type=server_type,
- client_platform=user_agent.platform
+ client_platform=user_agent.platform,
+ bgcolor=bgcolor,
+ fgcolor=fgcolor
)
diff --git a/web/pgadmin/tools/datagrid/templates/datagrid/index.html b/web/pgadmin/tools/datagrid/templates/datagrid/index.html
index 85055503b..05e0986d4 100644
--- a/web/pgadmin/tools/datagrid/templates/datagrid/index.html
+++ b/web/pgadmin/tools/datagrid/templates/datagrid/index.html
@@ -284,7 +284,7 @@
-
Filter
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 320cb67d9..8a8cb5e4c 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -34,9 +34,7 @@
}
.editor-title {
- background-color: #2C76B4;
padding: 4px 5px;
- color: white;
font-size: 13px;
}
diff --git a/web/webpack.shim.js b/web/webpack.shim.js
index 1f5b90ef1..4963aab92 100644
--- a/web/webpack.shim.js
+++ b/web/webpack.shim.js
@@ -111,6 +111,10 @@ var webpackShimConfig = {
'pgadmin.browser.messages': {
'deps': ['pgadmin.browser.datamodel'],
},
+ 'spectrum': {
+ 'deps': ['jquery'],
+ 'exports': '$.fn.spectrum',
+ },
},
// Map module id to file path used in 'define(['baseurl', 'misc']). It is
@@ -138,6 +142,7 @@ var webpackShimConfig = {
'dropzone': path.join(__dirname, './node_modules/dropzone/dist/dropzone'),
'bignumber': path.join(__dirname, './node_modules/bignumber.js/bignumber'),
'snap.svg': path.join(__dirname, './node_modules/snapsvg/dist/snap.svg'),
+ 'spectrum': path.join(__dirname, './node_modules/spectrum-colorpicker/spectrum'),
// AciTree
'jquery.acitree': path.join(__dirname, './node_modules/acitree/js/jquery.aciTree.min'),
diff --git a/web/yarn.lock b/web/yarn.lock
index 12762d5cb..9d135638f 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -6580,6 +6580,10 @@ spdx-license-ids@^1.0.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spectrum-colorpicker@^1.8.0:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/spectrum-colorpicker/-/spectrum-colorpicker-1.8.0.tgz#b926cf5002c0a77860b5f8351e1c093c65200107"
+
sprintf-js@^1.0.3:
version "1.1.1"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"