Update to use Bootstrap 3 instead of Bootstrap 4. Fixes #3562

This commit is contained in:
Aditya Toshniwal
2018-10-10 12:43:26 +01:00
committed by Dave Page
parent bdf90e67a7
commit 0565f8dd78
82 changed files with 2559 additions and 2486 deletions

View File

@@ -197,12 +197,12 @@ define('pgadmin.node.fts_configuration', [
'<div class="subnode-header-form">',
' <div class="container-fluid">',
' <div class="row">',
' <div class="col-xs-3">',
' <div class="col-3">',
' <label class="control-label"><%-token_label%></label>',
' </div>',
' <div class="col-xs-6" header="token"></div>',
' <div class="col-xs-2">',
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' <div class="col-6" header="token"></div>',
' <div class="col-2">',
' <button class="btn btn-sm-sq btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' </div>',
' </div>',
' </div>',
@@ -257,7 +257,7 @@ define('pgadmin.node.fts_configuration', [
var self = this,
titleTmpl = _.template('<div class=\'subnode-header\'></div>'),
$gridBody = $('<div></div>', {
class:'pgadmin-control-group backgrid form-group col-xs-12 object subnode',
class:'pgadmin-control-group backgrid form-group col-12 object subnode',
}).append(
titleTmpl({label: data.label})
);

View File

@@ -64,7 +64,7 @@ define('pgadmin.node.schema', [
'<div class="subnode-header">',
' <label class="control-label col-sm-4"><%-label%></label>',
'</div>'].join('\n')),
gridBody = $('<div class="pgadmin-control-group backgrid form-group col-xs-12 object subnode"></div>').append(
gridBody = $('<div class="pgadmin-control-group backgrid form-group col-12 object subnode"></div>').append(
gridHeader(attributes)
);

View File

@@ -391,12 +391,12 @@ define('pgadmin.node.exclusion_constraint', [
'<div class="subnode-header-form">',
' <div class="container-fluid">',
' <div class="row">',
' <div class="col-xs-4">',
' <div class="col-4">',
' <label class="control-label"><%-column_label%></label>',
' </div>',
' <div class="col-xs-4" header="column"></div>',
' <div class="col-xs-4">',
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' <div class="col-4" header="column"></div>',
' <div class="col-4">',
' <button class="btn btn-sm-sq btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' </div>',
' </div>',
' </div>',
@@ -443,7 +443,7 @@ define('pgadmin.node.exclusion_constraint', [
var self = this,
titleTmpl = _.template('<div class=\'subnode-header\'></div>'),
$gridBody =
$('<div class=\'pgadmin-control-group backgrid form-group col-xs-12 object subnode\'></div>').append(
$('<div class=\'pgadmin-control-group backgrid form-group col-12 object subnode\'></div>').append(
// Append titleTmpl only if create/edit mode
data.mode !== 'properties' ? titleTmpl({label: data.label}) : ''
);

View File

@@ -309,7 +309,7 @@ define('pgadmin.node.foreign_key', [
' </div>',
' <div class="col-md-6" header="local_column"></div>',
' <div class="col-md-2">',
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' <button class="btn btn-sm-sq btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' </div>',
' </div>',
' <div class="row">',
@@ -374,7 +374,7 @@ define('pgadmin.node.foreign_key', [
'<label class=\'control-label\'><%-label%></label>',
'</div>'].join('\n')),
$gridBody =
$('<div class=\'pgadmin-control-group backgrid form-group col-xs-12 object subnode\'></div>').append(
$('<div class=\'pgadmin-control-group backgrid form-group col-12 object subnode\'></div>').append(
// Append titleTmpl only if create/edit mode
data.mode !== 'properties' ? titleTmpl({label: data.label}) : ''
);

View File

@@ -25,7 +25,7 @@ define('pgadmin.node.trigger', [
' <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
'<% } %>',
].join('\n')),
className: 'pgadmin-control-group form-group col-xs-6',
className: 'pgadmin-control-group form-group col-6',
});
if (!pgBrowser.Nodes['coll-trigger']) {

View File

@@ -343,7 +343,7 @@ define('pgadmin.node.pga_schedule', [
);
this.$el.prepend(
'<div class="set-group pg-el-xs-12 ' +
'<div class="set-group c ' +
Backform.helpMessageClassName + '">' +
gettext('Schedules are specified using a <b>cron-style</b> format.<br/><ul><li>For each selected time or date element, the schedule will execute.<br/>e.g. To execute at 5 minutes past every hour, simply select 05 in the Minutes list box.<br/></li><li>Values from more than one field may be specified in order to further control the schedule.<br/>e.g. To execute at 12:05 and 14:05 every Monday and Thursday, you would click minute 05, hours 12 and 14, and weekdays Monday and Thursday.</li><li>For additional flexibility, the Month Days check list includes an extra Last Day option. This matches the last day of the month, whether it happens to be the 28th, 29th, 30th or 31st.</li></ul>') +
'</div>'

View File

@@ -25,6 +25,6 @@
margin: 5px;
}
div[role=tabpanel] > .pgadmin-control-group.form-group.pg-el-xs-12.jscexceptions {
div[role=tabpanel] > .pgadmin-control-group.form-group.c.jscexceptions {
min-height: 400px;
}

View File

@@ -66,8 +66,8 @@ define('pgadmin.node.role', [
var RoleCustomSwitchControl = Backform.SwitchControl.extend({
template: _.template([
'<label class="control-label pg-el-sm-9 pg-el-xs-12"><%=label%></label>',
'<div class="pgadmin-controls pg-el-sm-3 pg-el-xs-12">',
'<label class="control-label"><%=label%></label>',
'<div class="pgadmin-controls">',
' <div class="checkbox" style="float:right">',
' <label>',
' <input type="checkbox" class="<%=extraClasses.join(\' \')%>" name="<%=name%>" <%=value ? "checked=\'checked\'" : ""%> <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
@@ -82,7 +82,7 @@ define('pgadmin.node.role', [
var RoleMembersControl = Backform.Control.extend({
defaults: _.defaults(
{extraClasses: ['col-xs-12 col-sm-12 col-md-12']},
{extraClasses: ['col-12 col-sm-12 col-md-12']},
Backform.NodeListByNameControl.prototype.defaults
),
initialize: function() {

View File

@@ -0,0 +1,8 @@
.icon-server-connecting {
background-image: url('~top/static/img/load-node.gif') !important;
background-repeat: no-repeat;
background-size: 20px !important;
align-content: center;
vertical-align: middle;
height: 1.3em;
}

View File

@@ -328,10 +328,10 @@ define([
titleTmpl = _.template([
'<div class=\'subnode-header\'>',
'<label class=\'control-label\'><%-label%></label>',
'<button class=\'btn-sm btn-default add fa fa-plus\' title=\'' + _('Add new row') + '\' <%=canAdd ? \'\' : \'disabled="disabled"\'%>></button>',
'<button class=\'btn btn-sm-sq btn-default add fa fa-plus\' title=\'' + _('Add new row') + '\' <%=canAdd ? \'\' : \'disabled="disabled"\'%>></button>',
'</div>'].join('\n')),
$gridBody =
$('<div class=\'pgadmin-control-group backgrid form-group col-xs-12 object subnode\'></div>').append(
$('<div class=\'pgadmin-control-group backgrid form-group col-12 object subnode\'></div>').append(
titleTmpl(data)
);

View File

@@ -16,15 +16,6 @@
height: 1.3em;
}
.icon-server-connecting {
background-image: url('{{ url_for('static', filename='js/generated/img/load-node.gif')}}') !important;
background-repeat: no-repeat;
background-size: 20px !important;
align-content: center;
vertical-align: middle;
height: 1.3em;
}
.change_password {
padding-left: 7px;
}