优化页眉的显示

converter/converter.go

@@ -476,12 +476,12 @@ func (this *Converter) convertToPdf() (err error) {
 
 	//header template
 	if len(this.Config.Header) > 0 {
-		args = append(args, "--pdf-header-template", this.Config.Header)
+		args = append(args, "--pdf-header-template", GetFooterOrHeaderParams(this.Config.Header))
 	}
 
 	//footer template
 	if len(this.Config.Footer) > 0 {
-		args = append(args, "--pdf-footer-template", this.Config.Footer)
+		args = append(args, "--pdf-footer-template",GetFooterOrHeaderParams(this.Config.Footer))
 	}
 
 	if len(this.Config.MarginLeft) > 0 {

converter/util.go

@@ -45,3 +45,7 @@ func parseConfig(configFile string) (cfg Config, err error) {
 	}
 	return
 }
+
+func GetFooterOrHeaderParams(v string) string {
+	return v
+}

converter/util_linux.go

@@ -0,0 +1,5 @@
+package converter
+
+func GetFooterOrHeaderParams(v string) string {
+	return "\"" + v +"\""
+}

models/book_result.go

@@ -245,8 +245,8 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
 		Cover:        m.Cover,
 		Timestamp:    time.Now().Format("2006-01-02 15:04:05"),
 		Description:  string(blackfriday.MarkdownBasic([]byte(m.Description))),
-		Footer:       "\"<p style='color:#8E8E8E;font-size:12px;'>本文档使用 <a href='https://www.iminho.me' style='text-decoration:none;color:#1abc9c;font-weight:bold;'>MinDoc</a> 构建 <span style='float:right'>- _PAGENUM_ -</span></p>\"",
-		Header:       "\"<p style='color:#8E8E8E;font-size:12px;'>_SECTION_</p>\"",
+		Footer:       "<p style='color:#8E8E8E;font-size:12px;'>本文档使用 <a href='https://www.iminho.me' style='text-decoration:none;color:#1abc9c;font-weight:bold;'>MinDoc</a> 构建 <span style='float:right'>- _PAGENUM_ -</span></p>",
+		Header:       "<p style='color:#8E8E8E;font-size:12px;'>_SECTION_</p>",
 		Identifier:   "",
 		Language:     "zh-CN",
 		Creator:      m.CreateName,
@@ -264,7 +264,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) {
 		More:         []string{},
 	}
 	if m.Publisher != "" {
-		ebookConfig.Footer = "\"<p style='color:#8E8E8E;font-size:12px;'>本文档由 <span style='text-decoration:none;color:#1abc9c;font-weight:bold;'>"+ m.Publisher +"</span> 生成<span style='float:right'>- _PAGENUM_ -</span></p>\""
+		ebookConfig.Footer = "<p style='color:#8E8E8E;font-size:12px;'>本文档由 <span style='text-decoration:none;color:#1abc9c;font-weight:bold;'>"+ m.Publisher +"</span> 生成<span style='float:right'>- _PAGENUM_ -</span></p>"
 	}
 
 	if tempOutputPath, err = filepath.Abs(tempOutputPath); err != nil {

views/book/setting.tpl

@@ -65,8 +65,8 @@
                             </div>
                             <div class="form-group">
                                 <label>公司标识</label>
-                                <input type="text" class="form-control" name="publisher" value="{{.Model.publisher}}" placeholder="公司名称" disabled>
-                                <p class="text">导出文档时的标识</p>
+                                <input type="text" class="form-control" name="publisher" value="{{.Model.Publisher}}" placeholder="公司名称">
+                                <p class="text">导出文档PDF文档时显示的页脚</p>
                             </div>
                             <div class="form-group">
                                 <label>描述</label>