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/30 20:27:14 UTC
svn commit: r264823 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/weblog/actions/
src/org/roller/presentation/website/actions/
src/org/roller/presentation/website/formbeans/ web/ web/WEB-INF/classes/
web/theme/ web/weblog/ web...
Author: snoopdave
Date: Tue Aug 30 11:26:46 2005
New Revision: 264823
URL: http://svn.apache.org/viewcvs?rev=264823&view=rev
Log:
NPE fixes in template pages, ping pages and website settings
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/InviteMemberForm.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/taglibs.jsp
incubator/roller/branches/roller_2.0/web/theme/messages.jsp
incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java Tue Aug 30 11:26:46 2005
@@ -92,7 +92,7 @@
WebsiteData website = rreq.getWebsite();
try
{
- if (!isAuthorized(rreq))
+ if (!isAuthorized(rreq, website))
{
return mapping.findForward("access-denied");
}
@@ -174,13 +174,13 @@
{
RollerRequest rreq = RollerRequest.getRollerRequest(req);
AutoPingManager autoPingMgr = RollerFactory.getRoller().getAutopingManager();
+ PingTargetData pingTarget = select(rreq);
try
{
- if (!isAuthorized(rreq))
+ if (!isAuthorized(rreq, rreq.getWebsite()))
{
return mapping.findForward("access-denied");
}
- PingTargetData pingTarget = select(rreq);
AutoPingData autoPing = autoPingMgr.createAutoPing(pingTarget,
rreq.getWebsite());
autoPingMgr.storeAutoPing(autoPing);
@@ -204,13 +204,13 @@
{
RollerRequest rreq = RollerRequest.getRollerRequest(req);
AutoPingManager autoPingMgr = RollerFactory.getRoller().getAutopingManager();
+ PingTargetData pingTarget = select(rreq);
try
{
- if (!isAuthorized(rreq))
+ if (!isAuthorized(rreq, rreq.getWebsite()))
{
return mapping.findForward("access-denied");
}
- PingTargetData pingTarget = select(rreq);
autoPingMgr.removeAutoPing(pingTarget, rreq.getWebsite());
RollerFactory.getRoller().commit();
@@ -238,7 +238,7 @@
WebsiteData website = rreq.getWebsite();
try
{
- if (!isAuthorized(rreq))
+ if (!isAuthorized(rreq, website))
{
return mapping.findForward("access-denied");
}
@@ -251,7 +251,8 @@
}
else
{
- WeblogUpdatePinger.PingResult pingResult = WeblogUpdatePinger.sendPing(absoluteUrl, pingTarget, website);
+ WeblogUpdatePinger.PingResult pingResult =
+ WeblogUpdatePinger.sendPing(absoluteUrl, pingTarget, website);
if (pingResult.isError())
{
if (mLogger.isDebugEnabled()) mLogger.debug("Ping Result: " + pingResult);
@@ -334,10 +335,11 @@
}
}
- private boolean isAuthorized(RollerRequest rreq) throws RollerException
+ private boolean isAuthorized(RollerRequest rreq, WebsiteData website)
+ throws RollerException
{
RollerSession rses = RollerSession.getRollerSession(rreq.getRequest());
- return rses.isUserAuthorizedToAdmin(rreq.getWebsite())
+ return rses.isUserAuthorizedToAdmin(website)
&& !PingConfig.getDisablePingUsage();
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java Tue Aug 30 11:26:46 2005
@@ -41,7 +41,7 @@
* Allows website admin to invite new members to website.
*
* @struts.action path="/editor/inviteMember" parameter="method" name="inviteMemberForm"
- * @struts.action-forward name="inviteMember.page" path=".InviteMember"
+ * @struts.action-forward name="inviteMember.page" path=".InviteMember"
*/
public class InviteMemberAction extends DispatchAction
{
@@ -60,7 +60,7 @@
{
return edit(mapping, actionForm, request, response);
}
- return save(mapping, actionForm, request, response);
+ return send(mapping, actionForm, request, response);
}
/** If method param is not specified, use HTTP verb to pick method to call */
@@ -81,13 +81,18 @@
HttpServletResponse response)
throws IOException, ServletException
{
- ActionForward forward = mapping.findForward("inviteMember.page");
- request.setAttribute("model", new BasePageModel(
- "inviteMember.title", request, response, mapping));
+ ActionForward forward = mapping.findForward("inviteMember.page");
+
+ BasePageModel pageModel = new BasePageModel(
+ "inviteMember.title", request, response, mapping);
+ request.setAttribute("model", pageModel);
+
+ InviteMemberForm form = (InviteMemberForm)actionForm;
+ form.setWebsiteId(pageModel.getWebsite().getId());
return forward;
}
- public ActionForward save(
+ public ActionForward send(
ActionMapping mapping,
ActionForm actionForm,
HttpServletRequest request,
@@ -101,9 +106,6 @@
UserManager umgr = RollerFactory.getRoller().getUserManager();
UserData user = umgr.getUser(form.getUserName());
- request.setAttribute("model", new BasePageModel(
- "inviteMember.title", request, response, mapping));
-
if (user == null)
{
errors.add(ActionErrors.GLOBAL_ERROR,
@@ -118,11 +120,15 @@
{
errors.add(ActionErrors.GLOBAL_ERROR,
new ActionError("inviteMember.error.userAlreadyInvited"));
+ request.setAttribute("model", new BasePageModel(
+ "inviteMember.title", request, response, mapping));
}
else if (perms != null)
{
errors.add(ActionErrors.GLOBAL_ERROR,
new ActionError("inviteMember.error.userAlreadyMember"));
+ request.setAttribute("model", new BasePageModel(
+ "inviteMember.title", request, response, mapping));
}
else
{
@@ -140,6 +146,9 @@
}
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("inviteMember.userInvited"));
+
+ request.setAttribute("model", new BasePageModel(
+ "inviteMemberDone.title", request, response, mapping));
forward = mapping.findForward("memberPermissions");
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java Tue Aug 30 11:26:46 2005
@@ -26,6 +26,7 @@
import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
+import org.roller.presentation.website.formbeans.MemberPermissionsForm;
/**
* Allows website admin to change website member permissions.
@@ -53,6 +54,17 @@
return save(mapping, actionForm, request, response);
}
+ /** Called after invite user action posted */
+ public ActionForward send(
+ ActionMapping mapping,
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception
+ {
+ return edit(mapping, actionForm, request, response);
+ }
+
public ActionForward cancel(
ActionMapping mapping,
ActionForm actionForm,
@@ -70,8 +82,12 @@
HttpServletResponse response)
throws Exception
{
- request.setAttribute("model",
- new MemberPermissionsPageModel(request, response, mapping));
+ MemberPermissionsPageModel pageModel =
+ new MemberPermissionsPageModel(request, response, mapping);
+ request.setAttribute("model", pageModel);
+
+ MemberPermissionsForm form = (MemberPermissionsForm)actionForm;
+ form.setWebsiteId(pageModel.getWebsite().getId());
ActionForward forward = mapping.findForward("memberPermissions.page");
return forward;
}
@@ -85,8 +101,10 @@
{
ActionErrors errors = new ActionErrors();
ActionMessages msgs = new ActionMessages();
+
MemberPermissionsPageModel model =
new MemberPermissionsPageModel(request, response, mapping);
+
Iterator iter = model.getPermissions().iterator();
int removed = 0;
int changed = 0;
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Tue Aug 30 11:26:46 2005
@@ -69,7 +69,7 @@
WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
WeblogTemplate data = new WeblogTemplate();
form.copyTo(data, request.getLocale());
- data.setWebsite( website );
+ data.setWebsite(website);
data.setLastModified( new java.util.Date() );
data.setDescription("");
data.setContents("");
@@ -90,7 +90,7 @@
actionForm.reset(mapping,request);
- addModelObjects(request, response, mapping);
+ addModelObjects(request, response, mapping, website);
}
else
{
@@ -115,22 +115,25 @@
{
ActionForward forward = mapping.findForward("editPage.page");
try
- {
- request.setAttribute("model", new BasePageModel(
- "pageForm.title", request, response, mapping));
+ {
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rses = RollerSession.getRollerSession(request);
- WebsiteData website = rreq.getWebsite();
- if ( rses.isUserAuthorizedToAdmin(website) )
- {
+ WeblogTemplate pd = (WeblogTemplate)rreq.getPage();
+
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if ( rses.isUserAuthorizedToAdmin(pd.getWebsite()) )
+ {
+ BasePageModel pageModel = new BasePageModel(
+ "pageForm.title", request, response, mapping);
+ pageModel.setWebsite(pd.getWebsite());
+ request.setAttribute("model", pageModel);
+
UserData ud = rses.getAuthenticatedUser();
- WeblogTemplate pd = (WeblogTemplate) rreq.getPage();
WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
pf.copyFrom(pd, request.getLocale());
PageCacheFilter.removeFromCache( request, pd.getWebsite() );
- addModelObjects(request, response, mapping);
+ addModelObjects(request, response, mapping, pd.getWebsite());
}
else
{
@@ -163,7 +166,7 @@
WebsiteData website = rreq.getWebsite();
if ( rses.isUserAuthorizedToAdmin(website) )
{
- addModelObjects(request, response, mapping);
+ addModelObjects(request, response, mapping, website);
}
else
{
@@ -191,24 +194,22 @@
"pagesForm.title", request, response, mapping));
try
{
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rses = RollerSession.getRollerSession(request);
- WebsiteData website = rreq.getWebsite();
+ UserManager mgr = RollerFactory.getRoller().getUserManager();
+ WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
+ WeblogTemplate template = mgr.retrievePage(form.getId());
+ WebsiteData website = template.getWebsite();
+
+ RollerSession rses = RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAdmin(website) )
{
- WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
- UserManager mgr = RollerFactory.getRoller().getUserManager();
-
- // fetch template to be deleted (we'll need its website)
- WeblogTemplate template = mgr.retrievePage(form.getId());
-
mgr.removePageSafely(template.getId());
RollerFactory.getRoller().commit();
UserData user = rses.getAuthenticatedUser();
PageCacheFilter.removeFromCache(request, template.getWebsite());
- addModelObjects(request, response, mapping);
+ addModelObjects(
+ request, response, mapping, template.getWebsite());
actionForm.reset(mapping, request);
}
else
@@ -232,6 +233,7 @@
}
//-----------------------------------------------------------------------
+ /** Send user to remove confirmation page */
public ActionForward removeOk(
ActionMapping mapping,
ActionForm actionForm,
@@ -246,10 +248,10 @@
{
RollerSession rses = RollerSession.getRollerSession(request);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- WebsiteData website = rreq.getWebsite();
+ WeblogTemplate cd = (WeblogTemplate) rreq.getPage();
+ WebsiteData website = cd.getWebsite();
if ( rses.isUserAuthorizedToAdmin(website) )
{
- WeblogTemplate cd = (WeblogTemplate) rreq.getPage();
WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
pf.copyFrom(cd, request.getLocale());
@@ -280,20 +282,17 @@
ActionForward forward = mapping.findForward("editPage.page");
try
{
- RollerSession rses = RollerSession.getRollerSession(request);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- request.setAttribute("model", new BasePageModel(
- "pageForm.title", request, response, mapping));
- WebsiteData website = rreq.getWebsite();
- if ( rses.isUserAuthorizedToAdmin(website) )
+ WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
+ UserManager mgr = RollerFactory.getRoller().getUserManager();
+ WeblogTemplate data = mgr.retrievePage(form.getId());
+ WebsiteData website = data.getWebsite();
+
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (rses.isUserAuthorizedToAdmin(website))
{
- WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
- UserManager mgr = RollerFactory.getRoller().getUserManager();
- WeblogTemplate data = mgr.retrievePage(form.getId());
- data.save(); // should through exception if no save permission
form.copyTo(data, request.getLocale());
data.setLastModified( new java.util.Date() );
- data.setWebsite(mgr.retrieveWebsite(form.getWebsite().getId()));
validateLink( data );
@@ -311,6 +310,11 @@
UserData user = rses.getAuthenticatedUser();
PageCacheFilter.removeFromCache(request, data.getWebsite());
+
+ BasePageModel pageModel = new BasePageModel(
+ "pageForm.title", request, response, mapping);
+ pageModel.setWebsite(website);
+ request.setAttribute("model", pageModel);
}
else
{
@@ -374,7 +378,7 @@
throws IOException, ServletException
{
request.setAttribute("model", new BasePageModel(
- "pagesForm.title", request, response, mapping));
+ "pagesForm.title", request, response, mapping));
return (mapping.findForward("editPages"));
}
@@ -382,7 +386,8 @@
private void addModelObjects(
HttpServletRequest request,
HttpServletResponse response,
- ActionMapping mapping)
+ ActionMapping mapping,
+ WebsiteData website)
throws RollerException
{
UserManager mgr = RollerFactory.getRoller().getUserManager();
@@ -390,13 +395,13 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
UserData user = rses.getAuthenticatedUser();
- request.setAttribute("user",user);
+ request.setAttribute("user", user);
WebsiteData wd = rreq.getWebsite();
- request.setAttribute("website", wd);
+ request.setAttribute("website", website);
- List pages = mgr.getPages(wd);
- request.setAttribute("pages",pages);
+ List pages = mgr.getPages(website);
+ request.setAttribute("pages", pages);
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java Tue Aug 30 11:26:46 2005
@@ -137,7 +137,12 @@
WebsiteFormEx form = (WebsiteFormEx)actionForm;
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
UserManager umgr = RollerFactory.getRoller().getUserManager();
+
WebsiteData wd = umgr.retrieveWebsite(form.getId());
+
+ // Set website in request, so subsequent action gets it
+ RollerRequest.getRollerRequest(request).setWebsite(wd);
+
RollerSession rollerSession = RollerSession.getRollerSession(request);
if ( rollerSession.isUserAuthorizedToAdmin(wd))
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/InviteMemberForm.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/InviteMemberForm.java?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/InviteMemberForm.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/InviteMemberForm.java Tue Aug 30 11:26:46 2005
@@ -9,6 +9,8 @@
public class InviteMemberForm extends ActionForm
{
private String userName;
+ private String websiteId;
+
public String getUserName()
{
return userName;
@@ -16,5 +18,15 @@
public void setUserName(String userName)
{
this.userName = userName;
+ }
+
+ public String getWebsiteId()
+ {
+ return websiteId;
+ }
+
+ public void setWebsiteId(String websiteId)
+ {
+ this.websiteId = websiteId;
}
}
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=264823&r1=264822&r2=264823&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 Tue Aug 30 11:26:46 2005
@@ -448,6 +448,7 @@
inviteMemberDone.title=Invitation Sent
inviteMemberDone.message=User [{0}] has been invited to join this weblog
inviteMemberDone.inviteAnother=Invite another
+inviteMember.userInvited=User successfully invited
inviteMember.notificationSubject=Roller: invitation to join weblog "{0}" ({1})
inviteMember.notificationContent=You have been invited to join weblog "{0}" ({1}). \
@@ -1347,7 +1348,7 @@
# ---------------------------------------------------------------- Your Weblogs
yourWebsites.title=Main Menu
-yourWebsites.subtitle=Welcome to Roller. Use this main menu page to\
+yourWebsites.subtitle=Welcome to Roller. Use this main menu page to \
manage your weblogs, your user profile and (if you have admin permissions) \
administer the blog server.
Modified: incubator/roller/branches/roller_2.0/web/taglibs.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/taglibs.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/taglibs.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/taglibs.jsp Tue Aug 30 11:26:46 2005
@@ -1,26 +1,40 @@
-<%@ page language="java" errorPage="/error.jsp" contentType="text/html; charset=UTF-8" %><%@
-taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@
-taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %><%@
-taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %><%@
-taglib uri="http://struts.apache.org/tags-html" prefix="html" %><%@
-taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %><%@
-taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %><%@
-taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %><%@
-taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %><%@
-page import="org.roller.model.Roller" %><%@
-page import="org.roller.model.RollerFactory" %><%@
-page import="org.roller.pojos.UserData" %><%@
-page import="org.roller.pojos.WebsiteData" %><%@
-page import="org.roller.pojos.RollerConfigData" %><%@
-page import="org.roller.presentation.RollerContext" %><%@
-page import="org.roller.presentation.RollerSession" %><%@
-page import="org.roller.config.RollerConfig" %><%@
-page import="org.roller.presentation.RollerRequest" %><%@
-page import="org.roller.config.RollerRuntimeConfig" %><%@
-page import="org.roller.config.RollerConfig" %><%@
-page import="org.roller.presentation.LanguageUtil" %><%@
-page import="javax.servlet.jsp.jstl.core.Config" %><%
+<%@ page language="java" errorPage="/error.jsp" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
+
+<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
+
+<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
+
+<%@ page import="org.roller.model.Roller" %>
+<%@ page import="org.roller.model.RollerFactory" %>
+
+<%@ page import="org.roller.pojos.UserData" %>
+<%@ page import="org.roller.pojos.WebsiteData" %>
+<%@ page import="org.roller.pojos.RollerConfigData" %>
+
+<%@ page import="org.roller.config.RollerConfig" %>
+<%@ page import="org.roller.config.RollerRuntimeConfig" %>
+<%@ page import="org.roller.config.RollerConfig" %>
+
+<%@ page import="org.roller.presentation.RollerRequest" %>
+<%@ page import="org.roller.presentation.BasePageModel" %>
+<%@ page import="org.roller.presentation.RollerContext" %>
+<%@ page import="org.roller.presentation.RollerSession" %>
+<%@ page import="org.roller.presentation.LanguageUtil" %>
+
+<%
// fmt:setLocale doesn't accept an expression, hence this hack
-Config.set(pageContext, Config.FMT_LOCALE, LanguageUtil.getViewLocale(request), pageContext.PAGE_SCOPE);
-%><fmt:setBundle basename="ApplicationResources" /><%--
-Set all pages that include this page to use XHTML --%><html:xhtml />
\ No newline at end of file
+Config.set(pageContext, Config.FMT_LOCALE,
+ LanguageUtil.getViewLocale(request), pageContext.PAGE_SCOPE);
+%>
+<fmt:setBundle basename="ApplicationResources" />
+
+<%-- Set Struts tags to use XHTML --%>
+<html:xhtml />
\ No newline at end of file
Modified: incubator/roller/branches/roller_2.0/web/theme/messages.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/messages.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/messages.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/messages.jsp Tue Aug 30 11:26:46 2005
@@ -13,15 +13,6 @@
-->
</script>
-<%-- Error Messages --%>
-<logic:messagesPresent>
- <div id="errors" class="errors">
- <html:messages id="error">
- <c:out value="${error}" /><br />
- </html:messages>
- </div>
-</logic:messagesPresent>
-
<%-- Success Messages --%>
<logic:messagesPresent message="true">
<div id="messages" class="messages">
@@ -31,3 +22,11 @@
</div>
</logic:messagesPresent>
+<%-- Error Messages --%>
+<logic:messagesPresent>
+ <div id="errors" class="errors">
+ <html:messages id="error">
+ <c:out value="${error}" /><br />
+ </html:messages>
+ </div>
+</logic:messagesPresent>
Modified: incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp Tue Aug 30 11:26:46 2005
@@ -1,5 +1,9 @@
<%@ page import="org.roller.presentation.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
+<%
+BasePageModel pageModel = (BasePageModel)request.getAttribute("model");
+String websiteHandle = pageModel.getWebsite().getHandle();
+%>
<p class="subtitle">
<fmt:message key="pings.subtitle" >
@@ -60,6 +64,8 @@
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
<roller:linkparam
+ id="weblog" value="<%= websiteHandle %>" />
+ <roller:linkparam
id="method" value="disableSelected" />
<fmt:message key="pingTarget.disable"/>
</roller:link>
@@ -70,6 +76,8 @@
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
<roller:linkparam
+ id="weblog" value="<%= websiteHandle %>" />
+ <roller:linkparam
id="method" value="enableSelected" />
<fmt:message key="pingTarget.enable"/>
</roller:link>
@@ -83,6 +91,8 @@
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
<roller:linkparam
+ id="weblog" value="<%= websiteHandle %>" />
+ <roller:linkparam
id="method" value="pingSelectedNow" />
<fmt:message key="pingTarget.sendPingNow"/>
</roller:link>
@@ -152,6 +162,8 @@
name="pingTarget" property="id" />
<roller:linkparam
id="method" value="disableSelected" />
+ <roller:linkparam
+ id="weblog" value="<%= websiteHandle %>" />
<fmt:message key="pingTarget.disable"/>
</roller:link>
</c:when>
@@ -162,6 +174,8 @@
name="pingTarget" property="id" />
<roller:linkparam
id="method" value="enableSelected" />
+ <roller:linkparam
+ id="weblog" value="<%= websiteHandle %>" />
<fmt:message key="pingTarget.enable"/>
</roller:link>
</c:otherwise>
@@ -175,6 +189,8 @@
name="pingTarget" property="id" />
<roller:linkparam
id="method" value="pingSelectedNow" />
+ <roller:linkparam
+ id="weblog" value="<%= websiteHandle %>" />
<fmt:message key="pingTarget.sendPingNow"/>
</roller:link>
</td>
Modified: incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp Tue Aug 30 11:26:46 2005
@@ -12,8 +12,6 @@
-->
</script>
-<h1><fmt:message key="createWebsite.title" /></h1>
-
<p class="subtitle"><fmt:message key="createWebsite.prompt" /></p>
<br />
Modified: incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp Tue Aug 30 11:26:46 2005
@@ -13,7 +13,8 @@
<p class="subtitle"><fmt:message key="inviteMember.description" /></p>
<html:form action="/editor/inviteMember" method="post" focus="userName">
- <input name="method" type="hidden" value="save" />
+ <html:hidden property="websiteId" />
+ <input name="method" type="hidden" value="send" />
<div class="formrow">
<label for="userName" class="formrow" />
Modified: incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp Tue Aug 30 11:26:46 2005
@@ -8,9 +8,12 @@
<h3><fmt:message key="mainPage.actions" /></h3>
<hr />
<img src='<c:url value="/images/ComposeMail16.gif"/>' alt="mail-icon" align="bottom" />
- <roller:link page="/editor/inviteMember.do">
- <fmt:message key="memberPermissions.inviteMember" />
- </roller:link>
+ <c:url value="/editor/inviteMember.do" var="inviteUrl">
+ <c:param name="weblog" value="${model.website.handle}" />
+ </c:url>
+ <a href='<c:out value="${inviteUrl}" />'>
+ <fmt:message key="memberPermissions.inviteMember" />
+ </a>
<br />
<fmt:message key="memberPermissions.whyInvite" />
<br />
Modified: incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Tue Aug 30 11:26:46 2005
@@ -8,7 +8,6 @@
-->
</script>
-<h1><fmt:message key="yourProfile.title" /></h1>
<p class="subtitle"><fmt:message key="yourProfile.description" /></p>
<html:form action="/editor/yourProfile" method="post" focus="fullName">
Modified: incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-page.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-page.jsp Tue Aug 30 11:26:46 2005
@@ -37,16 +37,16 @@
<html:textarea property="description" rows="3" cols="50"/>
</td>
</tr>
- <tr>
- <td><fmt:message key="pageForm.template" /><br />
- <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
- </td>
- </tr>
+
</table>
+ <fmt:message key="pageForm.template" /><br />
+ <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
+
<html:hidden property="id"/>
<html:hidden property="name"/>
<input type="hidden" name="method" value="update" />
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<br />
<input type="submit" value='<fmt:message key="pageForm.save" />' /></input>
Modified: incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp?rev=264823&r1=264822&r2=264823&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp Tue Aug 30 11:26:46 2005
@@ -13,8 +13,7 @@
<fmt:message key="pagesForm.name"/>: <input type="text" name="name" size="30" />
<input type="submit" value='<fmt:message key="pagesForm.add" />' />
- <input type="hidden" property="template"
- value="<html><body><fmt:message key="pagesForm.emptyPage" /></body></html>" />
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<html:hidden property="method" value="add"/>
</html:form>