X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=blog.el;h=f6c1e6c9566e245ac95f82d0f0021f8108a7cf0f;hb=323ccbeededf2954ddeb3e14ff68a275ccb231ff;hp=2ab08e8cc8a635c358e0440594a4a2229bec6134;hpb=b13b4bec130538c082f698b9ce5bb72df72fca05;p=blog.git

diff --git a/blog.el b/blog.el
index 2ab08e8..f6c1e6c 100644
--- a/blog.el
+++ b/blog.el
@@ -68,27 +68,39 @@
 ;; To prevent inline-css when exporting html. will use external css
 (setq org-html-htmlize-output-type 'css)
 
+
+(setq blog-extra-head
+      (concat
+       ;; "<link rel='stylesheet' href='" css-file "' />\n"
+       "<link rel='stylesheet' href='../css/main.css' />\n"
+       "<link rel='stylesheet' href='../css/code.css' />"
+       ))
+
+(setq blog-header
+      (concat
+       " <header id= 'banner' > "
+       "<h1><a href= '/' >Peng Li</a></h1>"
+       "<hr>"
+       "<nav><ul>"
+       "<li><a href= '/' >About</a></li>"
+       "<li><a href= '/blog.html' >Blog</a></li>"
+       "<li><a href= '/home.html' >Home</a></li>"
+       "</ul></nav>"
+       "</header>"))
+
+
+
+(setq blog-footer
+      "<hr />\n
+<p><span style=\"float: left;\"><a href= \"/blog.xml\">RSS</a></span>
+License: <a href= \"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA 4.0</a></p>\n
+<p><a href= \"/contact.html\"> Contact</a></p>\n")
+
+;; don't know why setting this null in `org-publish-project-alist' doesn't work
+;; (setf org-html-home/up-format "")
+
 (setq org-publish-project-alist
       `(
-        ;; ("org-notes"
-        ;;  :base-directory ,root-dir
-        ;;  :base-extension "org"
-        ;;  :publishing-directory ,publish-dir
-        ;;  :recursive t
-        ;;  :publishing-function org-html-publish-to-html
-        ;;  :headline-levels 4
-        ;;  :section-numbers nil
-        ;;  :auto-preamble t
-        ;;  :auto-sitemap t          ;Generate sitmap.org automagicaly...
-        ;;  :sitemap-filename "sitemap.org" ;... call it sitemap.org (it's the default )...
-        ;;  :sitemap-title "Sitemap"
-
-        ;;  :html-table-of-contents nil
-        ;;  :html-postamble nil ;dont export creator auto validation info in html postamble div
-        ;;  :html-link-home "/"
-        ;;  :html-head  ,(concat  "<link rel='stylesheet' href='" css-file  "' />")
-        ;;  :html-head-include-default-style nil
-        ;;  :html-head-include-scripts nil)
 	("blog-pages"
 	 ;; publishing
 	 :base-directory ,root-dir
@@ -98,8 +110,19 @@
 	 :publishing-function org-html-publish-to-html
 	 
 	 ;; html style
-	 :html-head  ,(concat  "<link rel='stylesheet' href='" css-file  "' />")
-	 :html-postamble nil)
+	 :htlm-link-home "/"
+	 ;; disable home/up div
+	 :html-home/up-format ""
+	 :html-link-home ""
+	 :html-link-up ""
+	 ;;
+	 :html-head nil
+	 :html-head-include-default-style nil
+	 :html-head-include-scripts nil
+	 :html-head-extra  ,blog-extra-head
+	 :html-preamble ,blog-header
+	 :html-postamble ,blog-footer)
+
 	("blog-posts"
 	 ;; publishing
 	 :base-directory ,(concat root-dir "/posts")
@@ -107,12 +130,27 @@
 	 :publishing-directory ,(concat publish-dir "/posts")
 	 :recursive t
 	 :publishing-function org-html-publish-to-html
-	 :html-link-home "/"
-	 
+
 	 ;; html style
-	 :html-head ,(concat "<link rel='stylesheet' href='" css-file "' />")
-	 ;; don't export creator auto validation info in html postamble div
-	 :html-postamble nil)
+  	 :html-link-home "/"
+	 ;; disable Home/Up
+	 :html-home/up-format ""
+	 :html-link-up ""
+	 :html-link-home ""
+	 ;; Add css file, preamble and posamble
+	 :html-head nil
+	 :html-head-include-default-style nil
+	 :html-head-include-scripts nil
+	 :html-head-extra ,blog-extra-head
+	 :html-preamble ,blog-header
+	 :html-postamble ,blog-footer
+
+	 ;; sitemap
+	 :auto-sitemap t
+	 :sitemap-filename "sitemap.org"
+	 :sitemap-title "Sitemap"
+	 )
+	
 	("blog-css"
 	 :base-directory ,(concat root-dir "/css")
 	 :base-extension ".*"