From 7cd921c74d03c2bfe50a326d97bac947660b1b30 Mon Sep 17 00:00:00 2001 From: bnewbold Date: Wed, 19 Sep 2012 18:41:30 +0200 Subject: add basic bootstrap styling --- octopart_test.go | 4 +- serve.go | 1 - templates/base.html | 45 +- templates/bom_upload.html | 7 +- templates/bom_view.html | 12 +- templates/home.html | 7 +- templates/static/default.css | 5235 +++++++++++++++++++++++++++++++++++++++++- templates/user.html | 10 +- 8 files changed, 5294 insertions(+), 27 deletions(-) diff --git a/octopart_test.go b/octopart_test.go index 2e0e295..fdbd9b0 100644 --- a/octopart_test.go +++ b/octopart_test.go @@ -43,10 +43,10 @@ func TestGetMarketInfo(t *testing.T) { } func TestAttachInfo(t *testing.T) { - b := makeTestBom() + _, b := makeTestBom() bm := &BomMeta{} oc := NewOctopartClient("") oc.AttachMarketInfo(oc) - DumpBomAsText(bm, b, + DumpBomAsText(bm, b, os.Stdout) } diff --git a/serve.go b/serve.go index df344ce..dedd0a1 100644 --- a/serve.go +++ b/serve.go @@ -71,7 +71,6 @@ func userController(w http.ResponseWriter, r *http.Request, user, extra string) } context := make(map[string]interface{}) context["BomList"], err = bomstore.ListBoms(ShortName(user)) - context["Email"] = email context["UserName"] = user if err != nil { return diff --git a/templates/base.html b/templates/base.html index c455815..8066063 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,6 +3,47 @@ bommom -{{ end }} -{{ define "FOOTER" }} + + + + +

+ +

+{{ end }} +{{ define "FOOTER" }} +

+ {{ end }} + +{{ define "BOM_INFO" }} +

Owner:: {{ .BomMeta.Owner }}
Homepage: {{ .BomMeta.Homepage }}{{ end }} + {{ if .BomMeta.Description }}
Description:: {{ .BomMeta.Description }}
Version:: {{ .BomMeta.HeadVersion }} (at head)
Created:: {{ .Bom.Created }}
Source:: {{ .Bom.Progeny }}

+{{end}} + diff --git a/templates/bom_upload.html b/templates/bom_upload.html index 1d03963..30e2ff6 100644 --- a/templates/bom_upload.html +++ b/templates/bom_upload.html @@ -2,12 +2,7 @@ {{ if .BomMeta }}

{{ .BomMeta.Name }} is a bom.

-Owner: {{ .BomMeta.Owner }}
-{{ if .BomMeta.Homepage }}Homepage: {{ .BomMeta.Homepage }}
{{ end }} -{{ if .BomMeta.Description }}Description: {{ .BomMeta.Description }}
{{ end }} -Version: {{ .BomMeta.HeadVersion }} (at head)
-Created: {{ .Bom.Created }}
-{{ if .Bom.Progeny}}Source: {{ .Bom.Progeny }}
{{ end }} +{{ template "BOM_INFO" . }}

{{ else }} diff --git a/templates/bom_view.html b/templates/bom_view.html index cbd3474..2e66bf1 100644 --- a/templates/bom_view.html +++ b/templates/bom_view.html @@ -1,12 +1,10 @@ {{ template "HEADER" }}

{{ .BomMeta.Name }} is a bom.

qty

elements diff --git a/templates/home.html b/templates/home.html index 1b328c3..8749c58 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,10 +1,11 @@ {{ template "HEADER" }}

this is bomom.

{{ .Owner }}/{{ .Name }} +

{{ .Owner }}/{{ .Name }} {{ else }} No Boms found! {{ end }} - +

{{ .User }} is a bommom user.

Email:

{{ .UserName }} is a bommom user.

{{ .Name }} +

{{ .Name }} {{ else }} No Boms found! {{ end }} - +