From 24614e0764ec4655ded8b66ba6832bf8cd3cda1d Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 29 Sep 2014 18:56:38 -0400
Subject: css

---
 views/controls/editor/light-control.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views/controls/editor/light-control.ejs')

diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8b133a5..b90b646 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -3,7 +3,7 @@
   </div>
   
 	<div class="slider">
-		<h4>Brightness Control</h4>
+		<h4>Luminance Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
 	</div>
 
-- 
cgit v1.2.3-70-g09d2


From 77f2beed5e554e23cb6ad5d5a555ee710c1e95a1 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Tue, 30 Sep 2014 12:32:56 -0400
Subject: labeling some stuff

---
 public/assets/stylesheets/app.css       | 30 +++++++++++++++++-------------
 views/controls/editor/light-control.ejs |  2 +-
 views/controls/editor/media-editor.ejs  |  1 +
 views/controls/editor/settings.ejs      |  1 +
 4 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'views/controls/editor/light-control.ejs')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3748401..6929cef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1247,18 +1247,13 @@ iframe.embed {
 .lightcontrol {
   margin-top: 13%;
   right: 80px;
-  padding: 20px;
+  padding: 13px 20px 20px 20px;
   -webkit-transform: translateX(400px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateX(400px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
-.lightcontrol h4 {
-	font-weight: 600;
-	font-size: 12px;
-	line-height: 0;
-	margin-top: 15px;
-}
+
 .lightcontrol.active {
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
@@ -1278,12 +1273,14 @@ input[type=range] {
 }
 input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
-  background-color: #000;
-  width: 10px;
-  height: 10px;
+  background-color: white;
+  width: 15px;
+  height: 15px;
   border-radius:10px;
   cursor:pointer;
+	border:3px solid #000;
 }
+
 #color-picker {
   position: relative;
 }
@@ -1353,14 +1350,21 @@ span:hover .swatch {
   left: 10px;
 }
 
+.vvbox h4 {
+	font-weight: 600;
+	margin-bottom: 10px;
+	border-bottom: 1px solid #999;
+	padding-bottom: 6px;
+}
+
 .settings {
-  padding: 20px;
+  padding: 10px 20px 20px 20px;
   bottom: 20px;
   right: 10px;
   font-size: 12px;
-  -webkit-transform: translateY(400px);
+  -webkit-transform: translateY(450px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
-  transform: translateY(400px);
+  transform: translateY(450px);
   transition: -webkit-transform 0.2s ease-in-out;
 }
 
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index b90b646..410aaff 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,9 +1,9 @@
 <div class="vvbox lightcontrol">
+	<h4>Edit Room Colors</h4>
   <div id="color-picker">
   </div>
   
 	<div class="slider">
-		<h4>Luminance Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
 	</div>
 
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 000e8db..8f2c1c8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="mediaEditor">
+	<h4>Media Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index ed587fa..ad62b55 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="editorSettings">
+	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
-- 
cgit v1.2.3-70-g09d2


From df7653219ecef9cabfdb475946d86b6b0e797274 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 1 Oct 2014 16:47:56 -0400
Subject: preset styles

---
 public/assets/stylesheets/app.css       | 19 ++++++++++++++++---
 views/controls/editor/light-control.ejs | 18 +++++++++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'views/controls/editor/light-control.ejs')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d672465..5c76560 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1351,7 +1351,7 @@ iframe.embed {
 /* COLOR PICKER */
 
 .lightcontrol {
-  margin-top: 13%;
+  margin-top: 8%;
   right: 80px;
   padding: 13px 20px 20px 20px;
   -webkit-transform: translateX(400px);
@@ -1418,12 +1418,27 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
+.color-swatches.defaults {
+	margin-top: 10px;
+}
 .color-swatches span {
 	display: inline-block;
 	width: 50%;
 	float:left;
 	cursor:pointer;
+	font-size: 14px;
+	font-weight: 300;
+}
+.vvbox .color-swatches ~ h4 {
+	margin-bottom: -3px;
+	border-bottom: 1px solid #ddd;
+	padding-bottom: 6px;
+	padding-top: 11px;
+	display: inline-block;
+	width: 100%;
+	color: #555;
 }
+
 .color-swatches span:nth-child(1),.color-swatches span:nth-child(2){
 	margin-bottom:5px;
 }
@@ -1439,8 +1454,6 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .color-swatches label {
-	font-size: 14px;
-	font-weight: 300;
 	position: relative;
 	padding-left: 5px;
 	display: inline-block;
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 410aaff..37a243c 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -22,7 +22,23 @@
 	</span>
 	<span>
   </div>
-
+<h4>Preset Styles</h4>
+<div class="color-swatches defaults">
+	<span>
+    Wireframe
+	</span>
+	<span>
+    Shaded
+	</span>
+	<span>
+    P.Funk
+	</span>
+	<span>
+    SeaPunk
+	</span>
+</div>
+	
+</div>
 <!--
 	<div class="slider">
 		<input type="range" min="0" max="100" value="100" id="wall-hue" />
-- 
cgit v1.2.3-70-g09d2


From ddac735a463278e245e566105ace3e32c723128c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 1 Oct 2014 19:07:10 -0400
Subject: stubbing in text editor stuff

---
 .../assets/javascripts/ui/editor/EditorToolbar.js  | 17 ++++-
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/TextEditor.js  | 41 ++++++++++++
 server/lib/views/index.js                          |  2 +
 views/controls/editor/light-control.ejs            | 72 +++++++++-------------
 views/controls/editor/text-editor.ejs              | 32 ++++++++++
 views/controls/editor/toolbar.ejs                  | 10 ++-
 views/editor.ejs                                   |  1 +
 views/partials/header.ejs                          |  3 +
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 131 insertions(+), 49 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/TextEditor.js
 create mode 100644 views/controls/editor/text-editor.ejs

(limited to 'views/controls/editor/light-control.ejs')

diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index bb4b145..513306d 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -10,7 +10,7 @@ var EditorToolbar = View.extend({
 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
-		"click [data-role='edit-wall-text']": 'editWallText',
+		"click [data-role='toggle-text-editor']": 'toggleTextEditor',
 	},
 	
 	initialize: function(opt){
@@ -24,6 +24,7 @@ var EditorToolbar = View.extend({
 	
 	toggleSettings: function(){
 // 	  this.resetMode()
+    this.parent.textEditor.hide()
 		this.parent.lightControl.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.mediaEditor.hide()
@@ -47,6 +48,7 @@ var EditorToolbar = View.extend({
 	
 	resetControls: function(){
 	  $(".inuse").removeClass("inuse")
+    this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
@@ -107,6 +109,7 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-wallpaper-panel']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.lightControl.hide()
+    this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.wallpaperPicker.toggle(state)
 	},
@@ -117,12 +120,20 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-light-control']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
+    this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.lightControl.toggle(state)
 	},
 	
-	editWallText: function(){
-	},
+	toggleTextEditor: function(){
+		var state = ! $("[data-role='toggle-text-editor']").hasClass("inuse")
+		this.resetMode()
+		$("[data-role='toggle-text-editor']").toggleClass("inuse", state)
+		this.parent.mediaEditor.hide()
+		this.parent.wallpaperPicker.hide()
+		this.parent.settings.hide()
+		this.parent.textEditor.toggle(state)
+  },
 
 })
 
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 6636a8c..83db532 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -16,6 +16,7 @@ var EditorView = View.extend({
 		this.mediaEditor = new MediaEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
+		this.textEditor = new TextEditor ({ parent: this })
 		this.collaborators = new Collaborators ({ parent: this })
 	},
 
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
new file mode 100644
index 0000000..0319a31
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -0,0 +1,41 @@
+
+var TextEditor = FormView.extend({
+	el: "#textEditor",
+		
+	events: {
+		"keydown": 'taint',
+		"focus [name]": "clearMinotaur",
+		"mousedown": "stopPropagation",
+		"change [name=font-family]": 'changeFontFamily',
+		"change [name=font-size]": 'changeFontSize',
+		"input [name=text-body]": 'changeText',
+		"click [data-role=destroy-media]": "destroy",
+	},
+	
+	initialize: function(opt){
+		this.parent = opt.parent
+		this.__super__.initialize.call(this)
+    
+    this.$fontFamily = this.$("[name=font-family]")
+    this.$fontSize = this.$("[name=font-size]")
+    this.$textBody = this.$("[name=text-body]")
+	},
+
+  toggle: function(state){
+    this.$el.toggleClass("active", state);
+  },
+  
+  taint: function(e){
+    e.stopPropagation()
+  },
+  
+  changeFontFamily: function(){
+  },
+  
+  changeFontSize: function(){
+  },
+  
+  changeText: function(){
+  },
+
+})
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 29b84d8..ca48159 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -27,6 +27,7 @@ views.editor_new = function (req, res) {
 		res.redirect('/')
 	}
 	else {
+	  res.locals.opt.editing = true
 		res.render('editor')
 	}
 }
@@ -36,6 +37,7 @@ views.editor = function (req, res) {
 		res.redirect('/')
 	}
 	else if (req.isOwner || req.isCollaborator || req.isStaff) {
+	  res.locals.opt.editing = true
 		res.render('editor')
 	}
 	else {
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 37a243c..fdf95a7 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -8,49 +8,33 @@
 	</div>
 
   <div class="color-swatches">
-	<span>
-    <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
-	</span>
-	<span class="active">
-    <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
-	</span>
-	<span>
-    <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
-	</span>
-	<span>
-    <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
-	</span>
-	<span>
+    <span>
+      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+    </span>
+    <span class="active">
+      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+    </span>
+    <span>
+      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
+    </span>
+    <span>
+      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+    </span>
+  </div>
+
+  <h4>Preset Styles</h4>
+  <div class="color-swatches defaults">
+    <span>
+      Wireframe
+    </span>
+    <span>
+      Shaded
+    </span>
+    <span>
+      P.Funk
+    </span>
+    <span>
+      SeaPunk
+    </span>
   </div>
-<h4>Preset Styles</h4>
-<div class="color-swatches defaults">
-	<span>
-    Wireframe
-	</span>
-	<span>
-    Shaded
-	</span>
-	<span>
-    P.Funk
-	</span>
-	<span>
-    SeaPunk
-	</span>
-</div>
-	
-</div>
-<!--
-	<div class="slider">
-		<input type="range" min="0" max="100" value="100" id="wall-hue" />
-		<h4>Wall Hue</h4>
-	</div>
-	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="brightness-control" />
-		<h4>Brightness</h4>
-	</div>
-	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="shadow-control" />
-		<h4>Shadow</h4>
-	</div>
--->
 </div>
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
new file mode 100644
index 0000000..205fbdf
--- /dev/null
+++ b/views/controls/editor/text-editor.ejs
@@ -0,0 +1,32 @@
+<div class="vvbox settings" id="textEditor">
+	<h4>Edit Text</h4>
+  
+	<div class="setting">
+    <select name="font-family">
+      <option>Helvetica</option>
+      <option>Times New Roman</option>
+      <option>Lato</option>
+      <option></option>
+    </select>
+    <select name="font-size">
+      <option value="9">9pt</option>
+      <option value="10">10pt</option>
+      <option value="12">12pt</option>
+      <option value="16">16pt</option>
+      <option value="24">24pt</option>
+      <option value="36">36pt</option>
+      <option value="72">72pt</option>
+    </select>
+  </div>
+  
+	<div class="setting">
+	  <textarea name="text-body"></textarea>
+  </div>
+  
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-text">remove from wall</a>
+	</div>
+</div>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 63df73c..92807e1 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -12,9 +12,8 @@
 		data-role='destroy-media'
 		data-info="delete media"
 		class="icon-ios7-trash-outline"></span>
-		
 	<span
-		data-role='edit-wall-text'
+		data-role='toggle-text-editor'
 		data-info="edit wall text"
 		class="icon-ios7-compose-outline"></span>
  -->
@@ -26,6 +25,13 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="icon-ios7-sunny-outline"></span>
+
+[[ if (user.username == "test12343") { ]]
+	<span
+		data-role='toggle-text-editor'
+		data-info="edit wall text"
+		class="icon-ios7-compose-outline"></span>
+[[ } ]]
 		
 	<span
 		data-role='toggle-project-settings'
diff --git a/views/editor.ejs b/views/editor.ejs
index 9950878..e029225 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -17,6 +17,7 @@
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
 			[[ include controls/editor/light-control ]]
+			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/settings ]]
 		</div>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 88d832d..065385d 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -67,7 +67,10 @@
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink">Profile</a>
 	[[ } ]]
+	
+	[[ if (opt.editing) { ]]
 	<a href="#" class="icon-help-circled" id="help-button"></a>
+	[[ } ]]
 	
 [[ } else { ]]
 	<a href="/signup" data-role="show-signup-modal" class="signUp topLink">Sign Up</a>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2e2d8b6..1ce180a 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -100,6 +100,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script>
-- 
cgit v1.2.3-70-g09d2