diff --git a/dump.go b/dump.go
index 40b92ab..83b0b44 100644
--- a/dump.go
+++ b/dump.go
@@ -27,6 +27,7 @@ func dumpWiki() error {
if err != nil {
return err
}
+ defer engine.Close()
var arts []DumpArticle
titles, err := engine.Dump()
if err != nil {
@@ -60,6 +61,7 @@ func restoreWiki() (err error) {
}
}
engine = NewEngine(index)
+ defer engine.Close()
var arts []DumpArticle
err = json.NewDecoder(os.Stdin).Decode(&arts)
if err != nil {
diff --git a/engine.go b/engine.go
index f2677af..44c0b7e 100644
--- a/engine.go
+++ b/engine.go
@@ -178,7 +178,7 @@ func (e *Engine) Search(public bool, search string) (string, error) {
return "", err
}
if res.Total == 0 {
- return "No search results
", nil
+ return "No search results", nil
} else if res.Total == maxSearchResult {
return "", errors.New("engine: too many search results")
}
@@ -191,7 +191,7 @@ func (e *Engine) Search(public bool, search string) (string, error) {
if err != nil {
continue
}
- html += `"
+ html += `` + art.Title + ""
for fragField, frags := range hit.Fragments {
if fragField == "title" || fragField == "search" {
html += ``
diff --git a/main.go b/main.go
index 6ff7b87..cc7357f 100644
--- a/main.go
+++ b/main.go
@@ -61,8 +61,13 @@ func main() {
flag.BoolVar(&restore, "restore", false, "restore a json dump to the data directory (dump is read from stdin)")
flag.Parse()
+ err := os.Chdir(datadir)
+ if err != nil {
+ logger.Fatal("main: ", err)
+ }
+
if dump {
- err := dumpWiki()
+ err = dumpWiki()
if err != nil {
logger.Fatal("dump: ", err)
}
@@ -70,7 +75,7 @@ func main() {
}
if restore {
- err := restoreWiki()
+ err = restoreWiki()
if err != nil {
logger.Fatal("restore: ", err)
}
@@ -81,16 +86,12 @@ func main() {
User: user,
Group: group,
}
- err := godrop.Drop(cfg, func() (net.Listener, error) {
+ err = godrop.Drop(cfg, func() (net.Listener, error) {
return net.Listen("tcp", listen)
})
if err != nil {
logger.Fatal("main: ", err)
}
- err = os.Chdir(datadir)
- if err != nil {
- logger.Fatal("main: ", err)
- }
newLogger(logfile)
l, err := godrop.GetListener()
if err != nil {
diff --git a/sri.sh b/sri.sh
index cb102f2..a0c7988 100755
--- a/sri.sh
+++ b/sri.sh
@@ -5,6 +5,8 @@ FILES="*.css *.js *.ico"
echo "SRI (subresource integrity) hashes"
cd ${DIR}
for f in $(ls ${FILES} 2>/dev/null); do
+ grep '^' ${f} | head -c-1 - > tmp
+ mv tmp ${f}
printf "%13s: " ${f}
echo "${HASH}-$(cat ${f}|openssl dgst -${HASH} -binary|openssl enc -base64 -A)"
done
diff --git a/templates.go b/templates.go
index a47253c..f738cf4 100644
--- a/templates.go
+++ b/templates.go
@@ -19,7 +19,7 @@ const (
@@ -30,7 +30,7 @@ const (
GoWiki | {{.Title}}
-
+
@@ -538,6 +538,10 @@ a.para {
}
h1,h2,h3,h4,h5,h6 {
font-weight: bold;
+ padding-top: 60px !important;
+ margin-top: -50px !important;
+ -webkit-background-clip: content-box !important;
+ background-clip: content-box !important;
}
h1 {
font-size: 2em;
diff --git a/templates/all.html b/templates/all.html
index ed5ea67..b53f6f0 100644
--- a/templates/all.html
+++ b/templates/all.html
@@ -8,7 +8,7 @@
diff --git a/templates/custom.css b/templates/custom.css
index 3023e69..c1aceb9 100644
--- a/templates/custom.css
+++ b/templates/custom.css
@@ -37,6 +37,10 @@ a.para {
}
h1,h2,h3,h4,h5,h6 {
font-weight: bold;
+ padding-top: 60px !important;
+ margin-top: -50px !important;
+ -webkit-background-clip: content-box !important;
+ background-clip: content-box !important;
}
h1 {
font-size: 2em;
diff --git a/templates/index.html b/templates/index.html
index 2ebda79..9d076db 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,7 +3,7 @@
GoWiki | {{.Title}}
-
+