IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/tools/backup/__init__.py
View File

@@ -158,7 +158,7 @@ class BackupMessage(IProcessDesc):
def details(self, cmd, args):
name, host, port = self.get_server_details()
res = '<div class="h5">'
res = '<div>'
if self.backup_type == BACKUP.OBJECT:
res += _(
@@ -193,7 +193,7 @@ class BackupMessage(IProcessDesc):
# It should never reach here.
res += "Backup"
res += '</div><div class="h5">'
res += '</div><div>'
res += _("Running command:")
res += '</b><br><span class="pg-bg-cmd enable-selection">'
res += html.safe_str(cmd + self.cmd)

8
web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js
View File

@@ -29,8 +29,8 @@ export class BackupDialogWrapper extends DialogWrapper {
setup() {
return {
buttons: [{
text: '',
className: 'btn btn-default pull-left fa fa-lg fa-info',
text: '<span class="fa fa-lg fa-info"></span>',
className: 'btn btn-default pull-left',
attrs: {
name: 'object_help',
type: 'button',
@@ -38,9 +38,9 @@ export class BackupDialogWrapper extends DialogWrapper {
label: gettext('Backup'),
},
}, {
text: '',
text: '<span class="fa fa-lg fa-question"></span>',
key: 112,
className: 'btn btn-default pull-left fa fa-lg fa-question',
className: 'btn btn-default pull-left',
attrs: {
name: 'dialog_help',
type: 'button',

76
web/pgadmin/tools/datagrid/templates/datagrid/index.html
View File

@@ -12,7 +12,7 @@
{% endif %}
</style>
<div id="main-editor_panel">
<div id="fetching_data" class="wcLoadingIconContainer sql-editor-busy-fetching hide">
<div id="fetching_data" class="wcLoadingIconContainer sql-editor-busy-fetching d-none">
<div class="wcLoadingBackground"></div>
<span class="sql-editor-busy-icon wcLoadingIcon fa fa-spinner fa-pulse"></span>
<span class="sql-editor-busy-text wcLoadingLabel"></span>
@@ -32,19 +32,19 @@
disabled>
<i class="fa fa-floppy-o" aria-hidden="true" tabindex="0"></i>
</button>
<button id="btn-file-menu-dropdown" type="button" class="btn btn-default dropdown-toggle"
<button id="btn-file-menu-dropdown" type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" disabled
tabindex="0">
<span class="caret"></span> <span class="sr-only">{{ _('Toggle Dropdown') }}</span>
</button>
<ul class="dropdown-menu">
<li>
<a id="btn-file-menu-save" href="#" tabindex="0">
<a class="dropdown-item" id="btn-file-menu-save" href="#" tabindex="0">
<span>{{ _('Save') }}</span>
</a>
</li>
<li>
<a id="btn-file-menu-save-as" href="#" tabindex="0">
<a class="dropdown-item" id="btn-file-menu-save-as" href="#" tabindex="0">
<span>{{ _('Save As') }}</span>
</a>
</li>
@@ -54,7 +54,7 @@
<button id="btn-find" type="button" class="btn btn-default" title="{{ _('Find (Ctrl/Cmd+F)') }}">
<i class="fa fa-search" aria-hidden="true" tabindex="0"></i>
</button>
<button id="btn-find-menu-dropdown" type="button" class="btn btn-default dropdown-toggle"
<button id="btn-find-menu-dropdown" type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
title=""
accesskey=""
@@ -63,7 +63,7 @@
</button>
<ul class="dropdown-menu">
<li>
<a id="btn-find-menu-find" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-find" href="#" tabindex="0">
<span> {{ _('Find') }}{% if client_platform == 'macos' -%}
{{ _(' (Cmd+F)') }}
{% else %}
@@ -71,7 +71,7 @@
</a>
</li>
<li>
<a id="btn-find-menu-find-next" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-find-next" href="#" tabindex="0">
<span> {{ _('Find Next') }}{% if client_platform == 'macos' -%}
{{ _(' (Cmd+G)') }}
{% else %}
@@ -79,7 +79,7 @@
</a>
</li>
<li>
<a id="btn-find-menu-find-previous" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-find-previous" href="#" tabindex="0">
<span> {{ _('Find Previous') }}{% if client_platform == 'macos' -%}
{{ _(' (Cmd+Shift+G)') }}
{% else %}
@@ -87,13 +87,13 @@
</a>
</li>
<li>
<a id="btn-find-menu-find-persistent" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-find-persistent" href="#" tabindex="0">
<span>{{ _('Persistent Find') }}</span>
</a>
</li>
<li class="divider"></li>
<li class="dropdown-divider"></li>
<li>
<a id="btn-find-menu-replace" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-replace" href="#" tabindex="0">
<span> {{ _('Replace') }}{% if client_platform == 'macos' -%}
{{ _(' (Cmd+Shift+F)') }}
{% else %}
@@ -101,13 +101,13 @@
</a>
</li>
<li>
<a id="btn-find-menu-replace-all" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-replace-all" href="#" tabindex="0">
<span>{{ _('Replace All') }}</span>
</a>
</li>
<li class="divider"></li>
<li class="dropdown-divider"></li>
<li>
<a id="btn-find-menu-jump" href="#" tabindex="0">
<a class="dropdown-item" id="btn-find-menu-jump" href="#" tabindex="0">
<span>{{ _('Jump (Alt+G)') }}</span>
</a>
</li>
@@ -144,17 +144,17 @@
</button>
<ul class="dropdown-menu">
<li>
<a id="btn-indent-code" href="#" tabindex="0">
<a class="dropdown-item" id="btn-indent-code" href="#" tabindex="0">
<span> {{ _('Indent Selection (Tab)') }} </span>
</a>
</li>
<li>
<a id="btn-unindent-code" href="#" tabindex="0">
<a class="dropdown-item" id="btn-unindent-code" href="#" tabindex="0">
<span> {{ _('Unindent Selection (Shift+Tab)') }} </span>
</a>
</li>
<li>
<a id="btn-comment-line" href="#" tabindex="0">
<a class="dropdown-item" id="btn-comment-line" href="#" tabindex="0">
<span> {{ _('Inline Comment Selection') }}{% if client_platform == 'macos' -%}
{{ _(' (Cmd+/)') }}
{% else %}
@@ -162,7 +162,7 @@
</a>
</li>
<li>
<a id="btn-uncomment-line" href="#" tabindex="0">
<a class="dropdown-item" id="btn-uncomment-line" href="#" tabindex="0">
<span> {{ _('Inline Uncomment Selection') }}{% if client_platform == 'macos' -%}
{{ _(' (Cmd+.)') }}
{% else %}
@@ -170,7 +170,7 @@
</a>
</li>
<li>
<a id="btn-toggle-comment-block" href="#" tabindex="0">
<a class="dropdown-item" id="btn-toggle-comment-block" href="#" tabindex="0">
<span> {{ _('Block Comment/Uncomment Selection') }}{% if client_platform == 'macos' -%}
{{ _(' (Shift+Cmd+/)') }}
{% else %}
@@ -214,13 +214,13 @@
</select>
</div>
<div class="btn-group" role="group" aria-label="">
<div class="btn-group dropdown" role="group" aria-label="">
<button id="btn-flash" data-test-selector="execute-refresh-button" type="button" class="btn btn-default" style="width: 40px;"
title=""
tabindex="0">
<i class="fa fa-bolt" aria-hidden="true"></i>
</button>
<button id="btn-query-dropdown" type="button" class="btn btn-default dropdown-toggle"
<button id="btn-query-dropdown" type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
accesskey=""
title=""
@@ -229,59 +229,59 @@
</button>
<ul class="dropdown-menu" role="menu">
<li>
<a id="btn-flash-menu" href="#" tabindex="0">
<a class="dropdown-item" id="btn-flash-menu" href="#" tabindex="0">
<span></span>
</a>
</li>
<li>
<a id="btn-explain" href="#" tabindex="0">
<a class="dropdown-item" id="btn-explain" href="#" tabindex="0">
<span></span>
</a>
</li>
<li>
<a id="btn-explain-analyze" href="#" tabindex="0">
<a class="dropdown-item" id="btn-explain-analyze" href="#" tabindex="0">
<span></span>
</a>
</li>
<li class="divider"></li>
<li class="dropdown-divider"></li>
<li class="dropdown-submenu">
<a href="#" tabindex="0">{{ _('Explain Options') }}</a>
<a class="dropdown-item" href="#" tabindex="0">{{ _('Explain Options') }}</a>
<ul class="dropdown-menu">
<li>
<a id="btn-explain-verbose" href="#" class="noclose" tabindex="0">
<a class="dropdown-item" id="btn-explain-verbose" href="#" class="noclose" tabindex="0">
<i class="explain-verbose fa fa-check visibility-hidden" aria-hidden="true"></i>
<span> {{ _('Verbose') }} </span>
</a>
</li>
<li>
<a id="btn-explain-costs" href="#" class="noclose" tabindex="0">
<a class="dropdown-item" id="btn-explain-costs" href="#" class="noclose" tabindex="0">
<i class="explain-costs fa fa-check visibility-hidden" aria-hidden="true"></i>
<span> {{ _('Costs') }} </span>
</a>
</li>
<li>
<a id="btn-explain-buffers" href="#" class="noclose" tabindex="0">
<a class="dropdown-item" id="btn-explain-buffers" href="#" class="noclose" tabindex="0">
<i class="explain-buffers fa fa-check visibility-hidden" aria-hidden="true"></i>
<span> {{ _('Buffers') }} </span>
</a>
</li>
<li>
<a id="btn-explain-timing" href="#" class="noclose" tabindex="0">
<a class="dropdown-item" id="btn-explain-timing" href="#" class="noclose" tabindex="0">
<i class="explain-timing fa fa-check visibility-hidden" aria-hidden="true"></i>
<span> {{ _('Timing') }} </span>
</a>
</li>
</ul>
</li>
<li class="divider"></li>
<li class="dropdown-divider"></li>
<li>
<a id="btn-auto-commit" href="#" tabindex="0">
<a class="dropdown-item" id="btn-auto-commit" href="#" tabindex="0">
<i class="auto-commit fa fa-check visibility-hidden" aria-hidden="true"></i>
<span> {{ _('Auto commit?') }} </span>
</a>
</li>
<li>
<a id="btn-auto-rollback" href="#" tabindex="0">
<a class="dropdown-item" id="btn-auto-rollback" href="#" tabindex="0">
<i class="auto-rollback fa fa-check visibility-hidden" aria-hidden="true"></i>
<span> {{ _('Auto rollback?') }} </span>
</a>
@@ -305,12 +305,12 @@
</button>
<ul class="dropdown-menu">
<li>
<a id="btn-clear" href="#" tabindex="0">
<a class="dropdown-item" id="btn-clear" href="#" tabindex="0">
<span> {{ _('Clear Query Window') }} </span>
</a>
</li>
<li>
<a id="btn-clear-history" href="#" tabindex="0">
<a class="dropdown-item" id="btn-clear-history" href="#" tabindex="0">
<span> {{ _('Clear History') }} </span>
</a>
</li>
@@ -369,12 +369,10 @@
sqlEditorController.on('pgadmin-sqleditor:loading-icon:message', function(msg) {
msgDiv.text(msg);
}).on('pgadmin-sqleditor:loading-icon:show', function(msg) {
loadingDiv.removeClass('hide');
loadingDiv.removeClass('d-none');
msgDiv.text(msg);
}).on('pgadmin-sqleditor:loading-icon:hide', function() {
if (!loadingDiv.hasClass('hide')) {
loadingDiv.addClass('hide');
}
loadingDiv.addClass('d-none');
});
{% if script_type_url %}
var script_type_url = '{{ script_type_url }}';

4
web/pgadmin/tools/import_export/__init__.py
View File

@@ -125,7 +125,7 @@ class IEMessage(IProcessDesc):
id=self.sid, user_id=current_user.id
).first()
res = '<div class="h5">'
res = '<div>'
res += _(
"Copying table data '{0}.{1}' on database '{2}' "
"for the server '{3}'..."
@@ -140,7 +140,7 @@ class IEMessage(IProcessDesc):
)
)
res += '</div><div class="h5">'
res += '</div><div>'
res += _("Running command:")
res += '</b><br><span class="pg-bg-cmd enable-selection">'
res += html.safe_str(self._cmd)

4
web/pgadmin/tools/maintenance/__init__.py
View File

@@ -128,9 +128,9 @@ class Message(IProcessDesc):
if self.data['op'] == "CLUSTER":
res = _('CLUSTER')
res = '<div class="h5">' + html.safe_str(res)
res = '<div>' + html.safe_str(res)
res += '</div><div class="h5">'
res += '</div><div>'
res += html.safe_str(
_("Running Query:")
)

14
web/pgadmin/tools/maintenance/static/js/maintenance.js
View File

@@ -34,7 +34,7 @@ define([
' <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',
});
// Main model for Maintenance functionality
@@ -80,8 +80,8 @@ define([
],
control: Backform.RadioControl.extend({
template: _.template([
'<label class="control-label col-sm-4 col-xs-12"><%=label%></label>',
'<div class="pgadmin-controls col-xs-12 col-sm-8 btn-group pg-maintenance-op" data-toggle="buttons">',
'<label class="control-label col-sm-4 col-12"><%=label%></label>',
'<div class="pgadmin-controls col-12 col-sm-8 btn-group pg-maintenance-op" data-toggle="buttons">',
' <% for (var i=0; i < options.length; i++) { %>',
' <% var option = options[i]; %>',
' <label class="btn btn-primary<% if (i == 0) { %> active<%}%>">',
@@ -283,8 +283,8 @@ define([
setup: function() {
return {
buttons: [{
text: '',
className: 'btn btn-default pull-left fa fa-lg fa-info',
text: '<span class="fa fa-lg fa-info"></span>',
className: 'btn btn-default pull-left',
attrs: {
name: 'object_help',
type: 'button',
@@ -292,9 +292,9 @@ define([
label: gettext('Maintenance'),
},
}, {
text: '',
text: '<span class="fa fa-lg fa-question"></span>',
key: 112,
className: 'btn btn-default pull-left fa fa-lg fa-question',
className: 'btn btn-default pull-left',
attrs: {
name: 'dialog_help',
type: 'button',

4
web/pgadmin/tools/restore/__init__.py
View File

@@ -111,7 +111,7 @@ class RestoreMessage(IProcessDesc):
def details(self, cmd, args):
name, host, port = self.get_server_details()
res = '<div class="h5">'
res = '<div>'
res += html.safe_str(
_(
@@ -121,7 +121,7 @@ class RestoreMessage(IProcessDesc):
)
)
res += '</div><div class="h5"><b>'
res += '</div><div><b>'
res += html.safe_str(
_("Running command:")
)

8
web/pgadmin/tools/restore/static/js/restore_dialog_wrapper.js
View File

@@ -22,8 +22,8 @@ export class RestoreDialogWrapper extends DialogWrapper {
setup() {
return {
buttons: [{
text: '',
className: 'btn btn-default pull-left fa fa-lg fa-info',
text: '<span class="fa fa-lg fa-info"></span>',
className: 'btn btn-default pull-left',
attrs: {
name: 'object_help',
type: 'button',
@@ -31,9 +31,9 @@ export class RestoreDialogWrapper extends DialogWrapper {
label: gettext('Restore'),
},
}, {
text: '',
text: '<span class="fa fa-lg fa-question"></span>',
key: 112,
className: 'btn btn-default pull-left fa fa-lg fa-question',
className: 'btn btn-default pull-left',
attrs: {
name: 'dialog_help',
type: 'button',

6
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@@ -1306,7 +1306,7 @@ define('tools.querytool', [
_closeDropDown: function(ev) {
var target = ev && (ev.currentTarget || ev.target);
if (target) {
$(target).closest('.open').removeClass('open').find('.dropdown-backdrop').remove();
$(target).closest('.show').removeClass('show').find('.dropdown-backdrop').remove();
}
},
@@ -1480,7 +1480,7 @@ define('tools.querytool', [
// Callback function for cancel button click.
on_cancel: function() {
$('#filter').addClass('hidden');
$('#filter').addClass('d-none');
$('#editor-panel').removeClass('sql-editor-busy-fetching');
},
@@ -3279,7 +3279,7 @@ define('tools.querytool', [
setTimeout(
function() {
if (res.data.status) {
$('#filter').addClass('hidden');
$('#filter').addClass('d-none');
$('#editor-panel').removeClass('sql-editor-busy-fetching');
// Refresh the sql grid
queryToolActions.executeQuery(self);

37
web/pgadmin/tools/user_management/static/css/user_management.css Normal file
View File

@@ -0,0 +1,37 @@
.user_management .search_users form {
margin: 0;
}
.user_management table {
display: block;
height: 100%;
overflow: auto;
border: 0 none;
}
.user_management .backform-tab {
height: calc(100% - 75px);
}
.user_management .search_users {
float:right;
margin-right: 5px;
padding:0 !important;
}
.user_management .search_users input{
height:15px;
margin-top: 3px;
}
.user_management .user_container {
height: calc(100% - 35px);
}
.user_management input[placeholder] {
font-size: 12px;
}
.user_management_pg-alertify-button {
line-height: 16px;
}

10
web/pgadmin/tools/user_management/static/js/user_management.js
View File

@@ -60,9 +60,9 @@ define([
setup: function() {
return {
buttons: [{
text: '',
text: '<span class="fa fa-lg fa-question"></span>',
key: 112,
className: 'btn btn-default pull-left fa fa-lg fa-question',
className: 'btn btn-default pull-left',
attrs: {
name: 'dialog_help',
type: 'button',
@@ -576,9 +576,9 @@ define([
setup: function() {
return {
buttons: [{
text: '',
text: '<span class="fa fa-lg fa-question"></span>',
key: 112,
className: 'btn btn-default pull-left fa fa-lg fa-question',
className: 'btn btn-default pull-left',
attrs: {
name: 'dialog_help',
type: 'button',
@@ -757,7 +757,7 @@ define([
userCollection = this.userCollection = new UserCollection(),
header = [
'<div class="subnode-header">',
' <button class="btn-sm btn-default add fa fa-plus" title="<%-add_title%>" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' <button class="btn btn-sm-sq btn-default add fa fa-plus" title="<%-add_title%>" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
' <div class="control-label search_users"></div>',
'</div>',
].join('\n'),

45
web/pgadmin/tools/user_management/static/scss/_user_management.scss
View File

@@ -1,3 +1,48 @@
.bg-user-invalid {
@extend .bg-warning-lighter;
}
.user_management {
margin: 0 10px !important;
width: calc(100% - 20px);
height: 100%;
overflow: hidden;
}
.user_management .search_users form {
margin: 0;
}
.user_management table {
display: block;
height: 100%;
overflow: auto;
border: 0 none;
}
.user_management .backform-tab {
height: calc(100% - 75px);
}
.user_management .search_users {
float:right;
margin-right: 5px;
padding:0 !important;
}
.user_management .search_users input{
height:15px;
margin-top: 3px;
}
.user_management .user_container {
height: calc(100% - 35px);
}
.user_management input[placeholder] {
font-size: 12px;
}
.user_management_pg-alertify-button {
line-height: 16px;
}