public inbox for [email protected]
help / color / mirror / Atom feedFrom: Akshay Joshi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: Re: Used font awesome icon instead of 'Add' caption for Add button
Date: Tue, 26 Jul 2016 14:26:09 +0530
Message-ID: <CANxoLDcbQAthUzu8bhn-VkS_11kU9AZ4ojcgth0pDSK475GjGA@mail.gmail.com> (raw)
In-Reply-To: <CANxoLDf4bUTZHCYt35MOhVjStY0Mh5_HQ=08WHrVC8aFKdUhQw@mail.gmail.com>
References: <CANxoLDf4bUTZHCYt35MOhVjStY0Mh5_HQ=08WHrVC8aFKdUhQw@mail.gmail.com>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgadmin-hackers>
Hi
Forgot to add css changes. Attached is the modified patch.
On Tue, Jul 26, 2016 at 1:03 PM, Akshay Joshi <[email protected]
> wrote:
> Hi All
>
> I have used font awesome icon (+) for add button instead of caption "Add"
> where ever possible. Attached is the patch. Please review it and let me
> know the review comments.
>
> --
> *Akshay Joshi*
> *Principal Software Engineer *
>
>
>
> *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
>
--
*Akshay Joshi*
*Principal Software Engineer *
*Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
Attachments:
[application/octet-stream] Fixed_Add_Caption_v1.patch (8.3K, 3-Fixed_Add_Caption_v1.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
index 62d06c5..8d74700 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/js/fts_configuration.js
@@ -201,15 +201,14 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
' </div>',
' <div class="col-xs-6" header="token"></div>',
' <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>',].join("\n")
_.extend(data, {
- token_label: '{{ _('Tokens') }}',
- add_label: '{{ _('Add') }}'
+ token_label: '{{ _('Tokens') }}'
});
var self = this,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
index 1bb493f..6306116 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
@@ -402,15 +402,14 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
' </div>',
' <div class="col-xs-4" header="column"></div>',
' <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>',].join("\n")
_.extend(data, {
- column_label: '{{ _('Column') }}',
- add_label: '{{ _('Add') }}'
+ column_label: '{{ _('Column') }}'
});
var self = this,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
index 6bd6195..3ffa6ef 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
@@ -301,7 +301,7 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
' </div>',
' <div class="col-md-4" header="local_column"></div>',
' <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 class="row">',
@@ -321,7 +321,6 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
_.extend(data, {
column_label: '{{ _('Local column') }}',
- add_label: '{{ _('Add') }}',
references_label: '{{ _('References') }}',
referenced_label: '{{ _('Referencing') }}'
});
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js
index 1413dbc..7b27212 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js
@@ -373,7 +373,7 @@
titleTmpl = _.template([
"<div class='subnode-header'>",
"<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")),
$gridBody =
$("<div class='pgadmin-control-group backgrid form-group col-xs-12 object subnode'></div>").append(
diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index 2536fe3..15d9f8f 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -521,7 +521,7 @@ fieldset[disabled] .form-control {
float: right;
margin-right: 3px;
margin-bottom: 3px;
- margin-top: 3px;
+ margin-top: 5px;
}
.subnode {
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index eadea8a..2530db9 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -948,7 +948,7 @@
canDelete: evalF.apply(this.field, [data.canDelete, 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.
if (!data.visible) {
@@ -971,7 +971,7 @@
gridHeader = _.template([
'<div class="subnode-header">',
' <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")),
gridBody = $('<div class="pgadmin-control-group backgrid form-group pg-el-xs-12 object subnode"></div>').append(
gridHeader(data)
@@ -1209,7 +1209,7 @@
var self = this,
gridHeader = ["<div class='subnode-header'>",
" <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");
gridBody = $("<div class='pgadmin-control-group backgrid form-group pg-el-xs-12 object subnode'></div>").append(gridHeader);
diff --git a/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js b/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js
index 58facb1..c8c91c7 100644
--- a/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js
+++ b/web/pgadmin/tools/user_management/templates/user_management/js/user_management.js
@@ -532,14 +532,13 @@ define([
userCollection = this.userCollection = new UserCollection(),
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>',].join("\n"),
headerTpl = _.template(header),
data = {
canAdd: true,
- add_title: '{{ _("Add new user") }}',
- add_label:'{{ _('Add') }}'
+ add_title: '{{ _("Add new user") }}'
},
$gridBody = $("<div></div>", {
class: "user_container"
view thread (3+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected]
Subject: Re: Used font awesome icon instead of 'Add' caption for Add button
In-Reply-To: <CANxoLDcbQAthUzu8bhn-VkS_11kU9AZ4ojcgth0pDSK475GjGA@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox