mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Replace 'Add' buttons with '+'
This commit is contained in:
parent
19306934a0
commit
e803464ee0
@ -201,15 +201,14 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
|
|||||||
' </div>',
|
' </div>',
|
||||||
' <div class="col-xs-6" header="token"></div>',
|
' <div class="col-xs-6" header="token"></div>',
|
||||||
' <div class="col-xs-2">',
|
' <div class="col-xs-2">',
|
||||||
' <button class="btn-sm btn-default add" <%=canAdd ? "" : "disabled=\'disabled\'"%> ><%-add_label%></buttton>',
|
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></buttton>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' </div>',
|
' </div>',
|
||||||
'</div>',].join("\n")
|
'</div>',].join("\n")
|
||||||
|
|
||||||
_.extend(data, {
|
_.extend(data, {
|
||||||
token_label: '{{ _('Tokens') }}',
|
token_label: '{{ _('Tokens') }}'
|
||||||
add_label: '{{ _('Add') }}'
|
|
||||||
});
|
});
|
||||||
|
|
||||||
var self = this,
|
var self = this,
|
||||||
|
@ -402,15 +402,14 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
|
|||||||
' </div>',
|
' </div>',
|
||||||
' <div class="col-xs-4" header="column"></div>',
|
' <div class="col-xs-4" header="column"></div>',
|
||||||
' <div class="col-xs-4">',
|
' <div class="col-xs-4">',
|
||||||
' <button class="btn-sm btn-default add" <%=canAdd ? "" : "disabled=\'disabled\'"%> ><%-add_label%></buttton>',
|
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></buttton>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' </div>',
|
' </div>',
|
||||||
'</div>',].join("\n")
|
'</div>',].join("\n")
|
||||||
|
|
||||||
_.extend(data, {
|
_.extend(data, {
|
||||||
column_label: '{{ _('Column') }}',
|
column_label: '{{ _('Column') }}'
|
||||||
add_label: '{{ _('Add') }}'
|
|
||||||
});
|
});
|
||||||
|
|
||||||
var self = this,
|
var self = this,
|
||||||
|
@ -301,7 +301,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
|
|||||||
' </div>',
|
' </div>',
|
||||||
' <div class="col-md-4" header="local_column"></div>',
|
' <div class="col-md-4" header="local_column"></div>',
|
||||||
' <div class="col-md-4">',
|
' <div class="col-md-4">',
|
||||||
' <button class="btn-sm btn-default add" <%=canAdd ? "" : "disabled=\'disabled\'"%> ><%-add_label%></buttton>',
|
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></buttton>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' <div class="row">',
|
' <div class="row">',
|
||||||
@ -321,7 +321,6 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
|
|||||||
|
|
||||||
_.extend(data, {
|
_.extend(data, {
|
||||||
column_label: '{{ _('Local column') }}',
|
column_label: '{{ _('Local column') }}',
|
||||||
add_label: '{{ _('Add') }}',
|
|
||||||
references_label: '{{ _('References') }}',
|
references_label: '{{ _('References') }}',
|
||||||
referenced_label: '{{ _('Referencing') }}'
|
referenced_label: '{{ _('Referencing') }}'
|
||||||
});
|
});
|
||||||
|
@ -373,7 +373,7 @@
|
|||||||
titleTmpl = _.template([
|
titleTmpl = _.template([
|
||||||
"<div class='subnode-header'>",
|
"<div class='subnode-header'>",
|
||||||
"<label class='control-label'><%-label%></label>",
|
"<label class='control-label'><%-label%></label>",
|
||||||
"<button class='btn-sm btn-default add' <%=canAdd ? '' : 'disabled=\"disabled\"'%>>Add</buttton>",
|
"<button class='btn-sm btn-default add fa fa-plus' <%=canAdd ? '' : 'disabled=\"disabled\"'%>></buttton>",
|
||||||
"</div>"].join("\n")),
|
"</div>"].join("\n")),
|
||||||
$gridBody =
|
$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-xs-12 object subnode'></div>").append(
|
||||||
|
@ -521,7 +521,7 @@ fieldset[disabled] .form-control {
|
|||||||
float: right;
|
float: right;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
margin-bottom: 3px;
|
margin-bottom: 3px;
|
||||||
margin-top: 3px;
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.subnode {
|
.subnode {
|
||||||
|
@ -948,7 +948,7 @@
|
|||||||
canDelete: evalF.apply(this.field, [data.canDelete, data, this.model]),
|
canDelete: evalF.apply(this.field, [data.canDelete, data, this.model]),
|
||||||
canEdit: evalF.apply(this.field, [data.canEdit, data, this.model])
|
canEdit: evalF.apply(this.field, [data.canEdit, data, this.model])
|
||||||
});
|
});
|
||||||
_.extend(data, {add_label: "Add"});
|
_.extend(data, {add_label: ""});
|
||||||
|
|
||||||
// This control is not visible, we should remove it.
|
// This control is not visible, we should remove it.
|
||||||
if (!data.visible) {
|
if (!data.visible) {
|
||||||
@ -971,7 +971,7 @@
|
|||||||
gridHeader = _.template([
|
gridHeader = _.template([
|
||||||
'<div class="subnode-header">',
|
'<div class="subnode-header">',
|
||||||
' <label class="control-label pg-el-sm-10"><%-label%></label>',
|
' <label class="control-label pg-el-sm-10"><%-label%></label>',
|
||||||
' <button class="btn-sm btn-default add" <%=canAdd ? "" : "disabled=\'disabled\'"%>><%-add_label%></buttton>',
|
' <button class="btn-sm btn-default add fa fa-plus" <%=canAdd ? "" : "disabled=\'disabled\'"%>><%-add_label%></buttton>',
|
||||||
'</div>'].join("\n")),
|
'</div>'].join("\n")),
|
||||||
gridBody = $('<div class="pgadmin-control-group backgrid form-group pg-el-xs-12 object subnode"></div>').append(
|
gridBody = $('<div class="pgadmin-control-group backgrid form-group pg-el-xs-12 object subnode"></div>').append(
|
||||||
gridHeader(data)
|
gridHeader(data)
|
||||||
@ -1209,7 +1209,7 @@
|
|||||||
var self = this,
|
var self = this,
|
||||||
gridHeader = ["<div class='subnode-header'>",
|
gridHeader = ["<div class='subnode-header'>",
|
||||||
" <label class='control-label pg-el-sm-10'>" + data.label + "</label>" ,
|
" <label class='control-label pg-el-sm-10'>" + data.label + "</label>" ,
|
||||||
" <button class='btn-sm btn-default add'>Add</buttton>",
|
" <button class='btn-sm btn-default add fa fa-plus'></buttton>",
|
||||||
"</div>"].join("\n");
|
"</div>"].join("\n");
|
||||||
gridBody = $("<div class='pgadmin-control-group backgrid form-group pg-el-xs-12 object subnode'></div>").append(gridHeader);
|
gridBody = $("<div class='pgadmin-control-group backgrid form-group pg-el-xs-12 object subnode'></div>").append(gridHeader);
|
||||||
|
|
||||||
|
@ -532,14 +532,13 @@ define([
|
|||||||
userCollection = this.userCollection = new UserCollection(),
|
userCollection = this.userCollection = new UserCollection(),
|
||||||
header = [
|
header = [
|
||||||
'<div class="subnode-header">',
|
'<div class="subnode-header">',
|
||||||
' <button class="btn-sm btn-default add" title="<%-add_title%>" <%=canAdd ? "" : "disabled=\'disabled\'"%> ><%=add_label ? add_label : "" %></button>',
|
' <button class="btn-sm btn-default add fa fa-plus" title="<%-add_title%>" <%=canAdd ? "" : "disabled=\'disabled\'"%> ></button>',
|
||||||
' <div class="control-label search_users"></div>',
|
' <div class="control-label search_users"></div>',
|
||||||
'</div>',].join("\n"),
|
'</div>',].join("\n"),
|
||||||
headerTpl = _.template(header),
|
headerTpl = _.template(header),
|
||||||
data = {
|
data = {
|
||||||
canAdd: true,
|
canAdd: true,
|
||||||
add_title: '{{ _("Add new user") }}',
|
add_title: '{{ _("Add new user") }}'
|
||||||
add_label:'{{ _('Add') }}'
|
|
||||||
},
|
},
|
||||||
$gridBody = $("<div></div>", {
|
$gridBody = $("<div></div>", {
|
||||||
class: "user_container"
|
class: "user_container"
|
||||||
|
Loading…
Reference in New Issue
Block a user