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 +++++++++---------- .../picker-navigator.reel/picker-navigator.css | 12 +- .../picker-navigator.reel/picker-navigator.js | 18 +-- .../new-file-location.reel/new-file-location.js | 2 +- .../new-file-options-navigator.css | 22 +-- .../new-file-options-navigator.js | 14 +- js/io/ui/save-as-dialog.reel/save-as-dialog.css | 6 +- js/io/ui/save-as-dialog.reel/save-as-dialog.js | 2 +- 10 files changed, 248 insertions(+), 248 deletions(-) (limited to 'js/io/ui') 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; } diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css index e4ecf167..17d9aec1 100644 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css @@ -39,8 +39,8 @@ POSSIBILITY OF SUCH DAMAGE. background-color:#494949; font-family: 'Droid Sans', sans-serif; border-radius: 8px; - box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); - text-shadow: 1px 1px 1px #000; + box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); + text-shadow: 1px 1px 1px #000; } .picker .pickerHeader{ @@ -229,13 +229,13 @@ POSSIBILITY OF SUCH DAMAGE. } .picker .buttons button { - float: left; - width: 100px; - margin-top: 3px; + float: left; + width: 100px; + margin-top: 3px; } .picker .okButton{ - margin: 0px 22px 0px 8px; + margin: 0px 22px 0px 8px; /* margin-right:25px; -webkit-box-align: center; diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js index ddccc3d5..3066e0a8 100644 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js @@ -210,25 +210,25 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { }, willDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } }, draw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { this.filterVal.innerHTML = this.pickerModel.currentFilter; if(this.pickerModel.fatalError !== null){ this.error.innerHTML = this.pickerModel.fatalError; } - } + } }, didDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { var that = this; this.iconList = null; @@ -376,7 +376,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, { //ready to show picker now this.element.style.visibility = "visible"; this.element.focus(); - } + } }, updateAddressBar:{ diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js index ef66c0a2..7630f392 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js @@ -58,7 +58,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false); this.newFileName.element.addEventListener("keyup", this, false); - this.newFileName.element.focus(); + this.newFileName.element.focus(); this.newFileName.element.select(); } }, diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css index 10dd277d..1ea9fab5 100755 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css @@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. color:#ffffff; font-family: 'Droid Sans', sans-serif; border-radius: 8px; - box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); + box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); } .newfile .title{ @@ -47,8 +47,8 @@ POSSIBILITY OF SUCH DAMAGE. padding:5px; text-align: center; text-transform: uppercase; - font-weight: normal; - text-shadow: 1px 1px 1px #000; + font-weight: normal; + text-shadow: 1px 1px 1px #000; } .newfile .container{ @@ -84,7 +84,7 @@ POSSIBILITY OF SUCH DAMAGE. .newfile .right-bottom{ border: 1px solid #000000; - border-left: none; + border-left: none; overflow: auto; height:42%; padding: 15px; @@ -95,8 +95,8 @@ POSSIBILITY OF SUCH DAMAGE. padding:5px; text-align: center; text-transform: uppercase; - font-weight: normal; - text-shadow: 1px 1px 1px #000; + font-weight: normal; + text-shadow: 1px 1px 1px #000; } .newfile .buttons{ @@ -130,7 +130,7 @@ POSSIBILITY OF SUCH DAMAGE. } .newfile .atreeItem { - text-shadow: 1px 1px 1px #000; + text-shadow: 1px 1px 1px #000; } .newfile .atreeItem .name{ @@ -163,13 +163,13 @@ POSSIBILITY OF SUCH DAMAGE. } .newfile .buttons button { - float: left; - width: 100px; - margin-top: 3px; + float: left; + width: 100px; + margin-top: 3px; } .newfile .okButton{ - margin: 0px 18px 0px 8px; + margin: 0px 18px 0px 8px; /* margin-right:25px; -webkit-box-align: center; diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js index a888d304..6a4edd1f 100644 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js @@ -142,8 +142,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C }, didDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { var that = this; this.templateList = null; @@ -309,7 +309,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C handleOkButtonAction:{ value: function(evt){ var templateData, - selectedProjectTypeID = this.selectedProjectType.uri, + selectedProjectTypeID = this.selectedProjectType.uri, templateID = this.selectedTemplate.uri, projectName = this.newFileLocation.newFileName.value, projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value, @@ -324,10 +324,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C "projectDirectory="+projectDirectory+"\n"+ "projectWidth="+projectWidth+"\n"+ "projectHeight="+projectHeight; - //////////////////////////////////////////////////////////////////// - //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…) - templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type}; - //////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////// + //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…) + templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type}; + //////////////////////////////////////////////////////////////////// if(/[^/\\]$/g.test(projectDirectory)){ projectDirectory = projectDirectory + "/"; diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.css b/js/io/ui/save-as-dialog.reel/save-as-dialog.css index 5953cc45..d1612882 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.css +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.css @@ -94,9 +94,9 @@ POSSIBILITY OF SUCH DAMAGE. } .saveAsDialog .buttons button { - float: left; - width: 100px; - margin-top: 3px; + float: left; + width: 100px; + margin-top: 3px; } .saveAsDialog .okButton{ diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js index 276d38b4..38113ed0 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js @@ -33,7 +33,7 @@ var Montage = require("montage/core/core").Montage, var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { - hasReel: { + hasReel: { value: true }, -- cgit v1.2.3