You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/13 05:19:35 UTC
[8/8] stratos git commit: notify update status on nodes
notify update status on nodes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/55e0d844
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/55e0d844
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/55e0d844
Branch: refs/heads/4.1.0-test
Commit: 55e0d844413bb48384a0a79a5fcfb32ecc8f1189
Parents: e161508
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sat Dec 13 06:14:22 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 13 09:45:25 2014 +0530
----------------------------------------------------------------------
.../theme0/css/custom/application_editor.css | 19 +++++++++++++++++--
.../theme0/js/custom/applications-editor.js | 8 ++++++--
.../theme0/partials/applications_editor.hbs | 4 ++--
3 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/55e0d844/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
index 9b76099..879f2af 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
@@ -26,6 +26,7 @@
word-wrap: break-word;
padding-top: 24px;
text-align: center;
+ cursor: pointer;
}
.block-cartridge {
@@ -67,7 +68,7 @@
#whiteboard{
width: 800px;
- height: 600px;
+ height: 585px;
position: absolute;
}
@@ -138,4 +139,18 @@
float: right;
}
-#component-data{margin-top: 20px}
\ No newline at end of file
+#component-data{margin-top: 20px}
+.stepnode i {
+ margin-top: 2px;
+ color: #e67e22;
+}
+
+.notification {
+ position: absolute;
+ background-color: #fff;
+ width: 30px;
+ height: 30px;
+ border-radius: 15px;
+ top: 52px;
+ left: 52px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/55e0d844/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
index 5298114..2da8c15 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js
@@ -98,6 +98,7 @@ function addJsplumbCartridge(idname, cartridgeCounter) {
anchor: "TopCenter"
}, endpointOptions);
// jsPlumb.addEndpoint($(Div), sourceEndpoint);
+ $(Div).append('<div class="notification"><i class="fa fa-exclamation-circle fa-2x"></i></div>');
DragEl($(Div));
Repaint();
}
@@ -110,6 +111,7 @@ function addJsplumbGroup(groupJSON, cartridgeCounter){
.addClass('input-false')
.addClass('stepnode')
.appendTo('#whiteboard');
+ $(divRoot).append('<div class="notification"><i class="fa fa-exclamation-circle fa-2x"></i></div>');
jsPlumb.addEndpoint($(divRoot), {
anchor:"BottomCenter"
}, bottomConnectorOptions);
@@ -136,7 +138,7 @@ function addJsplumbGroup(groupJSON, cartridgeCounter){
.addClass('input-false')
.addClass('stepnode')
.appendTo('#whiteboard');
-
+ $(divCartridge).append('<div class="notification"><i class="fa fa-exclamation-circle fa-2x"></i></div>');
jsPlumb.addEndpoint($(divCartridge), {
anchor: "TopCenter"
}, generatedCartridgeEndpointOptions);
@@ -162,6 +164,7 @@ function addJsplumbGroup(groupJSON, cartridgeCounter){
.addClass('stepnode')
.addClass('input-false')
.appendTo('#whiteboard');
+ $(divGroup).append('<div class="notification"><i class="fa fa-exclamation-circle fa-2x"></i></div>');
jsPlumb.addEndpoint($(divGroup), {
anchor:"BottomCenter"
}, bottomConnectorOptions);
@@ -674,7 +677,7 @@ $(document).ready(function(){
DragEl(".stepnode");
Repaint();
- $('#whiteboard').on('dblclick', '.stepnode', function(){
+ $('#whiteboard').on('click', '.stepnode', function(){
//get tab activated
if($(this).attr('id') == 'applicationId'){
activateTab('general');
@@ -737,6 +740,7 @@ $(document).ready(function(){
$('#component-info-update').on('click', function(){
$('#'+blockId).attr('data-generated', encodeURIComponent(JSON.stringify(editor.getValue())));
$('#'+blockId).removeClass('input-false');
+ $('#'+blockId).find('div>i').removeClass('fa-exclamation-circle').addClass('fa-check-circle-o').css('color','#2ecc71');
$('#deploy').prop("disabled", false);
});
http://git-wip-us.apache.org/repos/asf/stratos/blob/55e0d844/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
index cd9abaa..7cb0bac 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
@@ -60,7 +60,7 @@
<div class="description" >
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">Details</h3>
+ <h3 class="panel-title">Information</h3>
</div>
<div class="panel-body description-section">
@@ -72,7 +72,7 @@
<div class="app-creator">
<div id="whiteboard">
<div id="applicationId" class="stepnode">
- App Id
+ App
</div>
</div>