You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/13 17:29:48 UTC
[1/6] git commit: USERGRID-207 Fix license headers in portal
Angular.js files
Repository: incubator-usergrid
Updated Branches:
refs/heads/master cbe636301 -> 7fab67376
USERGRID-207 Fix license headers in portal Angular.js files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/efade6fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/efade6fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/efade6fc
Branch: refs/heads/master
Commit: efade6fc817974b2ab04fb7b7fa5ceb4695151f5
Parents: cbe6363
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Tue Aug 12 23:24:42 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Tue Aug 12 23:24:42 2014 -0700
----------------------------------------------------------------------
portal/js/dialogs/modal.html | 34 ++++++++++--------
portal/js/menus/appMenu.html | 73 ++++++++++++++++++---------------------
portal/js/menus/orgMenu.html | 26 +++++++-------
3 files changed, 67 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/efade6fc/portal/js/dialogs/modal.html
----------------------------------------------------------------------
diff --git a/portal/js/dialogs/modal.html b/portal/js/dialogs/modal.html
index ed644fc..1060deb 100644
--- a/portal/js/dialogs/modal.html
+++ b/portal/js/dialogs/modal.html
@@ -1,3 +1,5 @@
+<div class="modal show fade" tabindex="-1" role="dialog"
+ aria-hidden="true">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +16,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <form ng-submit="extraDelegate(extrabutton)" name="dialogForm"
+ novalidate>
-<div class="modal show fade" tabindex="-1" role="dialog" aria-hidden="true">
- <form ng-submit="extraDelegate(extrabutton)" name="dialogForm" novalidate>
+ <div class="modal-header">
+ <h1 class="title">{{title}}</h1>
+ </div>
- <div class="modal-header">
- <h1 class="title">{{title}}</h1>
- </div>
-
- <div class="modal-body" ng-transclude></div>
- <div class="modal-footer">
- {{footertext}}
- <input type="submit" class="btn" id="dialogButton-{{buttonId}}" ng-if="extrabutton" ng-disabled="!dialogForm.$valid" aria-hidden="true" ng-value="extrabuttonlabel"/>
- <button class="btn cancel pull-left" data-dismiss="modal" aria-hidden="true"
- ng-click="closeDelegate(close)">{{closelabel}}
- </button>
- </div>
- </form> </div>
+ <div class="modal-body" ng-transclude></div>
+ <div class="modal-footer">
+ {{footertext}} <input type="submit" class="btn"
+ id="dialogButton-{{buttonId}}" ng-if="extrabutton"
+ ng-disabled="!dialogForm.$valid" aria-hidden="true"
+ ng-value="extrabuttonlabel" />
+ <button class="btn cancel pull-left" data-dismiss="modal"
+ aria-hidden="true" ng-click="closeDelegate(close)">{{closelabel}}
+ </button>
+ </div>
+ </form>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/efade6fc/portal/js/menus/appMenu.html
----------------------------------------------------------------------
diff --git a/portal/js/menus/appMenu.html b/portal/js/menus/appMenu.html
index c3f4086..daed9e0 100644
--- a/portal/js/menus/appMenu.html
+++ b/portal/js/menus/appMenu.html
@@ -1,3 +1,4 @@
+<ul id="app-menu" class="nav top-nav span12">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,44 +15,38 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<ul id="app-menu" class="nav top-nav span12">
- <li class="span7">
- <bsmodal id="newApplication"
- title="Create New Application"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newApplicationDialog"
- extrabuttonlabel="Create"
- buttonid="app"
- ng-cloak>
- <div ng-show="!hasApplications" class="modal-instructions" >You have no applications, please create one.</div>
- <div ng-show="hasCreateApplicationError" class="alert-error">Application already exists!</div>
- <p>New application name: <input ng-model="$parent.newApp.name" id="app-name-input" ng-pattern="appNameRegex" ng-attr-title="{{appNameRegexDescription}}" type="text" required ug-validate /></p>
- </bsmodal>
- <div class="btn-group">
- <a class="btn dropdown-toggle top-selector app-selector" id="current-app-selector" data-toggle="dropdown">
- <i class="pictogram">⚙</i> {{myApp.currentApp}}
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu app-nav">
- <li name="app-selector" ng-repeat="app in applications">
- <a id="app-{{app.name}}-link-id" ng-click="appChange(app.name)">{{app.name}}</a>
- </li>
- </ul>
- </div>
- </li>
- <li class="span5">
- <a ng-if="activeUI"
- class="btn btn-create zero-out pull-right"
- ng-click="showModal('newApplication')"
- analytics-on="click"
- analytics-category="App Services"
- analytics-label="Button"
- analytics-event="Add New App"
- >
- <i class="pictogram">⊞</i>
- Add New App
+ <li class="span7"><bsmodal id="newApplication"
+ title="Create New Application" close="hideModal"
+ closelabel="Cancel" extrabutton="newApplicationDialog"
+ extrabuttonlabel="Create" buttonid="app" ng-cloak>
+ <div ng-show="!hasApplications" class="modal-instructions">You
+ have no applications, please create one.</div>
+ <div ng-show="hasCreateApplicationError" class="alert-error">Application
+ already exists!</div>
+ <p>
+ New application name: <input ng-model="$parent.newApp.name"
+ id="app-name-input" ng-pattern="appNameRegex"
+ ng-attr-title="{{appNameRegexDescription}}" type="text" required
+ ug-validate />
+ </p>
+ </bsmodal>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle top-selector app-selector"
+ id="current-app-selector" data-toggle="dropdown"> <i
+ class="pictogram">⚙</i> {{myApp.currentApp}} <span
+ class="caret"></span>
</a>
- </li>
+ <ul class="dropdown-menu app-nav">
+ <li name="app-selector" ng-repeat="app in applications"><a
+ id="app-{{app.name}}-link-id" ng-click="appChange(app.name)">{{app.name}}</a>
+ </li>
+ </ul>
+ </div></li>
+ <li class="span5"><a ng-if="activeUI"
+ class="btn btn-create zero-out pull-right"
+ ng-click="showModal('newApplication')" analytics-on="click"
+ analytics-category="App Services" analytics-label="Button"
+ analytics-event="Add New App"> <i class="pictogram">⊞</i>
+ Add New App
+ </a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/efade6fc/portal/js/menus/orgMenu.html
----------------------------------------------------------------------
diff --git a/portal/js/menus/orgMenu.html b/portal/js/menus/orgMenu.html
index 1f2da50..5d110f6 100644
--- a/portal/js/menus/orgMenu.html
+++ b/portal/js/menus/orgMenu.html
@@ -1,3 +1,4 @@
+<ul class="nav top-nav org-nav">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,17 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<ul class="nav top-nav org-nav">
<li>
-<div class="btn-group ">
- <a class="btn dropdown-toggle top-selector org-selector" id="current-org-selector" data-toggle="dropdown">
- <i class="pictogram">📁</i> {{currentOrg}}<span class="caret"></span>
- </a>
- <ul class="dropdown-menu org-nav">
- <li name="org-selector" ng-repeat="(k,v) in organizations">
- <a id="org-{{v.name}}-selector" class="org-overview" ng-click="orgChange(v.name)"> {{v.name}}</a>
- </li>
- </ul>
+ <div class="btn-group ">
+ <a class="btn dropdown-toggle top-selector org-selector"
+ id="current-org-selector" data-toggle="dropdown"> <i
+ class="pictogram">📁</i> {{currentOrg}}<span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu org-nav">
+ <li name="org-selector" ng-repeat="(k,v) in organizations">
+ <a id="org-{{v.name}}-selector" class="org-overview"
+ ng-click="orgChange(v.name)"> {{v.name}}</a>
+ </li>
+ </ul>
</div>
- </li></ul>
+ </li>
+</ul>
[4/6] USERGRID-207 Fix license headers in portal Angular.js files
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/display-users.html
----------------------------------------------------------------------
diff --git a/portal/js/data/display-users.html b/portal/js/data/display-users.html
index 48328d0..5e0af48 100644
--- a/portal/js/data/display-users.html
+++ b/portal/js/data/display-users.html
@@ -1,3 +1,4 @@
+<table id="query-response-table" class="table">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,43 +15,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<table id="query-response-table" class="table">
<tbody>
- <tr class="zebraRows users-row">
- <td class="checkboxo">
- <input type="checkbox" onclick="Usergrid.console.selectAllEntities(this);"></td>
- <td class="gravatar50-td"> </td>
- <td class="user-details bold-header">Username</td>
- <td class="user-details bold-header">Display Name</td>
- <td class="user-details bold-header">UUID</td>
- <td class="view-details"> </td>
- </tr>
- <tr class="zebraRows users-row">
- <td class="checkboxo">
- <input class="listItem" type="checkbox" name="/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7" value="bf9a95da-d508-11e2-bf44-236d2eee13a7">
- </td>
- <td class="gravatar50-td">
- <img src="http://www.gravatar.com/avatar/01b37aa66496988ca780b3f515bc768e" class="gravatar50">
- </td>
- <td class="details">
- <a onclick="Usergrid.console.getCollection('GET', '/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/'+'bf9a95da-d508-11e2-bf44-236d2eee13a7'); $('#data-explorer').show(); return false;" class="view-details">10</a>
- </td>
- <td class="details"> #"><img src=x onerror=prompt(1);> </td>
- <td class="details"> bf9a95da-d508-11e2-bf44-236d2eee13a7 </td>
- <td class="view-details">
- <a href="" onclick="$('#query-row-bf9a95da-d508-11e2-bf44-236d2eee13a7').toggle(); $('#data-explorer').show(); return false;" class="view-details">Details</a>
- </td>
- </tr>
- <tr id="query-row-bf9a95da-d508-11e2-bf44-236d2eee13a7" style="display:none">
- <td colspan="5">
- <div>
- <div style="padding-bottom: 10px;">
- <button type="button" class="btn btn-small query-button active" id="button-query-show-row-JSON" onclick="Usergrid.console.activateQueryRowJSONButton(); $('#query-row-JSON-bf9a95da-d508-11e2-bf44-236d2eee13a7').show(); $('#query-row-content-bf9a95da-d508-11e2-bf44-236d2eee13a7').hide(); return false;">JSON</button>
- <button type="button" class="btn btn-small query-button disabled" id="button-query-show-row-content" onclick="Usergrid.console.activateQueryRowContentButton();$('#query-row-content-bf9a95da-d508-11e2-bf44-236d2eee13a7').show(); $('#query-row-JSON-bf9a95da-d508-11e2-bf44-236d2eee13a7').hide(); return false;">Content</button>
- </div>
- <div id="query-row-JSON-bf9a95da-d508-11e2-bf44-236d2eee13a7">
- <pre>{
+ <tr class="zebraRows users-row">
+ <td class="checkboxo"><input type="checkbox"
+ onclick="Usergrid.console.selectAllEntities(this);"></td>
+ <td class="gravatar50-td"> </td>
+ <td class="user-details bold-header">Username</td>
+ <td class="user-details bold-header">Display Name</td>
+ <td class="user-details bold-header">UUID</td>
+ <td class="view-details"> </td>
+ </tr>
+ <tr class="zebraRows users-row">
+ <td class="checkboxo"><input class="listItem" type="checkbox"
+ name="/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7"
+ value="bf9a95da-d508-11e2-bf44-236d2eee13a7"></td>
+ <td class="gravatar50-td"><img
+ src="http://www.gravatar.com/avatar/01b37aa66496988ca780b3f515bc768e"
+ class="gravatar50"></td>
+ <td class="details"><a
+ onclick="Usergrid.console.getCollection('GET', '/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/'+'bf9a95da-d508-11e2-bf44-236d2eee13a7'); $('#data-explorer').show(); return false;"
+ class="view-details">10</a></td>
+ <td class="details">#"><img src=x
+ onerror=prompt(1);></td>
+ <td class="details">bf9a95da-d508-11e2-bf44-236d2eee13a7</td>
+ <td class="view-details"><a href=""
+ onclick="$('#query-row-bf9a95da-d508-11e2-bf44-236d2eee13a7').toggle(); $('#data-explorer').show(); return false;"
+ class="view-details">Details</a></td>
+ </tr>
+ <tr id="query-row-bf9a95da-d508-11e2-bf44-236d2eee13a7"
+ style="display: none">
+ <td colspan="5">
+ <div>
+ <div style="padding-bottom: 10px;">
+ <button type="button"
+ class="btn btn-small query-button active"
+ id="button-query-show-row-JSON"
+ onclick="Usergrid.console.activateQueryRowJSONButton(); $('#query-row-JSON-bf9a95da-d508-11e2-bf44-236d2eee13a7').show(); $('#query-row-content-bf9a95da-d508-11e2-bf44-236d2eee13a7').hide(); return false;">JSON</button>
+ <button type="button"
+ class="btn btn-small query-button disabled"
+ id="button-query-show-row-content"
+ onclick="Usergrid.console.activateQueryRowContentButton();$('#query-row-content-bf9a95da-d508-11e2-bf44-236d2eee13a7').show(); $('#query-row-JSON-bf9a95da-d508-11e2-bf44-236d2eee13a7').hide(); return false;">Content</button>
+ </div>
+ <div id="query-row-JSON-bf9a95da-d508-11e2-bf44-236d2eee13a7">
+ <pre>{
"picture": "http://www.gravatar.com/avatar/01b37aa66496988ca780b3f515bc768e",
"uuid": "bf9a95da-d508-11e2-bf44-236d2eee13a7",
"type": "user",
@@ -86,19 +93,155 @@
},
"title": "#"><img src=x onerror=prompt(1);>"
}</pre>
+ </div>
+ <div
+ id="query-row-content-bf9a95da-d508-11e2-bf44-236d2eee13a7"
+ style="display: none">
+ <table>
+ <tbody>
+ <tr>
+ <td>picture</td>
+ <td>http://www.gravatar.com/avatar/01b37aa66496988ca780b3f515bc768e</td>
+ </tr>
+ <tr>
+ <td>uuid</td>
+ <td>bf9a95da-d508-11e2-bf44-236d2eee13a7</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>user</td>
+ </tr>
+ <tr>
+ <td>name</td>
+ <td>#&quot;&gt;&lt;img src=x
+ onerror=prompt(1);&gt;</td>
+ </tr>
+ <tr>
+ <td>created</td>
+ <td>1371224432557</td>
+ </tr>
+ <tr>
+ <td>modified</td>
+ <td>1371851347024</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>10</td>
+ </tr>
+ <tr>
+ <td>email</td>
+ <td>fdsafdsa@ookfd.com</td>
+ </tr>
+ <tr>
+ <td>activated</td>
+ <td>true</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td style="padding: 0"><table>
+ <tbody>
+ <tr></tr>
+ <tr>
+ <td>addr1</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>addr2</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>city</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>state</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>zip</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>country</td>
+ <td></td>
+ </tr>
+ </tbody>
+ </table></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td style="padding: 0"><table>
+ <tbody>
+ <tr></tr>
+ <tr>
+ <td>path</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td style="padding: 0"><table>
+ <tbody>
+ <tr></tr>
+ <tr>
+ <td>rolenames</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/rolenames</td>
+ </tr>
+ <tr>
+ <td>permissions</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/permissions</td>
+ </tr>
+ </tbody>
+ </table></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td style="padding: 0"><table>
+ <tbody>
+ <tr></tr>
+ <tr>
+ <td>activities</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/activities</td>
+ </tr>
+ <tr>
+ <td>devices</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/devices</td>
+ </tr>
+ <tr>
+ <td>feed</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/feed</td>
+ </tr>
+ <tr>
+ <td>groups</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/groups</td>
+ </tr>
+ <tr>
+ <td>roles</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/roles</td>
+ </tr>
+ <tr>
+ <td>following</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/following</td>
+ </tr>
+ <tr>
+ <td>followers</td>
+ <td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/followers</td>
+ </tr>
+ </tbody>
+ </table></td>
+ </tr>
+ </tbody>
+ </table></td>
+ </tr>
+ <tr>
+ <td>title</td>
+ <td>#&quot;&gt;&lt;img src=x
+ onerror=prompt(1);&gt;</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
- <div id="query-row-content-bf9a95da-d508-11e2-bf44-236d2eee13a7" style="display:none">
- <table>
- <tbody>
- <tr>
- <td>picture</td>
- <td>http://www.gravatar.com/avatar/01b37aa66496988ca780b3f515bc768e</td></tr><tr><td>uuid</td><td>bf9a95da-d508-11e2-bf44-236d2eee13a7</td></tr><tr><td>type</td><td>user</td></tr><tr><td>name</td><td>#&quot;&gt;&lt;img src=x onerror=prompt(1);&gt;</td></tr><tr><td>created</td><td>1371224432557</td></tr><tr><td>modified</td><td>1371851347024</td></tr><tr><td>username</td><td>10</td></tr><tr><td>email</td><td>fdsafdsa@ookfd.com</td></tr><tr><td>activated</td><td>true</td></tr><tr><td></td><td style="padding: 0"><table><tbody><tr></tr><tr><td>addr1</td><td></td></tr><tr><td>addr2</td><td></td></tr><tr><td>city</td><td></td></tr><tr><td>state</td><td></td></tr><tr><td>zip</td><td></td></tr><tr><td>country</td><td></td></tr></tbody></table></td></tr><tr><td></td><td style="padding: 0"><table><tbody><tr></tr><tr><td>path</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7</td></tr><tr><td></td><td style="padding:
0"><table><tbody><tr></tr><tr><td>rolenames</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/rolenames</td></tr><tr><td>permissions</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/permissions</td></tr></tbody></table></td></tr><tr><td></td><td style="padding: 0"><table><tbody><tr></tr><tr><td>activities</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/activities</td></tr><tr><td>devices</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/devices</td></tr><tr><td>feed</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/feed</td></tr><tr><td>groups</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/groups</td></tr><tr><td>roles</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95d
a-d508-11e2-bf44-236d2eee13a7/roles</td></tr><tr><td>following</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/following</td></tr><tr><td>followers</td><td>/users/8bb9a3fa-d508-11e2-875d-a59031a365e8/following/bf9a95da-d508-11e2-bf44-236d2eee13a7/followers</td></tr></tbody></table></td></tr></tbody></table></td></tr><tr><td>title</td><td>#&quot;&gt;&lt;img src=x onerror=prompt(1);&gt;</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </td>
- </tr>
+ </td>
+ </tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/entity.html
----------------------------------------------------------------------
diff --git a/portal/js/data/entity.html b/portal/js/data/entity.html
index 161e5b6..349b81f 100644
--- a/portal/js/data/entity.html
+++ b/portal/js/data/entity.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,9 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
-
<h4>Entity Detail</h4>
<div class="well">
<a href="#!/data" class="outside-link"><< Back to collection</a>
@@ -24,22 +22,22 @@
<fieldset>
<div class="control-group">
<strong>Path </strong>
- <div class="controls">
- {{entityType}}/{{entityUUID}}
- </div>
+ <div class="controls">{{entityType}}/{{entityUUID}}</div>
</div>
<div class="control-group">
- <label class="control-label" for="query-source"><strong>JSON Body</strong></label>
+ <label class="control-label" for="query-source"><strong>JSON
+ Body</strong></label>
<div class="controls">
<textarea ng-model="queryBody" class="span6 pull-left" rows="12">{{queryBody}}</textarea>
- <br>
- <a class="btn pull-left" ng-click="validateJson();">Validate JSON</a>
+ <br> <a class="btn pull-left" ng-click="validateJson();">Validate
+ JSON</a>
</div>
</div>
<div style="clear: both; height: 10px;"></div>
<div class="control-group">
- <button type="button" class="btn btn-primary" id="button-query" ng-click="saveEntity();">Save</button>
+ <button type="button" class="btn btn-primary" id="button-query"
+ ng-click="saveEntity();">Save</button>
<!--button type="button" class="btn btn-primary" id="button-query" ng-click="run();">Delete</button-->
</div>
</fieldset>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/global/insecure-banner.html
----------------------------------------------------------------------
diff --git a/portal/js/global/insecure-banner.html b/portal/js/global/insecure-banner.html
index 9b28f1e..25cf880 100644
--- a/portal/js/global/insecure-banner.html
+++ b/portal/js/global/insecure-banner.html
@@ -1,3 +1,4 @@
+<div ng-if="securityWarning" ng-cloak class="demo-holder">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,11 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div ng-if="securityWarning" ng-cloak class="demo-holder">
- <div class="alert alert-demo alert-animate">
- <div class="alert-text">
- <i class="pictogram">⚠</i>Warning: This application has "sandbox" permissions and is not production ready. <a target="_blank" href="http://apigee.com/docs/app-services/content/securing-your-app">Please go to our security documentation to find out more.</a></span>
- </div>
+ <div class="alert alert-demo alert-animate">
+ <div class="alert-text">
+ <i class="pictogram">⚠</i>Warning: This application has
+ "sandbox" permissions and is not production ready. <a
+ target="_blank"
+ href="http://apigee.com/docs/app-services/content/securing-your-app">Please
+ go to our security documentation to find out more.</a></span>
</div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/global/page-title.html
----------------------------------------------------------------------
diff --git a/portal/js/global/page-title.html b/portal/js/global/page-title.html
index c08bd26..1d4f32c 100644
--- a/portal/js/global/page-title.html
+++ b/portal/js/global/page-title.html
@@ -1,3 +1,4 @@
+<section class="row-fluid">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,21 +15,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<section class="row-fluid">
- <div class="span12">
- <div class="page-filters">
- <h1 class="title pull-left" id="pageTitle"><i class="pictogram title" style="padding-right: 5px;">{{icon}}</i>{{title}} <a class="super-help" href="http://community.apigee.com/content/apigee-customer-support" target="_blank" >(need help?)</a></h1>
- </div>
+ <div class="span12">
+ <div class="page-filters">
+ <h1 class="title pull-left" id="pageTitle">
+ <i class="pictogram title" style="padding-right: 5px;">{{icon}}</i>{{title}}
+ <a class="super-help"
+ href="http://community.apigee.com/content/apigee-customer-support"
+ target="_blank">(need help?)</a>
+ </h1>
</div>
- <bsmodal id="need-help"
- title="Need Help?"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="sendHelp"
- extrabuttonlabel="Get Help"
- ng-cloak>
- <p>Do you want to contact support? Support will get in touch with you as soon as possible.</p>
- </bsmodal>
+ </div>
+ <bsmodal id="need-help" title="Need Help?" close="hideModal"
+ closelabel="Cancel" extrabutton="sendHelp"
+ extrabuttonlabel="Get Help" ng-cloak>
+ <p>Do you want to contact support? Support will get in touch with
+ you as soon as possible.</p>
+ </bsmodal>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/groups/groups-activities.html
----------------------------------------------------------------------
diff --git a/portal/js/groups/groups-activities.html b/portal/js/groups/groups-activities.html
index f9733be..a9d0a4f 100644
--- a/portal/js/groups/groups-activities.html
+++ b/portal/js/groups/groups-activities.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="GroupsActivitiesCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,25 +15,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="GroupsActivitiesCtrl">
-
<br>
<div>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Date</td>
- <td>Content</td>
- <td>Verb</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="activity in selectedGroup.activities">
- <td>{{activity.createdDate}}</td>
- <td>{{activity.content}}</td>
- <td>{{activity.verb}}</td>
- <td>{{activity.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Date</td>
+ <td>Content</td>
+ <td>Verb</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows"
+ ng-repeat="activity in selectedGroup.activities">
+ <td>{{activity.createdDate}}</td>
+ <td>{{activity.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/groups/groups-details.html
----------------------------------------------------------------------
diff --git a/portal/js/groups/groups-details.html b/portal/js/groups/groups-details.html
index 90f2142..caac28f 100644
--- a/portal/js/groups/groups-details.html
+++ b/portal/js/groups/groups-details.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="GroupsDetailsCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,33 +15,52 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="GroupsDetailsCtrl">
-
<div>
- <form name="updateGroupDetailForm" ng-submit="saveSelectedGroup()" novalidate>
- <div style="float: left; padding-right: 30px;">
- <h4 class="ui-dform-legend">Group Information</h4>
- <label for="group-title" class="ui-dform-label">Group Title</label>
- <input type="text" id="group-title" ng-pattern="titleRegex" ng-attr-title="{{titleRegexDescription}}" required class="ui-dform-text" ng-model="group.title" ug-validate>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group title box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_details_title}}" tooltip-placement="right">(?)</a>
- <br/>
- <label for="group-path" class="ui-dform-label">Group Path</label>
- <input type="text" id="group-path" required ng-attr-title="{{pathRegexDescription}}" placeholder="ex: /mydata" ng-pattern="pathRegex" class="ui-dform-text" ng-model="group.path" ug-validate>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group path box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_details_path}}" tooltip-placement="right">(?)</a>
- <br/>
- </div>
- <br style="clear:both"/>
+ <form name="updateGroupDetailForm" ng-submit="saveSelectedGroup()"
+ novalidate>
+ <div style="float: left; padding-right: 30px;">
+ <h4 class="ui-dform-legend">Group Information</h4>
+ <label for="group-title" class="ui-dform-label">Group
+ Title</label> <input type="text" id="group-title"
+ ng-pattern="titleRegex"
+ ng-attr-title="{{titleRegexDescription}}" required
+ class="ui-dform-text" ng-model="group.title" ug-validate>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group title box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_details_title}}"
+ tooltip-placement="right">(?)</a> <br /> <label
+ for="group-path" class="ui-dform-label">Group Path</label> <input
+ type="text" id="group-path" required
+ ng-attr-title="{{pathRegexDescription}}"
+ placeholder="ex: /mydata" ng-pattern="pathRegex"
+ class="ui-dform-text" ng-model="group.path" ug-validate>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group path box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_details_path}}"
+ tooltip-placement="right">(?)</a> <br />
+ </div>
+ <br style="clear: both" />
- <div style="width:100%;float:left;padding: 20px 0">
- <input type="submit" value="Save Group" style="margin-right: 15px;" ng-disabled="!updateGroupDetailForm.$valid" class="btn btn-primary" />
- </div>
+ <div style="width: 100%; float: left; padding: 20px 0">
+ <input type="submit" value="Save Group"
+ style="margin-right: 15px;"
+ ng-disabled="!updateGroupDetailForm.$valid"
+ class="btn btn-primary" />
+ </div>
- <div class="content-container">
- <h4>JSON Group Object <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group json object')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_json_object}}" tooltip-placement="right">(?)</a></h4>
- <pre id="{{help.showJsonId}}">{{json}}</pre>
- </div>
- </form>
+ <div class="content-container">
+ <h4>
+ JSON Group Object <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group json object')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_json_object}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
+ <pre id="{{help.showJsonId}}">{{json}}</pre>
+ </div>
+ </form>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/groups/groups-members.html
----------------------------------------------------------------------
diff --git a/portal/js/groups/groups-members.html b/portal/js/groups/groups-members.html
index d92853f..6aa4730 100644
--- a/portal/js/groups/groups-members.html
+++ b/portal/js/groups/groups-members.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="GroupsMembersCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,65 +15,68 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="GroupsMembersCtrl">
-
-
- <bsmodal id="removeFromGroup"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="removeUsersFromGroupDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to remove the users from the seleted group(s)?</p>
+ <bsmodal id="removeFromGroup" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="removeUsersFromGroupDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to remove the users from the seleted
+ group(s)?</p>
</bsmodal>
- <bsmodal id="addGroupToUser"
- title="Add user to group"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addGroupToUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.user != '' ? $parent.user.username : 'Select a user...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="user in $parent.usersTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addGroupToUser" title="Add user to group"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addGroupToUserDialog" extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.user
+ != '' ? $parent.user.username : 'Select a user...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="user in $parent.usersTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
+ </ul>
+ </div>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group add user button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_users_add_user}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addGroupToUser')">Add User to Group</button>
- <button class="btn btn-primary" ng-disabled="!hasMembers || !valueSelected(groupsCollection.users._list)" ng-click="showModal('removeFromGroup')">Remove User(s) from Group</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group add user button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_users_add_user}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addGroupToUser')">Add User to Group</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasMembers || !valueSelected(groupsCollection.users._list)"
+ ng-click="showModal('removeFromGroup')">Remove User(s)
+ from Group</button>
</div>
<table class="table table-striped">
<tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasMembers" id="selectAllCheckbox" ng-model="groupMembersSelected" ng-click="selectAllEntities(groupsCollection.users._list,this,'groupMembersSelected')"></td>
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasMembers" id="selectAllCheckbox"
+ ng-model="groupMembersSelected"
+ ng-click="selectAllEntities(groupsCollection.users._list,this,'groupMembersSelected')"></td>
<td style="width: 50px;"></td>
<td>Username</td>
<td>Display Name</td>
</tr>
- <tr class="zebraRows" ng-repeat="user in groupsCollection.users._list">
- <td>
- <input
- type="checkbox"
- ng-model="user.checked"
- >
+ <tr class="zebraRows"
+ ng-repeat="user in groupsCollection.users._list">
+ <td><input type="checkbox" ng-model="user.checked">
</td>
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
<td>{{user.get('username')}}</td>
<td>{{user.get('name')}}</td>
</tr>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/groups/groups-roles.html
----------------------------------------------------------------------
diff --git a/portal/js/groups/groups-roles.html b/portal/js/groups/groups-roles.html
index 2fd3172..2e450f7 100644
--- a/portal/js/groups/groups-roles.html
+++ b/portal/js/groups/groups-roles.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="GroupsRolesCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,133 +15,162 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="GroupsRolesCtrl">
-
- <bsmodal id="addGroupToRole"
- title="Add group to role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addGroupToRoleDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.name != '' ? $parent.name : 'Role name...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="role in $parent.rolesTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.name = role.name">{{role.name}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addGroupToRole" title="Add group to role"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addGroupToRoleDialog" extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.name
+ != '' ? $parent.name : 'Role name...'}}</span> <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="role in $parent.rolesTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.name = role.name">{{role.name}}</a></li>
+ </ul>
+ </div>
</bsmodal>
- <bsmodal id="leaveRoleFromGroup"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="leaveRoleDialog"
- extrabuttonlabel="Leave"
- ng-cloak>
- <p>Are you sure you want to remove the group from the role(s)?</p>
+ <bsmodal id="leaveRoleFromGroup" title="Confirmation"
+ close="hideModal" closelabel="Cancel" extrabutton="leaveRoleDialog"
+ extrabuttonlabel="Leave" ng-cloak>
+ <p>Are you sure you want to remove the group from the role(s)?</p>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups roles add role button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_add_leave_role}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addGroupToRole')">Add Role to Group</button>
- <button class="btn btn-primary" ng-disabled="!hasRoles || !valueSelected(groupsCollection.roles._list)" ng-click="showModal('leaveRoleFromGroup')">Remove Role(s) from Group</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups roles add role button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_add_leave_role}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addGroupToRole')">Add Role to Group</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasRoles || !valueSelected(groupsCollection.roles._list)"
+ ng-click="showModal('leaveRoleFromGroup')">Remove Role(s)
+ from Group</button>
</div>
- <h4>Roles <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups roles roles list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_roles}}" tooltip-placement="top">(?)</a></h4>
+ <h4>
+ Roles <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups roles roles list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_roles}}"
+ tooltip-placement="top">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasRoles" id="groupsSelectAllCheckBox" ng-model="groupRoleSelected" ng-click="selectAllEntities(groupsCollection.roles._list,this,'groupRoleSelected')" ></td>
- <td>Role Name</td>
- <td>Role title</td>
- </tr>
- <tr class="zebraRows" ng-repeat="role in groupsCollection.roles._list">
- <td>
- <input
- type="checkbox"
- ng-model="role.checked"
- >
- </td>
- <td>{{role._data.name}}</td>
- <td>{{role._data.title}}</td>
- </tr>
+ <tr class="table-header">
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasRoles" id="groupsSelectAllCheckBox"
+ ng-model="groupRoleSelected"
+ ng-click="selectAllEntities(groupsCollection.roles._list,this,'groupRoleSelected')"></td>
+ <td>Role Name</td>
+ <td>Role title</td>
+ </tr>
+ <tr class="zebraRows"
+ ng-repeat="role in groupsCollection.roles._list">
+ <td><input type="checkbox" ng-model="role.checked">
+ </td>
+ <td>{{role._data.name}}</td>
+ <td>{{role._data.title}}</td>
+ </tr>
</tbody>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPreviousRoles()" style="display:{{roles_previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNextRoles()" style="display:{{roles_next_display}};float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPreviousRoles()"
+ style="display: {{roles_previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNextRoles()"
+ style="display: {{roles_next_display">Next ></button>
</div>
- <bsmodal id="deletePermission"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteGroupPermissionDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to delete the permission(s)?</p>
+ <bsmodal id="deletePermission" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="deleteGroupPermissionDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to delete the permission(s)?</p>
</bsmodal>
- <bsmodal id="addPermission"
- title="New Permission"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addGroupPermissionDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <p>Path: <input ng-model="$parent.permissions.path" placeholder="ex: /mydata" id="groupsrolespermissions" type="text" ng-pattern="pathRegex" ng-attr-title="{{pathRegexDescription}}" required ug-validate /> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles new permission path box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_new_permission_path}}" tooltip-placement="right">(?)</a></p>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.getPerm"> GET <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles add permission button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_new_permission_verbs}}" tooltip-placement="right">(?)</a>
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.postPerm"> POST
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.putPerm"> PUT
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.deletePerm"> DELETE
- </div>
+ <bsmodal id="addPermission" title="New Permission" close="hideModal"
+ closelabel="Cancel" extrabutton="addGroupPermissionDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <p>
+ Path: <input ng-model="$parent.permissions.path"
+ placeholder="ex: /mydata" id="groupsrolespermissions" type="text"
+ ng-pattern="pathRegex" ng-attr-title="{{pathRegexDescription}}"
+ required ug-validate /> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles new permission path box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_new_permission_path}}"
+ tooltip-placement="right">(?)</a>
+ </p>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.getPerm">
+ GET <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles add permission button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_new_permission_verbs}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.postPerm">
+ POST
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.putPerm">
+ PUT
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.deletePerm">
+ DELETE
+ </div>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups roles add permission button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_add_delete_permission}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addPermission')">Add Permission</button>
- <button class="btn btn-primary" ng-disabled="!hasPermissions || !valueSelected(selectedGroup.permissions)" ng-click="showModal('deletePermission')">Delete Permission(s)</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups roles add permission button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_add_delete_permission}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addPermission')">Add Permission</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasPermissions || !valueSelected(selectedGroup.permissions)"
+ ng-click="showModal('deletePermission')">Delete
+ Permission(s)</button>
</div>
- <h4>Permissions <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups roles permissions list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_permissions}}" tooltip-placement="top">(?)</a>
+ <h4>
+ Permissions <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups roles permissions list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_permissions}}"
+ tooltip-placement="top">(?)</a>
</h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td style="width: 30px;"><input ng-show="hasPermissions" type="checkbox" id="permissionsSelectAllCheckBox" ng-model="groupPermissionsSelected" ng-click="selectAllEntities(selectedGroup.permissions,this,'groupPermissionsSelected')" ></td>
- <td>Path</td>
- <td>GET</td>
- <td>POST</td>
- <td>PUT</td>
- <td>DELETE</td>
- </tr>
- <tr class="zebraRows" ng-repeat="permission in selectedGroup.permissions">
- <td>
- <input
- type="checkbox"
- ng-model="permission.checked"
- >
- </td>
- <td>{{permission.path}}</td>
- <td>{{permission.operations.get}}</td>
- <td>{{permission.operations.post}}</td>
- <td>{{permission.operations.put}}</td>
- <td>{{permission.operations.delete}}</td>
- </tr>
+ <tr class="table-header">
+ <td style="width: 30px;"><input ng-show="hasPermissions"
+ type="checkbox" id="permissionsSelectAllCheckBox"
+ ng-model="groupPermissionsSelected"
+ ng-click="selectAllEntities(selectedGroup.permissions,this,'groupPermissionsSelected')"></td>
+ <td>Path</td>
+ <td>GET</td>
+ <td>POST</td>
+ <td>PUT</td>
+ <td>DELETE</td>
+ </tr>
+ <tr class="zebraRows"
+ ng-repeat="permission in selectedGroup.permissions">
+ <td><input type="checkbox" ng-model="permission.checked">
+ </td>
+ <td>{{permission.path}}</td>
+ <td>{{permission.operations.get}}</td>
+ <td>{{permission.operations.post}}</td>
+ <td>{{permission.operations.put}}</td>
+ <td>{{permission.operations.delete}}</td>
+ </tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/groups/groups-tabs.html
----------------------------------------------------------------------
diff --git a/portal/js/groups/groups-tabs.html b/portal/js/groups/groups-tabs.html
index 89bb5bb..da25df2 100644
--- a/portal/js/groups/groups-tabs.html
+++ b/portal/js/groups/groups-tabs.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,14 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<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">👥</i> Groups</h1>
+ <h1 class="title" class="pull-left">
+ <i class="pictogram title">👥</i> Groups
+ </h1>
</div>
</div>
@@ -29,18 +29,28 @@
<div id="user-panel" class="panel-buffer">
<ul id="user-panel-tab-bar" class="nav nav-tabs">
- <li><a href="javaScript:void(0);" ng-click="gotoPage('groups')">Group List</a></li>
- <li ng-class="detailsSelected"><a href="javaScript:void(0);" ng-click="gotoPage('groups/details')">Details</a></li>
- <li ng-class="membersSelected"><a href="javaScript:void(0);" ng-click="gotoPage('groups/members')">Users</a></li>
- <li ng-class="activitiesSelected"><a href="javaScript:void(0);" ng-click="gotoPage('groups/activities')">Activities</a></li>
- <li ng-class="rolesSelected"><a href="javaScript:void(0);" ng-click="gotoPage('groups/roles')">Roles & Permissions</a></li>
+ <li><a href="javaScript:void(0);"
+ ng-click="gotoPage('groups')">Group List</a></li>
+ <li ng-class="detailsSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('groups/details')">Details</a></li>
+ <li ng-class="membersSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('groups/members')">Users</a></li>
+ <li ng-class="activitiesSelected"><a
+ href="javaScript:void(0);"
+ ng-click="gotoPage('groups/activities')">Activities</a></li>
+ <li ng-class="rolesSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('groups/roles')">Roles & Permissions</a></li>
</ul>
</div>
<div style="float: left; margin-right: 10px;">
<div style="float: left;">
- <div class="user-header-title"><strong>Group Path: </strong>{{selectedGroup.get('path')}}</div>
- <div class="user-header-title"><strong>Group Title: </strong>{{selectedGroup.get('title')}}</div>
+ <div class="user-header-title">
+ <strong>Group Path: </strong>{{selectedGroup.get('path')}}
+ </div>
+ <div class="user-header-title">
+ <strong>Group Title: </strong>{{selectedGroup.get('title')}}
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/groups/groups.html
----------------------------------------------------------------------
diff --git a/portal/js/groups/groups.html b/portal/js/groups/groups.html
index bd8da96..8769d07 100644
--- a/portal/js/groups/groups.html
+++ b/portal/js/groups/groups.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,97 +15,149 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <div id="intro-page">
+ <page-title title=" Groups" icon="👥"></page-title>
-<div class="content-page">
-
- <div id="intro-page" >
- <page-title title=" Groups" icon="👥"></page-title>
-
</div>
- <bsmodal id="newGroup"
- title="New Group"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newGroupDialog"
- extrabuttonlabel="Add"
- ng-model="dialog"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- <label for="title">Title</label>
- <div class="controls">
- <input type="text" id="title" ng-pattern="titleRegex" ng-attr-title="{{titleRegexDescription}}" required ng-model="newGroup.title"class="input-xlarge" ug-validate/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group title box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_details_title}}" tooltip-placement="right">(?)</a>
- </div>
+ <bsmodal id="newGroup" title="New Group" close="hideModal"
+ closelabel="Cancel" extrabutton="newGroupDialog"
+ extrabuttonlabel="Add" ng-model="dialog" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="title">Title</label>
+ <div class="controls">
+ <input type="text" id="title" ng-pattern="titleRegex"
+ ng-attr-title="{{titleRegexDescription}}" required
+ ng-model="newGroup.title" class="input-xlarge" ug-validate />
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group title box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_details_title}}"
+ tooltip-placement="right">(?)</a>
</div>
- <div class="control-group">
- <label for="path">Path</label>
- <div class="controls">
- <input id="path" type="text" ng-attr-title="{{pathRegexDescription}}" placeholder="ex: /mydata" ng-pattern="pathRegex" required ng-model="newGroup.path" class="input-xlarge" ug-validate/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group path box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_details_path}}" tooltip-placement="right">(?)</a>
- </div>
+ </div>
+ <div class="control-group">
+ <label for="path">Path</label>
+ <div class="controls">
+ <input id="path" type="text"
+ ng-attr-title="{{pathRegexDescription}}"
+ placeholder="ex: /mydata" ng-pattern="pathRegex" required
+ ng-model="newGroup.path" class="input-xlarge" ug-validate /> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group path box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_details_path}}"
+ tooltip-placement="right">(?)</a>
</div>
- </fieldset>
+ </div>
+ </fieldset>
</bsmodal>
- <bsmodal id="deleteGroup"
- title="Delete Group"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteGroupsDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to delete the group(s)?</p>
+ <bsmodal id="deleteGroup" title="Delete Group" close="hideModal"
+ closelabel="Cancel" extrabutton="deleteGroupsDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to delete the group(s)?</p>
</bsmodal>
<section class="row-fluid">
<div id="intro-list" class="span3 user-col">
<div class="button-toolbar span12">
- <a title="Select All" class="btn btn-primary select-all toolbar" ng-show="hasGroups" ng-click="selectAllEntities(groupsCollection._list,this,'groupBoxesSelected',true)"> <i class="pictogram">⊟</i></a>
- <button title="Delete" class="btn btn-primary toolbar" ng-disabled="!hasGroups || !valueSelected(groupsCollection._list)" ng-click="showModal('deleteGroup')"><i class="pictogram">☕</i></button>
- <button title="Add" class="btn btn-primary toolbar" ng-click="showModal('newGroup')"><i class="pictogram"></i></button>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_add_remove_buttons}}" tooltip-placement="right">(?)</a>
+ <a title="Select All" class="btn btn-primary select-all toolbar"
+ ng-show="hasGroups"
+ ng-click="selectAllEntities(groupsCollection._list,this,'groupBoxesSelected',true)">
+ <i class="pictogram">⊟</i>
+ </a>
+ <button title="Delete" class="btn btn-primary toolbar"
+ ng-disabled="!hasGroups || !valueSelected(groupsCollection._list)"
+ ng-click="showModal('deleteGroup')">
+ <i class="pictogram">☕</i>
+ </button>
+ <button title="Add" class="btn btn-primary toolbar"
+ ng-click="showModal('newGroup')">
+ <i class="pictogram"></i>
+ </button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_add_remove_buttons}}"
+ tooltip-placement="right">(?)</a>
</div>
<ul class="user-list">
- <li ng-class="selectedGroup._data.uuid === group._data.uuid ? 'selected' : ''" ng-repeat="group in groupsCollection._list" ng-click="selectGroup(group._data.uuid)">
- <input
- type="checkbox"
- ng-value="group._data.uuid"
- ng-checked="group.checked"
- ng-model="group.checked"
- >
- <a href="javaScript:void(0)" >{{group.get('title')}}</a>
- <br/>
+ <li
+ ng-class="selectedGroup._data.uuid === group._data.uuid ? 'selected' : ''"
+ ng-repeat="group in groupsCollection._list"
+ ng-click="selectGroup(group._data.uuid)"><input
+ type="checkbox" ng-value="group._data.uuid"
+ ng-checked="group.checked" ng-model="group.checked">
+ <a href="javaScript:void(0)">{{group.get('title')}}</a> <br />
<span ng-if="group.get('path')" class="label">Path:</span>/{{group.get('path')}}
</li>
</ul>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
</div>
- <div id="{{help.showTabsId}}" class="span9 tab-content" ng-show="selectedGroup.get" >
+ <div id="{{help.showTabsId}}" class="span9 tab-content"
+ ng-show="selectedGroup.get">
<div class="menu-toolbar">
- <ul class="inline" >
- <li class="tab" ng-class="currentGroupsPage.route === '/groups/details' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectGroupPage('/groups/details')"><i class="pictogram"></i>Details</a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups details tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_details_tab}}" tooltip-placement="right">(?)</a></div>
- </li>
- <li class="tab" ng-class="currentGroupsPage.route === '/groups/members' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectGroupPage('/groups/members')"><i class="pictogram">👥</i>Users</a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups users tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_users_tab}}" tooltip-placement="right">(?)</a></div>
- </li>
- <li class="tab" ng-class="currentGroupsPage.route === '/groups/activities' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectGroupPage('/groups/activities')"><i class="pictogram"></i>Activities</a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups activities tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_activities_tab}}" tooltip-placement="right">(?)</a></div>
- </li>
- <li class="tab" ng-class="currentGroupsPage.route === '/groups/roles' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectGroupPage('/groups/roles')"><i class="pictogram">🌎</i>Roles & Permissions</a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('groups role tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_roles_tab}}" tooltip-placement="right">(?)</a></div>
- </li>
+ <ul class="inline">
+ <li class="tab"
+ ng-class="currentGroupsPage.route === '/groups/details' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectGroupPage('/groups/details')"><i
+ class="pictogram"></i>Details</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups details tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_details_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentGroupsPage.route === '/groups/members' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectGroupPage('/groups/members')"><i
+ class="pictogram">👥</i>Users</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups users tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_users_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentGroupsPage.route === '/groups/activities' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectGroupPage('/groups/activities')"><i
+ class="pictogram"></i>Activities</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups activities tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_activities_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentGroupsPage.route === '/groups/roles' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectGroupPage('/groups/roles')"><i
+ class="pictogram">🌎</i>Roles & Permissions</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('groups role tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_roles_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
</ul>
</div>
<span ng-include="currentGroupsPage.template"></span>
-
</section>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/login/forgot-password.html
----------------------------------------------------------------------
diff --git a/portal/js/login/forgot-password.html b/portal/js/login/forgot-password.html
index 42ddf13..3dc3542 100644
--- a/portal/js/login/forgot-password.html
+++ b/portal/js/login/forgot-password.html
@@ -1,3 +1,4 @@
+<div class="login-content" ng-controller="ForgotPasswordCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,9 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="login-content" ng-controller="ForgotPasswordCtrl">
- <iframe class="container" ng-src="{{forgotPWiframeURL}}" id="forgot-password-frame" border="0" style="border:0;width:600px;height:620px;">
- <p>Email Address: <input id="resetPasswordEmail" name="resetPasswordEmail" /></p>
- <button class="btn btn-primary" ng-click="">Reset Password</button>
+ <iframe class="container" ng-src="{{forgotPWiframeURL}}"
+ id="forgot-password-frame" border="0"
+ style="border: 0; width: 600px; height: 620px;">
+ <p>
+ Email Address: <input id="resetPasswordEmail"
+ name="resetPasswordEmail" />
+ </p>
+ <button class="btn btn-primary" ng-click="">Reset Password</button>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/login/loading.html
----------------------------------------------------------------------
diff --git a/portal/js/login/loading.html b/portal/js/login/loading.html
index baf7673..0df5c25 100644
--- a/portal/js/login/loading.html
+++ b/portal/js/login/loading.html
@@ -1,3 +1,4 @@
+<h1>Loading...</h1>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -13,6 +14,4 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<h1>Loading...</h1>
+-->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/login/login.html
----------------------------------------------------------------------
diff --git a/portal/js/login/login.html b/portal/js/login/login.html
index fdaaae8..a4ffcb3 100755
--- a/portal/js/login/login.html
+++ b/portal/js/login/login.html
@@ -1,3 +1,4 @@
+<div class="login-content">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,59 +15,75 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="login-content">
- <bsmodal id="sendActivationLink"
- title="Resend Activation Link"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="resendActivationLink"
- extrabuttonlabel="Send Activation"
- ng-cloak>
- <fieldset>
- <p>Email to send to: <input type="email" required ng-model="$parent.activation.id" ng-pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" name="activationId" id="user-activationId" class="input-xlarge"/></p>
- </fieldset>
+ <bsmodal id="sendActivationLink" title="Resend Activation Link"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="resendActivationLink"
+ extrabuttonlabel="Send Activation" ng-cloak>
+ <fieldset>
+ <p>
+ Email to send to: <input type="email" required
+ ng-model="$parent.activation.id" ng-pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}" name="activationId"
+ id="user-activationId" class="input-xlarge" />
+ </p>
+ </fieldset>
</bsmodal>
<div class="login-holder">
- <form name="loginForm" id="login-form" ng-submit="login()" class="form-horizontal" novalidate>
- <h1 class="title">Enter your credentials</h1>
- <div class="alert-error" id="loginError" ng-if="loginMessage">{{loginMessage}}</div>
- <div class="control-group">
- <label class="control-label" for="login-username">Email or Username:</label>
- <div class="controls">
- <input type="text" ng-model="login.username" title="Please add a username or email." class="" id="login-username" required ng-value="login.username" size="20" ug-validate>
+ <form name="loginForm" id="login-form" ng-submit="login()"
+ class="form-horizontal" novalidate>
+ <h1 class="title">Enter your credentials</h1>
+ <div class="alert-error" id="loginError" ng-if="loginMessage">{{loginMessage}}</div>
+ <div class="control-group">
+ <label class="control-label" for="login-username">Email
+ or Username:</label>
+ <div class="controls">
+ <input type="text" ng-model="login.username"
+ title="Please add a username or email." class=""
+ id="login-username" required ng-value="login.username"
+ size="20" ug-validate>
+ </div>
</div>
- </div>
- <div class="control-group">
- <label class="control-label" for="login-password">Password:</label>
- <div class="controls">
- <input type="password" ng-model="login.password" required id="login-password" class="" ng-value="login.password" size="20" ug-validate>
+ <div class="control-group">
+ <label class="control-label" for="login-password">Password:</label>
+ <div class="controls">
+ <input type="password" ng-model="login.password" required
+ id="login-password" class="" ng-value="login.password"
+ size="20" ug-validate>
+ </div>
</div>
- </div>
- <div class="control-group" ng-show="requiresDeveloperKey">
- <label class="control-label" for="login-developerkey">Developer Key:</label>
- <div class="controls">
- <input type="text" ng-model="login.developerkey" id="login-developerkey" class="" ng-value="login.developerkey" size="20" ug-validate>
+ <div class="control-group" ng-show="requiresDeveloperKey">
+ <label class="control-label" for="login-developerkey">Developer
+ Key:</label>
+ <div class="controls">
+ <input type="text" ng-model="login.developerkey"
+ id="login-developerkey" class=""
+ ng-value="login.developerkey" size="20" ug-validate>
+ </div>
</div>
- </div>
- <div class="form-actions">
- <div class="submit">
- <input type="submit" name="button-login" id="button-login" ng-disabled="!loginForm.$valid || loading" value="{{loading ? loadingText : 'Log In'}}" class="btn btn-primary pull-right">
+ <div class="form-actions">
+ <div class="submit">
+ <input type="submit" name="button-login" id="button-login"
+ ng-disabled="!loginForm.$valid || loading"
+ value="{{loading ? loadingText : 'Log In'}}"
+ class="btn btn-primary pull-right">
+ </div>
</div>
- </div>
- </form>
+ </form>
</div>
<div class="extra-actions">
<div class="submit">
- <a ng-click="gotoSignUp()" name="button-signUp" id="button-signUp" value="Sign Up"
- class="btn btn-primary pull-left">Register</a>
+ <a ng-click="gotoSignUp()" name="button-signUp" id="button-signUp"
+ value="Sign Up" class="btn btn-primary pull-left">Register</a>
</div>
<div class="submit">
- <a ng-click="gotoForgotPasswordPage()" name="button-forgot-password" id="button-forgot-password"
- value="" class="btn btn-primary pull-left">Forgot Password?</a>
+ <a ng-click="gotoForgotPasswordPage()"
+ name="button-forgot-password" id="button-forgot-password"
+ value="" class="btn btn-primary pull-left">Forgot Password?</a>
</div>
- <a ng-click="showModal('sendActivationLink')" name="button-resend-activation" id="button-resend-activation"
- value="" class="btn btn-primary pull-left">Resend Activation Link</a>
+ <a ng-click="showModal('sendActivationLink')"
+ name="button-resend-activation" id="button-resend-activation"
+ value="" class="btn btn-primary pull-left">Resend Activation
+ Link</a>
</div>
- <div id="gtm" style="width: 450px;margin-top: 4em;" />
+ <div id="gtm" style="width: 450px; margin-top: 4em;" />
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/login/logout.html
----------------------------------------------------------------------
diff --git a/portal/js/login/logout.html b/portal/js/login/logout.html
index cac0ed5..b44c18a 100644
--- a/portal/js/login/logout.html
+++ b/portal/js/login/logout.html
@@ -1,3 +1,4 @@
+<div id="logut">Logging out...</div>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,5 +15,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div id="logut">Logging out...</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/login/register.html
----------------------------------------------------------------------
diff --git a/portal/js/login/register.html b/portal/js/login/register.html
index b5b7b97..f063c05 100644
--- a/portal/js/login/register.html
+++ b/portal/js/login/register.html
@@ -1,4 +1,5 @@
-<!--
+<div class="signUp-content">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,10 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="signUp-content">
<div class="signUp-holder">
- <form name="signUpform" id="signUp-form" ng-submit="register()" class="form-horizontal" ng-show="!signUpSuccess" novalidate>
+ <form name="signUpform" id="signUp-form" ng-submit="register()"
+ class="form-horizontal" ng-show="!signUpSuccess" novalidate>
<h1 class="title">Register</h1>
<div class="alert" ng-if="loginMessage">{{loginMessage}}</div>
@@ -25,7 +25,10 @@
<label class="control-label" for="register-orgName">Organization:</label>
<div class="controls">
- <input type="text" ng-model="registeredUser.orgName" id="register-orgName" ng-pattern="appNameRegex" ng-attr-title="{{appNameRegexDescription}}" ug-validate required class="" size="20">
+ <input type="text" ng-model="registeredUser.orgName"
+ id="register-orgName" ng-pattern="appNameRegex"
+ ng-attr-title="{{appNameRegexDescription}}" ug-validate
+ required class="" size="20">
</div>
</div>
@@ -33,7 +36,10 @@
<label class="control-label" for="register-name">Name:</label>
<div class="controls">
- <input type="text" ng-model="registeredUser.name" id="register-name" ng-pattern="nameRegex" ng-attr-title="{{nameRegexDescription}}" ug-validate required class="" size="20">
+ <input type="text" ng-model="registeredUser.name"
+ id="register-name" ng-pattern="nameRegex"
+ ng-attr-title="{{nameRegexDescription}}" ug-validate
+ required class="" size="20">
</div>
</div>
@@ -41,7 +47,10 @@
<label class="control-label" for="register-userName">Username:</label>
<div class="controls">
- <input type="text" ng-model="registeredUser.userName" id="register-userName" ng-pattern="usernameRegex" ng-attr-title="{{usernameRegexDescription}}" ug-validate required class="" size="20">
+ <input type="text" ng-model="registeredUser.userName"
+ id="register-userName" ng-pattern="usernameRegex"
+ ng-attr-title="{{usernameRegexDescription}}" ug-validate
+ required class="" size="20">
</div>
</div>
@@ -49,7 +58,10 @@
<label class="control-label" for="register-email">Email:</label>
<div class="controls">
- <input type="email" ng-model="registeredUser.email" id="register-email" ng-pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" required class="" ug-validate size="20">
+ <input type="email" ng-model="registeredUser.email"
+ id="register-email" ng-pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}" required class=""
+ ug-validate size="20">
</div>
</div>
@@ -58,39 +70,50 @@
<label class="control-label" for="register-password">Password:</label>
<div class="controls">
- <input type="password" ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" ug-validate ng-model="registeredUser.password" id="register-password" required class=""
- size="20">
+ <input type="password" ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}" ug-validate
+ ng-model="registeredUser.password" id="register-password"
+ required class="" size="20">
</div>
</div>
<div class="control-group">
- <label class="control-label" for="register-confirmPassword">Re-enter Password:</label>
+ <label class="control-label" for="register-confirmPassword">Re-enter
+ Password:</label>
<div class="controls">
- <input type="password" ng-model="registeredUser.confirmPassword" required id="register-confirmPassword" ug-validate class="" size="20">
+ <input type="password"
+ ng-model="registeredUser.confirmPassword" required
+ id="register-confirmPassword" ug-validate class="" size="20">
</div>
</div>
<div class="form-actions">
<div class="submit">
- <input type="submit" name="button-login" ng-disabled="!signUpform.$valid" id="button-login" value="Register"
- class="btn btn-primary pull-right">
+ <input type="submit" name="button-login"
+ ng-disabled="!signUpform.$valid" id="button-login"
+ value="Register" class="btn btn-primary pull-right">
</div>
<div class="submit">
- <a ng-click="cancel()" type="submit" name="button-cancel" id="button-cancel"
- class="btn btn-primary pull-right">Cancel</a>
+ <a ng-click="cancel()" type="submit" name="button-cancel"
+ id="button-cancel" class="btn btn-primary pull-right">Cancel</a>
</div>
</div>
</form>
<div class="console-section well thingy" ng-show="signUpSuccess">
- <span class="title">We're holding a seat for you!</span>
- <br><br>
+ <span class="title">We're holding a seat for you!</span> <br>
+ <br>
- <p>Thanks for signing up for a spot on our private beta. We will send you an email as soon as we're ready for
- you!</p>
+ <p>Thanks for signing up for a spot on our private beta. We
+ will send you an email as soon as we're ready for you!</p>
- <p>In the mean time, you can stay up to date with App Services on our <a
- href="https://groups.google.com/forum/?fromgroups#!forum/usergrid">GoogleGroup</a>.</p>
+ <p>
+ In the mean time, you can stay up to date with App Services on
+ our <a
+ href="https://groups.google.com/forum/?fromgroups#!forum/usergrid">GoogleGroup</a>.
+ </p>
- <p> <a href="#!/login">Back to login</a></p>
+ <p>
+ <a href="#!/login">Back to login</a>
+ </p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/menu.html
----------------------------------------------------------------------
diff --git a/portal/js/menu.html b/portal/js/menu.html
index b09ae8e..dc7c06d 100644
--- a/portal/js/menu.html
+++ b/portal/js/menu.html
@@ -1,3 +1,4 @@
+<ul class="nav nav-list" menu="sideMenu">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,12 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<ul class="nav nav-list" menu="sideMenu">
- <li class="option {{item.active ? 'active' : ''}}" ng-cloak="" ng-repeat="item in menuItems"><a data-ng-href="{{item.path}}"><i class="pictogram" ng-bind-html="item.pic"></i>{{item.title}}</a>
- <ul class="nav nav-list" ng-if="item.items">
- <li ng-repeat="subItem in item.items"><a data-ng-href="{{subItem.path}}"><i class="pictogram sub" ng-bind-html="subItem.pic"></i>{{subItem.title}}</a>
- </li>
- </ul>
- </li>
+ <li class="option {{item.active ? 'active' : ''}}" ng-cloak=""
+ ng-repeat="item in menuItems"><a data-ng-href="{{item.path}}"><i
+ class="pictogram" ng-bind-html="item.pic"></i>{{item.title}}</a>
+ <ul class="nav nav-list" ng-if="item.items">
+ <li ng-repeat="subItem in item.items"><a
+ data-ng-href="{{subItem.path}}"><i class="pictogram sub"
+ ng-bind-html="subItem.pic"></i>{{subItem.title}}</a></li>
+ </ul></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/menus/appMenu.html
----------------------------------------------------------------------
diff --git a/portal/js/menus/appMenu.html b/portal/js/menus/appMenu.html
index daed9e0..188335f 100644
--- a/portal/js/menus/appMenu.html
+++ b/portal/js/menus/appMenu.html
@@ -1,5 +1,5 @@
<ul id="app-menu" class="nav top-nav span12">
-<!--
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
[2/6] USERGRID-207 Fix license headers in portal Angular.js files
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-profile.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-profile.html b/portal/js/users/users-profile.html
index 678417f..08b3db0 100644
--- a/portal/js/users/users-profile.html
+++ b/portal/js/users/users-profile.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="UsersProfileCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,72 +15,98 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersProfileCtrl">
-
<div ng:include="'users/users-tabs.html'"></div>
<div class="row-fluid">
- <form ng-submit="saveSelectedUser()" name="profileForm" novalidate>
- <div class="span6">
- <h4>User Information <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users profile information')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_profile_information}}" tooltip-placement="top">(?)</a></h4>
- <label for="ui-form-username" class="ui-dform-label">Username</label>
- <input type="text" ug-validate name="ui-form-username" ng-pattern="usernameRegex" ng-attr-title="{{usernameRegexDescription}}" id="ui-form-username" class="ui-dform-text" ng-model="user.username">
- <br/>
- <label for="ui-form-name" class="ui-dform-label">Full Name</label>
- <input type="text" ug-validate ng-pattern="nameRegex" ng-attr-title="{{nameRegexDescription}}" name="ui-form-name" id="ui-form-name" class="ui-dform-text" ng-model="user.name">
- <br/>
- <label for="ui-form-title" class="ui-dform-label">Title</label>
- <input type="text" ug-validate name="ui-form-title" id="ui-form-title" class="ui-dform-text" ng-model="user.title">
- <br/>
- <label for="ui-form-url" class="ui-dform-label">Home Page</label>
- <input type="url" ug-validate name="ui-form-url" id="ui-form-url" title="Please enter a valid url." class="ui-dform-text" ng-model="user.url">
- <br/>
- <label for="ui-form-email" class="ui-dform-label">Email</label>
- <input type="email" ug-validate name="ui-form-email" id="ui-form-email" ng-pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" class="ui-dform-text" ng-model="user.email">
- <br/>
- <label for="ui-form-tel" class="ui-dform-label">Telephone</label>
- <input type="tel" ug-validate name="ui-form-tel" id="ui-form-tel" class="ui-dform-text" ng-model="user.tel">
- <br/>
- <label for="ui-form-picture" class="ui-dform-label">Picture URL</label>
- <input type="url" ug-validate name="ui-form-picture" id="ui-form-picture" title="Please enter a valid url." ng class="ui-dform-text" ng-model="user.picture">
- <br/>
- <label for="ui-form-bday" class="ui-dform-label">Birthday</label>
- <input type="date" ug-validate name="ui-form-bday" id="ui-form-bday" class="ui-dform-text" ng-model="user.bday">
- <br/>
- </div>
- <div class="span6">
- <h4>Address</h4>
- <label for="ui-form-addr1" class="ui-dform-label">Street 1</label>
- <input type="text" ug-validate name="ui-form-addr1" id="ui-form-addr1" class="ui-dform-text" ng-model="user.adr.addr1">
- <br/>
- <label for="ui-form-addr2" class="ui-dform-label">Street 2</label>
- <input type="text" ug-validate name="ui-form-addr2" id="ui-form-addr2" class="ui-dform-text" ng-model="user.adr.addr2">
- <br/>
- <label for="ui-form-city" class="ui-dform-label">City</label>
- <input type="text" ug-validate name="ui-form-city" id="ui-form-city" class="ui-dform-text" ng-model="user.adr.city">
- <br/>
- <label for="ui-form-state" class="ui-dform-label">State</label>
- <input type="text" ug-validate name="ui-form-state" id="ui-form-state" ng-attr-title="{{stateRegexDescription}}" ng-pattern="stateRegex" class="ui-dform-text" ng-model="user.adr.state">
- <br/>
- <label for="ui-form-zip" class="ui-dform-label">Zip</label>
- <input type="text" ug-validate name="ui-form-zip" ng-pattern="zipRegex" ng-attr-title="{{zipRegexDescription}}" id="ui-form-zip" class="ui-dform-text" ng-model="user.adr.zip">
- <br/>
- <label for="ui-form-country" class="ui-dform-label">Country</label>
- <input type="text" ug-validate name="ui-form-country" ng-attr-title="{{countryRegexDescription}}" ng-pattern="countryRegex" id="ui-form-country" class="ui-dform-text" ng-model="user.adr.country">
- <br/>
- </div>
+ <form ng-submit="saveSelectedUser()" name="profileForm" novalidate>
+ <div class="span6">
+ <h4>
+ User Information <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users profile information')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_profile_information}}"
+ tooltip-placement="top">(?)</a>
+ </h4>
+ <label for="ui-form-username" class="ui-dform-label">Username</label>
+ <input type="text" ug-validate name="ui-form-username"
+ ng-pattern="usernameRegex"
+ ng-attr-title="{{usernameRegexDescription}}"
+ id="ui-form-username" class="ui-dform-text"
+ ng-model="user.username"> <br /> <label
+ for="ui-form-name" class="ui-dform-label">Full Name</label> <input
+ type="text" ug-validate ng-pattern="nameRegex"
+ ng-attr-title="{{nameRegexDescription}}" name="ui-form-name"
+ id="ui-form-name" class="ui-dform-text" ng-model="user.name">
+ <br /> <label for="ui-form-title" class="ui-dform-label">Title</label>
+ <input type="text" ug-validate name="ui-form-title"
+ id="ui-form-title" class="ui-dform-text" ng-model="user.title">
+ <br /> <label for="ui-form-url" class="ui-dform-label">Home
+ Page</label> <input type="url" ug-validate name="ui-form-url"
+ id="ui-form-url" title="Please enter a valid url."
+ class="ui-dform-text" ng-model="user.url"> <br /> <label
+ for="ui-form-email" class="ui-dform-label">Email</label> <input
+ type="email" ug-validate name="ui-form-email"
+ id="ui-form-email" ng-pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}"
+ class="ui-dform-text" ng-model="user.email"> <br /> <label
+ for="ui-form-tel" class="ui-dform-label">Telephone</label> <input
+ type="tel" ug-validate name="ui-form-tel" id="ui-form-tel"
+ class="ui-dform-text" ng-model="user.tel"> <br /> <label
+ for="ui-form-picture" class="ui-dform-label">Picture
+ URL</label> <input type="url" ug-validate name="ui-form-picture"
+ id="ui-form-picture" title="Please enter a valid url." ng
+ class="ui-dform-text" ng-model="user.picture"> <br />
+ <label for="ui-form-bday" class="ui-dform-label">Birthday</label>
+ <input type="date" ug-validate name="ui-form-bday"
+ id="ui-form-bday" class="ui-dform-text" ng-model="user.bday">
+ <br />
+ </div>
+ <div class="span6">
+ <h4>Address</h4>
+ <label for="ui-form-addr1" class="ui-dform-label">Street
+ 1</label> <input type="text" ug-validate name="ui-form-addr1"
+ id="ui-form-addr1" class="ui-dform-text"
+ ng-model="user.adr.addr1"> <br /> <label
+ for="ui-form-addr2" class="ui-dform-label">Street 2</label> <input
+ type="text" ug-validate name="ui-form-addr2"
+ id="ui-form-addr2" class="ui-dform-text"
+ ng-model="user.adr.addr2"> <br /> <label
+ for="ui-form-city" class="ui-dform-label">City</label> <input
+ type="text" ug-validate name="ui-form-city" id="ui-form-city"
+ class="ui-dform-text" ng-model="user.adr.city"> <br />
+ <label for="ui-form-state" class="ui-dform-label">State</label>
+ <input type="text" ug-validate name="ui-form-state"
+ id="ui-form-state" ng-attr-title="{{stateRegexDescription}}"
+ ng-pattern="stateRegex" class="ui-dform-text"
+ ng-model="user.adr.state"> <br /> <label
+ for="ui-form-zip" class="ui-dform-label">Zip</label> <input
+ type="text" ug-validate name="ui-form-zip"
+ ng-pattern="zipRegex" ng-attr-title="{{zipRegexDescription}}"
+ id="ui-form-zip" class="ui-dform-text" ng-model="user.adr.zip">
+ <br /> <label for="ui-form-country" class="ui-dform-label">Country</label>
+ <input type="text" ug-validate name="ui-form-country"
+ ng-attr-title="{{countryRegexDescription}}"
+ ng-pattern="countryRegex" id="ui-form-country"
+ class="ui-dform-text" ng-model="user.adr.country"> <br />
+ </div>
<div class="span6">
- <input type="submit" class="btn btn-primary margin-35" ng-disabled="!profileForm.$valid" value="Save User"/>
+ <input type="submit" class="btn btn-primary margin-35"
+ ng-disabled="!profileForm.$valid" value="Save User" />
</div>
- <div class="content-container">
- <legend>JSON User Object <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users profile json')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_profile_json}}" tooltip-placement="top">(?)</a></legend>
- <pre id="{{help.showJsonId}}">{{user.json}}</pre>
- </div>
+ <div class="content-container">
+ <legend>
+ JSON User Object <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users profile json')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_profile_json}}"
+ tooltip-placement="top">(?)</a>
+ </legend>
+ <pre id="{{help.showJsonId}}">{{user.json}}</pre>
+ </div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-roles.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-roles.html b/portal/js/users/users-roles.html
index 3c58cb6..50fb60c 100644
--- a/portal/js/users/users-roles.html
+++ b/portal/js/users/users-roles.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="UsersRolesCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,135 +15,165 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersRolesCtrl">
-
<div ng:include="'users/users-tabs.html'"></div>
<div>
- <bsmodal id="addRole"
- title="Add user to role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addUserToRoleDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.name != '' ? $parent.name : 'Select a Role...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="role in $parent.rolesTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.name = role.name">{{role.name}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addRole" title="Add user to role" close="hideModal"
+ closelabel="Cancel" extrabutton="addUserToRoleDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.name
+ != '' ? $parent.name : 'Select a Role...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="role in $parent.rolesTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.name = role.name">{{role.name}}</a></li>
+ </ul>
+ </div>
</bsmodal>
- <bsmodal id="leaveRole"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="leaveRoleDialog"
- extrabuttonlabel="Leave"
- ng-cloak>
- <p>Are you sure you want to remove the user from the role(s)?</p>
+ <bsmodal id="leaveRole" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="leaveRoleDialog"
+ extrabuttonlabel="Leave" ng-cloak>
+ <p>Are you sure you want to remove the user from the role(s)?</p>
</bsmodal>
-<div ng-controller="UsersRolesCtrl">
+ <div ng-controller="UsersRolesCtrl">
-<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles add role button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_add_leave_role}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addRole')">Add Role</button>
- <button class="btn btn-primary" ng-disabled="!hasRoles || !valueSelected(selectedUser.roles)" ng-click="showModal('leaveRole')">Leave role(s)</button>
- </div>
- <br>
- <h4>Roles <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles roles list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_roles}}" tooltip-placement="top">(?)</a></h4>
- <table class="table table-striped">
- <tbody>
- <tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasRoles" id="rolesSelectAllCheckBox" ng-model="usersRolesSelected" ng-click="selectAllEntities(selectedUser.roles,this,'usersRolesSelected',true)" ></td>
- <td>Role Name</td>
- <td>Role title</td>
- </tr>
- <tr class="zebraRows" ng-repeat="role in selectedUser.roles">
- <td>
- <input
- type="checkbox"
- ng-model="role.checked"
- >
- </td>
- <td>{{role.name}}</td>
- <td>{{role.title}}</td>
- </tr>
- </tbody>
- </table>
+ <div class="button-strip">
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles add role button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_add_leave_role}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary" ng-click="showModal('addRole')">Add
+ Role</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasRoles || !valueSelected(selectedUser.roles)"
+ ng-click="showModal('leaveRole')">Leave role(s)</button>
+ </div>
+ <br>
+ <h4>
+ Roles <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles roles list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_roles}}"
+ tooltip-placement="top">(?)</a>
+ </h4>
+ <table class="table table-striped">
+ <tbody>
+ <tr class="table-header">
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasRoles" id="rolesSelectAllCheckBox"
+ ng-model="usersRolesSelected"
+ ng-click="selectAllEntities(selectedUser.roles,this,'usersRolesSelected',true)"></td>
+ <td>Role Name</td>
+ <td>Role title</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="role in selectedUser.roles">
+ <td><input type="checkbox" ng-model="role.checked">
+ </td>
+ <td>{{role.name}}</td>
+ <td>{{role.title}}</td>
+ </tr>
+ </tbody>
+ </table>
- <bsmodal id="deletePermission"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deletePermissionDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
+ <bsmodal id="deletePermission" title="Confirmation"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="deletePermissionDialog" extrabuttonlabel="Delete"
+ ng-cloak>
<p>Are you sure you want to delete the permission(s)?</p>
- </bsmodal>
+ </bsmodal>
- <bsmodal id="addPermission"
- title="New Permission"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addUserPermissionDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <p>Path: <input ng-model="$parent.permissions.path" placeholder="ex: /mydata" id="usersRolePermissions" type="text" ng-pattern="pathRegex" required ug-validate ng-attr-title="{{pathRegexDescription}}" /> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles new permission path box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_new_permission_path}}" tooltip-placement="right">(?)</a></p>
+ <bsmodal id="addPermission" title="New Permission"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addUserPermissionDialog" extrabuttonlabel="Add"
+ ng-cloak>
+ <p>
+ Path: <input ng-model="$parent.permissions.path"
+ placeholder="ex: /mydata" id="usersRolePermissions"
+ type="text" ng-pattern="pathRegex" required ug-validate
+ ng-attr-title="{{pathRegexDescription}}" /> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles new permission path box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_new_permission_path}}"
+ tooltip-placement="right">(?)</a>
+ </p>
<div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.getPerm"> GET <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles new permission verbs check boxes')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_new_permission_verbs}}" tooltip-placement="right">(?)</a>
+ <input type="checkbox" ng-model="$parent.permissions.getPerm">
+ GET <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles new permission verbs check boxes')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_new_permission_verbs}}"
+ tooltip-placement="right">(?)</a>
</div>
<div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.postPerm"> POST
+ <input type="checkbox" ng-model="$parent.permissions.postPerm">
+ POST
</div>
<div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.putPerm"> PUT
+ <input type="checkbox" ng-model="$parent.permissions.putPerm">
+ PUT
</div>
<div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.deletePerm"> DELETE
+ <input type="checkbox" ng-model="$parent.permissions.deletePerm">
+ DELETE
</div>
- </bsmodal>
+ </bsmodal>
- <div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles add permission button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_add_delete_permission}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addPermission')">Add Permission</button>
- <button class="btn btn-primary" ng-disabled="!hasPermissions || !valueSelected(selectedUser.permissions)" ng-click="showModal('deletePermission')">Delete Permission(s)</button>
+ <div class="button-strip">
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles add permission button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_add_delete_permission}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addPermission')">Add Permission</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasPermissions || !valueSelected(selectedUser.permissions)"
+ ng-click="showModal('deletePermission')">Delete
+ Permission(s)</button>
+ </div>
+ <br>
+ <h4>
+ Permissions <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles permissions list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_permissions}}"
+ tooltip-placement="top">(?)</a>
+ </h4>
+ <table class="table table-striped">
+ <tbody>
+ <tr class="table-header">
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasPermissions" id="permissionsSelectAllCheckBox"
+ ng-model="usersPermissionsSelected"
+ ng-click="selectAllEntities(selectedUser.permissions,this,'usersPermissionsSelected',true)"></td>
+ <td>Path</td>
+ <td>GET</td>
+ <td>POST</td>
+ <td>PUT</td>
+ <td>DELETE</td>
+ </tr>
+ <tr class="zebraRows"
+ ng-repeat="permission in selectedUser.permissions">
+ <td><input type="checkbox"
+ ng-model="permission.checked"></td>
+ <td>{{permission.path}}</td>
+ <td>{{permission.operations.get}}</td>
+ <td>{{permission.operations.post}}</td>
+ <td>{{permission.operations.put}}</td>
+ <td>{{permission.operations.delete}}</td>
+ </tr>
+ </tbody>
+ </table>
</div>
- <br>
- <h4>Permissions <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles permissions list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_permissions}}" tooltip-placement="top">(?)</a></h4>
- <table class="table table-striped">
- <tbody>
- <tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasPermissions" id="permissionsSelectAllCheckBox" ng-model="usersPermissionsSelected" ng-click="selectAllEntities(selectedUser.permissions,this,'usersPermissionsSelected',true)" ></td>
- <td>Path</td>
- <td>GET</td>
- <td>POST</td>
- <td>PUT</td>
- <td>DELETE</td>
- </tr>
- <tr class="zebraRows" ng-repeat="permission in selectedUser.permissions">
- <td>
- <input
- type="checkbox"
- ng-model="permission.checked"
- >
- </td>
- <td>{{permission.path}}</td>
- <td>{{permission.operations.get}}</td>
- <td>{{permission.operations.post}}</td>
- <td>{{permission.operations.put}}</td>
- <td>{{permission.operations.delete}}</td>
- </tr>
- </tbody>
- </table>
</div>
- </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-tabs.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-tabs.html b/portal/js/users/users-tabs.html
index cd22fbd..b28b04f 100644
--- a/portal/js/users/users-tabs.html
+++ b/portal/js/users/users-tabs.html
@@ -1,18 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users.html b/portal/js/users/users.html
index 6cf17d6..5052148 100644
--- a/portal/js/users/users.html
+++ b/portal/js/users/users.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,121 +15,205 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
-
- <div id="intro-page">
+ <div id="intro-page">
<page-title title=" Users" icon="👤"></page-title>
</div>
- <bsmodal id="newUser"
- title="Create New User"
- close="hideModal"
- closelabel="Cancel"
- buttonid="users"
- extrabutton="newUserDialog"
- extrabuttonlabel="Create"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- <label for="new-user-username">Username</label>
+ <bsmodal id="newUser" title="Create New User" close="hideModal"
+ closelabel="Cancel" buttonid="users" extrabutton="newUserDialog"
+ extrabuttonlabel="Create" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-user-username">Username</label>
- <div class="controls">
- <input type="text" required ng-model="$parent.newUser.newusername" ng-pattern="usernameRegex" ng-attr-title="{{usernameRegexDescription}}" name="username" id="new-user-username" class="input-xlarge" ug-validate/>
- <p class="help-block hide"></p>
- </div>
+ <div class="controls">
+ <input type="text" required
+ ng-model="$parent.newUser.newusername"
+ ng-pattern="usernameRegex"
+ ng-attr-title="{{usernameRegexDescription}}" name="username"
+ id="new-user-username" class="input-xlarge" ug-validate />
+ <p class="help-block hide"></p>
</div>
- <div class="control-group">
- <label for="new-user-fullname">Full name</label>
+ </div>
+ <div class="control-group">
+ <label for="new-user-fullname">Full name</label>
- <div class="controls">
- <input type="text" required ng-attr-title="{{nameRegexDescription}}" ng-pattern="nameRegex" ng-model="$parent.newUser.name" name="name" id="new-user-fullname" class="input-xlarge" ug-validate/>
+ <div class="controls">
+ <input type="text" required
+ ng-attr-title="{{nameRegexDescription}}"
+ ng-pattern="nameRegex" ng-model="$parent.newUser.name"
+ name="name" id="new-user-fullname" class="input-xlarge"
+ ug-validate />
- <p class="help-block hide"></p>
- </div>
+ <p class="help-block hide"></p>
</div>
- <div class="control-group">
- <label for="new-user-email">Email</label>
+ </div>
+ <div class="control-group">
+ <label for="new-user-email">Email</label>
- <div class="controls">
- <input type="email" required ng-model="$parent.newUser.email" pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" name="email" id="new-user-email" class="input-xlarge" ug-validate/>
+ <div class="controls">
+ <input type="email" required ng-model="$parent.newUser.email"
+ pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}"
+ name="email" id="new-user-email" class="input-xlarge"
+ ug-validate />
- <p class="help-block hide"></p>
- </div>
+ <p class="help-block hide"></p>
</div>
- <div class="control-group">
- <label for="new-user-password">Password</label>
+ </div>
+ <div class="control-group">
+ <label for="new-user-password">Password</label>
- <div class="controls">
- <input type="password" required ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" ng-model="$parent.newUser.newpassword" name="password" id="new-user-password" ug-validate
- class="input-xlarge"/>
+ <div class="controls">
+ <input type="password" required ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}"
+ ng-model="$parent.newUser.newpassword" name="password"
+ id="new-user-password" ug-validate class="input-xlarge" />
- <p class="help-block hide"></p>
- </div>
+ <p class="help-block hide"></p>
</div>
- <div class="control-group">
- <label for="new-user-re-password">Confirm password</label>
+ </div>
+ <div class="control-group">
+ <label for="new-user-re-password">Confirm password</label>
- <div class="controls">
- <input type="password" required ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" ng-model="$parent.newUser.repassword" name="re-password" id="new-user-re-password" ug-validate
- class="input-xlarge"/>
+ <div class="controls">
+ <input type="password" required ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}"
+ ng-model="$parent.newUser.repassword" name="re-password"
+ id="new-user-re-password" ug-validate class="input-xlarge" />
- <p class="help-block hide"></p>
- </div>
+ <p class="help-block hide"></p>
</div>
- </fieldset>
+ </div>
+ </fieldset>
</bsmodal>
- <bsmodal id="deleteUser"
- title="Delete User"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteUsersDialog"
- extrabuttonlabel="Delete"
- buttonid="deleteusers"
- ng-cloak>
- <p>Are you sure you want to delete the user(s)?</p>
+ <bsmodal id="deleteUser" title="Delete User" close="hideModal"
+ closelabel="Cancel" extrabutton="deleteUsersDialog"
+ extrabuttonlabel="Delete" buttonid="deleteusers" ng-cloak>
+ <p>Are you sure you want to delete the user(s)?</p>
</bsmodal>
<section class="row-fluid">
<div id="intro-list" class="span3 user-col">
-
+
<div class="button-toolbar span12">
- <a title="Select All" class="btn btn-primary toolbar select-all" ng-show="hasUsers" ng-click="selectAllEntities(usersCollection._list,this,'usersSelected',true)" ng-model="usersSelected"> <i class="pictogram">⊟</i></a>
- <button title="Delete" class="btn btn-primary toolbar" ng-disabled="!hasUsers || !valueSelected(usersCollection._list)" ng-click="showModal('deleteUser')" id="delete-user-button"><i class="pictogram">☕</i></button>
- <button title="Add" class="btn btn-primary toolbar" ng-click="showModal('newUser')" id="new-user-button" ng-attr-id="new-user-button"><i class="pictogram"></i></button>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add remove buttons')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_users_add_remove_buttons}}" tooltip-placement="right">(?)</a>
+ <a title="Select All" class="btn btn-primary toolbar select-all"
+ ng-show="hasUsers"
+ ng-click="selectAllEntities(usersCollection._list,this,'usersSelected',true)"
+ ng-model="usersSelected"> <i class="pictogram">⊟</i></a>
+ <button title="Delete" class="btn btn-primary toolbar"
+ ng-disabled="!hasUsers || !valueSelected(usersCollection._list)"
+ ng-click="showModal('deleteUser')" id="delete-user-button">
+ <i class="pictogram">☕</i>
+ </button>
+ <button title="Add" class="btn btn-primary toolbar"
+ ng-click="showModal('newUser')" id="new-user-button"
+ ng-attr-id="new-user-button">
+ <i class="pictogram"></i>
+ </button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add remove buttons')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_users_add_remove_buttons}}"
+ tooltip-placement="right">(?)</a>
</div>
<ul class="user-list">
- <li ng-class="selectedUser._data.uuid === user._data.uuid ? 'selected' : ''" ng-repeat="user in usersCollection._list" ng-click="selectUser(user._data.uuid)">
- <input
- type="checkbox"
- id="user-{{user.get('username')}}-checkbox"
- ng-value="user.get('uuid')"
- ng-checked="master"
- ng-model="user.checked"
- >
- <a href="javaScript:void(0)" id="user-{{user.get('username')}}-link" >{{user.get('username')}}</a>
- <span ng-if="user.name" class="label">Display Name:</span>{{user.name}}
- </li>
- </ul>
- <div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary toolbar" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous
- </button>
- <button class="btn btn-primary toolbar" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next >
- </button>
- </div>
-
+ <li
+ ng-class="selectedUser._data.uuid === user._data.uuid ? 'selected' : ''"
+ ng-repeat="user in usersCollection._list"
+ ng-click="selectUser(user._data.uuid)"><input
+ type="checkbox" id="user-{{user.get('username')}}-checkbox"
+ ng-value="user.get('uuid')" ng-checked="master"
+ ng-model="user.checked"> <a
+ href="javaScript:void(0)"
+ id="user-{{user.get('username')}}-link">{{user.get('username')}}</a>
+ <span ng-if="user.name" class="label">Display Name:</span>{{user.name}}
+ </li>
+ </ul>
+ <div style="padding: 10px 5px 10px 5px">
+ <button class="btn btn-primary toolbar" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary toolbar" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
+ </div>
+
</div>
- <div id="{{help.showTabsId}}" class="span9 tab-content" ng-show="hasUsers">
+ <div id="{{help.showTabsId}}" class="span9 tab-content"
+ ng-show="hasUsers">
<div class="menu-toolbar">
<ul class="inline">
- <li class="tab" ng-class="currentUsersPage.route === '/users/profile' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectUserPage('/users/profile')"><i class="pictogram"></i>Profile</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users profile tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_profile_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentUsersPage.route === '/users/groups' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectUserPage('/users/groups')"><i class="pictogram">👥</i>Groups</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users groups tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentUsersPage.route === '/users/activities' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectUserPage('/users/activities')"><i class="pictogram"></i>Activities</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users activities tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentUsersPage.route === '/users/feed' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectUserPage('/users/feed')"><i class="pictogram">📄</i>Feed</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users feed tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_feed_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentUsersPage.route === '/users/graph' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectUserPage('/users/graph')"><i class="pictogram">☁</i>Graph</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users graph tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_tab}}" tooltip-placement="top">(?)</a></div></li>
- <li class="tab" ng-class="currentUsersPage.route === '/users/roles' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectUserPage('/users/roles')"><i class="pictogram">🌎</i>Roles & Permissions</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_tab}}" tooltip-placement="top">(?)</a></div></li>
+ <li class="tab"
+ ng-class="currentUsersPage.route === '/users/profile' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectUserPage('/users/profile')"><i
+ class="pictogram"></i>Profile</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users profile tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_profile_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentUsersPage.route === '/users/groups' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectUserPage('/users/groups')"><i
+ class="pictogram">👥</i>Groups</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users groups tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentUsersPage.route === '/users/activities' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectUserPage('/users/activities')"><i
+ class="pictogram"></i>Activities</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users activities tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentUsersPage.route === '/users/feed' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectUserPage('/users/feed')"><i
+ class="pictogram">📄</i>Feed</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users feed tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_feed_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentUsersPage.route === '/users/graph' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectUserPage('/users/graph')"><i
+ class="pictogram">☁</i>Graph</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users graph tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_tab}}"
+ tooltip-placement="top">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentUsersPage.route === '/users/roles' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectUserPage('/users/roles')"><i
+ class="pictogram">🌎</i>Roles & Permissions</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_tab}}"
+ tooltip-placement="top">(?)</a>
+ </div></li>
</ul>
</div>
<span ng-include="currentUsersPage.template"></span>
[6/6] git commit: fix e2e tests
Posted by sf...@apache.org.
fix e2e tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7fab6737
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7fab6737
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7fab6737
Branch: refs/heads/master
Commit: 7fab673765f95122b4a0a7d886abe6f511f8b607
Parents: a945495
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Aug 13 09:28:51 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Aug 13 09:28:51 2014 -0600
----------------------------------------------------------------------
portal/Gruntfile.js | 2 +-
portal/build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7fab6737/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index b44f3e0..5fa1a68 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -291,7 +291,7 @@ module.exports = function (grunt) {
// includes files within path
{expand: true, src: ['*.html','config.js', '*.ico', 'helpJson.json'], dest: distPath, filter: 'isFile'},
{expand: true, src: ['sdk/**','css/**','img/**','js/charts/*.json'], dest: distPath},
- {expand: true, src: ['js/*.min.js','js/libs/**','css/**','img/**','bower_components/**'], dest: distPath}
+ {expand: true, src: ['js/generated/**','js/libs/**','css/**','img/**','bower_components/**'], dest: distPath}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7fab6737/portal/build.sh
----------------------------------------------------------------------
diff --git a/portal/build.sh b/portal/build.sh
index c5b79bf..5789446 100755
--- a/portal/build.sh
+++ b/portal/build.sh
@@ -16,7 +16,7 @@ e2e) buildMain
webdriver-manager start --standalone > seleniumLog.txt &
sleep 10
# run the build
- ./node_modules/grunt-cli/bin/grunt e2e
+ ./node_modules/grunt-cli/bin/grunt e2e-chrome
# stop selenium
curl -s -L http://localhost:4444/selenium-server/driver?cmd=shutDownSeleniumServer > seleniumLog.txt &
;;
[3/6] USERGRID-207 Fix license headers in portal Angular.js files
Posted by sf...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/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 6db1857..b2bb289 100644
--- a/portal/js/org-overview/org-overview.html
+++ b/portal/js/org-overview/org-overview.html
@@ -1,4 +1,5 @@
-<!--
+<div class="org-overview-content" ng-show="activeUI">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,125 +15,152 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="org-overview-content" ng-show="activeUI">
-
<page-title title=" Org Administration" icon="🕪"></page-title>
<section class="row-fluid">
- <div class="span6">
- <bsmodal id="introjs"
- title="Welcome to the API BaaS Admin Portal"
- close="hideModal"
- closelabel="Skip"
- extrabutton="startFirstTimeUser"
- extrabuttonlabel="Take the tour"
- ng-cloak>
- <p>To get started, click 'Take the tour' for a full walkthrough of the admin portal, or click 'Skip' to start working right away.</p>
- </bsmodal>
- <div id="intro-4-current-org">
- <h2 class="title">Current Organization <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('current org')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_current_org}}" tooltip-placement="right">(?)</a></h2>
- <table class="table table-striped">
- <tr>
- <td id="org-overview-name">{{currentOrganization.name}}</td>
- <td style="text-align: right">{{currentOrganization.uuid}}</td>
- </tr>
- </table>
- </div>
+ <div class="span6">
+ <bsmodal id="introjs" title="Welcome to the API BaaS Admin Portal"
+ close="hideModal" closelabel="Skip"
+ extrabutton="startFirstTimeUser"
+ extrabuttonlabel="Take the tour" ng-cloak>
+ <p>To get started, click 'Take the tour' for a full
+ walkthrough of the admin portal, or click 'Skip' to start
+ working right away.</p>
+ </bsmodal>
+ <div id="intro-4-current-org">
+ <h2 class="title">
+ Current Organization <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('current org')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_current_org}}"
+ tooltip-placement="right">(?)</a>
+ </h2>
+ <table class="table table-striped">
+ <tr>
+ <td id="org-overview-name">{{currentOrganization.name}}</td>
+ <td style="text-align: right">{{currentOrganization.uuid}}</td>
+ </tr>
+ </table>
+ </div>
+
+ <bsmodal id="newApplication" title="Create New Application"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="newApplicationDialog" extrabuttonlabel="Create"
+ ng-cloak>
+ <p>
+ New application name: <input ng-model="$parent.newApp.name"
+ ug-validate required type="text" ng-pattern="appNameRegex"
+ ng-attr-title="{{appNameRegexDescription}}" />
+ </p>
+ </bsmodal>
+ <div id="intro-5-applications">
+ <h2 class="title">
+ Applications <a class="help_tooltip"
+ ng-show="help.helpTooltipsEnabled"
+ ng-mouseover="help.sendTooltipGA('applications')" href="#"
+ ng-attr-tooltip="{{tooltip_applications}}"
+ tooltip-placement="right">(?)</a>
+ <div class="header-button btn-group pull-right">
+ <a class="btn filter-selector" style=""
+ ng-click="showModal('newApplication')"> <span
+ class="filter-label">Add New App</span>
+ </a>
+ </div>
+ </h2>
+
+ <table class="table table-striped">
+ <tr ng-repeat="application in applications">
+ <td>{{application.name}}</td>
+ <td style="text-align: right">{{application.uuid}}</td>
+ </tr>
+ </table>
+ </div>
+ <bsmodal id="regenerateCredentials" title="Confirmation"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="regenerateCredentialsDialog" extrabuttonlabel="Yes"
+ ng-cloak> Are you sure you want to regenerate the
+ credentials? </bsmodal>
+ <div id="intro-6-org-api-creds">
+ <h2 class="title">
+ Organization API Credentials <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('api org credentials')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_org_api_creds}}"
+ tooltip-placement="right">(?)</a>
+ <div class="header-button btn-group pull-right">
+ <a class="btn filter-selector"
+ ng-click="showModal('regenerateCredentials')"> <span
+ class="filter-label">Regenerate Org Credentials</span>
+ </a>
+ </div>
+ </h2>
+
+ <table class="table table-striped">
+ <tr>
+ <td>Client ID</td>
+ <td style="text-align: right">{{orgAPICredentials.client_id}}</td>
+ </tr>
+ <tr>
+ <td>Client Secret</td>
+ <td style="text-align: right">{{orgAPICredentials.client_secret}}</td>
+ </tr>
+ </table>
+ </div>
+ <bsmodal id="newAdministrator" title="Create New Administrator"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="newAdministratorDialog" extrabuttonlabel="Create"
+ ng-cloak>
+ <p>
+ New administrator email: <input id="newAdminInput" ug-validate
+ ng-model="$parent.admin.email" pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}" required
+ type="email" />
+ </p>
+ </bsmodal>
+ <div id="intro-7-org-admins">
+ <h2 class="title">
+ Organization Administrators <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('org admins')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_org_admins}}"
+ tooltip-placement="right">(?)</a>
+ <div class="header-button btn-group pull-right">
+ <a class="btn filter-selector"
+ ng-click="showModal('newAdministrator')"> <span
+ class="filter-label">Add New Administrator</span>
+ </a>
+ </div>
+ </h2>
- <bsmodal id="newApplication"
- title="Create New Application"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newApplicationDialog"
- extrabuttonlabel="Create"
- ng-cloak>
- <p>New application name: <input ng-model="$parent.newApp.name" ug-validate required type="text" ng-pattern="appNameRegex" ng-attr-title="{{appNameRegexDescription}}" /></p>
- </bsmodal>
- <div id="intro-5-applications">
- <h2 class="title" > Applications <a class="help_tooltip" ng-show="help.helpTooltipsEnabled" ng-mouseover="help.sendTooltipGA('applications')" href="#" ng-attr-tooltip="{{tooltip_applications}}" tooltip-placement="right">(?)</a>
- <div class="header-button btn-group pull-right">
- <a class="btn filter-selector" style="{{applicationsSize === 10 ? 'width:290px':''}}" ng-click="showModal('newApplication')">
- <span class="filter-label">Add New App</span>
- </a>
- </div>
- </h2>
-
- <table class="table table-striped">
- <tr ng-repeat="application in applications">
- <td>{{application.name}}</td>
- <td style="text-align: right">{{application.uuid}}</td>
- </tr>
- </table>
- </div>
- <bsmodal id="regenerateCredentials"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="regenerateCredentialsDialog"
- extrabuttonlabel="Yes"
- ng-cloak>
- Are you sure you want to regenerate the credentials?
- </bsmodal>
- <div id="intro-6-org-api-creds">
- <h2 class="title" >Organization API Credentials <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('api org credentials')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_org_api_creds}}" tooltip-placement="right">(?)</a>
- <div class="header-button btn-group pull-right">
- <a class="btn filter-selector" ng-click="showModal('regenerateCredentials')">
- <span class="filter-label">Regenerate Org Credentials</span>
- </a>
- </div>
- </h2>
-
- <table class="table table-striped">
- <tr>
- <td >Client ID</td>
- <td style="text-align: right" >{{orgAPICredentials.client_id}}</td>
- </tr>
- <tr>
- <td>Client Secret</td>
- <td style="text-align: right">{{orgAPICredentials.client_secret}}</td>
- </tr>
- </table>
- </div>
- <bsmodal id="newAdministrator"
- title="Create New Administrator"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newAdministratorDialog"
- extrabuttonlabel="Create"
- ng-cloak>
- <p>New administrator email: <input id="newAdminInput" ug-validate ng-model="$parent.admin.email" pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" required type="email" /></p>
- </bsmodal>
- <div id="intro-7-org-admins">
- <h2 class="title" >Organization Administrators <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('org admins')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_org_admins}}" tooltip-placement="right">(?)</a>
- <div class="header-button btn-group pull-right">
- <a class="btn filter-selector" ng-click="showModal('newAdministrator')">
- <span class="filter-label">Add New Administrator</span>
- </a>
- </div>
- </h2>
-
- <table class="table table-striped">
- <tr ng-repeat="administrator in orgAdministrators">
- <td><img style="width:30px;height:30px;" ng-src="{{administrator.image}}"> {{administrator.name}}</td>
- <td style="text-align: right">{{administrator.email}}</td>
- </tr>
- </table>
- </div>
- </div>
+ <table class="table table-striped">
+ <tr ng-repeat="administrator in orgAdministrators">
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{administrator.image}}">
+ {{administrator.name}}</td>
+ <td style="text-align: right">{{administrator.email}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
- <div class="span6">
- <div id="intro-8-activities">
- <h2 class="title">Activities <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('activities')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities}}" tooltip-placement="right">(?)</a></h2>
- <table class="table table-striped">
- <tr ng-repeat="activity in activities">
- <td>{{activity.title}}</td>
- <td style="text-align: right">{{activity.date}}</td>
- </tr>
- </table>
- </div>
- </div>
+ <div class="span6">
+ <div id="intro-8-activities">
+ <h2 class="title">
+ Activities <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('activities')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities}}"
+ tooltip-placement="right">(?)</a>
+ </h2>
+ <table class="table table-striped">
+ <tr ng-repeat="activity in activities">
+ <td>{{activity.title}}</td>
+ <td style="text-align: right">{{activity.date}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/profile/account.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/account.html b/portal/js/profile/account.html
index a29933a..0650fe3 100644
--- a/portal/js/profile/account.html
+++ b/portal/js/profile/account.html
@@ -1,3 +1,4 @@
+<page-title title=" Account Settings" icon=""></page-title>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,15 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<page-title title=" Account Settings" icon=""></page-title>
-
<section class="row-fluid">
<div class="span12 tab-content">
<div class="menu-toolbar">
<ul class="inline">
- <li class="tab" ng-show="!use_sso" ng-class="currentAccountPage.route === '/profile/profile' ? 'selected' : ''"><a class="btn btn-primary toolbar" id="profile-link" ng-click="selectAccountPage('/profile/profile')"><i class="pictogram"></i>Profile</a></li>
- <li class="tab" ng-class="currentAccountPage.route === '/profile/organizations' ? 'selected' : ''"><a class="btn btn-primary toolbar" id="account-link" ng-click="selectAccountPage('/profile/organizations')"><i class="pictogram">👥</i>Organizations</a></li>
+ <li class="tab" ng-show="!use_sso"
+ ng-class="currentAccountPage.route === '/profile/profile' ? 'selected' : ''"><a
+ class="btn btn-primary toolbar" id="profile-link"
+ ng-click="selectAccountPage('/profile/profile')"><i
+ class="pictogram"></i>Profile</a></li>
+ <li class="tab"
+ ng-class="currentAccountPage.route === '/profile/organizations' ? 'selected' : ''"><a
+ class="btn btn-primary toolbar" id="account-link"
+ ng-click="selectAccountPage('/profile/organizations')"><i
+ class="pictogram">👥</i>Organizations</a></li>
</ul>
</div>
<span ng-include="currentAccountPage.template"></span>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/profile/organizations.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/organizations.html b/portal/js/profile/organizations.html
index ea1db22..ef5c8b6 100644
--- a/portal/js/profile/organizations.html
+++ b/portal/js/profile/organizations.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="OrgCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,76 +15,80 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <page-title title=" Organizations" icon="🕪"></page-title>
-<div class="content-page" ng-controller="OrgCtrl">
-<page-title title=" Organizations" icon="🕪"></page-title>
+ <bsmodal id="newOrganization" title="Create New Organization"
+ close="hideModal" closelabel="Cancel" extrabutton="addOrganization"
+ extrabuttonlabel="Create" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-user-orgname">Organization Name</label>
- <bsmodal id="newOrganization"
- title="Create New Organization"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addOrganization"
- extrabuttonlabel="Create"
- ng-cloak>
- <fieldset>
+ <div class="controls">
+ <input type="text" required title="Name" ug-validate
+ ng-pattern="nameRegex"
+ ng-attr-title="{{nameRegexDescription}}"
+ ng-model="$parent.org.name" name="name" id="new-user-orgname"
+ class="input-xlarge" />
- <div class="control-group">
- <label for="new-user-orgname">Organization Name</label>
-
- <div class="controls">
- <input type="text" required title="Name" ug-validate ng-pattern="nameRegex" ng-attr-title="{{nameRegexDescription}}" ng-model="$parent.org.name" name="name" id="new-user-orgname" class="input-xlarge"/>
-
- <p class="help-block hide"></p>
- </div>
+ <p class="help-block hide"></p>
</div>
+ </div>
- </fieldset>
+ </fieldset>
</bsmodal>
- <div class="row-fluid" >
- <div class="span3 user-col ">
+ <div class="row-fluid">
+ <div class="span3 user-col ">
- <div class="button-toolbar span12">
-
- <button class="btn btn-primary toolbar" ng-click="showModal('newOrganization')" title="add organization" ng-show="true"><i class="pictogram"></i>
- </button>
- </div>
- <ul class="user-list">
- <li ng-class="selectedOrg.uuid === org.uuid ? 'selected' : ''"
- ng-repeat="org in orgs" ng-click=" selectOrganization(org)">
+ <div class="button-toolbar span12">
- <a href="javaScript:void(0)">{{org.name}}</a>
- </li>
- </ul>
+ <button class="btn btn-primary toolbar"
+ ng-click="showModal('newOrganization')"
+ title="add organization" ng-show="true">
+ <i class="pictogram"></i>
+ </button>
</div>
- <div class="span9">
- <div class="row-fluid" >
- <h4>Organization Information</h4>
- <div class="span11" ng-show="selectedOrg">
- <label class="ui-dform-label">Applications</label>
- <table class="table table-striped">
- <tr ng-repeat="app in selectedOrg.applicationsArray">
- <td> {{app.name}}</td>
- <td style="text-align: right">{{app.uuid}}</td>
- </tr>
- </table>
- <br/>
- <label class="ui-dform-label">Users</label>
- <table class="table table-striped">
- <tr ng-repeat="user in selectedOrg.usersArray">
- <td> {{user.name}}</td>
- <td style="text-align: right">{{user.email}}</td>
- </tr>
- </table>
- <form ng-submit="leaveOrganization(selectedOrg)">
- <input type="submit" name="button-leave-org" id="button-leave-org" title="Can only leave if organization has more than 1 user." ng-disabled="!doesOrgHaveUsers(selectedOrg)" value="Leave Organization" class="btn btn-primary pull-right">
- </form>
- </div>
- </div>
+ <ul class="user-list">
+ <li ng-class="selectedOrg.uuid === org.uuid ? 'selected' : ''"
+ ng-repeat="org in orgs" ng-click=" selectOrganization(org)">
- </div>
+ <a href="javaScript:void(0)">{{org.name}}</a>
+ </li>
+ </ul>
+ </div>
+ <div class="span9">
+ <div class="row-fluid">
+ <h4>Organization Information</h4>
+ <div class="span11" ng-show="selectedOrg">
+ <label class="ui-dform-label">Applications</label>
+ <table class="table table-striped">
+ <tr ng-repeat="app in selectedOrg.applicationsArray">
+ <td>{{app.name}}</td>
+ <td style="text-align: right">{{app.uuid}}</td>
+ </tr>
+ </table>
+ <br /> <label class="ui-dform-label">Users</label>
+ <table class="table table-striped">
+ <tr ng-repeat="user in selectedOrg.usersArray">
+ <td>{{user.name}}</td>
+ <td style="text-align: right">{{user.email}}</td>
+ </tr>
+ </table>
+ <form ng-submit="leaveOrganization(selectedOrg)">
+ <input type="submit" name="button-leave-org"
+ id="button-leave-org"
+ title="Can only leave if organization has more than 1 user."
+ ng-disabled="!doesOrgHaveUsers(selectedOrg)"
+ value="Leave Organization"
+ class="btn btn-primary pull-right">
+ </form>
</div>
+ </div>
+
+ </div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/profile/profile.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/profile.html b/portal/js/profile/profile.html
index 75e6cc8..fd315de 100644
--- a/portal/js/profile/profile.html
+++ b/portal/js/profile/profile.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="ProfileCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,69 +15,111 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="ProfileCtrl">
-<page-title title=" Profile" icon=""></page-title>
+ <page-title title=" Profile" icon=""></page-title>
<div id="account-panels">
<div class="panel-content">
<div class="console-section">
<div class="console-section-contents">
- <form name="updateAccountForm" id="update-account-form" ng-submit="saveUserInfo()" class="form-horizontal">
+ <form name="updateAccountForm" id="update-account-form"
+ ng-submit="saveUserInfo()" class="form-horizontal">
<fieldset>
<div class="control-group">
- <label id="update-account-id-label" class="control-label" for="update-account-id">UUID</label>
+ <label id="update-account-id-label"
+ class="control-label" for="update-account-id">UUID</label>
<div class="controls">
<span id="update-account-id" class="monospace">{{user.uuid}}</span>
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-username">Username </label>
+ <label class="control-label"
+ for="update-account-username">Username </label>
<div class="controls">
- <input type="text" ug-validate name="update-account-username" required ng-pattern="usernameRegex" id="update-account-username" ng-attr-title="{{usernameRegexDescription}}" class="span4" ng-model="user.username" size="20"/>
+ <input type="text" ug-validate
+ name="update-account-username" required
+ ng-pattern="usernameRegex"
+ id="update-account-username"
+ ng-attr-title="{{usernameRegexDescription}}"
+ class="span4" ng-model="user.username" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-name">Name </label>
+ <label class="control-label" for="update-account-name">Name
+ </label>
<div class="controls">
- <input type="text" ug-validate name="update-account-name" id="update-account-name" ng-pattern="nameRegex" ng-attr-title="{{nameRegexDescription}}" class="span4" ng-model="user.name" size="20"/>
+ <input type="text" ug-validate
+ name="update-account-name" id="update-account-name"
+ ng-pattern="nameRegex"
+ ng-attr-title="{{nameRegexDescription}}"
+ class="span4" ng-model="user.name" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-email"> Email</label>
+ <label class="control-label" for="update-account-email">
+ Email</label>
<div class="controls">
- <input type="email" ug-validate required name="update-account-email" ng-pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" id="update-account-email" class="span4" ng-model="user.email" size="20"/>
+ <input type="email" ug-validate required
+ name="update-account-email" ng-pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}"
+ id="update-account-email" class="span4"
+ ng-model="user.email" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-picture-img">Picture <br />(from <a href="http://gravatar.com">gravatar.com</a>) </label>
+ <label class="control-label"
+ for="update-account-picture-img">Picture <br />(from
+ <a href="http://gravatar.com">gravatar.com</a>)
+ </label>
<div class="controls">
- <img id="update-account-picture-img" ng-src="{{user.profileImg}}" width="50" />
+ <img id="update-account-picture-img"
+ ng-src="{{user.profileImg}}" width="50" />
</div>
</div>
- <span class="help-block">Leave blank any of the following to keep the current password unchanged</span>
- <br />
+ <span class="help-block">Leave blank any of the
+ following to keep the current password unchanged</span> <br />
<div class="control-group">
- <label class="control-label" for="old-account-password">Old Password</label>
+ <label class="control-label" for="old-account-password">Old
+ Password</label>
<div class="controls">
- <input type="password" ug-validate name="old-account-password" id="old-account-password" class="span4" ng-model="user.oldPassword" size="20"/>
+ <input type="password" ug-validate
+ name="old-account-password"
+ id="old-account-password" class="span4"
+ ng-model="user.oldPassword" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-password">New Password</label>
+ <label class="control-label"
+ for="update-account-password">New Password</label>
<div class="controls">
- <input type="password" ug-validate name="update-account-password" ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" id="update-account-password" class="span4" ng-model="user.newPassword" size="20"/>
+ <input type="password" ug-validate
+ name="update-account-password"
+ ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}"
+ id="update-account-password" class="span4"
+ ng-model="user.newPassword" size="20" />
</div>
</div>
- <div class="control-group" style="display:none">
- <label class="control-label" for="update-account-password-repeat">Confirm New Password</label>
+ <div class="control-group" style="display: none">
+ <label class="control-label"
+ for="update-account-password-repeat">Confirm
+ New Password</label>
<div class="controls">
- <input type="password" ug-validate name="update-account-password-repeat" ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" id="update-account-password-repeat" class="span4" ng-model="user.newPasswordConfirm" size="20"/>
+ <input type="password" ug-validate
+ name="update-account-password-repeat"
+ ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}"
+ id="update-account-password-repeat" class="span4"
+ ng-model="user.newPasswordConfirm" size="20" />
</div>
</div>
</fieldset>
<div class="form-actions">
- <input type="submit" class="btn btn-primary" name="button-update-account" ng-disabled="!updateAccountForm.$valid || loading" id="button-update-account" value="{{loading ? loadingText : 'Update'}}" class="btn btn-usergrid"/>
+ <input type="submit" class="btn btn-primary"
+ name="button-update-account"
+ ng-disabled="!updateAccountForm.$valid || loading"
+ id="button-update-account"
+ value="{{loading ? loadingText : 'Update'}}"
+ class="btn btn-usergrid" />
</div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-groups.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-groups.html b/portal/js/roles/roles-groups.html
index 2370d31..a16db33 100644
--- a/portal/js/roles/roles-groups.html
+++ b/portal/js/roles/roles-groups.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="RolesGroupsCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,65 +15,68 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="RolesGroupsCtrl">
-
-
- <bsmodal id="addRoleToGroup"
- title="Add group to role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addRoleToGroupDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.path !== '' ? $parent.title : 'Select a group...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="group in $parent.groupsTypeaheadValues" class="filterItem"><a ng-click="setRoleModal(group)">{{group.title}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addRoleToGroup" title="Add group to role"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addRoleToGroupDialog" extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.path
+ !== '' ? $parent.title : 'Select a group...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="group in $parent.groupsTypeaheadValues"
+ class="filterItem"><a ng-click="setRoleModal(group)">{{group.title}}</a></li>
+ </ul>
+ </div>
</bsmodal>
- <bsmodal id="removeGroupFromRole"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="removeGroupFromRoleDialog"
- extrabuttonlabel="Leave"
- ng-cloak>
- <p>Are you sure you want to remove the group from the role(s)?</p>
+ <bsmodal id="removeGroupFromRole" title="Confirmation"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="removeGroupFromRoleDialog" extrabuttonlabel="Leave"
+ ng-cloak>
+ <p>Are you sure you want to remove the group from the role(s)?</p>
</bsmodal>
<div class="users-section">
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group add user button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_groups_add_group}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addRoleToGroup')">Add Group to Role</button>
- <button class="btn btn-primary" ng-disabled="!hasGroups || !valueSelected(rolesCollection.groups._list)" ng-click="showModal('removeGroupFromRole')">Remove Group(s) from Role</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group add user button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_groups_add_group}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addRoleToGroup')">Add Group to
+ Role</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasGroups || !valueSelected(rolesCollection.groups._list)"
+ ng-click="showModal('removeGroupFromRole')">Remove
+ Group(s) from Role</button>
</div>
<table class="table table-striped">
<tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasGroups" id="selectAllCheckBox" ng-model="roleGroupsSelected" ng-click="selectAllEntities(rolesCollection.groups._list,this,'roleGroupsSelected')"></td>
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasGroups" id="selectAllCheckBox"
+ ng-model="roleGroupsSelected"
+ ng-click="selectAllEntities(rolesCollection.groups._list,this,'roleGroupsSelected')"></td>
<td>Title</td>
<td>Path</td>
</tr>
- <tr class="zebraRows" ng-repeat="group in rolesCollection.groups._list">
- <td>
- <input
- type="checkbox"
- ng-model="group.checked"
- >
+ <tr class="zebraRows"
+ ng-repeat="group in rolesCollection.groups._list">
+ <td><input type="checkbox" ng-model="group.checked">
</td>
<td>{{group._data.title}}</td>
<td>{{group._data.path}}</td>
</tr>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}" style="float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display" style="float:right;">Next
+ ></button>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-settings.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-settings.html b/portal/js/roles/roles-settings.html
index fbab7f2..ecbafc7 100644
--- a/portal/js/roles/roles-settings.html
+++ b/portal/js/roles/roles-settings.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="RolesSettingsCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,84 +15,115 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="RolesSettingsCtrl">
- <bsmodal id="deletePermission"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteRolePermissionDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to delete the permission(s)?</p>
+ <bsmodal id="deletePermission" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="deleteRolePermissionDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to delete the permission(s)?</p>
</bsmodal>
- <bsmodal id="addPermission"
- title="New Permission"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addRolePermissionDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <p>Path: <input ng-model="$parent.permissions.path" placeholder="ex: /mydata" required ng-pattern="pathRegex" ng-attr-title="{{pathRegexDescription}}" ug-validate id="rolePermissionsPath"/> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles new permission path box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_roles_new_permission_path}}" tooltip-placement="right">(?)</a></p>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.getPerm"> GET <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles add permission verbs')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_new_permission_verbs}}" tooltip-placement="right">(?)</a>
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.postPerm"> POST
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.putPerm"> PUT
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.deletePerm"> DELETE
- </div>
+ <bsmodal id="addPermission" title="New Permission" close="hideModal"
+ closelabel="Cancel" extrabutton="addRolePermissionDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <p>
+ Path: <input ng-model="$parent.permissions.path"
+ placeholder="ex: /mydata" required ng-pattern="pathRegex"
+ ng-attr-title="{{pathRegexDescription}}" ug-validate
+ id="rolePermissionsPath" /> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles new permission path box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_roles_new_permission_path}}"
+ tooltip-placement="right">(?)</a>
+ </p>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.getPerm">
+ GET <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles add permission verbs')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_new_permission_verbs}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.postPerm">
+ POST
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.putPerm">
+ PUT
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.deletePerm">
+ DELETE
+ </div>
</bsmodal>
<div>
- <h4>Inactivity <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles inactivity')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_inactivity}}" tooltip-placement="right">(?)</a></h4>
+ <h4>
+ Inactivity <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles inactivity')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_inactivity}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
<div id="role-permissions">
- <p>Integer only. 0 (zero) means no expiration.</p>
+ <p>Integer only. 0 (zero) means no expiration.</p>
- <form name="updateActivity" ng-submit="updateInactivity()" novalidate>
- Seconds: <input style="margin: 0" type="number" required name="role-inactivity"
- id="role-inactivity-input" min="0" ng-model="role._data.inactivity" title="Please input a positive integer >= 0." step = "any" ug-validate >
- <input type="submit" class="btn btn-primary" ng-disabled="!updateActivity.$valid" value="Set"/>
- </form>
+ <form name="updateActivity" ng-submit="updateInactivity()"
+ novalidate>
+ Seconds: <input style="margin: 0" type="number" required
+ name="role-inactivity" id="role-inactivity-input" min="0"
+ ng-model="role._data.inactivity"
+ title="Please input a positive integer >= 0." step="any"
+ ug-validate> <input type="submit"
+ class="btn btn-primary" ng-disabled="!updateActivity.$valid"
+ value="Set" />
+ </form>
</div>
- <br/>
+ <br />
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles details add permission button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_add_delete_permission}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addPermission')">Add Permission</button>
- <button class="btn btn-primary" ng-disabled="!hasSettings || !valueSelected(role.permissions)" ng-click="showModal('deletePermission')">Delete Permission(s)</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles details add permission button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_add_delete_permission}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addPermission')">Add Permission</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasSettings || !valueSelected(role.permissions)"
+ ng-click="showModal('deletePermission')">Delete
+ Permission(s)</button>
</div>
- <h4>Permissions <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles settings permissions list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_permissions}}" tooltip-placement="top">(?)</a></h4>
+ <h4>
+ Permissions <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles settings permissions list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_permissions}}"
+ tooltip-placement="top">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasSettings" id="selectAllCheckBox" ng-model="permissionsSelected" ng-click="selectAllEntities(role.permissions,this,'permissionsSelected')" ></td>
- <td>Path</td>
- <td>GET</td>
- <td>POST</td>
- <td>PUT</td>
- <td>DELETE</td>
- </tr>
- <tr class="zebraRows" ng-repeat="permission in role.permissions">
- <td>
- <input
- type="checkbox"
- ng-model="permission.checked"
- >
- </td>
- <td>{{permission.path}}</td>
- <td>{{permission.operations.get}}</td>
- <td>{{permission.operations.post}}</td>
- <td>{{permission.operations.put}}</td>
- <td>{{permission.operations.delete}}</td>
- </tr>
+ <tr class="table-header">
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasSettings" id="selectAllCheckBox"
+ ng-model="permissionsSelected"
+ ng-click="selectAllEntities(role.permissions,this,'permissionsSelected')"></td>
+ <td>Path</td>
+ <td>GET</td>
+ <td>POST</td>
+ <td>PUT</td>
+ <td>DELETE</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="permission in role.permissions">
+ <td><input type="checkbox" ng-model="permission.checked">
+ </td>
+ <td>{{permission.path}}</td>
+ <td>{{permission.operations.get}}</td>
+ <td>{{permission.operations.post}}</td>
+ <td>{{permission.operations.put}}</td>
+ <td>{{permission.operations.delete}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-tabs.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-tabs.html b/portal/js/roles/roles-tabs.html
index 7c4db80..dda7784 100644
--- a/portal/js/roles/roles-tabs.html
+++ b/portal/js/roles/roles-tabs.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,14 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<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"></i> Roles </h1>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles page title')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_page_title}}" tooltip-placement="right">(?)</a>
+ <h1 class="title" class="pull-left">
+ <i class="pictogram title"></i> Roles
+ </h1>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles page title')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_page_title}}"
+ tooltip-placement="right">(?)</a>
</div>
</div>
@@ -29,17 +34,25 @@
<div id="user-panel" class="panel-buffer">
<ul id="user-panel-tab-bar" class="nav nav-tabs">
- <li><a href="javaScript:void(0);" ng-click="gotoPage('roles')">Roles List</a></li>
- <li ng-class="settingsSelected"><a href="javaScript:void(0);" ng-click="gotoPage('roles/settings')">Settings</a></li>
- <li ng-class="usersSelected"><a href="javaScript:void(0);" ng-click="gotoPage('roles/users')">Users</a></li>
- <li ng-class="groupsSelected"><a href="javaScript:void(0);" ng-click="gotoPage('roles/groups')">Groups</a></li>
+ <li><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles')">Roles List</a></li>
+ <li ng-class="settingsSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles/settings')">Settings</a></li>
+ <li ng-class="usersSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles/users')">Users</a></li>
+ <li ng-class="groupsSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles/groups')">Groups</a></li>
</ul>
</div>
<div style="float: left; margin-right: 10px;">
<div style="float: left;">
- <div class="user-header-title"><strong>Role Name: </strong>{{selectedRole.name}}</div>
- <div class="user-header-title"><strong>Role Title: </strong>{{selectedRole.title}}</div>
+ <div class="user-header-title">
+ <strong>Role Name: </strong>{{selectedRole.name}}
+ </div>
+ <div class="user-header-title">
+ <strong>Role Title: </strong>{{selectedRole.title}}
+ </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-users.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-users.html b/portal/js/roles/roles-users.html
index 5a6b251..0392263 100644
--- a/portal/js/roles/roles-users.html
+++ b/portal/js/roles/roles-users.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="RolesUsersCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,64 +15,70 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="RolesUsersCtrl">
- <bsmodal id="removeFromRole"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="removeUsersFromGroupDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to remove the users from the seleted role(s)?</p>
+ <bsmodal id="removeFromRole" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="removeUsersFromGroupDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to remove the users from the selected
+ role(s)?</p>
</bsmodal>
- <bsmodal id="addRoleToUser"
- title="Add user to role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addRoleToUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.user.username ? $parent.user.username : 'Select a user...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="user in $parent.usersTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addRoleToUser" title="Add user to role" close="hideModal"
+ closelabel="Cancel" extrabutton="addRoleToUserDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.user.username
+ ? $parent.user.username : 'Select a user...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="user in $parent.usersTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
+ </ul>
+ </div>
</bsmodal>
<div class="users-section">
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles add user button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_users_add_user}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addRoleToUser')">Add User to Role</button>
- <button class="btn btn-primary" ng-disabled="!hasUsers || !valueSelected(rolesCollection.users._list)" ng-click="showModal('removeFromRole')">Remove User(s) from Role</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles add user button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_users_add_user}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addRoleToUser')">Add User to Role</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasUsers || !valueSelected(rolesCollection.users._list)"
+ ng-click="showModal('removeFromRole')">Remove User(s)
+ from Role</button>
</div>
<table class="table table-striped">
<tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasUsers" id="selectAllCheckBox" ng-model="roleUsersSelected" ng-click="selectAllEntities(rolesCollection.users._list,this,'roleUsersSelected')" ng-model="master"></td>
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasUsers" id="selectAllCheckBox"
+ ng-model="roleUsersSelected"
+ ng-click="selectAllEntities(rolesCollection.users._list,this,'roleUsersSelected')"
+ ng-model="master"></td>
<td style="width: 50px;"></td>
<td>Username</td>
<td>Display Name</td>
</tr>
- <tr class="zebraRows" ng-repeat="user in rolesCollection.users._list">
- <td>
- <input
- type="checkbox"
- ng-model="user.checked"
- >
+ <tr class="zebraRows"
+ ng-repeat="user in rolesCollection.users._list">
+ <td><input type="checkbox" ng-model="user.checked">
</td>
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
<td>{{user._data.username}}</td>
<td>{{user._data.name}}</td>
</tr>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles.html b/portal/js/roles/roles.html
index eb3990e..b1edaf5 100644
--- a/portal/js/roles/roles.html
+++ b/portal/js/roles/roles.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,88 +15,134 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
- <div id="intro-page" >
+ <div id="intro-page">
<page-title title=" Roles" icon=""></page-title>
</div>
- <bsmodal id="newRole"
- title="New Role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newRoleDialog"
- extrabuttonlabel="Create"
- buttonid="roles"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- <label for="new-role-roletitle">Title</label>
- <div class="controls">
- <input type="text" ng-pattern="titleRegex" ng-attr-title="{{titleRegexDescription}}" required ng-model="$parent.newRole.title" name="roletitle" id="new-role-roletitle" class="input-xlarge" ug-validate/>
- <p class="help-block hide"></p>
- </div>
- </div>
- <div class="control-group">
- <label for="new-role-rolename">Role Name</label>
- <div class="controls">
- <input type="text" required ng-pattern="roleNameRegex" ng-attr-title="{{roleNameRegexDescription}}" ng-model="$parent.newRole.name" name="rolename" id="new-role-rolename" class="input-xlarge" ug-validate/>
- <p class="help-block hide"></p>
- </div>
- </div>
- </fieldset>
+ <bsmodal id="newRole" title="New Role" close="hideModal"
+ closelabel="Cancel" extrabutton="newRoleDialog"
+ extrabuttonlabel="Create" buttonid="roles" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-role-roletitle">Title</label>
+ <div class="controls">
+ <input type="text" ng-pattern="titleRegex"
+ ng-attr-title="{{titleRegexDescription}}" required
+ ng-model="$parent.newRole.title" name="roletitle"
+ id="new-role-roletitle" class="input-xlarge" ug-validate />
+ <p class="help-block hide"></p>
+ </div>
+ </div>
+ <div class="control-group">
+ <label for="new-role-rolename">Role Name</label>
+ <div class="controls">
+ <input type="text" required ng-pattern="roleNameRegex"
+ ng-attr-title="{{roleNameRegexDescription}}"
+ ng-model="$parent.newRole.name" name="rolename"
+ id="new-role-rolename" class="input-xlarge" ug-validate />
+ <p class="help-block hide"></p>
+ </div>
+ </div>
+ </fieldset>
</bsmodal>
- <bsmodal id="deleteRole"
- title="Delete Role"
- close="hideModal"
- closelabel="Cancel"
- buttonid="deleteroles"
- extrabutton="deleteRoleDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to delete the role(s)?</p>
+ <bsmodal id="deleteRole" title="Delete Role" close="hideModal"
+ closelabel="Cancel" buttonid="deleteroles"
+ extrabutton="deleteRoleDialog" extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to delete the role(s)?</p>
</bsmodal>
<section class="row-fluid">
<div id="intro-list" class="span3 user-col">
<div class="button-toolbar span12">
- <a title="Select All" class="btn btn-primary select-all toolbar" ng-show="hasRoles" ng-click="selectAllEntities(rolesCollection._list,this,'rolesSelected',true)"> <i class="pictogram">⊟</i></a>
- <button id="delete-role-btn" title="Delete" class="btn btn-primary toolbar" ng-disabled="!hasRoles || !valueSelected(rolesCollection._list)" ng-click="showModal('deleteRole')"><i class="pictogram">☕</i></button>
- <button id="add-role-btn" title="Add" class="btn btn-primary toolbar" ng-click="showModal('newRole')"><i class="pictogram"></i></button>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add remove buttons')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_add_remove_buttons}}" tooltip-placement="right">(?)</a> </div>
+ <a title="Select All" class="btn btn-primary select-all toolbar"
+ ng-show="hasRoles"
+ ng-click="selectAllEntities(rolesCollection._list,this,'rolesSelected',true)">
+ <i class="pictogram">⊟</i>
+ </a>
+ <button id="delete-role-btn" title="Delete"
+ class="btn btn-primary toolbar"
+ ng-disabled="!hasRoles || !valueSelected(rolesCollection._list)"
+ ng-click="showModal('deleteRole')">
+ <i class="pictogram">☕</i>
+ </button>
+ <button id="add-role-btn" title="Add"
+ class="btn btn-primary toolbar"
+ ng-click="showModal('newRole')">
+ <i class="pictogram"></i>
+ </button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add remove buttons')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_add_remove_buttons}}"
+ tooltip-placement="right">(?)</a>
+ </div>
<ul class="user-list">
- <li ng-class="selectedRole._data.uuid === role._data.uuid ? 'selected' : ''" ng-repeat="role in rolesCollection._list" ng-click="selectRole(role._data.uuid)">
- <input
- type="checkbox"
- ng-value="role.get('uuid')"
- ng-checked="master"
- ng-model="role.checked"
- id="role-{{role.get('title')}}-cb"
- >
- <a id="role-{{role.get('title')}}-link">{{role.get('title')}}</a>
- <br/>
- <span ng-if="role.get('name')" class="label">Role Name:</span>{{role.get('name')}}
- </li>
+ <li
+ ng-class="selectedRole._data.uuid === role._data.uuid ? 'selected' : ''"
+ ng-repeat="role in rolesCollection._list"
+ ng-click="selectRole(role._data.uuid)"><input
+ type="checkbox" ng-value="role.get('uuid')"
+ ng-checked="master" ng-model="role.checked"
+ id="role-{{role.get('title')}}-cb"> <a
+ id="role-{{role.get('title')}}-link">{{role.get('title')}}</a>
+ <br /> <span ng-if="role.get('name')" class="label">Role
+ Name:</span>{{role.get('name')}}</li>
</ul>
- <div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}};float:right;">Next ></button>
- </div>
+ <div style="padding: 10px 5px 10px 5px">
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
+ </div>
</div>
-
- <div id="intro-information-tabs" class="span9 tab-content" ng-show="hasRoles">
+
+ <div id="intro-information-tabs" class="span9 tab-content"
+ ng-show="hasRoles">
<div class="menu-toolbar">
<ul class="inline">
- <li class="tab" ng-class="currentRolesPage.route === '/roles/settings' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectRolePage('/roles/settings')"><i class="pictogram"></i>Settings</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles settings tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_settings_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentRolesPage.route === '/roles/users' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectRolePage('/roles/users')"><i class="pictogram">👥</i>Users</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles users tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_users_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentRolesPage.route === '/roles/groups' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectRolePage('/roles/groups')"><i class="pictogram"></i>Groups</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles groups tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_groups_tab}}" tooltip-placement="right">(?)</a></div></li>
+ <li class="tab"
+ ng-class="currentRolesPage.route === '/roles/settings' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectRolePage('/roles/settings')"><i
+ class="pictogram"></i>Settings</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles settings tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_settings_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentRolesPage.route === '/roles/users' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectRolePage('/roles/users')"><i
+ class="pictogram">👥</i>Users</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles users tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_users_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentRolesPage.route === '/roles/groups' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectRolePage('/roles/groups')"><i
+ class="pictogram"></i>Groups</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles groups tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_groups_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
</ul>
</div>
<span ng-include="currentRolesPage.template"></span>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/shell/shell.html
----------------------------------------------------------------------
diff --git a/portal/js/shell/shell.html b/portal/js/shell/shell.html
index 4e3d316..798361d 100644
--- a/portal/js/shell/shell.html
+++ b/portal/js/shell/shell.html
@@ -1,3 +1,4 @@
+<page-title title=" Shell" icon="📱"></page-title>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,25 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<page-title title=" Shell" icon="📱"></page-title>
-
<section class="row-fluid">
<div class="console-section-contents" id="shell-panel">
<div id="shell-input-div">
- <p> Type "help" to view a list of the available commands.</p>
+ <p>Type "help" to view a list of the available commands.</p>
<hr>
- <form name="shellForm" ng-submit="submitCommand()" >
- <span> >> </span>
- <input type="text" id="shell-input" ng-model="shell.input" autofocus="autofocus" required
- ng-form="shellForm">
- <input style="display: none" type="submit" ng-form="shellForm" value="submit" ng-disabled="!shell.input"/>
+ <form name="shellForm" ng-submit="submitCommand()">
+ <span> >> </span> <input type="text" id="shell-input"
+ ng-model="shell.input" autofocus="autofocus" required
+ ng-form="shellForm"> <input style="display: none"
+ type="submit" ng-form="shellForm" value="submit"
+ ng-disabled="!shell.input" />
</form>
</div>
- <pre id="shell-output" class="prettyprint lang-js" style="overflow-x: auto; height: 400px;" ng-bind-html="shell.output">
+ <pre id="shell-output" class="prettyprint lang-js"
+ style="overflow-x: auto; height: 400px;"
+ ng-bind-html="shell.output">
</pre>
- <div id="lastshelloutput" ng-bind-html="shell.outputhidden" style="visibility:hidden"></div>
+ <div id="lastshelloutput" ng-bind-html="shell.outputhidden"
+ style="visibility: hidden"></div>
</div>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-activities.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-activities.html b/portal/js/users/users-activities.html
index 97c9a01..eef4b3c 100644
--- a/portal/js/users/users-activities.html
+++ b/portal/js/users/users-activities.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="UsersActivitiesCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,40 +15,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersActivitiesCtrl" >
-
- <bsmodal id="addActivityToUser"
- title="Add activity to user"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addActivityToUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <p>Content: <input id="activityMessage" ng-model="$parent.newActivity.activityToAdd" required name="activityMessage" ug-validate /> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add activity content')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities_add_activity_content}}" tooltip-placement="right">(?)</a></p>
+ <bsmodal id="addActivityToUser" title="Add activity to user"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addActivityToUserDialog" extrabuttonlabel="Add"
+ ng-cloak>
+ <p>
+ Content: <input id="activityMessage"
+ ng-model="$parent.newActivity.activityToAdd" required
+ name="activityMessage" ug-validate /> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add activity content')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities_add_activity_content}}"
+ tooltip-placement="right">(?)</a>
+ </p>
</bsmodal>
<div ng:include="'users/users-tabs.html'"></div>
<br>
- <div class="button-strip"><a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add activity button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities_add_activity}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addActivityToUser')">Add activity to user</button>
+ <div class="button-strip">
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add activity button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities_add_activity}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addActivityToUser')">Add activity to
+ user</button>
</div>
<div>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Date</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.content}}</td>
- <td>{{activity.verb}}</td>
- <td>{{activity.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Date</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.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-feed.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-feed.html b/portal/js/users/users-feed.html
index 0228596..d7681aa 100644
--- a/portal/js/users/users-feed.html
+++ b/portal/js/users/users-feed.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="UsersFeedCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,31 +15,28 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<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 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/a9454950/portal/js/users/users-graph.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-graph.html b/portal/js/users/users-graph.html
index 31d1a10..6b45a5d 100644
--- a/portal/js/users/users-graph.html
+++ b/portal/js/users/users-graph.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="UsersGraphCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,70 +15,85 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersGraphCtrl">
-
<div ng:include="'users/users-tabs.html'"></div>
<div>
- <bsmodal id="followUser"
- title="Follow User"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="followUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.user != '' ? $parent.user.username : 'Select a user...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="user in $parent.usersTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
- </ul>
- </div>
+ <bsmodal id="followUser" title="Follow User" close="hideModal"
+ closelabel="Cancel" extrabutton="followUserDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.user
+ != '' ? $parent.user.username : 'Select a user...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="user in $parent.usersTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
+ </ul>
+ </div>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users follow user')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_follow_user}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('followUser')">Follow User</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users follow user')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_follow_user}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary" ng-click="showModal('followUser')">Follow
+ User</button>
</div>
<br>
- <h4>Following <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users following list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_following}}" tooltip-placement="right">(?)</a></h4>
+ <h4>
+ Following <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users following list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_following}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Image</td>
- <td>Username</td>
- <td>Email</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="user in selectedUser.following">
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
- <td>{{user.username}}</td>
- <td>{{user.email}}</td>
- <td>{{user.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Image</td>
+ <td>Username</td>
+ <td>Email</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="user in selectedUser.following">
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
+ <td>{{user.username}}</td>
+ <td>{{user.email}}</td>
+ <td>{{user.uuid}}</td>
+ </tr>
</tbody>
</table>
- <h4>Followers <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users followers list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_followers}}" tooltip-placement="right">(?)</a></h4>
+ <h4>
+ Followers <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users followers list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_followers}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Image</td>
- <td>Username</td>
- <td>Email</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="user in selectedUser.followers">
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
- <td>{{user.username}}</td>
- <td>{{user.email}}</td>
- <td>{{user.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Image</td>
+ <td>Username</td>
+ <td>Email</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="user in selectedUser.followers">
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
+ <td>{{user.username}}</td>
+ <td>{{user.email}}</td>
+ <td>{{user.uuid}}</td>
+ </tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-groups.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-groups.html b/portal/js/users/users-groups.html
index 8b8cb91..5b1bfbc 100644
--- a/portal/js/users/users-groups.html
+++ b/portal/js/users/users-groups.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="UsersGroupsCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,72 +15,74 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersGroupsCtrl">
-
<div ng:include="'users/users-tabs.html'"></div>
<div>
- <bsmodal id="addUserToGroup"
- title="Add user to group"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addUserToGroupDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.title && $parent.title !== '' ? $parent.title : 'Select a group...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="group in $parent.groupsTypeaheadValues" class="filterItem"><a ng-click="selectGroup(group)">{{group.title}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addUserToGroup" title="Add user to group"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addUserToGroupDialog" extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.title
+ && $parent.title !== '' ? $parent.title : 'Select a
+ group...'}}</span> <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="group in $parent.groupsTypeaheadValues"
+ class="filterItem"><a ng-click="selectGroup(group)">{{group.title}}</a></li>
+ </ul>
+ </div>
</bsmodal>
- <bsmodal id="leaveGroup"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="leaveGroupDialog"
- extrabuttonlabel="Leave"
- ng-cloak>
- <p>Are you sure you want to remove the user from the seleted group(s)?</p>
+ <bsmodal id="leaveGroup" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="leaveGroupDialog"
+ extrabuttonlabel="Leave" ng-cloak>
+ <p>Are you sure you want to remove the user from the seleted
+ group(s)?</p>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add leave group buttons')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_add_leave_buttons}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addUserToGroup')">Add to group</button>
- <button class="btn btn-primary" ng-disabled="!hasGroups || !valueSelected(userGroupsCollection._list)" ng-click="showModal('leaveGroup')">Leave group(s)</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add leave group buttons')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_add_leave_buttons}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addUserToGroup')">Add to group</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasGroups || !valueSelected(userGroupsCollection._list)"
+ ng-click="showModal('leaveGroup')">Leave group(s)</button>
</div>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>
- <input type="checkbox" ng-show="hasGroups" id="selectAllCheckBox" ng-model="userGroupsSelected" ng-click="selectAllEntities(userGroupsCollection._list,this,'userGroupsSelected')" >
- </td>
- <td>Group Name <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('add user group list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_group_name}}" tooltip-placement="top">(?)</a></td>
- <td>Path</td>
- </tr>
- <tr class="zebraRows" ng-repeat="group in userGroupsCollection._list">
- <td>
- <input
- type="checkbox"
- ng-value="group.get('uuid')"
- ng-model="group.checked"
- >
- </td>
- <td>{{group.get('title')}}</td>
- <td>{{group.get('path')}}</td>
- </tr>
+ <tr class="table-header">
+ <td><input type="checkbox" ng-show="hasGroups"
+ id="selectAllCheckBox" ng-model="userGroupsSelected"
+ ng-click="selectAllEntities(userGroupsCollection._list,this,'userGroupsSelected')">
+ </td>
+ <td>Group Name <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('add user group list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_group_name}}"
+ tooltip-placement="top">(?)</a></td>
+ <td>Path</td>
+ </tr>
+ <tr class="zebraRows"
+ ng-repeat="group in userGroupsCollection._list">
+ <td><input type="checkbox" ng-value="group.get('uuid')"
+ ng-model="group.checked"></td>
+ <td>{{group.get('title')}}</td>
+ <td>{{group.get('path')}}</td>
+ </tr>
</tbody>
</table>
</div>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
</div>
[5/6] git commit: USERGRID-207 Fix license headers in portal
Angular.js files
Posted by sf...@apache.org.
USERGRID-207 Fix license headers in portal Angular.js files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a9454950
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a9454950
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a9454950
Branch: refs/heads/master
Commit: a945495062e0f93815c2b375a4d2f477ed70d793
Parents: efade6f
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Tue Aug 12 23:39:01 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Tue Aug 12 23:39:01 2014 -0700
----------------------------------------------------------------------
portal/js/activities/activities.html | 41 +-
portal/js/app-overview/app-overview.html | 37 +-
.../js/app-overview/doc-includes/android.html | 388 ++++++++++++-------
portal/js/app-overview/doc-includes/ios.html | 351 +++++++++++------
.../app-overview/doc-includes/javascript.html | 203 ++++++----
portal/js/data/data.html | 248 +++++++-----
portal/js/data/display-generic.html | 155 ++++----
portal/js/data/display-roles.html | 3 +-
portal/js/data/display-users.html | 241 +++++++++---
portal/js/data/entity.html | 18 +-
portal/js/global/insecure-banner.html | 15 +-
portal/js/global/page-title.html | 31 +-
portal/js/groups/groups-activities.html | 29 +-
portal/js/groups/groups-details.html | 68 ++--
portal/js/groups/groups-members.html | 86 ++--
portal/js/groups/groups-roles.html | 232 ++++++-----
portal/js/groups/groups-tabs.html | 32 +-
portal/js/groups/groups.html | 183 +++++----
portal/js/login/forgot-password.html | 14 +-
portal/js/login/loading.html | 5 +-
portal/js/login/login.html | 101 +++--
portal/js/login/logout.html | 3 +-
portal/js/login/register.html | 69 ++--
portal/js/menu.html | 17 +-
portal/js/menus/appMenu.html | 2 +-
portal/js/org-overview/org-overview.html | 256 ++++++------
portal/js/profile/account.html | 16 +-
portal/js/profile/organizations.html | 119 +++---
portal/js/profile/profile.html | 89 +++--
portal/js/roles/roles-groups.html | 86 ++--
portal/js/roles/roles-settings.html | 158 +++++---
portal/js/roles/roles-tabs.html | 33 +-
portal/js/roles/roles-users.html | 85 ++--
portal/js/roles/roles.html | 169 +++++---
portal/js/shell/shell.html | 24 +-
portal/js/users/users-activities.html | 62 +--
portal/js/users/users-feed.html | 48 ++-
portal/js/users/users-graph.html | 112 +++---
portal/js/users/users-groups.html | 105 ++---
portal/js/users/users-profile.html | 141 ++++---
portal/js/users/users-roles.html | 245 +++++++-----
portal/js/users/users-tabs.html | 17 +-
portal/js/users/users.html | 259 ++++++++-----
43 files changed, 2807 insertions(+), 1789 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/activities/activities.html
----------------------------------------------------------------------
diff --git a/portal/js/activities/activities.html b/portal/js/activities/activities.html
index 8837f55..34bd491 100644
--- a/portal/js/activities/activities.html
+++ b/portal/js/activities/activities.html
@@ -1,3 +1,4 @@
+<section class="row-fluid">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<section class="row-fluid">
<div class="span12">
<div class="page-filters">
- <h1 class="title" class="pull-left"><i class="pictogram title">📱</i> Activities</h1>
+ <h1 class="title" class="pull-left">
+ <i class="pictogram title">📱</i> Activities
+ </h1>
</div>
</div>
@@ -27,23 +28,23 @@
<div class="span12 tab-content">
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Date</td>
- <td></td>
- <td>User</td>
- <td>Content</td>
- <td>Verb</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="activity in activities">
- <td>{{formatDate(activity.created)}}</td>
- <td class="gravatar20"> <img ng-src="{{activity.actor.picture}}"/>
- </td>
- <td>{{activity.actor.displayName}}</td>
- <td>{{activity.content}}</td>
- <td>{{activity.verb}}</td>
- <td>{{activity.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Date</td>
+ <td></td>
+ <td>User</td>
+ <td>Content</td>
+ <td>Verb</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="activity in activities">
+ <td>{{formatDate(activity.created)}}</td>
+ <td class="gravatar20"><img
+ ng-src="{{activity.actor.picture}}" /></td>
+ <td>{{activity.actor.displayName}}</td>
+ <td>{{activity.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/app-overview.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/app-overview.html b/portal/js/app-overview/app-overview.html
index a6917a2..dd95414 100644
--- a/portal/js/app-overview/app-overview.html
+++ b/portal/js/app-overview/app-overview.html
@@ -1,3 +1,4 @@
+<div class="app-overview-content">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,28 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="app-overview-content" >
<section class="row-fluid">
- <page-title title=" Summary" icon="📱"></page-title>
- <section class="row-fluid">
+ <page-title title=" Summary" icon="📱"></page-title>
+ <section class="row-fluid">
<h2 class="title" id="app-overview-title">{{currentApp}}</h2>
- </section>
- <section class="row-fluid">
+ </section>
+ <section class="row-fluid">
- <div class="span6">
- <table class="table table-striped">
- <tr class="table-header">
- <td>Path</td>
- <td>Title</td>
- </tr>
- <tr class="zebraRows" ng-repeat="(k,v) in collections">
- <td>{{v.title}}</td>
- <td>{{v.count}}</td>
- </tr>
- </table>
- </div>
+ <div class="span6">
+ <table class="table table-striped">
+ <tr class="table-header">
+ <td>Path</td>
+ <td>Title</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="(k,v) in collections">
+ <td>{{v.title}}</td>
+ <td>{{v.count}}</td>
+ </tr>
+ </table>
+ </div>
- </section>
+ </section>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/doc-includes/android.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/doc-includes/android.html b/portal/js/app-overview/doc-includes/android.html
index 1ca3b08..3adc6ae 100644
--- a/portal/js/app-overview/doc-includes/android.html
+++ b/portal/js/app-overview/doc-includes/android.html
@@ -1,3 +1,4 @@
+<h2>1. Integrate the SDK into your project</h2>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,63 +15,108 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<h2>1. Integrate the SDK into your project</h2>
-<p>You can integrate Apigee features into your app by including the SDK in your project. You can do one of the following:</p>
+<p>You can integrate Apigee features into your app by including the
+ SDK in your project. You can do one of the following:</p>
<ul class="nav nav-tabs" id="myTab">
- <li class="active"><a data-toggle="tab" href="#existing_project">Existing project</a></li>
- <li><a data-toggle="tab" href="#new_project">New project</a></li>
+ <li class="active"><a data-toggle="tab" href="#existing_project">Existing
+ project</a></li>
+ <li><a data-toggle="tab" href="#new_project">New project</a></li>
</ul>
<div class="tab-content">
- <div class="tab-pane active" id="existing_project">
- <a class="jumplink" name="add_the_sdk_to_an_existing_project"></a>
- <p>If you've already got an Android project, you can integrate the Apigee SDK into your project as you normally would:</p>
- <div id="collapse">
- <a href="#jar_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="jar_collapse" class="collapse">
- <p>Add <code>apigee-android-<version>.jar</code> to your class path by doing the following:</p>
-
- <h3>Android 4.0 (or later) projects</h3>
- <p>Copy the jar file into the <code>/libs</code> folder in your project.</p>
-
- <h3>Android 3.0 (or earlier) projects</h3>
- <ol>
- <li>In the Eclipse <strong>Package Explorer</strong>, select your application's project folder.</li>
- <li>Click the <strong>File > Properties</strong> menu.</li>
- <li>In the <strong>Java Build Path</strong> section, click the <strong>Libraries</strong> tab, click <strong>Add External JARs</strong>.</li>
- <li>Browse to <code>apigee-android-<version>.jar</code>, then click <strong>Open</strong>.</li>
- <li>Order the <code>apigee-android-<version>.jar</code> at the top of the class path:
- <ol>
- <li>In the Eclipse <strong>Package Explorer</strong>, select your application's project folder.</li>
- <li>Click the <strong>File > Properties</strong> menu.</li>
- <li>In the properties dialog, in the <strong>Java Build Path</strong> section, click the <strong>Order and Export</strong> tab.</li>
- <li>
- <p><strong>IMPORTANT:</strong> Select the checkbox for <code>apigee-android-<version>.jar</code>, then click the <strong>Top</strong> button.</p>
- </li>
- </ol>
- </li>
- </ol>
- <div class="warning">
- <h3>Applications using Ant</h3>
- <p>If you are using Ant to build your application, you must also copy <code>apigee-android-<version>.jar</code> to the <code>/libs</code> folder in your application.</p>
- </div>
- </div>
- </div>
- <div class="tab-pane" id="new_project">
- <a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
- <p>If you don't have a project yet, you can begin by using the project template included with the SDK. The template includes support for SDK features.</p>
- <ul>
- <li>Locate the project template in the expanded SDK. It should be at the following location:
- <pre><sdk_root>/new-project-template</pre>
- </li>
- </ul>
- </div>
+ <div class="tab-pane active" id="existing_project">
+ <a class="jumplink" name="add_the_sdk_to_an_existing_project"></a>
+ <p>If you've already got an Android project, you can
+ integrate the Apigee SDK into your project as you
+ normally would:</p>
+ <div id="collapse">
+ <a href="#jar_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="jar_collapse" class="collapse">
+ <p>
+ Add
+ <code>apigee-android-<version>.jar</code>
+ to your class path by doing the following:
+ </p>
+
+ <h3>Android 4.0 (or later) projects</h3>
+ <p>
+ Copy the jar file into the
+ <code>/libs</code>
+ folder in your project.
+ </p>
+
+ <h3>Android 3.0 (or earlier) projects</h3>
+ <ol>
+ <li>In the Eclipse <strong>Package Explorer</strong>,
+ select your application's project folder.
+ </li>
+ <li>Click the <strong>File > Properties</strong> menu.
+ </li>
+ <li>In the <strong>Java Build Path</strong> section, click
+ the <strong>Libraries</strong> tab, click <strong>Add
+ External JARs</strong>.
+ </li>
+ <li>Browse to <code>apigee-android-<version>.jar</code>,
+ then click <strong>Open</strong>.
+ </li>
+ <li>Order the <code>apigee-android-<version>.jar</code>
+ at the top of the class path:
+ <ol>
+ <li>In the Eclipse <strong>Package Explorer</strong>,
+ select your application's project folder.
+ </li>
+ <li>Click the <strong>File >
+ Properties</strong> menu.
+ </li>
+ <li>In the properties dialog, in the <strong>Java
+ Build Path</strong> section, click the <strong>Order
+ and Export</strong> tab.
+ </li>
+ <li>
+ <p>
+ <strong>IMPORTANT:</strong> Select the checkbox for
+ <code>apigee-android-<version>.jar</code>
+ , then click the <strong>Top</strong> button.
+ </p>
+ </li>
+ </ol>
+ </li>
+ </ol>
+ <div class="warning">
+ <h3>Applications using Ant</h3>
+ <p>
+ If you are using Ant to build your application, you must also
+ copy
+ <code>apigee-android-<version>.jar</code>
+ to the
+ <code>/libs</code>
+ folder in your application.
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="tab-pane" id="new_project">
+ <a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
+ <p>If you don't have a project yet, you can begin by using
+ the project template included with the SDK. The template includes
+ support for SDK features.</p>
+ <ul>
+ <li>Locate the project template in the expanded SDK. It
+ should be at the following location: <pre><sdk_root>/new-project-template</pre>
+ </li>
+ </ul>
+ </div>
</div>
<h2>2. Update permissions in AndroidManifest.xml</h2>
-<p>Add the following Internet permissions to your application's <code>AndroidManifest.xml</code> file if they have not already been added. Note that with the exception of INTERNET, enabling all other permissions are optional.</p>
+<p>
+ Add the following Internet permissions to your application's
+ <code>AndroidManifest.xml</code>
+ file if they have not already been added. Note that with the exception
+ of INTERNET, enabling all other permissions are optional.
+</p>
<pre>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -79,10 +125,16 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
</pre>
<h2>3. Initialize the SDK</h2>
-<p>To initialize the App Services SDK, you must instantiate the <code>ApigeeClient</code> class. There are multiple ways to handle this step, but we recommend that you do the following:</p>
+<p>
+ To initialize the App Services SDK, you must instantiate the
+ <code>ApigeeClient</code>
+ class. There are multiple ways to handle this step, but we recommend
+ that you do the following:
+</p>
<ol>
- <li>Subclass the <code>Application</code> class, and add an instance variable for the <code>ApigeeClient</code> to it, along with getter and setter methods.
- <pre>
+ <li>Subclass the <code>Application</code> class, and add an
+ instance variable for the <code>ApigeeClient</code> to it, along
+ with getter and setter methods. <pre>
public class YourApplication extends Application
{
@@ -104,9 +156,9 @@ public class YourApplication extends Application
}
}
</pre>
- </li>
- <li>Declare the <code>Application</code> subclass in your <code>AndroidManifest.xml</code>. For example:
- <pre>
+ </li>
+ <li>Declare the <code>Application</code> subclass in your <code>AndroidManifest.xml</code>.
+ For example: <pre>
<application>
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
@@ -115,9 +167,9 @@ public class YourApplication extends Application
…
</application>
</pre>
- </li>
- <li>Instantiate the <code>ApigeeClient</code> class in the <code>onCreate</code> method of your first <code>Activity</code> class:
- <pre>
+ </li>
+ <li>Instantiate the <code>ApigeeClient</code> class in the <code>onCreate</code>
+ method of your first <code>Activity</code> class: <pre>
import com.apigee.sdk.ApigeeClient;
@Override
@@ -134,8 +186,14 @@ protected void onCreate(Bundle savedInstanceState) {
yourApp.setApigeeClient(apigeeClient);
}
</pre>
- <p>This will make the instance of <code>ApigeeClient</code> available to your <code>Application</code> class.</p>
- </li>
+ <p>
+ This will make the instance of
+ <code>ApigeeClient</code>
+ available to your
+ <code>Application</code>
+ class.
+ </p>
+ </li>
</ol>
<h2>4. Import additional SDK classes</h2>
<p>The following classes will enable you to call common SDK methods:</p>
@@ -145,82 +203,152 @@ import com.apigee.sdk.apm.android.MonitoringClient; //App Monitoring methods
import com.apigee.sdk.data.client.callbacks.ApiResponseCallback; //API response handling
import com.apigee.sdk.data.client.response.ApiResponse; //API response object
</pre>
-
+
<h2>5. Verify SDK installation</h2>
-<p>Once initialized, App Services will also automatically instantiate the <code>MonitoringClient</code> class and begin logging usage, crash and error metrics for your app.</p>
-<p><img src="img/verify.png" alt="screenshot of data in admin portal"/></p>
-<p>To verify that the SDK has been properly initialized, run your app, then go to 'Monitoring' > 'App Usage' in the <a href="https://www.apigee.com/usergrid">App Services admin portal</a> to verify that data is being sent.</p>
-<div class="warning">It may take up to two minutes for data to appear in the admin portal after you run your app.</div>
+<p>
+ Once initialized, App Services will also automatically instantiate the
+ <code>MonitoringClient</code>
+ class and begin logging usage, crash and error metrics for your app.
+</p>
+<p>
+ <img src="img/verify.png" alt="screenshot of data in admin portal" />
+</p>
+<p>
+ To verify that the SDK has been properly initialized, run your app,
+ then go to 'Monitoring' > 'App Usage' in the <a
+ href="https://www.apigee.com/usergrid">App Services admin portal</a>
+ to verify that data is being sent.
+</p>
+<div class="warning">It may take up to two minutes for data to
+ appear in the admin portal after you run your app.</div>
<h2>Installation complete! Try these next steps</h2>
<ul>
- <li>
- <h3><strong>Call additional SDK methods in your code</strong></h3>
- <p>The <code>DataClient</code> and <code>MonitoringClient</code> classes are also automatically instantiated for you, and accessible with the following accessors:</p>
- <ul>
- <li>
- <pre>DataClient dataClient = apigeeClient.getDataClient();</pre>
- <p>Use this object to access the data methods of the App Services SDK, including those for push notifications, data store, and geolocation.</p>
- </li>
- <li>
- <pre>MonitoringClient monitoringClient = apigeeClient.getMonitoringClient();</pre>
- <p>Use this object to access the app configuration and monitoring methods of the App Services SDK, including advanced logging, and A/B testing.</p>
- </li>
- </ul>
- </li>
- <li>
- <h3><strong>Add App Services features to your app</strong></h3>
- <p>With App Services you can quickly add valuable features to your mobile or web app, including push notifications, a custom data store, geolocation and more. Check out these links to get started with a few of our most popular features:</p>
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/8410">Push notifications</a></strong>: Send offers, alerts and other messages directly to user devices to dramatically increase engagement. With App Services you can send 10 million push notification per month for free!</li>
- <li><strong>App Monitoring</strong>: When you initialize the App Services SDK, a suite of valuable, <a href="http://apigee.com/docs/node/13190">customizable</a> application monitoring features are automatically enabled that deliver the data you need to fine tune performance, analyze issues, and improve user experience.
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/13176">App Usage Monitoring</a></strong>: Visit the <a href="https://apigee.com/usergrid">App Services admin portal</a> to view usage data for your app, including data on device models, platforms and OS versions running your app.</li>
- <li><strong><a href="http://apigee.com/docs/node/12861">API Performance Monitoring</a></strong>: Network performance is key to a solid user experience. In the <a href="https://apigee.com/usergrid">App Services admin portal</a> you can view key metrics, including response time, number of requests and raw API request logs.</li>
- <li><strong><a href="http://apigee.com/docs/node/13177">Error & Crash Monitoring</a></strong>: Get alerted to any errors or crashes, then view them in the <a href="https://apigee.com/usergrid">App Services admin portal</a>, where you can also analyze raw error and crash logs.</li>
- </ul>
- </li>
- <li><strong><a href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target users or return result sets based on user location to keep your app highly-relevant.</li>
- <li><strong><a href="http://apigee.com/docs/node/10152">Data storage</a></strong>: Store all your application data on our high-availability infrastructure, and never worry about dealing with a database ever again.</li>
- <li><strong><a href="http://apigee.com/docs/node/376">User management and authentication</a></strong>: Every app needs users. Use App Services to easily implement user registration, as well as OAuth 2.0-compliant login and authentication.</li>
- </ul>
- </li>
- <li>
- <h3><strong>Check out the sample apps</strong></h3>
- <p>The SDK includes samples that illustrate Apigee features. You'll find the samples in the following location in your SDK download:</p>
- <pre>
+ <li>
+ <h3>
+ <strong>Call additional SDK methods in your code</strong>
+ </h3>
+ <p>
+ The
+ <code>DataClient</code>
+ and
+ <code>MonitoringClient</code>
+ classes are also automatically instantiated for you, and
+ accessible with the following accessors:
+ </p>
+ <ul>
+ <li><pre>DataClient dataClient = apigeeClient.getDataClient();</pre>
+ <p>Use this object to access the data methods of the App
+ Services SDK, including those for push notifications, data
+ store, and geolocation.</p></li>
+ <li><pre>MonitoringClient monitoringClient = apigeeClient.getMonitoringClient();</pre>
+ <p>Use this object to access the app configuration and
+ monitoring methods of the App Services SDK, including advanced
+ logging, and A/B testing.</p></li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Add App Services features to your app</strong>
+ </h3>
+ <p>With App Services you can quickly add valuable features to
+ your mobile or web app, including push notifications, a custom
+ data store, geolocation and more. Check out these links to get
+ started with a few of our most popular features:</p>
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/8410">Push notifications</a></strong>:
+ Send offers, alerts and other messages directly to user devices
+ to dramatically increase engagement. With App Services you can
+ send 10 million push notification per month for free!</li>
+ <li><strong>App Monitoring</strong>: When you initialize the
+ App Services SDK, a suite of valuable, <a
+ href="http://apigee.com/docs/node/13190">customizable</a>
+ application monitoring features are automatically enabled that
+ deliver the data you need to fine tune performance, analyze
+ issues, and improve user experience.
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/13176">App Usage
+ Monitoring</a></strong>: Visit the <a
+ href="https://apigee.com/usergrid">App Services admin
+ portal</a> to view usage data for your app, including data on
+ device models, platforms and OS versions running your app.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/12861">API
+ Performance Monitoring</a></strong>: Network performance is key to a
+ solid user experience. In the <a
+ href="https://apigee.com/usergrid">App Services admin
+ portal</a> you can view key metrics, including response time,
+ number of requests and raw API request logs.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/13177">Error &
+ Crash Monitoring</a></strong>: Get alerted to any errors or crashes,
+ then view them in the <a href="https://apigee.com/usergrid">App
+ Services admin portal</a>, where you can also analyze raw
+ error and crash logs.</li>
+ </ul></li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target
+ users or return result sets based on user location to keep your
+ app highly-relevant.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/10152">Data storage</a></strong>:
+ Store all your application data on our high-availability
+ infrastructure, and never worry about dealing with a database
+ ever again.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/376">User management and
+ authentication</a></strong>: Every app needs users. Use App Services to
+ easily implement user registration, as well as OAuth
+ 2.0-compliant login and authentication.</li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Check out the sample apps</strong>
+ </h3>
+ <p>The SDK includes samples that illustrate
+ Apigee features. You'll find the samples in the following
+ location in your SDK download:</p> <pre>
apigee-android-sdk-<version>
...
/samples
</pre>
- <div id="collapse">
- <a href="#samples_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="samples_collapse" class="collapse">
- <p>The samples include the following:</p>
- <table class="table">
- <thead>
- <tr>
- <th scope="col">Sample</th>
- <th scope="col">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>books</td>
- <td>An app for storing a list of books that shows Apigee database operations such as reading, creating, and deleting.</td>
- </tr>
- <tr>
- <td>messagee</td>
- <td>An app for sending and receiving messages that shows Apigee database operations (reading, creating).</td>
- </tr>
- <tr>
- <td>push</td>
- <td>An app that uses the push feature to send notifications to the devices of users who have subscribed for them.</td>
- </tr>
- </tbody>
- </table>
- </div>
- </li>
+ <div id="collapse">
+ <a href="#samples_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="samples_collapse" class="collapse">
+ <p>The samples include the following:</p>
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Sample</th>
+ <th scope="col">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>books</td>
+ <td>An app for storing a list of books that shows
+ Apigee database operations such as reading, creating, and
+ deleting.</td>
+ </tr>
+ <tr>
+ <td>messagee</td>
+ <td>An app for sending and receiving messages that
+ shows Apigee database operations (reading, creating).</td>
+ </tr>
+ <tr>
+ <td>push</td>
+ <td>An app that uses the push feature to send
+ notifications to the devices of users who have subscribed
+ for them.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/doc-includes/ios.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/doc-includes/ios.html b/portal/js/app-overview/doc-includes/ios.html
index c372537..d1b3fc0 100644
--- a/portal/js/app-overview/doc-includes/ios.html
+++ b/portal/js/app-overview/doc-includes/ios.html
@@ -1,3 +1,4 @@
+<h2>1. Integrate ApigeeiOSSDK.framework</h2>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,85 +15,128 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<h2>1. Integrate ApigeeiOSSDK.framework</h2>
<a class="jumplink" name="add_the_sdk_to_an_existing_project"></a>
<ul class="nav nav-tabs" id="myTab">
- <li class="active"><a data-toggle="tab" href="#existing_project">Existing project</a></li>
- <li><a data-toggle="tab" href="#new_project">New project</a></li>
+ <li class="active"><a data-toggle="tab" href="#existing_project">Existing
+ project</a></li>
+ <li><a data-toggle="tab" href="#new_project">New project</a></li>
</ul>
<div class="tab-content">
- <div class="tab-pane active" id="existing_project">
- <p>If you've already got an Xcode iOS project, add it into your project as you normally would.</p>
- <div id="collapse"><a class="btn" data-toggle="collapse" href="#framework_collapse">Details</a></div>
- <div class="collapse" id="framework_collapse">
- <ol>
- <li>
- <p>Locate the SDK framework file so you can add it to your project. For example, you'll find the file at the following path:</p>
- <pre>
+ <div class="tab-pane active" id="existing_project">
+ <p>If you've already got an Xcode iOS project, add it into
+ your project as you normally would.</p>
+ <div id="collapse">
+ <a class="btn" data-toggle="collapse" href="#framework_collapse">Details</a>
+ </div>
+ <div class="collapse" id="framework_collapse">
+ <ol>
+ <li>
+ <p>Locate the SDK framework file so you can add it to your
+ project. For example, you'll find the file at the following
+ path:</p> <pre>
<sdk_root>/bin/ApigeeiOSSDK.framework</pre>
- </li>
- <li>In the <strong>Project Navigator</strong>, click on your project file, and then the <strong>Build Phases</strong> tab. Expand <strong>Link Binary With Libraries</strong>.</li>
- <li>Link the Apigee iOS SDK into your project.
- <ul>
- <li>Drag ApigeeiOSSDK.framework into the Frameworks group created by Xcode.</li>
- </ul>
- <p>OR</p>
- <ol>
- <li>At the bottom of the <strong>Link Binary With Libraries</strong> group, click the <strong>+</strong> button. Then click <strong>Add Other</strong>.</li>
- <li>Navigate to the directory that contains ApigeeiOSSDK.framework, and choose the ApigeeiOSSDK.framework folder.</li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
- <div class="tab-pane" id="new_project"><a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
- <p>If you're starting with a clean slate (you don't have a project yet), you can begin by using the project template included with the SDK. The template includes support for SDK features.</p>
- <ol>
- <li>
- <p>Locate the project template in the expanded SDK. It should be at the following location:</p>
- <pre>
+ </li>
+ <li>In the <strong>Project Navigator</strong>, click on
+ your project file, and then the <strong>Build Phases</strong>
+ tab. Expand <strong>Link Binary With Libraries</strong>.
+ </li>
+ <li>Link the Apigee iOS SDK into your project.
+ <ul>
+ <li>Drag ApigeeiOSSDK.framework into the Frameworks
+ group created by Xcode.</li>
+ </ul>
+ <p>OR</p>
+ <ol>
+ <li>At the bottom of the <strong>Link Binary
+ With Libraries</strong> group, click the <strong>+</strong>
+ button. Then click <strong>Add Other</strong>.
+ </li>
+ <li>Navigate to the directory that contains
+ ApigeeiOSSDK.framework, and choose the
+ ApigeeiOSSDK.framework folder.</li>
+ </ol>
+ </li>
+ </ol>
+ </div>
+ </div>
+ <div class="tab-pane" id="new_project">
+ <a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
+ <p>If you're starting with a clean slate (you don't have
+ a project yet), you can begin by using the project template
+ included with the SDK. The template includes support for SDK
+ features.</p>
+ <ol>
+ <li>
+ <p>Locate the project template in the expanded SDK. It
+ should be at the following location:</p> <pre>
<sdk_root>/new-project-template</pre>
- </li>
- <li>In the project template directory, open the project file: Apigee App Services iOS Template.xcodeproj.</li>
- <li>Get acquainted with the template by looking at its readme file.</li>
- </ol>
- </div>
+ </li>
+ <li>In the project template directory, open the project
+ file: Apigee App Services iOS Template.xcodeproj.</li>
+ <li>Get acquainted with the template by looking at its readme
+ file.</li>
+ </ol>
+ </div>
</div>
<h2>2. Add required iOS frameworks</h2>
-<p>Ensure that the following iOS frameworks are part of your project. To add them, under the <strong>Link Binary With Libraries</strong> group, click the <strong>+</strong> button, type the name of the framework you want to add, select the framework found by Xcode, then click <strong>Add</strong>.</p>
+<p>
+ Ensure that the following iOS frameworks are part of your project. To
+ add them, under the <strong>Link Binary With Libraries</strong> group,
+ click the <strong>+</strong> button, type the name of the framework
+ you want to add, select the framework found by Xcode, then click <strong>Add</strong>.
+</p>
<ul>
- <li>QuartzCore.framework</li>
- <li>CoreLocation.framework</li>
- <li>CoreTelephony.framework </li>
- <li>Security.framework</li>
- <li>SystemConfiguration.framework</li>
- <li>UIKit.framework</li>
+ <li>QuartzCore.framework</li>
+ <li>CoreLocation.framework</li>
+ <li>CoreTelephony.framework </li>
+ <li>Security.framework</li>
+ <li>SystemConfiguration.framework</li>
+ <li>UIKit.framework</li>
</ul>
<h2>3. Update 'Other Linker Flags'</h2>
-<p>In the <strong>Build Settings</strong> panel, add the following under <strong>Other Linker Flags</strong>:</p>
+<p>
+ In the <strong>Build Settings</strong> panel, add the following under
+ <strong>Other Linker Flags</strong>:
+</p>
<pre>
-ObjC -all_load</pre>
-<p>Confirm that flags are set for both <strong>DEBUG</strong> and <strong>RELEASE</strong>.</p>
+<p>
+ Confirm that flags are set for both <strong>DEBUG</strong> and <strong>RELEASE</strong>.
+</p>
<h2>4. Initialize the SDK</h2>
-<p>The <em>ApigeeClient</em> class initializes the App Services SDK. To do this you will need your organization name and application name, which are available in the <em>Getting Started</em> tab of the <a href="https://www.apigee.com/usergrid/">App Service admin portal</a>, under <strong>Mobile SDK Keys</strong>.</p>
+<p>
+ The <em>ApigeeClient</em> class initializes the App Services SDK. To
+ do this you will need your organization name and application name,
+ which are available in the <em>Getting Started</em> tab of the <a
+ href="https://www.apigee.com/usergrid/">App Service admin portal</a>,
+ under <strong>Mobile SDK Keys</strong>.
+</p>
<ol>
- <li>Import the SDK
- <p>Add the following to your source code to import the SDK:</p>
- <pre>
+ <li>Import the SDK
+ <p>Add the following to your source code to import the SDK:</p> <pre>
#import <ApigeeiOSSDK/Apigee.h></pre>
- </li>
- <li>
- <p>Declare the following properties in <code>AppDelegate.h</code>:</p>
- <pre>
+ </li>
+ <li>
+ <p>
+ Declare the following properties in
+ <code>AppDelegate.h</code>
+ :
+ </p> <pre>
@property (strong, nonatomic) ApigeeClient *apigeeClient;
@property (strong, nonatomic) ApigeeMonitoringClient *monitoringClient;
@property (strong, nonatomic) ApigeeDataClient *dataClient;
</pre>
- </li>
- <li>
- <p>Instantiate the <code>ApigeeClient</code> class inside the <code>didFinishLaunching</code> method of <code>AppDelegate.m</code>:</p>
- <pre>
+ </li>
+ <li>
+ <p>
+ Instantiate the
+ <code>ApigeeClient</code>
+ class inside the
+ <code>didFinishLaunching</code>
+ method of
+ <code>AppDelegate.m</code>
+ :
+ </p> <pre>
//Replace 'AppDelegate' with the name of your app delegate class to instantiate it
AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
@@ -109,82 +153,145 @@ appDelegate.apigeeClient = [[ApigeeClient alloc]
self.monitoringClient = [appDelegate.apigeeClient monitoringClient];
self.dataClient = [appDelegate.apigeeClient dataClient];
</pre>
- </li>
+ </li>
</ol>
<h2>5. Verify SDK installation</h2>
-<p>Once initialized, App Services will also automatically instantiate the <code>ApigeeMonitoringClient</code> class and begin logging usage, crash and error metrics for your app.</p>
+<p>
+ Once initialized, App Services will also automatically instantiate the
+ <code>ApigeeMonitoringClient</code>
+ class and begin logging usage, crash and error metrics for your app.
+</p>
-<p>To verify that the SDK has been properly initialized, run your app, then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a href="https://www.apigee.com/usergrid">App Services admin portal</a> to verify that data is being sent.</p>
-<p><img src="img/verify.png" alt="screenshot of data in admin portal"/></p>
-<div class="warning">It may take up to two minutes for data to appear in the admin portal after you run your app.</div>
+<p>
+ To verify that the SDK has been properly initialized, run your app,
+ then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a
+ href="https://www.apigee.com/usergrid">App Services admin portal</a>
+ to verify that data is being sent.
+</p>
+<p>
+ <img src="img/verify.png" alt="screenshot of data in admin portal" />
+</p>
+<div class="warning">It may take up to two minutes for data to
+ appear in the admin portal after you run your app.</div>
<h2>Installation complete! Try these next steps</h2>
-<ul>
- <li>
- <h3><strong>Call additional SDK methods in your code</strong></h3>
- <p>Create an instance of the AppDelegate class, then use <code>appDelegate.dataClient</code> or <code>appDelegate.monitoringClient</code> to call SDK methods:</p>
- <div id="collapse"><a class="btn" data-toggle="collapse" href="#client_collapse">Details</a></div>
- <div class="collapse" id="client_collapse">
- <ul>
- <li><code>appDelegate.dataClient</code>: Used to access the data methods of the App Services SDK, including those for push notifications, data store, and geolocation.</li>
- <li><code>appDelegate.monitoringClient</code>: Used to access the app configuration and monitoring methods of the App Services SDK, including advanced logging, and A/B testing.</li>
- </ul>
- <h3>Example</h3>
- <p>For example, you could create a new entity with the following:</p>
- <pre>
+<ul>
+ <li>
+ <h3>
+ <strong>Call additional SDK methods in your code</strong>
+ </h3>
+ <p>
+ Create an instance of the AppDelegate class, then use
+ <code>appDelegate.dataClient</code>
+ or
+ <code>appDelegate.monitoringClient</code>
+ to call SDK methods:
+ </p>
+ <div id="collapse">
+ <a class="btn" data-toggle="collapse" href="#client_collapse">Details</a>
+ </div>
+ <div class="collapse" id="client_collapse">
+ <ul>
+ <li><code>appDelegate.dataClient</code>: Used to access the
+ data methods of the App Services SDK, including those for push
+ notifications, data store, and geolocation.</li>
+ <li><code>appDelegate.monitoringClient</code>: Used to
+ access the app configuration and monitoring methods of the App
+ Services SDK, including advanced logging, and A/B testing.</li>
+ </ul>
+ <h3>Example</h3>
+ <p>For example, you could create a new entity with the
+ following:</p>
+ <pre>
AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
</pre>
- </div>
+ </div>
- </li>
- <li>
- <h3><strong>Add App Services features to your app</strong></h3>
- <p>With App Services you can quickly add valuable features to your mobile or web app, including push notifications, a custom data store, geolocation and more. Check out these links to get started with a few of our most popular features:</p>
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/8410">Push notifications</a></strong>: Send offers, alerts and other messages directly to user devices to dramatically increase engagement. With App Services you can send 10 million push notification per month for free!</li>
- <li><strong><a href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target users or return result sets based on user location to keep your app highly-relevant.</li>
- <li><strong><a href="http://apigee.com/docs/node/10152">Data storage</a></strong>: Store all your application data on our high-availability infrastructure, and never worry about dealing with a database ever again.</li>
- <li><strong><a href="http://apigee.com/docs/node/376">User management and authentication</a></strong>: Every app needs users. Use App Services to easily implement user registration, as well as OAuth 2.0-compliant login and authentication.</li>
- </ul>
- </li>
- <li>
- <h3><strong>Check out the sample apps</strong></h3>
- <p>The SDK includes samples that illustrate Apigee features. To look at them, open the .xcodeproj file for each in Xcode. To get a sample app running, open its project file, then follow the steps described in the section, <a target="_blank" href="http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios">Add the SDK to an existing project</a>.</p>
- <p>You'll find the samples in the following location in your SDK download:</p>
- <pre>
+ </li>
+ <li>
+ <h3>
+ <strong>Add App Services features to your app</strong>
+ </h3>
+ <p>With App Services you can quickly add valuable features to
+ your mobile or web app, including push notifications, a custom
+ data store, geolocation and more. Check out these links to get
+ started with a few of our most popular features:</p>
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/8410">Push notifications</a></strong>:
+ Send offers, alerts and other messages directly to user devices
+ to dramatically increase engagement. With App Services you can
+ send 10 million push notification per month for free!</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target
+ users or return result sets based on user location to keep your
+ app highly-relevant.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/10152">Data storage</a></strong>:
+ Store all your application data on our high-availability
+ infrastructure, and never worry about dealing with a database
+ ever again.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/376">User management and
+ authentication</a></strong>: Every app needs users. Use App Services to
+ easily implement user registration, as well as OAuth
+ 2.0-compliant login and authentication.</li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Check out the sample apps</strong>
+ </h3>
+ <p>
+ The SDK includes samples that illustrate Apigee features. To
+ look at them, open the .xcodeproj file for each in Xcode. To get a
+ sample app running, open its project file, then follow the steps
+ described in the section, <a target="_blank"
+ href="http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios">Add
+ the SDK to an existing project</a>.
+ </p>
+ <p>You'll find the samples in the following location in your SDK
+ download:</p> <pre>
apigee-ios-sdk-<version>
...
/samples
</pre>
- <div id="collapse"><a class="btn" data-toggle="collapse" href="#samples_collapse">Details</a></div>
- <div class="collapse" id="samples_collapse">
- <p>The samples include the following:</p>
- <table class="table">
- <thead>
- <tr>
- <th scope="col">Sample</th>
- <th scope="col">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>books</td>
- <td>An app for storing a list of books that shows Apigee database operations such as reading, creating, and deleting.</td>
- </tr>
- <tr>
- <td>messagee</td>
- <td>An app for sending and receiving messages that shows Apigee database operations (reading, creating).</td>
- </tr>
- <tr>
- <td>push</td>
- <td>An app that uses the push feature to send notifications to the devices of users who have subscribed for them.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <p> </p>
- </li>
+ <div id="collapse">
+ <a class="btn" data-toggle="collapse" href="#samples_collapse">Details</a>
+ </div>
+ <div class="collapse" id="samples_collapse">
+ <p>The samples include the following:</p>
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Sample</th>
+ <th scope="col">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>books</td>
+ <td>An app for storing a list of books that shows
+ Apigee database operations such as reading, creating, and
+ deleting.</td>
+ </tr>
+ <tr>
+ <td>messagee</td>
+ <td>An app for sending and receiving messages that
+ shows Apigee database operations (reading, creating).</td>
+ </tr>
+ <tr>
+ <td>push</td>
+ <td>An app that uses the push feature to send
+ notifications to the devices of users who have subscribed
+ for them.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <p> </p>
+ </li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/doc-includes/javascript.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/doc-includes/javascript.html b/portal/js/app-overview/doc-includes/javascript.html
index db6ed58..41cec2e 100644
--- a/portal/js/app-overview/doc-includes/javascript.html
+++ b/portal/js/app-overview/doc-includes/javascript.html
@@ -1,3 +1,4 @@
+<h2>1. Import the SDK into your HTML</h2>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,15 +15,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<h2>1. Import the SDK into your HTML</h2>
-<p>To enable support for Apigee-related functions in your HTML, you'll need to include <code>apigee.js</code> in your app. To do this, add the following to the <code>head</code> block of your HTML:</p>
+<p>
+ To enable support for Apigee-related functions in your HTML, you'll
+ need to include
+ <code>apigee.js</code>
+ in your app. To do this, add the following to the
+ <code>head</code>
+ block of your HTML:
+</p>
<pre>
<script type="text/javascript" src="path/to/js/sdk/apigee.js"></script>
</pre>
<h2>2. Instantiate Apigee.Client</h2>
-<p>Apigee.Client initializes the App Services SDK, and gives you access to all of the App Services SDK methods.</p>
-<p>You will need to pass a JSON object with the UUID or name for your App Services organization and application when you instantiate it.</p>
+<p>Apigee.Client initializes the App Services SDK, and gives you
+ access to all of the App Services SDK methods.</p>
+<p>You will need to pass a JSON object with the UUID or name for
+ your App Services organization and application when you instantiate
+ it.</p>
<pre>
//Apigee account credentials, available in the App Services admin portal
var client_creds = {
@@ -36,76 +45,132 @@ var dataClient = new Apigee.Client(client_creds);
<h2>3. Verify SDK installation</h2>
-<p>Once initialized, App Services will also automatically instantiate <code>Apigee.MonitoringClient</code> and begin logging usage, crash and error metrics for your app.</p>
+<p>
+ Once initialized, App Services will also automatically instantiate
+ <code>Apigee.MonitoringClient</code>
+ and begin logging usage, crash and error metrics for your app.
+</p>
-<p>To verify that the SDK has been properly initialized, run your app, then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a href="https://www.apigee.com/usergrid">App Services admin portal</a> to verify that data is being sent.</p>
-<p><img src="img/verify.png" alt="screenshot of data in admin portal"/></p>
-<div class="warning">It may take up to two minutes for data to appear in the admin portal after you run your app.</div>
+<p>
+ To verify that the SDK has been properly initialized, run your app,
+ then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a
+ href="https://www.apigee.com/usergrid">App Services admin portal</a>
+ to verify that data is being sent.
+</p>
+<p>
+ <img src="img/verify.png" alt="screenshot of data in admin portal" />
+</p>
+<div class="warning">It may take up to two minutes for data to
+ appear in the admin portal after you run your app.</div>
<h2>Installation complete! Try these next steps</h2>
<ul>
- <li>
- <h3><strong>Call additional SDK methods in your code</strong></h3>
- <p>Use <code>dataClient</code> or <code>dataClient.monitor</code> to call SDK methods:</p>
- <div id="collapse">
- <a href="#client_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="client_collapse" class="collapse">
- <ul>
- <li><code>dataClient</code>: Used to access the data methods of the App Services SDK, including those for push notifications, data store, and geolocation.</li>
- <li><code>dataClient.monitor</code>: Used to access the app configuration and monitoring methods of the App Services SDK, including advanced logging, and A/B testing.</li>
- </ul>
- </div>
- </li>
- <li>
- <h3><strong>Add App Services features to your app</strong></h3>
- <p>With App Services you can quickly add valuable features to your mobile or web app, including push notifications, a custom data store, geolocation and more. Check out these links to get started with a few of our most popular features:</p>
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/8410">Push notifications</a></strong>: Send offers, alerts and other messages directly to user devices to dramatically increase engagement. With App Services you can send 10 million push notification per month for free!</li>
- <li><strong><a href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Keep your app highly-relevant by targeting users or returning result sets based on user location.</li>
- <li><strong><a href="http://apigee.com/docs/node/10152">Data storage</a></strong>: Store all your application data on our high-availability infrastructure, and never worry about dealing with a database ever again.</li>
- <li><strong><a href="http://apigee.com/docs/node/376">User management and authentication</a></strong>: Every app needs users. Use App Services to easily implement registration, login and OAuth 2.0-compliant authentication.</li>
- </ul>
- </li>
- <li>
- <h3><strong>Check out the sample apps</strong></h3>
- <p>The SDK includes samples that illustrate Apigee features. To look at them, open the .xcodeproj file for each in Xcode. You'll find the samples in the following location in your SDK download:</p>
- <pre>
+ <li>
+ <h3>
+ <strong>Call additional SDK methods in your code</strong>
+ </h3>
+ <p>
+ Use
+ <code>dataClient</code>
+ or
+ <code>dataClient.monitor</code>
+ to call SDK methods:
+ </p>
+ <div id="collapse">
+ <a href="#client_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="client_collapse" class="collapse">
+ <ul>
+ <li><code>dataClient</code>: Used to access the data
+ methods of the App Services SDK, including those for push
+ notifications, data store, and geolocation.</li>
+ <li><code>dataClient.monitor</code>: Used to access the app
+ configuration and monitoring methods of the App Services SDK,
+ including advanced logging, and A/B testing.</li>
+ </ul>
+ </div>
+ </li>
+ <li>
+ <h3>
+ <strong>Add App Services features to your app</strong>
+ </h3>
+ <p>With App Services you can quickly add valuable features to
+ your mobile or web app, including push notifications, a custom
+ data store, geolocation and more. Check out these links to get
+ started with a few of our most popular features:</p>
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/8410">Push notifications</a></strong>:
+ Send offers, alerts and other messages directly to user devices
+ to dramatically increase engagement. With App Services you can
+ send 10 million push notification per month for free!</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Keep
+ your app highly-relevant by targeting users or returning result
+ sets based on user location.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/10152">Data storage</a></strong>:
+ Store all your application data on our high-availability
+ infrastructure, and never worry about dealing with a database
+ ever again.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/376">User management and
+ authentication</a></strong>: Every app needs users. Use App Services to
+ easily implement registration, login and OAuth 2.0-compliant
+ authentication.</li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Check out the sample apps</strong>
+ </h3>
+ <p>The SDK includes samples that illustrate
+ Apigee features. To look at them, open the .xcodeproj file
+ for each in Xcode. You'll find the samples in the following
+ location in your SDK download:</p> <pre>
apigee-javascript-sdk-master
...
/samples
</pre>
- <div id="collapse">
- <a href="#samples_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="samples_collapse" class="collapse">
- <p>The samples include the following:</p>
- <table class="table">
- <thead>
- <tr>
- <th scope="col">Sample</th>
- <th scope="col">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>booksSample.html</td>
- <td>An app for storing a list of books that shows Apigee database operations such as reading, creating, and deleting.</td>
- </tr>
- <tr>
- <td>messagee</td>
- <td>An app for sending and receiving messages that shows Apigee database operations (reading, creating).</td>
- </tr>
- <tr>
- <td>monitoringSample.html</td>
- <td>Shows basic configuration and initialization of the HTML5 app monitoring functionality. Works in browser, PhoneGap, Appcelerator, and Trigger.io.</td>
- </tr>
- <tr>
- <td>readmeSample.html</td>
- <td>A simple app for reading data from an Apigee database.</td>
- </tr>
- </tbody>
- </table>
- </div>
- </li>
+ <div id="collapse">
+ <a href="#samples_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="samples_collapse" class="collapse">
+ <p>The samples include the following:</p>
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Sample</th>
+ <th scope="col">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>booksSample.html</td>
+ <td>An app for storing a list of books that shows
+ Apigee database operations such as reading, creating, and
+ deleting.</td>
+ </tr>
+ <tr>
+ <td>messagee</td>
+ <td>An app for sending and receiving messages that
+ shows Apigee database operations (reading, creating).</td>
+ </tr>
+ <tr>
+ <td>monitoringSample.html</td>
+ <td>Shows basic configuration and initialization of the
+ HTML5 app monitoring functionality. Works in browser,
+ PhoneGap, Appcelerator, and Trigger.io.</td>
+ </tr>
+ <tr>
+ <td>readmeSample.html</td>
+ <td>A simple app for reading data from an Apigee
+ database.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/data.html
----------------------------------------------------------------------
diff --git a/portal/js/data/data.html b/portal/js/data/data.html
index 075bc7d..c732d1a 100644
--- a/portal/js/data/data.html
+++ b/portal/js/data/data.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,126 +15,193 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
-
- <bsmodal id="newCollection"
- title="Create new collection"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newCollectionDialog"
- extrabuttonlabel="Create"
- buttonid="collection"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- <label for="new-collection-name">Collection Name:</label>
- <div class="controls">
- <input type="text" ug-validate required ng-pattern="collectionNameRegex" ng-attr-title="{{collectionNameRegexDescription}}" ng-model="$parent.newCollection.name" name="collection" id="new-collection-name" class="input-xlarge"/>
- <p class="help-block hide"></p>
- </div>
+ <bsmodal id="newCollection" title="Create new collection"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="newCollectionDialog" extrabuttonlabel="Create"
+ buttonid="collection" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-collection-name">Collection Name:</label>
+ <div class="controls">
+ <input type="text" ug-validate required
+ ng-pattern="collectionNameRegex"
+ ng-attr-title="{{collectionNameRegexDescription}}"
+ ng-model="$parent.newCollection.name" name="collection"
+ id="new-collection-name" class="input-xlarge" />
+ <p class="help-block hide"></p>
</div>
- </fieldset>
+ </div>
+ </fieldset>
</bsmodal>
- <div id="intro-page">
+ <div id="intro-page">
<page-title title=" Collections" icon="📾"></page-title>
</div>
<section class="row-fluid">
<div id="intro-list" class="span3 user-col">
- <a class="btn btn-primary" id="new-collection-link" ng-click="showModal('newCollection')" title="new collection"><i class="pictogram"></i></a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data new collection')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_new_collection}}" tooltip-placement="right">(?)</a>
- <ul class="user-list" style="margin-top:5px;">
- <li ng-class="queryCollection._type === entity.name ? 'selected' : ''" ng-repeat="entity in collectionList" ng-click="loadCollection('/'+entity.name);">
- <a id="collection-{{entity.name}}-link" href="javaScript:void(0)">/{{entity.name}} </a>
- </li>
- </ul>
+ <a class="btn btn-primary" id="new-collection-link"
+ ng-click="showModal('newCollection')" title="new collection"><i
+ class="pictogram"></i></a> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data new collection')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_new_collection}}"
+ tooltip-placement="right">(?)</a>
+ <ul class="user-list" style="margin-top: 5px;">
+ <li
+ ng-class="queryCollection._type === entity.name ? 'selected' : ''"
+ ng-repeat="entity in collectionList"
+ ng-click="loadCollection('/'+entity.name);"><a
+ id="collection-{{entity.name}}-link" href="javaScript:void(0)">/{{entity.name}}
+ </a></li>
+ </ul>
- </div>
+ </div>
<div class="span9 tab-content">
<div class="content-page">
- <form id="intro-collection-query" name="dataForm" ng-submit="run();">
- <fieldset>
- <div class="control-group">
- <div class="" data-toggle="buttons-radio">
- <!--a class="btn" id="button-query-back">◀ Back</a-->
- <!--Added disabled class to change the way button looks but their functionality is as usual -->
- <label class="control-label" style="display:none"><strong>Method</strong> <a id="query-method-help" href="#" class="help-link">get help</a></label>
- <input type="radio" id="create-rb" name="query-action" style="margin-top: -2px;" ng-click="selectPOST();" ng-checked="verb=='POST'"> CREATE
- <input type="radio" id="read-rb" name="query-action" style="margin-top: -2px;" ng-click="selectGET();" ng-checked="verb=='GET'"> READ
- <input type="radio" id="update-rb" name="query-action" style="margin-top: -2px;" ng-click="selectPUT();" ng-checked="verb=='PUT'"> UPDATE
- <input type="radio" id="delete-rb" name="query-action" style="margin-top: -2px;" ng-click="selectDELETE();" ng-checked="verb=='DELETE'"> DELETE <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data query verbs')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_verb_buttons}}" tooltip-placement="right">(?)</a>
+ <form id="intro-collection-query" name="dataForm"
+ ng-submit="run();">
+ <fieldset>
+ <div class="control-group">
+ <div class="" data-toggle="buttons-radio">
+ <!--a class="btn" id="button-query-back">◀ Back</a-->
+ <!--Added disabled class to change the way button looks but their functionality is as usual -->
+ <label class="control-label" style="display: none"><strong>Method</strong>
+ <a id="query-method-help" href="#" class="help-link">get
+ help</a></label> <input type="radio" id="create-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectPOST();" ng-checked="verb=='POST'">
+ CREATE <input type="radio" id="read-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectGET();" ng-checked="verb=='GET'">
+ READ <input type="radio" id="update-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectPUT();" ng-checked="verb=='PUT'">
+ UPDATE <input type="radio" id="delete-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectDELETE();" ng-checked="verb=='DELETE'">
+ DELETE <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data query verbs')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_verb_buttons}}"
+ tooltip-placement="right">(?)</a>
+ </div>
</div>
- </div>
- <div class="control-group">
- <strong>Path </strong>
- <div class="controls">
- <input ng-model="data.queryPath" type="text" ug-validate id="pathDataQuery" ng-attr-title="{{pathRegexDescription}}" ng-pattern="pathRegex" class="span6" autocomplete="off" placeholder="ex: /users" required/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data query path')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_path_box}}" tooltip-placement="right">(?)</a>
+ <div class="control-group">
+ <strong>Path </strong>
+ <div class="controls">
+ <input ng-model="data.queryPath" type="text" ug-validate
+ id="pathDataQuery"
+ ng-attr-title="{{pathRegexDescription}}"
+ ng-pattern="pathRegex" class="span6"
+ autocomplete="off" placeholder="ex: /users" required />
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data query path')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_path_box}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ </div>
+ <div class="control-group">
+ <a id="back-to-collection" class="outside-link"
+ style="display: none">Back to collection</a>
</div>
- </div>
- <div class="control-group">
- <a id="back-to-collection" class="outside-link" style="display:none">Back to collection</a>
- </div>
- <div class="control-group">
- <strong>Query</strong>
- <div class="controls">
- <input ng-model="data.searchString" type="text" class="span6" autocomplete="off" placeholder="ex: select * where name='fred'"/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data query string')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_query_box}}" tooltip-placement="right">(?)</a>
- <div style="display:none">
- <a class="btn dropdown-toggle " data-toggle="dropdown">
- <span id="query-collections-caret" class="caret"></span>
- </a>
- <ul id="query-collections-indexes-list" class="dropdown-menu ">
- </ul>
+ <div class="control-group">
+ <strong>Query</strong>
+ <div class="controls">
+ <input ng-model="data.searchString" type="text"
+ class="span6" autocomplete="off"
+ placeholder="ex: select * where name='fred'" /> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data query string')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_query_box}}"
+ tooltip-placement="right">(?)</a>
+ <div style="display: none">
+ <a class="btn dropdown-toggle " data-toggle="dropdown">
+ <span id="query-collections-caret" class="caret"></span>
+ </a>
+ <ul id="query-collections-indexes-list"
+ class="dropdown-menu ">
+ </ul>
+ </div>
</div>
</div>
- </div>
- <div class="control-group" ng-show="verb=='GET' || verb=='DELETE'">
- <label class="control-label" for="query-limit"><strong>Limit</strong>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data limit')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_limit}}" tooltip-placement="right">(?)</a><a id="query-limit-help" href="#" ng-show="false" class="help-link">get help</a></label>
- <div class="controls">
- <div class="input-append">
- <input ng-model="data.queryLimit" type="text" class="span5" id="query-limit" placeholder="ex: 10">
+ <div class="control-group"
+ ng-show="verb=='GET' || verb=='DELETE'">
+ <label class="control-label" for="query-limit"><strong>Limit</strong>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data limit')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_limit}}"
+ tooltip-placement="right">(?)</a><a
+ id="query-limit-help" href="#" ng-show="false"
+ class="help-link">get help</a></label>
+ <div class="controls">
+ <div class="input-append">
+ <input ng-model="data.queryLimit" type="text"
+ class="span5" id="query-limit" placeholder="ex: 10">
+ </div>
</div>
</div>
- </div>
- <div class="control-group" style="display:{{queryBodyDisplay}}">
- <label class="control-label" for="query-source"><strong>JSON Body</strong>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data json body')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_json_body}}" tooltip-placement="right">(?)</a> <a id="query-json-help" href="#" ng-show="false" class="help-link">get help</a></label>
- <div class="controls">
- <textarea ng-model="data.queryBody" id="query-source" class="span6 pull-left" rows="4">
+ <div class="control-group"
+ style="display: {{queryBodyDisplay">
+ <label class="control-label" for="query-source"><strong>JSON
+ Body</strong> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data json body')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_json_body}}"
+ tooltip-placement="right">(?)</a> <a
+ id="query-json-help" href="#" ng-show="false"
+ class="help-link">get help</a></label>
+ <div class="controls">
+ <textarea ng-model="data.queryBody" id="query-source"
+ class="span6 pull-left" rows="4">
{ "name":"value" }
</textarea>
- <br>
- <a class="btn pull-left" ng-click="validateJson();">Validate JSON</a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data validate json')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_json_validate}}" tooltip-placement="right">(?)</a>
+ <br> <a class="btn pull-left"
+ ng-click="validateJson();">Validate JSON</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data validate json')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_json_validate}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ </div>
+ <div style="clear: both; height: 10px;"></div>
+ <div class="control-group">
+ <input type="submit"
+ ng-disabled="!dataForm.$valid || loading"
+ class="btn btn-primary" id="button-query"
+ value="{{loading ? loadingText : 'Run Query'}}" /> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data run query')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_run_query}}"
+ tooltip-placement="right">(?)</a>
</div>
- </div>
- <div style="clear: both; height: 10px;"></div>
- <div class="control-group">
- <input type="submit" ng-disabled="!dataForm.$valid || loading" class="btn btn-primary" id="button-query" value="{{loading ? loadingText : 'Run Query'}}"/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data run query')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_run_query}}" tooltip-placement="right">(?)</a>
- </div>
- </fieldset>
- </form>
+ </fieldset>
+ </form>
<div id="intro-entity-list">
- <div ng-include="display=='generic' ? 'data/display-generic.html' : ''"></div>
- <div ng-include="display=='users' ? 'data/display-users.html' : ''"></div>
- <div ng-include="display=='groups' ? 'data/display-groups.html' : ''"></div>
- <div ng-include="display=='roles' ? 'data/display-roles.html' : ''"></div>
+ <div
+ ng-include="display=='generic' ? 'data/display-generic.html' : ''"></div>
+ <div
+ ng-include="display=='users' ? 'data/display-users.html' : ''"></div>
+ <div
+ ng-include="display=='groups' ? 'data/display-groups.html' : ''"></div>
+ <div
+ ng-include="display=='roles' ? 'data/display-roles.html' : ''"></div>
</div>
</div>
- </div>
- </section>
+ </div>
+ </section>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/display-generic.html
----------------------------------------------------------------------
diff --git a/portal/js/data/display-generic.html b/portal/js/data/display-generic.html
index ad699eb..2b23276 100644
--- a/portal/js/data/display-generic.html
+++ b/portal/js/data/display-generic.html
@@ -1,4 +1,9 @@
-<!--
+<bsmodal id="deleteEntities"
+ title="Are you sure you want to delete the entities(s)?"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="deleteEntitiesDialog" extrabuttonlabel="Delete"
+ buttonid="del-entity" ng-cloak>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,98 +19,98 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<bsmodal id="deleteEntities"
- title="Are you sure you want to delete the entities(s)?"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteEntitiesDialog"
- extrabuttonlabel="Delete"
- buttonid="del-entity"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- </div>
- </fieldset>
+<fieldset>
+ <div class="control-group"></div>
+</fieldset>
</bsmodal>
-<span class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data entities list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_entities_list}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-disabled="!valueSelected(queryCollection._list) || deleteLoading" ng-click="deleteEntitiesDialog()">{{deleteLoading ? loadingText : 'Delete Entity(s)'}}</button>
+<span class="button-strip"> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data entities list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_entities_list}}" tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-disabled="!valueSelected(queryCollection._list) || deleteLoading"
+ ng-click="deleteEntitiesDialog()">{{deleteLoading ?
+ loadingText : 'Delete Entity(s)'}}</button>
</span>
<table class="table table-striped collection-list">
<thead>
- <tr class="table-header">
- <th><input type="checkbox" ng-show="queryCollection._list.length > 0" id="selectAllCheckbox" ng-model="queryBoxesSelected" ng-click="selectAllEntities(queryCollection._list,$parent,'queryBoxesSelected',true)"></th>
- <th ng-if="hasProperty('name')">Name</th>
- <th>UUID</th>
- <th></th>
- </tr>
+ <tr class="table-header">
+ <th><input type="checkbox"
+ ng-show="queryCollection._list.length > 0"
+ id="selectAllCheckbox" ng-model="queryBoxesSelected"
+ ng-click="selectAllEntities(queryCollection._list,$parent,'queryBoxesSelected',true)"></th>
+ <th ng-if="hasProperty('name')">Name</th>
+ <th>UUID</th>
+ <th></th>
+ </tr>
</thead>
<tbody ng-repeat="entity in queryCollection._list">
- <tr class="zebraRows" >
- <td>
- <input
- type="checkbox"
+ <tr class="zebraRows">
+ <td><input type="checkbox"
id="entity-{{entity._data.name}}-cb"
- ng-value="entity._data.uuid"
- ng-model="entity.checked"
- >
- </td>
- <td ng-if="hasProperty('name')">{{entity._data.name}}</td>
- <td>{{entity._data.uuid}}</td>
- <td><a href="javaScript:void(0)" ng-click="entitySelected[$index] = !entitySelected[$index]; selectEntity(entity._data.uuid, entitySelected[$index]);">{{entitySelected[$index] ? 'Hide' : 'View'}} Details</a></td>
- </tr>
- <tr ng-if="entitySelected[$index]">
- <td colspan="5">
-
+ ng-value="entity._data.uuid" ng-model="entity.checked">
+ </td>
+ <td ng-if="hasProperty('name')">{{entity._data.name}}</td>
+ <td>{{entity._data.uuid}}</td>
+ <td><a href="javaScript:void(0)"
+ ng-click="entitySelected[$index] = !entitySelected[$index]; selectEntity(entity._data.uuid, entitySelected[$index]);">{{entitySelected[$index]
+ ? 'Hide' : 'View'}} Details</a></td>
+ </tr>
+ <tr ng-if="entitySelected[$index]">
+ <td colspan="5">
- <h4 style="margin: 0 0 20px 0">Entity Detail</h4>
+ <h4 style="margin: 0 0 20px 0">Entity Detail</h4>
- <ul class="formatted-json">
- <li ng-repeat="(k,v) in entity._data track by $index">
- <span class="key">{{k}} :</span>
- <!--todo - doing manual recursion to get this out the door for launch, please fix-->
- <span ng-switch on="isDeep(v)">
- <ul ng-switch-when="true">
- <li ng-repeat="(k2,v2) in v"><span class="key">{{k2}} :</span>
- <span ng-switch on="isDeep(v2)">
- <ul ng-switch-when="true">
- <li ng-repeat="(k3,v3) in v2"><span class="key">{{k3}} :</span><span class="value">{{v3}}</span></li>
- </ul>
- <span ng-switch-when="false">
- <span class="value">{{v2}}</span>
+ <ul class="formatted-json">
+ <li ng-repeat="(k,v) in entity._data track by $index"><span
+ class="key">{{k}} :</span> <!--todo - doing manual recursion to get this out the door for launch, please fix-->
+ <span ng-switch on="isDeep(v)">
+ <ul ng-switch-when="true">
+ <li ng-repeat="(k2,v2) in v"><span class="key">{{k2}}
+ :</span> <span ng-switch on="isDeep(v2)">
+ <ul ng-switch-when="true">
+ <li ng-repeat="(k3,v3) in v2"><span
+ class="key">{{k3}} :</span><span class="value">{{v3}}</span></li>
+ </ul> <span ng-switch-when="false"> <span
+ class="value">{{v2}}</span>
</span>
- </span>
- </li>
- </ul>
- <span ng-switch-when="false">
- <span class="value">{{v}}</span>
+ </span></li>
+ </ul> <span ng-switch-when="false"> <span class="value">{{v}}</span>
</span>
- </span>
- </li>
- </ul>
+ </span></li>
+ </ul>
- <div class="control-group">
- <h4 style="margin: 20px 0 20px 0">Edit Entity <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data edit entity')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_edit_entity}}" tooltip-placement="right">(?)</a></h4>
- <div class="controls">
- <textarea ng-model="entity._json" class="span12" rows="12"></textarea>
- <br>
- <a class="btn btn-primary toolbar pull-left" ng-click="validateJson();">Validate JSON</a><button type="button" class="btn btn-primary pull-right" id="button-query" ng-click="saveEntity(entity);">Save</button>
- </div>
- </div>
- </td>
- </tr>
+ <div class="control-group">
+ <h4 style="margin: 20px 0 20px 0">
+ Edit Entity <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data edit entity')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_edit_entity}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
+ <div class="controls">
+ <textarea ng-model="entity._json" class="span12" rows="12"></textarea>
+ <br> <a class="btn btn-primary toolbar pull-left"
+ ng-click="validateJson();">Validate JSON</a>
+ <button type="button" class="btn btn-primary pull-right"
+ id="button-query" ng-click="saveEntity(entity);">Save</button>
+ </div>
+ </div>
+ </td>
+ </tr>
- <tr ng-show="queryCollection._list.length == 0">
- <td colspan="4">No data found</td>
- </tr>
+ <tr ng-show="queryCollection._list.length == 0">
+ <td colspan="4">No data found</td>
+ </tr>
</tbody>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary toolbar" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary toolbar" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary toolbar" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary toolbar" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/display-roles.html
----------------------------------------------------------------------
diff --git a/portal/js/data/display-roles.html b/portal/js/data/display-roles.html
index c182eb3..24b8468 100644
--- a/portal/js/data/display-roles.html
+++ b/portal/js/data/display-roles.html
@@ -1,3 +1,4 @@
+roles---------------------------------
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,5 +15,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-roles---------------------------------