From 5b6c62b7164cbde2845a3f7af810568e5ba53a6a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 13 Feb 2012 22:39:28 -0800
Subject: File IO UI tweaks
Making minor tweaks to the UI for file IO, will need to make much more at a later time.
---
js/io/document/html-document.js | 38 +++++-----------
js/io/document/text-document.js | 2 +-
.../new-file-location.reel/new-file-location.css | 8 +++-
.../new-file-options-navigator.css | 52 +++++++++++++++++-----
.../new-file-options-navigator.html | 4 +-
5 files changed, 61 insertions(+), 43 deletions(-)
(limited to 'js/io')
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
(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
*/
-var Montage = require("montage/core/core").Montage,
- baseDocumentModule = require("js/io/document/base-document"),
- NJUtils = require("js/lib/NJUtils").NJUtils;
-
-var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.BaseDocument, {
+////////////////////////////////////////////////////////////////////////
+//
+var Montage = require("montage/core/core").Montage,
+ BaseDocument = require("js/io/document/base-document").BaseDocument,
+ NJUtils = require("js/lib/NJUtils").NJUtils;
+////////////////////////////////////////////////////////////////////////
+//
+exports.HTMLDocument = Montage.create(BaseDocument, {
// PRIVATE MEMBERS
_selectionExclude: { value: null, enumerable: false },
_htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
@@ -477,32 +480,13 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
//TODO: Add code view logic and also styles for HTML
if (this.currentView === 'design') {
return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
- } else if(this.currentView === "code"){
+ } else if (this.currentView === "code"){
//TODO: Would this get call when we are in code of HTML?
+ } else {
+ //Error
}
}
}
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
-
-
- /*
-save:{
- value:function(){
- try{
- if(this.currentView === "design"){
- //generate html and save
- }else if((this.currentView === "code") && (this.codeViewDocument !== null)){
- this.codeViewDocument.editor.save();
- //persist to filesystem
- }
- this.dirtyFlag=false;
- }catch(e){
- console.log("Error while saving "+this.uri);
- console.log(e.stack);
- }
- }
- }
-*/
-
});
\ 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,
BaseDocument = require("js/io/document/base-document").BaseDocument;
////////////////////////////////////////////////////////////////////////
//
-var TextDocument = exports.TextDocument = Montage.create(BaseDocument, {
+exports.TextDocument = Montage.create(BaseDocument, {
// PRIVATE MEMBERS
_codeEditor: {
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 @@
.newfileLocation .newFileName{
width:65%;
margin-left:5px;
+ text-shadow: 1px 1px 1px #000;
}
.newfileLocation .newFileDirectory{
width:70%;
margin-left:5px;
+ text-shadow: 1px 1px 1px #000;
}
.newfileLocation .templateSelection{
@@ -32,6 +34,7 @@
.newfileLocation .locationSelection{
float:left;
width:75%;
+ text-shadow: 1px 1px 1px #000;
}
.newfileLocation .locationSelection div{
@@ -41,6 +44,7 @@
.newfileLocation .locationSelection input{
margin-left: 5px;
white-space: nowrap;
+ text-shadow: 1px 1px 1px #333;
}
.newfileLocation .templatePx{
@@ -50,6 +54,7 @@
.newfileLocation .nameText{
margin-right:28px;
+ text-shadow: 1px 1px 1px #000;
}
.newfileLocation .hottextunit{
@@ -58,5 +63,6 @@
}
.newfileLocation .fileExtension{
- color:#d7d7d7;
+ color:#FFF;
+ text-shadow: 1px 1px 1px #000;
}
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 @@
width:650px;
height:350px;
padding-left: 15px;
- padding-bottom:25px;
- background-color:#313131;
+ padding-bottom:32px;
+ background-color:#494949;
color:#ffffff;
+ font-family: 'Droid Sans', sans-serif;
+ border-radius: 8px;
+ box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
}
.newfile .title{
@@ -19,12 +22,14 @@
height:15px;
padding:5px;
text-align: center;
- font-weight: bold;
- color: #C1C1C1;
+ text-transform: uppercase;
+ font-weight: normal;
+ text-shadow: 1px 1px 1px #000;
}
.newfile .container{
- border: 1px groove #000000;
+ border: 1px solid #000000;
+ border-right: none;
overflow: auto;
background-color:#5f5f5f;
}
@@ -45,7 +50,7 @@
}
.newfile .right-top{
- border: 1px groove #000000;
+ border-right: 1px solid #000000;
overflow: auto;
min-height:150px;
height:58%;
@@ -54,7 +59,8 @@
}
.newfile .right-bottom{
- border: 1px groove #000000;
+ border: 1px solid #000000;
+ border-left: none;
overflow: auto;
height:42%;
padding: 15px;
@@ -64,7 +70,9 @@
border-bottom:1px solid #000000;
padding:5px;
text-align: center;
- font-weight: bold;
+ text-transform: uppercase;
+ font-weight: normal;
+ text-shadow: 1px 1px 1px #000;
}
.newfile .buttons{
@@ -74,10 +82,14 @@
.newfile .errorMsg{
float:left;
- margin-top: 7px;
+ margin-top: 12px;
+ text-shadow: 1px 1px 1px #333;
+ text-transform: uppercase;
+ clear: left;
+ width: 200px;
}
.newfile .errorMsg span{
- color: #BF3B3B;
+ color: #FF3A3A;
}
.newfile .disable{
@@ -93,6 +105,10 @@
font-weight: bold;
}
+.newfile .atreeItem {
+ text-shadow: 1px 1px 1px #000;
+}
+
.newfile .atreeItem .name{
padding: 3px;
}
@@ -115,14 +131,23 @@
white-space: normal;
padding-bottom:4px;
overflow: visible;
+ text-shadow: 1px 1px 1px #000;
}
.newfile .icon .iconImg{
margin-left:25px;
}
+.newfile .buttons button {
+ float: left;
+ width: 100px;
+ margin-top: 3px;
+}
+
.newfile .okButton{
- margin-right:25px;
+ margin: 0px 18px 0px 8px;
+ /*
+margin-right:25px;
-webkit-box-align: center;
text-align: center;
cursor: default;
@@ -133,10 +158,12 @@
border-radius:10px;
background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
cursor:pointer;
+*/
}
.newfile .cancelButton{
- -webkit-box-align: center;
+ /*
+-webkit-box-align: center;
text-align: center;
cursor: default;
padding: 0px 6px 0px;
@@ -146,6 +173,7 @@
border-radius:10px;
background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
cursor:pointer;
+*/
}
.newfile input[type="button"]:disabled{
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index 58bbed30..d4043658 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -54,8 +54,8 @@
-
-
+
+
--
cgit v1.2.3