From 51ec5bd2f498a38bb53d0f9a271f01e439827be2 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 18 Jun 2014 01:53:05 -0400
Subject: sizing stuff

---
 public/assets/javascripts/ui/editor/EditorSettings.js |  2 ++
 public/assets/javascripts/ui/editor/MediaViewer.js    | 14 ++++++++++++++
 public/assets/stylesheets/app.css                     |  6 +++---
 views/controls/editor/media-drawer.ejs                |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 9263dd7..1e70dbb 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -106,6 +106,8 @@ var EditorSettings = FormView.extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+// 		fd.append( "walls", JSON.stringify( Rooms.serialize() ) )
+		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
 		return fd
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index a1198f3..05e666b 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -87,6 +87,7 @@ var MediaViewer = ModalView.extend({
 		}).complete(cb || function(){})
 	},
 	
+	picked: null,
 	pick: function(e) {
 		e.stopPropagation()
 
@@ -101,6 +102,19 @@ var MediaViewer = ModalView.extend({
 			return
 		}
 
+// 		else {
+// 			this.picked = {}
+// 			this.picked.media = media
+// 			this.picked.image = image
+// 		}
+// 	},
+// 	
+// 	drag: function(e){
+// 		if (! this.pickedMedia) return
+// 		var media = this.picked.media
+// 		var image = this.picked.image
+// 		this.picked = null
+
 		this.hide()
 		
 		var $ants = $('.ants');
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 2d7f901..8ab4a3f 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -59,7 +59,7 @@ a{
 }
 
 .ants {
-	width:320px;
+	max-width:320px;
 	height: auto;
 	padding:15px;
 	background:white;
@@ -856,9 +856,9 @@ h5 {
   position:absolute;
   top:0;
   left:0;
-  -webkit-transform: translateX(100%);
+  -webkit-transform: translateX(120%);
   -webkit-transition: -webkit-transform 0.3s ease-in-out;
-  transform: translateX(100%);
+  transform: translateX(120%);
   transition: transform 0.3s ease-in-out;
   padding-top:40px;
 }
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 8375042..456699c 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -3,7 +3,7 @@
 	<form>
 		<span class="icon-ios7-upload-outline upload-icon"></span><br>
 		Upload File
-		<input type="file" accept="image/*" class="file">
+		<input type="file" accept="image/*" class="file" multiple>
 	</form>
 	<small>~ or ~</small><br>
 	<input type="text" placeholder="Enter Vimeo or YouTube Link" class="url">
-- 
cgit v1.2.3-70-g09d2