colorpicker presets

5 files changed, 46 insertions, 11 deletions

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 93e1f42..820fb5f 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -230,8 +230,6 @@
 		this.background = background
 		this.background.src = this.background.src.replace("url(","").replace(")","")
 
-		console.log(background)
-
 		if (this.background.src == "none") {
 		  this.wallpaperLoad(this.background.src)
 		  return
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 3eb2861..2b7cfaa 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -10,6 +10,7 @@ var LightControl = View.extend({
     "input #brightness-control": "updateBrightness",
     "input #outline-hue": "updateShadow",
     "input #wall-hue": "updateShadow",
+    "click .presets span": "selectPreset",
   },
   
   initialize: function(){
@@ -114,6 +115,38 @@ var LightControl = View.extend({
     this.setMode(mode)
   },
   
+  presets: {
+    wireframe: {
+      wall: [255,255,255],
+      outline: [0,0,0],
+      floor: [246,246,246],
+      ceiling: [255,255,255],
+    },
+    shaded: {
+      wall: [205,205,204],
+      outline: [0,0,0],
+      floor: [109,116,106],
+      ceiling: [159,163,157],
+    },
+    pfunk: {
+      wall: [255,63,78],
+      outline: [255,246,0],
+      floor: [255,255,0],
+      ceiling: [225,118,252],
+    },
+    seapunk: {
+      wall: [110,255,255],
+      outline: [146,133,255],
+      floor: [89,221,255],
+      ceiling: [139,255,173],
+    },
+  },
+  selectPreset: function(e){
+    var preset = $(e.currentTarget).data('preset')
+    if (! this.presets[preset]) return
+    this.load(this.presets[preset])
+  },
+  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index df2d075..6195ab6 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -53,8 +53,8 @@ var MediaPlayer = FormView.extend({
 		this.bind(scenery)
 		this.$el.addClass("active")
 		
-		this.$name.html(media.title)
-		this.$description.html(media.description)
+		this.$name.html( sanitize(media.title) )
+		this.$description.html( marked(media.description) )
 		
 		switch (media.type) {
 			case "image":
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index eb3bd87..15f29c3 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1475,13 +1475,17 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
-.color-swatches.defaults {
+.presets {
 	margin-top: 10px;
 }
 
-.color-swatches.defaults span{
+.presets span {
 	font-size:12px;
 	font-weight:500;
+	display: inline-block;
+	width: 50%;
+	float:left;
+	cursor:pointer;
 }
 .color-swatches span {
 	display: inline-block;
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index fdf95a7..1fc4484 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -23,17 +23,17 @@
   </div>
 
   <h4>Preset Styles</h4>
-  <div class="color-swatches defaults">
-    <span>
+  <div class="presets">
+    <span data-preset="wireframe">
       Wireframe
     </span>
-    <span>
+    <span data-preset="shaded">
       Shaded
     </span>
-    <span>
+    <span data-preset="pfunk">
       P.Funk
     </span>
-    <span>
+    <span data-preset="seapunk">
       SeaPunk
     </span>
   </div>