From 2d931ff53827eb36232b8e58327f2035f4250198 Mon Sep 17 00:00:00 2001 From: Ian Holsman Date: Sat, 23 Jun 2012 12:49:52 +1000 Subject: [PATCH 1/4] fix typo --- plugins/googleAnalytics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/googleAnalytics.py b/plugins/googleAnalytics.py index c41fc56..a5fcc66 100644 --- a/plugins/googleAnalytics.py +++ b/plugins/googleAnalytics.py @@ -17,7 +17,7 @@ def filter(self,content,*arg1,**arg2): def get(self,page): code=OptionSet.getValue("googleAnalytics_code",default="") - return '''

Google Anslytics

+ return '''

Google Analytics

Analytics Code:

From fa16001fedf4fb6700ccd24098cb743641cf1bcd Mon Sep 17 00:00:00 2001 From: Ian Holsman Date: Thu, 5 Jul 2012 10:16:12 +1000 Subject: [PATCH 2/4] change it to english --- views/rss.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/rss.xml b/views/rss.xml index 4ee29d9..c956a1c 100644 --- a/views/rss.xml +++ b/views/rss.xml @@ -31,13 +31,13 @@ 相关阅读 +

Related

{%endif%} -

本文网址:{{blog.baseurl}}/{{entry.link|escape}}

+

URL:{{blog.baseurl}}/{{entry.link|escape}}

]]> {{ blog.feedurl }}/comments {{entry.commentcount}} From baef58caec3ab458531a72b37826f0c0d56d0aa4 Mon Sep 17 00:00:00 2001 From: Ian Holsman Date: Tue, 10 Jul 2012 20:08:09 +1000 Subject: [PATCH 3/4] fix up sitemap so that XSLT works on it, and it is included in robots.txt --- blog.py | 5 +++-- static/images/favicon.ico | Bin 8550 -> 67646 bytes static/robots.txt | 2 +- static/sitemap.xsl | 2 +- views/sitemap.xml | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/blog.py b/blog.py index c85e839..def429c 100644 --- a/blog.py +++ b/blog.py @@ -417,7 +417,8 @@ def addurl(loc,lastmod=None,changefreq=None,priority=None): addurl(loc,None,'weekly',0.5) -## self.response.headers['Content-Type'] = 'application/atom+xml' +# self.response.headers['Content-Type'] = 'application/rss+xml; charset=utf-8' + self.response.headers['Content-Type'] = 'application/xml' self.render2('views/sitemap.xml',{'urlset':urls}) @@ -683,4 +684,4 @@ def main(): wsgiref.handlers.CGIHandler().run(application) if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/static/images/favicon.ico b/static/images/favicon.ico index 093c1967e63ecd2119e744d027c8f816e55912a0..7d52f09b4677cb7cd6acf1f790c1bbe1fc8cdf40 100644 GIT binary patch literal 67646 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 literal 8550 zcmeHLF=!)46dhv|Z(;BjCTwwFFQl;GiU?AiAaEB$iWpKvkRpPE1e3xD6-KxaLPR*m z#bHzk;ldad2AdG@6$ZIDSYrt23WHo2=8C}PAjK9b*4?@Yet9!1$!kfLl~_p;cFnW2 zJG1}2`Tx(~)fZxde+vsj{TDx(LVPHMSR{B!ydczdb(A?a$|2Wwh2IY&cAC7u$Jm#F-8NK%XC15`l(Lf!_ z4-sGZjD^xV5?{_qik$Oc?$Tb~+n|pRm&va{9d+u^eoz`BzFY;yR{e=HaWrL$F7hWEOmHQ)~)!G**@|Ga2=fKhs4WgjqFtCP@e~ED2k^$ulznX+!Nx<8(I<@eKYWPT0( z(9w`==Yv?+{!iVx`JNN5%fs&;+`}W4V?+5>UK?u;md^v^ePA=7j?23mtUC8W&hdzW z`>Y9U3Ya(8XG$2e6IVpRtzIWu=DNYOzSJETL*%jaVVNc{>8No?@HLv|+S7a$x}I54nBx zGGA0R2wqr^sHHKg{o(UuvBPQ1_%O|YU@e^qAf^~g;c89xTodl8L~tq5WIZ6iHQeqf zqjE)Y8#5m41?J921V1f4g3UQX>j3$c4vFMb7tMmM!^@*sA3jGiPSQ7KSjRtM9e+wJ z4$wdy#>}mT^y1Ob{V|*~Ix6#eO&F!9kuqQ&qMx>h9vde@xzmL zER-LNFb>rH;Je1d3Z-i=u#SJpx)ITkdPZMFH83Zvjt1tY@)vA}1^2C(uS<8hA$!_fKX z_FDR9=c=ws-<)%i`G)+ZkUzi1czn^X!JO-^oi$@zhpz9;FAtfQKz5a}pf6M$q8h9x zU2bPw%(r&J8YreDYmkrBv!J~n0`5bfwI{5<^cCxls#*WWA^DE4?RWN9^wZ}UYt?^o zNanTVJEN|RDnCblhj>Wc^>g5A7I;4moJ|5{jhi3J6IZik@$Gb3i0LySCKcX)ASSQo z&n9m|OyA6xXKyCT^EYA|e-hVX7FS}v4fQ>W@cOlQ&biNV!=D@Y5m=yw}_bKRv z5e~ka$9;;pPciWKdAC;*_bK8&Mck+8tEO?EBJNYfeTukG(N`G$_Jz1l5%($LK1JN8 Oi2D?`rSt#Wr}zt#ZpgO) diff --git a/static/robots.txt b/static/robots.txt index c5da5d9..f478a93 100644 --- a/static/robots.txt +++ b/static/robots.txt @@ -1,6 +1,6 @@ User-agent: * Crawl-delay: 10 - +Sitemap: http://www.doitwithdata.com.au/sitemap.xml Disallow: /admin/ Disallow: /rpc/ Disallow: /myadmin/ diff --git a/static/sitemap.xsl b/static/sitemap.xsl index 145fbc7..01dc8cd 100644 --- a/static/sitemap.xsl +++ b/static/sitemap.xsl @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/views/sitemap.xml b/views/sitemap.xml index b362e04..1f6bf56 100644 --- a/views/sitemap.xml +++ b/views/sitemap.xml @@ -1,6 +1,6 @@ - - - + + + {% spaceless %} {% for url in urlset %} From 069951d8fbba1a24d44f0eb1cda456e6df7b296a Mon Sep 17 00:00:00 2001 From: Ian Holsman Date: Tue, 10 Jul 2012 20:09:20 +1000 Subject: [PATCH 4/4] remove dud comment --- blog.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/blog.py b/blog.py index def429c..b85c047 100644 --- a/blog.py +++ b/blog.py @@ -416,8 +416,6 @@ def addurl(loc,lastmod=None,changefreq=None,priority=None): loc="%s/tag/%s"%(g_blog.baseurl, urlencode(tag.tag)) addurl(loc,None,'weekly',0.5) - -# self.response.headers['Content-Type'] = 'application/rss+xml; charset=utf-8' self.response.headers['Content-Type'] = 'application/xml' self.render2('views/sitemap.xml',{'urlset':urls})