roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r529793 [2/2] - in /roller/trunk: metadata/xdoclet/ src/org/apache/roller/ui/core/struts2/ src/org/apache/roller/ui/core/util/ src/org/apache/roller/ui/core/util/struts2/ web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/jsps/ web/WEB-INF/jsps/...
Date Tue, 17 Apr 2007 22:23:55 GMT
Added: roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,108 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<script type="text/javascript">
+<!--
+function previewImage(theme) {
+    document.preview.src="/themes/" + theme + "/sm-theme-" + theme + ".png";
+}
+function handlePreview() {
+	previewSpan = document.getElementById("handlePreview");
+	var n1 = previewSpan.childNodes[0];
+    var n2 = document.createTextNode(document.createWebsiteForm.handle.value);
+    if (n1 == null) {
+	    previewSpan.appendChild(n2);
+    } else {
+	    previewSpan.replaceChild(n2, n1);
+    }
+}
+-->
+</script>
+
+<p class="subtitle"><s:text name="createWebsite.prompt" /></p>
+
+<br /> 
+
+<s:form action="createWeblog!save">
+
+<table class="formtable">
+
+<tr>
+    <td class="label"><label for="name" /><s:text name="createWebsite.name" /></label></td>
+    <td class="field"><s:textfield name="bean.name" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="createWebsite.tip.name" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="description" /><s:text name="createWebsite.description" /></td>
+    <td class="field"><s:textfield name="bean.description" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="createWebsite.tip.description" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="handle" /><s:text name="createWebsite.handle" /></label></td>
+    <td class="field">
+        <s:textfield name="bean.handle" size="30" maxlength="30" onkeyup="handlePreview()" /><br />
+        <span style="text-size:70%">
+            <s:text name="createWebsite.weblogUrl" />:&nbsp;
+            <%-- <c:out value="${model.absoluteURL}" /> --%>/<span id="handlePreview" style="color:red">handle</span>
+        </span>
+    </td>
+    <td class="description"><s:text name="createWebsite.tip.handle" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="emailAddress" /><s:text name="createWebsite.emailAddress" /></label></td>
+    <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="50" /></td>
+    <td class="description"><s:text name="createWebsite.tip.email" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="locale" /><s:text name="createWebsite.locale" /></label></td>
+    <td class="field">
+       <s:select name="bean.locale" size="1" list="localesMap" />   
+    </td>
+    <td class="description"><s:text name="createWebsite.tip.locale" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="timeZone" /><s:text name="createWebsite.timeZone" /></label></td>
+    <td class="field">
+       <s:select name="bean.timeZone" size="1" list="timeZonesMap" />
+    </td>
+    <td class="description"><s:text name="createWebsite.tip.timezone" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="theme" /><s:text name="createWebsite.theme" /></label></td>
+    <td class="field">
+        <s:select name="bean.theme" size="1" list="themes" listKey="id" listValue="name" onchange="previewImage(this[selectedIndex].value)"/>
+       <br />
+       <br />
+       <img name="preview" src='/themes/<s:property value="themes[0].id"/>/sm-theme-<s:property value="themes[0].id"/>.png' />
+    </td>
+    <td class="description"><s:text name="createWebsite.tip.theme" /></td>
+</tr>
+</table>
+
+<br />
+   
+<s:submit key="createWebsite.button.save" />
+<s:submit key="createWebsite.button.cancel" action="createWeblog!cancel" />
+    
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/core/struts2/Login.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/Login.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/Login.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/Login.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,90 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+-->
+
+<%-- Body of the login page, invoked from login.jsp --%>
+
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<p><s:text name="loginPage.prompt" /></p>
+
+<form method="post" id="loginForm" 
+      action="<c:url value="/roller_j_security_check"/>"
+      onsubmit="saveUsername(this)">
+      
+    <table>
+        
+        <tr>
+            <th><s:text name="loginPage.userName" />:</th>
+            <td>
+                <input type="text" name="j_username" id="j_username" size="25" />
+            </td>
+        </tr>
+        
+        <tr>
+            <th><s:text name="loginPage.password" />:</th>
+            <td>
+                <input type="password" name="j_password" id="j_password" size="20" />
+            </td>
+        </tr>
+        
+        <c:if test="${rememberMeEnabled}">
+        <tr>
+            <td></td>
+            <td>
+                <input type="checkbox" name="rememberMe" id="rememberMe" />
+                <label for="rememberMe">
+                    <s:text name="loginPage.rememberMe" />
+                </label>
+            </td>
+        </tr>
+        </c:if>
+        
+        <tr>
+            <td></td>
+            <td>
+                <input type="submit" name="login" id="login" value="<s:text name="loginPage.login" />" />
+                <input type="reset" name="reset" id="reset" value="<s:text name="loginPage.reset" />" 
+                    onclick="document.getElementById('j_username').focus()" />
+            </td>
+        </tr>
+        
+    </table>
+    
+</form>
+
+<script type="text/javascript">
+<!--
+
+if (document.getElementById) {
+    if (getCookie("username") != null) {
+        if (document.getElementById) {
+            document.getElementById("j_username").value = getCookie("username");
+            document.getElementById("j_password").focus();
+        }
+    } else {
+        document.getElementById("j_username").focus();
+    }
+}
+
+function saveUsername(theForm) {
+    var expires = new Date();
+    expires.setTime(expires.getTime() + 24 * 30 * 60 * 60 * 1000); // sets it for approx 30 days.
+    setCookie("username",theForm.j_username.value,expires);
+}
+//-->
+</script>

Added: roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,166 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<%-- PROMPT: Welcome... you have no blog --%>
+<s:if test="existingPermissions.isEmpty && pendingPermissions.isEmpty"> 
+    <p><s:text name="yourWebsites.prompt.noBlog" />
+    <a href="<s:url action="createWeblog"/>"><s:text name="yourWebsites.createOne" /></a></p>
+</s:if>    
+
+<%-- PROMPT: You have invitation(s) --%>
+<s:elseif test="! pendingPermissions.isEmpty">
+    <p><s:text name="yourWebsites.invitationsPrompt" /></p>
+    
+    <s:iterator id="invite" value="pendingPermissions">
+        <s:text name="yourWebsites.youAreInvited" >
+            <s:param value="invite.website.handle" />
+        </s:text>
+        
+        <s:url action="menu!accept" id="acceptInvite">
+            <s:param name="inviteId" value="invite.id" />
+        </s:url>
+        <a href='<s:property value="acceptInvite" />'>
+            <s:text name="yourWebsites.accept" />
+        </a> 
+        &nbsp;|&nbsp;
+        <s:url action="menu!decline" id="declineInvite">
+            <s:param name="inviteId" value="invite.id" />
+        </s:url>
+        <a href='<s:property value="declineInvite" />'>
+            <s:text name="yourWebsites.decline" />
+        </a><br />
+    </s:iterator>
+    <br />
+</s:elseif>
+
+<%-- PROMPT: default ... select a weblog to edit --%>
+<s:else> 
+    <p class="subtitle"><s:text name="yourWebsites.prompt.hasBlog" /></p>        
+</s:else>
+
+<%-- if we have weblogs, then loop through and list them --%>
+<s:if test="! existingPermissions.isEmpty">
+    
+    <s:iterator id="perms" value="existingPermissions">
+
+        <div class="yourWeblogBox">  
+
+            <span class="mm_weblog_name"><img src='<c:url value="/images/folder.png"/>' />&nbsp;<s:property value="#perms.website.name" /></span>
+                
+            <table class="mm_table" width="100%" cellpadding="0" cellspacing="0">
+               <tr>
+               <td valign="top">
+
+                   <table cellpadding="0" cellspacing="0">
+                       
+                       <tr>
+                           <td class="mm_subtable_label"><s:text name='yourWebsites.weblog' /></td>
+                           <td><a href='<s:property value="#perms.website.URL" />'>
+                               <s:property value="#perms.website.absoluteURL" />
+                           </a></td>                          
+                       </tr>
+                       
+                       <tr>
+                           <td class="mm_subtable_label"><s:text name='yourWebsites.permission' /></td>
+                           <td><s:if test="#perms.permissionMask == 0" >LIMITED</s:if>
+                           <s:if test="#perms.permissionMask == 1" >AUTHOR</s:if>
+                           <s:if test="#perms.permissionMask == 3" >ADMIN</s:if></td>
+                       </tr>
+                       
+                       <tr>
+                           <td class="mm_subtable_label"><s:text name='yourWebsites.description' /></td>   
+                           <td><s:property value="#perms.website.description" escape="false" /></td>
+                       </tr>
+
+                       <tr>
+                           <td class="mm_subtable_label"><s:text name='yourWebsites.userCount' /></td>   
+                           <td><s:property value="#perms.website.userCount" /></td>
+                       </tr>
+
+                       <tr>
+                           <td class="mm_subtable_label"><s:text name='yourWebsites.todaysHits' /></td>   
+                           <td><s:property value="#perms.website.todaysHits" /></td>
+                       </tr>
+                       
+                   </table>
+
+               </td>
+               
+               <td class="mm_table_actions" width="20%" align="left" >
+
+                       <s:url action="weblog" id="newEntry">
+                           <s:param name="method" value="create" />
+                           <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>
+                       <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: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> 
+                       <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: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> 
+                       <br />
+                       
+                       <s:if test="#perms.permissionMask == 3">
+                           <s:url action="websiteSettings" id="manageWeblog">
+                               <s:param name="method" value="edit" />
+                               <s:param name="weblog" value="#perms.website.handle" />
+                           </s:url>
+                           <img src='<s:url value="/images/cog.png"/>' />
+                           <a href='<s:property value="manageWeblog" />'>
+                               <s:text name="yourWebsites.manage" /></a> 
+                           <br />
+                       </s:if>
+
+                       <%-- 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>
+                          <a href='<s:property value="resignWeblog" />'>
+                              <s:text name='yourWebsites.resign' />
+                          </a>
+                       </s:if>
+
+               </td>
+               </tr>
+            </table>
+            
+        </div>
+        
+    </s:iterator>
+
+</s:if>

Added: roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,52 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<div class="sidebarFade">
+    <div class="menu-tr">
+        <div class="menu-tl">
+            
+            <div class="sidebarInner">
+                <h3><s:text name="yourWebsites.actions" /></h3>
+                
+                <hr size="1" noshade="noshade" />
+                
+                <s:if test="groupBloggingEnabled || (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>
+                
+                <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">               
+                    <h3><a href="<s:url action="rollerConfig"/>"><s:text name="yourWebsites.globalAdmin" /></a></h3>          
+                    <p><s:text name="yourWebsites.globalAdmin.desc" /></p>
+                    
+                    <s:if test="planetAggregated">               
+                        <h3><a href="<s:url action="planetConfig"/>"><s:text name="yourWebsites.planetAdmin" /></a></h3>
+                        <p><s:text name="yourWebsites.planetAdmin.desc" /></p>
+                    </s:if>
+                </s:if>
+                
+                <br />
+            </div>
+            
+        </div>
+    </div>
+</div>	

Added: roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,81 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<p class="subtitle"><s:text name="yourProfile.description" /></p>
+
+<s:form action="profile!save">
+           
+<table class="formtable">
+
+<tr>
+    <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
+    <td class="field"><s:textfield name="bean.userName" readonly="true" /></td>
+    <td class="description"><s:text name="yourProfile.tip.userName" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
+    <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="userRegister.tip.fullName" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="passwordText" /><s:text name="userSettings.password" /></label></td>
+    <td class="field">
+        <s:password name="bean.passwordText" size="20" maxlength="20" />
+    </td>
+    <td class="description"><s:text name="userRegister.tip.password" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="passwordConfirm" /><s:text name="userSettings.passwordConfirm" /></label></td>
+    <td class="field"><s:password name="bean.passwordConfirm" size="20" maxlength="20" /></td>
+    <td class="description"><s:text name="userRegister.tip.passwordConfirm" /></td>
+</tr>
+    
+<tr>
+    <td class="label"><label for="emailAddress" /><s:text name="userSettings.email" /></label></td>
+    <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="40" /></td>
+    <td class="description"><s:text name="userRegister.tip.email" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="locale" /><s:text name="userSettings.locale" /></label></td>
+    <td class="field">
+       <s:select name="bean.locale" size="1" list="localesMap" />
+    </td>
+    <td class="description"><s:text name="userRegister.tip.locale" /></td>
+</tr>
+    
+<tr>
+    <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone" /></label></td>
+    <td class="field">
+       <s:select name="bean.timeZone" size="1" list="timeZonesMap" />
+    </td>
+    <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
+</tr>
+    
+</table>
+
+<br />
+
+<s:submit key="userSettings.button.save" />
+<s:submit key="userSettings.button.cancel" action="profile!cancel" />
+
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,93 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+-->
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<p><s:text name="userRegister.prompt" /></p>
+
+<s:form action="register!save" >
+    <s:hidden name="bean.id" />
+    <s:hidden name="bean.enabled" />
+
+<table class="formtable">
+
+<tr>
+    <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
+    <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="userRegister.tip.fullName" /></td>
+</tr>
+
+<s:if test="${fromSSO}">
+<tr>
+    <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
+    <td class="field"><strong><c:out value="${bean.userName}" /></strong></td>
+    <td class="description"><s:text name="userRegister.tip.userName" /></td>
+</tr>
+</s:if>
+<s:else>
+<tr>
+    <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
+    <td class="field"><s:textfield name="bean.userName" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="userRegister.tip.userName" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="passwordText" /><s:text name="userSettings.password" /></label></td>
+    <td class="field">
+       <s:password name="bean.passwordText" size="20" maxlength="20" />
+       <s:hidden name="bean.password" />
+   </td>
+    <td class="description"><s:text name="userRegister.tip.password" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="passwordConfirm" /><s:text name="userSettings.passwordConfirm" /></label></td>
+    <td class="field"><s:password name="bean.passwordConfirm" size="20" maxlength="20" /></td>
+    <td class="description"><s:text name="userRegister.tip.passwordConfirm" /></td>
+</tr>
+</s:else>
+
+<tr>
+    <td class="label"><label for="emailAddress" /><s:text name="userSettings.email" /></label></td>
+    <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="40" /></td>
+    <td class="description"><s:text name="userRegister.tip.email" /></td>
+</tr>
+
+<tr>
+    <td class="label"><label for="locale" /><s:text name="userSettings.locale" /></label></td>
+    <td class="field">
+       <s:select name="bean.locale" size="1" list="localesMap" />
+    </td>
+    <td class="description"><s:text name="userRegister.tip.locale" /></td>
+</tr>
+    
+<tr>
+    <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone" /></label></td>
+    <td class="field">
+       <s:select name="bean.timeZone" size="1" list="timeZonesMap" />
+    </td>
+    <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
+</tr>
+    
+</table>
+
+<br />
+
+<s:submit key="userRegister.button.save" />
+<s:submit key="userSettings.button.cancel" action="register!cancel" />
+    
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/core/struts2/Welcome.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/Welcome.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/Welcome.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/Welcome.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,39 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+-->
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<s:if test="activationStatus == null">
+    <p><s:text name="welcome.accountCreated" /></p>
+    <p><a href="<s:url action="login-redirect"/>" ><s:text name="welcome.clickHere" /></a>
+    <s:text name="welcome.toLoginAndPost" /></p>
+</s:if>
+
+<s:elseif test="activationStatus == 'pending'">
+    <p><s:text name="welcome.accountCreated" /></p>
+    <p><s:text name="welcome.user.account.not.activated" /></p>
+</s:elseif>
+
+<s:elseif test="activationStatus == 'active'">
+    <p><s:text name="welcome.user.account.activated" /></p>
+    <p><a href="<s:url action="login-redirect"/>" ><s:text name="welcome.clickHere" /></a>
+    <s:text name="welcome.toLoginAndPost" /></p>
+</s:elseif>
+
+<br />
+<br />
+<br />

Added: roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,39 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<% response.setContentType("text/html; charset=UTF-8"); %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ page import="org.apache.roller.business.Roller" %>
+<%@ page import="org.apache.roller.business.RollerFactory" %>
+
+<%@ page import="org.apache.roller.pojos.UserData" %>
+<%@ page import="org.apache.roller.pojos.WebsiteData" %>
+<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
+
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+
+<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerSession" %>
+
+<%@ 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="/struts-tags" prefix="s" %>
\ No newline at end of file

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/banner.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/banner.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/banner.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/banner.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,17 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
\ No newline at end of file

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,71 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%
+String absURL = RollerRuntimeConfig.getAbsoluteContextURL();
+boolean allowNewUsers = RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
+String customRegUrl = RollerRuntimeConfig.getProperty("users.registration.url");
+if(customRegUrl != null && customRegUrl.trim().equals(""))
+    customRegUrl = null;
+%>
+<div class="bannerStatusBox">
+    
+    <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
+        <tr>
+            <td class="bannerLeft">
+                
+                <s:if test="authenticatedUser != null">
+                    <s:text name="mainPage.loggedInAs" />
+                    <a href="<s:url action="profile"/>"><s:property value="authenticatedUser.userName"/></a>
+                </s:if>
+                
+                
+                <s:if test="actionWeblog != null">
+                    - <s:text name="mainPage.currentWebsite" />
+                    <b><a href='<s:property value="actionWeblog.absoluteURL" />'>
+                            <s:property value="actionWeblog.handle" />
+                    </a></b>
+                    
+                </s:if>
+                
+            </td>
+            
+            <td class="bannerRight">
+                
+                <a href="<s:url value="/"/>"><%= RollerRuntimeConfig.getProperty("site.shortName") %></a>
+                
+                | <a href="<s:url action="menu"/>"><s:text name="mainPage.mainMenu" /></a>
+                
+                <s:if test="authenticatedUser != null">
+                    | <a href="<s:url action="logout"/>"><s:text name="navigationBar.logout"/></a>
+                </s:if>
+                <s:else>
+                    | <a href="<s:url action="login-redirect"/>"><s:text name="navigationBar.login"/></a>
+                    
+                    <% if(allowNewUsers) { %>
+                    | <a href="<s:url action="register"/>"><s:text name="navigationBar.register"/></a>
+                    <% } else if(customRegUrl != null) { %>
+                    | <a href="<%= customRegUrl %>"><s:text name="navigationBar.register"/></a>
+                    <% } %>
+                </s:else>
+                
+            </td>
+        </tr>
+    </table>
+    
+</div>

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,22 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+#centercontent_wrap {
+    width: 100%;
+}
+
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,24 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+#centercontent_wrap {
+    width: 70%;
+}
+#rightcontent_wrap {
+    width: 29%;
+}
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,22 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+
+<%-- empty tile --%>
+
+
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,33 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+Powered by <a href="http://www.rollerweblogger.org">Apache Roller</a> 
+<%= RollerFactory.getRoller().getVersion() %> |
+
+<a href="http://opensource2.atlassian.com/projects/roller/">
+    <s:text name="footer.reportIssue" /></a> | 
+
+<a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+User+Documentation">
+    <s:text name="footer.userGuide" /></a> | 
+
+<a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">
+    <s:text name="footer.mailingLists" /></a>
+
+
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,31 @@
+<%-- 
+This default stuff goes in the HTML head element of each page
+You can override it with your own file via WEB-INF/tiles-def.xml
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/layout.css"/>'>
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/roller.css"/>'>   
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/menu.css"/>'>
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/calendar.css"/>'>
+      
+<% String theme = RollerConfig.getProperty("editor.theme"); %>
+
+<link rel="stylesheet" type="text/css" media="all" 
+    href="<%= request.getContextPath() %>/roller-ui/theme/<%= theme %>/colors.css" />  
+
+<script type="text/javascript" 
+    src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>   
+<script type="text/javascript" 
+    src='<c:url value="/roller-ui/scripts/calendar.js"/>'></script>
+<script type="text/javascript" 
+    src='<c:url value="/roller-ui/scripts/overlib.js"/>'>
+    <!-- overLIB (c) Erik Bosrup -->
+</script>  
+
+
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,23 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
+
+<roller:Menu model="admin-menu.xml" view="templates/menu/menu-tabbed.vm" />
+
+
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,22 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
+
+<roller:Menu model="editor-menu.xml" view="templates/menu/menu-tabbed.vm" />
+
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,45 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ 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">
+        <s:actionmessage />
+    </div>
+</s:if>
+
+<%-- Error Messages --%>
+<s:if test="! actionErrors.isEmpty">
+    <div id="errors" class="errors">
+        <s:actionerror />
+    </div>
+</s:if>

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/search.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/search.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/search.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/search.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,53 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<div class="searchSidebarHead">
+    <div class="menu-tr">
+        <div class="menu-tl">
+           <h3>&nbsp;</h3>
+        </div>
+    </div>
+</div>
+
+<div class="searchSidebarBody">
+
+     <h3><s:text name="mainPage.searchWeblogs" /></h3>
+
+     <form id="searchForm" method="get"
+        action="<c:out value="${baseURL}" />/sitesearch.do"
+        style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
+        <input type="text" id="q" name="q" size="20"
+            maxlength="255" value="<c:out value="${param.q}" />" />
+        <input value="&nbsp;ยป&nbsp;" class="searchButton" type="submit">
+     </form>
+     <script type="text/javascript"> 
+        // <!--
+        function validateSearch(form) {
+            if (form.q.value == "") {
+                alert("Please enter a search term to continue.");
+                form.q.focus();
+                return false;
+            }
+            return true;
+        } 
+        // -->
+     </script>
+
+</div>
+

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,85 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-error.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>
+                </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>
+            
+            <tiles:insert attribute="content" />    
+        </div>
+    </div>
+    
+    <div id="rightcontent_wrap">
+        <div id="rightcontent"> 
+        </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>
+</html>

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,64 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ 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><%= RollerRuntimeConfig.getProperty("site.shortName") %>: <s:property value="pageTitle" /></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insertAttribute name="head" />     
+<style type="text/css">
+<tiles:insertAttribute name="styles" />
+</style>
+</head>
+<body>
+
+<div id="banner">
+    <tiles:insertAttribute name="bannerStatus" />
+</div>
+
+<div id="content">
+    <div id="leftcontent_wrap">
+        <div id="leftcontent"> 
+        </div>
+    </div>
+    
+    <div id="centercontent_wrap">
+        <div id="centercontent">   
+            <h1><s:property value="pageTitle" /></h1>
+            <tiles:insertAttribute name="messages" /> 
+            <tiles:insertAttribute name="content" />    
+        </div>
+    </div>
+    
+    <div id="rightcontent_wrap">
+        <div id="rightcontent"> 
+            <tiles:insertAttribute name="sidebar" />
+        </div>
+    </div>
+</div>
+
+<div id="footer">
+    <tiles:insertAttribute name="footer" />
+</div>
+
+<div id="datetagdiv" 
+   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+</div>
+</body>
+</html>

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,64 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ 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><%= RollerRuntimeConfig.getProperty("site.shortName") %>: <s:property value="pageTitle" /></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insertAttribute name="head" />
+<style type="text/css">
+<tiles:insertAttribute name="styles" />
+</style>
+</head>
+<body>
+
+<div id="banner">
+    <tiles:insertAttribute name="banner" />
+    <tiles:insertAttribute name="bannerStatus" />
+</div>
+    
+<div id="wrapper"> 
+    <div id="leftcontent_wrap">
+        <div id="leftcontent"> 
+        </div>
+    </div>
+    
+    <div id="centercontent_wrap">
+        <div id="centercontent">   
+            <h1><s:property value="pageTitle" /></h1>
+            <tiles:insertAttribute name="messages" />
+            <tiles:insertAttribute name="content" />
+        </div>
+    </div>
+    
+    <div id="rightcontent_wrap">
+        <div id="rightcontent"> 
+        </div>
+    </div>
+</div>
+
+<div id="footer">
+    <tiles:insertAttribute name="footer" />
+</div>
+
+<div id="datetagdiv" 
+   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+</div>
+</body>
+</html>

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,68 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ 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><%= RollerRuntimeConfig.getProperty("site.shortName") %>: <s:property value="pageTitle" /></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insertAttribute name="head" />     
+<style type="text/css">
+<tiles:insertAttribute name="styles" />
+</style>
+</head>
+<body>
+
+<div id="banner">
+        <tiles:insertAttribute name="bannerStatus" />
+</div>
+    
+<div id="menu">
+        <h1><s:property value="pageTitle" /></h1>
+        <tiles:insertAttribute name="menu" />
+</div>
+    
+<div id="content"> 
+    <div id="leftcontent_wrap">
+        <div id="leftcontent"> 
+        </div>
+    </div>
+    
+    <div id="centercontent_wrap">
+        <div id="centercontent">   
+            <tiles:insertAttribute name="messages" /> 
+            <tiles:insertAttribute name="content" />    
+        </div>
+    </div>
+    
+    <div id="rightcontent_wrap">
+        <div id="rightcontent"> 
+            <tiles:insertAttribute name="sidebar" />
+        </div>
+    </div>
+</div>
+
+<div id="footer">
+    <tiles:insertAttribute name="footer" />
+</div>
+
+<div id="datetagdiv" 
+   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+</div>
+</body>
+</html>

Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/title.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/title.jsp?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/title.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/title.jsp Tue Apr 17 15:23:45 2007
@@ -0,0 +1,20 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<h1><c:out value="${siteTitle}" /></h1>
+<p class="subtitle"><c:out value="${siteDescription}" /></p>

Modified: roller/trunk/web/WEB-INF/security.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/security.xml?view=diff&rev=529793&r1=529792&r2=529793
==============================================================================
--- roller/trunk/web/WEB-INF/security.xml (original)
+++ roller/trunk/web/WEB-INF/security.xml Tue Apr 17 15:23:45 2007
@@ -50,6 +50,10 @@
                 /roller-ui/authoring/**=admin,editor
                 /roller-ui/admin/**=admin
                 /rewrite-status*=admin
+                /roller-ui/login-redirect=admin,editor
+                /roller-ui/profile**=admin,editor
+                /roller-ui/createWeblog**=admin,editor
+                /roller-ui/menu**=admin,editor
             </value>
                 <!-- Add this to above list for LDAP/SSO configuration -->
                 <!-- /roller-ui/user.do*=register -->

Added: roller/trunk/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/tiles.xml?view=auto&rev=529793
==============================================================================
--- roller/trunk/web/WEB-INF/tiles.xml (added)
+++ roller/trunk/web/WEB-INF/tiles.xml Tue Apr 17 15:23:45 2007
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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.
+-->
+<!DOCTYPE tiles-definitions PUBLIC
+    "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/tiles-config_2_0.dtd">
+<tiles-definitions>
+    
+    <definition name=".tiles-mainmenupage" template="/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp">
+        <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
+        <put name="head"         value="/WEB-INF/jsps/tiles/struts2/head.jsp" />
+        <put name="styles"       value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
+        <put name="messages"     value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
+        <put name="content"      value="${content}" />
+        <put name="sidebar"      value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
+        <put name="footer"       value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
+    </definition>
+    
+    <definition name=".tiles-tabbedpage" template="/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp">
+        <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
+        <put name="head"         value="/WEB-INF/jsps/tiles/struts2/head.jsp" />
+        <put name="styles"       value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
+        <put name="menu"         value="${menu}" />
+        <put name="messages"     value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
+        <put name="content"      value="${content}" />
+        <put name="sidebar"      value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
+        <put name="footer"       value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
+    </definition>
+    
+    <definition name=".tiles-simplepage" template="/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp">
+        <put name="banner"       value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
+        <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
+        <put name="head"         value="/WEB-INF/jsps/tiles/struts2/head.jsp" />
+        <put name="styles"       value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.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>
+    
+    <definition name=".tiles-editorpage" extends=".tiles-tabbedpage" >
+        <put name="menu" value="/WEB-INF/jsps/tiles/struts2/menu-editor.jsp" />
+    </definition>
+    
+    <definition name=".tiles-adminpage" extends=".tiles-tabbedpage" >
+        <put name="menu" value="/WEB-INF/jsps/tiles/struts2/menu-admin.jsp" />
+    </definition>
+    
+    
+    <!-- core pages (and associates) -->
+    <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>
+    
+    <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>
+    
+    <definition name=".CreateWeblogForm" extends=".tiles-simplepage" >
+        <put name="content" value="/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp" />
+    </definition>
+    
+    <definition name=".MainMenu" extends=".tiles-mainmenupage" >
+        <put name="content" value="/WEB-INF/jsps/core/struts2/MainMenu.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    
+    
+    <!-- weblog editor pages (and associates) -->
+    <definition name=".WeblogEdit" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEdit.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".WeblogEntryManagement" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".CommentManagement" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".CategoriesForm" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CategoriesForm.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/CategoriesSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".referers" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/referers.jsp" />
+    </definition>
+    <definition name=".BookmarksForm" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/BookmarksForm.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/BookmarksSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".upload-file" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/UploadFile.jsp" />
+    </definition>
+    
+    <!-- subpages -->
+    <definition name=".WeblogEntryRemove" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".CategoryForm" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CategoryForm.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".CategoryDeleteOK" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".BookmarkForm" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/BookmarkForm.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".FolderForm" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/FolderForm.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".import" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/import.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    
+    <!-- weblog admin pages (and associates) -->
+    <definition name=".edit-website" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/edit-website.jsp" />
+    </definition>
+    <definition name=".theme-editor" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/theme-editor.jsp" />
+    </definition>
+    <definition name=".edit-pages" extends=".tiles-editorpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/edit-pages.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".CommentManagementGlobal" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".MemberPermissions" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/MemberPermissions.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    <definition name=".CustomPingTargets" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargets.jsp" />
+    </definition>
+    <definition name=".PingResult" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/PingResult.jsp" />
+    </definition>
+    <definition name=".Pings" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/Pings.jsp" />
+    </definition>
+    <definition name=".Maintenance" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/Maintenance.jsp" />
+    </definition>
+    
+    <!-- subpages -->
+    <definition name=".WebsiteRemove" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WebsiteRemove.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".InviteMember" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/InviteMember.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".InviteMemberDone" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/InviteMemberDone.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".CustomPingTargetDeleteOK" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".CustomPingTargetEdit" extends=".tiles-editorpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".edit-page" extends=".tiles-editorpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/edit-page.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".remove-page" extends=".tiles-editorpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/remove-page.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".Invitations" extends=".tiles-editorpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/Invitations.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    
+    
+    <!-- global admin pages (and associates) -->
+    <definition name=".rollerProperties" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/rollerProperties.jsp" />
+    </definition>
+    <definition name=".UserAdmin" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/UserAdmin.jsp" />
+    </definition>
+    <definition name=".CommonPingTargets" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargets.jsp" />
+    </definition>
+    <definition name=".cacheInfo" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/cacheInfo.jsp" />
+    </definition>
+    
+    <definition name=".CommonPingTargetDeleteOK" extends=".tiles-simplepage" >
+        <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp" />
+    </definition>
+    <definition name=".CommonPingTargetEdit" extends=".tiles-simplepage" >
+        <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp" />
+    </definition>
+    
+    <definition name=".PlanetSubscriptions" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetSubscriptions.jsp" />
+    </definition>
+    <definition name=".PlanetConfig" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetConfig.jsp" />
+    </definition>
+    <definition name=".PlanetGroups" extends=".tiles-adminpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetGroups.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>



Mime
View raw message