merge

3 files changed, 72 insertions, 8 deletions

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 1bfc6cb..99db2a3 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -3,6 +3,7 @@ var LayoutsIndex = View.extend({
 
 	initialize: function(){
 		this.$templates = this.$(".templates")
+		this.$templatesList = this.$(".templates-list")
 		this.$noTemplates = this.$(".no-templates")
 		this.$form = this.$("form")
 	},
@@ -19,15 +20,21 @@ var LayoutsIndex = View.extend({
 			this.$form.hide()
 			this.$noTemplates.show()
 		}
-		this.$templates.empty()
+		this.$templatesList.empty()
 		data.forEach(function(room){
 			var $span = $("<span>")
-			// $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)
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
 		}.bind(this))
 		this.show()
 	}
diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
index 993d805..ebb0a96 100644
--- a/public/assets/javascripts/ui/site/ProjectList.js
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -1,16 +1,49 @@
-
+var projectListTimeout = null
 var ProjectList = View.extend({
 
 	el: ".projectList",
 
 	events: {
-		"mouseenter .room": 'spinOn',
-		"mouseleave .room": 'spinOff',
+		"mouseenter .room": 'enter',
+		"mouseleave .room": 'leave',
 	},
 	
 	initialize: function(){
+	  this.$(".images").each(function(){
+	    $divs = $(this).children("div")
+	    $divs.hide()
+	    $divs.first().show()
+	    $(this).data("index", 0)
+	  })
+	},
+	
+	timeout: null,
+	enter: function(e){
+    clearTimeout(projectListTimeout)
+    this.advance(e.currentTarget)
 	},
 	
+	leave: function(e){
+    clearTimeout(projectListTimeout)
+    var $divs = $(e.currentTarget).find(".images div")
+    $divs.hide()
+    $divs.eq(0).show()
+	},
+	
+	advance: function(el){
+    projectListTimeout = setTimeout(function(){
+      this.advance(el)
+    }.bind(this), 500)
+	  var $images = $(el).find(".images")
+	  var $divs = $images.children("div")
+	  var index = $images.data("index")
+	  var nextIndex = (index + 1) % $divs.length
+    $divs.eq(index).hide()
+    $divs.eq(nextIndex).show()
+    $images.data("index", nextIndex)
+	}
+	
+/*
 	spinOn: function(e){
 		var iframe = $(e.currentTarget).find("iframe").get('0')
 		if (! iframe) return
@@ -22,5 +55,6 @@ var ProjectList = View.extend({
 		if (! iframe) return
 		iframe.contentWindow.postMessage("spin-off", window.location.origin)
 	}
+*/
 
 })
diff --git a/public/assets/javascripts/ui/site/StaffView.js b/public/assets/javascripts/ui/site/StaffView.js
index fdf39d2..0398f71 100644
--- a/public/assets/javascripts/ui/site/StaffView.js
+++ b/public/assets/javascripts/ui/site/StaffView.js
@@ -3,14 +3,19 @@ var StaffView = View.extend({
   
   events: {
     "click #toggle-staff": "toggleStaff",
+    "click #toggle-featured": "toggleFeatured",
   },
 
 	initialize: function() {
 		this.$toggleStaff = $("#toggle-staff")
+		this.$toggleFeatured = $("#toggle-featured")
 		this.$mediaEmbed = $("#media-embed")
     if (this.$toggleStaff.length && this.$toggleStaff.data().isstaff) {
       this.$toggleStaff.html("Is Staff")
     }
+    if (this.$toggleFeatured.length && this.$toggleFeatured.data().featured) {
+      this.$toggleFeatured.html("Featured Project")
+    }
     if (this.$mediaEmbed.length) {
       var media = this.$mediaEmbed.data()
       this.$mediaEmbed.html( Parser.tag( media ) )
@@ -44,6 +49,24 @@ var StaffView = View.extend({
         }.bind(this)
       })
     }.bind(this))
+  },
+
+  toggleFeatured: function(){
+    var state = ! this.$toggleFeatured.data().featured
+    $.ajax({
+      type: "put",
+      dataType: "json",
+      url: window.location.href + "/feature",
+      data: {
+        state: state,
+        _csrf: $("#_csrf").val(),
+      },
+      success: function(data){
+        this.$toggleFeatured.data("featured", data.state)
+        this.$toggleFeatured.html(data.state ? "Featured Project" : "Feature this project")
+        $("#isFeaturedProject").html(data.state ? "yes" : "no")
+      }.bind(this)
+    })
   },	
 
 })