dan
/
transmet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'manage-categories' of github.com:dballard/transmet into manage-categories 

Conflicts:
	route_handlers.go
	templates/pages/categories.html
This commit is contained in:
Dan Ballard 2015-05-21 23:04:30 -07:00
parent 3b004dbeb3 fea21c9d10
commit d0fbd617b3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
route_handlers.go
View File

@ -243,7 +243,6 @@ func addedHandler(w http.ResponseWriter, r *http.Request, user *user.User) {
ShowTemplate("added", w, map[string]interface{}{"user": user, "flashes": flashes}) ShowTemplate("added", w, map[string]interface{}{"user": user, "flashes": flashes})
} }
func ServeFileHandler(res http.ResponseWriter, req *http.Request) { func ServeFileHandler(res http.ResponseWriter, req *http.Request) {
fname := path.Base(req.URL.Path) fname := path.Base(req.URL.Path)
http.ServeFile(res, req, "./"+fname) http.ServeFile(res, req, "./"+fname)

5
templates/pages/categories.html
View File

@ -19,6 +19,7 @@
{{else}} {{else}}
<div class="col-xs-12 category-row"> <div class="col-xs-12 category-row">
{{end}} {{end}}
{{.Name}} <a href="/categories/delete?id={{.Id}}">delete</a> {{.Name}} <a href="/categories/delete?id={{.Id}}">delete</a>
<select class="form-control category-change-parent" name="category-change-parent-{{.Id}}" > <select class="form-control category-change-parent" name="category-change-parent-{{.Id}}" >
@ -29,10 +30,12 @@
</select> </select>
</div> </div>
{{range $child := .Children}} {{range $child := .Children}}
{{template "row-category" $child}} {{template "row-category" $child}}
{{end}} {{end}}
{{end}} {{end}}
{{define "option-category"}} {{define "option-category"}}
@ -40,4 +43,6 @@
{{range $child := .Children}} {{range $child := .Children}}
{{template "option-category" $child}} {{template "option-category" $child}}
{{end}} {{end}}
=======
>>>>>>> fea21c9d10d89f90b71988dcb41722527b947f60
{{end}} {{end}}