aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui
diff options
context:
space:
mode:
authorAnanya Sen2012-02-10 02:04:42 -0800
committerAnanya Sen2012-02-10 02:04:42 -0800
commitcc3d8f5dfa82cf0a3620653af7e974f7417650f9 (patch)
tree4afe69f30f364f2011d706faced7243fb0eb6256 /js/io/ui
parentad0ee69be3512325ede94738f23597086a141a3e (diff)
parentfbe830fabe497d01f4f2eaddb867161a8187c101 (diff)
downloadninja-cc3d8f5dfa82cf0a3620653af7e974f7417650f9.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts: js/io/document/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/ui')
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html12
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js26
-rw-r--r--js/io/ui/cloudpopup.reel/css/cloudpopup.css46
-rwxr-xr-xjs/io/ui/cloudpopup.reel/css/cloudpopup.scss46
4 files changed, 127 insertions, 3 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index 1ab0892d..8e65a705 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -46,6 +46,18 @@
46 46
47 <button class="btn_ok nj-skinned">Ok</button> 47 <button class="btn_ok nj-skinned">Ok</button>
48 48
49 <section>
50
51 <h4>Install Ninja Cloud App</h4>
52
53 <p>Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus.</p>
54
55 <div class="cloud_icon"></div>
56
57 <button class="btn_download nj-skinned">Download</button>
58
59 </section>
60
49 </div> 61 </div>
50 </div> 62 </div>
51 63
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 7f494dcf..1344661b 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -17,10 +17,15 @@ exports.CloudPopup = Montage.create(Component, {
17 value: true 17 value: true
18 }, 18 },
19 //////////////////////////////////////////////////////////////////// 19 ////////////////////////////////////////////////////////////////////
20 //
21 _os: {
22 value: null
23 },
24 ////////////////////////////////////////////////////////////////////
20 // 25 //
21 components: { 26 components: {
22 enumerable: false, 27 enumerable: false,
23 value: {test_btn: null, ok_btn: null, cancel_btn: null, status: null, url: null} 28 value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null}
24 }, 29 },
25 //////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////
26 // 31 //
@@ -33,6 +38,7 @@ exports.CloudPopup = Montage.create(Component, {
33 this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0]; 38 this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0];
34 this.components.status = this.element.getElementsByClassName('status')[0]; 39 this.components.status = this.element.getElementsByClassName('status')[0];
35 this.components.url = this.element.getElementsByClassName('cloud_url')[0]; 40 this.components.url = this.element.getElementsByClassName('cloud_url')[0];
41 this.components.download_btn = this.element.getElementsByClassName('btn_download nj-skinned')[0];
36 } 42 }
37 }, 43 },
38 //////////////////////////////////////////////////////////////////// 44 ////////////////////////////////////////////////////////////////////
@@ -41,7 +47,11 @@ exports.CloudPopup = Montage.create(Component, {
41 enumerable: false, 47 enumerable: false,
42 value: function() { 48 value: function() {
43 // 49 //
44 50 if (navigator.appVersion.indexOf("Win")!=-1) {
51 this._os = 'windows';
52 } else if (navigator.appVersion.indexOf("Mac")!=-1) {
53 this._os = 'mac';
54 }
45 } 55 }
46 }, 56 },
47 //////////////////////////////////////////////////////////////////// 57 ////////////////////////////////////////////////////////////////////
@@ -62,6 +72,8 @@ exports.CloudPopup = Montage.create(Component, {
62 enumerable: false, 72 enumerable: false,
63 value: function() { 73 value: function() {
64 // 74 //
75 this.components.download_btn.addEventListener('click', this.downloadCloudApp.bind(this), false);
76 //
65 this.components.test_btn.addEventListener('click', this.testConnection.bind(this), false); 77 this.components.test_btn.addEventListener('click', this.testConnection.bind(this), false);
66 // 78 //
67 this.components.ok_btn.addEventListener('click', this.closeDialog.bind(this), false); 79 this.components.ok_btn.addEventListener('click', this.closeDialog.bind(this), false);
@@ -69,7 +81,15 @@ exports.CloudPopup = Montage.create(Component, {
69 } 81 }
70 }, 82 },
71 //////////////////////////////////////////////////////////////////// 83 ////////////////////////////////////////////////////////////////////
72 //this.application.ninja.coreIoApi.hideCloudDialog 84 //
85 downloadCloudApp: {
86 enumerable: false,
87 value: function() {
88 console.log(this._os);
89 }
90 },
91 ////////////////////////////////////////////////////////////////////
92 //
73 testConnection: { 93 testConnection: {
74 enumerable: false, 94 enumerable: false,
75 value: function() { 95 value: function() {
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.css b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
index fcf85e75..85c80ad5 100644
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.css
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
@@ -96,3 +96,49 @@
96 float: right; 96 float: right;
97 margin: 8px 2px 2px 8px; 97 margin: 8px 2px 2px 8px;
98} 98}
99
100/* line 105, cloudpopup.scss */
101.cloud_popup section {
102 float: left;
103 clear: both;
104 margin: 16px 0px 0px 0px;
105 background: #333333 -webkit-linear-gradient(top, #323232 0%, #3c3c3c 100%);
106 border: 1px solid #333;
107 padding: 8px;
108 border-radius: 6px;
109}
110
111/* line 116, cloudpopup.scss */
112.cloud_popup section h4 {
113 text-transform: uppercase;
114 font-weight: normal;
115 font-size: 12px;
116 text-shadow: 1px 1px 1px #000;
117 font-family: 'Droid Sans', sans-serif;
118 display: block;
119 float: left;
120 clear: both;
121 margin: 2px 0px 6px 0px;
122 padding: 0px;
123 width: 100%;
124 text-align: center;
125}
126
127/* line 132, cloudpopup.scss */
128.cloud_popup section .btn_download {
129 width: 120px;
130 text-align: center;
131 margin: 10px 0px 2px 4px;
132 float: left;
133 font-size: 11px;
134}
135
136/* line 141, cloudpopup.scss */
137.cloud_popup section .cloud_icon {
138 background-image: url(../../../../../ninja_icon_128.png);
139 background-size: 100% 100%;
140 width: 60px;
141 height: 60px;
142 float: left;
143 margin: -10px 0px -6px 56px;
144}
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
index b8c9f880..deab188e 100755
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
@@ -99,4 +99,50 @@ $grey_light: #494949;
99 text-align: center; 99 text-align: center;
100 float: right; 100 float: right;
101 margin: 8px 2px 2px 8px; 101 margin: 8px 2px 2px 8px;
102}
103
104.cloud_popup section
105{
106 float: left;
107 clear: both;
108 margin: 16px 0px 0px 0px;
109 background: #333 -webkit-linear-gradient(top, rgb(50, 50, 50) 0%, rgb(60, 60, 60) 100%);
110 border: 1px solid #333;
111 padding: 8px;
112 border-radius: 6px;
113}
114
115.cloud_popup section h4
116{
117 text-transform: uppercase;
118 font-weight: normal;
119 font-size: 12px;
120 text-shadow: 1px 1px 1px #000;
121 font-family: 'Droid Sans', sans-serif;
122 display: block;
123 float: left;
124 clear: both;
125 margin: 2px 0px 6px 0px;
126 padding: 0px;
127 width: 100%;
128 text-align: center;
129}
130
131.cloud_popup section .btn_download
132{
133 width: 120px;
134 text-align: center;
135 margin: 10px 0px 2px 4px;
136 float: left;
137 font-size: 11px;
138}
139
140.cloud_popup section .cloud_icon
141{
142 background-image: url(../../../../../ninja_icon_128.png);
143 background-size: 100% 100%;
144 width: 60px;
145 height: 60px;
146 float: left;
147 margin: -10px 0px -6px 56px;
102} \ No newline at end of file 148} \ No newline at end of file