From f7641a9b2d6f33e73227d2f8398509b54fdc0aa1 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 6 Mar 2012 16:48:52 -0800
Subject: updated file picker image icons

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/ui/icon-list-basic/icon.reel/icon.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'js/components/ui/icon-list-basic/icon.reel')

diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 72adbfa1..1ef6e277 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -174,21 +174,17 @@ var Icon = exports.Icon = Montage.create(Component, {
         enumerable: true,
         value:{
             "img_root":"images/picker/",
-            ".png":"png_file.png",
-            ".jpg":"jpeg_file.png",
             ".js":"js_file.png",
+            ".json":"json_file.png",
             ".css":"css_file.png",
             ".html":"html_file.png",
             ".xml":"xml_file.png",
             ".php":"php_file.png",
+            ".pl":"pl_file.png",
+            ".py":"py_file.png",
+            ".rb":"rb_file.png",
             ".doc":"doc_file.png",
-            ".docx":"doc_file.png",
-            ".rtf":"rtf_file.png",
-            ".pdf":"pdf_file.png",
-            ".zip":"zip_file.png",
-            ".rar":"zip_file.png",
-            ".app":"executable.png",
-            ".exe":"executable.png",
+            ".txt":"txt_file.png",
             "file_default":"file.png",
             "directory":"folder.png"
         }
-- 
cgit v1.2.3


From 85bf9f937fa2ec46e42f791fc6815f7c2f5446ea Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 10:42:05 -0700
Subject: file picker - added size unit new file - don't disable OK is file
 exists

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/ui/icon-list-basic/icon.reel/icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/components/ui/icon-list-basic/icon.reel')

diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 1ef6e277..7d36bc59 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -86,7 +86,7 @@ var Icon = exports.Icon = Montage.create(Component, {
                 this.metadata = "Name: "+this.icondata.name;
             }
             this.metadata = this.metadata + "<br />" + "Type: "+this.icondata.type;
-            if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size;}
+            if(this.icondata.size){this.metadata = this.metadata + "<br />" + "Size: "+this.icondata.size+ " bytes";}
             if(this.icondata.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.icondata.creationDate);}
             if(this.icondata.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.icondata.modifiedDate);}
 
-- 
cgit v1.2.3


From f639ae09013dfb6559891bbbe560bd5303a05f97 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 22 Mar 2012 10:45:38 -0700
Subject: IKNINJA-1364 : fixed css so that white spaces are not collapsed while
 rendering

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/ui/icon-list-basic/icon.reel/icon.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/components/ui/icon-list-basic/icon.reel')

diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index 9fb180d2..203db65c 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -35,7 +35,7 @@
 
 .icon .iconLabel{
     margin-top:8px;
-    white-space: nowrap;
+    white-space: pre;
     text-overflow: ellipsis;
     line-height:15px;
     overflow: hidden;
-- 
cgit v1.2.3