aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui
diff options
context:
space:
mode:
authorAnanya Sen2012-02-02 12:38:29 -0800
committerAnanya Sen2012-02-02 12:38:29 -0800
commite806afea0eb1b66ac457471983db0e3d5942d222 (patch)
treed2b712293dc0c8b5f6d9dfe77f7b7eebfd62ac7c /js/io/ui
parent0e595c4e11ce9b44eff157de8616ed15fcd5d6fc (diff)
parent33e655cbbb0816340c5a2e5d5cc0a6b0c7d9f53c (diff)
downloadninja-e806afea0eb1b66ac457471983db0e3d5942d222.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/io/ui')
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html2
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js15
-rw-r--r--js/io/ui/cloudpopup.reel/css/cloudpopup.css13
-rwxr-xr-xjs/io/ui/cloudpopup.reel/css/cloudpopup.scss1
4 files changed, 21 insertions, 10 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index fa4533d7..1ab0892d 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -34,7 +34,7 @@
34 34
35 <h3>Cloud Service Dialog</h3> 35 <h3>Cloud Service Dialog</h3>
36 36
37 <p>Duis aliquet egestas purus in blandit. Curabitur vulputate, ligula lacinia scelerisque tempor, lacus lacus ornare ante, ac egestas.</p> 37 <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
38 38
39 <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" /> 39 <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" />
40 40
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, {
51 value: function() { 51 value: function() {
52 // 52 //
53 this.testConnection(); 53 this.testConnection();
54 if (this.application.ninja.coreIoApi.cloudAvailable()) {
55 this.closeDialog();
56 }
54 } 57 }
55 }, 58 },
56 //////////////////////////////////////////////////////////////////// 59 ////////////////////////////////////////////////////////////////////
@@ -62,7 +65,7 @@ exports.CloudPopup = Montage.create(Component, {
62 this.components.test_btn.addEventListener('click', this.testConnection.bind(this), false); 65 this.components.test_btn.addEventListener('click', this.testConnection.bind(this), false);
63 // 66 //
64 this.components.ok_btn.addEventListener('click', this.closeDialog.bind(this), false); 67 this.components.ok_btn.addEventListener('click', this.closeDialog.bind(this), false);
65 this.components.cancel_btn.addEventListener('click', this.closeDialog.bind(this), false); 68 this.components.cancel_btn.addEventListener('click', this.cancelDialog.bind(this), false);
66 } 69 }
67 }, 70 },
68 //////////////////////////////////////////////////////////////////// 71 ////////////////////////////////////////////////////////////////////
@@ -90,6 +93,16 @@ exports.CloudPopup = Montage.create(Component, {
90 // 93 //
91 this.application.ninja.coreIoApi.hideCloudDialog(); 94 this.application.ninja.coreIoApi.hideCloudDialog();
92 } 95 }
96 },
97 ////////////////////////////////////////////////////////////////////
98 //
99 cancelDialog: {
100 enumerable: false,
101 value: function() {
102 //
103 this.application.ninja.coreIoApi.rootUrl = null;
104 this.application.ninja.coreIoApi.hideCloudDialog();
105 }
93 } 106 }
94 //////////////////////////////////////////////////////////////////// 107 ////////////////////////////////////////////////////////////////////
95 //////////////////////////////////////////////////////////////////// 108 ////////////////////////////////////////////////////////////////////
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 @@
36.cloud_popup .content p { 36.cloud_popup .content p {
37 text-shadow: 1px 1px 1px #222; 37 text-shadow: 1px 1px 1px #222;
38 margin: 0px 0px 12px 0px; 38 margin: 0px 0px 12px 0px;
39 text-align: justify;
40 color: #EEE; 39 color: #EEE;
41} 40}
42 41
43/* line 48, cloudpopup.scss */ 42/* line 47, cloudpopup.scss */
44.cloud_popup .content .btn_test { 43.cloud_popup .content .btn_test {
45 float: right; 44 float: right;
46 clear: right; 45 clear: right;
@@ -48,7 +47,7 @@
48 width: 60px; 47 width: 60px;
49} 48}
50 49
51/* line 56, cloudpopup.scss */ 50/* line 55, cloudpopup.scss */
52.cloud_popup .content label { 51.cloud_popup .content label {
53 float: left; 52 float: left;
54 margin: 5px 8px 0px 0px; 53 margin: 5px 8px 0px 0px;
@@ -57,7 +56,7 @@
57 text-align: right; 56 text-align: right;
58} 57}
59 58
60/* line 65, cloudpopup.scss */ 59/* line 64, cloudpopup.scss */
61.cloud_popup .content input { 60.cloud_popup .content input {
62 display: block; 61 display: block;
63 float: left; 62 float: left;
@@ -73,7 +72,7 @@
73 background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(45%, #434343), color-stop(100%, #292929)); 72 background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(45%, #434343), color-stop(100%, #292929));
74} 73}
75 74
76/* line 81, cloudpopup.scss */ 75/* line 80, cloudpopup.scss */
77.cloud_popup .content input:focus { 76.cloud_popup .content input:focus {
78 text-shadow: none; 77 text-shadow: none;
79 background: #FFF; 78 background: #FFF;
@@ -81,7 +80,7 @@
81 color: #292929; 80 color: #292929;
82} 81}
83 82
84/* line 89, cloudpopup.scss */ 83/* line 88, cloudpopup.scss */
85.cloud_popup .content .status { 84.cloud_popup .content .status {
86 float: left; 85 float: left;
87 clear: right; 86 clear: right;
@@ -90,7 +89,7 @@
90 width: 240px; 89 width: 240px;
91} 90}
92 91
93/* line 98, cloudpopup.scss */ 92/* line 97, cloudpopup.scss */
94.cloud_popup .content .btn_ok, .cloud_popup .content .btn_cancel { 93.cloud_popup .content .btn_ok, .cloud_popup .content .btn_cancel {
95 width: 80px; 94 width: 80px;
96 text-align: center; 95 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;
40{ 40{
41 text-shadow: 1px 1px 1px #222; 41 text-shadow: 1px 1px 1px #222;
42 margin: 0px 0px 12px 0px; 42 margin: 0px 0px 12px 0px;
43 text-align: justify;
44 color: #EEE; 43 color: #EEE;
45} 44}
46 45