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:49 UTC
[2/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/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>