From 0660079cefb9de23d686a7f50a6b810115974fd8 Mon Sep 17 00:00:00 2001
From: Niels Serup <ns@metanohi.org>
Date: Thu, 11 Aug 2011 03:37:52 +0200
Subject: [PATCH] More valid.

---
 apache-config                     |  4 ++--
 msgsite/listdir.org               |  5 ++++-
 msgsite/servererror.org           | 10 ++++++++--
 msgsite/showrevs.org              |  5 ++++-
 msgsite/sitemap.org               |  5 ++++-
 prestatic/aesthetics.js           |  9 ---------
 prestatic/general.css             | 28 ++++++++++++++--------------
 prestatic/screen.css              |  3 +++
 prestatic/template.html           | 11 ++++++-----
 site/index.org                    |  2 +-
 site/projects/index.org           | 20 ++++++++++++++++----
 site/projects/mege/tests/code.org |  1 +
 site/writings/index.org           |  5 ++++-
 13 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/apache-config b/apache-config
index 6256cd2..0b49984 100644
--- a/apache-config
+++ b/apache-config
@@ -34,8 +34,8 @@
     </Directory>
 
     LogLevel warn
-	ErrorLog ${APACHE_LOG_DIR}/metanohi.name-error.log
-	CustomLog ${APACHE_LOG_DIR}/metanohi.name-access.log combined
+	ErrorLog /var/log/apache2/metanohi.name-error.log
+	CustomLog /var/log/apache2/metanohi.name-access.log combined
 
 
 </VirtualHost>
diff --git a/msgsite/listdir.org b/msgsite/listdir.org
index dc24229..6f4be77 100644
--- a/msgsite/listdir.org
+++ b/msgsite/listdir.org
@@ -2,4 +2,7 @@
 
 * Directory listing: <@eval page.core_url@>
 
-<@deval page.dirlist@>
+#++deval
+#+BEGIN_SRC python3
+  page.dirlist
+#+END_SRC
diff --git a/msgsite/servererror.org b/msgsite/servererror.org
index ffdb352..4cd31ea 100644
--- a/msgsite/servererror.org
+++ b/msgsite/servererror.org
@@ -5,10 +5,16 @@
 There was an error, most likely due to sloppy programming:
 
 #&block
-<@deval page.error@>
+#++deval
+#+BEGIN_SRC python
+  page.error
+#+END_SRC
 #&
 
-<@deval page.errortraceback@>
+#++deval
+#+BEGIN_SRC python
+  page.errortraceback
+#+END_SRC
 
 ** Fixing it
 
diff --git a/msgsite/showrevs.org b/msgsite/showrevs.org
index 1cf9d1f..d7ae4f1 100644
--- a/msgsite/showrevs.org
+++ b/msgsite/showrevs.org
@@ -2,4 +2,7 @@
 
 * Revisions for <@deval repr(page.path_shown)@>
 
-<@deval page.revisions@>
+#++deval
+#+BEGIN_SRC python3
+  page.revisions
+#+END_SRC
diff --git a/msgsite/sitemap.org b/msgsite/sitemap.org
index ee5d286..608852e 100644
--- a/msgsite/sitemap.org
+++ b/msgsite/sitemap.org
@@ -2,4 +2,7 @@
 
 * Sitemap
 
-<@eval page.sitemap@>
+#++eval
+#+BEGIN_SRC python
+  page.sitemap
+#+END_SRC
diff --git a/prestatic/aesthetics.js b/prestatic/aesthetics.js
index e3b97f1..29a6efb 100644
--- a/prestatic/aesthetics.js
+++ b/prestatic/aesthetics.js
@@ -45,24 +45,15 @@ set_min_height = function() {
     contentdiv.style.minHeight = h + 'px';
 };
 
-set_logo_width = function() {
-    var ws;
-    ws = get_window_size();
-    ww = ws[1];
-    logodiv.style.width = ww + 'px';
-};
-
 adjust_sizes = function() {
     if (!is_screen_media())
         return;
     set_min_height();
-    set_logo_width();
 };
 
 window.addEventListener('load', function(event){
     menudiv = document.getElementById('menu');
     contentdiv = document.getElementById('content');
     metadiv = document.getElementById('metadata');
-    logodiv = document.getElementById('logo');
     adjust_sizes();
 }, false);
diff --git a/prestatic/general.css b/prestatic/general.css
index e267fdd..87ba9bb 100644
--- a/prestatic/general.css
+++ b/prestatic/general.css
@@ -111,7 +111,7 @@ h4 {
 }
 
 h5 {
-    margin-top: 5px 0 1px 0;
+    margin: 5px 0 1px 0;
     font-size: 16px;
     font-weight: bold;
 }
@@ -243,7 +243,7 @@ ul > * > ul, ol > * > ul {
 }
 
 ul > * * > ul, ol > * * > ul {
-    list-style-type: disc; ! important
+    list-style-type: disc !important;
 }
 
 ol {
@@ -259,7 +259,7 @@ ol > * > ol, ul > * > ol {
 }
 
 ol > * * > ol, ul > * * > ol {
-    list-style-type: decimal; ! important
+    list-style-type: decimal !important;
 }
 
 
@@ -269,7 +269,7 @@ dd {
     margin-left: 20px;
 }
 
-dl > dl {
+dl dl {
     margin-left: 21px;
     padding-left: 5px;
     border-left: 4px solid #000;
@@ -348,15 +348,15 @@ caption {
 }
 
 .center-align, .center-align > * {
-    text-align: center; ! important
+    text-align: center !important;
 }
 
 .right-align, .right-align > * {
-    text-align: right; ! important
+    text-align: right !important;
 }
 
 .left-align, .left-align > * {
-    text-align: left; ! important
+    text-align: left !important;
 }
 
 .center-float {
@@ -389,27 +389,27 @@ div.left-float, img.left-float, video.left-float, audio.left-float  {
 }
 
 .noclear, div.caption.noclear {
-    clear: none; ! important
+    clear: none !important;
 }
 
 .huge, .huge * {
-    font-size: 25px; ! important
+    font-size: 25px !important;
 }
 
 .large, .large * {
-    font-size: 18px; ! important
+    font-size: 18px !important;
 }
 
 .medium, .medium * {
-    font-size: 14px; ! important
+    font-size: 14px !important;
 }
 
 .small, .small * {
-    font-size: 11px; ! important
+    font-size: 11px !important;
 }
 
 .tiny, .tiny * {
-    font-size: 9px; ! important
+    font-size: 9px !important;
 }
 
 
@@ -434,7 +434,7 @@ div.left-float, img.left-float, video.left-float, audio.left-float  {
 .linenos {
     border-width: 0 1px 0 0;
     border-style: solid;
-    border-size: black;
+    border-color: black;
     vertical-align: top;
 }
 
diff --git a/prestatic/screen.css b/prestatic/screen.css
index 16a7521..80eb8ae 100644
--- a/prestatic/screen.css
+++ b/prestatic/screen.css
@@ -99,6 +99,9 @@ ul#menulinks {
       " url('/static/metanohi-logo.png') no-repeat center;\n"@*/
 }
 
+#body.full #logo {
+    
+}
 
 .highlighttable .code {
     width: 600px;
diff --git a/prestatic/template.html b/prestatic/template.html
index 2236e84..9d07f5b 100644
--- a/prestatic/template.html
+++ b/prestatic/template.html
@@ -32,19 +32,20 @@ if page.is_dynamic:
     <link href='/atom.xml' type='application/atom+xml' rel='alternate'
           title='metanohi atom feed' />
     <link rel='schema.DCTERMS' href='http://purl.org/dc/terms/' />
-    <meta name='DCTERMS.title' content='<!--@eval page.title@-->' />
-    <meta name='DCTERMS.description' content='<!--@eval page.summary@-->' />
+    <meta name='DCTERMS.title' content=<!--@eval repr(page.title)@--> />
     <meta name='DCTERMS.creator' content='Niels Serup' />
 <!--    <meta name='DCTERMS.format' content='application/xhtml+xml' />-->
 <!--@exec
+if page.summary:
+    print("<meta name='DCTERMS.description' content={} />".format(repr(page.summary)))
 if page.created_rfc3339:
     print("    <meta name='DCTERMS.created' content='{}' />".format(page.created_rfc3339))
 if page.modified_rfc3339:
     print("    <meta name='DCTERMS.modified' content='{}' />".format(page.modified_rfc3339))
 @-->
-    <meta name='DCTERMS.language' content='<!--@eval page.language@-->' />
+    <meta name='DCTERMS.language' content=<!--@eval repr(page.language)@--> />
     <meta name='DCTERMS.isPartOf' content='http://metanohi.org/' />
-    <meta name='DCTERMS.isVersionOf' content='<!--@eval page.core_url@-->' />
+    <meta name='DCTERMS.isVersionOf' content=<!--@eval repr(page.core_url)@--> />
     <meta name='DCTERMS.audience' content='software developers' />
     <meta name='DCTERMS.audience' content='hackers' />
     <meta name='DCTERMS.audience' content='individuals' />
@@ -72,7 +73,7 @@ if page.licenses:
 <!--@eval run_macros(page.head)@-->
   </head>
   <body>
-    <a id='minilogo' href='/'></a>
+    <div><a id='minilogo' href='/'></a></div>
     <div id='menu'>
       <ul id='menulinks'>
 <!--@prexec
diff --git a/site/index.org b/site/index.org
index e1bd7ca..9eabc16 100644
--- a/site/index.org
+++ b/site/index.org
@@ -20,7 +20,7 @@ Historically, this start page has featured text which had little purpose except
 to exist. That is over now. /metanohi/ has no real need for a start page ---
 and that means no more superfluous text[fn:extra].
 
-Feel free to check out my [[/projects][Projects]] page.
+Feel free to check out my [[/projects/][Projects]] page.
 
 * Passive activism
 
diff --git a/site/projects/index.org b/site/projects/index.org
index fa5ec60..c25f7c4 100644
--- a/site/projects/index.org
+++ b/site/projects/index.org
@@ -175,19 +175,31 @@ These are my projects, new and old.
 
 ** Relatively new
 
-<@exec boxprojs(top_projs) @>
+#++exec
+#+BEGIN_SRC python
+boxprojs(top_projs)
+#+END_SRC
 
 *** Others
 
-<@exec listprojs(other_projs) @>
+#++exec
+#+BEGIN_SRC python
+listprojs(other_projs)
+#+END_SRC
 
 
 #+mark: old
 ** Old
   
-<@exec boxprojs(old_top_projs) @>
+#++exec
+#+BEGIN_SRC python
+boxprojs(old_top_projs)
+#+END_SRC
 
 *** Others
 
-<@exec listprojs(other_old_projs) @>
+#++exec
+#+BEGIN_SRC python
+listprojs(other_old_projs)
+#+END_SRC
 
diff --git a/site/projects/mege/tests/code.org b/site/projects/mege/tests/code.org
index d73fae6..8e206f3 100644
--- a/site/projects/mege/tests/code.org
+++ b/site/projects/mege/tests/code.org
@@ -63,6 +63,7 @@ Inline: =<p>abc</p>=&html.
 <div style='margin-left: 20px' id='tempobj'>au</div>
 #+END_SRC
 The above code equals:
+
 #++show
 #+BEGIN_SRC html
 <div style='margin-left: 20px' id='tempobj'>au</div>
diff --git a/site/writings/index.org b/site/writings/index.org
index 1e8bbd7..3a43cf9 100644
--- a/site/writings/index.org
+++ b/site/writings/index.org
@@ -4,7 +4,10 @@
 
 * Writings
 
-<@eval macros.list_pages()@>
+#++eval
+#+BEGIN_SRC python
+macros.list_pages()
+#+END_SRC
 
 ** Old