use user defined frontmatter and stylesheet #23

This commit is contained in:
Henrique Dias 2016-08-21 20:50:23 +01:00
parent 35a9798278
commit 0b5a318728
4 changed files with 6 additions and 8 deletions

View File

@ -7,9 +7,9 @@
<link href='https://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ .Config.AbsoluteURL }}/_filemanagerinternal/css/styles.css"> <link rel="stylesheet" href="{{ .Config.AbsoluteURL }}/_filemanagerinternal/css/styles.css">
{{ if ne .Config.StyleSheet "" }} {{ if ne .User.StyleSheet "" }}
<style> <style>
{{ CSS .Config.StyleSheet }} {{ CSS .User.StyleSheet }}
</style> </style>
{{ end }} {{ end }}
</head> </head>

View File

@ -37,9 +37,7 @@ type UserConfig struct {
Rules []*Rule `json:"-"` // Access rules Rules []*Rule `json:"-"` // Access rules
} }
// TODO: USE USER StyleSheet // REVIEW: USE USER ROOT
// TODO: USE USER FRONTMATTER
// TODO: USE USER ROOT
// Rule is a dissalow/allow rule // Rule is a dissalow/allow rule
type Rule struct { type Rule struct {

View File

@ -15,7 +15,7 @@ import (
) )
// Update is used to update a file that was edited // Update is used to update a file that was edited
func (i *Info) Update(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error) { func (i *Info) Update(w http.ResponseWriter, r *http.Request, c *config.Config, u *config.UserConfig) (int, error) {
var data map[string]interface{} var data map[string]interface{}
kind := r.Header.Get("kind") kind := r.Header.Get("kind")
@ -45,7 +45,7 @@ func (i *Info) Update(w http.ResponseWriter, r *http.Request, c *config.Config)
mainContent = strings.TrimSpace(mainContent) mainContent = strings.TrimSpace(mainContent)
file = []byte(mainContent) file = []byte(mainContent)
case "complete": case "complete":
if file, code, err = ParseCompleteFile(data, i.Name, c.FrontMatter); err != nil { if file, code, err = ParseCompleteFile(data, i.Name, u.FrontMatter); err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
default: default:

View File

@ -116,7 +116,7 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
} }
// Update a file // Update a file
return fi.Update(w, r, c) return fi.Update(w, r, c, user)
case http.MethodPost: case http.MethodPost:
// Upload a new file // Upload a new file
if r.Header.Get("Upload") == "true" { if r.Header.Get("Upload") == "true" {