usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [07/71] [abbrv] updating portal with latest code base
Date Thu, 20 Feb 2014 16:20:55 GMT
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/libs/usergrid.sdk.js
----------------------------------------------------------------------
diff --git a/portal/js/libs/usergrid.sdk.js b/portal/js/libs/usergrid.sdk.js
index ea4c646..591ad60 100755
--- a/portal/js/libs/usergrid.sdk.js
+++ b/portal/js/libs/usergrid.sdk.js
@@ -104,12 +104,12 @@ Usergrid.Client.prototype.request = function (options, callback) {
     uri += "?" + encoded_params;
   }
   //stringify the body object
-  body = JSON.stringify(body);
+  body = options.formData ? null : JSON.stringify(body);
   //so far so good, so run the query
   var xhr = new XMLHttpRequest();
   xhr.open(method, uri, true);
   //add content type = json if there is a json payload
-  if (body) {
+  if (!options.formData) {
     xhr.setRequestHeader("Content-Type", "application/json");
     xhr.setRequestHeader("Accept", "application/json");
   }
@@ -192,7 +192,7 @@ Usergrid.Client.prototype.request = function (options, callback) {
     this.buildCurlCall(curlOptions);
   }
   this._start = new Date().getTime();
-  xhr.send(body);
+  xhr.send(options.formData || body);
 };
 
 Usergrid.Client.prototype.keys = function(o) {
@@ -1055,7 +1055,7 @@ Usergrid.Client.prototype.getDisplayImage = function (email, picture,
size) {
     if (email.length) {
       return 'https://secure.gravatar.com/avatar/' + MD5(email) + '?s=' + size;
     } else {
-      return 'https://apigee.com/usergrid/img/user_profile.png';;
+      return 'https://apigee.com/usergrid/img/user_profile.png';
     }
   } catch(e) {
     return 'https://apigee.com/usergrid/img/user_profile.png';

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/login/forgot-password-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/login/forgot-password-controller.js b/portal/js/login/forgot-password-controller.js
index 40eeb43..bf5fc08 100644
--- a/portal/js/login/forgot-password-controller.js
+++ b/portal/js/login/forgot-password-controller.js
@@ -2,11 +2,10 @@
 
 AppServices.Controllers.controller('ForgotPasswordCtrl',
   ['ug',
-    'data',
     '$scope',
     '$rootScope',
     '$location',
-    'utility', function (ug, data, $scope, $rootScope, $location) {
+    'utility', function (ug,  $scope, $rootScope, $location) {
     $rootScope.activeUI &&   $location.path('/');
     $scope.forgotPWiframeURL = $scope.apiUrl + '/management/users/resetpw';
   }]);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/login/login.html
----------------------------------------------------------------------
diff --git a/portal/js/login/login.html b/portal/js/login/login.html
index 65a5776..458c742 100755
--- a/portal/js/login/login.html
+++ b/portal/js/login/login.html
@@ -23,7 +23,7 @@
     <div class="control-group">
       <label class="control-label" for="login-password">Password:</label>
       <div class="controls">
-        <input type="password" ng-model="login.password" ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}"
required id="login-password" class="" ng-value="login.password" size="20" ug-validate>
+        <input type="password" ng-model="login.password"  required id="login-password"
class="" ng-value="login.password" size="20" ug-validate>
       </div>
     </div>
     <div class="form-actions">

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/org-overview/org-overview.html
----------------------------------------------------------------------
diff --git a/portal/js/org-overview/org-overview.html b/portal/js/org-overview/org-overview.html
index 34d4c1f..b64f1de 100644
--- a/portal/js/org-overview/org-overview.html
+++ b/portal/js/org-overview/org-overview.html
@@ -1,14 +1,6 @@
-<div class="org-overview-content">
+<div class="org-overview-content" ng-show="activeUI">
 
-  <section class="row-fluid">
-
-    <div class="span12">
-      <div class="page-filters">
-        <h1 class="title pull-left"><i class="pictogram title">&#128362;</i>Org
Overview</h1>
-      </div>
-    </div>
-
-  </section>
+  <page-title title=" Org Administration" icon="&#128362;"></page-title>
 
   <section class="row-fluid">
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/profile/account.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/account.html b/portal/js/profile/account.html
index ded1f39..bb0f468 100644
--- a/portal/js/profile/account.html
+++ b/portal/js/profile/account.html
@@ -1,10 +1,5 @@
-<section class="row-fluid">
-  <div class="span12">
-    <div class="page-filters">
-      <h1 class="title" class="pull-left"><i class="pictogram title">&#59170</i>
Account Settings </h1>
-    </div>
-  </div>
-</section>
+<page-title title=" Account Settings" icon="&#59170"></page-title>
+
 <section class="row-fluid">
   <div class="span12 tab-content">
     <div class="menu-toolbar">

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/roles/roles-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-controller.js b/portal/js/roles/roles-controller.js
index cfc9bfa..f0ad7ed 100644
--- a/portal/js/roles/roles-controller.js
+++ b/portal/js/roles/roles-controller.js
@@ -24,7 +24,7 @@ AppServices.Controllers.controller('RolesCtrl', ['ug', '$scope', '$rootScope',
'
     ug.getRoles();
 
     $scope.newRoleDialog = function(modalId){
-      if ($scope.rolename) {
+      if ($scope.newRole.name) {
         ug.createRole($scope.newRole.name,$scope.newRole.title);
         //add new role here
         $rootScope.$broadcast('alert', 'success', 'Role created successfully.');

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/roles/roles.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles.html b/portal/js/roles/roles.html
index aef43d9..9070ff5 100644
--- a/portal/js/roles/roles.html
+++ b/portal/js/roles/roles.html
@@ -1,14 +1,6 @@
 <div class="content-page">
 
-  <section class="row-fluid">
-
-    <div class="span12">
-      <div class="page-filters">
-        <h1 class="title" class="pull-left"><i class="pictogram title">&#59170;</i>
Roles</h1>
-      </div>
-    </div>
-
-  </section>
+  <page-title title=" Roles" icon="&#59170;"></page-title>
 
   <bsmodal id="newRole"
            title="New Role"

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5a98884/portal/js/shell/shell.html
----------------------------------------------------------------------
diff --git a/portal/js/shell/shell.html b/portal/js/shell/shell.html
index 7557639..b1261b9 100644
--- a/portal/js/shell/shell.html
+++ b/portal/js/shell/shell.html
@@ -1,10 +1,5 @@
-<section class="row-fluid">
-  <div class="span12">
-    <div class="page-filters">
-      <h1 class="title" class="pull-left"><i class="pictogram title">&#128241;</i>
Shell</h1>
-    </div>
-  </div>
-</section>
+<page-title title=" Shell" icon="&#128241;"></page-title>
+
 <section class="row-fluid">
   <div class="console-section-contents" id="shell-panel">
     <div id="shell-input-div">


Mime
View raw message