diff options
author | Jose Antonio Marquez | 2012-02-13 22:39:28 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-13 22:39:28 -0800 |
commit | 5b6c62b7164cbde2845a3f7af810568e5ba53a6a (patch) | |
tree | 48237b0fd7286359aa7e585a6c144cc7fed1a43b | |
parent | 64f54ffcebf09c570972b91ea5fdb7fe7654e622 (diff) | |
download | ninja-5b6c62b7164cbde2845a3f7af810568e5ba53a6a.tar.gz |
File IO UI tweaks
Making minor tweaks to the UI for file IO, will need to make much more at a later time.
7 files changed, 89 insertions, 51 deletions
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css index 93578ec1..9c85c6b5 100644 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css | |||
@@ -12,7 +12,11 @@ | |||
12 | padding-left:15px; | 12 | padding-left:15px; |
13 | padding-bottom:15px; | 13 | padding-bottom:15px; |
14 | color:#ffffff; | 14 | color:#ffffff; |
15 | background-color:#313131; | 15 | background-color:#494949; |
16 | font-family: 'Droid Sans', sans-serif; | ||
17 | border-radius: 8px; | ||
18 | box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); | ||
19 | text-shadow: 1px 1px 1px #000; | ||
16 | } | 20 | } |
17 | 21 | ||
18 | .picker .pickerHeader{ | 22 | .picker .pickerHeader{ |
@@ -20,7 +24,7 @@ | |||
20 | } | 24 | } |
21 | 25 | ||
22 | .picker .container{ | 26 | .picker .container{ |
23 | border: 1px groove #000000; | 27 | border: 1px solid #000000; |
24 | overflow: auto; | 28 | overflow: auto; |
25 | background-color:#5f5f5f; | 29 | background-color:#5f5f5f; |
26 | } | 30 | } |
@@ -39,21 +43,26 @@ | |||
39 | width:75%; | 43 | width:75%; |
40 | height:88%; | 44 | height:88%; |
41 | overflow: hidden; | 45 | overflow: hidden; |
46 | border-left: none; | ||
42 | } | 47 | } |
43 | 48 | ||
44 | .picker .right-top{ | 49 | .picker .right-top{ |
45 | border: 1px groove #000000; | 50 | border-right: 1px solid #000000; |
46 | overflow: auto; | 51 | overflow: auto; |
47 | min-height:150px; | 52 | min-height:150px; |
48 | height:75%; | 53 | height:75%; |
49 | width:auto; | 54 | width:auto; |
55 | border-right: none; | ||
50 | } | 56 | } |
51 | 57 | ||
52 | .picker .right-bottom{ | 58 | .picker .right-bottom{ |
53 | border: 1px groove #000000; | 59 | border: 1px solid #000000; |
60 | border-left: none; | ||
54 | overflow: auto; | 61 | overflow: auto; |
55 | height:20%; | 62 | height:20%; |
56 | padding: 10px; | 63 | padding: 10px; |
64 | border-bottom: none; | ||
65 | border-right: none; | ||
57 | } | 66 | } |
58 | 67 | ||
59 | .picker .driversList{ | 68 | .picker .driversList{ |
@@ -194,8 +203,16 @@ | |||
194 | pointer:auto; | 203 | pointer:auto; |
195 | } | 204 | } |
196 | 205 | ||
206 | .picker .buttons button { | ||
207 | float: left; | ||
208 | width: 100px; | ||
209 | margin-top: 3px; | ||
210 | } | ||
211 | |||
197 | .picker .okButton{ | 212 | .picker .okButton{ |
198 | margin-right:25px; | 213 | margin: 0px 22px 0px 8px; |
214 | /* | ||
215 | margin-right:25px; | ||
199 | -webkit-box-align: center; | 216 | -webkit-box-align: center; |
200 | text-align: center; | 217 | text-align: center; |
201 | cursor: default; | 218 | cursor: default; |
@@ -206,10 +223,12 @@ | |||
206 | border-radius:10px; | 223 | border-radius:10px; |
207 | background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); | 224 | background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); |
208 | cursor:pointer; | 225 | cursor:pointer; |
226 | */ | ||
209 | } | 227 | } |
210 | 228 | ||
211 | .picker .cancelButton{ | 229 | .picker .cancelButton{ |
212 | -webkit-box-align: center; | 230 | /* |
231 | -webkit-box-align: center; | ||
213 | text-align: center; | 232 | text-align: center; |
214 | cursor: default; | 233 | cursor: default; |
215 | padding: 0px 6px 0px; | 234 | padding: 0px 6px 0px; |
@@ -219,6 +238,7 @@ | |||
219 | border-radius:10px; | 238 | border-radius:10px; |
220 | background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); | 239 | background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); |
221 | cursor:pointer; | 240 | cursor:pointer; |
241 | */ | ||
222 | } | 242 | } |
223 | 243 | ||
224 | .picker input[type="button"]:disabled{ | 244 | .picker input[type="button"]:disabled{ |
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html index bd427f97..20cb0c68 100755 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html | |||
@@ -67,8 +67,8 @@ | |||
67 | <div id="right-bottom" class="right-bottom"></div> | 67 | <div id="right-bottom" class="right-bottom"></div> |
68 | </div> | 68 | </div> |
69 | <div class="buttons"> | 69 | <div class="buttons"> |
70 | <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" /> | 70 | <button id="cancelButton" value="CANCEL" class="cancelButton nj-skinned">Cancel</button> |
71 | <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" /> | 71 | <button id="okButton" disabled="true" value="OK" class="okButton nj-skinned">Ok</button> |
72 | </div> | 72 | </div> |
73 | <div id="filters" class="filters" style="display:block;"> | 73 | <div id="filters" class="filters" style="display:block;"> |
74 | <div class="dropdown hide"></div> | 74 | <div class="dropdown hide"></div> |
diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js index 520906ab..ac556c2d 100755 --- a/js/io/document/html-document.js +++ b/js/io/document/html-document.js | |||
@@ -4,11 +4,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage, | 7 | //////////////////////////////////////////////////////////////////////// |
8 | baseDocumentModule = require("js/io/document/base-document"), | 8 | // |
9 | NJUtils = require("js/lib/NJUtils").NJUtils; | 9 | var Montage = require("montage/core/core").Montage, |
10 | 10 | BaseDocument = require("js/io/document/base-document").BaseDocument, | |
11 | var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.BaseDocument, { | 11 | NJUtils = require("js/lib/NJUtils").NJUtils; |
12 | //////////////////////////////////////////////////////////////////////// | ||
13 | // | ||
14 | exports.HTMLDocument = Montage.create(BaseDocument, { | ||
12 | // PRIVATE MEMBERS | 15 | // PRIVATE MEMBERS |
13 | _selectionExclude: { value: null, enumerable: false }, | 16 | _selectionExclude: { value: null, enumerable: false }, |
14 | _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false}, | 17 | _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false}, |
@@ -477,32 +480,13 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base | |||
477 | //TODO: Add code view logic and also styles for HTML | 480 | //TODO: Add code view logic and also styles for HTML |
478 | if (this.currentView === 'design') { | 481 | if (this.currentView === 'design') { |
479 | return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; | 482 | return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML}; |
480 | } else if(this.currentView === "code"){ | 483 | } else if (this.currentView === "code"){ |
481 | //TODO: Would this get call when we are in code of HTML? | 484 | //TODO: Would this get call when we are in code of HTML? |
485 | } else { | ||
486 | //Error | ||
482 | } | 487 | } |
483 | } | 488 | } |
484 | } | 489 | } |
485 | //////////////////////////////////////////////////////////////////// | 490 | //////////////////////////////////////////////////////////////////// |
486 | //////////////////////////////////////////////////////////////////// | 491 | //////////////////////////////////////////////////////////////////// |
487 | |||
488 | |||
489 | /* | ||
490 | save:{ | ||
491 | value:function(){ | ||
492 | try{ | ||
493 | if(this.currentView === "design"){ | ||
494 | //generate html and save | ||
495 | }else if((this.currentView === "code") && (this.codeViewDocument !== null)){ | ||
496 | this.codeViewDocument.editor.save(); | ||
497 | //persist to filesystem | ||
498 | } | ||
499 | this.dirtyFlag=false; | ||
500 | }catch(e){ | ||
501 | console.log("Error while saving "+this.uri); | ||
502 | console.log(e.stack); | ||
503 | } | ||
504 | } | ||
505 | } | ||
506 | */ | ||
507 | |||
508 | }); \ No newline at end of file | 492 | }); \ No newline at end of file |
diff --git a/js/io/document/text-document.js b/js/io/document/text-document.js index e149c479..87fcc551 100755 --- a/js/io/document/text-document.js +++ b/js/io/document/text-document.js | |||
@@ -10,7 +10,7 @@ var Montage = require("montage/core/core").Montage, | |||
10 | BaseDocument = require("js/io/document/base-document").BaseDocument; | 10 | BaseDocument = require("js/io/document/base-document").BaseDocument; |
11 | //////////////////////////////////////////////////////////////////////// | 11 | //////////////////////////////////////////////////////////////////////// |
12 | // | 12 | // |
13 |