Struct with flash and error messages to differentiate in template.

5 files changed, 25 insertions, 69 deletions

diff --git a/app/handler.go b/app/handler.go
index 7dd8cc4..3f30c9f 100644
--- a/app/handler.go
+++ b/app/handler.go
@@ -57,24 +57,17 @@ func PrintRegisterHandler(w http.ResponseWriter, r *http.Request) {
 
 func PrintNewJobHandler(w http.ResponseWriter, r *http.Request) {
 	log.Println("Printing job")
-	var t string
 
 	session, err := store.Get(r, "_SID")
-	flashes := session.Flashes("success")
-	if len(flashes) > 0 {
-		t = "jobs.html"
-	} else {
-		flashes = session.Flashes("error")
-		t = "jobs_error.html"
-	}
+
+	m := FlashMessages{}
+	m.Success = session.Flashes("success")
+	m.Error = session.Flashes("error")
 	session.Save(r, w)
-	job := mainTempl.Lookup(t)
 
-	//flashes := session.Flashes()
-	//flashes := session.Flashes("success")
-	//flashes := session.Flashes("error")
-	fmt.Println(flashes)
-	err = job.ExecuteTemplate(w, t, flashes)
+	job := mainTempl.Lookup("jobs.html")
+
+	err = job.ExecuteTemplate(w, "jobs.html", m)
 	if err != nil {
 		log.Panic(err)
 	}
diff --git a/app/struct.go b/app/struct.go
index 37704d7..73e1dc7 100644
--- a/app/struct.go
+++ b/app/struct.go
@@ -36,3 +36,8 @@ type User struct {
 	DeletedAt time.Time
 	UpdatedAt time.Time
 }
+
+type FlashMessages struct {
+	Success []interface{}
+	Error   []interface{}
+}
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 5a3ff7d..b88d7cd 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [ -z $GIT_DIR ]; then
+	echo "Don't run this script from the command line."
+	echo "Move this file or set a symbolic link to \".git/hooks/pre-commit\"."
+	exit 1
+fi
+
 if [ -f $GIT_DIR/../app/Makefile ]; then
 	cd "$GIT_DIR/../app"
 	make test
diff --git a/views/jobs.html b/views/jobs.html
index df54994..510339d 100644
--- a/views/jobs.html
+++ b/views/jobs.html
@@ -2,14 +2,18 @@
 {{template "navbar.html"}}
 <div class="container">
 	<div class="row">
-{{range .}}
+{{range .Error}}
+<h4 class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible" role="alert">
+	<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
+	{{.}}
+</h4>
+{{end}}
+{{range .Success}}
 <h4 class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible" role="alert">
 	<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
 	{{.}}
 </h4>
 {{end}}
-		<div class="text-center">
-		</div>
 	</div>
 </div>
 <div class="container">
diff --git a/views/jobs_error.html b/views/jobs_error.html
deleted file mode 100644
index c13cbd8..0000000
--- a/views/jobs_error.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{{template "header.html"}}
-{{template "navbar.html"}}
-<div class="container">
-	<div class="row">
-{{range .}}
-<h4 class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible" role="alert">
-	<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-</h4>
-{{end}}
-		<div class="text-center">
-		</div>
-	</div>
-</div>
-<div class="container">
-	<div class="row">
-<form class="form-horizontal" method='post' action='/new'>
-	<fieldset>
-
-		<!-- Form Name -->
-		<div class="text-center">
-		<legend>Add new job!</legend>
-		</div>
-
-		<!-- Text input-->
-		<div class="form-group">
-			<label class="col-md-4 control-label" for="Url">Job Url:</label>  
-			<div class="col-md-4">
-		        	<div class="input-group">
-				<input id="Url" name="Url" placeholder="Url to monitor." class="form-control input-md" required="" type="text">
-			      	<span class="input-group-addon">     
-					<input name="Private" type="checkbox">     
-			        </span>
-				</div>
-				<span class="help-block">Check to mark this host as private.</span>  
-			</div>
-		</div>
-
-		<!-- Button -->
-		<div class="form-group">
-			<label class="col-md-4 control-label" for="submit"></label>
-			<div class="col-md-4">
-				<button class="btn btn-primary">Submit</button>
-			</div>
-		</div>
-
-	</fieldset>
-</form>
-
-	</div>
-</div>
-{{template "footer.html"}}