From fb5d5994b8d729ce6233549844817d2b7043d8a5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 1 Feb 2012 12:05:08 -0800
Subject: Adding cloud popup copy
---
js/io/ui/cloudpopup.reel/cloudpopup.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/io/ui/cloudpopup.reel')
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index fa4533d7..eb5e8178 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -34,7 +34,7 @@
Cloud Service Dialog
- Duis aliquet egestas purus in blandit. Curabitur vulputate, ligula lacinia scelerisque tempor, lacus lacus ornare ante, ac egestas.
+ Connection to the Ninja Cloud Server was not detected. Please verify that the server is running and the URL below is correct.
--
cgit v1.2.3
From 54ccd309722797e79ca35fe115b0372e86850551 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 1 Feb 2012 13:31:35 -0800
Subject: Removing filesytem class, no longer used
Also cleaning up cloud popup IU.
---
js/io/ui/cloudpopup.reel/cloudpopup.html | 2 +-
js/io/ui/cloudpopup.reel/css/cloudpopup.css | 13 ++++++-------
js/io/ui/cloudpopup.reel/css/cloudpopup.scss | 1 -
3 files changed, 7 insertions(+), 9 deletions(-)
(limited to 'js/io/ui/cloudpopup.reel')
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index eb5e8178..1ab0892d 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -34,7 +34,7 @@
Cloud Service Dialog
- Connection to the Ninja Cloud Server was not detected. Please verify that the server is running and the URL below is correct.
+ Connection to the Cloud Server was not detected. Please verify
that the server is running and the URL below is correct.
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.css b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
index eac18083..6d804e50 100644
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.css
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
@@ -36,11 +36,10 @@
.cloud_popup .content p {
text-shadow: 1px 1px 1px #222;
margin: 0px 0px 12px 0px;
- text-align: justify;
color: #EEE;
}
-/* line 48, cloudpopup.scss */
+/* line 47, cloudpopup.scss */
.cloud_popup .content .btn_test {
float: right;
clear: right;
@@ -48,7 +47,7 @@
width: 60px;
}
-/* line 56, cloudpopup.scss */
+/* line 55, cloudpopup.scss */
.cloud_popup .content label {
float: left;
margin: 5px 8px 0px 0px;
@@ -57,7 +56,7 @@
text-align: right;
}
-/* line 65, cloudpopup.scss */
+/* line 64, cloudpopup.scss */
.cloud_popup .content input {
display: block;
float: left;
@@ -73,7 +72,7 @@
background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(45%, #434343), color-stop(100%, #292929));
}
-/* line 81, cloudpopup.scss */
+/* line 80, cloudpopup.scss */
.cloud_popup .content input:focus {
text-shadow: none;
background: #FFF;
@@ -81,7 +80,7 @@
color: #292929;
}
-/* line 89, cloudpopup.scss */
+/* line 88, cloudpopup.scss */
.cloud_popup .content .status {
float: left;
clear: right;
@@ -90,7 +89,7 @@
width: 240px;
}
-/* line 98, cloudpopup.scss */
+/* line 97, cloudpopup.scss */
.cloud_popup .content .btn_ok, .cloud_popup .content .btn_cancel {
width: 80px;
text-align: center;
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
index 047e2dd1..5137beff 100755
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
@@ -40,7 +40,6 @@ $grey_light: #494949;
{
text-shadow: 1px 1px 1px #222;
margin: 0px 0px 12px 0px;
- text-align: justify;
color: #EEE;
}
--
cgit v1.2.3
From b354ea65f7c53ce05aff6a204853e666f084950f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 1 Feb 2012 13:56:49 -0800
Subject: Adding cancel functionality to cloud popup
Added the functionality to the cloud pupup cancel button to set the rootURL to null if selected, ok button will allow the value to remain as last input. Test button tests the URL, and therefore set it, but does not handling closing the dialog.
---
js/io/ui/cloudpopup.reel/cloudpopup.js | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
(limited to 'js/io/ui/cloudpopup.reel')
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index e8558179..7f494dcf 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -51,6 +51,9 @@ exports.CloudPopup = Montage.create(Component, {
value: function() {
//
this.testConnection();
+ if (this.application.ninja.coreIoApi.cloudAvailable()) {
+ this.closeDialog();
+ }
}
},
////////////////////////////////////////////////////////////////////
@@ -62,7 +65,7 @@ exports.CloudPopup = Montage.create(Component, {
this.components.test_btn.addEventListener('click', this.testConnection.bind(this), false);
//
this.components.ok_btn.addEventListener('click', this.closeDialog.bind(this), false);
- this.components.cancel_btn.addEventListener('click', this.closeDialog.bind(this), false);
+ this.components.cancel_btn.addEventListener('click', this.cancelDialog.bind(this), false);
}
},
////////////////////////////////////////////////////////////////////
@@ -90,6 +93,16 @@ exports.CloudPopup = Montage.create(Component, {
//
this.application.ninja.coreIoApi.hideCloudDialog();
}
+ },
+ ////////////////////////////////////////////////////////////////////
+ //
+ cancelDialog: {
+ enumerable: false,
+ value: function() {
+ //
+ this.application.ninja.coreIoApi.rootUrl = null;
+ this.application.ninja.coreIoApi.hideCloudDialog();
+ }
}
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
--
cgit v1.2.3