diff --git a/dynastie/generators/index.py b/dynastie/generators/index.py index ea8649c..07bcecd 100755 --- a/dynastie/generators/index.py +++ b/dynastie/generators/index.py @@ -21,6 +21,7 @@ import os import datetime import xml from xml.parsers.expat import * +import xml.parsers.expat from xml.dom.minidom import parse, parseString from dynastie.generators.generator import DynastieGenerator, StrictUTF8Writer from django.db import models @@ -410,13 +411,13 @@ class Index(DynastieGenerator): post_nodes = dom.getElementsByTagNameNS(self.URI, "posts") - if not post_nodes is None: + if not post_nodes is None and len(post_nodes) > 0: if post_nodes[0].hasAttribute("limit"): self.posts_per_page = int(post_nodes[0].getAttribute("limit")) else: self.posts_per_page = 5 else: - self.addError('No tag dyn:posts found') + self.addWarning('No tag dyn:posts found') return dom @@ -434,10 +435,9 @@ class Index(DynastieGenerator): while self.cur_page <= self.nb_pages: #print 'Generate ' + filename dom_ = impl.createDocument('', 'xml', None) - dom_.replaceChild(dom.firstChild.cloneNode(0), dom_.firstChild) - nodes = dom.getElementsByTagName("*") - nodes[0] = self.parse(src, self.hooks, posts, dom_, nodes[0]) - self.writeIfNotTheSame(output + filename, nodes[0]) + dom_.replaceChild(dom.firstChild.cloneNode(True), dom_.firstChild) + nodes = self.parse(src, self.hooks, posts, dom_, dom_.firstChild) + self.writeIfNotTheSame(output + filename, nodes) self.cur_page = self.cur_page + 1 filename = self.dirname + '/' + self.filename + str(self.cur_page) + '.html' diff --git a/dynastie/generators/post.py b/dynastie/generators/post.py index 37e2ff1..761dede 100755 --- a/dynastie/generators/post.py +++ b/dynastie/generators/post.py @@ -187,16 +187,15 @@ class Post(Index): if not post.published: continue #print 'Generate ' + filename dom_ = impl.createDocument('', 'xml', None) - dom_.replaceChild(dom.firstChild.cloneNode(0), dom_.firstChild) - nodes = dom.getElementsByTagName("*") - nodes[0] = self.parse(src, self.hooks, post, dom_, nodes[0]) + dom_.replaceChild(dom.firstChild.cloneNode(True), dom_.firstChild) + nodes = self.parse(src, self.hooks, post, dom_, dom_.firstChild) filename = output + '/post/' filename = filename + post.creation_date.strftime("%Y") + '/' + post.creation_date.strftime("%m") + '/' if not os.path.exists(filename): os.makedirs(filename) filename = filename + post.title_slug + '.html' - self.writeIfNotTheSame(filename, nodes[0]) + self.writeIfNotTheSame(filename, nodes) if not self.somethingWrote: self.addReport('Nothing changed') diff --git a/dynastie/sites/blog.soutade.fr/_all_posts.html b/dynastie/sites/blog.soutade.fr/_all_posts.html index 4faf7ac..54b2241 100644 --- a/dynastie/sites/blog.soutade.fr/_all_posts.html +++ b/dynastie/sites/blog.soutade.fr/_all_posts.html @@ -1,11 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/dynastie/sites/blog.soutade.fr/_archive.html b/dynastie/sites/blog.soutade.fr/_archive.html index 7eb50f7..ecda458 100755 --- a/dynastie/sites/blog.soutade.fr/_archive.html +++ b/dynastie/sites/blog.soutade.fr/_archive.html @@ -1,21 +1,23 @@ - -
Archives
- -
-
-
- -
- |
Écrit par
+ + +
Archives
+ +
+
+
+ +
+ |
Écrit par
+
+
- -
-
- -
- permalink commentaire(s) -
-
-
- + + +
+ permalink commentaire(s) +
+ + + +
diff --git a/dynastie/sites/blog.soutade.fr/_base.html b/dynastie/sites/blog.soutade.fr/_base.html index a89831c..e7a5b82 100755 --- a/dynastie/sites/blog.soutade.fr/_base.html +++ b/dynastie/sites/blog.soutade.fr/_base.html @@ -11,6 +11,7 @@ + @@ -43,6 +44,7 @@ + + + +
diff --git a/dynastie/sites/blog.soutade.fr/_search.html b/dynastie/sites/blog.soutade.fr/_search.html index 414d072..1b71a39 100755 --- a/dynastie/sites/blog.soutade.fr/_search.html +++ b/dynastie/sites/blog.soutade.fr/_search.html @@ -1,19 +1,21 @@ - - -
-
-
- -
- |
Écrit par
+ + + +
+
+
+ +
+ |
Écrit par
+
+
- -
-
- -
- permalink commentaire(s) -
-
-
+ + + + + +
diff --git a/dynastie/sites/blog.soutade.fr/_tag.html b/dynastie/sites/blog.soutade.fr/_tag.html index 64e6766..d284384 100644 --- a/dynastie/sites/blog.soutade.fr/_tag.html +++ b/dynastie/sites/blog.soutade.fr/_tag.html @@ -1,21 +1,23 @@ - -
- -
-
-
- -
- |
Écrit par
+ + +
+ +
+
+
+ +
+ |
Écrit par
+
+
- -
-
- -
- permalink commentaire(s) -
-
-
- + + +
+ permalink commentaire(s) +
+ + + +
diff --git a/dynastie/sites/blog.soutade.fr/css/blog.css b/dynastie/sites/blog.soutade.fr/css/blog.css index 8b187c2..582c056 100755 --- a/dynastie/sites/blog.soutade.fr/css/blog.css +++ b/dynastie/sites/blog.soutade.fr/css/blog.css @@ -8,8 +8,8 @@ body /* margin: 0 auto; */ padding: 0; background-color: #ffffe2; - margin-left: 20%; - margin-right: 20%; + margin-left: 15%; + margin-right: 15%; height:100%; } @@ -109,6 +109,7 @@ div.menu div.menu_content div.menu_content_header div.menu div.menu_content div.menu_content_content { color: #5e6a34; + margin: 3px; } div.menu_content_content a