Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp Tue Jun 5 16:15:47 2007 @@ -28,25 +28,19 @@ window.open('<s:url value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+selector.options[selected].value, '_preview', ''); } -function toggleThemeOptioner() { - // just call toggle on both theme optioner choices - new Effect.toggle('sharedThemeOptioner', 'appear'); - new Effect.toggle('customThemeOptioner', 'appear'); -} - function updateThemeChooser(selected) { if(selected.value == 'shared') { - selectedChooser = document.getElementById('sharedChooser'); - selectedOptioner = document.getElementById('sharedOptioner'); + selectedChooser = $('sharedChooser'); + selectedOptioner = $('sharedOptioner'); - otherChooser = document.getElementById('customChooser'); - otherOptioner = document.getElementById('customOptioner'); + otherChooser = $('customChooser'); + otherOptioner = $('customOptioner'); } else { - selectedChooser = document.getElementById('customChooser'); - selectedOptioner = document.getElementById('customOptioner'); + selectedChooser = $('customChooser'); + selectedOptioner = $('customOptioner'); - otherChooser = document.getElementById('sharedChooser'); - otherOptioner = document.getElementById('sharedOptioner'); + otherChooser = $('sharedChooser'); + otherOptioner = $('sharedOptioner'); } // update styling on chooser @@ -56,8 +50,8 @@ otherChooser.style.border="1px solid grey"; // update display of selected optioner - otherOptioner.style.display="none"; - selectedOptioner.style.display="block"; + otherOptioner.hide(); + selectedOptioner.show(); } --> </script> @@ -92,22 +86,22 @@ <p><s:text name="themeEditor.yourCurrentTheme" />: <b><s:property value="actionWeblog.theme.name"/></b></p> <p> - <s:select id="sharedSelector" name="themeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage(document.getElementById('sharedPreviewImg'), this[selectedIndex].value)"/> + <s:select id="sharedSelector" name="themeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage($('sharedPreviewImg'), this[selectedIndex].value)"/> </p> <p> <img id="sharedPreviewImg" src="" /> <!-- initialize preview image at page load --> <script type="text/javascript"> <s:if test="customTheme"> - previewImage(document.getElementById('sharedPreviewImg'), '<s:property value="themes[0].id"/>'); + previewImage($('sharedPreviewImg'), '<s:property value="themes[0].id"/>'); </s:if> <s:else> - previewImage(document.getElementById('sharedPreviewImg'), '<s:property value="themeId"/>'); + previewImage($('sharedPreviewImg'), '<s:property value="themeId"/>'); </s:else> </script> </p> <p> - » <a href="#" onclick="fullPreview(document.getElementById('sharedSelector'))"><s:text name="themeEditor.previewLink" /></a><br/> + » <a href="#" onclick="fullPreview($('sharedSelector'))"><s:text name="themeEditor.previewLink" /></a><br/> <s:text name="themeEditor.previewDescription" /> </p> @@ -129,17 +123,17 @@ <span class="warning"><s:text name="themeEditor.importWarning" /></span> </p> <p> - <s:select id="customSelector" name="importThemeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage(document.getElementById('customPreviewImg'), this[selectedIndex].value)"/> + <s:select id="customSelector" name="importThemeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage($('customPreviewImg'), this[selectedIndex].value)"/> </p> <p> <img id="customPreviewImg" src="" /> <!-- initialize preview image at page load --> <script type="text/javascript"> - previewImage(document.getElementById('customPreviewImg'), '<s:property value="themes[0].id"/>'); + previewImage($('customPreviewImg'), '<s:property value="themes[0].id"/>'); </script> </p> <p> - » <a href="#" onclick="fullPreview(document.getElementById('customSelector'))"><s:text name="themeEditor.previewLink" /></a><br/> + » <a href="#" onclick="fullPreview($('customSelector'))"><s:text name="themeEditor.previewLink" /></a><br/> <s:text name="themeEditor.previewDescription" /> </p> <p><s:submit key="themeEditor.save" /></p> @@ -150,9 +144,9 @@ <%-- initializes the chooser/optioner display at page load time --%> <script type="text/javascript"> <s:if test="customTheme"> - updateThemeChooser(document.getElementById('customRadio')); + updateThemeChooser($('customRadio')); </s:if> <s:else> - updateThemeChooser(document.getElementById('sharedRadio')); + updateThemeChooser($('sharedRadio')); </s:else> </script>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp Tue Jun 5 16:15:47 2007 @@ -24,8 +24,8 @@ } function fullPreview() { - selected=document.getElementById('themeEdit_themeId').selectedIndex; - window.open('<s:url value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+document.getElementById('themeEdit_themeId').options[selected].value, '_preview', ''); + selected=$('themeEdit_themeId').selectedIndex; + window.open('<s:url value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+$('themeEdit_themeId').options[selected].value, '_preview', ''); } --> </script> @@ -44,13 +44,13 @@ <div> <p> - <s:select name="themeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage(document.getElementById('previewImg'), this[selectedIndex].value)"/> + <s:select name="themeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage($('previewImg'), this[selectedIndex].value)"/> </p> <p> <img id="previewImg" src="" /> <!-- initialize preview image at page load --> <script type="text/javascript"> - previewImage(document.getElementById('previewImg'), '<s:property value="themeId"/>'); + previewImage($('previewImg'), '<s:property value="themeId"/>'); </script> </p> <p> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp Tue Jun 5 16:15:47 2007 @@ -16,31 +16,40 @@ directory of this distribution. --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<h2 class="error"><s:text name="error.title.403" /></h2> - -<c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" /> -<c:set var="message" value="${requestScope['javax.servlet.error.message']}" /> -<c:set var="type" value="${requestScope['javax.servlet.error.type']}" /> - -<table width="80%" border="1px" style="border-collapse: collapse;"> - <tr> - <td width="20%">Status Code</td> - <td><c:out value="${status_code}" /></td> - </tr> - <tr> - <td width="20%">Message</td> - <td><c:out value="${message}" /></td> - </tr> - <tr> - <td width="20%">Type</td> - <td><c:out value="${type}" /></td> - </tr> - <tr> - <td width="20%">Exception</td> - <td><s:text name="error.text.403" /></td> - </tr> -</table> - -<br /> -<br /> +<!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><s:text name="error.title.403" /></title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + + <h2 class="error"><s:text name="error.title.403" /></h2> + + <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" /> + <c:set var="message" value="${requestScope['javax.servlet.error.message']}" /> + <c:set var="type" value="${requestScope['javax.servlet.error.type']}" /> + + <table width="80%" border="1px" style="border-collapse: collapse;"> + <tr> + <td width="20%">Status Code</td> + <td><c:out value="${status_code}" /></td> + </tr> + <tr> + <td width="20%">Message</td> + <td><c:out value="${message}" /></td> + </tr> + <tr> + <td width="20%">Type</td> + <td><c:out value="${type}" /></td> + </tr> + <tr> + <td width="20%">Exception</td> + <td><s:text name="error.text.403" /></td> + </tr> + </table> + + <br /> + <br /> + </body> +</html> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp Tue Jun 5 16:15:47 2007 @@ -16,31 +16,45 @@ directory of this distribution. --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<h2 class="error"><s:text name="error.title.404" /></h2> - -<c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" /> -<c:set var="message" value="${requestScope['javax.servlet.error.message']}" /> -<c:set var="type" value="${requestScope['javax.servlet.error.type']}" /> - -<table width="80%" border="1px" style="border-collapse: collapse;"> - <tr> - <td width="20%">Status Code</td> - <td><c:out value="${status_code}" /></td> - </tr> - <tr> - <td width="20%">Message</td> - <td><c:out value="${message}" /></td> - </tr> - <tr> - <td width="20%">Type</td> - <td><c:out value="${type}" /></td> - </tr> - <tr> - <td width="20%">Exception</td> - <td><s:text name="error.text.404" /></td> - </tr> -</table> - -<br /> -<br /> +<fmt:setBundle basename="ApplicationResources" /> +<!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><fmt:message key="error.title.404" /></title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + + <link rel="stylesheet" type="text/css" media="all" href='<c:url value="/roller-ui/styles/roller.css"/>' /> + </head> + <body> + + <div style="padding: 15px 25px 25px 25px"> + <h2 class="error"><fmt:message key="error.title.404" /></h2> + + <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" /> + <c:set var="message" value="${requestScope['javax.servlet.error.message']}" /> + <c:set var="type" value="${requestScope['javax.servlet.error.type']}" /> + + <table width="80%" border="1px" style="border-collapse: collapse;"> + <tr> + <td width="20%">Status Code</td> + <td><c:out value="${status_code}" /></td> + </tr> + <tr> + <td width="20%">Message</td> + <td><c:out value="${message}" /></td> + </tr> + <tr> + <td width="20%">Type</td> + <td><c:out value="${type}" /></td> + </tr> + <tr> + <td width="20%">Exception</td> + <td><fmt:message key="error.text.404" /></td> + </tr> + </table> + </div> + + <br /> + <br /> + </body> +</html> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp Tue Jun 5 16:15:47 2007 @@ -16,58 +16,45 @@ directory of this distribution. --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<h2 class="error"><s:text name="errorPage.title" /></h2> - -<s:if test="!getProp('site.debugMode')"> - <p><s:text name="errorPage.message" /></p> -</s:if> -<s:else> - - <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" /> - <c:set var="message" value="${requestScope['javax.servlet.error.message']}" /> - <c:set var="type" value="${requestScope['javax.servlet.error.type']}" /> - <c:set var="exception" value="${requestScope['javax.servlet.error.exception']}" /> - - <table width="80%" border="1px" style="border-collapse: collapse;"> - <tr> - <td width="20%">Status Code</td> - <td><c:out value="${status_code}" /></td> - </tr> - <tr> - <td width="20%">Message</td> - <td><c:out value="${message}" /></td> - </tr> - <tr> - <td width="20%">Type</td> - <td><c:out value="${type}" /></td> - </tr> - <tr> - <td width="20%">Exception</td> - <td><c:out value="${exception}" /></td> - </tr> - </table> - - <c:if test="${!empty exception}"> - <% - java.io.StringWriter sw = new java.io.StringWriter(); - Throwable t = (Throwable)pageContext.getAttribute("exception"); - if (t != null) { - t.printStackTrace(new java.io.PrintWriter(sw)); - String stackTrace = sw.toString(); - if (stackTrace.trim().length() > 0) { - %> - <p>Stack Trace:</p> - <form> - <textarea rows="30" style="font-size:8pt;width:80%"> - <%= stackTrace %> - </textarea> - </form> - <% } - } %> - </c:if> - - <br /> - <br /> - -</s:else> +<fmt:setBundle basename="ApplicationResources" /> +<!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><fmt:message key="errorPage.title" /></title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + + <link rel="stylesheet" type="text/css" media="all" href='<c:url value="/roller-ui/styles/roller.css"/>' /> + </head> + <body> + <div style="padding: 15px 25px 25px 25px"> + <h2 class="error"><fmt:message key="errorPage.title" /></h2> + + <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" /> + <c:set var="message" value="${requestScope['javax.servlet.error.message']}" /> + <c:set var="type" value="${requestScope['javax.servlet.error.type']}" /> + <c:set var="exception" value="${requestScope['javax.servlet.error.exception']}" /> + + <table width="80%" border="1px" style="border-collapse: collapse;"> + <tr> + <td width="20%">Status Code</td> + <td><c:out value="${status_code}" /></td> + </tr> + <tr> + <td width="20%">Message</td> + <td><c:out value="${message}" /></td> + </tr> + <tr> + <td width="20%">Type</td> + <td><c:out value="${type}" /></td> + </tr> + <tr> + <td width="20%">Exception</td> + <td><fmt:message key="errorPage.message" /></td> + </tr> + </table> + </div> + + <br /> + <br /> + </body> +</html> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp Tue Jun 5 16:15:47 2007 @@ -4,28 +4,20 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/layout.css"/>'> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/roller.css"/>'> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/menu.css"/>'> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/calendar.css"/>'> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' /> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' /> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' /> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/calendar.css"/>' /> <link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/roller-ui/theme/<s:property value="getProp('editor.theme')"/>/colors.css" /> -<script type="text/javascript" - src="<s:url value="/theme/scripts/roller.js"/>"></script> -<script type="text/javascript" - src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script> -<script type="text/javascript" - src='<s:url value="/roller-ui/scripts/overlib.js"/>'> - <!-- overLIB (c) Erik Bosrup --> -</script> +<script type="text/javascript" src="<s:url value="/theme/scripts/roller.js"/>"></script> +<script type="text/javascript" src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script> + +<%-- struts2 head disabled until we need it --%> +<%-- <s:head theme="ajax"/> --%> -<s:head theme="ajax"/> <script type="text/javascript" src="<s:url value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script> <script type="text/javascript" src="<s:url value="/roller-ui/scripts/scriptaculous/scriptaculous.js"/>" ></script> -<script type="text/javascript" src="<s:url value="/roller-ui/scripts/roller-autocomplete.js"/>" ></script> \ No newline at end of file +<script type="text/javascript" src="<s:url value="/roller-ui/scripts/roller-autocomplete.js"/>" ></script> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp Tue Jun 5 16:15:47 2007 @@ -4,23 +4,13 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/layout.css"/>'> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/roller.css"/>'> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/menu.css"/>'> -<link rel="stylesheet" type="text/css" media="all" - href='<s:url value="/roller-ui/styles/calendar.css"/>'> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' /> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' /> +<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' /> <link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/roller-ui/theme/<s:property value="getProp('editor.theme')"/>/colors.css" /> -<script type="text/javascript" - src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script> -<script type="text/javascript" - src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script> -<script type="text/javascript" - src='<s:url value="/roller-ui/scripts/overlib.js"/>'> - <!-- overLIB (c) Erik Bosrup --> -</script> +<script type="text/javascript" src="<s:url value="/theme/scripts/roller.js" />"></script> + +<script type="text/javascript" src="<s:url value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/messages.jsp URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/messages.jsp?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/messages.jsp (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/messages.jsp Tue Jun 5 16:15:47 2007 @@ -17,20 +17,6 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<script type="text/javascript"> -<!-- -function dirty() { - messages = document.getElementById("messages"); - if (messages != null) { - messages.className = "warnings"; - var n1 = messages.childNodes[0]; - var n2 = document.createTextNode("Unsaved changes"); - messages.replaceChild(n2, n1); - } -} ---> -</script> - <%-- Success Messages --%> <s:if test="!actionMessages.isEmpty"> <div id="messages" class="messages"> @@ -41,9 +27,15 @@ <%-- Error Messages --%> <s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty"> <div id="errors" class="errors"> - <s:actionerror /> - <s:iterator id="key" value="fieldErrors"> - <s:property value="#key.value" /> - </s:iterator> + <ul> + <s:iterator id="actionError" value="actionErrors"> + <li><s:property value="#actionError" /></li> + </s:iterator> + <s:iterator id="fieldErrorName" value="fieldErrors.keySet()"> + <s:iterator id="fieldErrorValue" value="fieldErrors[#fieldErrorName]"> + <li><s:property value="#fieldErrorValue" /></li> + </s:iterator> + </s:iterator> + </ul> </div> </s:if> Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml (original) +++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml Tue Jun 5 16:15:47 2007 @@ -64,15 +64,6 @@ <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) --> @@ -128,7 +119,7 @@ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> <put name="content" value="/WEB-INF/jsps/admin/GlobalCommentManagement.jsp" /> <put name="sidebar" value="/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp" /> </definition> <definition name=".CommonPingTargets" extends=".tiles-tabbedpage" > @@ -195,7 +186,7 @@ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" /> <put name="content" value="/WEB-INF/jsps/editor/Comments.jsp" /> <put name="sidebar" value="/WEB-INF/jsps/editor/CommentsSidebar.jsp" /> - <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" /> + <put name="styles" value="/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp" /> </definition> <definition name=".Categories" extends=".tiles-tabbedpage" > Modified: roller/branches/roller_guice/merges.txt URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/merges.txt?view=diff&rev=544674&r1=544673&r2=544674 ============================================================================== --- roller/branches/roller_guice/merges.txt (original) +++ roller/branches/roller_guice/merges.txt Tue Jun 5 16:15:47 2007 @@ -1,4 +1,8 @@ +June 5, 2007 +svn merge -r 544642:544667 https://svn.apache.org/repos/asf/roller/trunk +svn merge -r 544028:544642 https://svn.apache.org/repos/asf/roller/trunk + June 1-3, 2007 svn merge -r 543971:544028 https://svn.apache.org/repos/asf/roller/trunk svn merge -r 543970:543971 https://svn.apache.org/repos/asf/roller/trunk
