You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/04 21:58:22 UTC
[52/54] [abbrv] git commit: updated bower version, fixed app overview,
modified help
updated bower version, fixed app overview, modified help
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e3dbe766
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e3dbe766
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e3dbe766
Branch: refs/heads/master
Commit: e3dbe766432778a0a706d8405bd6435fbd3d95d6
Parents: 11243ef
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Jul 30 16:35:43 2014 -0600
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Jul 30 16:35:43 2014 -0600
----------------------------------------------------------------------
portal/helpJson.json | 12 +++++------
.../js/app-overview/app-overview-controller.js | 21 +++-----------------
portal/package.json | 2 +-
3 files changed, 10 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e3dbe766/portal/helpJson.json
----------------------------------------------------------------------
diff --git a/portal/helpJson.json b/portal/helpJson.json
index e4773a1..54cd064 100644
--- a/portal/helpJson.json
+++ b/portal/helpJson.json
@@ -1,15 +1,15 @@
{
"introjs": [{
"element": "#intro-1-org",
- "intro": "<p class='introjstooltipheader'>Your organizations</p><p>Click to view a list of the organizations you have access to. Orgs are how applications are grouped and managed in API BaaS.</p>",
+ "intro": "<p class='introjstooltipheader'>Your organizations</p><p>Click to view a list of the organizations you have access to. Orgs are how applications are grouped and managed in Usergrid.</p>",
"position": "right"
}, {
"element": "#intro-2-app-menu",
- "intro": "<p class='introjstooltipheader'>Your applications</p><p>Click to view a list of applications in the currently selected organization. Applications represent unique data stores in API BaaS.</p>",
+ "intro": "<p class='introjstooltipheader'>Your applications</p><p>Click to view a list of applications in the currently selected organization. Applications represent unique data stores in Usergrid.</p>",
"position": "right"
}, {
"element": "#intro-3-side-menu",
- "intro": "<p class='introjstooltipheader'>API BaaS features menu</p><p>Click an item in the menu to configure and manage the corresponding feature.</p><p>From here you can configure and manage everything about the currently selected API BaaS application, such as user access, push notifications, your data store, and more.</p>",
+ "intro": "<p class='introjstooltipheader'>Usergrid features menu</p><p>Click an item in the menu to configure and manage the corresponding feature.</p><p>From here you can configure and manage everything about the currently selected API BaaS application, such as user access, push notifications, your data store, and more.</p>",
"position": "right"
}, {
"element": "#intro-4-current-org",
@@ -33,13 +33,13 @@
"position": "left"
}, {
"element": "#intro-9-sdks",
- "intro": "<p class='introjstooltipheader'>Download an SDK!</p><p>Ready to start using API BaaS to power your app? Download one of our SDKs to get developing in your preferred language fast!</p>",
+ "intro": "<p class='introjstooltipheader'>Download an SDK!</p><p>Ready to start using Usergrid to power your app? Download one of our SDKs to get developing in your preferred language fast!</p>",
"position": "bottom"
}],
"tooltip": {
- "tooltip_current_org": "The name and UUID for the organization you're logged into. An org is how your applications are grouped in API BaaS.",
- "tooltip_applications": "A list of the applications in your org. Applications represent unique data stores. Additional API BaaS features (e.g. App Monitoring, push notifications, etc.) are configured separately for each application.",
+ "tooltip_current_org": "The name and UUID for the organization you're logged into. An org is how your applications are grouped in Usergrid.",
+ "tooltip_applications": "A list of the applications in your org. Applications represent unique data stores.",
"tooltip_org_api_creds": "These credentials can be sent from server-based code to authenticate as an org admin user. Org admins have full access to make any API call to an organization and all of the applications in it. Don't use these in a mobile app or client-side code!",
"tooltip_org_admins": "A list of people who have org admin access to this organization.",
"tooltip_activities": "A list of recent activities that have occurred in this organization, such as the creation of a new application."
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e3dbe766/portal/js/app-overview/app-overview-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/app-overview-controller.js b/portal/js/app-overview/app-overview-controller.js
index 12d0af3..79446f8 100644
--- a/portal/js/app-overview/app-overview-controller.js
+++ b/portal/js/app-overview/app-overview-controller.js
@@ -31,27 +31,12 @@ AppServices.Controllers.controller('AppOverviewCtrl',
$scope.collections = [];
$scope.graph = '';
$scope.$on('top-collections-received', function (event, collections) {
-//alert('yes');
- //todo add this to charts service as helper
- $scope.collections = collections;
- var arr = [];
- for (var i in collections) {
- if (collections.hasOwnProperty(i)) {
- arr.push(collections[i]);
- }
- }
- $scope.appOverview = {};
+ $scope.collections = collections;
+ $scope.applyScope();
});
ug.getTopCollections();
- /*
- $scope.$on('app-initialized',function(){
- ug.getTopCollections();
- });
- if($rootScope.activeUI){
- ug.getTopCollections();
- }
- */
+
}]);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e3dbe766/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 0482ba5..777bf3d 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -36,7 +36,7 @@
"grunt-contrib-clean": "~0.4.0",
"grunt-dom-munger": "~3.1.0",
"bower": "~1.2.8",
- "grunt-bower-task": "~0.3.4",
+ "grunt-bower-task": "~0.4.0",
"grunt-istanbul": "~0.2.5"
},
"engines": {