diff --git a/htroot/Blog.html b/htroot/Blog.html index 3db7dca9f..3c2c69ab6 100644 --- a/htroot/Blog.html +++ b/htroot/Blog.html @@ -3,6 +3,7 @@ YaCy '#[clientname]#': Blog #%env/templates/metas.template%# + #%env/templates/header.template%# diff --git a/htroot/Blog.java b/htroot/Blog.java index b173ecc58..7f3290cd6 100644 --- a/htroot/Blog.java +++ b/htroot/Blog.java @@ -241,6 +241,9 @@ public class Blog { // show blog-entry/entries prop.put("mode", 0); //viewing if(pagename.equals("blog_default")) { + prop.put("peername", yacyCore.seedDB.mySeed.getName()); + String address = yacyCore.seedDB.mySeed.getAddress(); + prop.put("address", address); //index all entries try { Iterator i = switchboard.blogDB.keys(false); @@ -262,6 +265,7 @@ public class Blog { continue; entry = switchboard.blogDB.read(pageid); prop.put("mode_entries_"+count+"_pageid",entry.key()); + prop.put("mode_entries_"+count+"_address", address); if(!xml) { prop.put("mode_entries_"+count+"_subject", new String(entry.subject(),"UTF-8")); prop.put("mode_entries_"+count+"_author", new String(entry.author(),"UTF-8")); @@ -284,6 +288,8 @@ public class Blog { prop.put("mode_entries_"+count+"_commentsactive", 1); prop.put("mode_entries_"+count+"_commentsactive_pageid",entry.key()); prop.put("mode_entries_"+count+"_commentsactive_comments", new String(entry.commentsSize(),"UTF-8")); + prop.put("mode_entries_"+count+"_commentsactive_address", address); + } else prop.put("mode_entries_"+count+"_commentsactive", 0); diff --git a/htroot/Blog.rss b/htroot/Blog.rss new file mode 100644 index 000000000..a1e07a9ab --- /dev/null +++ b/htroot/Blog.rss @@ -0,0 +1,17 @@ + + + + YaCy-Blog of Peer #[peername]# + http://#[address]#/Blog.html + #(mode)# #{entries}# + #[author]# + #[subject]# + http://#[address]#/Blog.html?page=#[pageid]# + #[date]# + #[pageid]# + + #(commentsactive)#::http://#[address]#/BlogComments.html?page=#[pageid]##(/commentsactive)# + #{/entries}# #(/mode)# + + \ No newline at end of file