mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Additional Bootstrap 4 fixes:
- Calendar control - Query Tool's Sort/Filter drop down - Backform hidden controls - Debugger toolbar
This commit is contained in:
Aditya Toshniwal
committed by
Dave Page
Dave Page
parent
3f16a0c52c
commit
6991c06937
@@ -132,7 +132,7 @@ define('pgadmin.browser', [
|
||||
isCloseable: false,
|
||||
isPrivate: true,
|
||||
elContainer: true,
|
||||
content: '<div class="obj_properties"><div class="alert alert-info pg-panel-message">' + select_object_msg + '</div></div>',
|
||||
content: '<div class="obj_properties container-fluid"><div class="alert alert-info pg-panel-message">' + select_object_msg + '</div></div>',
|
||||
events: panelEvents,
|
||||
onCreate: function(myPanel, $container) {
|
||||
$container.addClass('pg-no-overflow');
|
||||
|
||||
@@ -395,7 +395,7 @@ define('pgadmin.browser.node', [
|
||||
success: function() {
|
||||
// Clear timeout and remove message
|
||||
clearTimeout(timer);
|
||||
$msgDiv.addClass('hidden');
|
||||
$msgDiv.addClass('d-none');
|
||||
|
||||
// We got the latest attributes of the object. Render the view
|
||||
// now.
|
||||
@@ -479,7 +479,7 @@ define('pgadmin.browser.node', [
|
||||
isCloseable: true,
|
||||
isPrivate: true,
|
||||
elContainer: true,
|
||||
content: '<div class="obj_properties"><div class="alert alert-info pg-panel-message">' + gettext('Please wait while we fetch information about the node from the server...') + '</div></div>',
|
||||
content: '<div class="obj_properties container-fluid"><div class="alert alert-info pg-panel-message">' + gettext('Please wait while we fetch information about the node from the server...') + '</div></div>',
|
||||
onCreate: function(myPanel, $container) {
|
||||
$container.addClass('pg-no-overflow');
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
@import '~alertifyjs/build/css/themes/bootstrap.css';
|
||||
@import '~font-awesome/css/font-awesome.css';
|
||||
@import '~bootstrap-datepicker/dist/css/bootstrap-datepicker3.css';
|
||||
@import '~eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css';
|
||||
@import '~tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css';
|
||||
@import '~bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css';
|
||||
@import '~backgrid-select-all/backgrid-select-all.css';
|
||||
@import '~backgrid-filter/backgrid-filter.css';
|
||||
|
||||
@@ -28,6 +28,7 @@ define([
|
||||
setGroupClassName: 'set-group pg-el-xs-12',
|
||||
tabClassName: 'backform-tab pg-el-xs-12',
|
||||
setGroupContentClassName: 'fieldset-content pg-el-xs-12',
|
||||
hiddenClassName: 'd-none',
|
||||
});
|
||||
|
||||
Backform.controlMapper = {
|
||||
@@ -2340,13 +2341,19 @@ define([
|
||||
label: '',
|
||||
options: {
|
||||
format: 'YYYY-MM-DD HH:mm:ss Z',
|
||||
showClear: true,
|
||||
showTodayButton: true,
|
||||
icons: {
|
||||
clear: 'fa fa-trash',
|
||||
},
|
||||
buttons: {
|
||||
showClear: true,
|
||||
showToday: true,
|
||||
},
|
||||
toolbarPlacement: 'top',
|
||||
widgetPositioning: {
|
||||
horizontal: 'auto',
|
||||
vertical: 'bottom',
|
||||
},
|
||||
keepOpen: false,
|
||||
},
|
||||
placeholder: 'YYYY-MM-DD HH:mm:ss Z',
|
||||
extraClasses: [],
|
||||
@@ -2362,16 +2369,16 @@ define([
|
||||
},
|
||||
openPicker: function() {
|
||||
if (this.has_datepicker) {
|
||||
this.$el.find('input').datetimepicker('show');
|
||||
this.$el.find('input').datetimepicker('toggle');
|
||||
}
|
||||
},
|
||||
template: _.template([
|
||||
'<label class="<%=Backform.controlLabelClassName%>"><%=label%></label>',
|
||||
'<div class="input-group <%=Backform.controlsClassName%>">',
|
||||
' <input type="text" class="<%=Backform.controlClassName%> <%=extraClasses.join(\' \')%>" name="<%=name%>" value="<%-value%>" placeholder="<%-placeholder%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />',
|
||||
' <span class="input-group-addon">',
|
||||
' <span class="fa fa-calendar"></span>',
|
||||
' </span>',
|
||||
' <input type="text" class="<%=Backform.controlClassName%> datetimepicker-input <%=extraClasses.join(\' \')%>" name="<%=name%>" value="<%-value%>" placeholder="<%-placeholder%>" <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> data-toggle="datetimepicker"/>',
|
||||
' <div class="input-group-append">',
|
||||
' <span class="input-group-text fa fa-calendar"></span>',
|
||||
' </div>',
|
||||
'</div>',
|
||||
'<% if (helpMessage && helpMessage.length) { %>',
|
||||
' <div class="<%=Backform.controlsClassName%>">',
|
||||
@@ -2464,7 +2471,6 @@ define([
|
||||
);
|
||||
}
|
||||
this.updateInvalid();
|
||||
|
||||
return this;
|
||||
},
|
||||
clearInvalid: function() {
|
||||
|
||||
@@ -1348,9 +1348,15 @@ define([
|
||||
},
|
||||
options = _.extend({
|
||||
format: 'YYYY-MM-DD HH:mm:ss Z',
|
||||
showClear: true,
|
||||
showTodayButton: true,
|
||||
icons: {
|
||||
clear: 'fa fa-trash',
|
||||
},
|
||||
buttons: {
|
||||
showClear: true,
|
||||
showToday: true,
|
||||
},
|
||||
toolbarPlacement: 'top',
|
||||
keepOpen: false,
|
||||
}, evalF(this.column.get('options')), {
|
||||
keyBinds: {
|
||||
'shift tab': function(widget) {
|
||||
|
||||
@@ -250,3 +250,8 @@ td.switch-cell > div.bootstrap-switch {
|
||||
background-color: $input-disabled-bg !important;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
|
||||
.btn-toolbar {
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
@@ -935,6 +935,7 @@ lgg-el-container[el=md] .pg-el-lg-8,
|
||||
}
|
||||
|
||||
.pg-prop-btn-group {
|
||||
min-width: 100%;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
padding: 2px;
|
||||
@@ -1051,6 +1052,7 @@ lgg-el-container[el=md] .pg-el-lg-8,
|
||||
.obj_properties .backform-tab > .tab-content {
|
||||
padding: 0px;
|
||||
overflow-y: auto;
|
||||
min-height: 100%;
|
||||
max-height: 100%;
|
||||
}
|
||||
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
tabindex="0" disabled>
|
||||
<i class="fa fa-filter" aria-hidden="true"></i>
|
||||
</button>
|
||||
<button id="btn-filter-dropdown" type="button" class="btn btn-default dropdown-toggle"
|
||||
<button id="btn-filter-dropdown" type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split"
|
||||
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
|
||||
title=""
|
||||
accesskey=""
|
||||
@@ -195,10 +195,16 @@
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li>
|
||||
<a id="btn-filter-menu" href="#" tabindex="0">{{ _('Sort/Filter') }}</a>
|
||||
<a id="btn-include-filter" href="#" tabindex="0">{{ _('Filter by Selection') }}</a>
|
||||
<a id="btn-exclude-filter" href="#" tabindex="0">{{ _('Exclude by Selection') }}</a>
|
||||
<a id="btn-remove-filter" href="#" tabindex="0">{{ _('Remove Sort/Filter') }}</a>
|
||||
<a id="btn-filter-menu" class="dropdown-item" href="#" tabindex="0">{{ _('Sort/Filter') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="btn-include-filter" class="dropdown-item" href="#" tabindex="0">{{ _('Filter by Selection') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="btn-exclude-filter" class="dropdown-item" href="#" tabindex="0">{{ _('Exclude by Selection') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="btn-remove-filter" class="dropdown-item" href="#" tabindex="0">{{ _('Remove Sort/Filter') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -36,8 +36,8 @@ try {
|
||||
</style>
|
||||
{% endif %}
|
||||
<div class="debugger_main_container" tabindex="0">
|
||||
<nav class="navbar-inverse navbar-fixed-top">
|
||||
<div id="btn-toolbar" class="btn-toolbar pg-prop-btn-group bg-gray-lighter border-gray-light" role="toolbar" aria-label="">
|
||||
<nav class="navbar navbar-expand-lg fixed-top">
|
||||
<div id="btn-toolbar" class="pg-prop-btn-group bg-gray-lighter border-gray-light" role="toolbar" aria-label="">
|
||||
<div class="btn-group" role="group" aria-label="">
|
||||
<button type="button" class="btn btn-default btn-step-into" id="btn-step-into"
|
||||
title=""
|
||||
|
||||
Reference in New Issue
Block a user