view project button in settings

3 files changed, 24 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 026607a..b319404 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -18,6 +18,7 @@ var EditorSettings = FormView.extend({
 		"click [data-role='clear-project']": 'clear',
 		"click [data-role='destroy-project']": 'destroy',
 		"click [data-role='toggle-map']": 'toggleMap',
+		"click [data-role='view-project']": 'viewProject',
     "click #startText": "setStartPosition",
     "click #moveText": "confirmStartPosition",
     "click #confirmText": "setStartPosition",
@@ -217,11 +218,25 @@ var EditorSettings = FormView.extend({
     this.isVisible = true
 	},
 	
+	viewAfterSave: false,
+	viewProject: function(e){
+	  e.preventDefault()
+		Minotaur.unwatch(this)
+		Minotaur.hide()
+	  this.viewAfterSave = true
+	  this.save()
+	},
+	
 	success: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		if (this.viewAfterSave) {
+		  window.location.pathname = "/project/" + data.slug
+		  return
+		}
+		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 		
diff --git a/server/lib/util.js b/server/lib/util.js
index 273d7d1..e3fd1ed 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -10,8 +10,9 @@ var entities = new RegExp("[<>&]", 'g')
 
 var util = {}
 
-util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") }
-
+util.trim = function (s){
+  return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"")
+}
 util.slugify = function (s){
 	return (s || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-")
 }
@@ -33,7 +34,6 @@ util.escapeRegExp = function (s) {
 util.htmlize = function(s) {
   return s.replace(/\n/g,"<br>")
 }
-
 util.cleanQuery = function (query) {
 	var update = _.extend({}, query);
 	delete update._id;
@@ -43,14 +43,10 @@ util.cleanQuery = function (query) {
 	delete update.created_by;
 	return update;
 }
-
 util.ip2num = function(dot) {
-  console.log(dot);
-  
 	var d = (dot || "127.0.0.1").split('.');
 	return ((((((+d[0])*256)+(+d[1]))*256)+(+d[2]))*256)+(+d[3]);
 }
-
 util.num2ip = function(num) {
   if (! num) return ""
 	var d = num % 256;
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index cd17382..cd915c5 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -27,6 +27,12 @@
       <span class="ion-map"></span>
       Edit map
     </a>
+
+	  <a href="#" class="modalLink" data-role='view-project' style="margin-left: 40px;">
+      <span class="ion-ios7-search-strong"></span>
+      View project
+    </a>
+
 	</div>
 	
 	<div class="setting">