Merge branch 'master' of github.com:okfocus/vvalls

6 files changed, 47 insertions, 13 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index de47be4..f74b535 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -17,8 +17,8 @@ var EditorSettings = FormView.extend({
 	},
 	
 	initialize: function(opt){
-		this.parent = opt.parent
-		this.__super__.initialize.call(this)
+    this.parent = opt.parent
+    this.__super__.initialize.call(this)
 		
 		this.$id = this.$("[name=_id]")
 		this.$csrf = this.$("[name=_csrf]")
@@ -110,7 +110,6 @@ var EditorSettings = FormView.extend({
 	  var state = typeof state == 'boolean' ? state : ! this.$el.hasClass("active")
 		this.$el.toggleClass("active", state)
 
-    $(".inuse").removeClass("inuse")
 		$("[data-role='toggle-project-settings']").toggleClass("inuse", state)
 	},
 
@@ -183,6 +182,8 @@ var EditorSettings = FormView.extend({
 		window.history.pushState(null, document.title, "/project/" + data.slug + "/edit")
 
 		this.parent.data = data
+
+    this.toggle(false)
 	},
 
 })
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 7cfa863..436c0cb 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -6,23 +6,33 @@ var MediaViewer = ModalView.extend({
 	
 	events: {
 		'click .foundToggle': "foundToggle",
-		'click .yourMedia': "userToggle",
+		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
 		'click .mediaContainer': "pick",
 	},
 	
+	initialize: function(opt){
+		this.__super__.initialize.call(this)
+		this.parent = opt.parent
+		this.$foundMedia = this.$(".foundMedia")
+		this.$myMedia = this.$(".myMedia")
+		this.$foundToggle = this.$(".foundToggle")
+		this.$userToggle = this.$(".userToggle")
+		this.$deleteMedia = this.$("#deleteMedia")
+	},
+
 	foundToggle: function(){
-    this.$(".foundMedia").addClass("active");
-    this.$(".myMedia").addClass("inactive");
+    this.foundMedia.addClass("active");
+    this.myMedia.addClass("inactive");
     this.$("a").removeClass("active");
-    this.$(".foundToggle").addClass("active");
+    this.foundToggle.addClass("active");
 	},
 	
 	userToggle: function(){
-    this.$(".foundMedia").removeClass("active");
-    this.$(".myMedia").removeClass("inactive");
+    this.foundMedia.removeClass("active");
+    this.myMedia.removeClass("inactive");
     this.$("a").removeClass("active");
-    this.$(".yourMedia").addClass("active");
+    this.userToggle.addClass("active");
 	},
 
 	show: function(){
@@ -46,7 +56,12 @@ var MediaViewer = ModalView.extend({
 
 	populate: function(data){
 		this.loaded = true
-		data && data.forEach(this.add.bind(this))
+		if (data && data.length) {
+		  data.forEach(this.add.bind(this))
+		}
+		else {
+		  this.$deleteMedia.hide()
+		}
 		this.__super__.show.call(this)
 	},
 	
@@ -78,6 +93,7 @@ var MediaViewer = ModalView.extend({
 		$span.append(image)
 
 		this.$(".myMedia").prepend($span)		
+    this.$deleteMedia.show()
 	},
 
 	deleteIsArmed: false,
@@ -112,6 +128,11 @@ var MediaViewer = ModalView.extend({
 		if (this.deleteIsArmed) {
 			this.destroy(media._id)
 			$target.remove()
+
+			if ($(".myMedia .mediaContainer").length == 0) {
+        this.$deleteMedia.hide()
+        this.deleteArmed(false)
+			}
 			return
 		}
 
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 8048288..0dd2921 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -36,7 +36,6 @@ var WallpaperPicker = UploadView.extend({
 	},
 
 	populate: function(data){
-	  console.log(data)
 		this.loaded = true
 		if (data && data.length) {
 		  data.forEach(this.add.bind(this))
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index bfc3dec..1bfc6cb 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -25,6 +25,7 @@ var LayoutsIndex = View.extend({
 			// $span.html(JSON.stringify(room))
 			$span.data("slug", room.slug)
 			$span.css("background-image", "url(" + room.photo + ")")
+			$span.attr("data-name", room.name)
 			
 			this.$templates.append($span)
 		}.bind(this))
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 1f1b1fe..3f3b8f7 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -504,6 +504,18 @@ iframe.embed {
   display: inline-block;
   margin: 4vw;
   border:1px solid white;
+  position: relative;
+}
+
+.templates span:after {
+  content: attr(data-name);
+  position: absolute;
+  top: 100%;
+  width: 100%;
+  left: 0;
+  background: #fff;
+  padding: 5px;
+  border-top: 1px solid black;
 }
 
 .templates span:hover {
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 241164f..d73a3ef 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -16,7 +16,7 @@
 
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
-	<h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
 	<h3 class="editBtn warn" id="deleteMedia">delete media?</h3>
 	<div class="myMedia">
 	</div>