From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/io/ui/cloudpopup.reel/cloudpopup.html | 90 +++++++------- js/io/ui/cloudpopup.reel/cloudpopup.js | 170 +++++++++++++-------------- js/io/ui/cloudpopup.reel/css/cloudpopup.scss | 160 ++++++++++++------------- 3 files changed, 210 insertions(+), 210 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 cd6e4c94..1d8da879 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html @@ -31,14 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. --> - - - - - - - - - - - + + + -
-
- -

Cloud Service Dialog

- -

Connection to the Cloud Server was not detected. Please verify
that the server is running and the URL below is correct.

- - - - - -
 
- - - - - -
- -

Install Ninja Cloud App

- -

The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.

- -
- - - -
- -
-
+ - +
+
+ +

Cloud Service Dialog

+ +

Connection to the Cloud Server was not detected. Please verify
that the server is running and the URL below is correct.

+ + + + + +
 
+ + + + + +
+ +

Install Ninja Cloud App

+ +

The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.

+ +
+ + + +
+ +
+
+ + diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js index c64d8974..7ae9e892 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.js +++ b/js/io/ui/cloudpopup.reel/cloudpopup.js @@ -30,136 +30,136 @@ POSSIBILITY OF SUCH DAMAGE. //////////////////////////////////////////////////////////////////////// // -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component; //////////////////////////////////////////////////////////////////////// // exports.CloudPopup = Montage.create(Component, { - //////////////////////////////////////////////////////////////////// - // - hasTemplate: { + //////////////////////////////////////////////////////////////////// + // + hasTemplate: { value: true }, //////////////////////////////////////////////////////////////////// - // - _os: { + // + _os: { value: null }, //////////////////////////////////////////////////////////////////// // components: { - enumerable: false, - value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null} + enumerable: false, + value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null} }, //////////////////////////////////////////////////////////////////// // prepareForDraw: { - enumerable: false, - value: function () { - // - this.components.test_btn = this.element.getElementsByClassName('btn_test nj-skinned')[0]; - this.components.ok_btn = this.element.getElementsByClassName('btn_ok nj-skinned')[0]; - this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0]; - this.components.status = this.element.getElementsByClassName('status')[0]; - this.components.url = this.element.getElementsByClassName('cloud_url')[0]; - this.components.download_btn = this.element.getElementsByClassName('btn_download nj-skinned')[0]; - } + enumerable: false, + value: function () { + // + this.components.test_btn = this.element.getElementsByClassName('btn_test nj-skinned')[0]; + this.components.ok_btn = this.element.getElementsByClassName('btn_ok nj-skinned')[0]; + this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0]; + this.components.status = this.element.getElementsByClassName('status')[0]; + this.components.url = this.element.getElementsByClassName('cloud_url')[0]; + this.components.download_btn = this.element.getElementsByClassName('btn_download nj-skinned')[0]; + } }, //////////////////////////////////////////////////////////////////// // willDraw: { - enumerable: false, - value: function() { - // - if (navigator.appVersion.indexOf("Win")!=-1) { - this._os = 'windows'; - } else if (navigator.appVersion.indexOf("Mac")!=-1) { - this._os = 'mac'; - } else { - //Alternate message for no OS detected (probably Linux) - this.element.getElementsByTagName('section')[0].style.display = 'none'; - } - } + enumerable: false, + value: function() { + // + if (navigator.appVersion.indexOf("Win")!=-1) { + this._os = 'windows'; + } else if (navigator.appVersion.indexOf("Mac")!=-1) { + this._os = 'mac'; + } else { + //Alternate message for no OS detected (probably Linux) + this.element.getElementsByTagName('section')[0].style.display = 'none'; + } + } }, //////////////////////////////////////////////////////////////////// // draw: { - enumerable: false, - value: function() { - // + enumerable: false, + value: function() { + // if (this.application.localStorage.getItem("ioRootUrl")) { this.components.url.value = this.application.localStorage.getItem("ioRootUrl"); - } - // - this.testConnection(); - if (this.application.ninja.coreIoApi.cloudAvailable()) { - this.closeDialog(); - } - } + } + // + this.testConnection(); + if (this.application.ninja.coreIoApi.cloudAvailable()) { + this.closeDialog(); + } + } }, //////////////////////////////////////////////////////////////////// // didDraw: { - enumerable: false, - value: function() { - // - this.components.download_btn.addEventListener('click', this.downloadCloudApp.bind(this), false); - // - 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.cancelDialog.bind(this), false); - } + enumerable: false, + value: function() { + // + this.components.download_btn.addEventListener('click', this.downloadCloudApp.bind(this), false); + // + 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.cancelDialog.bind(this), false); + } }, //////////////////////////////////////////////////////////////////// // downloadCloudApp: { - enumerable: false, - value: function() { - if(this._os === 'mac') { - location.href = '/ninja_localcloud_for_mac.zip'; - } else if (this._os === 'windows') { - location.href = '/ninja_localcloud_for_windows.zip'; - } else { - alert('Your operating system is not supported by the Ninja Local Cloud App.'); - } - } + enumerable: false, + value: function() { + if(this._os === 'mac') { + location.href = '/ninja_localcloud_for_mac.zip'; + } else if (this._os === 'windows') { + location.href = '/ninja_localcloud_for_windows.zip'; + } else { + alert('Your operating system is not supported by the Ninja Local Cloud App.'); + } + } }, //////////////////////////////////////////////////////////////////// // testConnection: { - enumerable: false, - value: function() { - // - this.application.ninja.coreIoApi.rootUrl = this.components.url.value; - // - if (this.application.ninja.coreIoApi.cloudAvailable()) { - this.components.status.style.color = '#77FF00'; - this.components.status.innerHTML = 'Connected to '+this.application.ninja.coreIoApi.cloudData.name; - } else { - this.components.status.style.color = '#FF3A3A'; - this.components.status.innerHTML = 'Disconnected'; - } - } + enumerable: false, + value: function() { + // + this.application.ninja.coreIoApi.rootUrl = this.components.url.value; + // + if (this.application.ninja.coreIoApi.cloudAvailable()) { + this.components.status.style.color = '#77FF00'; + this.components.status.innerHTML = 'Connected to '+this.application.ninja.coreIoApi.cloudData.name; + } else { + this.components.status.style.color = '#FF3A3A'; + this.components.status.innerHTML = 'Disconnected'; + } + } }, //////////////////////////////////////////////////////////////////// // closeDialog: { - enumerable: false, - value: function() { - // - this.application.ninja.coreIoApi.hideCloudDialog(); - } + enumerable: false, + value: function() { + // + this.application.ninja.coreIoApi.hideCloudDialog(); + } }, //////////////////////////////////////////////////////////////////// // cancelDialog: { - enumerable: false, - value: function() { - // - this.application.ninja.coreIoApi.rootUrl = null; - this.application.ninja.coreIoApi.hideCloudDialog(); - } + enumerable: false, + value: function() { + // + this.application.ninja.coreIoApi.rootUrl = null; + this.application.ninja.coreIoApi.hideCloudDialog(); + } } //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss index 870c5bbf..b8cb5aea 100755 --- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss +++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss @@ -34,75 +34,75 @@ $grey_light: #494949; .cloud_popup { - font-size: 12px; - text-shadow: 1px 1px 1px #000; - font-family: 'Droid Sans', sans-serif; + font-size: 12px; + text-shadow: 1px 1px 1px #000; + font-family: 'Droid Sans', sans-serif; } .cloud_popup .content { - width: 360px; + width: 360px; } .cloud_popup .content h3 { - text-transform: uppercase; - font-weight: normal; - font-size: 14px; - text-shadow: 1px 1px 1px #000; - font-family: 'Droid Sans', sans-serif; - display: block; - float: left; - clear: both; - margin: 4px 0px 8px 0px; - padding: 0px; - width: 100%; - text-align: center; + text-transform: uppercase; + font-weight: normal; + font-size: 14px; + text-shadow: 1px 1px 1px #000; + font-family: 'Droid Sans', sans-serif; + display: block; + float: left; + clear: both; + margin: 4px 0px 8px 0px; + padding: 0px; + width: 100%; + text-align: center; } .cloud_popup .content p { - text-shadow: 1px 1px 1px #222; - margin: 0px 0px 12px 0px; - color: #EEE; + text-shadow: 1px 1px 1px #222; + margin: 0px 0px 12px 0px; + color: #EEE; } .cloud_popup .content .btn_test { - float: right; - clear: right; - margin: 1px 2px 0px 8px; - width: 60px; + float: right; + clear: right; + margin: 1px 2px 0px 8px; + width: 60px; } .cloud_popup .content label { - float: left; - margin: 5px 8px 0px 0px; - display: block; - width: 96px; - text-align: right; + float: left; + margin: 5px 8px 0px 0px; + display: block; + width: 96px; + text-align: right; } .cloud_popup .content input { - display: block; - float: left; - color: #FFF; - border: 0px; - padding: 4px; - margin: 0px; - width: 176px; - border-radius: 4px; - text-shadow: 1px 1px 1px #222; - font-family: 'Droid Sans', sans-serif; - border: 1px lighten($grey_dark, 20%) solid; - background: $grey_dark -webkit-gradient(linear, left top, left bottom, color-stop(45%, lighten($grey_dark, 10%)), color-stop(100%, $grey_dark)); + display: block; + float: left; + color: #FFF; + border: 0px; + padding: 4px; + margin: 0px; + width: 176px; + border-radius: 4px; + text-shadow: 1px 1px 1px #222; + font-family: 'Droid Sans', sans-serif; + border: 1px lighten($grey_dark, 20%) solid; + background: $grey_dark -webkit-gradient(linear, left top, left bottom, color-stop(45%, lighten($grey_dark, 10%)), color-stop(100%, $grey_dark)); } .cloud_popup .content input:focus { - text-shadow: none; + text-shadow: none; background: #FFF; border: 1px $grey_dark solid; color: $grey_dark; @@ -110,63 +110,63 @@ $grey_light: #494949; .cloud_popup .content .status { - float: left; - clear: right; - margin: 5px 0px 0px 6px; - text-shadow: 1px 1px 1px #333; - width: 240px; + float: left; + clear: right; + margin: 5px 0px 0px 6px; + text-shadow: 1px 1px 1px #333; + width: 240px; } .cloud_popup .content .btn_ok, .cloud_popup .content .btn_cancel { - width: 80px; - text-align: center; - float: right; - margin: 8px 2px 2px 8px; + width: 80px; + text-align: center; + float: right; + margin: 8px 2px 2px 8px; } .cloud_popup section { - float: left; - clear: both; - margin: 16px 0px 0px 0px; - background: #333 -webkit-linear-gradient(top, rgb(50, 50, 50) 0%, rgb(60, 60, 60) 100%); - border: 1px solid #333; - padding: 8px; - border-radius: 6px; + float: left; + clear: both; + margin: 16px 0px 0px 0px; + background: #333 -webkit-linear-gradient(top, rgb(50, 50, 50) 0%, rgb(60, 60, 60) 100%); + border: 1px solid #333; + padding: 8px; + border-radius: 6px; } .cloud_popup section h4 { - text-transform: uppercase; - font-weight: normal; - font-size: 12px; - text-shadow: 1px 1px 1px #000; - font-family: 'Droid Sans', sans-serif; - display: block; - float: left; - clear: both; - margin: 2px 0px 6px 0px; - padding: 0px; - width: 100%; - text-align: center; + text-transform: uppercase; + font-weight: normal; + font-size: 12px; + text-shadow: 1px 1px 1px #000; + font-family: 'Droid Sans', sans-serif; + display: block; + float: left; + clear: both; + margin: 2px 0px 6px 0px; + padding: 0px; + width: 100%; + text-align: center; } .cloud_popup section .btn_download { - width: 120px; - text-align: center; - margin: 10px 0px 2px 4px; - float: left; - font-size: 11px; + width: 120px; + text-align: center; + margin: 10px 0px 2px 4px; + float: left; + font-size: 11px; } .cloud_popup section .cloud_icon { - background-image: url(../../../../../ninja_icon_128.png); - background-size: 100% 100%; - width: 60px; - height: 60px; - float: left; - margin: -10px 0px -6px 56px; + background-image: url(../../../../../ninja_icon_128.png); + background-size: 100% 100%; + width: 60px; + height: 60px; + float: left; + margin: -10px 0px -6px 56px; } -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/io/ui/cloudpopup.reel/cloudpopup.html | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 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 1d8da879..99888793 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html @@ -29,14 +29,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - + - + - + - + - + - + - +
- +

Cloud Service Dialog

- +

Connection to the Cloud Server was not detected. Please verify
that the server is running and the URL below is correct.

- + - + - +
 
- + - + - +
- +

Install Ninja Cloud App

- +

The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.

- +
- + - +
- +
- + -- cgit v1.2.3 From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:44:57 -0700 Subject: Remove byte order markers (BOM) --- 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 99888793..50986e93 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html @@ -1,4 +1,4 @@ - +