html tempalte works!

This commit is contained in:
Dan Ballard 2015-05-13 08:26:30 -07:00
parent 4d05a266d1
commit 6ccf2a6898
4 changed files with 42 additions and 18 deletions

View File

@ -22,6 +22,7 @@ type News struct {
type NewsContainer struct {
Name string
News []News
Category *categories.Category
Children map[int]*NewsContainer
}
@ -42,6 +43,20 @@ func nullStringToString(str *sql.NullString) string {
}
}
func addContainer(category_id int, flat, tree map[int]*NewsContainer) {
container := &NewsContainer{ Category: categories.CategoriesFlat[category_id], Name: categories.CategoriesFlat[category_id].Name, News: []News{}, Children: map[int]*NewsContainer{} }
flat[category_id] = container
parent := categories.CategoriesFlat[category_id].Parent
if parent.Valid {
if _, ok := flat[int(parent.Int64)]; !ok {
addContainer(int(parent.Int64), flat, tree)
}
flat[int(parent.Int64)].Children[category_id] = container
} else {
tree[category_id] = container
}
}
func Unexported(db *sql.DB) (map[int]*NewsContainer, error) {
categories.LoadCategories(db)
@ -78,25 +93,16 @@ func Unexported(db *sql.DB) (map[int]*NewsContainer, error) {
cid = int(category_id.Int64)
}
var container *NewsContainer
var ok bool
fmt.Println("cid: ", cid)
if container, ok = newsFlat[cid]; !ok {
fmt.Println("ADDING")
// need new container for new cid
container = &NewsContainer{ Name: categories.CategoriesFlat[cid].Name, News: []News{}, Children: map[int]*NewsContainer{} }
newsFlat[cid] = container
parent := categories.CategoriesFlat[cid].Parent
if parent.Valid {
fmt.Println("parent: ", parent.Int64)
newsFlat[int(parent.Int64)].Children[cid] = container
} else {
fmt.Println("no parent")
newsTree[cid] = container
}
if _, ok := newsFlat[cid]; !ok {
addContainer(cid, newsFlat, newsTree)
}
container := newsFlat[cid]
container.News = append(container.News, news)
}
return newsTree, nil
}
func (this *NewsContainer) HeaderDepth(start int) int {
return start + this.Category.Depth()
}

View File

@ -13,6 +13,8 @@ import (
"strconv"
"github.com/dballard/transmet/categories"
"github.com/dballard/transmet/news"
"bytes"
"html/template"
)
func GetFlashes(session *sessions.Session) map[string]interface{} {
@ -195,8 +197,18 @@ func templateFormHandler(w http.ResponseWriter, r *http.Request, user *user.User
if err != nil {
return
}
var templateBuf bytes.Buffer
template, err := template.ParseFiles("templates/html_template.html")
if err != nil {
fmt.Println("Error processing html_tempalte:" , err)
}
err = template.Execute(&templateBuf, map[string]interface{}{"news": news})
if err != nil {
fmt.Println("Exec err: ", err)
}
ShowTemplate("list", w, map[string]interface{}{"user": user, "flashes": flashes, "news": news})
ShowTemplate("list", w, map[string]interface{}{"user": user, "flashes": flashes, "template": &templateBuf})
}
func templatePostHandler(w http.ResponseWriter, r *http.Request, user *user.User) {

View File

@ -0,0 +1,6 @@
{{range $nc := .news}}{{template "news-category" $nc}}{{end}}
{{define "news-category"}}<h{{$.HeaderDepth 1 }}>{{$.Name}}</h{{$.HeaderDepth 1 }}>
{{range $n := .News}}{{template "news" $n}}{{end}}{{range $nc := .Children}}{{template "news-category" $nc}}{{end}}{{end}}
{{define "news"}}<p><a href="{{.Url}}">{{.Title}}</a><br/>
{{.Notes}}</p>
{{end}}

View File

@ -10,6 +10,6 @@
</div>
</form>
<textarea class="form-control" name="template" placeholder="Template" rows="3" cols="80">{{.template}}</textarea>
<textarea class="form-control" name="template" placeholder="Template" rows="16" cols="80">{{.template}}</textarea>
{{end}}