You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/08/05 17:27:56 UTC
svn commit: r230484 - in /incubator/roller/branches/roller_2.0: ./
src/org/roller/pojos/ src/org/roller/presentation/weblog/actions/ web/
web/WEB-INF/classes/ web/WEB-INF/classes/flavors/
Author: snoopdave
Date: Fri Aug 5 08:27:48 2005
New Revision: 230484
URL: http://svn.apache.org/viewcvs?rev=230484&view=rev
Log:
more group blogging UI work
Modified:
incubator/roller/branches/roller_2.0/properties.xmlf
incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/atom.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/rss.vm
incubator/roller/branches/roller_2.0/web/denied.jsp
incubator/roller/branches/roller_2.0/web/error.jsp
incubator/roller/branches/roller_2.0/web/login.jsp
incubator/roller/branches/roller_2.0/web/main.jsp
Modified: incubator/roller/branches/roller_2.0/properties.xmlf
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/properties.xmlf?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/properties.xmlf (original)
+++ incubator/roller/branches/roller_2.0/properties.xmlf Fri Aug 5 08:27:48 2005
@@ -43,8 +43,6 @@
<include name="commons-cache.jar" />
<include name="concurrent-1.3.2.jar"/>
<include name="log4j-1.2.4.jar"/>
- <include name="activation.jar"/>
- <include name="mail.jar"/>
<include name="jazzy-core.jar" />
<include name="commons-betwixt-1.0-beta-1.jar" />
<include name="rome-0.6.jar"/>
@@ -79,6 +77,11 @@
<include name="servlet-api.jar"/>
</fileset>
+<fileset id="mail.jars" dir="${ro.tools}/lib">
+ <include name="activation.jar"/>
+ <include name="mail.jar"/>
+</fileset>
+
<fileset id="jstl.jars" dir="${ro.tools}/standard-1.0.3/lib">
<include name="jstl.jar"/>
<include name="standard.jar"/>
@@ -105,6 +108,7 @@
<path id="base.path">
<path refid="xml.path"/>
<fileset refid="base.jars"/>
+ <fileset refid="mail.jars"/>
<fileset refid="commons.jars"/>
</path>
@@ -113,6 +117,7 @@
<fileset refid="presentation.jars"/>
<fileset refid="struts.jars"/>
<fileset refid="servlet.jars"/>
+ <fileset refid="mail.jars"/>
<fileset refid="jstl.jars"/>
<!--fileset refid="resin.jars" /-->
</path>
Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java Fri Aug 5 08:27:48 2005
@@ -53,7 +53,7 @@
protected String mDefaultPlugins;
protected Boolean isEnabled;
protected Date dateCreated;
-
+
// Associated objects
protected UserData mUser = null; // TODO: decide if website.user is needed
protected List permissions = new ArrayList();
@@ -742,7 +742,8 @@
}
/** No-op needed to please XDoclet generated code */
- public void setUserCount()
+ private int userCount = 0;
+ public void setUserCount(int userCount)
{
// no-op
}
@@ -764,7 +765,8 @@
}
/** No-op needed to please XDoclet generated code */
- public void setAdminUserCount()
+ private int adminUserCount = 0;
+ public void setAdminUserCount(int adminUserCount)
{
// no-op
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Fri Aug 5 08:27:48 2005
@@ -67,7 +67,6 @@
import com.swabunga.spell.event.SpellCheckEvent;
-
/////////////////////////////////////////////////////////////////////////////
/**
* Supports Weblog Entry form actions edit, remove, update, etc.
@@ -97,7 +96,8 @@
ActionForward forward = mapping.findForward("weblogEdit.page");
try
{
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
if (rollerSession.isUserAuthorized())
{
WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
@@ -137,9 +137,19 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
WeblogEntryData entry = rreq.getWeblogEntry();
+
+ if ( rollerSession.getCurrentWebsite() == null
+ && entry.getWebsite().hasUserPermissions(
+ rollerSession.getAuthenticatedUser(),PermissionsData.AUTHOR))
+ {
+ // user clicked on URL in email notification
+ rollerSession.setCurrentWebsite(entry.getWebsite());
+ }
+
if ( rollerSession.isUserAuthorizedToAuthor()
|| (rollerSession.isUserAuthorized() && entry.isDraft()))
{
@@ -210,7 +220,8 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
if ( rollerSession.isUserAuthorizedToAuthor() )
{
request.setAttribute("model",
@@ -271,7 +282,7 @@
entry = weblogMgr.retrieveWeblogEntry(wf.getId());
entry.save(); // should throw if save not permitted
}
- wf.copyTo(entry, request.getLocale(), request.getParameterMap());
+ wf.copyTo(entry, request.getLocale(),request.getParameterMap());
// Fetch MediaCast content type and length
mLogger.debug("Checking MediaCast attributes");
@@ -294,25 +305,23 @@
mLogger.debug("Populating form");
wf.copyFrom(entry, request.getLocale());
-
- reindexEntry(RollerFactory.getRoller(), entry);
-
- // open up a new session, because we will forward to the edit action
- //RollerFactory.getRoller().begin(); // begin already called by RequestFilter
-
- request.setAttribute(RollerRequest.WEBLOGENTRYID_KEY, entry.getId());
+
+ request.setAttribute(
+ RollerRequest.WEBLOGENTRYID_KEY, entry.getId());
- // Flush the page cache
+ // Reindex entry, flush caches, etc.
+ reindexEntry(RollerFactory.getRoller(), entry);
mLogger.debug("Removing from cache");
- PageCacheFilter.removeFromCache(request, RollerSession.getRollerSession(request).getCurrentWebsite());
- // refresh the front page cache
+ PageCacheFilter.removeFromCache(request,
+ RollerSession.getRollerSession(request).getCurrentWebsite());
MainPageAction.flushMainPageCache();
- // remove session objects that may be left over from spellchecking
+ // Clean up session objects we used
HttpSession session = request.getSession(true);
session.removeAttribute("spellCheckEvents");
session.removeAttribute("entryText");
-
+
+ // Load up request with data for view
request.setAttribute("model",
new WeblogEntryPageModel(request, response, mapping,
(WeblogEntryFormEx)actionForm,
@@ -321,15 +330,20 @@
if (!rses.isUserAuthorizedToAuthor() &&
rses.isUserAuthorized() && entry.isPending())
{
+ // implies that entry just changed to pending
notifyWebsiteAuthorsOfPendingEntry(request, entry);
- uiMessages.add(null,
- new ActionMessage("weblogEdit.submitedForReview"));
+ uiMessages.add(null,
+ new ActionMessage("weblogEdit.submitedForReview"));
+ // so clear entry from editor
+ actionForm = new WeblogEntryFormEx();
+ request.setAttribute(mapping.getName(), actionForm);
+ forward = create(mapping, actionForm, request, response);
}
else
{
uiMessages.add(null,
- new ActionMessage("weblogEdit.changesSaved"));
+ new ActionMessage("weblogEdit.changesSaved"));
}
saveMessages(request, uiMessages);
mLogger.debug("operation complete");
@@ -382,7 +396,8 @@
// list of enabled website authors and admins
ArrayList reviewers = new ArrayList();
- List websiteUsers = umgr.getUsers(entry.getWebsite(), Boolean.TRUE);
+ List websiteUsers =
+ umgr.getUsers(entry.getWebsite(), Boolean.TRUE);
// build list of reviewers (website users with author permission)
Iterator websiteUserIter = websiteUsers.iterator();
@@ -403,13 +418,15 @@
String rootURL = rc.getAbsoluteContextUrl(request);
if (rootURL == null || rootURL.trim().length()==0)
{
- rootURL = RequestUtils.serverURL(request) + request.getContextPath();
+ rootURL = RequestUtils.serverURL(request)
+ + request.getContextPath();
}
String editURL = rootURL
- + "/editor/weblog.do?method=edit&entryid=" + entry.getId();
+ + "/editor/weblog.do?method=edit&entryid=" + entry.getId();
ResourceBundle resources = ResourceBundle.getBundle(
- "ApplicationResources", entry.getWebsite().getLocaleInstance());
+ "ApplicationResources",
+ entry.getWebsite().getLocaleInstance());
StringBuffer sb = new StringBuffer();
sb.append(
MessageFormat.format(
@@ -445,7 +462,8 @@
}
catch (RollerException e)
{
- throw new RuntimeException("FATAL ERROR: unable to find Roller object");
+ throw new RuntimeException(
+ "FATAL ERROR: unable to find Roller object");
}
}
@@ -468,10 +486,12 @@
if (con.getResponseCode() != 200)
{
mLogger.debug("Response code indicates error");
- mLogger.error("ERROR "+con.getResponseCode()+" return from MediaCast URL");
+ mLogger.error("ERROR "
+ + con.getResponseCode() + " return from MediaCast URL");
mLogger.debug(con.getContent().toString());
}
- else if (con.getContentType()!=null && con.getContentLength()!=-1)
+ else if (con.getContentType()!=null
+ && con.getContentLength()!=-1)
{
mLogger.debug("Got good reponse and content info");
entry.putEntryAttribute(
@@ -529,7 +549,8 @@
WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
WeblogEntryData wd =
roller.getWeblogManager().retrieveWeblogEntry(wf.getId());
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
if ( rollerSession.isUserAuthorizedToAuthor()
|| (rollerSession.isUserAuthorized() && wd.isDraft()) )
{
@@ -568,15 +589,17 @@
try
{
WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
- WeblogEntryData wd = mgr.retrieveWeblogEntry(request.getParameter("id"));
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ WeblogEntryData wd =
+ mgr.retrieveWeblogEntry(request.getParameter("id"));
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
if ( rollerSession.isUserAuthorizedToAuthor()
|| (rollerSession.isUserAuthorized() && wd.isDraft()) )
{
// Flush the page cache
PageCacheFilter.removeFromCache(request,
- RollerSession.getRollerSession(request).getCurrentWebsite());
+ RollerSession.getRollerSession(request).getCurrentWebsite());
// remove the index for it
wd.setStatus(WeblogEntryData.DRAFT);
@@ -586,7 +609,8 @@
RollerFactory.getRoller().commit();
ActionMessages uiMessages = new ActionMessages();
- uiMessages.add(null, new ActionMessage("weblogEdit.entryRemoved"));
+ uiMessages.add(null,
+ new ActionMessage("weblogEdit.entryRemoved"));
saveMessages(request, uiMessages);
}
else
@@ -615,7 +639,8 @@
{
try
{
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rollerSession.isUserAuthorizedToAuthor() )
{
@@ -674,7 +699,8 @@
ActionForward forward = mapping.findForward("weblogEdit.page");
try
{
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession =
+ RollerSession.getRollerSession(request);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rollerSession.isUserAuthorizedToAuthor() )
{
@@ -732,20 +758,21 @@
WeblogEntryData wd = rreq.getWeblogEntry();
if (wd == null || wd.getId() == null)
{
- throw new NullPointerException("Unable to find WeblogEntry for "+
+ throw new NullPointerException(
+ "Unable to find WeblogEntry for "+
request.getParameter(RollerRequest.WEBLOGENTRYID_KEY));
}
WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
- // If form indicates that comments should be deleted, then delete
- WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ // If form indicates that comments should be deleted, delete
+ WeblogManager mgr= RollerFactory.getRoller().getWeblogManager();
String[] deleteIds = form.getDeleteComments();
if (deleteIds != null && deleteIds.length > 0)
{
mgr.removeComments( deleteIds );
}
- List comments = mgr.getComments( wd.getId(), false ); // spam too
+ List comments = mgr.getComments(wd.getId(), false); // spam too
if (form.getSpamComments() != null)
{
// comments marked as spam
@@ -811,14 +838,15 @@
WeblogEntryData entry = null;
try
{
- RollerSession rollerSession = RollerSession.getRollerSession(request);
+ RollerSession rollerSession= RollerSession.getRollerSession(request);
if (rollerSession.isUserAuthorizedToAuthor())
{
WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
String entryid = form.getId();
if ( entryid == null )
{
- entryid= request.getParameter(RollerRequest.WEBLOGENTRYID_KEY);
+ entryid =
+ request.getParameter(RollerRequest.WEBLOGENTRYID_KEY);
}
RollerContext rctx= RollerContext.getRollerContext(request);
@@ -828,7 +856,8 @@
String title = entry.getTitle();
// Run entry through registered PagePlugins
- PageHelper pageHelper = PageHelper.createPageHelper(request, response);
+ PageHelper pageHelper =
+ PageHelper.createPageHelper(request, response);
pageHelper.setSkipFlag(true); // don't process ReadMorePlugin
String excerpt = pageHelper.renderPlugins(entry);
excerpt = StringUtils.left( Utilities.removeHTML(excerpt),255 );
@@ -868,14 +897,15 @@
wr.flush();
// Get the response
- rd = new BufferedReader(
- new InputStreamReader(conn.getInputStream()));
+ rd = new BufferedReader(new InputStreamReader(
+ conn.getInputStream()));
String line;
StringBuffer resultBuff = new StringBuffer();
while ((line = rd.readLine()) != null)
{
- resultBuff.append(Utilities.escapeHTML(line, true));
+ resultBuff.append(
+ Utilities.escapeHTML(line, true));
resultBuff.append("<br />");
}
@@ -963,7 +993,8 @@
* is being deleted then mark it published = false.
* @param entry
*/
- private void reindexEntry(Roller roller, WeblogEntryData entry) throws RollerException
+ private void reindexEntry(Roller roller, WeblogEntryData entry)
+ throws RollerException
{
IndexManager manager = roller.getIndexManager();
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Fri Aug 5 08:27:48 2005
@@ -318,6 +318,8 @@
error.permissionDenied.title=Permission Denied
error.permissionDenied.prompt=Possible causes:
+error.permissionDenied.reason0=You requested a weblog entry that you do not have \
+permission to edit (perhaps one you've already submitted for review?).
error.permissionDenied.reason1=You tried to save an object from "stale" web page, \
left by an earlier login under a different user account.
error.permissionDenied.reason2=You logged in using incorrect capitalization of \
@@ -472,7 +474,7 @@
mainPage.hits=hits
mainPage.link=Link
mainPage.rss.tip=Combined RSS feed for site.
-
+mainPage.postedBy=By
mainPage.actions=Actions
mainPage.status=Status
mainPage.loggedInAs=Logged in as
@@ -1137,9 +1139,9 @@
and pick which weblog you'd like to use. But group blogging is disabled on \
this server, so you can safely ignore this page.
-yourWebsites.groupBloggingEnabled=This page allows you to create additional \
-weblogs, select which weblog you'd like to work in and accept invitations to \
-join other user's weblogs.
+yourWebsites.groupBloggingEnabled=This page allows you to select which of your \
+weblogs you'd like to work in, accept/decline invitations to join other \
+user's weblogs and create new weblogs.
yourWebsites.invited=You've been invited to join the weblog
yourWebsites.accept=accept
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/atom.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/atom.vm?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/atom.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/atom.vm Fri Aug 5 08:27:48 2005
@@ -19,7 +19,7 @@
<created>$utilities.formatIso8601Date($entry.pubTime)</created>
<modified>$utilities.formatIso8601Date($entry.updateTime)</modified>
#if( $userName == "zzz_none_zzz" )
- <author><name>$entry.website.user.fullName</name></author>
+ <author><name>$entry.creator.fullName</name></author>
#end
<link rel="alternate" type="text/html" href="$absBaseURL$entry.permaLink"/>
<id>tag:$host,$utilities.formatIso8601Day($entry.pubTime):/$entry.website.user.userName?anchor=$entry.anchor</id>
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/rss.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/rss.vm?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/rss.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/rss.vm Fri Aug 5 08:27:48 2005
@@ -23,7 +23,7 @@
<comments>$absBaseURL$utilities.textToHTML($entry.commentsLink)</comments>
#end
<pubDate>$utilities.formatRfc822Date($entry.pubTime)</pubDate>
- <dc:creator>$utilities.textToHTML($entry.website.user.fullName,true)</dc:creator>
+ <dc:creator>$utilities.textToHTML($entry.creator.fullName,true)</dc:creator>
#set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
Modified: incubator/roller/branches/roller_2.0/web/denied.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/denied.jsp?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/denied.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/denied.jsp Fri Aug 5 08:27:48 2005
@@ -32,10 +32,41 @@
<h2><fmt:message key="error.permissionDenied.title" /></h2>
<fmt:message key="error.permissionDenied.prompt" />
<ul>
+<li><fmt:message key="error.permissionDenied.reason0" /></li>
<li><fmt:message key="error.permissionDenied.reason1" /></li>
<li><fmt:message key="error.permissionDenied.reason2" /></li>
<li><fmt:message key="error.permissionDenied.reason3" /></li>
</ul>
-<%@ include file="/theme/footer.jsp" %>
+<br />
+<br />
+
+ <div id="footer" class="clearfix">
+ <a href="http://www.rollerweblogger.org">
+ Powered by Roller Weblogger</a> |
+
+ <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
+ <fmt:message key="footer.reportIssue" /></a> |
+
+ <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+ <fmt:message key="footer.userGuide" /></a> |
+
+ <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
+ <fmt:message key="footer.macros" /></a> |
+
+ <a href="http://sourceforge.net/mail/?group_id=47722">
+ <fmt:message key="footer.mailingLists" /></a>
+ </div><!-- end footer -->
+
+</div> <!-- end centercontent -->
+
+<div id="rightcontent">
+</div>
+
+</div> <!-- end wrapper -->
+
+</body>
+</html>
+
+<% } catch (Exception e) { e.printStackTrace(); } %>
Modified: incubator/roller/branches/roller_2.0/web/error.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error.jsp?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error.jsp Fri Aug 5 08:27:48 2005
@@ -6,7 +6,7 @@
<%@ include file="/taglibs.jsp" %>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>Roller :: Editor</title>
+<title>Roller ERROR</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script type="text/javascript"
src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
@@ -58,6 +58,40 @@
<% exception.printStackTrace(new java.io.PrintWriter(out)); %>
</textarea></form>
<% } %>
-<%@ include file="/theme/footer.jsp" %>
+
+
+
+
+<br />
+<br />
+
+ <div id="footer" class="clearfix">
+ <a href="http://www.rollerweblogger.org">
+ Powered by Roller Weblogger</a> |
+
+ <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
+ <fmt:message key="footer.reportIssue" /></a> |
+
+ <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+ <fmt:message key="footer.userGuide" /></a> |
+
+ <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
+ <fmt:message key="footer.macros" /></a> |
+
+ <a href="http://sourceforge.net/mail/?group_id=47722">
+ <fmt:message key="footer.mailingLists" /></a>
+ </div><!-- end footer -->
+
+</div> <!-- end centercontent -->
+
+<div id="rightcontent">
+</div>
+
+</div> <!-- end wrapper -->
+
+</body>
+</html>
+
+<% } catch (Exception e) { e.printStackTrace(); } %>
Modified: incubator/roller/branches/roller_2.0/web/login.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/login.jsp?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login.jsp Fri Aug 5 08:27:48 2005
@@ -25,7 +25,9 @@
</tr>
<tr>
<th><fmt:message key="loginPage.userName" />:</th>
- <td><input type="text" name="j_username" id="j_username" size="25" /></td>
+ <td>
+ <input type="text" name="j_username" id="j_username" size="25" />
+ </td>
</tr>
<tr>
<th><fmt:message key="loginPage.password" />:</th>
Modified: incubator/roller/branches/roller_2.0/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main.jsp?rev=230484&r1=230483&r2=230484&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main.jsp Fri Aug 5 08:27:48 2005
@@ -2,8 +2,8 @@
page import="org.roller.presentation.MainPageAction" %><%@
page import="java.util.Locale" %><%
pageContext.setAttribute("leftPage","main-sidebar.jsp");
-%><%@
-include file="/taglibs.jsp" %><%@
+%><%@
+include file="/taglibs.jsp" %><%@
include file="/theme/header.jsp" %><%
request.setAttribute("pinnedPosts",
((MainPageAction.MainPageData)request.getAttribute("data")).getWeblogEntriesPinnedToMain(5));
@@ -11,84 +11,88 @@
((MainPageAction.MainPageData)request.getAttribute("data")).getRecentWeblogEntries(45));
request.setAttribute("popularWebsites",
((MainPageAction.MainPageData)request.getAttribute("data")).getPopularWebsites(65));
-%>
- <div class="bannerBox">
- <%@ include file="local-banner.jspf" %>
- </div>
-
- <c:if test="${!empty pinnedPosts}">
-
- <div class="entryTitleBox">
- <fmt:message key="mainPage.pinnedEntries" />
- </div>
-
- <c:forEach var="post" items="${pinnedPosts}">
- <div class="entryBoxPinned">
-
- <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
- <str:truncateNicely upper="90" >
- <c:out value="${post.displayTitle}" />
- </str:truncateNicely></a>
- </a><br />
-
- <span class="entryDetails">
-
- <a href='<c:out value="${baseURL}" />/page/<c:out value="${post.creator.userName}" />' class="entryDetails">
- <str:truncateNicely upper="50" >
- <c:out value="${post.website.name}" />
- </str:truncateNicely></a> |
- <c:out value="${post.category.path}" /> |
- <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" />
- <c:if test="${!empty post.link}">
- | <a href='<c:out value="${post.link}" />' class="entryDetails"><fmt:message key="mainPage.link" /></a>
- </c:if>
- <br />
-
- </span>
-
- <roller:ApplyPlugins name="post" scope="page" maxLength="250" skipFlag="true" />
-
- </div>
- </c:forEach>
- <br />
- </c:if>
-
- <div class="entryTitleBox">
- <a href='<c:url value="/rss"/>' title='<fmt:message key="mainPage.rss.tip" />'>
- <img src='<c:url value="/images/rssbadge.gif"/>' align="right" border="0"
- alt='<fmt:message key="mainPage.rss.tip" />' /></a>
- <fmt:message key="mainPage.recentEntries" />
- </div>
-
- <c:forEach var="post" items="${recentPosts}">
- <div class="entryBox">
-
- <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
- <str:truncateNicely upper="90" >
- <c:out value="${post.displayTitle}" />
- </str:truncateNicely></a>
- </a><br />
-
- <span class="entryDetails">
-
- <a href='<c:out value="${baseURL}" />/page/<c:out value="${post.creator.userName}" />' class="entryDetails">
- <str:truncateNicely upper="50" >
- <c:out value="${post.website.name}" />
- </str:truncateNicely></a> |
- <c:out value="${post.category.path}" /> |
- <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" />
- <c:if test="${!empty post.link}">
- | <a href='<c:out value="${post.link}" />' class="entryDetails"><fmt:message key="mainPage.link" /></a>
- </c:if>
- <br />
-
- </span>
-
- <roller:ApplyPlugins name="post" scope="page" stripHtml="true" maxLength="200" skipFlag="true" />
-
- </div>
- </c:forEach>
-
-<%@ include file="/theme/footer.jsp" %>
-
-
+%>
+ <div class="bannerBox">
+ <%@ include file="local-banner.jspf" %>
+ </div>
+
+ <c:if test="${!empty pinnedPosts}">
+
+ <div class="entryTitleBox">
+ <fmt:message key="mainPage.pinnedEntries" />
+ </div>
+
+ <c:forEach var="post" items="${pinnedPosts}">
+ <div class="entryBoxPinned">
+
+ <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
+ <str:truncateNicely upper="90" >
+ <c:out value="${post.displayTitle}" />
+ </str:truncateNicely></a>
+ </a><br />
+
+ <span class="entryDetails">
+
+ <a href='<c:out value="${baseURL}" />/page/<c:out value="${post.website.handle}" />' class="entryDetails">
+ <str:truncateNicely upper="50" >
+ <c:out value="${post.website.name}" />
+ </str:truncateNicely></a> |
+ <c:out value="${post.category.path}" /> |
+ <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" /> |
+ <fmt:message key="mainPage.postedBy" />
+ <c:out value="${post.creator.userName}" />
+ <c:if test="${!empty post.link}">
+ | <a href='<c:out value="${post.link}" />' class="entryDetails"><fmt:message key="mainPage.link" /></a>
+ </c:if>
+ <br />
+
+ </span>
+
+ <roller:ApplyPlugins name="post" scope="page" maxLength="250" skipFlag="true" />
+
+ </div>
+ </c:forEach>
+ <br />
+ </c:if>
+
+ <div class="entryTitleBox">
+ <a href='<c:url value="/rss"/>' title='<fmt:message key="mainPage.rss.tip" />'>
+ <img src='<c:url value="/images/rssbadge.gif"/>' align="right" border="0"
+ alt='<fmt:message key="mainPage.rss.tip" />' /></a>
+ <fmt:message key="mainPage.recentEntries" />
+ </div>
+
+ <c:forEach var="post" items="${recentPosts}">
+ <div class="entryBox">
+
+ <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
+ <str:truncateNicely upper="90" >
+ <c:out value="${post.displayTitle}" />
+ </str:truncateNicely></a>
+ </a><br />
+
+ <span class="entryDetails">
+
+ <a href='<c:out value="${baseURL}" />/page/<c:out value="${post.website.handle}" />' class="entryDetails">
+ <str:truncateNicely upper="50" >
+ <c:out value="${post.website.name}" />
+ </str:truncateNicely></a> |
+ <c:out value="${post.category.path}" /> |
+ <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" /> |
+ <fmt:message key="mainPage.postedBy" />
+ <c:out value="${post.creator.userName}" />
+ <c:if test="${!empty post.link}">
+ | <a href='<c:out value="${post.link}" />' class="entryDetails"><fmt:message key="mainPage.link" /></a>
+ </c:if>
+ <br />
+
+ </span>
+
+ <roller:ApplyPlugins name="post" scope="page" stripHtml="true" maxLength="200" skipFlag="true" />
+
+ </div>
+ </c:forEach>
+
+<%@ include file="/theme/footer.jsp" %>
+
+