Pārlūkot izejas kodu

HTML export: Move home/up link div into the content div

Patch by Sebastian Rose
Carsten Dominik 15 gadi atpakaļ
vecāks
revīzija
9714678f30
2 mainītis faili ar 9 papildinājumiem un 6 dzēšanām
  1. 3 0
      lisp/ChangeLog
  2. 6 6
      lisp/org-html.el

+ 3 - 0
lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-11-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-html.el (org-export-as-html): Move the home/up link into
+	the content div.
+
 	* org.el (org-export-latex-packages-alist): Option definition
 	moved here from org-latex.el.
 

+ 6 - 6
lisp/org-html.el

@@ -753,7 +753,6 @@ PUB-DIR is set, use this as the publishing directory."
 <html xmlns=\"http://www.w3.org/1999/xhtml\"
 lang=\"%s\" xml:lang=\"%s\">
 <head>
-%s
 <title>%s</title>
 <meta http-equiv=\"Content-Type\" content=\"text/html;charset=%s\"/>
 <meta name=\"generator\" content=\"Org-mode\"/>
@@ -765,6 +764,7 @@ lang=\"%s\" xml:lang=\"%s\">
 </head>
 <body>
 <div id=\"content\">
+%s
 "
 		 (format
 		  (or (and (stringp org-export-html-xml-declaration)
@@ -775,17 +775,17 @@ lang=\"%s\" xml:lang=\"%s\">
 		      "")
 		  (or charset "iso-8859-1"))
 		 language language
+		 (org-html-expand title)
+		 (or charset "iso-8859-1")
+		 date author description keywords
+		 style
 		 (if (or link-up link-home)
 		     (concat
 		      (format org-export-html-home/up-format
 			      (or link-up link-home)
 			      (or link-home link-up))
 		      "\n")
-		   "")
-		 (org-html-expand title)
-		 (or charset "iso-8859-1")
-		 date author description keywords
-		 style))
+		   "")))
 
         (org-export-html-insert-plist-item opt-plist :preamble opt-plist)