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/16 17:23:23 UTC
svn commit: r233007 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/website/actions/ web/WEB-INF/classes/
web/theme/ web/website/
Author: snoopdave
Date: Tue Aug 16 08:21:18 2005
New Revision: 233007
URL: http://svn.apache.org/viewcvs?rev=233007&view=rev
Log:
More tweaks to 2.0 pages, look and feel, final preps before screenshots
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/theme/roller.css
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/YourWebsites.jsp
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=233007&r1=233006&r2=233007&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 16 08:21:18 2005
@@ -44,7 +44,6 @@
*
* @struts.action path="/editor/inviteMember" parameter="method" name="inviteMemberForm"
* @struts.action-forward name="inviteMember.page" path=".InviteMember"
- * @struts.action-forward name="inviteMemberDone.page" path=".InviteMemberDone"
*/
public class InviteMemberAction extends DispatchAction
{
@@ -126,13 +125,23 @@
String mask = request.getParameter("permissionsMask");
umgr.inviteUser(website, user, Short.parseShort(mask));
request.setAttribute("user", user);
- forward = mapping.findForward("inviteMemberDone.page");
- notifyInvitee(request, website, user);
+ try
+ {
+ notifyInvitee(request, website, user);
+ }
+ catch (RollerException e)
+ {
+ errors.add(ActionErrors.GLOBAL_ERROR,
+ new ActionError("error.untranslated", e.getMessage()));
+ }
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("inviteMember.userInvited"));
+
+ forward = mapping.findForward("memberPermissions");
}
}
- if (!errors.isEmpty()) saveErrors(request, errors);
+ saveErrors(request, errors);
+ saveMessages(request, msgs);
return forward;
}
@@ -141,7 +150,7 @@
*/
private void notifyInvitee(
HttpServletRequest request, WebsiteData website, UserData user)
- throws Exception
+ throws RollerException
{
try
{
@@ -198,17 +207,17 @@
}
catch (NamingException e)
{
- mLogger.error("ERROR: Notification email(s) not sent, "
+ throw new RollerException("ERROR: Notification email(s) not sent, "
+ "Roller's mail session not properly configured", e);
}
catch (MessagingException e)
{
- mLogger.error("ERROR: Notification email(s) not sent, "
- + "due to Roller configuration or mail server problem.", e);
+ throw new RollerException("ERROR: Notification email(s) not sent, "
+ + "due to Roller configuration or mail server problem.", e);
}
catch (MalformedURLException e)
{
- mLogger.error("ERROR: Notification email(s) not sent, "
+ throw new RollerException("ERROR: Notification email(s) not sent, "
+ "Roller site URL is malformed?", e);
}
catch (RollerException e)
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=233007&r1=233006&r2=233007&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 16 08:21:18 2005
@@ -263,6 +263,8 @@
#---------------------------------------------------------------- Error messages
+error.untranslated={0}
+
error.add.blogcat=Error adding Weblog Category
error.add.blogentry=Error adding Weblog Entry
error.add.bookmark=Error adding Bookmark
Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=233007&r1=233006&r2=233007&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Tue Aug 16 08:21:18 2005
@@ -48,8 +48,7 @@
margin: 0px;
padding: 0px;
font: small Verdana,Arial,Sans-serif;
- font: x-small/1.5em Verdana, Arial, Helvetica, sans-serif;
- font-size: 69%;
+ font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
}
p {
background: transparent;
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=233007&r1=233006&r2=233007&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 16 08:21:18 2005
@@ -6,7 +6,7 @@
document.inviteMemberForm.method.value="cancel";
document.inviteMemberForm.submit();
}
-<%@ include file="/scripts/ajax-user.js" %>
+<%@ include file="/theme/scripts/ajax-user.js" %>
// -->
</script>
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=233007&r1=233006&r2=233007&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 16 08:21:18 2005
@@ -7,7 +7,7 @@
<h3><fmt:message key="mainPage.actions" /></h3>
<hr />
- <img src='<c:url value="/images/ComposeMail16.png"/>' alt="mail-icon" align="bottom" />
+ <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>
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=233007&r1=233006&r2=233007&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Tue Aug 16 08:21:18 2005
@@ -146,6 +146,7 @@
<%-- <fmt:message key="yourWebsites.notAllowed" /> --%>
</c:when>
<c:otherwise>
+ <img src='<c:url value="/images/Remove16.gif"/>' />
<a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out value="${perms.website.handle}" />")'>
<fmt:message key='yourWebsites.resign' />
</a>