You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/07/23 10:43:58 UTC
[1/3] incubator-ignite git commit: IGNITE-843: Updated screen tips.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 14fa6f65f -> 419dde3a6
IGNITE-843: Updated screen tips.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4c04705
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4c04705
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4c04705
Branch: refs/heads/ignite-843
Commit: e4c047051abd838d841373c553e34e425bbc7ac7
Parents: 14fa6f6
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jul 23 15:42:42 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jul 23 15:42:42 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/models/caches.json | 2 +-
.../src/main/js/controllers/models/clusters.json | 2 +-
.../src/main/js/controllers/models/metadata.json | 8 ++++----
.../src/main/js/controllers/models/summary.json | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4c04705/modules/web-control-center/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/controllers/models/caches.json b/modules/web-control-center/src/main/js/controllers/models/caches.json
index 0ffc9d4..13c5985 100644
--- a/modules/web-control-center/src/main/js/controllers/models/caches.json
+++ b/modules/web-control-center/src/main/js/controllers/models/caches.json
@@ -1,6 +1,6 @@
{
"screenTip": {
- "workflowTitle": "Use Caches view to:",
+ "workflowTitle": "Use caches view to:",
"workflowContent": [
"<ul>",
" <li>Configure caches.</li>",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4c04705/modules/web-control-center/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/controllers/models/clusters.json b/modules/web-control-center/src/main/js/controllers/models/clusters.json
index d6d7d23..e90094e 100644
--- a/modules/web-control-center/src/main/js/controllers/models/clusters.json
+++ b/modules/web-control-center/src/main/js/controllers/models/clusters.json
@@ -1,6 +1,6 @@
{
"screenTip": {
- "workflowTitle": "Use Clusters view to:",
+ "workflowTitle": "Use clusters view to:",
"workflowContent": [
"<ul>",
" <li>Configure clusters.</li>",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4c04705/modules/web-control-center/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/controllers/models/metadata.json b/modules/web-control-center/src/main/js/controllers/models/metadata.json
index 3248f7a..516fb6e 100644
--- a/modules/web-control-center/src/main/js/controllers/models/metadata.json
+++ b/modules/web-control-center/src/main/js/controllers/models/metadata.json
@@ -1,16 +1,16 @@
{
"screenTip": {
- "workflowTitle": "Use Cache Type Metadata view to:",
+ "workflowTitle": "Use metadata view to:",
"workflowContent": [
"<ul>",
- " <li>Manually configure metadata for queries and/or store.</li>",
- " <li>Configure metadata from database tables metadata.</li>",
+ " <li>Manually configure metadata for queries and persistence.</li>",
+ "Or",
+ " <li>Automatically configure metadata from database schema.</li>",
"</ul>"
],
"whatsNextTitle": "What's next:",
"whatsNextContent": [
"<ul>",
- " <li>Configure clusters.</li>",
" <li>Associate caches with metadata.</li>",
" <li>Generate XML and java code on Summary view.</li>",
"</ul>"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4c04705/modules/web-control-center/src/main/js/controllers/models/summary.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/controllers/models/summary.json b/modules/web-control-center/src/main/js/controllers/models/summary.json
index 056291c..29edb3d 100644
--- a/modules/web-control-center/src/main/js/controllers/models/summary.json
+++ b/modules/web-control-center/src/main/js/controllers/models/summary.json
@@ -1,6 +1,6 @@
{
"screenTip": {
- "workflowTitle": "Use Summary view to:",
+ "workflowTitle": "Use summary view to:",
"workflowContent": [
"<ul>",
" <li>See XML and java code for server nodes configurations.</li>",
[3/3] incubator-ignite git commit: IGNITE-843: Fixed tooltip trigger
for remove button.
Posted by ak...@apache.org.
IGNITE-843: Fixed tooltip trigger for remove button.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/419dde3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/419dde3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/419dde3a
Branch: refs/heads/ignite-843
Commit: 419dde3a61dc9fcee1a53d62a8f4d510212e0a94
Parents: bbee713
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jul 23 15:43:51 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jul 23 15:43:51 2015 +0700
----------------------------------------------------------------------
.../web-control-center/src/main/js/views/includes/controls.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/419dde3a/modules/web-control-center/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/views/includes/controls.jade b/modules/web-control-center/src/main/js/views/includes/controls.jade
index d8bf89e..2318370 100644
--- a/modules/web-control-center/src/main/js/views/includes/controls.jade
+++ b/modules/web-control-center/src/main/js/views/includes/controls.jade
@@ -44,7 +44,7 @@ mixin btn-add(click)
i.tipField.fa.fa-plus(ng-click=click bs-tooltip data-title='Add new item')
mixin btn-remove(click)
- i.tipField.fa.fa-remove(ng-click=click bs-tooltip data-title='Remove item')
+ i.tipField.fa.fa-remove(ng-click=click bs-tooltip data-title='Remove item' data-trigger='hover')
mixin btn-up(show, click)
i.tipField.fa.fa-arrow-up(ng-show=show ng-click=click bs-tooltip data-title='Move item up')
[2/3] incubator-ignite git commit: IGNITE-843: Fixed remove items
from groups.
Posted by ak...@apache.org.
IGNITE-843: Fixed remove items from groups.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbee7131
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbee7131
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbee7131
Branch: refs/heads/ignite-843
Commit: bbee7131543c8f66be954fe8d313aca2e41110a7
Parents: e4c0470
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jul 23 15:43:23 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jul 23 15:43:23 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/metadata-controller.js | 22 ++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbee7131/modules/web-control-center/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/controllers/metadata-controller.js b/modules/web-control-center/src/main/js/controllers/metadata-controller.js
index 74ece5c..bf58fe2 100644
--- a/modules/web-control-center/src/main/js/controllers/metadata-controller.js
+++ b/modules/web-control-center/src/main/js/controllers/metadata-controller.js
@@ -552,16 +552,30 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo
};
$scope.tableGroupNewItemActive = function (groupIndex) {
- var groupName = $scope.backupItem.groups[groupIndex].name;
+ var groups = $scope.backupItem.groups;
+
+ if (groups) {
+ var group = groups[groupIndex];
+
+ if (group) {
+ var groupName = group.name;
+
+ return $table.tableNewItemActive({model: groupName});
+ }
+ }
- return $table.tableNewItemActive({model: groupName});
+ return false;
};
$scope.tableGroupItemEditing = function (groupIndex, index) {
var groups = $scope.backupItem.groups;
- if (groups)
- return $table.tableEditing({model: groups[groupIndex].name}, index);
+ if (groups) {
+ var group = groups[groupIndex];
+
+ if (group)
+ return $table.tableEditing({model: group.name}, index);
+ }
return false;
};