Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp Fri May 18 19:02:48 2007 @@ -24,19 +24,17 @@ </s:text> </p> -<s:if test="bean.required"> +<s:if test="template.required"> <p class="pagetip"><s:text name="pageForm.tip.required" /></p> </s:if> <s:else> <p class="pagetip"><s:text name="pageForm.tip" /></p> </s:else> -<s:form action="template!save" id="template"> +<s:form action="templateEdit!save" id="template"> + <s:hidden name="weblog" /> <s:hidden name="bean.id"/> - <s:hidden name="bean.decoratorName" /> - <s:hidden name="bean.required" /> <s:hidden name="bean.action" /> - <s:hidden name="weblog" value="%{actionWeblog.handle}" /> <%-- ================================================================== --%> <%-- Name, link and desription: disabled when page is a required page --%> @@ -45,7 +43,7 @@ <tr> <td class="label"><s:text name="pageForm.name" /> </td> <td class="field"> - <s:if test="bean.required"> + <s:if test="template.required"> <span class="fixedAttr"><s:property value="bean.name"/></span> <s:hidden name="bean.name" /> </s:if> @@ -92,11 +90,11 @@ --> </script> - <s:if test="!bean.required"> + <s:if test="!template.required"> <tr> <td class="label" valign="top"><s:text name="pageForm.link" /> </td> <td class="field"> - <s:if test="bean.required"> + <s:if test="template.required"> <span class="fixedAttr"><s:property value="bean.link"/></span> <s:hidden name="bean.link" /> </s:if> @@ -115,7 +113,7 @@ <tr> <td class="label" valign="top" style="padding-top: 4px"><s:text name="pageForm.description" /> </td> <td class="field"> - <s:if test="bean.required"> + <s:if test="template.required"> <span class="fixedAttr"><s:property value="bean.description"/></span> <s:hidden name="bean.description" /> </s:if> @@ -136,7 +134,7 @@ <script type="text/javascript"><!-- if (getCookie("editorSize1") != null) { - document.weblogTemplateFormEx.contents.rows = getCookie("editorSize1"); + document.getElementById('template_bean_contents').rows = getCookie("editorSize1"); } function changeSize(e, num) { a = e.rows + num; @@ -162,9 +160,9 @@ <td align="right"> <!-- Add buttons to make this textarea taller or shorter --> <input type="button" name="taller" value=" ↓ " - onclick="changeSize1(document.template.template_bean_contents, 5)" /> + onclick="changeSize1(document.getElementById('template_bean_contents'), 5)" /> <input type="button" name="shorter" value=" ↑ " - onclick="changeSize1(document.template.template_bean_contents, -5)" /> + onclick="changeSize1(document.getElementById('template_bean_contents'), -5)" /> </td> </tr> </table> @@ -187,12 +185,12 @@ <tr> <script type="text/javascript"><!-- function showContentTypeField() { - if (document.weblogTemplateFormEx.autoContentType[0].checked) { - document.weblogTemplateFormEx.manualContentType.readOnly = true; - document.weblogTemplateFormEx.manualContentType.style.background = '#e5e5e5'; + if (document.getElementById('template_bean_autoContentType1').checked) { + document.getElementById('template_bean_manualContentType').readOnly = true; + document.getElementById('template_bean_manualContentType').style.background = '#e5e5e5'; } else { - document.weblogTemplateFormEx.manualContentType.readOnly = false; - document.weblogTemplateFormEx.manualContentType.style.background = '#ffffff'; + document.getElementById('template_bean_manualContentType').readOnly = false; + document.getElementById('template_bean_manualContentType').style.background = '#ffffff'; } } // --></script> @@ -200,13 +198,22 @@ <tr> <td class="label" valign="top"><s:text name="pageForm.outputContentType" /> </td> <td class="field"> - - <s:radio name="autoContentType" list="{true}" onchange="showContentTypeField()" /> - <s:text name="pageForm.useAutoContentType" /><br /> - - <s:radio name="autoContentType" list="{false}" onchange="showContentTypeField()" /> - <s:text name="pageForm.useManualContentType" /> - <s:textfield name="manualContentType" /> + <s:if test="bean.autoContentType"> + <input type="radio" name="bean.autoContentType" value="true" checked="true" onchange="showContentTypeField()" id="template_bean_autoContentType1"/> + <s:text name="pageForm.useAutoContentType" /><br /> + + <input type="radio" name="bean.autoContentType" value="false" onchange="showContentTypeField()" id="template_bean_autoContentType2"/> + <s:text name="pageForm.useManualContentType" /> + <s:textfield name="bean.manualContentType" /> + </s:if> + <s:else> + <input type="radio" name="bean.autoContentType" value="true" onchange="showContentTypeField()" id="template_bean_autoContentType1"/> + <s:text name="pageForm.useAutoContentType" /><br /> + + <input type="radio" name="bean.autoContentType" value="false" checked="true" onchange="showContentTypeField()" id="template_bean_autoContentType2"/> + <s:text name="pageForm.useManualContentType" /> + <s:textfield name="bean.manualContentType" /> + </s:else> <br /> <br /> @@ -223,13 +230,13 @@ <tr> <td class="field"> - <s:if test="bean.required"> - <s:hidden name="navbar" /> + <s:if test="template.required"> + <s:hidden name="bean.navbar" /> </s:if> <s:else> <tr> <td class="label"><s:text name="pageForm.navbar" /> </td> - <td class="field"><s:checkbox name="navbar" /> + <td class="field"><s:checkbox name="bean.navbar" /> <s:text name="pageForm.navbar.tip" /> </td> <td class="description"></td> @@ -240,13 +247,13 @@ </tr> <td class="field"> - <s:if test="bean.required"> - <s:hidden name="hidden" /> + <s:if test="template.required"> + <s:hidden name="bean.hidden" /> </s:if> <s:else> <tr> <td class="label"><s:text name="pageForm.hidden" /> </td> - <td class="field"><s:checkbox name="hidden" /> + <td class="field"><s:checkbox name="bean.hidden" /> <s:text name="pageForm.hidden.tip" /> </td> <td class="description"></td> @@ -261,14 +268,14 @@ <tr> <td class="field"> - <s:if test="bean.required || !model.rollerSession.globalAdminUser}"> - <s:hidden name="templateLanguage" /> + <s:if test="template.required || !userIsAdmin}"> + <s:hidden name="bean.templateLanguage" /> </s:if> <s:else> <tr> <td class="label"><s:text name="pageForm.templateLanguage" /> </td> <td class="field"> - <s:select name="templateLanguage" list="templateLanguages" size="1" /> + <s:select name="bean.templateLanguage" list="templateLanguages" size="1" /> </td> <td class="description"></td> </tr> @@ -284,13 +291,3 @@ <br /> </s:form> - -<%-- -Added by Matt Raible since the focus javascript generated by Struts -doesn't seem to work for forms with duplicate named elements. ---%> -<script type="text/javascript"> -<!-- - document.forms[0].elements[0].focus(); -// --> -</script>
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Templates.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Templates.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Templates.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Templates.jsp Fri May 18 19:02:48 2007 @@ -53,7 +53,7 @@ <s:url id="editIcon" value="/images/page_white_gear.png"/> </s:else> <img src='<s:url value="%{editIcon}"/>' border="0" alt="icon" /> - <s:url id="edit" action="template"> + <s:url id="edit" action="templateEdit"> <s:param name="weblog" value="actionWeblog.handle" /> <s:param name="bean.id" value="#p.id" /> </s:url> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp Fri May 18 19:02:48 2007 @@ -21,38 +21,38 @@ <div class="menu-tr"> <div class="menu-tl"> -<div class="sidebarInner"> - <h3><s:text name="pagesForm.addNewPage" /></h3> - <hr size="1" noshade="noshade" /> - - <s:form action="templateAdd!save"> - <s:hidden name="weblog" value="%{actionWeblog.handle}" /> - - <table cellpadding="0" cellspacing="0"> - <tr> - <td><s:text name="pagesForm.name"/>:</td> - <td><s:textfield name="newTmplName" /></td> - </tr> - - <s:if test="!availableActions.isEmpty" > - <tr> - <td><s:text name="pagesForm.action"/>:</td> - <td> - <s:select name="newTmplAction" size="1" list="availableActions" /> - </td> - </tr> - </s:if> - - <tr> - <td></td> - <td><s:submit key="pagesForm.add" /></td> - </tr> - </table> - - </s:form> - <br /> - -</div> + <div class="sidebarInner"> + <h3><s:text name="pagesForm.addNewPage" /></h3> + <hr size="1" noshade="noshade" /> + + <s:form action="templateAdd!save"> + <s:hidden name="weblog" /> + + <table cellpadding="0" cellspacing="0"> + <tr> + <td><s:text name="pagesForm.name"/>:</td> + <td><s:textfield name="newTmplName" /></td> + </tr> + + <s:if test="!availableActions.isEmpty" > + <tr> + <td><s:text name="pagesForm.action"/>:</td> + <td> + <s:select name="newTmplAction" size="1" list="availableActions" /> + </td> + </tr> + </s:if> + + <tr> + <td></td> + <td><s:submit key="pagesForm.add" /></td> + </tr> + </table> + + </s:form> + <br /> + + </div> </div> </div> </div> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp Fri May 18 19:02:48 2007 @@ -39,8 +39,8 @@ <s:text name="themeEditor.tip" /> </p> -<s:form action="themes!save"> - <s:hidden name="weblog" value="%{actionWeblog.handle}" /> +<s:form action="themeEdit!save"> + <s:hidden name="weblog" /> <p><s:text name="themeEditor.yourCurrentTheme" />: <b><s:property value="actionWeblog.theme.name"/></b></p> @@ -52,7 +52,7 @@ <img name="preview" src="" /> <!-- initialize preview image at page load --> <script type="text/javascript"> - previewImage('<s:property value="actionWeblog.theme.id"/>'); + previewImage('<s:property value="actionWeblog.theme.id"/>'); </script> </p> <p><s:submit key="themeEditor.save" /></p> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp Fri May 18 19:02:48 2007 @@ -44,10 +44,22 @@ <tr> <td class="label"><s:text name="websiteSettings.websiteDescription" /></td> - <td class="field"><s:textarea name="bean.description" rows="3" cols="40"/></td> + <td class="field"><s:textfield name="bean.description" /></td> <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> </tr> - + + <tr> + <td class="label"><s:text name="websiteSettings.icon" /></td> + <td class="field"><s:textfield name="bean.icon" /></td> + <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + </tr> + + <tr> + <td class="label"><s:text name="websiteSettings.about" /></td> + <td class="field"><s:textarea name="bean.about" rows="3" cols="40"/></td> + <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + </tr> + <tr> <td class="label"><s:text name="websiteSettings.emailAddress" /> <td class="field"><s:textfield name="bean.emailAddress" size="40"/></td> @@ -161,7 +173,7 @@ <tr> <td class="label"><s:text name="websiteSettings.defaultCommentDays" /></td> <td class="field"> - <s:select name="bean.defaultCommentDays" list="commentDaysOptions" size="1" listKey="key" listValue="value" /> + <s:select name="bean.defaultCommentDays" list="commentDaysList" size="1" listKey="key" listValue="value" /> <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> </tr> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp Fri May 18 19:02:48 2007 @@ -29,18 +29,18 @@ <s:iterator id="invite" value="pendingPermissions"> <s:text name="yourWebsites.youAreInvited" > - <s:param value="invite.website.handle" /> + <s:param value="#invite.website.handle" /> </s:text> <s:url action="menu!accept" id="acceptInvite"> - <s:param name="inviteId" value="invite.id" /> + <s:param name="inviteId" value="#invite.id" /> </s:url> <a href='<s:property value="acceptInvite" />'> <s:text name="yourWebsites.accept" /> </a> | <s:url action="menu!decline" id="declineInvite"> - <s:param name="inviteId" value="invite.id" /> + <s:param name="inviteId" value="#invite.id" /> </s:url> <a href='<s:property value="declineInvite" />'> <s:text name="yourWebsites.decline" /> @@ -104,33 +104,27 @@ <td class="mm_table_actions" width="20%" align="left" > - <s:url action="weblog" id="newEntry"> - <s:param name="method" value="create" /> + <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry"> <s:param name="weblog" value="#perms.website.handle" /> </s:url> <img src='<s:url value="/images/table_edit.png"/>' /> - <a href='<s:property value="newEntry" />'> - <s:text name="yourWebsites.newEntry" /></a> + <s:a href="%{newEntry}"><s:text name="yourWebsites.newEntry" /></s:a> <br /> <%-- Show Entries link with count, TODO: show N/M where N is draft, M is published --%> - <s:url action="weblogEntryManagement" id="editEntries"> - <s:param name="method" value="query" /> + <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries"> <s:param name="weblog" value="#perms.website.handle" /> </s:url> <img src='<s:url value="/images/table_multiple.png"/>' /> - <a href='<s:property value="editEntries" />'> - <s:text name="yourWebsites.editEntries" /> (<s:property value="#perms.website.entryCount" />)</a> + <s:a href="%{editEntries}"><s:text name="yourWebsites.editEntries" /> (<s:property value="#perms.website.entryCount" />)</s:a> <br /> <%-- Show Comments link with count, TODO: show N/M where N is pending, M is approved --%> - <s:url action="commentManagement" id="manageComments"> - <s:param name="method" value="query" /> + <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments"> <s:param name="weblog" value="#perms.website.handle" /> </s:url> <img src='<s:url value="/images/page_white_edit.png"/>' /> - <a href='<s:property value="manageComments" />'> - <s:text name="yourWebsites.manageComments" /> (<s:property value="#perms.website.commentCount" />)</a> + <s:a href="%{manageComments}"><s:text name="yourWebsites.manageComments" /> (<s:property value="#perms.website.commentCount" />)</s:a> <br /> <s:if test="#perms.permissionMask == 3"> @@ -146,8 +140,8 @@ <%-- authors and limited bloggers can resign, but admin cannot resign if he/she is the last admin in the blog --%> <s:if test="#perms.permissionMask == 0 || #perms.permissionMask == 1 || #perms.website.adminUserCount > 1"> <img src='<c:url value="/images/delete.png"/>' /> - <s:url value="menu!resign" id="resignWeblog"> - <s:param name="weblog" value="#perms.website.handle" /> + <s:url action="menu!resign" id="resignWeblog"> + <s:param name="websiteId" value="#perms.website.id" /> </s:url> <a href='<s:property value="resignWeblog" />'> <s:text name='yourWebsites.resign' /> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp Fri May 18 19:02:48 2007 @@ -26,7 +26,7 @@ <hr size="1" noshade="noshade" /> - <s:if test="groupBloggingEnabled || (existingPermissions.isEmpty && pendingPermissions.isEmpty)"> + <s:if test="getBooleanProp('groupblogging.enabled') || (existingPermissions.isEmpty && pendingPermissions.isEmpty)"> <h3><a href="<s:url action="createWeblog" />"><s:text name="yourWebsites.createWeblog" /></a></h3> <p><s:text name="yourWebsites.createWeblog.desc" /></p> </s:if> @@ -34,11 +34,11 @@ <h3><a href="<s:url action="profile"/>"><s:text name="yourWebsites.editProfile" /></a></h3> <p><s:text name="yourWebsites.editProfile.desc" /></p> - <s:if test="userAdmin"> + <s:if test="userIsAdmin"> <h3><a href="<s:url action="globalConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.globalAdmin" /></a></h3> <p><s:text name="yourWebsites.globalAdmin.desc" /></p> - <s:if test="planetAggregated"> + <s:if test="getBooleanProp('planet.aggregator.enabled')"> <h3><a href="<s:url action="planetConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.planetAdmin" /></a></h3> <p><s:text name="yourWebsites.planetAdmin.desc" /></p> </s:if> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp Fri May 18 19:02:48 2007 @@ -20,6 +20,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> -<%@ taglib uri="http://struts.apache.org/tags-tiles2"; prefix="tiles" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles"; prefix="tiles" %> <%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1"; prefix="str" %> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp Fri May 18 19:02:48 2007 @@ -15,71 +15,41 @@ copyright in this work, please see the NOTICE file in the top level directory of this distribution. --%> -<%@ include file="/WEB-INF/jsps/taglibs-error.jsp" %> +<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> -<head> -<title><c:out value="${model.title}" /></title> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<tiles:insert page="/WEB-INF/jsps/tiles/head.jsp" /> -</head> -<body> - -<div id="wrapper"> - <div id="leftcontent_wrap"> - <div id="leftcontent"> - </div> - </div> - - <div id="centercontent_wrap"> - <div id="centercontent"> - <h1><c:out value="${model.title}" /></h1> - - <%-- Success Messages --%> - <logic:messagesPresent message="true"> - <div id="messages" class="messages"> - <html:messages id="message" message="true"> - <c:out value="${message}" escapeXml="false"/><br /> - </html:messages> + <head> + <title><s:text name="error" /></title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <tiles:insertAttribute name="head" /> + </head> + <body> + + <div id="wrapper"> + <div id="leftcontent_wrap"> + <div id="leftcontent"> </div> - </logic:messagesPresent> + </div> - <%-- Error Messages --%> - <logic:messagesPresent> - <div id="errors" class="errors"> - <html:messages id="error"> - <c:out value="${error}" /><br /> - </html:messages> + <div id="centercontent_wrap"> + <div id="centercontent"> + <tiles:insertAttribute name="messages" /> + <tiles:insertAttribute name="content" /> </div> - </logic:messagesPresent> + </div> - <tiles:insert attribute="content" /> + <div id="rightcontent_wrap"> + <div id="rightcontent"> + </div> + </div> + </div> + + <div id="footer"> + <tiles:insertAttribute name="footer" /> </div> - </div> - - <div id="rightcontent_wrap"> - <div id="rightcontent"> + + <div id="datetagdiv" + style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"> </div> - </div> -</div> - -<div id="footer"> - Powered by <a href="http://www.rollerweblogger.org";>Apache Roller (incubating)</a> - <%= RollerFactory.getRoller().getVersion() %> | - - <a href="http://opensource2.atlassian.com/projects/roller/";> - <s:text name="footer.reportIssue" /></a> | - - <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide";> - <s:text name="footer.userGuide" /></a> | - - <a href="http://rollerweblogger.org/wiki/Wiki.jsp?page=RollerMailingLists";> - <s:text name="footer.mailingLists" /></a> - -</div> - -<div id="datetagdiv" - style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"> -</div> -</body> + </body> </html> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml Fri May 18 19:02:48 2007 @@ -180,7 +180,7 @@ <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilter"> <property name="authenticationManager" ref="authenticationManager"/> - <property name="authenticationFailureUrl" value="/roller-ui/login.do?error=true"/> + <property name="authenticationFailureUrl" value="/roller-ui/login.rol?error=true"/> <property name="defaultTargetUrl" value="/"/> <property name="filterProcessesUrl" value="/roller_j_security_check"/> <property name="rememberMeServices" ref="rememberMeServices"/> @@ -198,7 +198,7 @@ <bean id="remoteUserFilter" class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter"/> <bean id="authenticationProcessingFilterEntryPoint" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint"> - <property name="loginFormUrl" value="/roller-ui/login.do"/> + <property name="loginFormUrl" value="/roller-ui/login.rol"/> <property name="forceHttps" value="false"/> </bean> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml Fri May 18 19:02:48 2007 @@ -52,26 +52,52 @@ <put name="footer" value="/WEB-INF/jsps/tiles/struts2/footer.jsp" /> </definition> + <definition name=".tiles-errorpage" template="/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp"> + <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp" /> + <put name="messages" value="/WEB-INF/jsps/tiles/struts2/messages.jsp" /> + <put name="content" value="${content}" /> + <put name="footer" value="/WEB-INF/jsps/tiles/struts2/footer.jsp" /> + </definition> + + + <!-- error pages --> + <definition name=".denied" extends=".tiles-errorpage" > + <put name="content" value="/WEB-INF/jsps/errors/denied.jsp" /> + </definition> + <definition name=".error" extends=".tiles-errorpage" > + <put name="content" value="/WEB-INF/jsps/errors/error.jsp" /> + </definition> + <definition name=".403" extends=".tiles-errorpage" > + <put name="content" value="/WEB-INF/jsps/errors/403.jsp" /> + </definition> + <definition name=".404" extends=".tiles-errorpage" > + <put name="content" value="/WEB-INF/jsps/errors/404.jsp" /> + </definition> + <!-- core pages (and associates) --> + <definition name=".Setup" extends=".tiles-simplepage" > + <put name="content" value="/WEB-INF/jsps/core/struts2/Setup.jsp" /> + </definition> + <definition name=".Login" extends=".tiles-simplepage" > <put name="content" value="/WEB-INF/jsps/core/struts2/Login.jsp" /> </definition> - <definition name=".RegisterForm" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/RegisterForm.jsp" /> + <definition name=".Register" extends=".tiles-simplepage" > + <put name="content" value="/WEB-INF/jsps/core/struts2/Register.jsp" /> </definition> <definition name=".Welcome" extends=".tiles-simplepage" > <put name="content" value="/WEB-INF/jsps/core/struts2/Welcome.jsp" /> </definition> - <definition name=".ProfileForm" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/ProfileForm.jsp" /> + <definition name=".Profile" extends=".tiles-simplepage" > + <put name="content" value="/WEB-INF/jsps/core/struts2/Profile.jsp" /> </definition> - <definition name=".CreateWeblogForm" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp" /> + <definition name=".CreateWeblog" extends=".tiles-simplepage" > + <put name="content" value="/WEB-INF/jsps/core/struts2/CreateWeblog.jsp" /> </definition> <definition name=".MainMenu" extends=".tiles-mainmenupage" > @@ -228,8 +254,8 @@ <put name="content" value="/WEB-INF/jsps/authoring/struts2/Resources.jsp" /> </definition> - <definition name=".referers" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/referers.jsp" /> + <definition name=".Referrers" extends=".tiles-tabbedpage" > + <put name="content" value="/WEB-INF/jsps/authoring/struts2/Referrers.jsp" /> </definition> @@ -244,6 +270,7 @@ </definition> <definition name=".ThemeEdit" extends=".tiles-tabbedpage" > + <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" /> <put name="content" value="/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp" /> </definition> @@ -253,13 +280,13 @@ <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" /> </definition> - <definition name=".TemplateRemove" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp" /> + <definition name=".TemplateEdit" extends=".tiles-tabbedpage" > + <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp" /> <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> </definition> - <definition name=".TemplateEditForm" extends=".tiles-tabbedpage" > - <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp" /> + <definition name=".TemplateRemove" extends=".tiles-tabbedpage" > + <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp" /> <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" /> </definition> @@ -296,21 +323,6 @@ <definition name=".Maintenance" extends=".tiles-tabbedpage" > <put name="content" value="/WEB-INF/jsps/authoring/struts2/Maintenance.jsp" /> - </definition> - - - <!-- error pages --> - <definition name=".denied" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/denied.jsp" /> - </definition> - <definition name=".error" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/error.jsp" /> - </definition> - <definition name=".error403" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/error403.jsp" /> - </definition> - <definition name=".error404" extends=".tiles-simplepage" > - <put name="content" value="/WEB-INF/jsps/error404.jsp" /> </definition> </tiles-definitions> Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm Fri May 18 19:02:48 2007 @@ -180,9 +180,9 @@ #foreach( $comment in $comments ) #if($comment.approved || $model.commentForm.preview) #if($config.commentEscapeHtml) - #set($content = $utils.escapeHTML($comment.content)) + #set($content = $comment.content)) #else - #set($content = $utils.transformToHTMLSubset($utils.escapeHTML($comment.content))) + #set($content = $utils.transformToHTMLSubset($comment.content)) #end #if($config.commentAutoFormat) #set($content = $utils.autoformat($content)) @@ -196,11 +196,11 @@ <p class="comment-details"> $text.get("macro.weblog.postedby") #if (!$utils.isEmpty($comment.name) && !$utils.isEmpty($comment.url)) - <a rel="nofollow" href="$comment.url"><b>$utils.escapeHTML($comment.name)</b></a> + <a rel="nofollow" href="$comment.url"><b>$comment.name</b></a> #elseif (!$utils.isEmpty($comment.name)) - <b>$utils.escapeHTML($comment.name)</b> + <b>$comment.name</b> #elseif ($comment.remoteHost) - <b>$utils.escapeHTML($comment.remoteHost)</b> + <b>$comment.remoteHost</b> #else <b>$text.get("macro.weblog.comment.unknown")</b> #end Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml Fri May 18 19:02:48 2007 @@ -499,22 +499,22 @@ <error-page> <exception-type>java.lang.Exception</exception-type> - <location>/WEB-INF/jsps/error.jsp</location> + <location>/roller-ui/error.rol</location> </error-page> <error-page> <error-code>403</error-code> - <location>/WEB-INF/jsps/403.jsp</location> + <location>/roller-ui/403.rol</location> </error-page> <error-page> <error-code>404</error-code> - <location>/WEB-INF/jsps/404.jsp</location> + <location>/roller-ui/404.rol</location> </error-page> <error-page> <error-code>400</error-code> - <location>/login-redirect.jsp</location> + <location>/roller-ui/login-redirect.rol</location> </error-page> Modified: roller/branches/roller_4.0_newbackend/web/index.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/index.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/index.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/index.jsp Fri May 18 19:02:48 2007 @@ -14,33 +14,21 @@ limitations under the License. For additional information regarding copyright in this work, please see the NOTICE file in the top level directory of this distribution. ---%><%@ -page import="org.apache.roller.config.RollerRuntimeConfig" session="false" %><% +--%><%@ page session="false" %><% + // lets see if we have a frontpage blog String frontpageBlog = - RollerRuntimeConfig.getProperty("site.frontpage.weblog.handle"); + org.apache.roller.config.RollerRuntimeConfig.getProperty("site.frontpage.weblog.handle"); if (frontpageBlog != null && !"".equals(frontpageBlog.trim())) { // dispatch to frontpage blog RequestDispatcher homepage = request.getRequestDispatcher("/roller-ui/rendering/page/"+frontpageBlog); homepage.forward(request, response); - return; } else { - // need to create a session before response is committed - request.getSession(true); + // dispatch to setup page + RequestDispatcher setuppage = request.getRequestDispatcher("/roller-ui/setup.rol"); + setuppage.forward(request, response); } -// otherwise, show the "Here's how to finish your Roller install page" - -%><% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<%@ include file="/WEB-INF/jsps/taglibs.jsp" %> -<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp"> - <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" /> - <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" /> - <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" /> - <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> - <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" /> - <tiles:put name="content" value="/WEB-INF/jsps/setupBody.jsp" /> - <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" /> -</tiles:insert> +%> \ No newline at end of file Modified: roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-text.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-text.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-text.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-text.jsp Fri May 18 19:02:48 2007 @@ -16,14 +16,12 @@ directory of this distribution. --%> <%-- This page is designed to be included in edit-weblog.jsp --%> -<%@ include file="/WEB-INF/jsps/taglibs.jsp" %> +<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> <script type="text/javascript"> <!-- -function postWeblogEntry(publish) { - if (publish) - document.weblogEntryFormEx.publishEntry.value = "true"; - document.weblogEntryFormEx.submit(); +function postWeblogEntry() { + // no-op } function changeSize(e, num) { a = e.rows + num; @@ -43,35 +41,35 @@ </script> <%-- ===================================================================== --%> -<p class="toplabel"><fmt:message key="weblogEdit.content" /></p> +<p class="toplabel"><s:text name="weblogEdit.content" /></p> -<html:textarea property="text" cols="75" rows="25" style="width: 100%" tabindex="5"/> +<s:textarea name="bean.text" cols="75" rows="25" cssStyle="width: 100%" tabindex="5"/> <script type="text/javascript"> <!-- if (getCookie("editorSize1") != null) { - document.weblogEntryFormEx.text.rows = getCookie("editorSize1"); + document.getElementById('entry_bean_text').rows = getCookie("editorSize1"); } --> </script> <table style="width:100%"><tr><td align="right"> <!-- Add buttons to make this textarea taller or shorter --> - <input type="button" name="taller" value=" ↓ " onclick="changeSize1(document.weblogEntryFormEx.text, 5)" /> - <input type="button" name="shorter" value=" ↑ " onclick="changeSize1(document.weblogEntryFormEx.text, -5)" /> + <input type="button" name="taller" value=" ↓ " onclick="changeSize1(document.getElementById('entry_bean_text'), 5)" /> + <input type="button" name="shorter" value=" ↑ " onclick="changeSize1(document.getElementById('entry_bean_text'), -5)" /> </td></tr></table> <%-- ===================================================================== --%> -<p class="toplabel"><fmt:message key="weblogEdit.summary" /></p> +<p class="toplabel"><s:text name="weblogEdit.summary" /></p> -<html:textarea property="summary" cols="75" rows="5" style="width: 100%" tabindex="6"/> +<s:textarea name="bean.summary" cols="75" rows="5" cssStyle="width: 100%" tabindex="6"/> <script type="text/javascript"> <!-- if (getCookie("editorSize") != null) { - document.weblogEntryFormEx.summary.rows = getCookie("editorSize"); + document.getElementById('entry_bean_summary').rows = getCookie("editorSize"); } --> </script> <table style="width:100%"><tr><td align="right"> <!-- Add buttons to make this textarea taller or shorter --> - <input type="button" name="taller" value=" ↓ " onclick="changeSize(document.weblogEntryFormEx.summary, 5)" /> - <input type="button" name="shorter" value=" ↑ " onclick="changeSize(document.weblogEntryFormEx.summary, -5)" /> + <input type="button" name="taller" value=" ↓ " onclick="changeSize(document.getElementById('entry_bean_summary'), 5)" /> + <input type="button" name="shorter" value=" ↑ " onclick="changeSize(document.getElementById('entry_bean_summary'), -5)" /> </td></tr></table> Modified: roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-xinha.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-xinha.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-xinha.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/roller-ui/authoring/editors/editor-xinha.jsp Fri May 18 19:02:48 2007 @@ -15,35 +15,33 @@ copyright in this work, please see the NOTICE file in the top level directory of this distribution. --%> -<%-- This page is designed to be included in edit-weblog.jsp --%> -<%@ include file="/WEB-INF/jsps/taglibs.jsp" %> +<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> <script type="text/javascript"> <!-- function postWeblogEntry() { - document.weblogEntryFormEx.text.value = xinha_editors.xe_content.getHTML().trim(); + document.weblogEntryFormEx.text.value = xinha_editors.xe_content.getHTML().trim(); document.weblogEntryFormEx.summary.value = xinha_editors.xe_summary.getHTML().trim(); - document.weblogEntryFormEx.submit(); } // (preferably absolute) URL (including trailing slash) where Xinha is installed -_editor_url = '<c:url value="/roller-ui/authoring/editors/xinha/" />' +_editor_url = '<s:url value="/roller-ui/authoring/editors/xinha/" />' // And the language we need to use in the editor. _editor_lang = "en"; --> </script> -<script type="text/javascript" src='<c:url value="/roller-ui/authoring/editors/xinha/htmlarea.js" />'></script> -<script type="text/javascript" src='<c:url value="/roller-ui/authoring/editors/xinha/my_config.js" />'></script> +<script type="text/javascript" src='<s:url value="/roller-ui/authoring/editors/xinha/htmlarea.js" />'></script> +<script type="text/javascript" src='<s:url value="/roller-ui/authoring/editors/xinha/my_config.js" />'></script> <noscript><p><b>Javascript must be enabled to use this form.</b></p></noscript> <%-- ===================================================================== --%> -<b><fmt:message key="weblogEdit.content" /></b><br /> -<html:textarea styleId="xe_content" property="text" rows="25" cols="50" style="width: 100%"></html:textarea> +<b><s:text name="weblogEdit.content" /></b><br /> +<s:textarea id="xe_content" name="bean.text" rows="25" cols="50" cssStyle="width: 100%" /> <%-- ===================================================================== --%> -<b><fmt:message key="weblogEdit.summary" /></b><br /> -<html:textarea styleId="xe_summary" property="summary" rows="10" cols="50" style="width: 100%"></html:textarea> +<b><s:text name="weblogEdit.summary" /></b><br /> +<s:textarea id="xe_summary" name="bean.summary" rows="10" cols="50" cssStyle="width: 100%" /> Modified: roller/branches/roller_4.0_newbackend/web/roller-ui/login-redirect.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/roller-ui/login-redirect.jsp?view=diff&rev=539673&r1=539672&r2=539673 ============================================================================== --- roller/branches/roller_4.0_newbackend/web/roller-ui/login-redirect.jsp (original) +++ roller/branches/roller_4.0_newbackend/web/roller-ui/login-redirect.jsp Fri May 18 19:02:48 2007 @@ -26,9 +26,9 @@ if (websites.size() == 1) { WebsiteData website = (WebsiteData) websites.get(0); - response.sendRedirect(request.getContextPath()+"/roller-ui/authoring/weblog.do?method=create&weblog="+website.getHandle()); + response.sendRedirect(request.getContextPath()+"/roller-ui/authoring/entryAdd.rol&weblog="+website.getHandle()); } else { - response.sendRedirect(request.getContextPath()+"/roller-ui/yourWebsites.do"); + response.sendRedirect(request.getContextPath()+"/roller-ui/menu.rol"); } %>
