You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/21 16:06:10 UTC
[2/2] stratos git commit: UI changes
UI changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a948d06d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a948d06d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a948d06d
Branch: refs/heads/master
Commit: a948d06d705816f2173f7b450336165987c2d857
Parents: eb765f7
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 21 19:12:58 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu May 21 19:36:05 2015 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 4 ++--
.../console/configure_form.jag | 10 +++++-----
.../console/themes/theme0/partials/applications_form.hbs | 5 ++---
.../console/themes/theme0/partials/configure_form.hbs | 5 ++---
.../console/themes/theme0/partials/users_form.hbs | 4 ++--
.../console/themes/theme0/renderers/configure_form.js | 4 ++--
6 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a948d06d/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index 9b502eb..0c52785 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -95,8 +95,8 @@ var formtype = elements.formtype;
switch (formtype) {
case "applications":
- formTitle = "Application Definition",
- buttonText = "Application Definition";
+ formTitle = "Application",
+ buttonText = "Application";
list_data = util.RESTCalls.getApplications();
if (list_data.status == 'error') {
list_data = null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/a948d06d/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index dfc37e0..df0c9f9 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -113,7 +113,7 @@ if(isEdit == false && elements.action != 'new') {
case "cartridges":
formTitle = "Cartridge",
- buttonText = "Cartridge Definition";
+ buttonText = "Cartridge";
list_data = util.RESTCalls.getCartridges();
if (list_data.status == 'error') {
list_data = null;
@@ -121,8 +121,8 @@ if(isEdit == false && elements.action != 'new') {
break;
case "cartridge-groups":
- formTitle = "Cartridge Group Definition",
- buttonText = "Cartridge Group Definition";
+ formTitle = "Cartridge Group",
+ buttonText = "Cartridge Group";
list_data = util.RESTCalls.getGroups();
if (list_data.status == 'error') {
list_data = null;
@@ -139,8 +139,8 @@ if(isEdit == false && elements.action != 'new') {
break;
case "application-policies":
- formTitle = "Application Policy Definition",
- buttonText = "Application Policy Definition";
+ formTitle = "Application Policy",
+ buttonText = "Application Policy";
list_data = util.RESTCalls.getApplicationPolicies();
if (list_data.status == 'error') {
list_data = null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/a948d06d/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index b1762db..0042071 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -92,15 +92,14 @@
</div>
</div>
<div class="col-md-7 col-sm-3 text-right">
- <a type="button" class="btn btn-primary btn-lg add-button" href="new/">Add
- New {{buttonText}}</a>
+ <a type="button" class="btn btn-primary btn-lg add-button" href="new/">Add {{buttonText}}</a>
</div>
</div>
{{else}}
<div class="row no-item row-overide">
<div class="row title">
<h2>No <span>{{formTitle}}s</span> found...</h2>
- <a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formTitle}}</a>
+ <a type="button" class="btn btn-primary btn-lg" href="new/">Add {{formTitle}}</a>
</div>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a948d06d/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index 1ef765d..2071a60 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -122,8 +122,7 @@
</div>
</div>
<div class="col-md-7 col-sm-3 text-right">
- <a type="button" class="btn btn-primary btn-lg add-button" href="new/">Add
- New {{buttonText}}</a>
+ <a type="button" class="btn btn-primary btn-lg add-button" href="new/">Add {{buttonText}}</a>
</div>
</div>
{{else}}
@@ -134,7 +133,7 @@
<h3>You need to add <i>{{dependancy}}</i> before {{formTitle}}</h3>
<a type="button" class="btn btn-primary btn-lg" href="../{{dependancy}}/new/">Add New {{dependancy}}</a>
{{else}}
- <a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{buttonText}}</a>
+ <a type="button" class="btn btn-primary btn-lg" href="new/">Add {{buttonText}}</a>
{{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a948d06d/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index 3339baf..7472ccf 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -36,7 +36,7 @@
<div class='container text-center form-toolbar'>
<div class='col-md-5'></div>
<div class='col-md-7 '>
- <button class='btn btn-info btn-lg pull-right' type='button' id='deploy' data-form=''> Add New {{formTitle}}</button>
+ <button class='btn btn-info btn-lg pull-right' type='button' id='deploy' data-form=''> Add {{formTitle}}</button>
<button class='btn btn-default btn-lg pull-right button-gap' type='button' onclick='window.location.replace(document.referrer)'> Cancel
</button>
</div>
@@ -81,7 +81,7 @@
{{else}}
<div class="row no-item row-overide">
<div class="row title">
- <h2>No {{formTitle}} found..</h2>
+ <h2>No {{formTitle}}s found...</h2>
<a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formTitle}}</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a948d06d/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
index b204a33..a61121d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
@@ -28,8 +28,8 @@ var render = function (theme, data, meta, require) {
{
partial: 'index_title',
context: {
- page_title: 'Apache Stratos - Application Managment',
- page_description: 'Apache Stratos - Application Managment'
+ page_title: 'Apache Stratos - Application Management',
+ page_description: 'Apache Stratos - Application Management'
}
}
],