You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2005/09/26 06:44:09 UTC
svn commit: r291557 - in /incubator/roller/branches/roller_2.0/web:
WEB-INF/tiles-defs.xml loginBody.jsp
Author: agilliland
Date: Sun Sep 25 21:44:06 2005
New Revision: 291557
URL: http://svn.apache.org/viewcvs?rev=291557&view=rev
Log:
a few tweaks to tiles defs.
move "error" message div up a bit on login page.
Modified:
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/loginBody.jsp
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=291557&r1=291556&r2=291557&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Sun Sep 25 21:44:06 2005
@@ -9,11 +9,11 @@
<put name="title" value="/theme/title.jsp" />
<put name="bannerStatus" value="/theme/bannerStatus.jsp" />
<put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/css-banner.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
<put name="content" value="${content}" />
<put name="search" value="/theme/search.jsp" />
<put name="sidebar" value="/theme/empty.jsp" />
- <put name="footer" value="/theme/footerMain.jsp" />
+ <put name="footer" value="/theme/footer.jsp" />
</definition>
<definition name=".tiles-mainmenupage" path="/theme/tiles-mainmenupage.jsp">
@@ -71,7 +71,7 @@
<definition name=".YourWebsites" extends=".tiles-mainmenupage" >
<put name="content" value="/website/YourWebsites.jsp" />
<put name="sidebar" value="/website/YourWebsitesSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-high.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".YourProfile" extends=".tiles-simplepage" >
Modified: incubator/roller/branches/roller_2.0/web/loginBody.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/loginBody.jsp?rev=291557&r1=291556&r2=291557&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/loginBody.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/loginBody.jsp Sun Sep 25 21:44:06 2005
@@ -5,24 +5,18 @@
<h1><fmt:message key="loginPage.title" /></h1>
-<p style="border-top: 1px grey solid"><fmt:message key="loginPage.prompt" /></p>
-
+<p><fmt:message key="loginPage.prompt" /></p>
+
+<logic:present parameter="error">
+ <div class="error" style="margin-bottom: 15px"><bean:message key="error.password.mismatch"/></div>
+</logic:present>
+
<form method="post"
id="loginForm"
action="<c:url value="/auth/"/>"
onsubmit="saveUsername(this)">
<table>
-
- <tr>
- <td colspan="2">
- <logic:present parameter="error">
- <div class="error">
- <bean:message key="error.password.mismatch"/>
- </div>
- </logic:present>
- </td>
- </tr>
<tr>
<th><fmt:message key="loginPage.userName" />:</th>