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:51 UTC
[4/6] USERGRID-207 Fix license headers in portal Angular.js files
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.