You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/28 00:22:09 UTC
[51/61] [abbrv] [partial] git commit: updated to latest Angular-based
admin portal
updated to latest Angular-based admin portal
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/508ef2f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/508ef2f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/508ef2f7
Branch: refs/pull/35/merge
Commit: 508ef2f7ac52f1fc22edc9fdaa2e2d0f3ff6f22d
Parents: f0974e7
Author: Rod Simpson <ro...@apigee.com>
Authored: Mon Jan 27 15:24:01 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Mon Jan 27 15:24:01 2014 -0700
----------------------------------------------------------------------
portal/Deployment.md | 23 +
portal/Gruntfile.js | 304 +
portal/LICENSE | 202 -
portal/README.md | 273 +-
portal/UnitTests.md | 24 +
portal/Vagrantfile | 23 -
portal/bower.json | 12 +
portal/build.sh | 28 +
portal/coming_soon.html | 31 -
portal/config.js | 87 +-
portal/css/apigeeGlobalNavigation.css | 274 +
.../css/arsmarquette/ARSMaquettePro-Light.otf | Bin 0 -> 184600 bytes
.../css/arsmarquette/ARSMaquettePro-Medium.otf | Bin 0 -> 188020 bytes
.../css/arsmarquette/ARSMaquettePro-Regular.otf | Bin 0 -> 188096 bytes
.../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin 251 -> 0 bytes
.../images/ui-bg_flat_100_deedf7_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_100_e4f1fb_40x100.png | Bin 213 -> 0 bytes
.../images/ui-bg_flat_100_f2f5f7_40x100.png | Bin 212 -> 0 bytes
.../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin 181 -> 0 bytes
.../images/ui-bg_flat_50_3baae3_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_80_d7ebf9_40x100.png | Bin 183 -> 0 bytes
.../ui-bg_highlight-hard_70_000000_1x100.png | Bin 118 -> 0 bytes
.../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin 153 -> 0 bytes
.../images/ui-icons_000000_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2694e8_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_3d80b3_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_72a7cf_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes
.../css/custom-theme/jquery-ui-1.8.9.custom.css | 573 -
portal/css/entypo/entypo.eot | Bin 0 -> 35540 bytes
portal/css/entypo/entypo.svg | 13 +
portal/css/entypo/entypo.ttf | Bin 0 -> 35392 bytes
portal/css/entypo/entypo.woff | Bin 0 -> 21916 bytes
portal/css/jquery-ui-timepicker.css | 53 -
portal/css/jquery.ui.statusbar.css | 25 -
portal/css/main.css | 1460 +
portal/css/prettify.css | 52 -
portal/css/usergrid.css | 6358 ----
portal/images/android-sdk-download.png | Bin 4848 -> 0 bytes
portal/images/api-activity.gif | Bin 10819 -> 0 bytes
portal/images/apigee-logo.png | Bin 3647 -> 0 bytes
portal/images/apigeetopbar.png | Bin 4658 -> 0 bytes
portal/images/btn-copyCurl-up.png | Bin 2762 -> 0 bytes
portal/images/clippy-bg.png | Bin 561 -> 0 bytes
portal/images/close.gif | Bin 718 -> 0 bytes
portal/images/dotnet-sdk-download.png | Bin 7149 -> 0 bytes
portal/images/down_arrow.png | Bin 1285 -> 0 bytes
portal/images/error.png | Bin 2009 -> 0 bytes
portal/images/faviconApigee.ico | Bin 1150 -> 0 bytes
portal/images/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes
portal/images/glyphicons-halflings.png | Bin 4352 -> 0 bytes
.../glyphicons_halflings_135_wrench-white2.pdn | Bin 5400 -> 0 bytes
.../glyphicons_halflings_135_wrench-white2.png | Bin 296 -> 0 bytes
.../images/glyphicons_halflings_135_wrench.png | Bin 228 -> 0 bytes
.../glyphicons_halflings_135_wrench_white.png | Bin 251 -> 0 bytes
.../glyphicons_halflings_wrench_white.png | Bin 1016 -> 0 bytes
portal/images/grid.png | Bin 166 -> 0 bytes
portal/images/icons.png | Bin 13132 -> 0 bytes
portal/images/ios-sdk-download.png | Bin 4886 -> 0 bytes
portal/images/javascript-sdk-download.png | Bin 4618 -> 0 bytes
portal/images/left_arrow.png | Bin 1257 -> 0 bytes
portal/images/logo-white.png | Bin 2014 -> 0 bytes
portal/images/menuActiveTriangle.png | Bin 315 -> 0 bytes
portal/images/nodejs-sdk-download.png | Bin 5273 -> 0 bytes
portal/images/notice.png | Bin 2112 -> 0 bytes
portal/images/orange-arrow.png | Bin 242 -> 0 bytes
portal/images/right_arrow.png | Bin 1251 -> 0 bytes
portal/images/ruby-sdk-download.png | Bin 6343 -> 0 bytes
portal/images/success.png | Bin 1863 -> 0 bytes
portal/images/swish_arrow.png | Bin 220 -> 0 bytes
portal/images/topbackground.png | Bin 2890 -> 0 bytes
portal/images/up_arrow.png | Bin 1292 -> 0 bytes
portal/images/user-photo.png | Bin 3849 -> 0 bytes
portal/images/user_profile.png | Bin 3775 -> 0 bytes
portal/images/usergrid_200.png | Bin 6397 -> 0 bytes
portal/images/usergrid_400.png | Bin 8746 -> 0 bytes
portal/images/warning.png | Bin 1179 -> 0 bytes
portal/img/appswitcher/apiPlatform_lg.png | Bin 0 -> 2397 bytes
portal/img/appswitcher/appServices_lg.png | Bin 0 -> 2295 bytes
portal/img/appswitcher/console_lg.png | Bin 0 -> 1453 bytes
portal/img/appswitcher/home_lg.png | Bin 0 -> 1522 bytes
portal/img/appswitcher/logo_color.png | Bin 0 -> 3459 bytes
portal/img/appswitcher/max_lg.png | Bin 0 -> 1970 bytes
.../img/appswitcher/triangleMenuItem_right.png | Bin 0 -> 1158 bytes
.../triangleMenuItem_right_hover.png | Bin 0 -> 1169 bytes
portal/img/blue-bars.png | Bin 0 -> 3635 bytes
portal/img/blue-bolt.png | Bin 0 -> 3942 bytes
portal/img/blue-carat.png | Bin 0 -> 1006 bytes
portal/img/green_dot.png | Bin 0 -> 3472 bytes
portal/img/logo.gif | Bin 0 -> 2279 bytes
portal/img/nav-device.gif | Bin 0 -> 2184 bytes
portal/img/nav-sprites.png | Bin 0 -> 7953 bytes
portal/img/no-data1.png | Bin 0 -> 45300 bytes
portal/img/phone-small.gif | Bin 0 -> 1300 bytes
portal/img/push/APNS_cert_upload.png | Bin 0 -> 33956 bytes
portal/img/push/APNS_certification.png | Bin 0 -> 16855 bytes
portal/img/push/android-notification.png | Bin 0 -> 41629 bytes
portal/img/push/google_api_key.png | Bin 0 -> 98118 bytes
portal/img/push/iphone_message.png | Bin 0 -> 90307 bytes
portal/img/push/step_1.png | Bin 0 -> 1953 bytes
portal/img/push/step_2.png | Bin 0 -> 2117 bytes
portal/img/push/step_3.png | Bin 0 -> 2162 bytes
portal/img/red_dot.png | Bin 0 -> 3482 bytes
portal/img/sdk-sprites-large.png | Bin 0 -> 14642 bytes
portal/img/sdk-sprites.png | Bin 0 -> 5027 bytes
portal/img/tablet-small.gif | Bin 0 -> 1390 bytes
portal/img/user-photo.png | Bin 0 -> 3849 bytes
portal/img/user_profile.png | Bin 0 -> 3775 bytes
portal/img/yellow_dot.png | Bin 0 -> 3475 bytes
portal/index.html | 1602 +-
portal/js/activities/activities-controller.js | 11 +
portal/js/activities/activities.html | 33 +
.../js/app-overview/app-overview-controller.js | 76 +
portal/js/app-overview/app-overview.html | 34 +
.../js/app-overview/doc-includes/android.html | 209 +
.../app-overview/doc-includes/images/verify.png | Bin 0 -> 22934 bytes
portal/js/app-overview/doc-includes/ios.html | 173 +
.../app-overview/doc-includes/javascript.html | 94 +
portal/js/app-overview/doc-includes/net.html | 0
portal/js/app-overview/doc-includes/node.html | 0
portal/js/app-overview/doc-includes/ruby.html | 0
.../app-overview/getting-started-controller.js | 90 +
portal/js/app-overview/getting-started.html | 126 +
portal/js/app.js | 125 +
portal/js/app/app.js | 118 -
portal/js/app/console.js | 4536 ---
portal/js/app/helpers.js | 241 -
portal/js/app/navigation.js | 189 -
portal/js/app/pages.js | 154 -
portal/js/app/params.js | 30 -
portal/js/app/quickLogin.js | 30 -
portal/js/app/session.js | 172 -
portal/js/app/sso.js | 89 -
portal/js/app/status.js | 33 -
portal/js/app/ui/collections.entity.js | 320 -
portal/js/app/ui/collections.user.js | 120 -
portal/js/app/ui/ui.js | 415 -
portal/js/app/usergrid.appSDK.js | 2073 --
portal/js/app/usergrid.appSDK.orig.js | 2070 --
portal/js/charts/chart-controller.js | 6 +
portal/js/charts/chart-directives.js | 141 +
portal/js/charts/chart-service.js | 494 +
portal/js/charts/highcharts.json | 329 +
portal/js/charts/sparklines.js | 2 +
portal/js/data/data-controller.js | 304 +
portal/js/data/data.html | 121 +
portal/js/data/display-generic.html | 95 +
portal/js/data/display-groups.html | 0
portal/js/data/display-roles.html | 1 +
portal/js/data/display-users.html | 88 +
portal/js/data/entity-controller.js | 69 +
portal/js/data/entity.html | 31 +
portal/js/data/shell-controller.js | 9 +
portal/js/data/shell.html | 16 +
portal/js/dialogs/balloon-directive.js | 25 +
portal/js/dialogs/modal-directive.js | 41 +
portal/js/dialogs/modal.html | 16 +
portal/js/global/alert-controller.js | 33 +
portal/js/global/alert-directive.js | 40 +
portal/js/global/app-switcher-directive.js | 35 +
portal/js/global/appswitcher-template.html | 34 +
portal/js/global/insecure-banner.html | 7 +
portal/js/global/insecure-banner.js | 46 +
portal/js/global/page-constants.js | 11 +
portal/js/global/page-controller.js | 392 +
portal/js/global/page-service.js | 214 +
portal/js/global/temp.json | 18 +
portal/js/global/ug-service.js | 987 +
portal/js/global/util-directive.js | 24 +
portal/js/global/utility-service.js | 52 +
portal/js/global/validate-directive.js | 40 +
.../js/groups/groups-activities-controller.js | 27 +
portal/js/groups/groups-activities.html | 24 +
portal/js/groups/groups-controller.js | 119 +
portal/js/groups/groups-details-controller.js | 38 +
portal/js/groups/groups-details.html | 28 +
portal/js/groups/groups-members-controller.js | 113 +
portal/js/groups/groups-members.html | 60 +
portal/js/groups/groups-roles-controller.js | 184 +
portal/js/groups/groups-roles.html | 127 +
portal/js/groups/groups-tabs.html | 31 +
portal/js/groups/groups.html | 92 +
portal/js/lib/MD5.min.js | 1 -
portal/js/lib/backbone.js | 1431 -
portal/js/lib/bootstrap.min.js | 7 -
portal/js/lib/date.min.js | 2 -
portal/js/lib/jquery-1.7.2.min.js | 4 -
portal/js/lib/jquery-ui-1.8.18.min.js | 15 -
portal/js/lib/jquery.dataset.min.js | 1 -
portal/js/lib/jquery.dform-0.1.3.min.js | 16 -
portal/js/lib/jquery.jsonp-2.3.1.min.js | 3 -
portal/js/lib/jquery.tmpl.min.js | 10 -
portal/js/lib/jquery.ui.statusbar.min.js | 1 -
portal/js/lib/jquery.ui.timepicker.min.js | 1 -
portal/js/lib/prettify.js | 1477 -
portal/js/lib/underscore-min.js | 5 -
portal/js/libs/Highcharts-2.3.5/index.htm | 79 +
.../js/adapters/mootools-adapter.js | 13 +
.../js/adapters/mootools-adapter.src.js | 328 +
.../js/adapters/prototype-adapter.js | 16 +
.../js/adapters/prototype-adapter.src.js | 385 +
.../libs/Highcharts-2.3.5/js/highcharts-more.js | 35 +
.../Highcharts-2.3.5/js/highcharts-more.src.js | 1581 +
.../js/libs/Highcharts-2.3.5/js/highcharts.js | 250 +
.../libs/Highcharts-2.3.5/js/highcharts.src.js | 15281 ++++++++
.../Highcharts-2.3.5/js/modules/canvas-tools.js | 133 +
.../js/modules/canvas-tools.src.js | 3113 ++
.../js/libs/Highcharts-2.3.5/js/modules/data.js | 14 +
.../Highcharts-2.3.5/js/modules/data.src.js | 512 +
.../Highcharts-2.3.5/js/modules/exporting.js | 23 +
.../js/modules/exporting.src.js | 752 +
.../Highcharts-2.3.5/js/themes/dark-blue.js | 263 +
.../Highcharts-2.3.5/js/themes/dark-green.js | 263 +
.../js/libs/Highcharts-2.3.5/js/themes/gray.js | 262 +
.../js/libs/Highcharts-2.3.5/js/themes/grid.js | 95 +
.../js/libs/Highcharts-2.3.5/js/themes/skies.js | 89 +
portal/js/libs/MD5.min.js | 1 +
portal/js/libs/angular-1.0.5/angular-cookies.js | 183 +
.../libs/angular-1.0.5/angular-cookies.min.js | 7 +
portal/js/libs/angular-1.0.5/angular-loader.js | 276 +
.../js/libs/angular-1.0.5/angular-loader.min.js | 7 +
portal/js/libs/angular-1.0.5/angular-mocks.js | 1886 +
.../js/libs/angular-1.0.5/angular-resource.js | 445 +
.../libs/angular-1.0.5/angular-resource.min.js | 10 +
.../js/libs/angular-1.0.5/angular-sanitize.js | 535 +
.../libs/angular-1.0.5/angular-sanitize.min.js | 13 +
portal/js/libs/angular-1.0.5/angular.js | 14733 ++++++++
portal/js/libs/angular-1.0.5/angular.min.js | 161 +
portal/js/libs/angular-1.0.5/version.txt | 1 +
portal/js/libs/angular-1.1.5/angular-1.1.5.js | 16876 +++++++++
.../js/libs/angular-1.1.5/angular-merge.min.js | 8 +
.../angular-1.1.5/angular-resource-1.1.5.js | 537 +
portal/js/libs/angular-1.2.5/angular-animate.js | 1323 +
.../libs/angular-1.2.5/angular-animate.min.js | 23 +
.../angular-1.2.5/angular-animate.min.js.map | 8 +
portal/js/libs/angular-1.2.5/angular-cookies.js | 202 +
.../libs/angular-1.2.5/angular-cookies.min.js | 8 +
.../angular-1.2.5/angular-cookies.min.js.map | 8 +
portal/js/libs/angular-1.2.5/angular-csp.css | 24 +
portal/js/libs/angular-1.2.5/angular-loader.js | 410 +
.../js/libs/angular-1.2.5/angular-loader.min.js | 9 +
.../angular-1.2.5/angular-loader.min.js.map | 8 +
portal/js/libs/angular-1.2.5/angular-mocks.js | 2116 ++
.../js/libs/angular-1.2.5/angular-resource.js | 565 +
.../libs/angular-1.2.5/angular-resource.min.js | 13 +
.../angular-1.2.5/angular-resource.min.js.map | 8 +
portal/js/libs/angular-1.2.5/angular-route.js | 911 +
.../js/libs/angular-1.2.5/angular-route.min.js | 14 +
.../libs/angular-1.2.5/angular-route.min.js.map | 8 +
.../js/libs/angular-1.2.5/angular-sanitize.js | 622 +
.../libs/angular-1.2.5/angular-sanitize.min.js | 14 +
.../angular-1.2.5/angular-sanitize.min.js.map | 8 +
.../js/libs/angular-1.2.5/angular-scenario.js | 32374 +++++++++++++++++
portal/js/libs/angular-1.2.5/angular-touch.js | 563 +
.../js/libs/angular-1.2.5/angular-touch.min.js | 13 +
.../libs/angular-1.2.5/angular-touch.min.js.map | 8 +
portal/js/libs/angular-1.2.5/angular.js | 20369 +++++++++++
portal/js/libs/angular-1.2.5/angular.min.js | 201 +
portal/js/libs/angular-1.2.5/angular.min.js.map | 8 +
portal/js/libs/angular-1.2.5/errors.json | 1 +
portal/js/libs/angular-1.2.5/version.json | 1 +
portal/js/libs/angular-1.2.5/version.txt | 1 +
.../angularitics-0.8.5-google-analytics.js | 7 +
.../js/libs/angularitics/angularitics-0.8.5.js | 6 +
.../libs/bootstrap/css/bootstrap-responsive.css | 1345 +
.../bootstrap/css/bootstrap-responsive.min.css | 1245 +
portal/js/libs/bootstrap/css/bootstrap.css | 6169 ++++
portal/js/libs/bootstrap/css/bootstrap.min.css | 5469 +++
.../js/libs/bootstrap/custom/css/bootstrap.css | 6315 ++++
.../libs/bootstrap/custom/css/bootstrap.min.css | 874 +
.../custom/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes
.../custom/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes
portal/js/libs/bootstrap/custom/js/bootstrap.js | 2291 ++
.../libs/bootstrap/custom/js/bootstrap.min.js | 7 +
.../img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes
.../libs/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes
portal/js/libs/bootstrap/js/bootstrap.js | 2117 ++
portal/js/libs/bootstrap/js/bootstrap.min.js | 644 +
portal/js/libs/google-viz-api.js | 49 +
portal/js/libs/jquery/jquery-1.9.1.min.js | 5 +
.../js/libs/jquery/jquery-migrate-1.1.1.min.js | 3 +
portal/js/libs/jquery/jquery.sparkline.min.js | 5 +
portal/js/libs/jqueryui/date.min.js | 2 +
.../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin 0 -> 251 bytes
.../images/ui-bg_flat_100_deedf7_40x100.png | Bin 0 -> 182 bytes
.../images/ui-bg_flat_100_e4f1fb_40x100.png | Bin 0 -> 213 bytes
.../images/ui-bg_flat_100_f2f5f7_40x100.png | Bin 0 -> 212 bytes
.../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin 0 -> 181 bytes
.../images/ui-bg_flat_50_3baae3_40x100.png | Bin 0 -> 182 bytes
.../images/ui-bg_flat_80_d7ebf9_40x100.png | Bin 0 -> 183 bytes
.../ui-bg_highlight-hard_70_000000_1x100.png | Bin 0 -> 118 bytes
.../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin 0 -> 153 bytes
.../jqueryui/images/ui-icons_000000_256x240.png | Bin 0 -> 4369 bytes
.../jqueryui/images/ui-icons_2694e8_256x240.png | Bin 0 -> 4369 bytes
.../jqueryui/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes
.../jqueryui/images/ui-icons_3d80b3_256x240.png | Bin 0 -> 4369 bytes
.../jqueryui/images/ui-icons_72a7cf_256x240.png | Bin 0 -> 4369 bytes
.../jqueryui/images/ui-icons_ffffff_256x240.png | Bin 0 -> 4369 bytes
portal/js/libs/jqueryui/jquery-ui-1.8.18.min.js | 15 +
.../js/libs/jqueryui/jquery-ui-1.8.9.custom.css | 573 +
.../js/libs/jqueryui/jquery-ui-timepicker.css | 53 +
.../libs/jqueryui/jquery.ui.timepicker.min.js | 1 +
.../ui-bootstrap-custom-0.3.0.min.js | 1 +
.../ui-bootstrap-custom-tpls-0.3.0.min.js | 1 +
portal/js/libs/usergrid.sdk.js | 2469 ++
portal/js/login/forgot-password-controller.js | 12 +
portal/js/login/forgot-password.html | 5 +
portal/js/login/loading.html | 3 +
portal/js/login/login-controller.js | 83 +
portal/js/login/login.html | 48 +
portal/js/login/logout-controller.js | 10 +
portal/js/login/logout.html | 1 +
portal/js/login/register-controller.js | 36 +
portal/js/login/register.html | 80 +
portal/js/menus/appMenu.html | 41 +
portal/js/menus/menu-directives.js | 434 +
portal/js/menus/orgMenu.html | 13 +
.../js/org-overview/org-overview-controller.js | 86 +
portal/js/org-overview/org-overview.html | 121 +
portal/js/profile/account-controller.js | 18 +
portal/js/profile/account.html | 18 +
portal/js/profile/organizations-controller.js | 73 +
portal/js/profile/organizations.html | 71 +
portal/js/profile/profile-controller.js | 40 +
portal/js/profile/profile.html | 68 +
portal/js/roles/roles-controller.js | 112 +
portal/js/roles/roles-groups-controller.js | 113 +
portal/js/roles/roles-groups.html | 60 +
portal/js/roles/roles-settings-controller.js | 87 +
portal/js/roles/roles-settings.html | 80 +
portal/js/roles/roles-tabs.html | 30 +
portal/js/roles/roles-users-controller.js | 112 +
portal/js/roles/roles-users.html | 59 +
portal/js/roles/roles.html | 91 +
portal/js/shell/shell-controller.js | 216 +
portal/js/shell/shell.html | 25 +
portal/js/spec/client-tests.js | 159 -
portal/js/spec/index.html | 20 -
portal/js/spec/qunit-git.css | 238 -
portal/js/spec/qunit-git.js | 1865 -
portal/js/unit-tests/appSDK-tests.js | 255 -
portal/js/unit-tests/ie-jquery-tests.js | 191 -
portal/js/unit-tests/qunit.css | 231 -
portal/js/unit-tests/qunit.js | 1934 -
portal/js/users/users-activities-controller.js | 40 +
portal/js/users/users-activities.html | 39 +
portal/js/users/users-controller.js | 115 +
portal/js/users/users-graph-controller.js | 67 +
portal/js/users/users-graph.html | 67 +
portal/js/users/users-groups-controller.js | 124 +
portal/js/users/users-groups.html | 67 +
portal/js/users/users-profile-controller.js | 32 +
portal/js/users/users-profile.html | 70 +
portal/js/users/users-roles-controller.js | 138 +
portal/js/users/users-roles.html | 129 +
portal/js/users/users-tabs.html | 3 +
portal/js/users/users.html | 126 +
portal/loading.html | 9 -
portal/package.json | 48 +
portal/planned_outage.html | 48 -
portal/sass/.gitignore | 1 -
portal/sass/config.rb | 25 -
portal/sass/usergrid.scss | 1855 -
portal/scripts/e2e-test.bat | 11 +
portal/scripts/e2e-test.sh | 9 +
portal/scripts/test.bat | 11 +
portal/scripts/test.sh | 9 +
portal/scripts/watchr.rb | 19 +
portal/scripts/web-server.js | 244 +
portal/sdk/usergrid.0.10.4.js | 1402 +
portal/sdk/usergrid.0.10.5.js | 1755 +
portal/sdk/usergrid.0.10.7.js | 2265 ++
portal/server.js | 244 +
portal/service_down.html | 48 -
.../apigee.ui.activities.table_rows.html | 14 -
.../templates/apigee.ui.admins.table_rows.html | 8 -
.../apigee.ui.applications.table_rows.html | 4 -
.../apigee.ui.collection.table_rows.html | 65 -
.../apigee.ui.collections.query.indexes.html | 5 -
.../apigee.ui.collections.table_rows.html | 9 -
.../apigee.ui.collections.user.header.html | 21 -
portal/templates/apigee.ui.curl.detail.html | 11 -
portal/templates/apigee.ui.feed.table_rows.html | 15 -
.../templates/apigee.ui.groups.table_rows.html | 14 -
.../apigee.ui.panels.group.activities.html | 28 -
.../apigee.ui.panels.group.details.html | 97 -
.../apigee.ui.panels.group.memberships.html | 40 -
.../apigee.ui.panels.group.permissions.html | 99 -
.../apigee.ui.panels.role.permissions.html | 58 -
.../templates/apigee.ui.panels.role.users.html | 38 -
.../apigee.ui.panels.user.activities.html | 40 -
.../templates/apigee.ui.panels.user.graph.html | 80 -
.../apigee.ui.panels.user.memberships.html | 40 -
.../apigee.ui.panels.user.permissions.html | 105 -
.../apigee.ui.panels.user.profile.html | 113 -
.../apigee.ui.role.groups.table_rows.html | 44 -
.../templates/apigee.ui.roles.table_rows.html | 15 -
.../templates/apigee.ui.users.table_rows.html | 18 -
portal/templates/test/modalForm2.html | 32 -
portal/test/autocomplete.html | 25 -
portal/test/modalForm.html | 32 -
portal/tests/karma.conf.js | 68 +
portal/tests/protractor/applications.spec.js | 31 +
portal/tests/protractor/data.spec.js | 46 +
portal/tests/protractor/forgotPassword.spec.js | 28 +
portal/tests/protractor/monitoring.spec.js | 15 +
portal/tests/protractor/organization.spec.js | 40 +
portal/tests/protractor/profile.spec.js | 69 +
portal/tests/protractor/push.spec.js | 15 +
portal/tests/protractor/users.spec.js | 49 +
portal/tests/protractor/util.js | 91 +
portal/tests/protractorConf.js | 89 +
portal/tests/selenium/chromedriver | Bin 0 -> 22034760 bytes
.../selenium-server-standalone-2.37.0.jar | Bin 0 -> 34730734 bytes
portal/tests/unit/sample.spec.js | 46 +
stack/pom.xml | 2 +-
417 files changed, 166651 insertions(+), 30356 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/Deployment.md
----------------------------------------------------------------------
diff --git a/portal/Deployment.md b/portal/Deployment.md
new file mode 100644
index 0000000..50c79fe
--- /dev/null
+++ b/portal/Deployment.md
@@ -0,0 +1,23 @@
+## Deploying or Developing
+
+If you are just deploying...
+
+1. install nodejs - http://nodejs.org/download/
+2. install grunt - "sudo npm install grunt-cli -g"
+3. from the root dir, run ./build.sh
+4. this will create a directory in the root called dist, in dist is a zip file appsvc-ui.zip, unzip and deploy to your favorite web server
+
+If you are developing...
+
+1. from the root dir, run ./build.sh;
+2. to monitor and build the performance code => run grunt --gruntfile Perf-Gruntfile.js dev; this will need to continue running in terminal as you are developing
+3. to monitor and build the portal code base => run grunt dev; this will open a browser with http://localhost:3000/index-debug.html
+4. to debug in the browser go to http://localhost:3000/index-debug.html; http://localhost:3000/ will point to the compressed files
+5. if the libraries get out of sync run ./build.sh again and this will run grunt build in the background.
+
+If you want to run the e2e tests
+
+1. from the root directory ./build.sh e2e
+
+
+To version open a terminal and run 'npm version x.x.x' this will add a tag and increment the package.json.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
new file mode 100644
index 0000000..d30fa90
--- /dev/null
+++ b/portal/Gruntfile.js
@@ -0,0 +1,304 @@
+var packageJson = require('./package.json');
+var userGrid = require('./config.js');
+
+var menu = '<ul class="nav nav-list" menu="sideMenu">';
+userGrid.options.menuItems.forEach(function(menuItem){
+ menu += '<li class="option '+ (menuItem.active ? 'active' : '') + '" ng-cloak>';
+ menu += '<a data-ng-href="'+menuItem.path+'"><i class="pictogram">'+menuItem.pic+'</i>'+menuItem.title+'</a>';
+ menuItem.items && menuItem.items.forEach(function(subItem){
+ menu += '<ul class="nav nav-list">';
+ menu += '<li>';
+ menu += '<a data-ng-href="'+subItem.path+'"><i class="pictogram sub">'+subItem.pic+'</i>'+subItem.title+'</a>'
+ menu += '</li>';
+ menu += '</ul>';
+ });
+ menu += '</li>';
+});
+menu += '</ul>';
+
+var mainRefs = "",
+ devRefs = ""
+ ;
+userGrid.options.scriptReferences.main.forEach(function (current) {
+ mainRefs += "<script src='" + current + "'></script>";
+});
+userGrid.options.scriptReferences.dev.forEach(function (current) {
+ devRefs += "<script src='" + current + "'></script>";
+});
+
+var cssRefs = "";
+userGrid.options.cssRefs.forEach(function(css){
+ cssRefs += '<link href="'+css.src+'" rel="stylesheet" id="'+css.id+'"/>';
+});
+
+module.exports = function (grunt) {
+
+ var distPath = 'dist/'+packageJson.packageName,
+ libsFile = 'js/libs/usergrid-libs.min.js',
+ devFile = 'js/usergrid-dev.min.js',
+ devFileIncludes= ['js/**/*.js','!js/libs/**/*.js', '!js/**/*.min.js'],
+ mainFile = 'js/usergrid.min.js',
+ templateFile = 'js/templates.js',
+ distName = packageJson.packageName
+ ;
+ // Project configuration.
+ grunt.initConfig({
+ pkg: grunt.file.readJSON('package.json'),
+
+ uglify: {
+ options: {
+ banner: '/*! <%= pkg.name %>@<%= pkg.version %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
+ },
+ 'usergrid-libs':{
+ options: {
+ mangle: false,
+ compress: {warnings:false},
+ beautify: false
+ },
+ files:{
+ 'js/libs/usergrid-libs.min.js':[
+ 'js/libs/jquery/jquery-1.9.1.min.js',
+ 'js/libs/jquery/jquery-migrate-1.1.1.min.js',
+ 'js/libs/jquery/jquery.sparkline.min.js',
+ 'js/libs/Highcharts-2.3.5/js/highcharts.js',
+ 'js/libs/angular-1.2.5/angular.min.js',
+ 'js/libs/angular-1.2.5/angular-route.min.js',
+ 'js/libs/angular-1.2.5/angular-resource.min.js',
+ 'js/libs/angular-1.2.5/angular-sanitize.min.js',
+ 'js/libs/usergrid.sdk.js',
+ 'js/libs/MD5.min.js',
+ 'bower_components/angularitics/dist/angulartics.min.js',
+ 'bower_components/angularitics/dist/angulartics-google-analytics.min.js',
+ 'js/libs/ui-bootstrap/ui-bootstrap-custom-tpls-0.3.0.min.js',
+ 'js/libs/jqueryui/jquery-ui-1.8.18.min.js',
+ 'js/libs/jqueryui/date.min.js'
+ ]
+ }
+ },
+ 'usergrid-dev': {
+ options: {
+ mangle: false,
+ compress: false,
+ beautify: true,
+ wrap: true
+ },
+ files: {
+ 'js/usergrid-dev.min.js': [
+ 'js/app.js',
+ 'js/**/*.js',
+ '!js/config.js',
+ '!js/libs/**/*.js',
+ '!'+mainFile,
+ '!'+devFile
+ ]
+ }
+ },
+ 'usergrid': {
+ options: {
+ mangle: false,
+ compress: {warnings:false},
+ beautify: false
+ },
+ files: {
+ 'js/usergrid.min.js': [
+ devFile
+ ]
+ }
+ }
+
+ },
+ ngtemplates: {
+ "appservices": {
+ options: {
+ base: 'js/'
+ },
+ src: ['js/**/*.html','!**/index*'],
+ dest: templateFile,
+ options: {
+ url: function(url) { return url.replace('js/', ''); }
+ }
+ }
+ },
+
+ cssmin: {
+ combine: {
+ files: {
+ 'css/dash.min.css': ['css/apigeeGlobalNavigation.css', 'css/main.css']
+ }
+ }
+ },
+ watch: {
+ files: [
+ 'index-template.html',
+ 'css/**/*.css',
+ 'js/**/*.js',
+ 'js/**/*.html',
+ '!tests/',
+ '!archive/',
+ '!css/dash.min.css',
+ '!js/libs/',
+ '!js/*.min.js',
+ '!'+templateFile,
+ '!'+libsFile
+ ],
+ tasks: ['build-dev']
+ },
+ connect: {
+ server: {
+ options: {
+ target: 'http://localhost:3000/index-debug.html', // target url to open
+ open: 'http://localhost:3000/index-debug.html',
+ port: 3000,
+ base: ''
+ }
+ },
+ 'e2e-phantom': {
+ options: {
+ port: 3005,
+ base: distPath
+ }
+ },
+ 'e2e-chrome': {
+ options: {
+ port: 3006,
+ base: distPath
+ }
+ }
+ },
+ karma: {
+ unit: {
+ configFile: 'tests/karma.conf.js',
+ runnerPort: 9999,
+ singleRun: true,
+ browsers: ['PhantomJS']
+ }
+ },
+ protractor: {
+ options: {
+ configFile: "tests/protractorConf.js", // Default config file
+ keepAlive: true, // If false, the grunt process stops when the test fails.
+ noColor: false, // If true, protractor will not use colors in its output.
+ args: {
+ baseUrl:'http://localhost:3005'
+ }
+ },
+ phantom: {
+ options: {
+ args: {
+ // Arguments passed to the command
+ capabilities: {
+ baseUrl:'http://localhost:3005',
+ 'browserName': 'phantomjs'
+ }
+ }
+ }
+ },
+ chrome: {
+ options: {
+ args: {
+ // Arguments passed to the command
+ capabilities: {
+ baseUrl:'http://localhost:3006',
+ 'browserName': 'chrome'
+ }
+ }
+ }
+ }
+ },
+ copy:{
+ main:{
+ files:[
+ // includes files within path
+ {expand: true, src: ['*.html','config.js', '*.ico','js/*.min.js'], dest: distPath, filter: 'isFile'},
+ {expand: true, src: ['sdk/**','css/**','bower_components/**','img/**','js/app-overview/doc-includes/images/**','archive/**','js/libs/**','js/charts/*.json'], dest: distPath}
+
+ ]
+ }
+ },
+ compress: {
+ main: {
+ options: {
+ archive: 'dist/'+distName+'.'+packageJson.version+'.zip'
+ },
+ expand: true,
+ cwd: distPath+'/',
+ src: ['**/*'],
+ dest: distName+'.'+packageJson.version
+ }
+ },
+ clean: {
+ build: ['dist/','js/*.min.js',templateFile]
+ },
+ dom_munger: {
+ main: {
+ options: {
+ append:{selector:'body',html:mainRefs},
+ update: {selector:'#main-script',attribute:'src',value:mainFile}
+
+ },
+ src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
+ dest: 'index.html' //update the dist/index.html (the src index.html is copied there)
+
+ },
+ dev: {
+ options: {
+ append:{selector:'body',html:devRefs},
+ update: {selector:'#main-script',attribute:'src',value:devFile}
+ },
+ src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
+ dest: 'index-debug.html' //update the dist/index.html (the src index.html is copied there)
+ },
+ menu: {
+ options: {
+ append:{selector:'#sideMenu',html:menu}
+ },
+ src: ['index.html','index-debug.html'] //update the dist/index.html (the src index.html is copied there)
+ },
+ css: {
+ options: {
+ append:{selector:'head',html:cssRefs}
+ },
+ src: ['index.html','index-debug.html'] //update the dist/index.html (the src index.html is copied there)
+ }
+ },
+ bower: {
+ install: {
+ options:{
+ cleanup:false,
+ copy:false
+ }
+ }
+ }
+ });
+
+ grunt.loadNpmTasks('grunt-contrib-uglify');
+ grunt.loadNpmTasks('grunt-contrib-cssmin');
+ grunt.loadNpmTasks('grunt-contrib-copy');
+ grunt.loadNpmTasks('grunt-contrib-watch');
+ grunt.loadNpmTasks('grunt-contrib-connect');
+ grunt.loadNpmTasks('grunt-contrib-compress');
+ grunt.loadNpmTasks('grunt-contrib-clean');
+ grunt.loadNpmTasks('grunt-angular-templates');
+ grunt.loadNpmTasks('grunt-bower-task');
+ grunt.loadNpmTasks('grunt-contrib-connect');
+ grunt.loadNpmTasks('grunt-protractor-runner');
+ grunt.loadNpmTasks('grunt-karma');
+ grunt.loadNpmTasks('grunt-dom-munger');
+
+ // Default task(s).
+ grunt.registerTask('dev', ['connect:server', 'watch']);
+
+ grunt.registerTask('validate', ['jshint', 'complexity']);
+
+ grunt.registerTask('build-dev', [ 'ngtemplates','uglify:usergrid-dev','uglify:usergrid', 'cssmin','dom_munger','karma:unit']);
+
+ grunt.registerTask('default', ['build','karma:unit']);
+
+ grunt.registerTask('e2e', ['karma:unit','connect:e2e-phantom','protractor:phantom']);
+ grunt.registerTask('e2e-chrome', ['karma:unit','connect:e2e-chrome','protractor:chrome']);
+
+
+ grunt.registerTask('no-monitoring', ['build','clean:perf','karma:unit','compress']);
+
+ grunt.registerTask('build', ['clean:build','bower:install','ngtemplates', 'uglify','cssmin','dom_munger','copy','compress']);
+};
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/LICENSE
----------------------------------------------------------------------
diff --git a/portal/LICENSE b/portal/LICENSE
deleted file mode 100644
index 246e032..0000000
--- a/portal/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2012 Apigee Corp
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/README.md
----------------------------------------------------------------------
diff --git a/portal/README.md b/portal/README.md
index 2d3de8e..9c9a289 100644
--- a/portal/README.md
+++ b/portal/README.md
@@ -1,137 +1,138 @@
-##Version
-
-Current Version: **0.11.1**
-
-Change log:
-
-<https://github.com/apigee/usergrid-portal/blob/master/changelog.md>
-
-
-##Overview
-This is an open-source Javascript-based console application for Usergrid called the *Admin portal*. The Admin portal is the primary administrative user interface for working with Usergrid.
-
-The Admin portal is available online at <https://apigee.com/usergrid/>. The Admin portal source code is fully open source and forkable. You can easily extend the Admin portal, embed it into your own applications, or inspect the code to learn best practices associated with the Usergrid API.
-
-The Admin portal repo is located here:
-
-<https://github.com/apigee/usergrid-portal>
-
-You can download the Admin portal code here:
-
-* Download as a zip file: <https://github.com/apigee/usergrid-portal/archive/master.zip>
-* Download as a tar.gz file: <https://github.com/apigee/usergrid-portal/archive/master.tar.gz>
-
-To find out more about Apigee App Services, a free, hosted version of Usergrid, see:
-
-<http://apigee.com/about/developers>
-
-To view the Apigee App Services documentation, see:
-
-<http://apigee.com/docs/app_services>
-
-
-##About the Admin portal
-Use the Admin portal for administrative operations, including:
-
-* Create new organizations and applications.
-* View information about the current organization, such as its applications, administrators, and credentials.
+##Overview
+This is an open-source Javascript-based console application for Usergrid called the *admin portal*. The admin portal is the primary administrative user interface for working with Usergrid.
+
+The admin portal source code is fully open source and forkable. You can easily extend the admin portal, embed it into your own applications, or inspect the code to learn best practices associated with the Usergrid API.
+
+The admin portal source is in the Usergrid repo here:
+
+<https://github.com/usergrid/usergrid>
+
+##About the admin portal
+Use the admin portal for administrative operations, including:
+
+* Create new organizations and applications.
+* View information about the current organization, such as its applications, administrators, and credentials.
* Display information about an application, such as its users, groups, collections, and roles.
-* Create and modify roles to manage access to your data.
-* View and modify your data, with full support for users, groups, and custom entities and collections.
-* Generate and access credentials for API access.
-
-
-##Navigating the Admin portal
-
-The Admin portal interface displays a variety of pages that display information and enable you to perform management
-actions. These include:
-
-* Account home
-* Application dashboard
-* Users
-* Groups
-* Roles
-* Activities
-* Collections
-* Analytics
-* Properties
-* Shell
-
-
-You can display any of these pages by clicking its respective item in the left sidebar menu of the Admin portal.
-
-###Account Home
-When you log in to the Admin portal, you are presented with a home page for managing the applications and data for your organization.
-The home page displays:
-
-* Applications associated with the currently selected organization
-* Administrators that are part of that organization
-* API credentials for the organization
-* Activities performed recently by administrators
-* A menu for building, organizing, and managing application content
-
-###Application dashboard
-The Application Dashboard shows a variety of statistical data for the selected application. You can see the activity level, the total number of entities, and other vital statistics for monitoring application health as well as quota limits.
-
-###Users
-The Users page lists the user entities created in the current application. You can add or delete users. You can also edit various properties of a user entity such as the user's name or address.
-
-###Groups
-The Groups page lists the groups created in the current application. You can add or delete groups. You can also edit some properties of a group such as the group's display name.
-
-###Roles
-The Roles page lists the roles defined for the current application. You can add or delete roles. You can also specify and update the permissions for a role.
-
-###Activities
-The Activities page lists the activities posted in an application. You can view when the activity was posted, who posted the activity, and the content of the activity. You can also search for activities by content or actor.
-
-###Collections
-The Collections page lists the collections created in the current application. You can also search for, add, update, or deleted collections.
-
-###Analytics
-Use this page to collect and analyze Usergrid usage data such as the number of times a particular collection has been accessed over a period of time.
-You can specify parameters for data collection, including what data points you'd like to collect, over what time period, and at what resolution.
-When you click the Generate button, the results are displayed in tabular form and graphically in the lower portion of the page.
-
-###Properties
-The Properties page lists the credentials (Client ID and Client Secret) for the current application. You can regenerate credentials for the application from this page.
-
-###Shell
-The Shell page gives you a simple way to get started using the Usergrid API. It provides a command-line environment within your web browser for trying out Usergrid API calls interactively.
-
-##Displaying API calls as cURL commands
-You can display the equivalent cURL syntax for each API call that is made through the Admin portal. The calls are displayed in the console area of any of the following browsers: Chrome, Internet Explorer (in the debugger), Firefox (in Firebug), and Safari.
-For details, see Displaying Usergrid API calls as Curl commands:
-
-<http://apigee.com/docs/usergrid/content/displaying-app-services-api-calls-curl-commands>
-
-More information on cURL can be found here:
-
-<http://curl.haxx.se/>
-
-## Contributing
-We welcome your enhancements!
-
-Like [Usergrid](https://github.com/apigee/usergrid-node-module), the Admin portal is open source and licensed under the Apache License, Version 2.0.
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push your changes to the upstream branch (`git push origin my-new-feature`)
-5. Create new Pull Request (make sure you describe what you did and why your mod is needed)
-
-##More information
-For more information on App Services, Apigee's free hosted version of Usergrid, visit <http://apigee.com/about/developers>.
-
-## Usergrid is open source
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-<http://www.apache.org/licenses/LICENSE-2.0>
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+* Create and modify roles to manage access to your data.
+* View and modify your data, with full support for users, groups, and custom entities and collections.
+* Generate and access credentials for API access.
+
+##Navigating the admin portal
+
+The admin portal interface displays a variety of pages that display information and enable you to perform management
+actions. These include:
+
+* Account home
+* Application dashboard
+* Users
+* Groups
+* Roles
+* Activities
+* Collections
+* Analytics
+* Properties
+* Shell
+
+You can display any of these pages by clicking its respective item in the left sidebar menu of the admin portal.
+
+###Account Home
+When you log in to the admin portal, you are presented with a home page for managing the applications and data for your organization.
+
+The home page displays:
+
+* Applications associated with the currently selected organization
+* Administrators that are part of that organization
+* API credentials for the organization
+* Activities performed recently by administrators
+* A menu for building, organizing, and managing application content
+
+###Application dashboard
+The Application Dashboard shows a variety of statistical data for the selected application. You can see the activity level, the total number of entities, and other vital statistics for monitoring application health as well as quota limits.
+
+###Users
+The Users page lists the user entities created in the current application. You can add or delete users. You can also edit various properties of a user entity such as the user's name or address.
+
+###Groups
+The Groups page lists the groups created in the current application. You can add or delete groups. You can also edit some properties of a group such as the group's display name.
+
+###Roles
+The Roles page lists the roles defined for the current application. You can add or delete roles. You can also specify and update the permissions for a role.
+
+###Activities
+The Activities page lists the activities posted in an application. You can view when the activity was posted, who posted the activity, and the content of the activity. You can also search for activities by content or actor.
+
+###Collections
+The Collections page lists the collections created in the current application. You can also search for, add, update, or deleted collections.
+
+###Analytics
+Use this page to collect and analyze Usergrid usage data such as the number of times a particular collection has been accessed over a period of time.
+You can specify parameters for data collection, including what data points you'd like to collect, over what time period, and at what resolution.
+When you click the Generate button, the results are displayed in tabular form and graphically in the lower portion of the page.
+
+###Properties
+The Properties page lists the credentials (Client ID and Client Secret) for the current application. You can regenerate credentials for the application from this page.
+
+###Shell
+The Shell page gives you a simple way to get started using the Usergrid API. It provides a command-line environment within your web browser for trying out Usergrid API calls interactively.
+
+##Displaying API calls as cURL commands
+You can display the equivalent cURL syntax for each API call that is made through the Admin portal. The calls are displayed in the console area of any of the following browsers: Chrome, Internet Explorer (in the debugger), Firefox (in Firebug), and Safari.
+
+More information on cURL can be found here:
+
+<http://curl.haxx.se/>
+
+You can also use the Usergrid Command Line (ugc) for terminal access to the Usergrid API. ugc provides simplified access to Usergrid. For more about ugc, see the Usergrid repo:
+
+<https://github.com/usergrid/usergrid>
+
+##Deploying or Developing
+
+If you are just deploying:
+
+1. Install Node.js from http://nodejs.org/download/.
+2. Install Grunt with `sudo npm install grunt-cli -g`
+3. From the root directory, run `./build.sh`.
+4. This will create a directory in the root called dist. In dist is a zip file called appsvc-ui.zip. Unzip and deploy to your favorite web server.
+
+If you are developing:
+
+1. From the root directory, run `./build.sh`.
+2. To monitor and build the performance code => run `grunt --gruntfile Perf-Gruntfile.js dev;`. This will need to continue running in terminal as you are developing.
+3. To monitor and build the portal code base => run `grunt dev;`. This will open a browser with http://localhost:3000/index-debug.html.
+4. To debug in the browser go to http://localhost:3000/index-debug.html; http://localhost:3000/ will point to the compressed files.
+5. If the libraries get out of sync, run `./build.sh` again and this will run grunt build in the background.
+
+If you want to run the e2e tests:
+
+- From the root directory, run `./build.sh e2e`.
+
+
+To version open a terminal and run 'npm version x.x.x' this will add a tag and increment the package.json.
+
+##Unit Tests
+[Unit Tests](UnitTests.md)
+
+## Contributing
+We welcome your enhancements!
+
+Like [Usergrid](https://github.com/apigee/usergrid-node-module), the admin portal is open source and licensed under the Apache License, Version 2.0.
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push your changes to the upstream branch (`git push origin my-new-feature`)
+5. Create new Pull Request (make sure you describe what you did and why your mod is needed)
+
+## Usergrid is open source
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/UnitTests.md
----------------------------------------------------------------------
diff --git a/portal/UnitTests.md b/portal/UnitTests.md
new file mode 100644
index 0000000..082093b
--- /dev/null
+++ b/portal/UnitTests.md
@@ -0,0 +1,24 @@
+## Running the tests
+Before running the tests you will need to run the following steps.
+
+1. install nodejs - http://nodejs.org/download/
+
+2. install grunt - "sudo npm install grunt-cli -g"
+
+3. install karma - "sudo npm install karma -g"
+
+4. install protractor - "sudo npm install protractor -g"
+
+5. in terminal navigate to the root directory of git repo for the Usergrid Admin Portal
+
+6. run npm install in your terminal - "npm install"
+
+7. run grunt in your terminal - "grunt", this will also run the tests, if you want to run the tests independently follow the next steps
+
+8. run karma in your terminal - "karma start tests/karma.conf.js"
+
+9. this will open a browser window where you can debug
+
+10. if you want to run the e2e tests open a terminal, navigate to the root and run "protractor ./tests/protractorConf.js"
+
+for more info see http://karma-runner.github.io/0.10/index.html or https://github.com/angular/protractor
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/Vagrantfile
----------------------------------------------------------------------
diff --git a/portal/Vagrantfile b/portal/Vagrantfile
deleted file mode 100644
index 72b44da..0000000
--- a/portal/Vagrantfile
+++ /dev/null
@@ -1,23 +0,0 @@
-Vagrant::Config.run do |config|
- puppet_dir = ".puppet"
-
- config.vm.box = "precise64"
- config.vm.box_url = "http://files.vagrantup.com/precise64.box"
- config.vm.host_name = "usergrid.dev"
- config.vm.network :hostonly, "10.10.4.22"
- config.vm.share_folder "templates", "/tmp/vagrant-puppet/templates", File.join(puppet_dir, "templates")
-
- config.vm.provision :shell, :path => File.join(puppet_dir, "bootstrap.sh")
-
- config.vm.provision :puppet do |puppet|
- puppet.module_path = File.join(puppet_dir, "modules")
- puppet.manifests_path = File.join(puppet_dir, "manifests")
- puppet.manifest_file = "main.pp"
-
- puppet.options = [
- "--templatedir", "/tmp/vagrant-puppet/templates",
- "--verbose",
- "--debug"
- ]
- end
-end
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/bower.json
----------------------------------------------------------------------
diff --git a/portal/bower.json b/portal/bower.json
new file mode 100644
index 0000000..862eadc
--- /dev/null
+++ b/portal/bower.json
@@ -0,0 +1,12 @@
+{
+ "name": "usergrid-portal",
+ "version": "2.0.12",
+ "ignore": [],
+ "dependencies": {
+ "angularitics": "~0.8.7"
+ },
+ "devDependencies": {},
+ "keywords": [
+ "usergrid"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/build.sh
----------------------------------------------------------------------
diff --git a/portal/build.sh b/portal/build.sh
new file mode 100755
index 0000000..0c1107d
--- /dev/null
+++ b/portal/build.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+buildMain(){
+ echo #####
+ echo grunt --gruntfile Gruntfile.js $1
+ echo #####
+ ./node_modules/grunt-cli/bin/grunt --gruntfile Gruntfile.js $1
+}
+
+
+npm install
+
+case "$1" in
+e2e) buildMain
+ ./node_modules/grunt-cli/bin/grunt --gruntfile Gruntfile.js $1
+ ;;
+dev) buildMain
+ ./node_modules/grunt-cli/bin/grunt --gruntfile Gruntfile.js $1
+ ;;
+*) echo "pass e2e to run e2e tests"
+ buildMain
+ ;;
+esac
+
+echo ####
+echo zip has been delivered to ./dist/
+
+
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/coming_soon.html
----------------------------------------------------------------------
diff --git a/portal/coming_soon.html b/portal/coming_soon.html
deleted file mode 100644
index ae609d3..0000000
--- a/portal/coming_soon.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<body>
-<div id="fullContainer">
- <div class="navbar navbar-fixed-top">
- <h1 class="apigee"><a href="https://apigee.com" target="_blank"><img src="images/apigee-logo.png">apigee</a></h1>
- <h2 id="ActualPage1">App Services Admin Portal</h2>
- <ul id="loginMenu" class="nav secondary-nav">
- <li><a id="login-link" href="#"><i class="icon-user"></i> Login</a></li>
- <li><a id="signup-link" href="#">Sign Up</a></li>
- <li><a id="forgot-password-link" href="#"><i class="icon-lock"></i> Forgot Password</a></li>
- </ul>
- </div>
- <div id="coming_soon">
- <div class="huge">
- Coming Soon
- </div>
- <br />
- <div class="bigbig">
- Thanks for checking us out, we're almost ready!
- </div>
- <div class="big">
- Find out more about App Services <a href="#"><strong>here</strong></a>
- </div>
- </div>
- <footer>
- <div class="container-fluid">
- <span id="copyright" class="pull-right">© 2012 Apigee Corp. All rights reserved.</span>
- </div>
- </footer>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/config.js
----------------------------------------------------------------------
diff --git a/portal/config.js b/portal/config.js
index bcd2028..d48c0b8 100644
--- a/portal/config.js
+++ b/portal/config.js
@@ -1,2 +1,87 @@
var Usergrid = Usergrid || {};
-//Usergrid.apiUrl = 'http://localhost:8080/'; //notice trailing slash
\ No newline at end of file
+
+Usergrid.showNotifcations = true;
+
+// used only if hostname does not match a real server name
+Usergrid.overrideUrl = 'https://api.usergrid.com/';
+
+Usergrid.options = {
+ client:{
+ // apiKey:'123456'
+ },
+ cssRefs:[],
+ "scriptReferences":{
+ "dev":[],
+ "main": []
+ },
+ menuItems:[
+ {path:'#!/org-overview', active:true,pic:'📁',title:'Org Overview'},
+ {path:'#!/getting-started/setup',pic:'🚀',title:'Getting Started'},
+ {path:'#!/app-overview/summary',pic:'',title:'App Overview',
+ items:[
+ {path:'#!/app-overview/summary',pic:'📱',title:'Summary'}
+ ]
+ },
+ {
+ path:'#!/users',pic:'',title:'Users',
+ items:[
+ {path:'#!/users',pic:'👤',title:'Users'},
+ {path:'#!/groups',pic:'👥',title:'Groups'},
+ {path:'#!/roles',pic:'',title:'Roles'}
+ ]
+ },
+ {
+ path:'#!/data',pic:'📸',title:'Data',
+ items:[
+ {path:'#!/data',pic:'📾',title:'Collections'}
+ ]
+ },
+ {
+ path:'#!/activities',pic:'',title:'Activities'
+ },
+ {
+ path:'#!/configure/default-configs',pic:'⚒',title:'Configure',
+ items:[
+ {path:'#!/configure/default-configs',pic:'📖',title:'Default Configs'},
+ {path:'#!/configure/beta-configs',pic:'',title:'Beta Testing Configs'},
+ {path:'#!/configure/ab-configs',pic:'',title:'A/B Configs'}
+ ]
+ },
+ {path:'#!/shell',pic:'⌨',title:'Shell'}
+ ]
+};
+
+Usergrid.regex = {
+ appNameRegex: new RegExp("^[0-9a-zA-Z.-]{3,25}$"),
+ usernameRegex: new RegExp("^[0-9a-zA-Z\.\_-]{4,25}$"),
+ nameRegex: new RegExp("^([0-9a-zA-Z@#$%^&!?;:.,'\"~*-:+_\[\\](){}/\\ |]{3,60})+$"),
+ roleNameRegex: new RegExp("^([0-9a-zA-Z./-]{3,25})+$"),
+ emailRegex: new RegExp("^(([0-9a-zA-Z]+[_\+.-]?)+@[0-9a-zA-Z]+[0-9,a-z,A-Z,.,-]*(.){1}[a-zA-Z]{2,4})+$"),
+ passwordRegex: new RegExp("^([0-9a-zA-Z@#$%^&!?<>;:.,'\"~*-:+_\[\\](){}/\\ |]{6,25})+$"),
+ pathRegex: new RegExp("^/[a-zA-Z0-9\.\*_~-]+(\/[a-zA-Z0-9\.\*_~-]+)*$"),
+ titleRegex: new RegExp("[a-zA-Z0-9.!-?]+[\/]?"),
+ urlRegex: new RegExp("^(http?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$"),
+ zipRegex: new RegExp("^[0-9]{5}(?:-[0-9]{4})?$"),
+ countryRegex: new RegExp("^[A-Za-z ]{3,100}$"),
+ stateRegex: new RegExp("^[A-Za-z ]{2,100}$"),
+ collectionNameRegex: new RegExp("^[0-9a-zA-Z_.]{3,25}$"),
+ appNameRegexDescription: "This field only allows : A-Z, a-z, 0-9, dot, and dash and must be between 3-25 characters.",
+ usernameRegexDescription: "This field only allows : A-Z, a-z, 0-9, dot, underscore and dash. Must be between 4 and 15 characters.",
+ nameRegexDescription: "Please enter a valid name. Must be betwee 3 and 60 characters.",
+ roleNameRegexDescription: "Role only allows : /, a-z, 0-9, dot, and dash. Must be between 3 and 25 characters.",
+ emailRegexDescription: "Please enter a valid email.",
+ passwordRegexDescription: "Please enter a valid password between 6 and 25 characters.",
+ pathRegexDescription: "Path must begin with a slash, path only allows: /, a-z, 0-9, dot, and dash, paths of the format: /path/ or /path//path are not allowed",
+ titleRegexDescription: "Please enter a valid title.",
+ urlRegexDescription: "Please enter a valid url",
+ zipRegexDescription: "Please enter a valid zip code.",
+ countryRegexDescription: "Sorry only alphabetical characters or spaces are allowed. Must be between 3-100 characters.",
+ stateRegexDescription: "Sorry only alphabetical characters or spaces are allowed. Must be between 2-100 characters.",
+ collectionNameRegexDescription: "Collection name only allows : a-z A-Z 0-9. Must be between 3-25 characters."
+};
+
+try{
+ if(module && module.exports){
+ module.exports = Usergrid;
+ }
+}catch(e){}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/apigeeGlobalNavigation.css
----------------------------------------------------------------------
diff --git a/portal/css/apigeeGlobalNavigation.css b/portal/css/apigeeGlobalNavigation.css
new file mode 100644
index 0000000..88673d0
--- /dev/null
+++ b/portal/css/apigeeGlobalNavigation.css
@@ -0,0 +1,274 @@
+
+.dropdown {
+ position: relative;
+}
+.dropdown-toggle {
+ *margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+ outline: 0;
+}
+.caret {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ vertical-align: top;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000000;
+ opacity: 0.3;
+ filter: alpha(opacity=30);
+ content: "";
+}
+.dropdown .caret {
+ margin-top: 8px;
+ margin-left: 2px;
+}
+.dropdown:hover .caret,
+.open.dropdown .caret {
+ opacity: 1;
+ filter: alpha(opacity=100);
+}
+.dropdown-menu {
+ position: absolute;
+ top: 100%;
+ left: 0;
+ z-index: 1000;
+ float: left;
+ display: none;
+ min-width: 160px;
+ padding: 4px 0;
+ margin: 0;
+ list-style: none;
+ background-color: #ffffff;
+ border-color: #ccc;
+ border-color: rgba(0, 0, 0, 0.2);
+ border-style: solid;
+ border-width: 1px;
+ -webkit-border-radius: 0 0 5px 5px;
+ -moz-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding;
+ background-clip: padding-box;
+ *border-right-width: 2px;
+ *border-bottom-width: 2px;
+}
+.dropdown-menu.pull-right {
+ right: 0;
+ left: auto;
+}
+.dropdown-menu .divider {
+ height: 1px;
+ margin: 8px 1px;
+ overflow: hidden;
+ background-color: #e5e5e5;
+ border-bottom: 1px solid #ffffff;
+ *width: 100%;
+ *margin: -5px 0 5px;
+}
+.dropdown-menu a {
+ display: block;
+ padding: 3px 15px;
+ clear: both;
+ font-weight: normal;
+ line-height: 18px;
+ color: #333333;
+ white-space: nowrap;
+}
+.dropdown-menu li > a:hover,
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ background-color: #0088cc;
+}
+.dropdown.open {
+ *z-index: 1000;
+}
+.dropdown.open .dropdown-toggle {
+ color: #ffffff;
+ background: #ccc;
+ background: rgba(0, 0, 0, 0.3);
+}
+.dropdown.open .dropdown-menu {
+ display: block;
+}
+.pull-right .dropdown-menu {
+ left: auto;
+ right: 0;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+ border-top: 0;
+ border-bottom: 4px solid #000000;
+ content: "\2191";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+ top: auto;
+ bottom: 100%;
+ margin-bottom: 1px;
+}
+
+.dropdownContainingSubmenu .dropdown-menu {
+ padding: 0;
+ margin-top: -4px;
+ min-width: auto;
+ background-color: #ffffff;
+ -webkit-border-radius: 0 0 0 0;
+ -moz-border-radius: 0 0 0 0;
+ border-radius: 0 0 0 0;
+ -webkit-box-shadow: 4px 4px 16px rgba(0, 0, 0, 0.25);
+ -moz-box-shadow: 4px 4px 16px rgba(0, 0, 0, 0.25);
+ box-shadow: 4px 4px 16px rgba(0, 0, 0, 0.25);
+ border-width: 1px;
+ border-top-width: 4px;
+ border-color: #bb2d16;
+}
+.dropdownContainingSubmenu .dropdown-menu a {
+ color: #494949;
+ padding: 7px 10px;
+}
+.dropdownContainingSubmenu .dropdown-menu a:hover {
+ color: #ffffff;
+ background-color: #f03800;
+}
+.dropdownContainingSubmenu .dropdown-menu .nav-header {
+ background-color: #f0f0f0;
+ margin-top: 0;
+ padding-left: 10px;
+}
+.dropdownContainingSubmenu .dropdown-menu .divider {
+ margin: 0;
+}
+.navbar .dropdown-menu:before {
+ content: normal;
+}
+.navbar .dropdown-menu:after {
+ content: normal;
+}
+/*#E02E01;*/
+#globalNav {
+ margin-left: 20px;
+ background-color: transparent;
+}
+#globalNav .dropdown-toggle {
+ border-radius: 3px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ margin-top: 7.5px;
+ margin-bottom: 7.5px;
+}
+#globalNav .dropdown-toggle :hover {
+ background-color: transparent;
+}
+#globalNav.active .caret {
+ opacity: .7;
+}
+#globalNav.active :hover .caret {
+ opacity: 1;
+}
+
+#globalNav ul ul a {
+ border-left: 1px solid #bb2d16;
+}
+#globalNav ul ul li {
+ position: relative;
+}
+#globalNav ul ul li:first-child {
+ border-bottom: 1px solid #bb2d16;
+}
+#globalNav ul ul a:before {
+ content: "";
+ width: 6px;
+ height: 32px;
+ position: absolute;
+ left: -6px;
+ top: 0;
+}
+#globalNav ul ul .active a:hover:before,
+#globalNav ul ul .active a:before {
+ background-image: url('images/triangleMenuItem_right.png');
+}
+#globalNav ul ul:hover a:before {
+ background-image: none;
+}
+#globalNav ul ul a:hover:before {
+ background-image: url('images/triangleMenuItem_right_hover.png');
+}
+#globalNav ul ul li a:hover {
+ border-color: transparent;
+}
+#globalNav .dropdown-menu {
+ width: 400px;
+}
+#globalNavDetail {
+ padding: 20px 10px 0 10px;
+ width: 250px;
+ height: 100%;
+ position: relative;
+ top: 0;
+}
+#globalNavDetail > div {
+ display: none;
+ color: graytext;
+ background-image: none;
+ background-repeat: no-repeat;
+ background-position: 0 0;
+ min-height: 64px;
+}
+#globalNavDetail > div.open {
+ display: inline-block;
+}
+#globalNavDetail > div .globalNavDetailApigeeLogo,
+#globalNavDetail > div .globalNavDetailSubtitle,
+#globalNavDetail > div .globalNavDetailTitle,
+#globalNavDetail > div .globalNavDetailDescription {
+ margin-left: 80px;
+}
+#globalNavDetail > div .globalNavDetailSubtitle {
+ font-size: 10px;
+ text-transform: uppercase;
+}
+#globalNavDetail > div .globalNavDetailTitle {
+ margin-top: 5px;
+ font-size: 20px;
+}
+#globalNavDetail > div .globalNavDetailDescription {
+ margin-top: 10px;
+ line-height: 17px;
+ font-style: oblique;
+}
+#globalNavDetail #globalNavDetailApigeeHome {
+ margin-top: -10px;
+ background-image: url('img/appswitcher/home_lg.png');
+}
+#globalNavDetail #globalNavDetailApigeeHome .globalNavDetailApigeeLogo {
+ margin-top: 10px;
+ background-image: url('img/appswitcher/logo_color.png');
+ width: 116px;
+ height: 40px;
+}
+#globalNavDetail #globalNavDetailAppServices {
+ background-image: url('img/appswitcher/appServices_lg.png');
+}
+#globalNavDetail #globalNavDetailApiPlatform {
+ background-image: url('img/appswitcher/apiPlatform_lg.png');
+}
+#globalNavDetail #globalNavDetailMobileAnalytics {
+ background-image: url('img/appswitcher/max_lg.png');
+}
+#globalNavDetail #globalNavDetailApiConsoles {
+ background-image: url('img/appswitcher/console_lg.png');
+}
+#globalNavSubmenuContainer {
+ float: right;
+}
+#globalNavSubmenuContainer ul {
+ margin-left: 0;
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/arsmarquette/ARSMaquettePro-Light.otf
----------------------------------------------------------------------
diff --git a/portal/css/arsmarquette/ARSMaquettePro-Light.otf b/portal/css/arsmarquette/ARSMaquettePro-Light.otf
new file mode 100644
index 0000000..afd066d
Binary files /dev/null and b/portal/css/arsmarquette/ARSMaquettePro-Light.otf differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/arsmarquette/ARSMaquettePro-Medium.otf
----------------------------------------------------------------------
diff --git a/portal/css/arsmarquette/ARSMaquettePro-Medium.otf b/portal/css/arsmarquette/ARSMaquettePro-Medium.otf
new file mode 100644
index 0000000..052dad8
Binary files /dev/null and b/portal/css/arsmarquette/ARSMaquettePro-Medium.otf differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/arsmarquette/ARSMaquettePro-Regular.otf
----------------------------------------------------------------------
diff --git a/portal/css/arsmarquette/ARSMaquettePro-Regular.otf b/portal/css/arsmarquette/ARSMaquettePro-Regular.otf
new file mode 100644
index 0000000..c738638
Binary files /dev/null and b/portal/css/arsmarquette/ARSMaquettePro-Regular.otf differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/portal/css/custom-theme/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
deleted file mode 100755
index 6348115..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_flat_100_deedf7_40x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_flat_100_deedf7_40x100.png b/portal/css/custom-theme/images/ui-bg_flat_100_deedf7_40x100.png
deleted file mode 100755
index 85aaedf..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_flat_100_deedf7_40x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_flat_100_e4f1fb_40x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_flat_100_e4f1fb_40x100.png b/portal/css/custom-theme/images/ui-bg_flat_100_e4f1fb_40x100.png
deleted file mode 100755
index 5a501f8..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_flat_100_e4f1fb_40x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_flat_100_f2f5f7_40x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_flat_100_f2f5f7_40x100.png b/portal/css/custom-theme/images/ui-bg_flat_100_f2f5f7_40x100.png
deleted file mode 100755
index f0d20dd..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_flat_100_f2f5f7_40x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_flat_15_cd0a0a_40x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_flat_15_cd0a0a_40x100.png b/portal/css/custom-theme/images/ui-bg_flat_15_cd0a0a_40x100.png
deleted file mode 100755
index 7680b54..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_flat_15_cd0a0a_40x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_flat_50_3baae3_40x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_flat_50_3baae3_40x100.png b/portal/css/custom-theme/images/ui-bg_flat_50_3baae3_40x100.png
deleted file mode 100755
index a966891..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_flat_50_3baae3_40x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_flat_80_d7ebf9_40x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_flat_80_d7ebf9_40x100.png b/portal/css/custom-theme/images/ui-bg_flat_80_d7ebf9_40x100.png
deleted file mode 100755
index 3f3d137..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_flat_80_d7ebf9_40x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_highlight-hard_70_000000_1x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_highlight-hard_70_000000_1x100.png b/portal/css/custom-theme/images/ui-bg_highlight-hard_70_000000_1x100.png
deleted file mode 100755
index d588297..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_highlight-hard_70_000000_1x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/portal/css/custom-theme/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
deleted file mode 100755
index 54aff0c..0000000
Binary files a/portal/css/custom-theme/images/ui-bg_highlight-soft_25_ffef8f_1x100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-icons_000000_256x240.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-icons_000000_256x240.png b/portal/css/custom-theme/images/ui-icons_000000_256x240.png
deleted file mode 100644
index 7c211aa..0000000
Binary files a/portal/css/custom-theme/images/ui-icons_000000_256x240.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-icons_2694e8_256x240.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-icons_2694e8_256x240.png b/portal/css/custom-theme/images/ui-icons_2694e8_256x240.png
deleted file mode 100755
index e62b8f7..0000000
Binary files a/portal/css/custom-theme/images/ui-icons_2694e8_256x240.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-icons_2e83ff_256x240.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-icons_2e83ff_256x240.png b/portal/css/custom-theme/images/ui-icons_2e83ff_256x240.png
deleted file mode 100755
index 09d1cdc..0000000
Binary files a/portal/css/custom-theme/images/ui-icons_2e83ff_256x240.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-icons_3d80b3_256x240.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-icons_3d80b3_256x240.png b/portal/css/custom-theme/images/ui-icons_3d80b3_256x240.png
deleted file mode 100755
index 52c3cc6..0000000
Binary files a/portal/css/custom-theme/images/ui-icons_3d80b3_256x240.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-icons_72a7cf_256x240.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-icons_72a7cf_256x240.png b/portal/css/custom-theme/images/ui-icons_72a7cf_256x240.png
deleted file mode 100755
index 0d20b73..0000000
Binary files a/portal/css/custom-theme/images/ui-icons_72a7cf_256x240.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/508ef2f7/portal/css/custom-theme/images/ui-icons_ffffff_256x240.png
----------------------------------------------------------------------
diff --git a/portal/css/custom-theme/images/ui-icons_ffffff_256x240.png b/portal/css/custom-theme/images/ui-icons_ffffff_256x240.png
deleted file mode 100755
index 42f8f99..0000000
Binary files a/portal/css/custom-theme/images/ui-icons_ffffff_256x240.png and /dev/null differ