X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=blog.el;h=245a849cb7b98b308361d107ee7a6cac9a996471;hb=ad028b3390f78be19de9eaae3336a1d883618f3b;hp=26672fad5238c3dd7de165ac29a1c0b870dd8793;hpb=222c14138e6e22d12e475faed8d1d1cacf381f47;p=blog.git

diff --git a/blog.el b/blog.el
index 26672fa..245a849 100644
--- a/blog.el
+++ b/blog.el
@@ -68,27 +68,38 @@
 ;; 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")
+
+;; 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
@@ -96,31 +107,59 @@
 	 :publishing-directory ,publish-dir
 	 :recursive nil
 	 :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")
+	 :base-directory ,(concat root-dir "/posts")
 	 :base-extension "org"
-	 :publishing-directory ,(concat publish-dir "posts")
+	 :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-directory ,(concat root-dir "/css")
 	 :base-extension ".*"
-	 :publishing-directory ,(concat publish-dir "css")
+	 :publishing-directory ,(concat publish-dir "/css")
 	 :publishing-function org-publish-attachment
 	 :recursive t)
 	("blog-cgi"
-	 :base-directory ,(concat root-dir "cgi-bin")
+	 :base-directory ,(concat root-dir "/cgi-bin")
 	 :base-extension ".*"
-	 :publishing-directory ,(concat publish-dir "cgi-bin")
+	 :publishing-directory ,(concat publish-dir "/cgi-bin")
 	 :publishing-function org-publish-attachment
 	 :recursive t)
         ("blog" :components ("blog-pages" "blog-posts" "blog-css" "blog-cgi"))))