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:50 UTC
[3/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/org-overview/org-overview.html
----------------------------------------------------------------------
diff --git a/portal/js/org-overview/org-overview.html b/portal/js/org-overview/org-overview.html
index 6db1857..b2bb289 100644
--- a/portal/js/org-overview/org-overview.html
+++ b/portal/js/org-overview/org-overview.html
@@ -1,4 +1,5 @@
-<!--
+<div class="org-overview-content" ng-show="activeUI">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,125 +15,152 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="org-overview-content" ng-show="activeUI">
-
<page-title title=" Org Administration" icon="🕪"></page-title>
<section class="row-fluid">
- <div class="span6">
- <bsmodal id="introjs"
- title="Welcome to the API BaaS Admin Portal"
- close="hideModal"
- closelabel="Skip"
- extrabutton="startFirstTimeUser"
- extrabuttonlabel="Take the tour"
- ng-cloak>
- <p>To get started, click 'Take the tour' for a full walkthrough of the admin portal, or click 'Skip' to start working right away.</p>
- </bsmodal>
- <div id="intro-4-current-org">
- <h2 class="title">Current Organization <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('current org')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_current_org}}" tooltip-placement="right">(?)</a></h2>
- <table class="table table-striped">
- <tr>
- <td id="org-overview-name">{{currentOrganization.name}}</td>
- <td style="text-align: right">{{currentOrganization.uuid}}</td>
- </tr>
- </table>
- </div>
+ <div class="span6">
+ <bsmodal id="introjs" title="Welcome to the API BaaS Admin Portal"
+ close="hideModal" closelabel="Skip"
+ extrabutton="startFirstTimeUser"
+ extrabuttonlabel="Take the tour" ng-cloak>
+ <p>To get started, click 'Take the tour' for a full
+ walkthrough of the admin portal, or click 'Skip' to start
+ working right away.</p>
+ </bsmodal>
+ <div id="intro-4-current-org">
+ <h2 class="title">
+ Current Organization <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('current org')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_current_org}}"
+ tooltip-placement="right">(?)</a>
+ </h2>
+ <table class="table table-striped">
+ <tr>
+ <td id="org-overview-name">{{currentOrganization.name}}</td>
+ <td style="text-align: right">{{currentOrganization.uuid}}</td>
+ </tr>
+ </table>
+ </div>
+
+ <bsmodal id="newApplication" title="Create New Application"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="newApplicationDialog" extrabuttonlabel="Create"
+ ng-cloak>
+ <p>
+ New application name: <input ng-model="$parent.newApp.name"
+ ug-validate required type="text" ng-pattern="appNameRegex"
+ ng-attr-title="{{appNameRegexDescription}}" />
+ </p>
+ </bsmodal>
+ <div id="intro-5-applications">
+ <h2 class="title">
+ Applications <a class="help_tooltip"
+ ng-show="help.helpTooltipsEnabled"
+ ng-mouseover="help.sendTooltipGA('applications')" href="#"
+ ng-attr-tooltip="{{tooltip_applications}}"
+ tooltip-placement="right">(?)</a>
+ <div class="header-button btn-group pull-right">
+ <a class="btn filter-selector" style=""
+ ng-click="showModal('newApplication')"> <span
+ class="filter-label">Add New App</span>
+ </a>
+ </div>
+ </h2>
+
+ <table class="table table-striped">
+ <tr ng-repeat="application in applications">
+ <td>{{application.name}}</td>
+ <td style="text-align: right">{{application.uuid}}</td>
+ </tr>
+ </table>
+ </div>
+ <bsmodal id="regenerateCredentials" title="Confirmation"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="regenerateCredentialsDialog" extrabuttonlabel="Yes"
+ ng-cloak> Are you sure you want to regenerate the
+ credentials? </bsmodal>
+ <div id="intro-6-org-api-creds">
+ <h2 class="title">
+ Organization API Credentials <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('api org credentials')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_org_api_creds}}"
+ tooltip-placement="right">(?)</a>
+ <div class="header-button btn-group pull-right">
+ <a class="btn filter-selector"
+ ng-click="showModal('regenerateCredentials')"> <span
+ class="filter-label">Regenerate Org Credentials</span>
+ </a>
+ </div>
+ </h2>
+
+ <table class="table table-striped">
+ <tr>
+ <td>Client ID</td>
+ <td style="text-align: right">{{orgAPICredentials.client_id}}</td>
+ </tr>
+ <tr>
+ <td>Client Secret</td>
+ <td style="text-align: right">{{orgAPICredentials.client_secret}}</td>
+ </tr>
+ </table>
+ </div>
+ <bsmodal id="newAdministrator" title="Create New Administrator"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="newAdministratorDialog" extrabuttonlabel="Create"
+ ng-cloak>
+ <p>
+ New administrator email: <input id="newAdminInput" ug-validate
+ ng-model="$parent.admin.email" pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}" required
+ type="email" />
+ </p>
+ </bsmodal>
+ <div id="intro-7-org-admins">
+ <h2 class="title">
+ Organization Administrators <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('org admins')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_org_admins}}"
+ tooltip-placement="right">(?)</a>
+ <div class="header-button btn-group pull-right">
+ <a class="btn filter-selector"
+ ng-click="showModal('newAdministrator')"> <span
+ class="filter-label">Add New Administrator</span>
+ </a>
+ </div>
+ </h2>
- <bsmodal id="newApplication"
- title="Create New Application"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newApplicationDialog"
- extrabuttonlabel="Create"
- ng-cloak>
- <p>New application name: <input ng-model="$parent.newApp.name" ug-validate required type="text" ng-pattern="appNameRegex" ng-attr-title="{{appNameRegexDescription}}" /></p>
- </bsmodal>
- <div id="intro-5-applications">
- <h2 class="title" > Applications <a class="help_tooltip" ng-show="help.helpTooltipsEnabled" ng-mouseover="help.sendTooltipGA('applications')" href="#" ng-attr-tooltip="{{tooltip_applications}}" tooltip-placement="right">(?)</a>
- <div class="header-button btn-group pull-right">
- <a class="btn filter-selector" style="{{applicationsSize === 10 ? 'width:290px':''}}" ng-click="showModal('newApplication')">
- <span class="filter-label">Add New App</span>
- </a>
- </div>
- </h2>
-
- <table class="table table-striped">
- <tr ng-repeat="application in applications">
- <td>{{application.name}}</td>
- <td style="text-align: right">{{application.uuid}}</td>
- </tr>
- </table>
- </div>
- <bsmodal id="regenerateCredentials"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="regenerateCredentialsDialog"
- extrabuttonlabel="Yes"
- ng-cloak>
- Are you sure you want to regenerate the credentials?
- </bsmodal>
- <div id="intro-6-org-api-creds">
- <h2 class="title" >Organization API Credentials <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('api org credentials')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_org_api_creds}}" tooltip-placement="right">(?)</a>
- <div class="header-button btn-group pull-right">
- <a class="btn filter-selector" ng-click="showModal('regenerateCredentials')">
- <span class="filter-label">Regenerate Org Credentials</span>
- </a>
- </div>
- </h2>
-
- <table class="table table-striped">
- <tr>
- <td >Client ID</td>
- <td style="text-align: right" >{{orgAPICredentials.client_id}}</td>
- </tr>
- <tr>
- <td>Client Secret</td>
- <td style="text-align: right">{{orgAPICredentials.client_secret}}</td>
- </tr>
- </table>
- </div>
- <bsmodal id="newAdministrator"
- title="Create New Administrator"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newAdministratorDialog"
- extrabuttonlabel="Create"
- ng-cloak>
- <p>New administrator email: <input id="newAdminInput" ug-validate ng-model="$parent.admin.email" pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" required type="email" /></p>
- </bsmodal>
- <div id="intro-7-org-admins">
- <h2 class="title" >Organization Administrators <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('org admins')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_org_admins}}" tooltip-placement="right">(?)</a>
- <div class="header-button btn-group pull-right">
- <a class="btn filter-selector" ng-click="showModal('newAdministrator')">
- <span class="filter-label">Add New Administrator</span>
- </a>
- </div>
- </h2>
-
- <table class="table table-striped">
- <tr ng-repeat="administrator in orgAdministrators">
- <td><img style="width:30px;height:30px;" ng-src="{{administrator.image}}"> {{administrator.name}}</td>
- <td style="text-align: right">{{administrator.email}}</td>
- </tr>
- </table>
- </div>
- </div>
+ <table class="table table-striped">
+ <tr ng-repeat="administrator in orgAdministrators">
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{administrator.image}}">
+ {{administrator.name}}</td>
+ <td style="text-align: right">{{administrator.email}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
- <div class="span6">
- <div id="intro-8-activities">
- <h2 class="title">Activities <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('activities')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities}}" tooltip-placement="right">(?)</a></h2>
- <table class="table table-striped">
- <tr ng-repeat="activity in activities">
- <td>{{activity.title}}</td>
- <td style="text-align: right">{{activity.date}}</td>
- </tr>
- </table>
- </div>
- </div>
+ <div class="span6">
+ <div id="intro-8-activities">
+ <h2 class="title">
+ Activities <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('activities')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities}}"
+ tooltip-placement="right">(?)</a>
+ </h2>
+ <table class="table table-striped">
+ <tr ng-repeat="activity in activities">
+ <td>{{activity.title}}</td>
+ <td style="text-align: right">{{activity.date}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/profile/account.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/account.html b/portal/js/profile/account.html
index a29933a..0650fe3 100644
--- a/portal/js/profile/account.html
+++ b/portal/js/profile/account.html
@@ -1,3 +1,4 @@
+<page-title title=" Account Settings" icon=""></page-title>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,15 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<page-title title=" Account Settings" icon=""></page-title>
-
<section class="row-fluid">
<div class="span12 tab-content">
<div class="menu-toolbar">
<ul class="inline">
- <li class="tab" ng-show="!use_sso" ng-class="currentAccountPage.route === '/profile/profile' ? 'selected' : ''"><a class="btn btn-primary toolbar" id="profile-link" ng-click="selectAccountPage('/profile/profile')"><i class="pictogram"></i>Profile</a></li>
- <li class="tab" ng-class="currentAccountPage.route === '/profile/organizations' ? 'selected' : ''"><a class="btn btn-primary toolbar" id="account-link" ng-click="selectAccountPage('/profile/organizations')"><i class="pictogram">👥</i>Organizations</a></li>
+ <li class="tab" ng-show="!use_sso"
+ ng-class="currentAccountPage.route === '/profile/profile' ? 'selected' : ''"><a
+ class="btn btn-primary toolbar" id="profile-link"
+ ng-click="selectAccountPage('/profile/profile')"><i
+ class="pictogram"></i>Profile</a></li>
+ <li class="tab"
+ ng-class="currentAccountPage.route === '/profile/organizations' ? 'selected' : ''"><a
+ class="btn btn-primary toolbar" id="account-link"
+ ng-click="selectAccountPage('/profile/organizations')"><i
+ class="pictogram">👥</i>Organizations</a></li>
</ul>
</div>
<span ng-include="currentAccountPage.template"></span>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/profile/organizations.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/organizations.html b/portal/js/profile/organizations.html
index ea1db22..ef5c8b6 100644
--- a/portal/js/profile/organizations.html
+++ b/portal/js/profile/organizations.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="OrgCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,76 +15,80 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <page-title title=" Organizations" icon="🕪"></page-title>
-<div class="content-page" ng-controller="OrgCtrl">
-<page-title title=" Organizations" icon="🕪"></page-title>
+ <bsmodal id="newOrganization" title="Create New Organization"
+ close="hideModal" closelabel="Cancel" extrabutton="addOrganization"
+ extrabuttonlabel="Create" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-user-orgname">Organization Name</label>
- <bsmodal id="newOrganization"
- title="Create New Organization"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addOrganization"
- extrabuttonlabel="Create"
- ng-cloak>
- <fieldset>
+ <div class="controls">
+ <input type="text" required title="Name" ug-validate
+ ng-pattern="nameRegex"
+ ng-attr-title="{{nameRegexDescription}}"
+ ng-model="$parent.org.name" name="name" id="new-user-orgname"
+ class="input-xlarge" />
- <div class="control-group">
- <label for="new-user-orgname">Organization Name</label>
-
- <div class="controls">
- <input type="text" required title="Name" ug-validate ng-pattern="nameRegex" ng-attr-title="{{nameRegexDescription}}" ng-model="$parent.org.name" name="name" id="new-user-orgname" class="input-xlarge"/>
-
- <p class="help-block hide"></p>
- </div>
+ <p class="help-block hide"></p>
</div>
+ </div>
- </fieldset>
+ </fieldset>
</bsmodal>
- <div class="row-fluid" >
- <div class="span3 user-col ">
+ <div class="row-fluid">
+ <div class="span3 user-col ">
- <div class="button-toolbar span12">
-
- <button class="btn btn-primary toolbar" ng-click="showModal('newOrganization')" title="add organization" ng-show="true"><i class="pictogram"></i>
- </button>
- </div>
- <ul class="user-list">
- <li ng-class="selectedOrg.uuid === org.uuid ? 'selected' : ''"
- ng-repeat="org in orgs" ng-click=" selectOrganization(org)">
+ <div class="button-toolbar span12">
- <a href="javaScript:void(0)">{{org.name}}</a>
- </li>
- </ul>
+ <button class="btn btn-primary toolbar"
+ ng-click="showModal('newOrganization')"
+ title="add organization" ng-show="true">
+ <i class="pictogram"></i>
+ </button>
</div>
- <div class="span9">
- <div class="row-fluid" >
- <h4>Organization Information</h4>
- <div class="span11" ng-show="selectedOrg">
- <label class="ui-dform-label">Applications</label>
- <table class="table table-striped">
- <tr ng-repeat="app in selectedOrg.applicationsArray">
- <td> {{app.name}}</td>
- <td style="text-align: right">{{app.uuid}}</td>
- </tr>
- </table>
- <br/>
- <label class="ui-dform-label">Users</label>
- <table class="table table-striped">
- <tr ng-repeat="user in selectedOrg.usersArray">
- <td> {{user.name}}</td>
- <td style="text-align: right">{{user.email}}</td>
- </tr>
- </table>
- <form ng-submit="leaveOrganization(selectedOrg)">
- <input type="submit" name="button-leave-org" id="button-leave-org" title="Can only leave if organization has more than 1 user." ng-disabled="!doesOrgHaveUsers(selectedOrg)" value="Leave Organization" class="btn btn-primary pull-right">
- </form>
- </div>
- </div>
+ <ul class="user-list">
+ <li ng-class="selectedOrg.uuid === org.uuid ? 'selected' : ''"
+ ng-repeat="org in orgs" ng-click=" selectOrganization(org)">
- </div>
+ <a href="javaScript:void(0)">{{org.name}}</a>
+ </li>
+ </ul>
+ </div>
+ <div class="span9">
+ <div class="row-fluid">
+ <h4>Organization Information</h4>
+ <div class="span11" ng-show="selectedOrg">
+ <label class="ui-dform-label">Applications</label>
+ <table class="table table-striped">
+ <tr ng-repeat="app in selectedOrg.applicationsArray">
+ <td>{{app.name}}</td>
+ <td style="text-align: right">{{app.uuid}}</td>
+ </tr>
+ </table>
+ <br /> <label class="ui-dform-label">Users</label>
+ <table class="table table-striped">
+ <tr ng-repeat="user in selectedOrg.usersArray">
+ <td>{{user.name}}</td>
+ <td style="text-align: right">{{user.email}}</td>
+ </tr>
+ </table>
+ <form ng-submit="leaveOrganization(selectedOrg)">
+ <input type="submit" name="button-leave-org"
+ id="button-leave-org"
+ title="Can only leave if organization has more than 1 user."
+ ng-disabled="!doesOrgHaveUsers(selectedOrg)"
+ value="Leave Organization"
+ class="btn btn-primary pull-right">
+ </form>
</div>
+ </div>
+
+ </div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/profile/profile.html
----------------------------------------------------------------------
diff --git a/portal/js/profile/profile.html b/portal/js/profile/profile.html
index 75e6cc8..fd315de 100644
--- a/portal/js/profile/profile.html
+++ b/portal/js/profile/profile.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="ProfileCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,69 +15,111 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="ProfileCtrl">
-<page-title title=" Profile" icon=""></page-title>
+ <page-title title=" Profile" icon=""></page-title>
<div id="account-panels">
<div class="panel-content">
<div class="console-section">
<div class="console-section-contents">
- <form name="updateAccountForm" id="update-account-form" ng-submit="saveUserInfo()" class="form-horizontal">
+ <form name="updateAccountForm" id="update-account-form"
+ ng-submit="saveUserInfo()" class="form-horizontal">
<fieldset>
<div class="control-group">
- <label id="update-account-id-label" class="control-label" for="update-account-id">UUID</label>
+ <label id="update-account-id-label"
+ class="control-label" for="update-account-id">UUID</label>
<div class="controls">
<span id="update-account-id" class="monospace">{{user.uuid}}</span>
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-username">Username </label>
+ <label class="control-label"
+ for="update-account-username">Username </label>
<div class="controls">
- <input type="text" ug-validate name="update-account-username" required ng-pattern="usernameRegex" id="update-account-username" ng-attr-title="{{usernameRegexDescription}}" class="span4" ng-model="user.username" size="20"/>
+ <input type="text" ug-validate
+ name="update-account-username" required
+ ng-pattern="usernameRegex"
+ id="update-account-username"
+ ng-attr-title="{{usernameRegexDescription}}"
+ class="span4" ng-model="user.username" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-name">Name </label>
+ <label class="control-label" for="update-account-name">Name
+ </label>
<div class="controls">
- <input type="text" ug-validate name="update-account-name" id="update-account-name" ng-pattern="nameRegex" ng-attr-title="{{nameRegexDescription}}" class="span4" ng-model="user.name" size="20"/>
+ <input type="text" ug-validate
+ name="update-account-name" id="update-account-name"
+ ng-pattern="nameRegex"
+ ng-attr-title="{{nameRegexDescription}}"
+ class="span4" ng-model="user.name" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-email"> Email</label>
+ <label class="control-label" for="update-account-email">
+ Email</label>
<div class="controls">
- <input type="email" ug-validate required name="update-account-email" ng-pattern="emailRegex" ng-attr-title="{{emailRegexDescription}}" id="update-account-email" class="span4" ng-model="user.email" size="20"/>
+ <input type="email" ug-validate required
+ name="update-account-email" ng-pattern="emailRegex"
+ ng-attr-title="{{emailRegexDescription}}"
+ id="update-account-email" class="span4"
+ ng-model="user.email" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-picture-img">Picture <br />(from <a href="http://gravatar.com">gravatar.com</a>) </label>
+ <label class="control-label"
+ for="update-account-picture-img">Picture <br />(from
+ <a href="http://gravatar.com">gravatar.com</a>)
+ </label>
<div class="controls">
- <img id="update-account-picture-img" ng-src="{{user.profileImg}}" width="50" />
+ <img id="update-account-picture-img"
+ ng-src="{{user.profileImg}}" width="50" />
</div>
</div>
- <span class="help-block">Leave blank any of the following to keep the current password unchanged</span>
- <br />
+ <span class="help-block">Leave blank any of the
+ following to keep the current password unchanged</span> <br />
<div class="control-group">
- <label class="control-label" for="old-account-password">Old Password</label>
+ <label class="control-label" for="old-account-password">Old
+ Password</label>
<div class="controls">
- <input type="password" ug-validate name="old-account-password" id="old-account-password" class="span4" ng-model="user.oldPassword" size="20"/>
+ <input type="password" ug-validate
+ name="old-account-password"
+ id="old-account-password" class="span4"
+ ng-model="user.oldPassword" size="20" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="update-account-password">New Password</label>
+ <label class="control-label"
+ for="update-account-password">New Password</label>
<div class="controls">
- <input type="password" ug-validate name="update-account-password" ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" id="update-account-password" class="span4" ng-model="user.newPassword" size="20"/>
+ <input type="password" ug-validate
+ name="update-account-password"
+ ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}"
+ id="update-account-password" class="span4"
+ ng-model="user.newPassword" size="20" />
</div>
</div>
- <div class="control-group" style="display:none">
- <label class="control-label" for="update-account-password-repeat">Confirm New Password</label>
+ <div class="control-group" style="display: none">
+ <label class="control-label"
+ for="update-account-password-repeat">Confirm
+ New Password</label>
<div class="controls">
- <input type="password" ug-validate name="update-account-password-repeat" ng-pattern="passwordRegex" ng-attr-title="{{passwordRegexDescription}}" id="update-account-password-repeat" class="span4" ng-model="user.newPasswordConfirm" size="20"/>
+ <input type="password" ug-validate
+ name="update-account-password-repeat"
+ ng-pattern="passwordRegex"
+ ng-attr-title="{{passwordRegexDescription}}"
+ id="update-account-password-repeat" class="span4"
+ ng-model="user.newPasswordConfirm" size="20" />
</div>
</div>
</fieldset>
<div class="form-actions">
- <input type="submit" class="btn btn-primary" name="button-update-account" ng-disabled="!updateAccountForm.$valid || loading" id="button-update-account" value="{{loading ? loadingText : 'Update'}}" class="btn btn-usergrid"/>
+ <input type="submit" class="btn btn-primary"
+ name="button-update-account"
+ ng-disabled="!updateAccountForm.$valid || loading"
+ id="button-update-account"
+ value="{{loading ? loadingText : 'Update'}}"
+ class="btn btn-usergrid" />
</div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-groups.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-groups.html b/portal/js/roles/roles-groups.html
index 2370d31..a16db33 100644
--- a/portal/js/roles/roles-groups.html
+++ b/portal/js/roles/roles-groups.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="RolesGroupsCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,65 +15,68 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="RolesGroupsCtrl">
-
-
- <bsmodal id="addRoleToGroup"
- title="Add group to role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addRoleToGroupDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.path !== '' ? $parent.title : 'Select a group...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="group in $parent.groupsTypeaheadValues" class="filterItem"><a ng-click="setRoleModal(group)">{{group.title}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addRoleToGroup" title="Add group to role"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addRoleToGroupDialog" extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.path
+ !== '' ? $parent.title : 'Select a group...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="group in $parent.groupsTypeaheadValues"
+ class="filterItem"><a ng-click="setRoleModal(group)">{{group.title}}</a></li>
+ </ul>
+ </div>
</bsmodal>
- <bsmodal id="removeGroupFromRole"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="removeGroupFromRoleDialog"
- extrabuttonlabel="Leave"
- ng-cloak>
- <p>Are you sure you want to remove the group from the role(s)?</p>
+ <bsmodal id="removeGroupFromRole" title="Confirmation"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="removeGroupFromRoleDialog" extrabuttonlabel="Leave"
+ ng-cloak>
+ <p>Are you sure you want to remove the group from the role(s)?</p>
</bsmodal>
<div class="users-section">
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('group add user button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_groups_add_group}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addRoleToGroup')">Add Group to Role</button>
- <button class="btn btn-primary" ng-disabled="!hasGroups || !valueSelected(rolesCollection.groups._list)" ng-click="showModal('removeGroupFromRole')">Remove Group(s) from Role</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('group add user button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_groups_add_group}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addRoleToGroup')">Add Group to
+ Role</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasGroups || !valueSelected(rolesCollection.groups._list)"
+ ng-click="showModal('removeGroupFromRole')">Remove
+ Group(s) from Role</button>
</div>
<table class="table table-striped">
<tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasGroups" id="selectAllCheckBox" ng-model="roleGroupsSelected" ng-click="selectAllEntities(rolesCollection.groups._list,this,'roleGroupsSelected')"></td>
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasGroups" id="selectAllCheckBox"
+ ng-model="roleGroupsSelected"
+ ng-click="selectAllEntities(rolesCollection.groups._list,this,'roleGroupsSelected')"></td>
<td>Title</td>
<td>Path</td>
</tr>
- <tr class="zebraRows" ng-repeat="group in rolesCollection.groups._list">
- <td>
- <input
- type="checkbox"
- ng-model="group.checked"
- >
+ <tr class="zebraRows"
+ ng-repeat="group in rolesCollection.groups._list">
+ <td><input type="checkbox" ng-model="group.checked">
</td>
<td>{{group._data.title}}</td>
<td>{{group._data.path}}</td>
</tr>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}" style="float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display" style="float:right;">Next
+ ></button>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-settings.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-settings.html b/portal/js/roles/roles-settings.html
index fbab7f2..ecbafc7 100644
--- a/portal/js/roles/roles-settings.html
+++ b/portal/js/roles/roles-settings.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="RolesSettingsCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,84 +15,115 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="RolesSettingsCtrl">
- <bsmodal id="deletePermission"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteRolePermissionDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to delete the permission(s)?</p>
+ <bsmodal id="deletePermission" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="deleteRolePermissionDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to delete the permission(s)?</p>
</bsmodal>
- <bsmodal id="addPermission"
- title="New Permission"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addRolePermissionDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <p>Path: <input ng-model="$parent.permissions.path" placeholder="ex: /mydata" required ng-pattern="pathRegex" ng-attr-title="{{pathRegexDescription}}" ug-validate id="rolePermissionsPath"/> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles new permission path box')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_roles_new_permission_path}}" tooltip-placement="right">(?)</a></p>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.getPerm"> GET <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles add permission verbs')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_new_permission_verbs}}" tooltip-placement="right">(?)</a>
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.postPerm"> POST
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.putPerm"> PUT
- </div>
- <div class="control-group">
- <input type="checkbox" ng-model="$parent.permissions.deletePerm"> DELETE
- </div>
+ <bsmodal id="addPermission" title="New Permission" close="hideModal"
+ closelabel="Cancel" extrabutton="addRolePermissionDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <p>
+ Path: <input ng-model="$parent.permissions.path"
+ placeholder="ex: /mydata" required ng-pattern="pathRegex"
+ ng-attr-title="{{pathRegexDescription}}" ug-validate
+ id="rolePermissionsPath" /> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles new permission path box')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_roles_new_permission_path}}"
+ tooltip-placement="right">(?)</a>
+ </p>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.getPerm">
+ GET <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles add permission verbs')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_new_permission_verbs}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.postPerm">
+ POST
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.putPerm">
+ PUT
+ </div>
+ <div class="control-group">
+ <input type="checkbox" ng-model="$parent.permissions.deletePerm">
+ DELETE
+ </div>
</bsmodal>
<div>
- <h4>Inactivity <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users roles inactivity')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_inactivity}}" tooltip-placement="right">(?)</a></h4>
+ <h4>
+ Inactivity <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users roles inactivity')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_inactivity}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
<div id="role-permissions">
- <p>Integer only. 0 (zero) means no expiration.</p>
+ <p>Integer only. 0 (zero) means no expiration.</p>
- <form name="updateActivity" ng-submit="updateInactivity()" novalidate>
- Seconds: <input style="margin: 0" type="number" required name="role-inactivity"
- id="role-inactivity-input" min="0" ng-model="role._data.inactivity" title="Please input a positive integer >= 0." step = "any" ug-validate >
- <input type="submit" class="btn btn-primary" ng-disabled="!updateActivity.$valid" value="Set"/>
- </form>
+ <form name="updateActivity" ng-submit="updateInactivity()"
+ novalidate>
+ Seconds: <input style="margin: 0" type="number" required
+ name="role-inactivity" id="role-inactivity-input" min="0"
+ ng-model="role._data.inactivity"
+ title="Please input a positive integer >= 0." step="any"
+ ug-validate> <input type="submit"
+ class="btn btn-primary" ng-disabled="!updateActivity.$valid"
+ value="Set" />
+ </form>
</div>
- <br/>
+ <br />
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles details add permission button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_add_delete_permission}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addPermission')">Add Permission</button>
- <button class="btn btn-primary" ng-disabled="!hasSettings || !valueSelected(role.permissions)" ng-click="showModal('deletePermission')">Delete Permission(s)</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles details add permission button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_add_delete_permission}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addPermission')">Add Permission</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasSettings || !valueSelected(role.permissions)"
+ ng-click="showModal('deletePermission')">Delete
+ Permission(s)</button>
</div>
- <h4>Permissions <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles settings permissions list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_permissions}}" tooltip-placement="top">(?)</a></h4>
+ <h4>
+ Permissions <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles settings permissions list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_permissions}}"
+ tooltip-placement="top">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasSettings" id="selectAllCheckBox" ng-model="permissionsSelected" ng-click="selectAllEntities(role.permissions,this,'permissionsSelected')" ></td>
- <td>Path</td>
- <td>GET</td>
- <td>POST</td>
- <td>PUT</td>
- <td>DELETE</td>
- </tr>
- <tr class="zebraRows" ng-repeat="permission in role.permissions">
- <td>
- <input
- type="checkbox"
- ng-model="permission.checked"
- >
- </td>
- <td>{{permission.path}}</td>
- <td>{{permission.operations.get}}</td>
- <td>{{permission.operations.post}}</td>
- <td>{{permission.operations.put}}</td>
- <td>{{permission.operations.delete}}</td>
- </tr>
+ <tr class="table-header">
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasSettings" id="selectAllCheckBox"
+ ng-model="permissionsSelected"
+ ng-click="selectAllEntities(role.permissions,this,'permissionsSelected')"></td>
+ <td>Path</td>
+ <td>GET</td>
+ <td>POST</td>
+ <td>PUT</td>
+ <td>DELETE</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="permission in role.permissions">
+ <td><input type="checkbox" ng-model="permission.checked">
+ </td>
+ <td>{{permission.path}}</td>
+ <td>{{permission.operations.get}}</td>
+ <td>{{permission.operations.post}}</td>
+ <td>{{permission.operations.put}}</td>
+ <td>{{permission.operations.delete}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-tabs.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-tabs.html b/portal/js/roles/roles-tabs.html
index 7c4db80..dda7784 100644
--- a/portal/js/roles/roles-tabs.html
+++ b/portal/js/roles/roles-tabs.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,14 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
<section class="row-fluid">
<div class="span12">
<div class="page-filters">
- <h1 class="title" class="pull-left"><i class="pictogram title"></i> Roles </h1>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles page title')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_page_title}}" tooltip-placement="right">(?)</a>
+ <h1 class="title" class="pull-left">
+ <i class="pictogram title"></i> Roles
+ </h1>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles page title')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_page_title}}"
+ tooltip-placement="right">(?)</a>
</div>
</div>
@@ -29,17 +34,25 @@
<div id="user-panel" class="panel-buffer">
<ul id="user-panel-tab-bar" class="nav nav-tabs">
- <li><a href="javaScript:void(0);" ng-click="gotoPage('roles')">Roles List</a></li>
- <li ng-class="settingsSelected"><a href="javaScript:void(0);" ng-click="gotoPage('roles/settings')">Settings</a></li>
- <li ng-class="usersSelected"><a href="javaScript:void(0);" ng-click="gotoPage('roles/users')">Users</a></li>
- <li ng-class="groupsSelected"><a href="javaScript:void(0);" ng-click="gotoPage('roles/groups')">Groups</a></li>
+ <li><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles')">Roles List</a></li>
+ <li ng-class="settingsSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles/settings')">Settings</a></li>
+ <li ng-class="usersSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles/users')">Users</a></li>
+ <li ng-class="groupsSelected"><a href="javaScript:void(0);"
+ ng-click="gotoPage('roles/groups')">Groups</a></li>
</ul>
</div>
<div style="float: left; margin-right: 10px;">
<div style="float: left;">
- <div class="user-header-title"><strong>Role Name: </strong>{{selectedRole.name}}</div>
- <div class="user-header-title"><strong>Role Title: </strong>{{selectedRole.title}}</div>
+ <div class="user-header-title">
+ <strong>Role Name: </strong>{{selectedRole.name}}
+ </div>
+ <div class="user-header-title">
+ <strong>Role Title: </strong>{{selectedRole.title}}
+ </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles-users.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles-users.html b/portal/js/roles/roles-users.html
index 5a6b251..0392263 100644
--- a/portal/js/roles/roles-users.html
+++ b/portal/js/roles/roles-users.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="RolesUsersCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,64 +15,70 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="RolesUsersCtrl">
- <bsmodal id="removeFromRole"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="removeUsersFromGroupDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to remove the users from the seleted role(s)?</p>
+ <bsmodal id="removeFromRole" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="removeUsersFromGroupDialog"
+ extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to remove the users from the selected
+ role(s)?</p>
</bsmodal>
- <bsmodal id="addRoleToUser"
- title="Add user to role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addRoleToUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.user.username ? $parent.user.username : 'Select a user...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="user in $parent.usersTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addRoleToUser" title="Add user to role" close="hideModal"
+ closelabel="Cancel" extrabutton="addRoleToUserDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.user.username
+ ? $parent.user.username : 'Select a user...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="user in $parent.usersTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
+ </ul>
+ </div>
</bsmodal>
<div class="users-section">
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles add user button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_users_add_user}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addRoleToUser')">Add User to Role</button>
- <button class="btn btn-primary" ng-disabled="!hasUsers || !valueSelected(rolesCollection.users._list)" ng-click="showModal('removeFromRole')">Remove User(s) from Role</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles add user button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_users_add_user}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addRoleToUser')">Add User to Role</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasUsers || !valueSelected(rolesCollection.users._list)"
+ ng-click="showModal('removeFromRole')">Remove User(s)
+ from Role</button>
</div>
<table class="table table-striped">
<tr class="table-header">
- <td style="width: 30px;"><input type="checkbox" ng-show="hasUsers" id="selectAllCheckBox" ng-model="roleUsersSelected" ng-click="selectAllEntities(rolesCollection.users._list,this,'roleUsersSelected')" ng-model="master"></td>
+ <td style="width: 30px;"><input type="checkbox"
+ ng-show="hasUsers" id="selectAllCheckBox"
+ ng-model="roleUsersSelected"
+ ng-click="selectAllEntities(rolesCollection.users._list,this,'roleUsersSelected')"
+ ng-model="master"></td>
<td style="width: 50px;"></td>
<td>Username</td>
<td>Display Name</td>
</tr>
- <tr class="zebraRows" ng-repeat="user in rolesCollection.users._list">
- <td>
- <input
- type="checkbox"
- ng-model="user.checked"
- >
+ <tr class="zebraRows"
+ ng-repeat="user in rolesCollection.users._list">
+ <td><input type="checkbox" ng-model="user.checked">
</td>
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
<td>{{user._data.username}}</td>
<td>{{user._data.name}}</td>
</tr>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/roles/roles.html
----------------------------------------------------------------------
diff --git a/portal/js/roles/roles.html b/portal/js/roles/roles.html
index eb3990e..b1edaf5 100644
--- a/portal/js/roles/roles.html
+++ b/portal/js/roles/roles.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,88 +15,134 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
- <div id="intro-page" >
+ <div id="intro-page">
<page-title title=" Roles" icon=""></page-title>
</div>
- <bsmodal id="newRole"
- title="New Role"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newRoleDialog"
- extrabuttonlabel="Create"
- buttonid="roles"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- <label for="new-role-roletitle">Title</label>
- <div class="controls">
- <input type="text" ng-pattern="titleRegex" ng-attr-title="{{titleRegexDescription}}" required ng-model="$parent.newRole.title" name="roletitle" id="new-role-roletitle" class="input-xlarge" ug-validate/>
- <p class="help-block hide"></p>
- </div>
- </div>
- <div class="control-group">
- <label for="new-role-rolename">Role Name</label>
- <div class="controls">
- <input type="text" required ng-pattern="roleNameRegex" ng-attr-title="{{roleNameRegexDescription}}" ng-model="$parent.newRole.name" name="rolename" id="new-role-rolename" class="input-xlarge" ug-validate/>
- <p class="help-block hide"></p>
- </div>
- </div>
- </fieldset>
+ <bsmodal id="newRole" title="New Role" close="hideModal"
+ closelabel="Cancel" extrabutton="newRoleDialog"
+ extrabuttonlabel="Create" buttonid="roles" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-role-roletitle">Title</label>
+ <div class="controls">
+ <input type="text" ng-pattern="titleRegex"
+ ng-attr-title="{{titleRegexDescription}}" required
+ ng-model="$parent.newRole.title" name="roletitle"
+ id="new-role-roletitle" class="input-xlarge" ug-validate />
+ <p class="help-block hide"></p>
+ </div>
+ </div>
+ <div class="control-group">
+ <label for="new-role-rolename">Role Name</label>
+ <div class="controls">
+ <input type="text" required ng-pattern="roleNameRegex"
+ ng-attr-title="{{roleNameRegexDescription}}"
+ ng-model="$parent.newRole.name" name="rolename"
+ id="new-role-rolename" class="input-xlarge" ug-validate />
+ <p class="help-block hide"></p>
+ </div>
+ </div>
+ </fieldset>
</bsmodal>
- <bsmodal id="deleteRole"
- title="Delete Role"
- close="hideModal"
- closelabel="Cancel"
- buttonid="deleteroles"
- extrabutton="deleteRoleDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <p>Are you sure you want to delete the role(s)?</p>
+ <bsmodal id="deleteRole" title="Delete Role" close="hideModal"
+ closelabel="Cancel" buttonid="deleteroles"
+ extrabutton="deleteRoleDialog" extrabuttonlabel="Delete" ng-cloak>
+ <p>Are you sure you want to delete the role(s)?</p>
</bsmodal>
<section class="row-fluid">
<div id="intro-list" class="span3 user-col">
<div class="button-toolbar span12">
- <a title="Select All" class="btn btn-primary select-all toolbar" ng-show="hasRoles" ng-click="selectAllEntities(rolesCollection._list,this,'rolesSelected',true)"> <i class="pictogram">⊟</i></a>
- <button id="delete-role-btn" title="Delete" class="btn btn-primary toolbar" ng-disabled="!hasRoles || !valueSelected(rolesCollection._list)" ng-click="showModal('deleteRole')"><i class="pictogram">☕</i></button>
- <button id="add-role-btn" title="Add" class="btn btn-primary toolbar" ng-click="showModal('newRole')"><i class="pictogram"></i></button>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add remove buttons')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_add_remove_buttons}}" tooltip-placement="right">(?)</a> </div>
+ <a title="Select All" class="btn btn-primary select-all toolbar"
+ ng-show="hasRoles"
+ ng-click="selectAllEntities(rolesCollection._list,this,'rolesSelected',true)">
+ <i class="pictogram">⊟</i>
+ </a>
+ <button id="delete-role-btn" title="Delete"
+ class="btn btn-primary toolbar"
+ ng-disabled="!hasRoles || !valueSelected(rolesCollection._list)"
+ ng-click="showModal('deleteRole')">
+ <i class="pictogram">☕</i>
+ </button>
+ <button id="add-role-btn" title="Add"
+ class="btn btn-primary toolbar"
+ ng-click="showModal('newRole')">
+ <i class="pictogram"></i>
+ </button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add remove buttons')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_add_remove_buttons}}"
+ tooltip-placement="right">(?)</a>
+ </div>
<ul class="user-list">
- <li ng-class="selectedRole._data.uuid === role._data.uuid ? 'selected' : ''" ng-repeat="role in rolesCollection._list" ng-click="selectRole(role._data.uuid)">
- <input
- type="checkbox"
- ng-value="role.get('uuid')"
- ng-checked="master"
- ng-model="role.checked"
- id="role-{{role.get('title')}}-cb"
- >
- <a id="role-{{role.get('title')}}-link">{{role.get('title')}}</a>
- <br/>
- <span ng-if="role.get('name')" class="label">Role Name:</span>{{role.get('name')}}
- </li>
+ <li
+ ng-class="selectedRole._data.uuid === role._data.uuid ? 'selected' : ''"
+ ng-repeat="role in rolesCollection._list"
+ ng-click="selectRole(role._data.uuid)"><input
+ type="checkbox" ng-value="role.get('uuid')"
+ ng-checked="master" ng-model="role.checked"
+ id="role-{{role.get('title')}}-cb"> <a
+ id="role-{{role.get('title')}}-link">{{role.get('title')}}</a>
+ <br /> <span ng-if="role.get('name')" class="label">Role
+ Name:</span>{{role.get('name')}}</li>
</ul>
- <div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}};float:right;">Next ></button>
- </div>
+ <div style="padding: 10px 5px 10px 5px">
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
+ </div>
</div>
-
- <div id="intro-information-tabs" class="span9 tab-content" ng-show="hasRoles">
+
+ <div id="intro-information-tabs" class="span9 tab-content"
+ ng-show="hasRoles">
<div class="menu-toolbar">
<ul class="inline">
- <li class="tab" ng-class="currentRolesPage.route === '/roles/settings' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectRolePage('/roles/settings')"><i class="pictogram"></i>Settings</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles settings tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_settings_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentRolesPage.route === '/roles/users' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectRolePage('/roles/users')"><i class="pictogram">👥</i>Users</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles users tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_users_tab}}" tooltip-placement="right">(?)</a></div></li>
- <li class="tab" ng-class="currentRolesPage.route === '/roles/groups' ? 'selected' : ''"><div class="btn btn-primary toolbar" ><a class="btn-content" ng-click="selectRolePage('/roles/groups')"><i class="pictogram"></i>Groups</a> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('roles groups tab')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_roles_groups_tab}}" tooltip-placement="right">(?)</a></div></li>
+ <li class="tab"
+ ng-class="currentRolesPage.route === '/roles/settings' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectRolePage('/roles/settings')"><i
+ class="pictogram"></i>Settings</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles settings tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_settings_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentRolesPage.route === '/roles/users' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectRolePage('/roles/users')"><i
+ class="pictogram">👥</i>Users</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles users tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_users_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
+ <li class="tab"
+ ng-class="currentRolesPage.route === '/roles/groups' ? 'selected' : ''"><div
+ class="btn btn-primary toolbar">
+ <a class="btn-content"
+ ng-click="selectRolePage('/roles/groups')"><i
+ class="pictogram"></i>Groups</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('roles groups tab')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_roles_groups_tab}}"
+ tooltip-placement="right">(?)</a>
+ </div></li>
</ul>
</div>
<span ng-include="currentRolesPage.template"></span>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/shell/shell.html
----------------------------------------------------------------------
diff --git a/portal/js/shell/shell.html b/portal/js/shell/shell.html
index 4e3d316..798361d 100644
--- a/portal/js/shell/shell.html
+++ b/portal/js/shell/shell.html
@@ -1,3 +1,4 @@
+<page-title title=" Shell" icon="📱"></page-title>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,25 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<page-title title=" Shell" icon="📱"></page-title>
-
<section class="row-fluid">
<div class="console-section-contents" id="shell-panel">
<div id="shell-input-div">
- <p> Type "help" to view a list of the available commands.</p>
+ <p>Type "help" to view a list of the available commands.</p>
<hr>
- <form name="shellForm" ng-submit="submitCommand()" >
- <span> >> </span>
- <input type="text" id="shell-input" ng-model="shell.input" autofocus="autofocus" required
- ng-form="shellForm">
- <input style="display: none" type="submit" ng-form="shellForm" value="submit" ng-disabled="!shell.input"/>
+ <form name="shellForm" ng-submit="submitCommand()">
+ <span> >> </span> <input type="text" id="shell-input"
+ ng-model="shell.input" autofocus="autofocus" required
+ ng-form="shellForm"> <input style="display: none"
+ type="submit" ng-form="shellForm" value="submit"
+ ng-disabled="!shell.input" />
</form>
</div>
- <pre id="shell-output" class="prettyprint lang-js" style="overflow-x: auto; height: 400px;" ng-bind-html="shell.output">
+ <pre id="shell-output" class="prettyprint lang-js"
+ style="overflow-x: auto; height: 400px;"
+ ng-bind-html="shell.output">
</pre>
- <div id="lastshelloutput" ng-bind-html="shell.outputhidden" style="visibility:hidden"></div>
+ <div id="lastshelloutput" ng-bind-html="shell.outputhidden"
+ style="visibility: hidden"></div>
</div>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-activities.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-activities.html b/portal/js/users/users-activities.html
index 97c9a01..eef4b3c 100644
--- a/portal/js/users/users-activities.html
+++ b/portal/js/users/users-activities.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="UsersActivitiesCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,40 +15,49 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersActivitiesCtrl" >
-
- <bsmodal id="addActivityToUser"
- title="Add activity to user"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addActivityToUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <p>Content: <input id="activityMessage" ng-model="$parent.newActivity.activityToAdd" required name="activityMessage" ug-validate /> <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add activity content')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities_add_activity_content}}" tooltip-placement="right">(?)</a></p>
+ <bsmodal id="addActivityToUser" title="Add activity to user"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addActivityToUserDialog" extrabuttonlabel="Add"
+ ng-cloak>
+ <p>
+ Content: <input id="activityMessage"
+ ng-model="$parent.newActivity.activityToAdd" required
+ name="activityMessage" ug-validate /> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add activity content')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities_add_activity_content}}"
+ tooltip-placement="right">(?)</a>
+ </p>
</bsmodal>
<div ng:include="'users/users-tabs.html'"></div>
<br>
- <div class="button-strip"><a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add activity button')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_activities_add_activity}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addActivityToUser')">Add activity to user</button>
+ <div class="button-strip">
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add activity button')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_activities_add_activity}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addActivityToUser')">Add activity to
+ user</button>
</div>
<div>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Date</td>
- <td>Content</td>
- <td>Verb</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="activity in activities">
- <td>{{activity.createdDate}}</td>
- <td>{{activity.content}}</td>
- <td>{{activity.verb}}</td>
- <td>{{activity.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Date</td>
+ <td>Content</td>
+ <td>Verb</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="activity in activities">
+ <td>{{activity.createdDate}}</td>
+ <td>{{activity.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-feed.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-feed.html b/portal/js/users/users-feed.html
index 0228596..d7681aa 100644
--- a/portal/js/users/users-feed.html
+++ b/portal/js/users/users-feed.html
@@ -1,3 +1,4 @@
+<div class="content-page" ng-controller="UsersFeedCtrl">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,31 +15,28 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersFeedCtrl" >
-
- <div ng:include="'users/users-tabs.html'"></div>
- <br>
- <div>
- <table class="table table-striped">
- <tbody>
- <tr class="table-header">
- <td>Date</td>
- <td>User</td>
- <td>Content</td>
- <td>Verb</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="activity in activities">
- <td>{{activity.createdDate}}</td>
- <td>{{activity.actor.displayName}}</td>
- <td>{{activity.content}}</td>
- <td>{{activity.verb}}</td>
- <td>{{activity.uuid}}</td>
- </tr>
- </tbody>
- </table>
- </div>
+ <div ng:include="'users/users-tabs.html'"></div>
+ <br>
+ <div>
+ <table class="table table-striped">
+ <tbody>
+ <tr class="table-header">
+ <td>Date</td>
+ <td>User</td>
+ <td>Content</td>
+ <td>Verb</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="activity in activities">
+ <td>{{activity.createdDate}}</td>
+ <td>{{activity.actor.displayName}}</td>
+ <td>{{activity.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-graph.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-graph.html b/portal/js/users/users-graph.html
index 31d1a10..6b45a5d 100644
--- a/portal/js/users/users-graph.html
+++ b/portal/js/users/users-graph.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="UsersGraphCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,70 +15,85 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersGraphCtrl">
-
<div ng:include="'users/users-tabs.html'"></div>
<div>
- <bsmodal id="followUser"
- title="Follow User"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="followUserDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.user != '' ? $parent.user.username : 'Select a user...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="user in $parent.usersTypeaheadValues" class="filterItem"><a ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
- </ul>
- </div>
+ <bsmodal id="followUser" title="Follow User" close="hideModal"
+ closelabel="Cancel" extrabutton="followUserDialog"
+ extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.user
+ != '' ? $parent.user.username : 'Select a user...'}}</span> <span
+ class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="user in $parent.usersTypeaheadValues"
+ class="filterItem"><a
+ ng-click="$parent.$parent.user = user">{{user.username}}</a></li>
+ </ul>
+ </div>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users follow user')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_follow_user}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('followUser')">Follow User</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users follow user')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_follow_user}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary" ng-click="showModal('followUser')">Follow
+ User</button>
</div>
<br>
- <h4>Following <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users following list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_following}}" tooltip-placement="right">(?)</a></h4>
+ <h4>
+ Following <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users following list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_following}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Image</td>
- <td>Username</td>
- <td>Email</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="user in selectedUser.following">
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
- <td>{{user.username}}</td>
- <td>{{user.email}}</td>
- <td>{{user.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Image</td>
+ <td>Username</td>
+ <td>Email</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="user in selectedUser.following">
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
+ <td>{{user.username}}</td>
+ <td>{{user.email}}</td>
+ <td>{{user.uuid}}</td>
+ </tr>
</tbody>
</table>
- <h4>Followers <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users followers list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_graph_followers}}" tooltip-placement="right">(?)</a></h4>
+ <h4>
+ Followers <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users followers list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_graph_followers}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Image</td>
- <td>Username</td>
- <td>Email</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="user in selectedUser.followers">
- <td><img style="width:30px;height:30px;" ng-src="{{user._portal_image_icon}}"></td>
- <td>{{user.username}}</td>
- <td>{{user.email}}</td>
- <td>{{user.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Image</td>
+ <td>Username</td>
+ <td>Email</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="user in selectedUser.followers">
+ <td><img style="width: 30px; height: 30px;"
+ ng-src="{{user._portal_image_icon}}"></td>
+ <td>{{user.username}}</td>
+ <td>{{user.email}}</td>
+ <td>{{user.uuid}}</td>
+ </tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/users/users-groups.html
----------------------------------------------------------------------
diff --git a/portal/js/users/users-groups.html b/portal/js/users/users-groups.html
index 8b8cb91..5b1bfbc 100644
--- a/portal/js/users/users-groups.html
+++ b/portal/js/users/users-groups.html
@@ -1,4 +1,5 @@
-<!--
+<div class="content-page" ng-controller="UsersGroupsCtrl">
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,72 +15,74 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page" ng-controller="UsersGroupsCtrl">
-
<div ng:include="'users/users-tabs.html'"></div>
<div>
- <bsmodal id="addUserToGroup"
- title="Add user to group"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="addUserToGroupDialog"
- extrabuttonlabel="Add"
- ng-cloak>
- <div class="btn-group">
- <a class="btn dropdown-toggle filter-selector" data-toggle="dropdown">
- <span class="filter-label">{{$parent.title && $parent.title !== '' ? $parent.title : 'Select a group...'}}</span>
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li ng-repeat="group in $parent.groupsTypeaheadValues" class="filterItem"><a ng-click="selectGroup(group)">{{group.title}}</a></li>
- </ul>
- </div>
+ <bsmodal id="addUserToGroup" title="Add user to group"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="addUserToGroupDialog" extrabuttonlabel="Add" ng-cloak>
+ <div class="btn-group">
+ <a class="btn dropdown-toggle filter-selector"
+ data-toggle="dropdown"> <span class="filter-label">{{$parent.title
+ && $parent.title !== '' ? $parent.title : 'Select a
+ group...'}}</span> <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-repeat="group in $parent.groupsTypeaheadValues"
+ class="filterItem"><a ng-click="selectGroup(group)">{{group.title}}</a></li>
+ </ul>
+ </div>
</bsmodal>
- <bsmodal id="leaveGroup"
- title="Confirmation"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="leaveGroupDialog"
- extrabuttonlabel="Leave"
- ng-cloak>
- <p>Are you sure you want to remove the user from the seleted group(s)?</p>
+ <bsmodal id="leaveGroup" title="Confirmation" close="hideModal"
+ closelabel="Cancel" extrabutton="leaveGroupDialog"
+ extrabuttonlabel="Leave" ng-cloak>
+ <p>Are you sure you want to remove the user from the seleted
+ group(s)?</p>
</bsmodal>
<div class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('users add leave group buttons')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_add_leave_buttons}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-click="showModal('addUserToGroup')">Add to group</button>
- <button class="btn btn-primary" ng-disabled="!hasGroups || !valueSelected(userGroupsCollection._list)" ng-click="showModal('leaveGroup')">Leave group(s)</button>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('users add leave group buttons')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_add_leave_buttons}}"
+ tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-click="showModal('addUserToGroup')">Add to group</button>
+ <button class="btn btn-primary"
+ ng-disabled="!hasGroups || !valueSelected(userGroupsCollection._list)"
+ ng-click="showModal('leaveGroup')">Leave group(s)</button>
</div>
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>
- <input type="checkbox" ng-show="hasGroups" id="selectAllCheckBox" ng-model="userGroupsSelected" ng-click="selectAllEntities(userGroupsCollection._list,this,'userGroupsSelected')" >
- </td>
- <td>Group Name <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('add user group list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_groups_group_name}}" tooltip-placement="top">(?)</a></td>
- <td>Path</td>
- </tr>
- <tr class="zebraRows" ng-repeat="group in userGroupsCollection._list">
- <td>
- <input
- type="checkbox"
- ng-value="group.get('uuid')"
- ng-model="group.checked"
- >
- </td>
- <td>{{group.get('title')}}</td>
- <td>{{group.get('path')}}</td>
- </tr>
+ <tr class="table-header">
+ <td><input type="checkbox" ng-show="hasGroups"
+ id="selectAllCheckBox" ng-model="userGroupsSelected"
+ ng-click="selectAllEntities(userGroupsCollection._list,this,'userGroupsSelected')">
+ </td>
+ <td>Group Name <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('add user group list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_groups_group_name}}"
+ tooltip-placement="top">(?)</a></td>
+ <td>Path</td>
+ </tr>
+ <tr class="zebraRows"
+ ng-repeat="group in userGroupsCollection._list">
+ <td><input type="checkbox" ng-value="group.get('uuid')"
+ ng-model="group.checked"></td>
+ <td>{{group.get('title')}}</td>
+ <td>{{group.get('path')}}</td>
+ </tr>
</tbody>
</table>
</div>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
</div>