update the default syndie post, and add in some html hooks for it
only allow 40 chars in the subject within the thread tree
This commit is contained in:
@ -150,11 +150,13 @@ public abstract class BaseServlet extends HttpServlet {
|
|||||||
|
|
||||||
Collection tags = getFilteredTags(req);
|
Collection tags = getFilteredTags(req);
|
||||||
Collection filteredAuthors = getFilteredAuthors(req);
|
Collection filteredAuthors = getFilteredAuthors(req);
|
||||||
if (forceNewIndex || (index == null) || (!index.getFilteredTags().equals(tags)) || (!index.getFilteredAuthors().equals(filteredAuthors))) {
|
boolean tagsChanged = ( (index != null) && (!index.getFilteredTags().equals(tags)) );
|
||||||
|
boolean authorsChanged = ( (index != null) && (!index.getFilteredAuthors().equals(filteredAuthors)) );
|
||||||
|
if (forceNewIndex || (index == null) || (tagsChanged) || (authorsChanged) ) {
|
||||||
index = new FilteredThreadIndex(user, BlogManager.instance().getArchive(), getFilteredTags(req), filteredAuthors);
|
index = new FilteredThreadIndex(user, BlogManager.instance().getArchive(), getFilteredTags(req), filteredAuthors);
|
||||||
req.getSession().setAttribute("threadIndex", index);
|
req.getSession().setAttribute("threadIndex", index);
|
||||||
if (_log.shouldLog(Log.INFO))
|
if (_log.shouldLog(Log.INFO))
|
||||||
_log.info("New filtered index created (forced? " + forceNewIndex + ")");
|
_log.info("New filtered index created (forced? " + forceNewIndex + ", tagsChanged? " + tagsChanged + ", authorsChanged? " + authorsChanged + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
render(user, req, resp.getWriter(), index);
|
render(user, req, resp.getWriter(), index);
|
||||||
@ -191,7 +193,7 @@ public abstract class BaseServlet extends HttpServlet {
|
|||||||
name = name + i;
|
name = name + i;
|
||||||
}
|
}
|
||||||
|
|
||||||
pn = new PetName(name, "syndie", "syndieblog", loc);
|
pn = new PetName(name, AddressesServlet.NET_SYNDIE, AddressesServlet.PROTO_BLOG, loc);
|
||||||
}
|
}
|
||||||
pn.addGroup(group);
|
pn.addGroup(group);
|
||||||
if (isNew)
|
if (isNew)
|
||||||
@ -230,6 +232,8 @@ public abstract class BaseServlet extends HttpServlet {
|
|||||||
BlogManager.instance().saveUser(user);
|
BlogManager.instance().saveUser(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (rv)
|
||||||
|
_log.debug("Bookmarking required rebuild");
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -530,6 +534,8 @@ public abstract class BaseServlet extends HttpServlet {
|
|||||||
//SKIP_TAGS.add("post");
|
//SKIP_TAGS.add("post");
|
||||||
//SKIP_TAGS.add("thread");
|
//SKIP_TAGS.add("thread");
|
||||||
SKIP_TAGS.add("offset"); // if we are adjusting the filter, ignore the previous offset
|
SKIP_TAGS.add("offset"); // if we are adjusting the filter, ignore the previous offset
|
||||||
|
SKIP_TAGS.add("addLocation");
|
||||||
|
SKIP_TAGS.add("addGroup");
|
||||||
SKIP_TAGS.add("login");
|
SKIP_TAGS.add("login");
|
||||||
SKIP_TAGS.add("password");
|
SKIP_TAGS.add("password");
|
||||||
}
|
}
|
||||||
|
@ -256,7 +256,7 @@ public class ViewThreadedServlet extends BaseServlet {
|
|||||||
String subject = rec.getHeader(HTMLRenderer.HEADER_SUBJECT);
|
String subject = rec.getHeader(HTMLRenderer.HEADER_SUBJECT);
|
||||||
if (subject == null)
|
if (subject == null)
|
||||||
subject = "";
|
subject = "";
|
||||||
out.write(trim(subject, 60));
|
out.write(trim(subject, 40));
|
||||||
out.write("</a>\n</td><td class=\"threadRight\">\n");
|
out.write("</a>\n</td><td class=\"threadRight\">\n");
|
||||||
out.write("<a href=\"");
|
out.write("<a href=\"");
|
||||||
out.write(getViewThreadLink(req, node, user));
|
out.write(getViewThreadLink(req, node, user));
|
||||||
|
@ -1,5 +1,23 @@
|
|||||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html
|
||||||
><head><title>What is Syndie?</title></head
|
><head><title>What is Syndie?</title></head
|
||||||
><body bgcolor="#BBBBFF">
|
><body bgcolor="#BBBBFF">
|
||||||
<p>Syndie is, like, neat, man. (aka todo)</p>
|
|
||||||
|
<p>Perhaps the best introduction to Syndie can be found <a
|
||||||
|
href="threads.jsp?post=ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1132012800001">in
|
||||||
|
Syndie itself</a>.</p>
|
||||||
|
|
||||||
|
<p>Updates can be found by filtering for the <a
|
||||||
|
href="threads.jsp?tags=syndie.intro">syndie.intro</a> tag (if you only want to
|
||||||
|
receive posts that <a
|
||||||
|
href="threads.jsp?author=ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=">jrandom</a>
|
||||||
|
made with that tag, that can be <a
|
||||||
|
href="threads.jsp?tags=syndie.intro&author=ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=">achieved</a>
|
||||||
|
as well).</p>
|
||||||
|
|
||||||
|
<p>If you have any questions or problems with Syndie, just post them and
|
||||||
|
syndicate it up to <a href="http://syndiemedia.i2p/">syndiemedia.i2p</a> (which should show up as the default archive
|
||||||
|
on new installs). You can also use the <a href="http://forum.i2p.net/">I2P
|
||||||
|
forums</a> if you're having trouble getting Syndie to work, and people are
|
||||||
|
almost always around on the <a href="http://forum.i2p.net/viewtopic.php?t=952">#i2p irc
|
||||||
|
channel</a>.</p>
|
||||||
</body></html>
|
</body></html>
|
||||||
|
@ -317,7 +317,7 @@
|
|||||||
<mkdir dir="pkg-temp/syndie/archive" />
|
<mkdir dir="pkg-temp/syndie/archive" />
|
||||||
<mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
|
<mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
|
||||||
<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
|
<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
|
||||||
<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1126915200003.snd" />
|
<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1132012800001.snd" />
|
||||||
</target>
|
</target>
|
||||||
<target name="tarball" depends="preppkg">
|
<target name="tarball" depends="preppkg">
|
||||||
<tar compression="bzip2" destfile="i2p.tar.bz2">
|
<tar compression="bzip2" destfile="i2p.tar.bz2">
|
||||||
@ -395,7 +395,7 @@
|
|||||||
<mkdir dir="pkg-temp/syndie/archive" />
|
<mkdir dir="pkg-temp/syndie/archive" />
|
||||||
<mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
|
<mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
|
||||||
<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
|
<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
|
||||||
<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1126915200003.snd" />
|
<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1132012800001.snd" />
|
||||||
</target>
|
</target>
|
||||||
<target name="installer" depends="preppkg">
|
<target name="installer" depends="preppkg">
|
||||||
<taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
|
<taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
|
||||||
|
Reference in New Issue
Block a user