You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/04/01 10:39:28 UTC
git commit: Added Apache License Header to
org.apache.stratos.manager.console component's hbs files
Repository: incubator-stratos
Updated Branches:
refs/heads/master f9a30f7db -> fa893ee92
Added Apache License Header to org.apache.stratos.manager.console component's hbs files
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fa893ee9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fa893ee9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fa893ee9
Branch: refs/heads/master
Commit: fa893ee920da72bd46aa17567ebfbb10ae1d6652
Parents: f9a30f7
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Tue Apr 1 14:08:45 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Tue Apr 1 14:08:45 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme1/pages/index.hbs | 21 +
.../console/themes/theme1/pages/plain.hbs | 21 +
.../console/themes/theme1/partials/404.hbs | 21 +
.../themes/theme1/partials/cartridge_info.hbs | 227 ++++---
.../themes/theme1/partials/cartridges.hbs | 61 +-
.../theme1/partials/configure_stratos.hbs | 21 +
.../partials/configure_stratos_wizard.hbs | 21 +
.../themes/theme1/partials/dashboard.hbs | 23 +-
.../themes/theme1/partials/error_page.hbs | 21 +
.../console/themes/theme1/partials/header.hbs | 657 ++++++++++---------
.../console/themes/theme1/partials/login.hbs | 69 +-
.../themes/theme1/partials/mycartridges.hbs | 59 +-
.../theme1/partials/subscribe_cartridge.hbs | 423 ++++++------
.../theme1/partials/tenant_management.hbs | 23 +-
.../themes/theme1/partials/tenant_new.hbs | 23 +-
.../console/themes/theme1/partials/title.hbs | 23 +-
16 files changed, 1025 insertions(+), 689 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
index 5fdf4cf..7afe0cc 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<!DOCTYPE html>
<!--[if lt IE 7]>
<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs
index 16c7783..d2c5dad 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<!DOCTYPE html>
<!--[if lt IE 7]>
<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs
index 19d4c06..8cd05a0 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<div class="top-blue-strip"></div>
<style>
body {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
index 3a17e79..587c12d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
@@ -1,103 +1,124 @@
-<div class="container content-starter">
- <div class="row">
- <div class="col-lg-12">
- <h1><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i> {{cartridgeInfo.cartridgeAlias}}-<span>({{cartridgeInfo.displayName}} - {{cartridgeInfo.version}})</span></h1>
- </div>
- </div>
-</div>
-
-<div class="container">
-<div class="row">
- <div class="col-lg-12">
-
- <div style="margin-bottom:20px;">{{cartridgeInfo.description}}</div>
-
- <div class="data-title">Access URLs:</div>
- {{#each cartridgeInfo.portMappings}}
- <div>
- <a target="_blank" href="{{protocol}}://{{../cartridgeInfo.hostName}}:{{proxyPort}}">{{protocol}}://{{../cartridgeInfo.hostName}}:{{proxyPort}}</a>
- </div>
- {{/each}}
-
- <div class="data-title">ActiveInstances:</div>
- <div>{{cartridgeInfo.activeInstances}}</div>
-
- <div class="data-title">CartridgeAlias:</div>
- <div>{{cartridgeInfo.cartridgeAlias}}</div>
-
- <div class="data-title">CartridgeType:</div>
- <div>{{cartridgeInfo.cartridgeType}}</div>
-
- <div class="data-title">HostName:</div>
- <div>{{cartridgeInfo.hostName}}</div>
-
- <div class="data-title">Version:</div>
- <div>{{cartridgeInfo.version}}</div>
-
- <div class="data-title">Tenancy Model:</div>
- {{#if cartridgeInfo.multiTenant}}
- <div>true</div>
-
- {{else}}
- <div>false</div>
- {{/if}}
-
-
- <div class="data-title">Provider:</div>
- <div>{{cartridgeInfo.provider}}</div>
-
- {{#if cartridgeInfo.repoURL }}
- <div class="data-title">RepoURL</div>
- <div>{{cartridgeInfo.repoURL}}</div>
- {{/if}}
-
- {{#ifCond cartridgeInfo.provider "==" "data"}}
-
- <div class="data-title">UserName</div>
- <div>{{cartridgeInfo.dbUserName}}</div>
-
- <div class="data-title">Password</div>
- <div>{{cartridgeInfo.password}}</div>
-
- {{/ifCond}}
- {{#if clusterinfo.member}}
- <div class="data-title">Members Private ip(s):</div>
- <div>
- {{#each clusterinfo.member}}
- {{memberIp}}
- {{/each}}
- </div>
-
- <div class="data-title">Members Public ip(s):</div>
- <div>
- {{#each clusterinfo.member}}
- {{memberPublicIp}}
- {{/each}}
- </div>
-
- {{/if}}
-
- {{#if lbclusterinfo.member}}
- <div class="data-title">LB Private ip:</div>
- <div>
- {{#each lbclusterinfo.member}}
- {{memberIp}};
- {{/each}}
- </div>
-
- <div class="data-title">LB Public ip:</div>
- <div>
- {{#each lbclusterinfo.member}}
- {{memberPublicIp}};
- {{/each}}
- </div>
-
- {{/if}}
-
- <div>
- </div>
-
-
- </div>
-</div>
-</div>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i> {{cartridgeInfo.cartridgeAlias}}-<span>({{cartridgeInfo.displayName}} - {{cartridgeInfo.version}})</span></h1>
+ </div>
+ </div>
+</div>
+
+<div class="container">
+<div class="row">
+ <div class="col-lg-12">
+
+ <div style="margin-bottom:20px;">{{cartridgeInfo.description}}</div>
+
+ <div class="data-title">Access URLs:</div>
+ {{#each cartridgeInfo.portMappings}}
+ <div>
+ <a target="_blank" href="{{protocol}}://{{../cartridgeInfo.hostName}}:{{proxyPort}}">{{protocol}}://{{../cartridgeInfo.hostName}}:{{proxyPort}}</a>
+ </div>
+ {{/each}}
+
+ <div class="data-title">ActiveInstances:</div>
+ <div>{{cartridgeInfo.activeInstances}}</div>
+
+ <div class="data-title">CartridgeAlias:</div>
+ <div>{{cartridgeInfo.cartridgeAlias}}</div>
+
+ <div class="data-title">CartridgeType:</div>
+ <div>{{cartridgeInfo.cartridgeType}}</div>
+
+ <div class="data-title">HostName:</div>
+ <div>{{cartridgeInfo.hostName}}</div>
+
+ <div class="data-title">Version:</div>
+ <div>{{cartridgeInfo.version}}</div>
+
+ <div class="data-title">Tenancy Model:</div>
+ {{#if cartridgeInfo.multiTenant}}
+ <div>true</div>
+
+ {{else}}
+ <div>false</div>
+ {{/if}}
+
+
+ <div class="data-title">Provider:</div>
+ <div>{{cartridgeInfo.provider}}</div>
+
+ {{#if cartridgeInfo.repoURL }}
+ <div class="data-title">RepoURL</div>
+ <div>{{cartridgeInfo.repoURL}}</div>
+ {{/if}}
+
+ {{#ifCond cartridgeInfo.provider "==" "data"}}
+
+ <div class="data-title">UserName</div>
+ <div>{{cartridgeInfo.dbUserName}}</div>
+
+ <div class="data-title">Password</div>
+ <div>{{cartridgeInfo.password}}</div>
+
+ {{/ifCond}}
+ {{#if clusterinfo.member}}
+ <div class="data-title">Members Private ip(s):</div>
+ <div>
+ {{#each clusterinfo.member}}
+ {{memberIp}}
+ {{/each}}
+ </div>
+
+ <div class="data-title">Members Public ip(s):</div>
+ <div>
+ {{#each clusterinfo.member}}
+ {{memberPublicIp}}
+ {{/each}}
+ </div>
+
+ {{/if}}
+
+ {{#if lbclusterinfo.member}}
+ <div class="data-title">LB Private ip:</div>
+ <div>
+ {{#each lbclusterinfo.member}}
+ {{memberIp}};
+ {{/each}}
+ </div>
+
+ <div class="data-title">LB Public ip:</div>
+ <div>
+ {{#each lbclusterinfo.member}}
+ {{memberPublicIp}};
+ {{/each}}
+ </div>
+
+ {{/if}}
+
+ <div>
+ </div>
+
+
+ </div>
+</div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
index 4bee9fb..7f42fb3 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
@@ -1,13 +1,34 @@
-<div class="container content-starter">
- <div class="row">
- <div class="col-lg-12">
- <h1>{{title}}</h1>
- </div>
- </div>
-</div>
+<!--
-<div class="container">
- <div class="row">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{title}}</h1>
+ </div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="row">
{{#each cartridges}}
{{#if serviceGroup}}
<div class="col-md-6">
@@ -50,7 +71,7 @@
{{/each}}
</div>
</div>
- </div>
+ </div>
</div>
</div>
@@ -67,21 +88,21 @@
<div class="cartridge-description">{{description}}</div>
<div class="lb-description">This will be auto subscribed for you</div>
- {{else}}
+ {{else}}
<a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a>
<div class="cartridge-description">{{description}}</div>
<div class="cartridge-description">
{{#if multiTenant}}
<i class="fa fa-users"></i> Multi Tenant Enabled
{{else}}
- <i class="fa fa-user"></i> Single Tenant
+ <i class="fa fa-user"></i> Single Tenant
{{/if}}
</div>
- {{/if}}
- </div>
+ {{/if}}
+ </div>
</div>
- </div>
- </div>
+ </div>
+ </div>
{{/if}}
{{else}}
@@ -93,8 +114,8 @@
{{else}}
Please contact your system administrator.
{{/isAllowed}}
- </div>
- </div>
+ </div>
+ </div>
{{/each}}
- </div>
-</div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos.hbs
index 86a85f9..ebd8f4b 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
{{#if config_status.first_use}}
<div class="container content-starter">
<div class="row">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
index f47b88a..65d8786 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
{{#if config_status.first_use}}
{{#if config_on}}
<div class="container content-starter">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/dashboard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/dashboard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/dashboard.hbs
index 8596332..22e8158 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/dashboard.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/dashboard.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<div class="dashboard-wrapper-a">
<div class="container content-starter">
<div class="row">
@@ -20,4 +41,4 @@
</div> <!-- End Dashboard wrapper -->
-<script src="{{url "/themes/theme1/ui/js/dashboard.js"}}"></script>
\ No newline at end of file
+<script src="{{url "/themes/theme1/ui/js/dashboard.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/error_page.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/error_page.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/error_page.hbs
index 2eafeea..ff07294 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/error_page.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/error_page.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<div class="container content-starter">
<div class="row">
<div class="col-lg-12">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
index 45b4f3a..0bfca48 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
@@ -1,318 +1,339 @@
-{{#if login}}
- <div class="top-blue-strip"></div>
- <div class="login-logo-section"><a href="{{url "/"}}"><img src="{{url "/themes/theme1/ui/img/logo-login.png"}}"/></a></div>
- <style>
- body {
- padding-top: 0;
- padding-bottom: 0;
- }
- </style>
-{{/if}}
-{{#unless login}}
-<div class="navbar navbar-inverse navbar-fixed-top main-menu">
-<div class="shadow-wrapper">
- <div class="top-blue-strip"></div>
- <div class="container">
- <div class="row">
- <div class="col-lg-3">
- <a class="navbar-brand" href="{{url "/"}}"><img src="{{url "/themes/theme1/ui/img/logo-inside.png"}}"/></a>
- </div>
- <div class="col-lg-9 custom-nav">
- <ul class="pull-left">
- <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/dashboard.jag"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
- <li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My Cartridges</span></a></li>
- {{#isAllowed "configure"}}<li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>{{/isAllowed}}
- {{#isAllowed "tenant-mgt"}}<li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>{{/isAllowed}}
- </ul>
- <ul class="pull-right">
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> {{#user}}{{/user}} <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
- <li>
- <a href="{{url "/controllers/logout.jag"}}"><i class="fa fa-sign-out"></i> logout</a>
- </li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- <!--/.navbar-collapse -->
- </div><!-- End container -->
- </div>
- <div class="breadcrumb-strip">
- <div class="container">
- <div class="row">
- {{#unless wizard_on}}
- {{#unless config_on}}
- <div class="col-lg-3">
- <a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
- </div>
- {{#if has_action_buttons}}
- <div class="col-lg-4 action-buttons">
- <button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button>
- <button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button>
- <!--<button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>-->
- </div>
- <div class="col-lg-5 help-section">
- {{#if has_help}}
- <i class="icons-help"></i>
- <p>{{help}}</p>
- {{/if}}
- </div>
- {{else}}
- <div class="col-lg-9 help-section">
- {{#if has_help}}
- <i class="icons-help"></i>
- <p>{{help}}</p>
- {{/if}}
- </div>
- {{/if}}
- {{/unless}} <!-- configon -->
- {{/unless}} <!-- wizardon -->
-
-
-
-
-
- {{#if config_on}}
- <div class="col-lg-12">
- {{#if config_status.first_use}}
- <ul class="sub-menu-inactive">
- <li>Partitions</li>
- <li>Auto scale Policies</li>
- <li>Deployments Policies</li>
- <li>LBs</li>
- <li>Cartridges</li>
- <li>Multi-Tenant Services</li>
- </ul>
- {{else}}
- <ul class="sub-menu-wizard non-wizard">
- <li {{#ifCond step "==" 1 }}class="active"{{/ifCond}}>
- <a href="{{url "/configure_stratos.jag?step=1" }}">
- <div class="wizard-number">1</div>
- <div>Partitions</div>
- </a>
- </li>
-
- <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}>
- <a href="{{url "/configure_stratos.jag?step=2" }}">
- <div class="wizard-number">2</div>
- <div>Auto scale Policies</div>
- </a>
- </li>
-
- <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}>
- <a href="{{url "/configure_stratos.jag?step=3" }}">
- <div class="wizard-number">3</div>
- <div>Deployments Policies</div>
- </a>
- </li>
-
-
-
- <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}>
- <a href="{{url "/configure_stratos.jag?step=4" }}">
- <div class="wizard-number">4</div>
- <div>LBs</div>
- </a>
- </li>
-
-
-
- <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}>
- <a href="{{url "/configure_stratos.jag?step=5" }}">
- <div class="wizard-number">5</div>
- <div>Cartridges</div>
- </a>
- </li>
-
-
- <li {{#ifCond step "==" 6 }}class="active"{{/ifCond}}>
- <a href="{{url "/configure_stratos.jag?step=6" }}">
- <div class="wizard-number">6</div>
- <div>Multi-Tenant Services</div>
- </a>
- </li>
-
- </ul>
- {{/if}}
- {{#unless wizard_on}}
- {{#unless config_status.first_use}}
- <div class="pull-right">
- <a href="{{url "/configure_stratos_wizard.jag" }}" class="btn btn-important">
- <div>Configuration Wizard</div>
- </a>
- </div>
- {{/unless}}
- {{/unless}}
- </div>
-
- {{/if}}
-
-
- {{#if wizard_on}}
- <div class="col-lg-12">
-
- <ul class="sub-menu-wizard">
- <li class="active">
- <a href="{{url "/configure_stratos_wizard.jag?step=1" }}">
- <div class="wizard-number">1</div>
- <div>Partitions</div>
- </a>
- </li>
- <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_2}}active-no-background{{/unless}}"></li>
-
-
-
- {{#if wizard_on_2}}
- <li class="active">
- <a href="{{url "/configure_stratos_wizard.jag?step=2" }}">
- <div class="wizard-number">2</div>
- <div>Auto scale Policies</div>
- </a>
- </li>
- <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_3}}active-no-background{{/unless}}"></li>
- {{else}}
- <li>
- <div class="in-active-wizard-item">
- <div class="wizard-number">2</div>
- <div>Auto scale Policies</div>
- </div>
- </li>
- <li class="sub-menu-wizard-pointer"></li>
- {{/if}}
-
-
- {{#if wizard_on_3}}
- <li class="active">
- <a href="{{url "/configure_stratos_wizard.jag?step=3" }}">
- <div class="wizard-number">3</div>
- <div>Deployments Policies</div>
- </a>
- </li>
- <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_4}}active-no-background{{/unless}}"></li>
- {{else}}
- <li>
- <div class="in-active-wizard-item">
- <div class="wizard-number">3</div>
- <div>Deployments Policies</div>
- </div>
- </li>
- <li class="sub-menu-wizard-pointer"></li>
- {{/if}}
-
-
- {{#if wizard_on_4}}
- <li class="active">
- <a href="{{url "/configure_stratos_wizard.jag?step=4" }}">
- <div class="wizard-number">4</div>
- <div>LBs</div>
- </a>
- </li>
- <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_5}}active-no-background{{/unless}}"></li>
- {{else}}
- <li>
- <div class="in-active-wizard-item">
- <div class="wizard-number">4</div>
- <div>LBs</div>
- </div>
- </li>
- <li class="sub-menu-wizard-pointer"></li>
- {{/if}}
-
-
- {{#if wizard_on_5}}
- <li class="active">
- <a href="{{url "/configure_stratos_wizard.jag?step=5" }}">
- <div class="wizard-number">5</div>
- <div>Cartridges</div>
- </a>
- </li>
- <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_6}}active-no-background{{/unless}}"></li>
- {{else}}
- <li>
- <div class="in-active-wizard-item">
- <div class="wizard-number">5</div>
- <div>Cartridges</div>
- </div>
- </li>
- <li class="sub-menu-wizard-pointer"></li>
- {{/if}}
-
-
- {{#if wizard_on_6}}
- <li class="active">
- <a href="{{url "/configure_stratos_wizard.jag?step=6" }}">
- <div class="wizard-number">6</div>
- <div>Multi-Tenant Services</div>
- </a>
- </li>
- <li class="sub-menu-wizard-pointer active-pointer no-background"></li>
- {{else}}
- <li>
- <div class="in-active-wizard-item">
- <div class="wizard-number">6</div>
- <div>Multi-Tenant Services</div>
- </div>
- </li>
- <li class="sub-menu-wizard-pointer no-background"></li>
- {{/if}}
-
-
- </ul>
-
- </div>
- {{/if}}
- </div>
- </div>
- </div>
-
- {{#if error}}
- <div class="info-bar error">
- <div class="container">
- <div class="row">
- <div class="col-lg-12">
- <i class="icon-exclamation"></i>{{error_msg}}</a>
- </div>
- </div>
- </div>
- </div>
- {{else}}
- {{#if deploy_status}}
- <div class="info-bar success">
- <div class="container">
- <div class="row">
- <div class="col-lg-12">
- <i class="icon-exclamation"></i>{{type}} successful.</a>
- </div>
- </div>
- </div>
- </div>
- {{else}}
- {{#if config_status.not_complete}}
- <div class="info-bar">
- <div class="container">
- <div class="row">
- <div class="col-lg-3">
- </div>
- <div class="col-lg-6">
- <i class="icon-exclamation"></i> Configure Stratos is not completed. <a href="{{url "/configure_stratos_wizard.jag"}}">Take the Wizard</a>
- </div>
- </div>
- </div>
- </div>
- {{/if}}
- {{/if}}
-
- {{/if}}
-
-</div>
-
-<form action="{{url "/controllers/manageTenants.jag"}}" id="manageTenantsForm">
-<input type="hidden" value="" id="foo" name="foo" />
-<input type="hidden" value="" id="state" name="state" />
-</form>
-
-{{/unless}}
-
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+{{#if login}}
+ <div class="top-blue-strip"></div>
+ <div class="login-logo-section"><a href="{{url "/"}}"><img src="{{url "/themes/theme1/ui/img/logo-login.png"}}"/></a></div>
+ <style>
+ body {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+ </style>
+{{/if}}
+{{#unless login}}
+<div class="navbar navbar-inverse navbar-fixed-top main-menu">
+<div class="shadow-wrapper">
+ <div class="top-blue-strip"></div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-3">
+ <a class="navbar-brand" href="{{url "/"}}"><img src="{{url "/themes/theme1/ui/img/logo-inside.png"}}"/></a>
+ </div>
+ <div class="col-lg-9 custom-nav">
+ <ul class="pull-left">
+ <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/dashboard.jag"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
+ <li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My Cartridges</span></a></li>
+ {{#isAllowed "configure"}}<li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>{{/isAllowed}}
+ {{#isAllowed "tenant-mgt"}}<li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>{{/isAllowed}}
+ </ul>
+ <ul class="pull-right">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> {{#user}}{{/user}} <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
+ <li>
+ <a href="{{url "/controllers/logout.jag"}}"><i class="fa fa-sign-out"></i> logout</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <!--/.navbar-collapse -->
+ </div><!-- End container -->
+ </div>
+ <div class="breadcrumb-strip">
+ <div class="container">
+ <div class="row">
+ {{#unless wizard_on}}
+ {{#unless config_on}}
+ <div class="col-lg-3">
+ <a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
+ </div>
+ {{#if has_action_buttons}}
+ <div class="col-lg-4 action-buttons">
+ <button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button>
+ <button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button>
+ <!--<button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>-->
+ </div>
+ <div class="col-lg-5 help-section">
+ {{#if has_help}}
+ <i class="icons-help"></i>
+ <p>{{help}}</p>
+ {{/if}}
+ </div>
+ {{else}}
+ <div class="col-lg-9 help-section">
+ {{#if has_help}}
+ <i class="icons-help"></i>
+ <p>{{help}}</p>
+ {{/if}}
+ </div>
+ {{/if}}
+ {{/unless}} <!-- configon -->
+ {{/unless}} <!-- wizardon -->
+
+
+
+
+
+ {{#if config_on}}
+ <div class="col-lg-12">
+ {{#if config_status.first_use}}
+ <ul class="sub-menu-inactive">
+ <li>Partitions</li>
+ <li>Auto scale Policies</li>
+ <li>Deployments Policies</li>
+ <li>LBs</li>
+ <li>Cartridges</li>
+ <li>Multi-Tenant Services</li>
+ </ul>
+ {{else}}
+ <ul class="sub-menu-wizard non-wizard">
+ <li {{#ifCond step "==" 1 }}class="active"{{/ifCond}}>
+ <a href="{{url "/configure_stratos.jag?step=1" }}">
+ <div class="wizard-number">1</div>
+ <div>Partitions</div>
+ </a>
+ </li>
+
+ <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}>
+ <a href="{{url "/configure_stratos.jag?step=2" }}">
+ <div class="wizard-number">2</div>
+ <div>Auto scale Policies</div>
+ </a>
+ </li>
+
+ <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}>
+ <a href="{{url "/configure_stratos.jag?step=3" }}">
+ <div class="wizard-number">3</div>
+ <div>Deployments Policies</div>
+ </a>
+ </li>
+
+
+
+ <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}>
+ <a href="{{url "/configure_stratos.jag?step=4" }}">
+ <div class="wizard-number">4</div>
+ <div>LBs</div>
+ </a>
+ </li>
+
+
+
+ <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}>
+ <a href="{{url "/configure_stratos.jag?step=5" }}">
+ <div class="wizard-number">5</div>
+ <div>Cartridges</div>
+ </a>
+ </li>
+
+
+ <li {{#ifCond step "==" 6 }}class="active"{{/ifCond}}>
+ <a href="{{url "/configure_stratos.jag?step=6" }}">
+ <div class="wizard-number">6</div>
+ <div>Multi-Tenant Services</div>
+ </a>
+ </li>
+
+ </ul>
+ {{/if}}
+ {{#unless wizard_on}}
+ {{#unless config_status.first_use}}
+ <div class="pull-right">
+ <a href="{{url "/configure_stratos_wizard.jag" }}" class="btn btn-important">
+ <div>Configuration Wizard</div>
+ </a>
+ </div>
+ {{/unless}}
+ {{/unless}}
+ </div>
+
+ {{/if}}
+
+
+ {{#if wizard_on}}
+ <div class="col-lg-12">
+
+ <ul class="sub-menu-wizard">
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=1" }}">
+ <div class="wizard-number">1</div>
+ <div>Partitions</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_2}}active-no-background{{/unless}}"></li>
+
+
+
+ {{#if wizard_on_2}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=2" }}">
+ <div class="wizard-number">2</div>
+ <div>Auto scale Policies</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_3}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">2</div>
+ <div>Auto scale Policies</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_3}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=3" }}">
+ <div class="wizard-number">3</div>
+ <div>Deployments Policies</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_4}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">3</div>
+ <div>Deployments Policies</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_4}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=4" }}">
+ <div class="wizard-number">4</div>
+ <div>LBs</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_5}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">4</div>
+ <div>LBs</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_5}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=5" }}">
+ <div class="wizard-number">5</div>
+ <div>Cartridges</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_6}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">5</div>
+ <div>Cartridges</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_6}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=6" }}">
+ <div class="wizard-number">6</div>
+ <div>Multi-Tenant Services</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer no-background"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">6</div>
+ <div>Multi-Tenant Services</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer no-background"></li>
+ {{/if}}
+
+
+ </ul>
+
+ </div>
+ {{/if}}
+ </div>
+ </div>
+ </div>
+
+ {{#if error}}
+ <div class="info-bar error">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <i class="icon-exclamation"></i>{{error_msg}}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{else}}
+ {{#if deploy_status}}
+ <div class="info-bar success">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <i class="icon-exclamation"></i>{{type}} successful.</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{else}}
+ {{#if config_status.not_complete}}
+ <div class="info-bar">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-3">
+ </div>
+ <div class="col-lg-6">
+ <i class="icon-exclamation"></i> Configure Stratos is not completed. <a href="{{url "/configure_stratos_wizard.jag"}}">Take the Wizard</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/if}}
+ {{/if}}
+
+ {{/if}}
+
+</div>
+
+<form action="{{url "/controllers/manageTenants.jag"}}" id="manageTenantsForm">
+<input type="hidden" value="" id="foo" name="foo" />
+<input type="hidden" value="" id="state" name="state" />
+</form>
+
+{{/unless}}
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/login.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/login.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/login.hbs
index c0affc5..06c120d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/login.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/login.hbs
@@ -1,33 +1,54 @@
-<h1 class="login-title">The most comprehensive enterprise grade PaaS Framework</h1>
-<div class="container">
- <div class="row">
- <div class="col-lg-12 login-box-wrapper">
- <div class="login-box">
- <div class="login-box-top">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<h1 class="login-title">The most comprehensive enterprise grade PaaS Framework</h1>
+<div class="container">
+ <div class="row">
+ <div class="col-lg-12 login-box-wrapper">
+ <div class="login-box">
+ <div class="login-box-top">
<h2 class="login-sub-title">Login to Manage cartridges</h2>
<form method="post" action="{{url "/loginSubmit"}}" id="loginForm">
- <div class="username-wrapper">
+ <div class="username-wrapper">
<input name="username" id="username" class="input-username" type="text" placeholder="Username" />
- </div>
- <div class="password-wrapper">
+ </div>
+ <div class="password-wrapper">
<input name="password" id="password" class="input-password" type="password" placeholder="Password" />
- </div>
-
- <div class="login-button-wrapper">
+ </div>
+
+ <div class="login-button-wrapper">
<div class="loginError" id="loginError" {{#unless hasError}}style="display: none"{{/unless}} >{{#if hasError}}{{error}}{{/if}}</div>
<button class="btn btn-primary login-button" type="button" id="loginButton">Sign In</button>
- </div>
- </form>
- </div>
- <div class="login-box-bottom">
- <label class="pull-left"><input type="checkbox" /> Stay Signed In</label>
+ </div>
+ </form>
+ </div>
+ <div class="login-box-bottom">
+ <label class="pull-left"><input type="checkbox" /> Stay Signed In</label>
<!--<label class="pull-right"><a>Create an account</a></label>-->
- <div style="clear: both"></div>
- </div>
- </div>
- <br />
- <div class="login-box-footer"></div>
- </div>
- </div>
+ <div style="clear: both"></div>
+ </div>
+ </div>
+ <br />
+ <div class="login-box-footer"></div>
+ </div>
+ </div>
</div>
<script src="{{url "/themes/theme1/ui/js/login.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
index 6bb0b43..550a4f3 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
@@ -1,13 +1,34 @@
-<div class="container content-starter">
- <div class="row">
- <div class="col-lg-12">
- <h1>{{title}}</h1>
- </div>
- </div>
-</div>
+<!--
-<div class="container">
- <div class="row">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{title}}</h1>
+ </div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="row">
{{#each mycartridges}}
{{#if serviceGroup}}
<div class="col-md-6">
@@ -40,7 +61,7 @@
</div>
</div>
</div>
- </div>
+ </div>
</div>
{{else}}
<div class="col-md-6">
@@ -58,8 +79,8 @@
<div class="cartridge-description">{{repoURL}} <a class="js_syncRepo" data-value="{{cartridgeAlias}}"><i class="fa fa-refresh"></i></a></div>
</div>
</div>
- </div>
- </div>
+ </div>
+ </div>
{{/if}}
{{else}}
<div class="col-lg-12">
@@ -68,12 +89,12 @@
</div>
</div>
{{/each}}
- </div>
-</div>
+ </div>
+</div>
-<form method="post" id="cForm" action="{{url "/controllers/cartridgeUnsubscribeSubmit.jag"}}">
- <input type="hidden" name="alias" id="alias" />
-</form>
-<script src="{{url "/themes/theme1/ui/js/popup.js"}}"></script>
-<script src="{{url "/themes/theme1/ui/js/mycartridges.js"}}"></script>
+<form method="post" id="cForm" action="{{url "/controllers/cartridgeUnsubscribeSubmit.jag"}}">
+ <input type="hidden" name="alias" id="alias" />
+</form>
+<script src="{{url "/themes/theme1/ui/js/popup.js"}}"></script>
+<script src="{{url "/themes/theme1/ui/js/mycartridges.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
index 492c289..4adf266 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
@@ -1,201 +1,222 @@
-<div class="container content-starter">
- <div class="row">
- <div class="col-lg-12">
- <h1>{{cartridgeType}} {{cartridge.version}} Cartridge</h1>
- </div>
- </div>
-</div>
-
-<div class="container">
- <div class="row">
- <div class="col-lg-12">
- <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}" id="subscribeCartridgeForm">
- <div class="form-group">
- <label class="required">Public URL:</label>
- <div class="form-inline">
- <input name="cartridgeType" type="hidden" value="{{cartridgeType}}"/>
- <input name="alias"
- type="text"
- class="required form-control input-xlarge js-help"
- data-help="Specify a unique alias which can be used to generate the hostname as alias.hostname from cartridge"
- data-help-x-offset="50"
- data-help-y-offset="10"
- placeholder="myphp" />
- <label>.{{cartridge.hostName}}</label>
- </div>
- </div>
-
-
- {{#ifCond cartridge.provider "==" "data"}}
- {{else}}
- {{#ifCond cartridge.provider "==" "application"}}
- {{else}}
- <div class="form-group">
- <label class="required">Repo URL:</label>
- <div class="form-inline">
- <input name="repoURL"
- type="text"
- class="required form-control input-xlarge js-help"
- data-help="Specify a repository URL of the artifacts."
- data-help-x-offset="50"
- data-help-y-offset="10"
- placeholder="https://github.com/test/mytestphp.git" />
- </div>
- <div class="checkbox">
- <label>
- <input name="isPublicRepo" type="checkbox" checked="checked" id="public_check" /> This is a public repository
- </label>
- </div>
- </div>
- <div id="credential_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;">
- <h2>Provide Credentials</h2>
- <div class="form-group">
- <label class="required">Username:</label>
- <div class="form-inline">
- <input name="repoUsername" class="required form-control input-xlarge" placeholder="username"/>
- </div>
- </div>
- <div class="form-group">
- <label class="required">Password:</label>
- <div class="form-inline">
- <input name="repoPassword" type="password" class="required form-control input-xlarge" placeholder="******"/>
- </div>
- </div>
- </div>
- {{/ifCond}}
-
- {{/ifCond}}
-
-
- {{#if cartridge.multiTenant}}
- <input type="hidden" value="{{autoscalingPolicyName}}" name="autoscalePolicy" />
- <input type="hidden" value="{{deploymentPolicyName}}" name="deploymentPolicy" />
- {{else}}
- <div class="form-group">
- <label class="required">Autoscale Policy:</label>
- <div class="form-inline">
- <select
- name="autoscalePolicy"
- class="form-control input-xlarge js-help"
- data-help="Please choose a applicable autoscaling policy for the subscription."
- data-help-x-offset="50"
- data-help-y-offset="10"
- >
-
- {{#if cartridge.defaultAutoscalingPolicy}}
- <option>{{cartridge.defaultAutoscalingPolicy}}</option>
- {{else}}
- {{#each autoScalePolicies}}
- <option>{{id}}</option>
- {{/each}}
- {{/if}}
-
-
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="required">Deployment Policy:</label>
- <div class="form-inline">
- <select
- name="deploymentPolicy"
- class="form-control input-xlarge js-help"
- data-help="Please choose a applicable deployment policy for the subscription.."
- data-help-x-offset="50"
- data-help-y-offset="10"
- >
-
- {{#if cartridge.defaultDeploymentPolicy}}
- <option>{{cartridge.defaultDeploymentPolicy}}</option>
- {{else}}
- {{#each deploymentPolicies}}
- <option>{{id}}</option>
- {{/each}}
- {{/if}}
-
-
- </select>
- </div>
- </div>
-
- {{/if}}
-
- {{#if cartridge.persistence.persistanceRequired}}
- {{#unless cartridge.multiTenant}}
-
- <div class="form-group">
- <label class="required">Persistent Storage:</label>
- <label>
- <input name="persistencerequired" type="checkbox" id="volume_check"/> Require Persistent Storage
- </label>
- </div>
- <div id="persistence_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;">
- <div class="form-group">
- <label class="required">Size(GB):</label>
- </div>
- <div class="form-group">
- <div class="form-inline">
- <input name="size" class="form-control input-xlarge" placeholder="10"/>
- </div>
- </div>
- <div class="form-group">
- <label>
- <input name="removeOnUnsubscription" type="checkbox" id="volume_check" />Remove On Unsubscription
- </label>
- </div>
- </div>
- {{/unless}}
- {{/if}}
-
- <div class="form-group">
- <label class="required">New Checkbox:</label>
- <label>
- <input name="new_checkbox" type="checkbox" id="new_checkbox"/> Require Persistent Storage
- </label>
- </div>
-
- <button type="submit" class="btn btn-primary">Subscribe to Cartridge</button>
- </form>
- </div>
- </div>
-</div>
-<script>
- $(function(){
- $('.js-help')
- .focus(
- function () {
- var $input = $(this);
- var bubbleLeft = $input.offset().left + $input.width();
- var bubbleTop = $input.offset().top - $input.height() / 2;
- $('#speech_bubble_container p').html($input.attr('data-help'));
- bubbleLeft += parseInt($input.attr('data-help-x-offset'));
- bubbleTop += parseInt($input.attr('data-help-y-offset'));
- var bubbleWidth = Math.floor($(document).width() - bubbleLeft - 105);
- $('#speech_bubble_container').css({'width': bubbleWidth + "px"}).show('fast').css({"position": "absolute", "left": bubbleLeft + "px", "top": bubbleTop + "px"});
- console.info(Math.floor(bubbleWidth));
- }
- ).blur(
- function () {
- $('#speech_bubble_container').hide();
- });
-
- var $public_check = $('#public_check');
- if(!$public_check.is(':checked')){
- $('#public_check').prop("checked",true);
- }
- $public_check.click(function(){
- $('#credential_container').toggle($public_check.checked);
- });
-
- var $volume_check = $('#volume_check');
-
- if($volume_check.is(':checked')){
- $('#volume_check').prop("checked",false);
- }
- $volume_check.click(function(){
- $('#persistence_container').toggle($volume_check.checked);
- });
- $( "#subscribeCartridgeForm" ).validate();
- });
-
-</script>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{cartridgeType}} {{cartridge.version}} Cartridge</h1>
+ </div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}" id="subscribeCartridgeForm">
+ <div class="form-group">
+ <label class="required">Public URL:</label>
+ <div class="form-inline">
+ <input name="cartridgeType" type="hidden" value="{{cartridgeType}}"/>
+ <input name="alias"
+ type="text"
+ class="required form-control input-xlarge js-help"
+ data-help="Specify a unique alias which can be used to generate the hostname as alias.hostname from cartridge"
+ data-help-x-offset="50"
+ data-help-y-offset="10"
+ placeholder="myphp" />
+ <label>.{{cartridge.hostName}}</label>
+ </div>
+ </div>
+
+
+ {{#ifCond cartridge.provider "==" "data"}}
+ {{else}}
+ {{#ifCond cartridge.provider "==" "application"}}
+ {{else}}
+ <div class="form-group">
+ <label class="required">Repo URL:</label>
+ <div class="form-inline">
+ <input name="repoURL"
+ type="text"
+ class="required form-control input-xlarge js-help"
+ data-help="Specify a repository URL of the artifacts."
+ data-help-x-offset="50"
+ data-help-y-offset="10"
+ placeholder="https://github.com/test/mytestphp.git" />
+ </div>
+ <div class="checkbox">
+ <label>
+ <input name="isPublicRepo" type="checkbox" checked="checked" id="public_check" /> This is a public repository
+ </label>
+ </div>
+ </div>
+ <div id="credential_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;">
+ <h2>Provide Credentials</h2>
+ <div class="form-group">
+ <label class="required">Username:</label>
+ <div class="form-inline">
+ <input name="repoUsername" class="required form-control input-xlarge" placeholder="username"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="required">Password:</label>
+ <div class="form-inline">
+ <input name="repoPassword" type="password" class="required form-control input-xlarge" placeholder="******"/>
+ </div>
+ </div>
+ </div>
+ {{/ifCond}}
+
+ {{/ifCond}}
+
+
+ {{#if cartridge.multiTenant}}
+ <input type="hidden" value="{{autoscalingPolicyName}}" name="autoscalePolicy" />
+ <input type="hidden" value="{{deploymentPolicyName}}" name="deploymentPolicy" />
+ {{else}}
+ <div class="form-group">
+ <label class="required">Autoscale Policy:</label>
+ <div class="form-inline">
+ <select
+ name="autoscalePolicy"
+ class="form-control input-xlarge js-help"
+ data-help="Please choose a applicable autoscaling policy for the subscription."
+ data-help-x-offset="50"
+ data-help-y-offset="10"
+ >
+
+ {{#if cartridge.defaultAutoscalingPolicy}}
+ <option>{{cartridge.defaultAutoscalingPolicy}}</option>
+ {{else}}
+ {{#each autoScalePolicies}}
+ <option>{{id}}</option>
+ {{/each}}
+ {{/if}}
+
+
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="required">Deployment Policy:</label>
+ <div class="form-inline">
+ <select
+ name="deploymentPolicy"
+ class="form-control input-xlarge js-help"
+ data-help="Please choose a applicable deployment policy for the subscription.."
+ data-help-x-offset="50"
+ data-help-y-offset="10"
+ >
+
+ {{#if cartridge.defaultDeploymentPolicy}}
+ <option>{{cartridge.defaultDeploymentPolicy}}</option>
+ {{else}}
+ {{#each deploymentPolicies}}
+ <option>{{id}}</option>
+ {{/each}}
+ {{/if}}
+
+
+ </select>
+ </div>
+ </div>
+
+ {{/if}}
+
+ {{#if cartridge.persistence.persistanceRequired}}
+ {{#unless cartridge.multiTenant}}
+
+ <div class="form-group">
+ <label class="required">Persistent Storage:</label>
+ <label>
+ <input name="persistencerequired" type="checkbox" id="volume_check"/> Require Persistent Storage
+ </label>
+ </div>
+ <div id="persistence_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;">
+ <div class="form-group">
+ <label class="required">Size(GB):</label>
+ </div>
+ <div class="form-group">
+ <div class="form-inline">
+ <input name="size" class="form-control input-xlarge" placeholder="10"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label>
+ <input name="removeOnUnsubscription" type="checkbox" id="volume_check" />Remove On Unsubscription
+ </label>
+ </div>
+ </div>
+ {{/unless}}
+ {{/if}}
+
+ <div class="form-group">
+ <label class="required">New Checkbox:</label>
+ <label>
+ <input name="new_checkbox" type="checkbox" id="new_checkbox"/> Require Persistent Storage
+ </label>
+ </div>
+
+ <button type="submit" class="btn btn-primary">Subscribe to Cartridge</button>
+ </form>
+ </div>
+ </div>
+</div>
+<script>
+ $(function(){
+ $('.js-help')
+ .focus(
+ function () {
+ var $input = $(this);
+ var bubbleLeft = $input.offset().left + $input.width();
+ var bubbleTop = $input.offset().top - $input.height() / 2;
+ $('#speech_bubble_container p').html($input.attr('data-help'));
+ bubbleLeft += parseInt($input.attr('data-help-x-offset'));
+ bubbleTop += parseInt($input.attr('data-help-y-offset'));
+ var bubbleWidth = Math.floor($(document).width() - bubbleLeft - 105);
+ $('#speech_bubble_container').css({'width': bubbleWidth + "px"}).show('fast').css({"position": "absolute", "left": bubbleLeft + "px", "top": bubbleTop + "px"});
+ console.info(Math.floor(bubbleWidth));
+ }
+ ).blur(
+ function () {
+ $('#speech_bubble_container').hide();
+ });
+
+ var $public_check = $('#public_check');
+ if(!$public_check.is(':checked')){
+ $('#public_check').prop("checked",true);
+ }
+ $public_check.click(function(){
+ $('#credential_container').toggle($public_check.checked);
+ });
+
+ var $volume_check = $('#volume_check');
+
+ if($volume_check.is(':checked')){
+ $('#volume_check').prop("checked",false);
+ }
+ $volume_check.click(function(){
+ $('#persistence_container').toggle($volume_check.checked);
+ });
+ $( "#subscribeCartridgeForm" ).validate();
+ });
+
+</script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
index 4e8f3c5..2e50af4 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<div class="container content-starter responsive-gap-maker">
<div class="row">
<div class="col-lg-12">
@@ -61,4 +82,4 @@
<input type="hidden" value="" id="state" name="state" />
</form>
<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
-<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
\ No newline at end of file
+<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
index 2836b6e..24dd864 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
<div class="container content-starter">
<div class="row">
<div class="col-lg-12">
@@ -75,4 +96,4 @@
</div>
</div>
<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
-<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
\ No newline at end of file
+<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa893ee9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/title.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/title.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/title.hbs
index 7cdec43..d6cb75e 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/title.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/title.hbs
@@ -1 +1,22 @@
-<title>{{title}}</title>
\ No newline at end of file
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<title>{{title}}</title>