X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=blog.el;h=245a849cb7b98b308361d107ee7a6cac9a996471;hb=35bda6ea5602b1f1bd79e50eff027a1f24d47334;hp=55913c1b4b4a9b6b891b059e4f0bb9f61ad79b67;hpb=90ed81b2107172656423eb4f56350f2a6bec5a22;p=blog.git

diff --git a/blog.el b/blog.el
index 55913c1..245a849 100644
--- a/blog.el
+++ b/blog.el
@@ -82,46 +82,24 @@
        "<h1><a href= '/' >Peng Li</a></h1>"
        "<hr>"
        "<nav><ul>"
-       ;; "<li><a href= '/contact.html' >Contact</a></li>"
+       "<li><a href= '/' >About</a></li>"
        "<li><a href= '/blog.html' >Blog</a></li>"
-       ;; "<li><a href= '/teaching.html' >Teaching</a></li>"
-       ;; "<li><a href= '/research.html' >Research</a></li>"
-       "<li><a href= '/' >About Me</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")
+(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")
 
 ;; 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
@@ -136,9 +114,13 @@
 	 :html-home/up-format ""
 	 :html-link-home ""
 	 :html-link-up ""
-	 
-	 :html-head  ,blog-extra-head
-	 :html-postamble nil)
+	 ;;
+	 :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
@@ -160,7 +142,12 @@
 	 :html-head-include-scripts nil
 	 :html-head-extra ,blog-extra-head
 	 :html-preamble ,blog-header
-	 ;; :html-postamble ,blog-footer
+	 :html-postamble ,blog-footer
+
+	 ;; sitemap
+	 :auto-sitemap t
+	 :sitemap-filename "sitemap.org"
+	 :sitemap-title "Sitemap"
 	 )
 	
 	("blog-css"