summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2010-10-25 15:13:16 (GMT)
committer Jaromil <jaromil@dyne.org>2010-10-25 15:13:16 (GMT)
commit5db1ba69078d2ed7f1c4fd60aae6e70e35cfedd3 (patch)
tree7b27bfa2cd2cc848358f5e4320420b7b872d57df
parent065069527ec4cc35324a3902585fe4501fc278e2 (diff)
more styling
hellekin suggests to normalize path for other software
-rw-r--r--dyne-web/Makefile14
-rw-r--r--dyne-web/muse-config.el163
-rw-r--r--dyne-web/public/images/tbt-wheel.png (renamed from dyne-web/pub/images/tbt-wheel.png)bin136516 -> 136516 bytes
-rw-r--r--dyne-web/public/stylesheet/common.css (renamed from dyne-web/pub/stylesheet/common.css)0
-rw-r--r--dyne-web/public/stylesheet/dyne.css (renamed from dyne-web/pub/stylesheet/dyne.css)69
-rw-r--r--dyne-web/public/stylesheet/print.css (renamed from dyne-web/pub/stylesheet/print.css)0
-rw-r--r--dyne-web/public/stylesheet/screen.css (renamed from dyne-web/pub/stylesheet/screen.css)15
-rw-r--r--dyne-web/views/footer.html (renamed from dyne-web/templates/footer.html)9
-rw-r--r--dyne-web/views/footer.tex (renamed from dyne-web/templates/footer.tex)0
-rw-r--r--dyne-web/views/header.html (renamed from dyne-web/templates/header.html)0
-rw-r--r--dyne-web/views/header.tex (renamed from dyne-web/templates/header.tex)0
-rw-r--r--dyne-web/views/index.muse (renamed from dyne-web/pages/index.muse)0
12 files changed, 139 insertions, 131 deletions
diff --git a/dyne-web/Makefile b/dyne-web/Makefile
index c172923..9b224c1 100644
--- a/dyne-web/Makefile
+++ b/dyne-web/Makefile
@@ -1,11 +1,15 @@
-all:
- emacs -Q -no-site-file -batch -l muse-config.el \
+
+all: siteconf
+ emacs -Q -no-site-file -batch -l siteconf.el -l muse-config.el \
-f muse-project-batch-publish "TBT"
-clean:
- emacs -Q -no-site-file -batch -l muse-config.el \
- -f muse-project-delete-output-files "TBT"
+siteconf:
+ echo "(set 'path \"`pwd`\")" > siteconf.el
+clean:
+ emacs -Q -no-site-file -batch -l siteconf.el -l muse-config.el \
+ -f muse-project-delete-output-files "TBT"
+ rm -f siteconf.el
diff --git a/dyne-web/muse-config.el b/dyne-web/muse-config.el
index c68db34..c2acc17 100644
--- a/dyne-web/muse-config.el
+++ b/dyne-web/muse-config.el
@@ -24,25 +24,79 @@
(require 'muse-wiki) ; load Wiki support
;(require 'muse-ikiwiki) ; load ikiwiki export support
-;;(require 'muse-message) ; load message support (experimental)
-;;(require 'atom-api) ; atom api for muse
+;;; Skinning my Muse
+
+(custom-set-faces
+ '(muse-bad-link ((t (:foreground "DeepPink" :underline "DeepPink" :weight bold)))))
+
+(custom-set-variables
+ '(muse-latex-permit-contents-tag t)
+ '(muse-colors-autogen-headings (quote outline))
+ '(muse-colors-inline-image-method (quote muse-colors-use-publishing-directory))
+ '(muse-mode-hook (quote (flyspell-mode footnote-mode)))
+ '(muse-publish-comments-p nil)
+
+; LINKS
+ ;; '(muse-publish-desc-transforms
+ ;; (quote (muse-wiki-publish-pretty-title
+ ;; muse-wiki-publish-pretty-interwiki
+ ;; muse-publish-strip-URL)))
+ ;; '(muse-wiki-publish-small-title-words
+ ;; (quote ("the" "and" "at" "on" "of" "for" "in" "an" "a" "page")))
+
+; HTML
+ '(muse-html-charset-default "utf-8")
+ '(muse-html-encoding-default (quote utf-8))
+ '(muse-html-meta-content-encoding (quote utf-8))
+ '(muse-html-footer (concat path "/views/footer.html"))
+ '(muse-html-header (concat path "/views/header.html"))
+ '(muse-html-style-sheet
+ "<link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"all\"
+ href=\"stylesheet/dyne.css\" />
+ <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"screen\"
+ href=\"stylesheet/screen.css\" />
+ <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"print\"
+ href=\"stylesheet/print.css\" />")
+ '(muse-html-table-attributes " class=\"muse-table\" border=\"0\" cellpadding=\"5\"")
+
+ ;; RSS should not summarize but include the whole entry
+ '(muse-journal-rss-summarize-entries nil)
+
+; LATEX
+ '(muse-latex-footer (concat path "/views/footer.tex"))
+ '(muse-latex-header (concat path "/views/header.tex"))
+ '(muse-latex-permit-contents-tag t)
+ '(muse-latex-twocolumn t)
+
+; XHTML
+ '(muse-xhtml-footer (concat path "/views/footer.html"))
+ '(muse-xhtml-header (concat path "/views/header.html"))
+ '(muse-xhtml-meta-content-encoding (quote utf-8))
+ '(muse-xhtml-style-sheet
+ "<link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"all\"
+ href=\"css/common.css\" />
+ <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"screen\"
+ href=\"css/screen.css\" />
+ <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"print\"
+ href=\"css/print.css\" />")
+
+
+)
;; -----------
;; Styles
-;; ---- jaromil's musings
+;; ---- webpage theme configuration
(muse-derive-style "tbt-webpage-html" "html"
- :author "Jaromil"
- :header "~/devel/tbt/dyne-web/templates/header.html"
- :footer "~/devel/tbt/dyne-web/templates/footer.html"
+ :header (concat path "/views/header.html")
+ :footer (concat path "/views/footer.html")
:base-url "http://tbt.dyne.org")
(muse-derive-style "tbt-webpage-pdf" "pdf"
- :author "Jaromil"
- :header "~/devel/tbt/dyne-web/templates/header.tex"
- :footer "~/devel/tbt/dyne-web/templates/footer.tex"
+ :header (concat path "/views/header.tex")
+ :footer (concat path "/views/footer.tex")
:base-url "http://tbt.dyne.org")
@@ -51,7 +105,7 @@
`(
("TBT"
- (,@(muse-project-alist-dirs "pages")
+ (,@(muse-project-alist-dirs "views")
)
;; Publish this directory and its subdirectories. Arguments
;; are as follows. The above `muse-project-alist-dirs' part
@@ -61,12 +115,12 @@
;; 3. Publishing style
;; remainder: Other things to put in every generated style
- ,@(muse-project-alist-styles "pages"
- "pub"
+ ,@(muse-project-alist-styles "views"
+ "public"
"tbt-webpage-html")
- ,@(muse-project-alist-styles "pages"
- "pub"
+ ,@(muse-project-alist-styles "views"
+ "public"
"tbt-webpage-pdf")
)
@@ -96,17 +150,6 @@
(set (make-local-variable 'muse-publish-url-transforms)
(cons 'cb-make-links-absolute muse-publish-url-transforms)))
-;; Use hires images in documents
-(defun cb-make-images-hires (str &res ignored)
- "Make images hi resulution."
- (when str
- (save-match-data
- (if (string-match "fotos/.*" str)
- (replace-match "fotos/hires/" nil t str)
- str))))
-(defun make-images-hires()
- (set (make-local-variable 'muse-publish-url-transforms)
- (cons 'cb-make-images-hires muse-publish-url-transforms)))
(defun muse-insert-reset-chapter ()
(insert "\n\\setcounter{chapter}{1}\n"))
@@ -130,76 +173,6 @@
)
-;;; Skinning my Muse
-
-(custom-set-faces
- '(muse-bad-link ((t (:foreground "DeepPink" :underline "DeepPink" :weight bold)))))
-
-(custom-set-variables
- '(muse-latex-permit-contents-tag t)
- '(muse-colors-autogen-headings (quote outline))
- '(muse-colors-inline-image-method (quote muse-colors-use-publishing-directory))
- '(muse-mode-hook (quote (flyspell-mode footnote-mode)))
- '(muse-publish-comments-p nil)
-
-; LINKS
- ;; '(muse-publish-desc-transforms
- ;; (quote (muse-wiki-publish-pretty-title
- ;; muse-wiki-publish-pretty-interwiki
- ;; muse-publish-strip-URL)))
- ;; '(muse-wiki-publish-small-title-words
- ;; (quote ("the" "and" "at" "on" "of" "for" "in" "an" "a" "page")))
-
-; HTML
- '(muse-html-charset-default "utf-8")
- '(muse-html-encoding-default (quote utf-8))
- '(muse-html-meta-content-encoding (quote utf-8))
- '(muse-html-footer "templates/footer.html")
- '(muse-html-header "templates/header.html")
- '(muse-html-style-sheet
- "<link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"all\"
- href=\"stylesheet/dyne.css\" />
- <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"screen\"
- href=\"stylesheet/screen.css\" />
- <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"print\"
- href=\"stylesheet/print.css\" />")
- '(muse-html-table-attributes " class=\"muse-table\" border=\"0\" cellpadding=\"5\"")
-
- ;; RSS should not summarize but include the whole entry
- '(muse-journal-rss-summarize-entries nil)
-
-; RSS feed
-; '(muse-journal-rss-entry-template "
-; <item>
-;; <title>%title%</title>
-; <link>%link%#%anchor%</link>
-; <author>Jaromil</author>
-; <pubDate>%date%</pubDate>
-; <guid>%link%#%anchor%</guid>
-; %enclosure%
-; </item>
-; ")
-
-; LATEX
- '(muse-latex-footer "templates/footer.tex")
- '(muse-latex-header "templates/header.tex")
- '(muse-latex-permit-contents-tag t)
- '(muse-latex-twocolumn t)
-
-; XHTML
- '(muse-xhtml-footer "templates/footer.html")
- '(muse-xhtml-header "templates/header.html")
- '(muse-xhtml-meta-content-encoding (quote utf-8))
- '(muse-xhtml-style-sheet
- "<link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"all\"
- href=\"css/common.css\" />
- <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"screen\"
- href=\"css/screen.css\" />
- <link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" media=\"print\"
- href=\"css/print.css\" />")
-
-
-)
;;;; fixes to markup?
;(defvar muse-latex-markup-strings
diff --git a/dyne-web/pub/images/tbt-wheel.png b/dyne-web/public/images/tbt-wheel.png
index f4d8bbb..f4d8bbb 100644
--- a/dyne-web/pub/images/tbt-wheel.png
+++ b/dyne-web/public/images/tbt-wheel.png
Binary files differ
diff --git a/dyne-web/pub/stylesheet/common.css b/dyne-web/public/stylesheet/common.css
index a435b3f..a435b3f 100644
--- a/dyne-web/pub/stylesheet/common.css
+++ b/dyne-web/public/stylesheet/common.css
diff --git a/dyne-web/pub/stylesheet/dyne.css b/dyne-web/public/stylesheet/dyne.css
index ac22ddf..b8fa880 100644
--- a/dyne-web/pub/stylesheet/dyne.css
+++ b/dyne-web/public/stylesheet/dyne.css
@@ -11,7 +11,7 @@ body {
background-color: #ffeedd;
color: #333;
font-family: Arial, Helvetica, sans-serif;
- font-size: 10pt;
+ font-size: 9pt;
margin: 0;
padding: 0;
}
@@ -95,17 +95,48 @@ h1 {
}
h2 {
- background: #fed url(http://dyne.org/images/bg_gradient.png) top left repeat-y;
- color: #222;
- border-bottom: 2px dotted #ec9;
- font-size: 28px;
- font-style: italic;
- margin: 10px 0 0 -3em;
- padding: 0.5em;
- white-space: nowrap;
+ background: #fed url(http://dyne.org/images/bg_gradient.png) top left repeat-y;
+ color: #222;
+ border-bottom: 2px dotted #ec9;
+ font-size: 28px;
+ font-style: italic;
+ margin: 10px 0 0 -3em;
+ padding: 0.5em;
+ white-space: nowrap;
+ text-align: center;
+}
+
+h3 {
+ color: #222;
+ border-bottom: 1px dotted #ec9;
+ font-size: 22px;
+ font-style: italic;
+ margin: 2em 0 0 7em;
+ padding: 0.5em;
+ white-space: nowrap;
+ text-align: left;
+ width: 20em;
+
+}
+
+h4 {
+ color: #222;
+ font-size: 18px;
+ font-style: italic;
+ margin: 1em 10em;
+ padding: 0.5em;
+ white-space: nowrap;
+ text-align: left;
+ width: 50%;
+
}
+
p {
- margin: 20px 2em -10px 2em;
+ margin: 1em 0 0 10em;
+}
+pre {
+ font-size: 8pt;
+ margin: 1em 0 0 10em;
}
/* footer */
@@ -140,14 +171,18 @@ footer section h2 {
margin-top: 1em;
text-align: center; }
#disclaimer {
- font-size: smaller;
- text-align: justify;
- width: 18em; }
+ font-size: smaller;
+ text-align: justify;
+ margin-top: 1.5em;
+ width: 18em;
+ }
#credits {
- font-size: smaller;
- margin-right: 1em;
- text-align: right;
- width: 140px; }
+ font-size: smaller;
+ margin-right: 1em;
+ margin-top: 1.5em;
+ text-align: right;
+ width: 140px;
+ }
#recognition {
margin-top: 1em;
text-align: center; }
diff --git a/dyne-web/pub/stylesheet/print.css b/dyne-web/public/stylesheet/print.css
index f234cab..f234cab 100644
--- a/dyne-web/pub/stylesheet/print.css
+++ b/dyne-web/public/stylesheet/print.css
diff --git a/dyne-web/pub/stylesheet/screen.css b/dyne-web/public/stylesheet/screen.css
index ade84fa..1b7ac4e 100644
--- a/dyne-web/pub/stylesheet/screen.css
+++ b/dyne-web/public/stylesheet/screen.css
@@ -25,7 +25,11 @@
}
.contents {
- width: 13em;
+ font-family:Georgia,Arial,Helvetica,sans-serif;
+ font-size: 12px;
+
+ width: 11.5em;
+ height: 100%;
float: left;
clear: left;
margin-top: 10em;
@@ -33,15 +37,10 @@
margin-right: 3em;
margin-bottom: 0.5em;
padding: .5em 30px;
- moz-background-clip:border;
- moz-background-inline-policy:continuous;
- moz-background-origin:padding;
- background:#FFEEDD url(http://dyne.org/images/dynebggrl2rsm.png) repeat-y scroll 0 0;
-
- font-family:Georgia,Arial,Helvetica,sans-serif;
- font-size:small;
display: compact;
+ position: fixed;
+
}
blockquote {
diff --git a/dyne-web/templates/footer.html b/dyne-web/views/footer.html
index 66d7847..77da5e5 100644
--- a/dyne-web/templates/footer.html
+++ b/dyne-web/views/footer.html
@@ -3,19 +3,16 @@
<section id="credits">
<h2>Credits</h2>
- <p>
<a href="http://dyne.org/" target="_top"><img src="http://dyne.org/images/dyne-sm.png" alt="dyne.org stamp" /></a><br />
- is kindly hosted<br> by <a href="http://nimk.nl/">nimk.nl</a> and <a href="http://servus.at/">servus.at</a></p>
+ is kindly hosted<br> by <a href="http://nimk.nl/">nimk.nl</a> and <a href="http://servus.at/">servus.at</a>
</section>
<section id="disclaimer">
<h2>dyne.org</h2>
- <p>
Copyleft 2000 - 2010 dyne.org foundation and respective authors.
Verbatim copying and distribution is permitted in any medium,
- provided this notice is preserved.
- <p><a href="contact">Send your enquiries &amp; questions to dyne's hackers</a>.</p>
- </p>
+ provided this notice is preserved.<br />
+ <a href="contact">Send your enquiries &amp; questions to dyne's hackers</a>.
</section>
<section id="recognition">
diff --git a/dyne-web/templates/footer.tex b/dyne-web/views/footer.tex
index 5050aa1..5050aa1 100644
--- a/dyne-web/templates/footer.tex
+++ b/dyne-web/views/footer.tex
diff --git a/dyne-web/templates/header.html b/dyne-web/views/header.html
index 63091af..63091af 100644
--- a/dyne-web/templates/header.html
+++ b/dyne-web/views/header.html
diff --git a/dyne-web/templates/header.tex b/dyne-web/views/header.tex
index 687f4c9..687f4c9 100644
--- a/dyne-web/templates/header.tex
+++ b/dyne-web/views/header.tex
diff --git a/dyne-web/pages/index.muse b/dyne-web/views/index.muse
index 83f19ef..83f19ef 100644
--- a/dyne-web/pages/index.muse
+++ b/dyne-web/views/index.muse