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:52 UTC
[5/6] git commit: USERGRID-207 Fix license headers in portal
Angular.js files
USERGRID-207 Fix license headers in portal Angular.js files
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a9454950
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a9454950
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a9454950
Branch: refs/heads/master
Commit: a945495062e0f93815c2b375a4d2f477ed70d793
Parents: efade6f
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Tue Aug 12 23:39:01 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Tue Aug 12 23:39:01 2014 -0700
----------------------------------------------------------------------
portal/js/activities/activities.html | 41 +-
portal/js/app-overview/app-overview.html | 37 +-
.../js/app-overview/doc-includes/android.html | 388 ++++++++++++-------
portal/js/app-overview/doc-includes/ios.html | 351 +++++++++++------
.../app-overview/doc-includes/javascript.html | 203 ++++++----
portal/js/data/data.html | 248 +++++++-----
portal/js/data/display-generic.html | 155 ++++----
portal/js/data/display-roles.html | 3 +-
portal/js/data/display-users.html | 241 +++++++++---
portal/js/data/entity.html | 18 +-
portal/js/global/insecure-banner.html | 15 +-
portal/js/global/page-title.html | 31 +-
portal/js/groups/groups-activities.html | 29 +-
portal/js/groups/groups-details.html | 68 ++--
portal/js/groups/groups-members.html | 86 ++--
portal/js/groups/groups-roles.html | 232 ++++++-----
portal/js/groups/groups-tabs.html | 32 +-
portal/js/groups/groups.html | 183 +++++----
portal/js/login/forgot-password.html | 14 +-
portal/js/login/loading.html | 5 +-
portal/js/login/login.html | 101 +++--
portal/js/login/logout.html | 3 +-
portal/js/login/register.html | 69 ++--
portal/js/menu.html | 17 +-
portal/js/menus/appMenu.html | 2 +-
portal/js/org-overview/org-overview.html | 256 ++++++------
portal/js/profile/account.html | 16 +-
portal/js/profile/organizations.html | 119 +++---
portal/js/profile/profile.html | 89 +++--
portal/js/roles/roles-groups.html | 86 ++--
portal/js/roles/roles-settings.html | 158 +++++---
portal/js/roles/roles-tabs.html | 33 +-
portal/js/roles/roles-users.html | 85 ++--
portal/js/roles/roles.html | 169 +++++---
portal/js/shell/shell.html | 24 +-
portal/js/users/users-activities.html | 62 +--
portal/js/users/users-feed.html | 48 ++-
portal/js/users/users-graph.html | 112 +++---
portal/js/users/users-groups.html | 105 ++---
portal/js/users/users-profile.html | 141 ++++---
portal/js/users/users-roles.html | 245 +++++++-----
portal/js/users/users-tabs.html | 17 +-
portal/js/users/users.html | 259 ++++++++-----
43 files changed, 2807 insertions(+), 1789 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/activities/activities.html
----------------------------------------------------------------------
diff --git a/portal/js/activities/activities.html b/portal/js/activities/activities.html
index 8837f55..34bd491 100644
--- a/portal/js/activities/activities.html
+++ b/portal/js/activities/activities.html
@@ -1,3 +1,4 @@
+<section class="row-fluid">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<section class="row-fluid">
<div class="span12">
<div class="page-filters">
- <h1 class="title" class="pull-left"><i class="pictogram title">📱</i> Activities</h1>
+ <h1 class="title" class="pull-left">
+ <i class="pictogram title">📱</i> Activities
+ </h1>
</div>
</div>
@@ -27,23 +28,23 @@
<div class="span12 tab-content">
<table class="table table-striped">
<tbody>
- <tr class="table-header">
- <td>Date</td>
- <td></td>
- <td>User</td>
- <td>Content</td>
- <td>Verb</td>
- <td>UUID</td>
- </tr>
- <tr class="zebraRows" ng-repeat="activity in activities">
- <td>{{formatDate(activity.created)}}</td>
- <td class="gravatar20"> <img ng-src="{{activity.actor.picture}}"/>
- </td>
- <td>{{activity.actor.displayName}}</td>
- <td>{{activity.content}}</td>
- <td>{{activity.verb}}</td>
- <td>{{activity.uuid}}</td>
- </tr>
+ <tr class="table-header">
+ <td>Date</td>
+ <td></td>
+ <td>User</td>
+ <td>Content</td>
+ <td>Verb</td>
+ <td>UUID</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="activity in activities">
+ <td>{{formatDate(activity.created)}}</td>
+ <td class="gravatar20"><img
+ ng-src="{{activity.actor.picture}}" /></td>
+ <td>{{activity.actor.displayName}}</td>
+ <td>{{activity.content}}</td>
+ <td>{{activity.verb}}</td>
+ <td>{{activity.uuid}}</td>
+ </tr>
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/app-overview.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/app-overview.html b/portal/js/app-overview/app-overview.html
index a6917a2..dd95414 100644
--- a/portal/js/app-overview/app-overview.html
+++ b/portal/js/app-overview/app-overview.html
@@ -1,3 +1,4 @@
+<div class="app-overview-content">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,28 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="app-overview-content" >
<section class="row-fluid">
- <page-title title=" Summary" icon="📱"></page-title>
- <section class="row-fluid">
+ <page-title title=" Summary" icon="📱"></page-title>
+ <section class="row-fluid">
<h2 class="title" id="app-overview-title">{{currentApp}}</h2>
- </section>
- <section class="row-fluid">
+ </section>
+ <section class="row-fluid">
- <div class="span6">
- <table class="table table-striped">
- <tr class="table-header">
- <td>Path</td>
- <td>Title</td>
- </tr>
- <tr class="zebraRows" ng-repeat="(k,v) in collections">
- <td>{{v.title}}</td>
- <td>{{v.count}}</td>
- </tr>
- </table>
- </div>
+ <div class="span6">
+ <table class="table table-striped">
+ <tr class="table-header">
+ <td>Path</td>
+ <td>Title</td>
+ </tr>
+ <tr class="zebraRows" ng-repeat="(k,v) in collections">
+ <td>{{v.title}}</td>
+ <td>{{v.count}}</td>
+ </tr>
+ </table>
+ </div>
- </section>
+ </section>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/doc-includes/android.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/doc-includes/android.html b/portal/js/app-overview/doc-includes/android.html
index 1ca3b08..3adc6ae 100644
--- a/portal/js/app-overview/doc-includes/android.html
+++ b/portal/js/app-overview/doc-includes/android.html
@@ -1,3 +1,4 @@
+<h2>1. Integrate the SDK into your project</h2>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,63 +15,108 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<h2>1. Integrate the SDK into your project</h2>
-<p>You can integrate Apigee features into your app by including the SDK in your project. You can do one of the following:</p>
+<p>You can integrate Apigee features into your app by including the
+ SDK in your project. You can do one of the following:</p>
<ul class="nav nav-tabs" id="myTab">
- <li class="active"><a data-toggle="tab" href="#existing_project">Existing project</a></li>
- <li><a data-toggle="tab" href="#new_project">New project</a></li>
+ <li class="active"><a data-toggle="tab" href="#existing_project">Existing
+ project</a></li>
+ <li><a data-toggle="tab" href="#new_project">New project</a></li>
</ul>
<div class="tab-content">
- <div class="tab-pane active" id="existing_project">
- <a class="jumplink" name="add_the_sdk_to_an_existing_project"></a>
- <p>If you've already got an Android project, you can integrate the Apigee SDK into your project as you normally would:</p>
- <div id="collapse">
- <a href="#jar_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="jar_collapse" class="collapse">
- <p>Add <code>apigee-android-<version>.jar</code> to your class path by doing the following:</p>
-
- <h3>Android 4.0 (or later) projects</h3>
- <p>Copy the jar file into the <code>/libs</code> folder in your project.</p>
-
- <h3>Android 3.0 (or earlier) projects</h3>
- <ol>
- <li>In the Eclipse <strong>Package Explorer</strong>, select your application's project folder.</li>
- <li>Click the <strong>File > Properties</strong> menu.</li>
- <li>In the <strong>Java Build Path</strong> section, click the <strong>Libraries</strong> tab, click <strong>Add External JARs</strong>.</li>
- <li>Browse to <code>apigee-android-<version>.jar</code>, then click <strong>Open</strong>.</li>
- <li>Order the <code>apigee-android-<version>.jar</code> at the top of the class path:
- <ol>
- <li>In the Eclipse <strong>Package Explorer</strong>, select your application's project folder.</li>
- <li>Click the <strong>File > Properties</strong> menu.</li>
- <li>In the properties dialog, in the <strong>Java Build Path</strong> section, click the <strong>Order and Export</strong> tab.</li>
- <li>
- <p><strong>IMPORTANT:</strong> Select the checkbox for <code>apigee-android-<version>.jar</code>, then click the <strong>Top</strong> button.</p>
- </li>
- </ol>
- </li>
- </ol>
- <div class="warning">
- <h3>Applications using Ant</h3>
- <p>If you are using Ant to build your application, you must also copy <code>apigee-android-<version>.jar</code> to the <code>/libs</code> folder in your application.</p>
- </div>
- </div>
- </div>
- <div class="tab-pane" id="new_project">
- <a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
- <p>If you don't have a project yet, you can begin by using the project template included with the SDK. The template includes support for SDK features.</p>
- <ul>
- <li>Locate the project template in the expanded SDK. It should be at the following location:
- <pre><sdk_root>/new-project-template</pre>
- </li>
- </ul>
- </div>
+ <div class="tab-pane active" id="existing_project">
+ <a class="jumplink" name="add_the_sdk_to_an_existing_project"></a>
+ <p>If you've already got an Android project, you can
+ integrate the Apigee SDK into your project as you
+ normally would:</p>
+ <div id="collapse">
+ <a href="#jar_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="jar_collapse" class="collapse">
+ <p>
+ Add
+ <code>apigee-android-<version>.jar</code>
+ to your class path by doing the following:
+ </p>
+
+ <h3>Android 4.0 (or later) projects</h3>
+ <p>
+ Copy the jar file into the
+ <code>/libs</code>
+ folder in your project.
+ </p>
+
+ <h3>Android 3.0 (or earlier) projects</h3>
+ <ol>
+ <li>In the Eclipse <strong>Package Explorer</strong>,
+ select your application's project folder.
+ </li>
+ <li>Click the <strong>File > Properties</strong> menu.
+ </li>
+ <li>In the <strong>Java Build Path</strong> section, click
+ the <strong>Libraries</strong> tab, click <strong>Add
+ External JARs</strong>.
+ </li>
+ <li>Browse to <code>apigee-android-<version>.jar</code>,
+ then click <strong>Open</strong>.
+ </li>
+ <li>Order the <code>apigee-android-<version>.jar</code>
+ at the top of the class path:
+ <ol>
+ <li>In the Eclipse <strong>Package Explorer</strong>,
+ select your application's project folder.
+ </li>
+ <li>Click the <strong>File >
+ Properties</strong> menu.
+ </li>
+ <li>In the properties dialog, in the <strong>Java
+ Build Path</strong> section, click the <strong>Order
+ and Export</strong> tab.
+ </li>
+ <li>
+ <p>
+ <strong>IMPORTANT:</strong> Select the checkbox for
+ <code>apigee-android-<version>.jar</code>
+ , then click the <strong>Top</strong> button.
+ </p>
+ </li>
+ </ol>
+ </li>
+ </ol>
+ <div class="warning">
+ <h3>Applications using Ant</h3>
+ <p>
+ If you are using Ant to build your application, you must also
+ copy
+ <code>apigee-android-<version>.jar</code>
+ to the
+ <code>/libs</code>
+ folder in your application.
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="tab-pane" id="new_project">
+ <a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
+ <p>If you don't have a project yet, you can begin by using
+ the project template included with the SDK. The template includes
+ support for SDK features.</p>
+ <ul>
+ <li>Locate the project template in the expanded SDK. It
+ should be at the following location: <pre><sdk_root>/new-project-template</pre>
+ </li>
+ </ul>
+ </div>
</div>
<h2>2. Update permissions in AndroidManifest.xml</h2>
-<p>Add the following Internet permissions to your application's <code>AndroidManifest.xml</code> file if they have not already been added. Note that with the exception of INTERNET, enabling all other permissions are optional.</p>
+<p>
+ Add the following Internet permissions to your application's
+ <code>AndroidManifest.xml</code>
+ file if they have not already been added. Note that with the exception
+ of INTERNET, enabling all other permissions are optional.
+</p>
<pre>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -79,10 +125,16 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
</pre>
<h2>3. Initialize the SDK</h2>
-<p>To initialize the App Services SDK, you must instantiate the <code>ApigeeClient</code> class. There are multiple ways to handle this step, but we recommend that you do the following:</p>
+<p>
+ To initialize the App Services SDK, you must instantiate the
+ <code>ApigeeClient</code>
+ class. There are multiple ways to handle this step, but we recommend
+ that you do the following:
+</p>
<ol>
- <li>Subclass the <code>Application</code> class, and add an instance variable for the <code>ApigeeClient</code> to it, along with getter and setter methods.
- <pre>
+ <li>Subclass the <code>Application</code> class, and add an
+ instance variable for the <code>ApigeeClient</code> to it, along
+ with getter and setter methods. <pre>
public class YourApplication extends Application
{
@@ -104,9 +156,9 @@ public class YourApplication extends Application
}
}
</pre>
- </li>
- <li>Declare the <code>Application</code> subclass in your <code>AndroidManifest.xml</code>. For example:
- <pre>
+ </li>
+ <li>Declare the <code>Application</code> subclass in your <code>AndroidManifest.xml</code>.
+ For example: <pre>
<application>
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
@@ -115,9 +167,9 @@ public class YourApplication extends Application
…
</application>
</pre>
- </li>
- <li>Instantiate the <code>ApigeeClient</code> class in the <code>onCreate</code> method of your first <code>Activity</code> class:
- <pre>
+ </li>
+ <li>Instantiate the <code>ApigeeClient</code> class in the <code>onCreate</code>
+ method of your first <code>Activity</code> class: <pre>
import com.apigee.sdk.ApigeeClient;
@Override
@@ -134,8 +186,14 @@ protected void onCreate(Bundle savedInstanceState) {
yourApp.setApigeeClient(apigeeClient);
}
</pre>
- <p>This will make the instance of <code>ApigeeClient</code> available to your <code>Application</code> class.</p>
- </li>
+ <p>
+ This will make the instance of
+ <code>ApigeeClient</code>
+ available to your
+ <code>Application</code>
+ class.
+ </p>
+ </li>
</ol>
<h2>4. Import additional SDK classes</h2>
<p>The following classes will enable you to call common SDK methods:</p>
@@ -145,82 +203,152 @@ import com.apigee.sdk.apm.android.MonitoringClient; //App Monitoring methods
import com.apigee.sdk.data.client.callbacks.ApiResponseCallback; //API response handling
import com.apigee.sdk.data.client.response.ApiResponse; //API response object
</pre>
-
+
<h2>5. Verify SDK installation</h2>
-<p>Once initialized, App Services will also automatically instantiate the <code>MonitoringClient</code> class and begin logging usage, crash and error metrics for your app.</p>
-<p><img src="img/verify.png" alt="screenshot of data in admin portal"/></p>
-<p>To verify that the SDK has been properly initialized, run your app, then go to 'Monitoring' > 'App Usage' in the <a href="https://www.apigee.com/usergrid">App Services admin portal</a> to verify that data is being sent.</p>
-<div class="warning">It may take up to two minutes for data to appear in the admin portal after you run your app.</div>
+<p>
+ Once initialized, App Services will also automatically instantiate the
+ <code>MonitoringClient</code>
+ class and begin logging usage, crash and error metrics for your app.
+</p>
+<p>
+ <img src="img/verify.png" alt="screenshot of data in admin portal" />
+</p>
+<p>
+ To verify that the SDK has been properly initialized, run your app,
+ then go to 'Monitoring' > 'App Usage' in the <a
+ href="https://www.apigee.com/usergrid">App Services admin portal</a>
+ to verify that data is being sent.
+</p>
+<div class="warning">It may take up to two minutes for data to
+ appear in the admin portal after you run your app.</div>
<h2>Installation complete! Try these next steps</h2>
<ul>
- <li>
- <h3><strong>Call additional SDK methods in your code</strong></h3>
- <p>The <code>DataClient</code> and <code>MonitoringClient</code> classes are also automatically instantiated for you, and accessible with the following accessors:</p>
- <ul>
- <li>
- <pre>DataClient dataClient = apigeeClient.getDataClient();</pre>
- <p>Use this object to access the data methods of the App Services SDK, including those for push notifications, data store, and geolocation.</p>
- </li>
- <li>
- <pre>MonitoringClient monitoringClient = apigeeClient.getMonitoringClient();</pre>
- <p>Use this object to access the app configuration and monitoring methods of the App Services SDK, including advanced logging, and A/B testing.</p>
- </li>
- </ul>
- </li>
- <li>
- <h3><strong>Add App Services features to your app</strong></h3>
- <p>With App Services you can quickly add valuable features to your mobile or web app, including push notifications, a custom data store, geolocation and more. Check out these links to get started with a few of our most popular features:</p>
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/8410">Push notifications</a></strong>: Send offers, alerts and other messages directly to user devices to dramatically increase engagement. With App Services you can send 10 million push notification per month for free!</li>
- <li><strong>App Monitoring</strong>: When you initialize the App Services SDK, a suite of valuable, <a href="http://apigee.com/docs/node/13190">customizable</a> application monitoring features are automatically enabled that deliver the data you need to fine tune performance, analyze issues, and improve user experience.
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/13176">App Usage Monitoring</a></strong>: Visit the <a href="https://apigee.com/usergrid">App Services admin portal</a> to view usage data for your app, including data on device models, platforms and OS versions running your app.</li>
- <li><strong><a href="http://apigee.com/docs/node/12861">API Performance Monitoring</a></strong>: Network performance is key to a solid user experience. In the <a href="https://apigee.com/usergrid">App Services admin portal</a> you can view key metrics, including response time, number of requests and raw API request logs.</li>
- <li><strong><a href="http://apigee.com/docs/node/13177">Error & Crash Monitoring</a></strong>: Get alerted to any errors or crashes, then view them in the <a href="https://apigee.com/usergrid">App Services admin portal</a>, where you can also analyze raw error and crash logs.</li>
- </ul>
- </li>
- <li><strong><a href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target users or return result sets based on user location to keep your app highly-relevant.</li>
- <li><strong><a href="http://apigee.com/docs/node/10152">Data storage</a></strong>: Store all your application data on our high-availability infrastructure, and never worry about dealing with a database ever again.</li>
- <li><strong><a href="http://apigee.com/docs/node/376">User management and authentication</a></strong>: Every app needs users. Use App Services to easily implement user registration, as well as OAuth 2.0-compliant login and authentication.</li>
- </ul>
- </li>
- <li>
- <h3><strong>Check out the sample apps</strong></h3>
- <p>The SDK includes samples that illustrate Apigee features. You'll find the samples in the following location in your SDK download:</p>
- <pre>
+ <li>
+ <h3>
+ <strong>Call additional SDK methods in your code</strong>
+ </h3>
+ <p>
+ The
+ <code>DataClient</code>
+ and
+ <code>MonitoringClient</code>
+ classes are also automatically instantiated for you, and
+ accessible with the following accessors:
+ </p>
+ <ul>
+ <li><pre>DataClient dataClient = apigeeClient.getDataClient();</pre>
+ <p>Use this object to access the data methods of the App
+ Services SDK, including those for push notifications, data
+ store, and geolocation.</p></li>
+ <li><pre>MonitoringClient monitoringClient = apigeeClient.getMonitoringClient();</pre>
+ <p>Use this object to access the app configuration and
+ monitoring methods of the App Services SDK, including advanced
+ logging, and A/B testing.</p></li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Add App Services features to your app</strong>
+ </h3>
+ <p>With App Services you can quickly add valuable features to
+ your mobile or web app, including push notifications, a custom
+ data store, geolocation and more. Check out these links to get
+ started with a few of our most popular features:</p>
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/8410">Push notifications</a></strong>:
+ Send offers, alerts and other messages directly to user devices
+ to dramatically increase engagement. With App Services you can
+ send 10 million push notification per month for free!</li>
+ <li><strong>App Monitoring</strong>: When you initialize the
+ App Services SDK, a suite of valuable, <a
+ href="http://apigee.com/docs/node/13190">customizable</a>
+ application monitoring features are automatically enabled that
+ deliver the data you need to fine tune performance, analyze
+ issues, and improve user experience.
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/13176">App Usage
+ Monitoring</a></strong>: Visit the <a
+ href="https://apigee.com/usergrid">App Services admin
+ portal</a> to view usage data for your app, including data on
+ device models, platforms and OS versions running your app.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/12861">API
+ Performance Monitoring</a></strong>: Network performance is key to a
+ solid user experience. In the <a
+ href="https://apigee.com/usergrid">App Services admin
+ portal</a> you can view key metrics, including response time,
+ number of requests and raw API request logs.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/13177">Error &
+ Crash Monitoring</a></strong>: Get alerted to any errors or crashes,
+ then view them in the <a href="https://apigee.com/usergrid">App
+ Services admin portal</a>, where you can also analyze raw
+ error and crash logs.</li>
+ </ul></li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target
+ users or return result sets based on user location to keep your
+ app highly-relevant.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/10152">Data storage</a></strong>:
+ Store all your application data on our high-availability
+ infrastructure, and never worry about dealing with a database
+ ever again.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/376">User management and
+ authentication</a></strong>: Every app needs users. Use App Services to
+ easily implement user registration, as well as OAuth
+ 2.0-compliant login and authentication.</li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Check out the sample apps</strong>
+ </h3>
+ <p>The SDK includes samples that illustrate
+ Apigee features. You'll find the samples in the following
+ location in your SDK download:</p> <pre>
apigee-android-sdk-<version>
...
/samples
</pre>
- <div id="collapse">
- <a href="#samples_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="samples_collapse" class="collapse">
- <p>The samples include the following:</p>
- <table class="table">
- <thead>
- <tr>
- <th scope="col">Sample</th>
- <th scope="col">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>books</td>
- <td>An app for storing a list of books that shows Apigee database operations such as reading, creating, and deleting.</td>
- </tr>
- <tr>
- <td>messagee</td>
- <td>An app for sending and receiving messages that shows Apigee database operations (reading, creating).</td>
- </tr>
- <tr>
- <td>push</td>
- <td>An app that uses the push feature to send notifications to the devices of users who have subscribed for them.</td>
- </tr>
- </tbody>
- </table>
- </div>
- </li>
+ <div id="collapse">
+ <a href="#samples_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="samples_collapse" class="collapse">
+ <p>The samples include the following:</p>
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Sample</th>
+ <th scope="col">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>books</td>
+ <td>An app for storing a list of books that shows
+ Apigee database operations such as reading, creating, and
+ deleting.</td>
+ </tr>
+ <tr>
+ <td>messagee</td>
+ <td>An app for sending and receiving messages that
+ shows Apigee database operations (reading, creating).</td>
+ </tr>
+ <tr>
+ <td>push</td>
+ <td>An app that uses the push feature to send
+ notifications to the devices of users who have subscribed
+ for them.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/doc-includes/ios.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/doc-includes/ios.html b/portal/js/app-overview/doc-includes/ios.html
index c372537..d1b3fc0 100644
--- a/portal/js/app-overview/doc-includes/ios.html
+++ b/portal/js/app-overview/doc-includes/ios.html
@@ -1,3 +1,4 @@
+<h2>1. Integrate ApigeeiOSSDK.framework</h2>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,85 +15,128 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<h2>1. Integrate ApigeeiOSSDK.framework</h2>
<a class="jumplink" name="add_the_sdk_to_an_existing_project"></a>
<ul class="nav nav-tabs" id="myTab">
- <li class="active"><a data-toggle="tab" href="#existing_project">Existing project</a></li>
- <li><a data-toggle="tab" href="#new_project">New project</a></li>
+ <li class="active"><a data-toggle="tab" href="#existing_project">Existing
+ project</a></li>
+ <li><a data-toggle="tab" href="#new_project">New project</a></li>
</ul>
<div class="tab-content">
- <div class="tab-pane active" id="existing_project">
- <p>If you've already got an Xcode iOS project, add it into your project as you normally would.</p>
- <div id="collapse"><a class="btn" data-toggle="collapse" href="#framework_collapse">Details</a></div>
- <div class="collapse" id="framework_collapse">
- <ol>
- <li>
- <p>Locate the SDK framework file so you can add it to your project. For example, you'll find the file at the following path:</p>
- <pre>
+ <div class="tab-pane active" id="existing_project">
+ <p>If you've already got an Xcode iOS project, add it into
+ your project as you normally would.</p>
+ <div id="collapse">
+ <a class="btn" data-toggle="collapse" href="#framework_collapse">Details</a>
+ </div>
+ <div class="collapse" id="framework_collapse">
+ <ol>
+ <li>
+ <p>Locate the SDK framework file so you can add it to your
+ project. For example, you'll find the file at the following
+ path:</p> <pre>
<sdk_root>/bin/ApigeeiOSSDK.framework</pre>
- </li>
- <li>In the <strong>Project Navigator</strong>, click on your project file, and then the <strong>Build Phases</strong> tab. Expand <strong>Link Binary With Libraries</strong>.</li>
- <li>Link the Apigee iOS SDK into your project.
- <ul>
- <li>Drag ApigeeiOSSDK.framework into the Frameworks group created by Xcode.</li>
- </ul>
- <p>OR</p>
- <ol>
- <li>At the bottom of the <strong>Link Binary With Libraries</strong> group, click the <strong>+</strong> button. Then click <strong>Add Other</strong>.</li>
- <li>Navigate to the directory that contains ApigeeiOSSDK.framework, and choose the ApigeeiOSSDK.framework folder.</li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
- <div class="tab-pane" id="new_project"><a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
- <p>If you're starting with a clean slate (you don't have a project yet), you can begin by using the project template included with the SDK. The template includes support for SDK features.</p>
- <ol>
- <li>
- <p>Locate the project template in the expanded SDK. It should be at the following location:</p>
- <pre>
+ </li>
+ <li>In the <strong>Project Navigator</strong>, click on
+ your project file, and then the <strong>Build Phases</strong>
+ tab. Expand <strong>Link Binary With Libraries</strong>.
+ </li>
+ <li>Link the Apigee iOS SDK into your project.
+ <ul>
+ <li>Drag ApigeeiOSSDK.framework into the Frameworks
+ group created by Xcode.</li>
+ </ul>
+ <p>OR</p>
+ <ol>
+ <li>At the bottom of the <strong>Link Binary
+ With Libraries</strong> group, click the <strong>+</strong>
+ button. Then click <strong>Add Other</strong>.
+ </li>
+ <li>Navigate to the directory that contains
+ ApigeeiOSSDK.framework, and choose the
+ ApigeeiOSSDK.framework folder.</li>
+ </ol>
+ </li>
+ </ol>
+ </div>
+ </div>
+ <div class="tab-pane" id="new_project">
+ <a class="jumplink" name="create_a_new_project_based_on_the_SDK"></a>
+ <p>If you're starting with a clean slate (you don't have
+ a project yet), you can begin by using the project template
+ included with the SDK. The template includes support for SDK
+ features.</p>
+ <ol>
+ <li>
+ <p>Locate the project template in the expanded SDK. It
+ should be at the following location:</p> <pre>
<sdk_root>/new-project-template</pre>
- </li>
- <li>In the project template directory, open the project file: Apigee App Services iOS Template.xcodeproj.</li>
- <li>Get acquainted with the template by looking at its readme file.</li>
- </ol>
- </div>
+ </li>
+ <li>In the project template directory, open the project
+ file: Apigee App Services iOS Template.xcodeproj.</li>
+ <li>Get acquainted with the template by looking at its readme
+ file.</li>
+ </ol>
+ </div>
</div>
<h2>2. Add required iOS frameworks</h2>
-<p>Ensure that the following iOS frameworks are part of your project. To add them, under the <strong>Link Binary With Libraries</strong> group, click the <strong>+</strong> button, type the name of the framework you want to add, select the framework found by Xcode, then click <strong>Add</strong>.</p>
+<p>
+ Ensure that the following iOS frameworks are part of your project. To
+ add them, under the <strong>Link Binary With Libraries</strong> group,
+ click the <strong>+</strong> button, type the name of the framework
+ you want to add, select the framework found by Xcode, then click <strong>Add</strong>.
+</p>
<ul>
- <li>QuartzCore.framework</li>
- <li>CoreLocation.framework</li>
- <li>CoreTelephony.framework </li>
- <li>Security.framework</li>
- <li>SystemConfiguration.framework</li>
- <li>UIKit.framework</li>
+ <li>QuartzCore.framework</li>
+ <li>CoreLocation.framework</li>
+ <li>CoreTelephony.framework </li>
+ <li>Security.framework</li>
+ <li>SystemConfiguration.framework</li>
+ <li>UIKit.framework</li>
</ul>
<h2>3. Update 'Other Linker Flags'</h2>
-<p>In the <strong>Build Settings</strong> panel, add the following under <strong>Other Linker Flags</strong>:</p>
+<p>
+ In the <strong>Build Settings</strong> panel, add the following under
+ <strong>Other Linker Flags</strong>:
+</p>
<pre>
-ObjC -all_load</pre>
-<p>Confirm that flags are set for both <strong>DEBUG</strong> and <strong>RELEASE</strong>.</p>
+<p>
+ Confirm that flags are set for both <strong>DEBUG</strong> and <strong>RELEASE</strong>.
+</p>
<h2>4. Initialize the SDK</h2>
-<p>The <em>ApigeeClient</em> class initializes the App Services SDK. To do this you will need your organization name and application name, which are available in the <em>Getting Started</em> tab of the <a href="https://www.apigee.com/usergrid/">App Service admin portal</a>, under <strong>Mobile SDK Keys</strong>.</p>
+<p>
+ The <em>ApigeeClient</em> class initializes the App Services SDK. To
+ do this you will need your organization name and application name,
+ which are available in the <em>Getting Started</em> tab of the <a
+ href="https://www.apigee.com/usergrid/">App Service admin portal</a>,
+ under <strong>Mobile SDK Keys</strong>.
+</p>
<ol>
- <li>Import the SDK
- <p>Add the following to your source code to import the SDK:</p>
- <pre>
+ <li>Import the SDK
+ <p>Add the following to your source code to import the SDK:</p> <pre>
#import <ApigeeiOSSDK/Apigee.h></pre>
- </li>
- <li>
- <p>Declare the following properties in <code>AppDelegate.h</code>:</p>
- <pre>
+ </li>
+ <li>
+ <p>
+ Declare the following properties in
+ <code>AppDelegate.h</code>
+ :
+ </p> <pre>
@property (strong, nonatomic) ApigeeClient *apigeeClient;
@property (strong, nonatomic) ApigeeMonitoringClient *monitoringClient;
@property (strong, nonatomic) ApigeeDataClient *dataClient;
</pre>
- </li>
- <li>
- <p>Instantiate the <code>ApigeeClient</code> class inside the <code>didFinishLaunching</code> method of <code>AppDelegate.m</code>:</p>
- <pre>
+ </li>
+ <li>
+ <p>
+ Instantiate the
+ <code>ApigeeClient</code>
+ class inside the
+ <code>didFinishLaunching</code>
+ method of
+ <code>AppDelegate.m</code>
+ :
+ </p> <pre>
//Replace 'AppDelegate' with the name of your app delegate class to instantiate it
AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
@@ -109,82 +153,145 @@ appDelegate.apigeeClient = [[ApigeeClient alloc]
self.monitoringClient = [appDelegate.apigeeClient monitoringClient];
self.dataClient = [appDelegate.apigeeClient dataClient];
</pre>
- </li>
+ </li>
</ol>
<h2>5. Verify SDK installation</h2>
-<p>Once initialized, App Services will also automatically instantiate the <code>ApigeeMonitoringClient</code> class and begin logging usage, crash and error metrics for your app.</p>
+<p>
+ Once initialized, App Services will also automatically instantiate the
+ <code>ApigeeMonitoringClient</code>
+ class and begin logging usage, crash and error metrics for your app.
+</p>
-<p>To verify that the SDK has been properly initialized, run your app, then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a href="https://www.apigee.com/usergrid">App Services admin portal</a> to verify that data is being sent.</p>
-<p><img src="img/verify.png" alt="screenshot of data in admin portal"/></p>
-<div class="warning">It may take up to two minutes for data to appear in the admin portal after you run your app.</div>
+<p>
+ To verify that the SDK has been properly initialized, run your app,
+ then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a
+ href="https://www.apigee.com/usergrid">App Services admin portal</a>
+ to verify that data is being sent.
+</p>
+<p>
+ <img src="img/verify.png" alt="screenshot of data in admin portal" />
+</p>
+<div class="warning">It may take up to two minutes for data to
+ appear in the admin portal after you run your app.</div>
<h2>Installation complete! Try these next steps</h2>
-<ul>
- <li>
- <h3><strong>Call additional SDK methods in your code</strong></h3>
- <p>Create an instance of the AppDelegate class, then use <code>appDelegate.dataClient</code> or <code>appDelegate.monitoringClient</code> to call SDK methods:</p>
- <div id="collapse"><a class="btn" data-toggle="collapse" href="#client_collapse">Details</a></div>
- <div class="collapse" id="client_collapse">
- <ul>
- <li><code>appDelegate.dataClient</code>: Used to access the data methods of the App Services SDK, including those for push notifications, data store, and geolocation.</li>
- <li><code>appDelegate.monitoringClient</code>: Used to access the app configuration and monitoring methods of the App Services SDK, including advanced logging, and A/B testing.</li>
- </ul>
- <h3>Example</h3>
- <p>For example, you could create a new entity with the following:</p>
- <pre>
+<ul>
+ <li>
+ <h3>
+ <strong>Call additional SDK methods in your code</strong>
+ </h3>
+ <p>
+ Create an instance of the AppDelegate class, then use
+ <code>appDelegate.dataClient</code>
+ or
+ <code>appDelegate.monitoringClient</code>
+ to call SDK methods:
+ </p>
+ <div id="collapse">
+ <a class="btn" data-toggle="collapse" href="#client_collapse">Details</a>
+ </div>
+ <div class="collapse" id="client_collapse">
+ <ul>
+ <li><code>appDelegate.dataClient</code>: Used to access the
+ data methods of the App Services SDK, including those for push
+ notifications, data store, and geolocation.</li>
+ <li><code>appDelegate.monitoringClient</code>: Used to
+ access the app configuration and monitoring methods of the App
+ Services SDK, including advanced logging, and A/B testing.</li>
+ </ul>
+ <h3>Example</h3>
+ <p>For example, you could create a new entity with the
+ following:</p>
+ <pre>
AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
</pre>
- </div>
+ </div>
- </li>
- <li>
- <h3><strong>Add App Services features to your app</strong></h3>
- <p>With App Services you can quickly add valuable features to your mobile or web app, including push notifications, a custom data store, geolocation and more. Check out these links to get started with a few of our most popular features:</p>
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/8410">Push notifications</a></strong>: Send offers, alerts and other messages directly to user devices to dramatically increase engagement. With App Services you can send 10 million push notification per month for free!</li>
- <li><strong><a href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target users or return result sets based on user location to keep your app highly-relevant.</li>
- <li><strong><a href="http://apigee.com/docs/node/10152">Data storage</a></strong>: Store all your application data on our high-availability infrastructure, and never worry about dealing with a database ever again.</li>
- <li><strong><a href="http://apigee.com/docs/node/376">User management and authentication</a></strong>: Every app needs users. Use App Services to easily implement user registration, as well as OAuth 2.0-compliant login and authentication.</li>
- </ul>
- </li>
- <li>
- <h3><strong>Check out the sample apps</strong></h3>
- <p>The SDK includes samples that illustrate Apigee features. To look at them, open the .xcodeproj file for each in Xcode. To get a sample app running, open its project file, then follow the steps described in the section, <a target="_blank" href="http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios">Add the SDK to an existing project</a>.</p>
- <p>You'll find the samples in the following location in your SDK download:</p>
- <pre>
+ </li>
+ <li>
+ <h3>
+ <strong>Add App Services features to your app</strong>
+ </h3>
+ <p>With App Services you can quickly add valuable features to
+ your mobile or web app, including push notifications, a custom
+ data store, geolocation and more. Check out these links to get
+ started with a few of our most popular features:</p>
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/8410">Push notifications</a></strong>:
+ Send offers, alerts and other messages directly to user devices
+ to dramatically increase engagement. With App Services you can
+ send 10 million push notification per month for free!</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Target
+ users or return result sets based on user location to keep your
+ app highly-relevant.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/10152">Data storage</a></strong>:
+ Store all your application data on our high-availability
+ infrastructure, and never worry about dealing with a database
+ ever again.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/376">User management and
+ authentication</a></strong>: Every app needs users. Use App Services to
+ easily implement user registration, as well as OAuth
+ 2.0-compliant login and authentication.</li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Check out the sample apps</strong>
+ </h3>
+ <p>
+ The SDK includes samples that illustrate Apigee features. To
+ look at them, open the .xcodeproj file for each in Xcode. To get a
+ sample app running, open its project file, then follow the steps
+ described in the section, <a target="_blank"
+ href="http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios">Add
+ the SDK to an existing project</a>.
+ </p>
+ <p>You'll find the samples in the following location in your SDK
+ download:</p> <pre>
apigee-ios-sdk-<version>
...
/samples
</pre>
- <div id="collapse"><a class="btn" data-toggle="collapse" href="#samples_collapse">Details</a></div>
- <div class="collapse" id="samples_collapse">
- <p>The samples include the following:</p>
- <table class="table">
- <thead>
- <tr>
- <th scope="col">Sample</th>
- <th scope="col">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>books</td>
- <td>An app for storing a list of books that shows Apigee database operations such as reading, creating, and deleting.</td>
- </tr>
- <tr>
- <td>messagee</td>
- <td>An app for sending and receiving messages that shows Apigee database operations (reading, creating).</td>
- </tr>
- <tr>
- <td>push</td>
- <td>An app that uses the push feature to send notifications to the devices of users who have subscribed for them.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <p> </p>
- </li>
+ <div id="collapse">
+ <a class="btn" data-toggle="collapse" href="#samples_collapse">Details</a>
+ </div>
+ <div class="collapse" id="samples_collapse">
+ <p>The samples include the following:</p>
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Sample</th>
+ <th scope="col">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>books</td>
+ <td>An app for storing a list of books that shows
+ Apigee database operations such as reading, creating, and
+ deleting.</td>
+ </tr>
+ <tr>
+ <td>messagee</td>
+ <td>An app for sending and receiving messages that
+ shows Apigee database operations (reading, creating).</td>
+ </tr>
+ <tr>
+ <td>push</td>
+ <td>An app that uses the push feature to send
+ notifications to the devices of users who have subscribed
+ for them.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <p> </p>
+ </li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/app-overview/doc-includes/javascript.html
----------------------------------------------------------------------
diff --git a/portal/js/app-overview/doc-includes/javascript.html b/portal/js/app-overview/doc-includes/javascript.html
index db6ed58..41cec2e 100644
--- a/portal/js/app-overview/doc-includes/javascript.html
+++ b/portal/js/app-overview/doc-includes/javascript.html
@@ -1,3 +1,4 @@
+<h2>1. Import the SDK into your HTML</h2>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,15 +15,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<h2>1. Import the SDK into your HTML</h2>
-<p>To enable support for Apigee-related functions in your HTML, you'll need to include <code>apigee.js</code> in your app. To do this, add the following to the <code>head</code> block of your HTML:</p>
+<p>
+ To enable support for Apigee-related functions in your HTML, you'll
+ need to include
+ <code>apigee.js</code>
+ in your app. To do this, add the following to the
+ <code>head</code>
+ block of your HTML:
+</p>
<pre>
<script type="text/javascript" src="path/to/js/sdk/apigee.js"></script>
</pre>
<h2>2. Instantiate Apigee.Client</h2>
-<p>Apigee.Client initializes the App Services SDK, and gives you access to all of the App Services SDK methods.</p>
-<p>You will need to pass a JSON object with the UUID or name for your App Services organization and application when you instantiate it.</p>
+<p>Apigee.Client initializes the App Services SDK, and gives you
+ access to all of the App Services SDK methods.</p>
+<p>You will need to pass a JSON object with the UUID or name for
+ your App Services organization and application when you instantiate
+ it.</p>
<pre>
//Apigee account credentials, available in the App Services admin portal
var client_creds = {
@@ -36,76 +45,132 @@ var dataClient = new Apigee.Client(client_creds);
<h2>3. Verify SDK installation</h2>
-<p>Once initialized, App Services will also automatically instantiate <code>Apigee.MonitoringClient</code> and begin logging usage, crash and error metrics for your app.</p>
+<p>
+ Once initialized, App Services will also automatically instantiate
+ <code>Apigee.MonitoringClient</code>
+ and begin logging usage, crash and error metrics for your app.
+</p>
-<p>To verify that the SDK has been properly initialized, run your app, then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a href="https://www.apigee.com/usergrid">App Services admin portal</a> to verify that data is being sent.</p>
-<p><img src="img/verify.png" alt="screenshot of data in admin portal"/></p>
-<div class="warning">It may take up to two minutes for data to appear in the admin portal after you run your app.</div>
+<p>
+ To verify that the SDK has been properly initialized, run your app,
+ then go to <strong>'Monitoring' > 'App Usage'</strong> in the <a
+ href="https://www.apigee.com/usergrid">App Services admin portal</a>
+ to verify that data is being sent.
+</p>
+<p>
+ <img src="img/verify.png" alt="screenshot of data in admin portal" />
+</p>
+<div class="warning">It may take up to two minutes for data to
+ appear in the admin portal after you run your app.</div>
<h2>Installation complete! Try these next steps</h2>
<ul>
- <li>
- <h3><strong>Call additional SDK methods in your code</strong></h3>
- <p>Use <code>dataClient</code> or <code>dataClient.monitor</code> to call SDK methods:</p>
- <div id="collapse">
- <a href="#client_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="client_collapse" class="collapse">
- <ul>
- <li><code>dataClient</code>: Used to access the data methods of the App Services SDK, including those for push notifications, data store, and geolocation.</li>
- <li><code>dataClient.monitor</code>: Used to access the app configuration and monitoring methods of the App Services SDK, including advanced logging, and A/B testing.</li>
- </ul>
- </div>
- </li>
- <li>
- <h3><strong>Add App Services features to your app</strong></h3>
- <p>With App Services you can quickly add valuable features to your mobile or web app, including push notifications, a custom data store, geolocation and more. Check out these links to get started with a few of our most popular features:</p>
- <ul>
- <li><strong><a href="http://apigee.com/docs/node/8410">Push notifications</a></strong>: Send offers, alerts and other messages directly to user devices to dramatically increase engagement. With App Services you can send 10 million push notification per month for free!</li>
- <li><strong><a href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Keep your app highly-relevant by targeting users or returning result sets based on user location.</li>
- <li><strong><a href="http://apigee.com/docs/node/10152">Data storage</a></strong>: Store all your application data on our high-availability infrastructure, and never worry about dealing with a database ever again.</li>
- <li><strong><a href="http://apigee.com/docs/node/376">User management and authentication</a></strong>: Every app needs users. Use App Services to easily implement registration, login and OAuth 2.0-compliant authentication.</li>
- </ul>
- </li>
- <li>
- <h3><strong>Check out the sample apps</strong></h3>
- <p>The SDK includes samples that illustrate Apigee features. To look at them, open the .xcodeproj file for each in Xcode. You'll find the samples in the following location in your SDK download:</p>
- <pre>
+ <li>
+ <h3>
+ <strong>Call additional SDK methods in your code</strong>
+ </h3>
+ <p>
+ Use
+ <code>dataClient</code>
+ or
+ <code>dataClient.monitor</code>
+ to call SDK methods:
+ </p>
+ <div id="collapse">
+ <a href="#client_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="client_collapse" class="collapse">
+ <ul>
+ <li><code>dataClient</code>: Used to access the data
+ methods of the App Services SDK, including those for push
+ notifications, data store, and geolocation.</li>
+ <li><code>dataClient.monitor</code>: Used to access the app
+ configuration and monitoring methods of the App Services SDK,
+ including advanced logging, and A/B testing.</li>
+ </ul>
+ </div>
+ </li>
+ <li>
+ <h3>
+ <strong>Add App Services features to your app</strong>
+ </h3>
+ <p>With App Services you can quickly add valuable features to
+ your mobile or web app, including push notifications, a custom
+ data store, geolocation and more. Check out these links to get
+ started with a few of our most popular features:</p>
+ <ul>
+ <li><strong><a
+ href="http://apigee.com/docs/node/8410">Push notifications</a></strong>:
+ Send offers, alerts and other messages directly to user devices
+ to dramatically increase engagement. With App Services you can
+ send 10 million push notification per month for free!</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/410">Geolocation</a></strong>: Keep
+ your app highly-relevant by targeting users or returning result
+ sets based on user location.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/10152">Data storage</a></strong>:
+ Store all your application data on our high-availability
+ infrastructure, and never worry about dealing with a database
+ ever again.</li>
+ <li><strong><a
+ href="http://apigee.com/docs/node/376">User management and
+ authentication</a></strong>: Every app needs users. Use App Services to
+ easily implement registration, login and OAuth 2.0-compliant
+ authentication.</li>
+ </ul>
+ </li>
+ <li>
+ <h3>
+ <strong>Check out the sample apps</strong>
+ </h3>
+ <p>The SDK includes samples that illustrate
+ Apigee features. To look at them, open the .xcodeproj file
+ for each in Xcode. You'll find the samples in the following
+ location in your SDK download:</p> <pre>
apigee-javascript-sdk-master
...
/samples
</pre>
- <div id="collapse">
- <a href="#samples_collapse" class="btn" data-toggle="collapse"><i class="icon-white icon-chevron-down"></i> Details</a>
- </div>
- <div id="samples_collapse" class="collapse">
- <p>The samples include the following:</p>
- <table class="table">
- <thead>
- <tr>
- <th scope="col">Sample</th>
- <th scope="col">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>booksSample.html</td>
- <td>An app for storing a list of books that shows Apigee database operations such as reading, creating, and deleting.</td>
- </tr>
- <tr>
- <td>messagee</td>
- <td>An app for sending and receiving messages that shows Apigee database operations (reading, creating).</td>
- </tr>
- <tr>
- <td>monitoringSample.html</td>
- <td>Shows basic configuration and initialization of the HTML5 app monitoring functionality. Works in browser, PhoneGap, Appcelerator, and Trigger.io.</td>
- </tr>
- <tr>
- <td>readmeSample.html</td>
- <td>A simple app for reading data from an Apigee database.</td>
- </tr>
- </tbody>
- </table>
- </div>
- </li>
+ <div id="collapse">
+ <a href="#samples_collapse" class="btn" data-toggle="collapse"><i
+ class="icon-white icon-chevron-down"></i> Details</a>
+ </div>
+ <div id="samples_collapse" class="collapse">
+ <p>The samples include the following:</p>
+ <table class="table">
+ <thead>
+ <tr>
+ <th scope="col">Sample</th>
+ <th scope="col">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>booksSample.html</td>
+ <td>An app for storing a list of books that shows
+ Apigee database operations such as reading, creating, and
+ deleting.</td>
+ </tr>
+ <tr>
+ <td>messagee</td>
+ <td>An app for sending and receiving messages that
+ shows Apigee database operations (reading, creating).</td>
+ </tr>
+ <tr>
+ <td>monitoringSample.html</td>
+ <td>Shows basic configuration and initialization of the
+ HTML5 app monitoring functionality. Works in browser,
+ PhoneGap, Appcelerator, and Trigger.io.</td>
+ </tr>
+ <tr>
+ <td>readmeSample.html</td>
+ <td>A simple app for reading data from an Apigee
+ database.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/data.html
----------------------------------------------------------------------
diff --git a/portal/js/data/data.html b/portal/js/data/data.html
index 075bc7d..c732d1a 100644
--- a/portal/js/data/data.html
+++ b/portal/js/data/data.html
@@ -1,3 +1,4 @@
+<div class="content-page">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,126 +15,193 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<div class="content-page">
-
- <bsmodal id="newCollection"
- title="Create new collection"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="newCollectionDialog"
- extrabuttonlabel="Create"
- buttonid="collection"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- <label for="new-collection-name">Collection Name:</label>
- <div class="controls">
- <input type="text" ug-validate required ng-pattern="collectionNameRegex" ng-attr-title="{{collectionNameRegexDescription}}" ng-model="$parent.newCollection.name" name="collection" id="new-collection-name" class="input-xlarge"/>
- <p class="help-block hide"></p>
- </div>
+ <bsmodal id="newCollection" title="Create new collection"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="newCollectionDialog" extrabuttonlabel="Create"
+ buttonid="collection" ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ <label for="new-collection-name">Collection Name:</label>
+ <div class="controls">
+ <input type="text" ug-validate required
+ ng-pattern="collectionNameRegex"
+ ng-attr-title="{{collectionNameRegexDescription}}"
+ ng-model="$parent.newCollection.name" name="collection"
+ id="new-collection-name" class="input-xlarge" />
+ <p class="help-block hide"></p>
</div>
- </fieldset>
+ </div>
+ </fieldset>
</bsmodal>
- <div id="intro-page">
+ <div id="intro-page">
<page-title title=" Collections" icon="📾"></page-title>
</div>
<section class="row-fluid">
<div id="intro-list" class="span3 user-col">
- <a class="btn btn-primary" id="new-collection-link" ng-click="showModal('newCollection')" title="new collection"><i class="pictogram"></i></a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data new collection')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_new_collection}}" tooltip-placement="right">(?)</a>
- <ul class="user-list" style="margin-top:5px;">
- <li ng-class="queryCollection._type === entity.name ? 'selected' : ''" ng-repeat="entity in collectionList" ng-click="loadCollection('/'+entity.name);">
- <a id="collection-{{entity.name}}-link" href="javaScript:void(0)">/{{entity.name}} </a>
- </li>
- </ul>
+ <a class="btn btn-primary" id="new-collection-link"
+ ng-click="showModal('newCollection')" title="new collection"><i
+ class="pictogram"></i></a> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data new collection')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_new_collection}}"
+ tooltip-placement="right">(?)</a>
+ <ul class="user-list" style="margin-top: 5px;">
+ <li
+ ng-class="queryCollection._type === entity.name ? 'selected' : ''"
+ ng-repeat="entity in collectionList"
+ ng-click="loadCollection('/'+entity.name);"><a
+ id="collection-{{entity.name}}-link" href="javaScript:void(0)">/{{entity.name}}
+ </a></li>
+ </ul>
- </div>
+ </div>
<div class="span9 tab-content">
<div class="content-page">
- <form id="intro-collection-query" name="dataForm" ng-submit="run();">
- <fieldset>
- <div class="control-group">
- <div class="" data-toggle="buttons-radio">
- <!--a class="btn" id="button-query-back">◀ Back</a-->
- <!--Added disabled class to change the way button looks but their functionality is as usual -->
- <label class="control-label" style="display:none"><strong>Method</strong> <a id="query-method-help" href="#" class="help-link">get help</a></label>
- <input type="radio" id="create-rb" name="query-action" style="margin-top: -2px;" ng-click="selectPOST();" ng-checked="verb=='POST'"> CREATE
- <input type="radio" id="read-rb" name="query-action" style="margin-top: -2px;" ng-click="selectGET();" ng-checked="verb=='GET'"> READ
- <input type="radio" id="update-rb" name="query-action" style="margin-top: -2px;" ng-click="selectPUT();" ng-checked="verb=='PUT'"> UPDATE
- <input type="radio" id="delete-rb" name="query-action" style="margin-top: -2px;" ng-click="selectDELETE();" ng-checked="verb=='DELETE'"> DELETE <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data query verbs')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_verb_buttons}}" tooltip-placement="right">(?)</a>
+ <form id="intro-collection-query" name="dataForm"
+ ng-submit="run();">
+ <fieldset>
+ <div class="control-group">
+ <div class="" data-toggle="buttons-radio">
+ <!--a class="btn" id="button-query-back">◀ Back</a-->
+ <!--Added disabled class to change the way button looks but their functionality is as usual -->
+ <label class="control-label" style="display: none"><strong>Method</strong>
+ <a id="query-method-help" href="#" class="help-link">get
+ help</a></label> <input type="radio" id="create-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectPOST();" ng-checked="verb=='POST'">
+ CREATE <input type="radio" id="read-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectGET();" ng-checked="verb=='GET'">
+ READ <input type="radio" id="update-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectPUT();" ng-checked="verb=='PUT'">
+ UPDATE <input type="radio" id="delete-rb"
+ name="query-action" style="margin-top: -2px;"
+ ng-click="selectDELETE();" ng-checked="verb=='DELETE'">
+ DELETE <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data query verbs')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_verb_buttons}}"
+ tooltip-placement="right">(?)</a>
+ </div>
</div>
- </div>
- <div class="control-group">
- <strong>Path </strong>
- <div class="controls">
- <input ng-model="data.queryPath" type="text" ug-validate id="pathDataQuery" ng-attr-title="{{pathRegexDescription}}" ng-pattern="pathRegex" class="span6" autocomplete="off" placeholder="ex: /users" required/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data query path')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_path_box}}" tooltip-placement="right">(?)</a>
+ <div class="control-group">
+ <strong>Path </strong>
+ <div class="controls">
+ <input ng-model="data.queryPath" type="text" ug-validate
+ id="pathDataQuery"
+ ng-attr-title="{{pathRegexDescription}}"
+ ng-pattern="pathRegex" class="span6"
+ autocomplete="off" placeholder="ex: /users" required />
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data query path')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_path_box}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ </div>
+ <div class="control-group">
+ <a id="back-to-collection" class="outside-link"
+ style="display: none">Back to collection</a>
</div>
- </div>
- <div class="control-group">
- <a id="back-to-collection" class="outside-link" style="display:none">Back to collection</a>
- </div>
- <div class="control-group">
- <strong>Query</strong>
- <div class="controls">
- <input ng-model="data.searchString" type="text" class="span6" autocomplete="off" placeholder="ex: select * where name='fred'"/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data query string')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_query_box}}" tooltip-placement="right">(?)</a>
- <div style="display:none">
- <a class="btn dropdown-toggle " data-toggle="dropdown">
- <span id="query-collections-caret" class="caret"></span>
- </a>
- <ul id="query-collections-indexes-list" class="dropdown-menu ">
- </ul>
+ <div class="control-group">
+ <strong>Query</strong>
+ <div class="controls">
+ <input ng-model="data.searchString" type="text"
+ class="span6" autocomplete="off"
+ placeholder="ex: select * where name='fred'" /> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data query string')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_query_box}}"
+ tooltip-placement="right">(?)</a>
+ <div style="display: none">
+ <a class="btn dropdown-toggle " data-toggle="dropdown">
+ <span id="query-collections-caret" class="caret"></span>
+ </a>
+ <ul id="query-collections-indexes-list"
+ class="dropdown-menu ">
+ </ul>
+ </div>
</div>
</div>
- </div>
- <div class="control-group" ng-show="verb=='GET' || verb=='DELETE'">
- <label class="control-label" for="query-limit"><strong>Limit</strong>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data limit')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_limit}}" tooltip-placement="right">(?)</a><a id="query-limit-help" href="#" ng-show="false" class="help-link">get help</a></label>
- <div class="controls">
- <div class="input-append">
- <input ng-model="data.queryLimit" type="text" class="span5" id="query-limit" placeholder="ex: 10">
+ <div class="control-group"
+ ng-show="verb=='GET' || verb=='DELETE'">
+ <label class="control-label" for="query-limit"><strong>Limit</strong>
+ <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data limit')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_limit}}"
+ tooltip-placement="right">(?)</a><a
+ id="query-limit-help" href="#" ng-show="false"
+ class="help-link">get help</a></label>
+ <div class="controls">
+ <div class="input-append">
+ <input ng-model="data.queryLimit" type="text"
+ class="span5" id="query-limit" placeholder="ex: 10">
+ </div>
</div>
</div>
- </div>
- <div class="control-group" style="display:{{queryBodyDisplay}}">
- <label class="control-label" for="query-source"><strong>JSON Body</strong>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data json body')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_json_body}}" tooltip-placement="right">(?)</a> <a id="query-json-help" href="#" ng-show="false" class="help-link">get help</a></label>
- <div class="controls">
- <textarea ng-model="data.queryBody" id="query-source" class="span6 pull-left" rows="4">
+ <div class="control-group"
+ style="display: {{queryBodyDisplay">
+ <label class="control-label" for="query-source"><strong>JSON
+ Body</strong> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data json body')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_json_body}}"
+ tooltip-placement="right">(?)</a> <a
+ id="query-json-help" href="#" ng-show="false"
+ class="help-link">get help</a></label>
+ <div class="controls">
+ <textarea ng-model="data.queryBody" id="query-source"
+ class="span6 pull-left" rows="4">
{ "name":"value" }
</textarea>
- <br>
- <a class="btn pull-left" ng-click="validateJson();">Validate JSON</a>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data validate json')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_json_validate}}" tooltip-placement="right">(?)</a>
+ <br> <a class="btn pull-left"
+ ng-click="validateJson();">Validate JSON</a> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data validate json')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_json_validate}}"
+ tooltip-placement="right">(?)</a>
+ </div>
+ </div>
+ <div style="clear: both; height: 10px;"></div>
+ <div class="control-group">
+ <input type="submit"
+ ng-disabled="!dataForm.$valid || loading"
+ class="btn btn-primary" id="button-query"
+ value="{{loading ? loadingText : 'Run Query'}}" /> <a
+ class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data run query')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_run_query}}"
+ tooltip-placement="right">(?)</a>
</div>
- </div>
- <div style="clear: both; height: 10px;"></div>
- <div class="control-group">
- <input type="submit" ng-disabled="!dataForm.$valid || loading" class="btn btn-primary" id="button-query" value="{{loading ? loadingText : 'Run Query'}}"/>
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data run query')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_run_query}}" tooltip-placement="right">(?)</a>
- </div>
- </fieldset>
- </form>
+ </fieldset>
+ </form>
<div id="intro-entity-list">
- <div ng-include="display=='generic' ? 'data/display-generic.html' : ''"></div>
- <div ng-include="display=='users' ? 'data/display-users.html' : ''"></div>
- <div ng-include="display=='groups' ? 'data/display-groups.html' : ''"></div>
- <div ng-include="display=='roles' ? 'data/display-roles.html' : ''"></div>
+ <div
+ ng-include="display=='generic' ? 'data/display-generic.html' : ''"></div>
+ <div
+ ng-include="display=='users' ? 'data/display-users.html' : ''"></div>
+ <div
+ ng-include="display=='groups' ? 'data/display-groups.html' : ''"></div>
+ <div
+ ng-include="display=='roles' ? 'data/display-roles.html' : ''"></div>
</div>
</div>
- </div>
- </section>
+ </div>
+ </section>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/display-generic.html
----------------------------------------------------------------------
diff --git a/portal/js/data/display-generic.html b/portal/js/data/display-generic.html
index ad699eb..2b23276 100644
--- a/portal/js/data/display-generic.html
+++ b/portal/js/data/display-generic.html
@@ -1,4 +1,9 @@
-<!--
+<bsmodal id="deleteEntities"
+ title="Are you sure you want to delete the entities(s)?"
+ close="hideModal" closelabel="Cancel"
+ extrabutton="deleteEntitiesDialog" extrabuttonlabel="Delete"
+ buttonid="del-entity" ng-cloak>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,98 +19,98 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<bsmodal id="deleteEntities"
- title="Are you sure you want to delete the entities(s)?"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteEntitiesDialog"
- extrabuttonlabel="Delete"
- buttonid="del-entity"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- </div>
- </fieldset>
+<fieldset>
+ <div class="control-group"></div>
+</fieldset>
</bsmodal>
-<span class="button-strip">
- <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data entities list')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_entities_list}}" tooltip-placement="left">(?)</a>
- <button class="btn btn-primary" ng-disabled="!valueSelected(queryCollection._list) || deleteLoading" ng-click="deleteEntitiesDialog()">{{deleteLoading ? loadingText : 'Delete Entity(s)'}}</button>
+<span class="button-strip"> <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data entities list')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_entities_list}}" tooltip-placement="left">(?)</a>
+ <button class="btn btn-primary"
+ ng-disabled="!valueSelected(queryCollection._list) || deleteLoading"
+ ng-click="deleteEntitiesDialog()">{{deleteLoading ?
+ loadingText : 'Delete Entity(s)'}}</button>
</span>
<table class="table table-striped collection-list">
<thead>
- <tr class="table-header">
- <th><input type="checkbox" ng-show="queryCollection._list.length > 0" id="selectAllCheckbox" ng-model="queryBoxesSelected" ng-click="selectAllEntities(queryCollection._list,$parent,'queryBoxesSelected',true)"></th>
- <th ng-if="hasProperty('name')">Name</th>
- <th>UUID</th>
- <th></th>
- </tr>
+ <tr class="table-header">
+ <th><input type="checkbox"
+ ng-show="queryCollection._list.length > 0"
+ id="selectAllCheckbox" ng-model="queryBoxesSelected"
+ ng-click="selectAllEntities(queryCollection._list,$parent,'queryBoxesSelected',true)"></th>
+ <th ng-if="hasProperty('name')">Name</th>
+ <th>UUID</th>
+ <th></th>
+ </tr>
</thead>
<tbody ng-repeat="entity in queryCollection._list">
- <tr class="zebraRows" >
- <td>
- <input
- type="checkbox"
+ <tr class="zebraRows">
+ <td><input type="checkbox"
id="entity-{{entity._data.name}}-cb"
- ng-value="entity._data.uuid"
- ng-model="entity.checked"
- >
- </td>
- <td ng-if="hasProperty('name')">{{entity._data.name}}</td>
- <td>{{entity._data.uuid}}</td>
- <td><a href="javaScript:void(0)" ng-click="entitySelected[$index] = !entitySelected[$index]; selectEntity(entity._data.uuid, entitySelected[$index]);">{{entitySelected[$index] ? 'Hide' : 'View'}} Details</a></td>
- </tr>
- <tr ng-if="entitySelected[$index]">
- <td colspan="5">
-
+ ng-value="entity._data.uuid" ng-model="entity.checked">
+ </td>
+ <td ng-if="hasProperty('name')">{{entity._data.name}}</td>
+ <td>{{entity._data.uuid}}</td>
+ <td><a href="javaScript:void(0)"
+ ng-click="entitySelected[$index] = !entitySelected[$index]; selectEntity(entity._data.uuid, entitySelected[$index]);">{{entitySelected[$index]
+ ? 'Hide' : 'View'}} Details</a></td>
+ </tr>
+ <tr ng-if="entitySelected[$index]">
+ <td colspan="5">
- <h4 style="margin: 0 0 20px 0">Entity Detail</h4>
+ <h4 style="margin: 0 0 20px 0">Entity Detail</h4>
- <ul class="formatted-json">
- <li ng-repeat="(k,v) in entity._data track by $index">
- <span class="key">{{k}} :</span>
- <!--todo - doing manual recursion to get this out the door for launch, please fix-->
- <span ng-switch on="isDeep(v)">
- <ul ng-switch-when="true">
- <li ng-repeat="(k2,v2) in v"><span class="key">{{k2}} :</span>
- <span ng-switch on="isDeep(v2)">
- <ul ng-switch-when="true">
- <li ng-repeat="(k3,v3) in v2"><span class="key">{{k3}} :</span><span class="value">{{v3}}</span></li>
- </ul>
- <span ng-switch-when="false">
- <span class="value">{{v2}}</span>
+ <ul class="formatted-json">
+ <li ng-repeat="(k,v) in entity._data track by $index"><span
+ class="key">{{k}} :</span> <!--todo - doing manual recursion to get this out the door for launch, please fix-->
+ <span ng-switch on="isDeep(v)">
+ <ul ng-switch-when="true">
+ <li ng-repeat="(k2,v2) in v"><span class="key">{{k2}}
+ :</span> <span ng-switch on="isDeep(v2)">
+ <ul ng-switch-when="true">
+ <li ng-repeat="(k3,v3) in v2"><span
+ class="key">{{k3}} :</span><span class="value">{{v3}}</span></li>
+ </ul> <span ng-switch-when="false"> <span
+ class="value">{{v2}}</span>
</span>
- </span>
- </li>
- </ul>
- <span ng-switch-when="false">
- <span class="value">{{v}}</span>
+ </span></li>
+ </ul> <span ng-switch-when="false"> <span class="value">{{v}}</span>
</span>
- </span>
- </li>
- </ul>
+ </span></li>
+ </ul>
- <div class="control-group">
- <h4 style="margin: 20px 0 20px 0">Edit Entity <a class="help_tooltip" ng-mouseover="help.sendTooltipGA('data edit entity')" ng-show="help.helpTooltipsEnabled" href="#" ng-attr-tooltip="{{tooltip_edit_entity}}" tooltip-placement="right">(?)</a></h4>
- <div class="controls">
- <textarea ng-model="entity._json" class="span12" rows="12"></textarea>
- <br>
- <a class="btn btn-primary toolbar pull-left" ng-click="validateJson();">Validate JSON</a><button type="button" class="btn btn-primary pull-right" id="button-query" ng-click="saveEntity(entity);">Save</button>
- </div>
- </div>
- </td>
- </tr>
+ <div class="control-group">
+ <h4 style="margin: 20px 0 20px 0">
+ Edit Entity <a class="help_tooltip"
+ ng-mouseover="help.sendTooltipGA('data edit entity')"
+ ng-show="help.helpTooltipsEnabled" href="#"
+ ng-attr-tooltip="{{tooltip_edit_entity}}"
+ tooltip-placement="right">(?)</a>
+ </h4>
+ <div class="controls">
+ <textarea ng-model="entity._json" class="span12" rows="12"></textarea>
+ <br> <a class="btn btn-primary toolbar pull-left"
+ ng-click="validateJson();">Validate JSON</a>
+ <button type="button" class="btn btn-primary pull-right"
+ id="button-query" ng-click="saveEntity(entity);">Save</button>
+ </div>
+ </div>
+ </td>
+ </tr>
- <tr ng-show="queryCollection._list.length == 0">
- <td colspan="4">No data found</td>
- </tr>
+ <tr ng-show="queryCollection._list.length == 0">
+ <td colspan="4">No data found</td>
+ </tr>
</tbody>
</table>
<div style="padding: 10px 5px 10px 5px">
- <button class="btn btn-primary toolbar" ng-click="getPrevious()" style="display:{{previous_display}}">< Previous</button>
- <button class="btn btn-primary toolbar" ng-click="getNext()" style="display:{{next_display}}; float:right;">Next ></button>
+ <button class="btn btn-primary toolbar" ng-click="getPrevious()"
+ style="display: {{previous_display">< Previous</button>
+ <button class="btn btn-primary toolbar" ng-click="getNext()"
+ style="display: {{next_display">Next ></button>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9454950/portal/js/data/display-roles.html
----------------------------------------------------------------------
diff --git a/portal/js/data/display-roles.html b/portal/js/data/display-roles.html
index c182eb3..24b8468 100644
--- a/portal/js/data/display-roles.html
+++ b/portal/js/data/display-roles.html
@@ -1,3 +1,4 @@
+roles---------------------------------
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,5 +15,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-roles---------------------------------