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 /js/io | |
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.
Diffstat (limited to 'js/io')
5 files changed, 61 insertions, 43 deletions
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 | var TextDocument = exports.TextDocument = Montage.create(BaseDocument, { | 13 | exports.TextDocument = Montage.create(BaseDocument, { |
14 | // PRIVATE MEMBERS | 14 | // PRIVATE MEMBERS |
15 | _codeEditor: { | 15 | _codeEditor: { |
16 | value: { | 16 | value: { |
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css index 092ca626..e79082a6 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css | |||
@@ -7,11 +7,13 @@ | |||
7 | .newfileLocation .newFileName{ | 7 | .newfileLocation .newFileName{ |
8 | width:65%; | 8 | width:65%; |
9 | margin-left:5px; | 9 | margin-left:5px; |
10 | text-shadow: 1px 1px 1px #000; | ||
10 | } | 11 | } |
11 | 12 | ||
12 | .newfileLocation .newFileDirectory{ | 13 | .newfileLocation .newFileDirectory{ |
13 | width:70%; | 14 | width:70%; |
14 | margin-left:5px; | 15 | margin-left:5px; |
16 | text-shadow: 1px 1px 1px #000; | ||
15 | } | 17 | } |
16 | 18 | ||
17 | .newfileLocation .templateSelection{ | 19 | .newfileLocation .templateSelection{ |
@@ -32,6 +34,7 @@ | |||
32 | .newfileLocation .locationSelection{ | 34 | .newfileLocation .locationSelection{ |
33 | float:left; | 35 | float:left; |
34 | width:75%; | 36 | width:75%; |
37 | text-shadow: 1px 1px 1px #000; | ||
35 | } | 38 | } |
36 | 39 | ||
37 | .newfileLocation .locationSelection div{ | 40 | .newfileLocation .locationSelection div{ |
@@ -41,6 +44,7 @@ | |||
41 | .newfileLocation .locationSelection input{ | 44 | .newfileLocation .locationSelection input{ |
42 | margin-left: 5px; | 45 | margin-left: 5px; |
43 | white-space: nowrap; | 46 | white-space: nowrap; |
47 | text-shadow: 1px 1px 1px #333; | ||
44 | } | 48 | } |
45 | 49 | ||
46 | .newfileLocation .templatePx{ | 50 | .newfileLocation .templatePx{ |
@@ -50,6 +54,7 @@ | |||
50 | 54 | ||
51 | .newfileLocation .nameText{ | 55 | .newfileLocation .nameText{ |
52 | margin-right:28px; | 56 | margin-right:28px; |
57 | text-shadow: 1px 1px 1px #000; | ||
53 | } | 58 | } |
54 | 59 | ||
55 | .newfileLocation .hottextunit{ | 60 | .newfileLocation .hottextunit{ |
@@ -58,5 +63,6 @@ | |||
58 | } | 63 | } |
59 | 64 | ||
60 | .newfileLocation .fileExtension{ | 65 | .newfileLocation .fileExtension{ |
61 | color:#d7d7d7; | 66 | color:#FFF; |
67 | text-shadow: 1px 1px 1px #000; | ||
62 | } | 68 | } |
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 95ce01f9..5a359200 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 | |||
@@ -9,9 +9,12 @@ | |||
9 | width:650px; | 9 | width:650px; |
10 | height:350px; | 10 | height:350px; |
11 | padding-left: 15px; | 11 | padding-left: 15px; |
12 | padding-bottom:25px; | 12 | padding-bottom:32px; |
13 | background-color:#313131; | 13 | background-color:#494949; |
14 | color:#ffffff; | 14 | color:#ffffff; |
15 | font-family: 'Droid Sans', sans-serif; | ||
16 | border-radius: 8px; | ||
17 | box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); | ||
15 | } | 18 | } |
16 | 19 | ||
17 | .newfile .title{ | 20 | .newfile .title{ |
@@ -19,12 +22,14 @@ | |||
19 | height:15px; | 22 | height:15px; |
20 | padding:5px; | 23 | padding:5px; |
21 | text-align: center; | 24 | text-align: center; |
22 | font-weight: bold; | 25 | text-transform: uppercase; |
23 | color: #C1C1C1; | 26 | font-weight: normal; |
27 | text-shadow: 1px 1px 1px #000; | ||
24 | } | 28 | } |
25 | 29 | ||
26 | .newfile .container{ | 30 | .newfile .container{ |
27 | border: 1px groove #000000; | 31 | border: 1px solid #000000; |
32 | border-right: none; | ||
28 | overflow: auto; | 33 | overflow: auto; |
29 | background-color:#5f5f5f; | 34 | background-color:#5f5f5f; |
30 | } | 35 | } |
@@ -45,7 +50,7 @@ | |||
45 | } | 50 | } |
46 | 51 | ||
47 | .newfile .right-top{ | 52 | .newfile .right-top{ |
48 | border: 1px groove #000000; | 53 | border-right: 1px solid #000000; |
49 | overflow: auto; | 54 | overflow: auto; |
50 | min-height:150px; | 55 | min-height:150px; |
51 | height:58%; | 56 | height:58%; |
@@ -54,7 +59,8 @@ | |||
54 | } | 59 | } |
55 | 60 | ||
56 | .newfile .right-bottom{ | 61 | .newfile .right-bottom{ |
57 | border: 1px groove #000000; | 62 | border: 1px solid #000000; |
63 | border-left: none; | ||
58 | overflow: auto; | 64 | overflow: auto; |
59 | height:42%; | 65 | height:42%; |
60 | padding: 15px; | 66 | padding: 15px; |
@@ -64,7 +70,9 @ |