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/03/19 20:21:13 UTC
[03/55] [abbrv] USERGRID-86: Remove restriction on 10 apps in the
portal
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/js/users/users-feed-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/users/users-feed-controller.js b/portal/js/users/users-feed-controller.js
new file mode 100644
index 0000000..1f1c4a5
--- /dev/null
+++ b/portal/js/users/users-feed-controller.js
@@ -0,0 +1,29 @@
+'use strict'
+
+AppServices.Controllers.controller('UsersFeedCtrl', ['ug', '$scope', '$rootScope', '$location',
+ function (ug, $scope, $rootScope, $location) {
+
+ $scope.activitiesSelected = 'active';
+ $scope.activityToAdd = '';
+ $scope.activities = [];
+ $scope.newActivity = {};
+ var getFeed = function(){
+ ug.getEntityActivities($rootScope.selectedUser,true);
+ };
+
+ if (!$rootScope.selectedUser) {
+ $location.path('/users');
+ return;
+ } else {
+ getFeed();
+ }
+
+ $scope.$on('users-feed-error',function(){
+ $rootScope.$broadcast('alert', 'error', 'could not create activity');
+ });
+ $scope.$on('users-feed-received',function(evt,entities){
+ $scope.activities = entities;
+ $scope.applyScope();
+ });
+
+ }]);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/js/users/users-feed.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-feed.html b/portal/js/users/users-feed.html
new file mode 100644
index 0000000..5968746
--- /dev/null
+++ b/portal/js/users/users-feed.html
@@ -0,0 +1,27 @@
+<div class="content-page" ng-controller="UsersFeedCtrl" >
+
+ <div ng:include="'users/users-tabs.html'"></div>
+ <br>
+ <div>
+ <table class="table table-striped">
+ <tbody>
+ <tr class="table-header">
+ <td>Date</td>
+ <td>User</td>
+ <td>Content</td>
+ <td>Verb</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="activity in activities">
+ <td>{{activity.createdDate}}</td>
+ <td>{{activity.actor.displayName}}</td>
+ <td>{{activity.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/js/users/users.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users.html b/portal/js/users/users.html
index ad53edc..6078c82 100644
--- a/portal/js/users/users.html
+++ b/portal/js/users/users.html
@@ -107,6 +107,7 @@
<li class="tab" ng-class="currentUsersPage.route === '/users/profile' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/profile')"><i class="pictogram"></i>Profile</a></li>
<li class="tab" ng-class="currentUsersPage.route === '/users/groups' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/groups')"><i class="pictogram">👥</i>Groups</a></li>
<li class="tab" ng-class="currentUsersPage.route === '/users/activities' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/activities')"><i class="pictogram"></i>Activities</a></li>
+ <li class="tab" ng-class="currentUsersPage.route === '/users/feed' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/feed')"><i class="pictogram">📄</i>Feed</a></li>
<li class="tab" ng-class="currentUsersPage.route === '/users/graph' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/graph')"><i class="pictogram">☁</i>Graph</a></li>
<li class="tab" ng-class="currentUsersPage.route === '/users/roles' ? 'selected' : ''"><a class="btn btn-primary toolbar" ng-click="selectUserPage('/users/roles')"><i class="pictogram">🌎</i>Roles & Permissions</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf075e6c/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index ca5b409..a54ded3 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,6 +1,6 @@
{
"name": "apigee-usergrid",
- "version": "2.0.34",
+ "version": "2.0.36",
"packageName": "appsvc-ui",
"description": "full apigee portal",
"main": "./scripts/web-server.js",
@@ -36,7 +36,8 @@
"grunt-contrib-clean": "~0.5.0",
"grunt-dom-munger": "~3.1.0",
"bower": "~1.2.8",
- "grunt-bower-task": "~0.3.4"
+ "grunt-bower-task": "~0.3.4",
+ "grunt-s3": "~0.2.0-alpha.3"
},
"engines": {
"node": ">=0.10.21"