roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r533435 [2/2] - in /roller/trunk: src/org/apache/roller/ui/admin/struts2/ src/org/apache/roller/ui/authoring/struts2/ web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/jsps/admin/struts2/ web/WEB-INF/jsps/authoring/struts2/
Date Sat, 28 Apr 2007 22:20:03 GMT
Added: roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,82 @@
+<%--
+  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="configForm.subtitle" /></a>
+<p><s:text name="configForm.prompt" /></a>
+
+<s:form action="globalConfig!save">
+
+    <table class="formtableNoDesc">
+    
+    <s:iterator id="dg" value="globalConfigDef.displayGroups">
+    
+        <tr>
+            <td colspan="3"><h2><s:text name="%{#dg.key}" /></h2></td>
+        </tr>
+    
+        <s:iterator id="pd" value="#dg.propertyDefs">
+            
+            <tr>
+                <td class="label"><s:text name="%{#pd.key}" /></td>
+              
+                  <%-- "string" type means use a simple textbox --%>
+                  <s:if test="#pd.type == 'string'">
+                    <td class="field"><input type="text" name='<s:property value="#pd.name"/>' value='<s:property value="properties[#pd.name].value"/>' size="35" /></td>
+                  </s:if>
+                  
+                  <%-- "text" type means use a full textarea --%>
+                  <s:elseif test="#pd.type == 'text'">
+                    <td class="field">
+                      <textarea name='<s:property value="#pd.name"/>' rows="<s:property value="#pd.rows"/>" cols="<s:property value="#pd.cols"/>"><s:property value="properties[#pd.name].value"/></textarea>
+                    </td>
+                  </s:elseif>
+                  
+                  <%-- "boolean" type means use a checkbox --%>
+                  <s:elseif test="#pd.type == 'boolean'">
+                      <s:if test="properties[#pd.name].value == 'true'">
+                          <td class="field"><input type="checkbox" name='<s:property value="#pd.name"/>' CHECKED></td>
+                      </s:if>
+                      <s:else>
+                          <td class="field"><input type="checkbox" name='<s:property value="#pd.name"/>'></td>
+                      </s:else>
+                  </s:elseif>
+                  
+                  <%-- if it's something we don't understand then use textbox --%>
+                  <s:else>
+                    <td class="field"><input type="text" name='<s:property value="#pd.name"/>' size="50" /></td>
+                  </s:else>
+                
+                <td class="description"><%-- <s:text name="" /> --%></td>
+            </tr>
+          
+        </s:iterator>
+      
+        <tr>
+            <td colspan="2">&nbsp;</td>
+        </tr>
+        
+    </s:iterator>
+
+    </table>
+    
+    <div class="control">
+        <input class="buttonBox" type="submit" value="<s:text name="configForm.save"/>"/>
+    </div>
+    
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,141 @@
+<%--
+  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="userAdmin.subtitle.editUser" /></p>
+
+<s:form action="modifyUser!save">
+    <s:hidden name="bean.id" />
+    
+    <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="userAdmin.tip.fullName" /></td>
+        </tr>
+        
+        <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" readonly="true" cssStyle="background: #e5e5e5" /></td>
+            <td class="description"><s:text name="userAdmin.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.password" size="20" maxlength="20" /></td>
+            <td class="description"><s:text name="userAdmin.tip.password" /></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="userAdmin.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="localesList" listValue="displayName" />
+            </td>
+            <td class="description"><s:text name="userAdmin.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="timeZonesList" />
+            </td>
+            <td class="description"><s:text name="userAdmin.tip.timeZone" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="userEnabled" /><s:text name="userAdmin.enabled" /></label></td>
+            <td class="field">
+                <s:checkbox name="bean.enabled" />
+            </td>
+            <td class="description"><s:text name="userAdmin.tip.enabled" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="userAdmin" /><s:text name="userAdmin.userAdmin" /></label></td>
+            <td class="field">
+                <s:checkbox name="bean.administrator" />
+            </td>
+            <td class="description"><s:text name="userAdmin.tip.userAdmin" /></td>
+        </tr>
+        
+    </table>
+    
+    <br />
+    
+    <p class="subtitle"><s:text name="userAdmin.userWeblogs" /></p>
+    
+    <s:if test="!user.permissions.isEmpty"> 
+        
+        <p><s:text name="userAdmin.userMemberOf" /></p>  
+        <table class="rollertable" style="width: 80%">
+            <s:iterator id="perms" value="user.permissions">
+                <tr>
+                    <td width="%30">
+                        <a href='<s:property value="baseURL" />/<s:property value="#perms.website.handle" />'>
+                            <s:property value="#perms.website.name" /> [<s:property value="#perms.website.handle" />] 
+                        </a>
+                    </td>
+                    <td width="%15">
+                        <s:url action="postEntry" namespace="/roller-ui/authoring" id="newEntry">
+                            <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="newEntry" />'>
+                        <s:text name="userAdmin.newEntry" /></a>
+                    </td>
+                    <td width="%15">
+                        <s:url value="entries" namespace="/roller-ui/authoring" id="editEntries">
+                            <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="editEntries" />'>
+                        <s:text name="userAdmin.editEntries" /></a> 
+                    </td>
+                    <td width="%15">
+                        <s:url value="settings" namespace="/roller-ui/authoring" id="manageWeblog">
+                            <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="manageWeblog" />'>
+                        <s:text name="userAdmin.manage" /></a>
+                    </td>
+                </tr>
+            </s:iterator>    
+        </table>
+        
+    </s:if>
+    
+    <s:else>
+        <s:text name="userAdmin.userHasNoWeblogs" />
+    </s:else>
+    
+    <br />
+    <br />
+    
+    <div class="control">
+        <s:submit key="userAdmin.save" />
+        <s:submit key="application.cancel" action="modifyUser!cancel" />
+    </div>
+    
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/admin/struts2/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/admin/struts2/UserAdmin.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/admin/struts2/UserAdmin.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/admin/struts2/UserAdmin.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,48 @@
+<%--
+  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">
+<!-- //
+<%@ include file="/roller-ui/scripts/ajax-user.js" %>
+// -->
+</script> 
+
+<p class="subtitle"><s:text name="userAdmin.subtitle.searchUser" /></p>
+<p><s:text name="userAdmin.prompt.searchUser" /></p>
+
+<s:form action="modifyUser" method="GET">
+    
+    <span style="margin:4px"><s:text name="inviteMember.userName" /></span>
+    <input name="userName" id="userName" size="30" maxlength="30" 
+           onfocus="onUserNameFocus(null)" onkeyup="onUserNameChange(null)" 
+           style="margin:4px" />
+    <input type="submit" value='<s:text name="userAdmin.edit" />' 
+           style="margin:4px" />
+    <br />
+    <select id="userList" size="10" onchange="onUserSelected()" 
+            style="width:300px; margin:4px" ></select>
+    
+</s:form>
+
+<p class="subtitle"><s:text name="userAdmin.subtitle.userCreation" /></p>
+<s:text name="userAdmin.prompt.orYouCan" />
+<s:url action="createUser" id="createUser" />
+<a href="<s:property value="createUser" />">
+    <s:text name="userAdmin.prompt.createANewUser" />
+</a>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-form-ajax.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-form-ajax.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-form-ajax.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-form-ajax.jsp Sat Apr 28 15:20:00 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" %>
+
+<s:form action="templateAdd!save" theme="ajax">
+    <s:hidden name="weblog" value="%{actionWeblog.handle}"/>
+    
+    <s:textfield name="newTmplName" />
+    
+    <s:if test="availableActions.isEmpty">
+        <s:hidden name="newTmplAction" value="custom"/>
+        <s:submit type="button" notifyTopics="/refreshCustom" targets="addTmplForm"/>
+    </s:if>
+    <s:else>
+        <s:select name="newTmplAction" list="availableActions" size="1"/>
+        <s:submit type="button" notifyTopics="/refreshTheme" targets="addTmplForm"/>
+    </s:else>
+</s:form>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-success-ajax.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-success-ajax.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-success-ajax.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateAdd-success-ajax.jsp Sat Apr 28 15:20:00 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/authoring/struts2/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,305 @@
+<%--
+  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="pageForm.subtitle" >
+       <s:param value="bean.name" />
+       <s:param value="actionWeblog.handle" />
+   </s:text>
+</p>
+
+<s:if test="bean.required">
+    <p class="pagetip"><s:text name="pageForm.tip.required" /></p>
+</s:if>
+<s:else>
+    <p class="pagetip"><s:text name="pageForm.tip" /></p>
+</s:else>
+                
+<s:form action="template!save" id="template">
+    <s:hidden name="bean.id"/>
+    <s:hidden name="bean.decoratorName" />
+    <s:hidden name="bean.required" />
+    <s:hidden name="bean.action" />
+    <s:hidden name="weblog" value="%{actionWeblog.handle}" />
+    
+    <%-- ================================================================== --%>
+    <%-- Name, link and desription: disabled when page is a required page --%>
+    
+    <table cellspacing="5">
+        <tr>
+            <td class="label"><s:text name="pageForm.name" />&nbsp;</td>
+            <td class="field">
+                <s:if test="bean.required">
+                    <span class="fixedAttr"><s:property value="bean.name"/></span>
+                    <s:hidden name="bean.name" />
+                </s:if>
+                <s:else>
+                    <s:textfield name="bean.name" size="50"/>
+                </s:else>
+            </td>
+            <td class="description"></td>
+        </tr>
+        
+        <script type="text/javascript">
+        <!--
+        var weblogURL = '<s:property value="actionWeblog.absoluteURL" />';
+        var originalLink = '<s:property value="bean.link" />';
+        
+        // Update page URL when user changes link
+        function updatePageURLDisplay() {
+            var previewSpan = document.getElementById("handlePreview");
+            var n1 = previewSpan.firstChild;
+            var n2 = document.createTextNode(document.weblogTemplateFormEx.link.value);
+            if (n1 == null) {
+                previewSpan.appendChild(n2);
+            } else {
+                previewSpan.replaceChild(n2, n1);
+            }           
+        }
+        // Don't launch page if user has changed link, it'll be a 404
+        function launchPage() {
+            if (originalLink != document.weblogTemplateFormEx.link.value) {
+                window.alert("Link changed, not launching page");
+            } else {
+                window.open(weblogURL + '/page/' + originalLink, '_blank');
+            }
+        }
+        // Only highlight launch link user hasn't changed link
+        function highlightLaunchLink() {
+            if (originalLink == document.weblogTemplateFormEx.link.value) {
+                document.getElementById('launchLink').style.textDecoration = 'underline';
+            }
+        }
+        function unhighlightLaunchLink() {
+                document.getElementById('launchLink').style.textDecoration = 'none';
+        }
+        -->
+        </script>
+        
+        <s:if test="!bean.required">
+            <tr>
+                <td class="label" valign="top"><s:text name="pageForm.link" />&nbsp;</td>
+                <td class="field">
+                    <s:if test="bean.required">
+                        <span class="fixedAttr"><s:property value="bean.link"/></span>
+                        <s:hidden name="bean.link" />
+                    </s:if>
+                    <s:else>
+                        <s:textfield name="bean.link" size="50" onkeyup="updatePageURLDisplay()" />
+                    </s:else>
+                    <br />
+                    <s:property value="actionWeblog.absoluteURL" />/page/<span id="handlePreview" style="color:red"><s:property value="bean.link" /></span>
+                    [<span id="launchLink" class="fakelink" 
+                           onClick="launchPage()" onMouseOver="highlightLaunchLink()" onMouseOut="unhighlightLaunchLink()"><s:text name="pageForm.launch" /></span>]
+                </td>
+                <td class="description"></td>
+            </tr>
+        </s:if>
+        
+        <tr>
+            <td class="label" valign="top" style="padding-top: 4px"><s:text name="pageForm.description" />&nbsp;</td>
+            <td class="field">
+                <s:if test="bean.required">
+                    <span class="fixedAttr"><s:property value="bean.description"/></span>
+                    <s:hidden name="bean.description" />
+                </s:if>
+                <s:else>
+                    <s:textarea name="bean.description" cols="50" rows="2" />
+                </s:else>
+            </td>
+            <td class="description"></td>
+        </tr>
+        
+    </table>
+    
+    <%-- ================================================================== --%>
+    <%-- Template editing area w/resize buttons --%>
+    
+    <br />
+    <s:textarea name="bean.contents" cols="80" rows="30" cssStyle="width:100%" />
+    
+    <script type="text/javascript"><!--
+        if (getCookie("editorSize1") != null) {
+            document.weblogTemplateFormEx.contents.rows = getCookie("editorSize1");
+        }
+        function changeSize(e, num) {
+            a = e.rows + num;
+            if (a > 0) e.rows = a;
+            var expires = new Date();
+            expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days.
+            setCookie("editorSize",e.rows,expires);
+        }
+        function changeSize1(e, num) {
+            a = e.rows + num;
+            if (a > 0) e.rows = a;
+            var expires = new Date();
+            expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days.
+            setCookie("editorSize1",e.rows,expires);
+        }
+    // --></script>
+    <table style="width:100%">
+        <tr>
+            <td>
+                <s:submit key="pageForm.save" /></input>
+                <s:submit key="application.done" action="templates" /></input>
+            </td>
+            <td align="right">
+                <!-- Add buttons to make this textarea taller or shorter -->
+                <input type="button" name="taller" value=" &darr; " 
+                       onclick="changeSize1(document.template.template_bean_contents, 5)" />
+                <input type="button" name="shorter" value=" &uarr; " 
+                       onclick="changeSize1(document.template.template_bean_contents, -5)" />
+            </td>
+        </tr>
+    </table>
+   
+    
+    <%-- ================================================================== --%>
+    <%-- Advanced settings inside a control toggle --%>
+    
+    <br />
+    <br />
+    <div id="advancedControlToggle" class="controlToggle">
+        <span id="iadvancedControl">+</span>
+        <a class="controlToggle" onclick="javascript:toggleControl('advancedControlToggle','advancedControl')">
+        <s:text name="pageForm.advancedSettings" /></a>
+    </div>
+    <div id="advancedControl" class="advancedControl" style="display:none">
+        
+        <table cellspacing="0">
+            
+            <tr>
+                <script type="text/javascript"><!--
+                    function showContentTypeField() {
+                        if (document.weblogTemplateFormEx.autoContentType[0].checked) {
+                            document.weblogTemplateFormEx.manualContentType.readOnly = true;
+                            document.weblogTemplateFormEx.manualContentType.style.background = '#e5e5e5';
+                        } else {
+                            document.weblogTemplateFormEx.manualContentType.readOnly = false;
+                            document.weblogTemplateFormEx.manualContentType.style.background = '#ffffff';
+                        }
+                    }
+                // --></script> 
+                <td class="field">                
+                    <tr>
+                        <td class="label" valign="top"><s:text name="pageForm.outputContentType" />&nbsp;</td>
+                        <td class="field">
+                                                        
+                            <s:radio name="autoContentType" list="{true}" onchange="showContentTypeField()" /> 
+                            <s:text name="pageForm.useAutoContentType" /><br />
+                            
+                            <s:radio name="autoContentType" list="{false}" onchange="showContentTypeField()" />
+                            <s:text name="pageForm.useManualContentType" />
+                            <s:textfield name="manualContentType" />   
+                            
+                            <br />
+                            <br />
+                                               
+                        </td>
+                        <td class="description"></td>
+                    </tr>
+                </td>
+                <td class="description"></td>
+                <script type="text/javascript"><!--
+                    showContentTypeField();
+                // --></script> 
+            </tr>
+            
+            <tr>
+                <td class="field">                
+                    <s:if test="bean.required">
+                        <s:hidden name="navbar" />
+                    </s:if>
+                    <s:else>
+                        <tr>
+                            <td class="label"><s:text name="pageForm.navbar" />&nbsp;</td>
+                            <td class="field"><s:checkbox name="navbar" /> 
+                                <s:text name="pageForm.navbar.tip" />
+                            </td>
+                            <td class="description"></td>
+                        </tr>
+                    </s:else>
+                </td>
+                <td class="description"></td>
+            </tr>
+            
+            <td class="field">                
+                <s:if test="bean.required">
+                    <s:hidden name="hidden" />
+                </s:if>
+                <s:else>
+                    <tr>
+                        <td class="label"><s:text name="pageForm.hidden" />&nbsp;</td>
+                        <td class="field"><s:checkbox name="hidden" />
+                            <s:text name="pageForm.hidden.tip" />
+                        </td>
+                        <td class="description"></td>                            
+                    </tr>
+                </s:else>
+                <br />
+                <br />
+
+            </td>
+            <td class="description"></td> 
+            </tr>
+                        
+            <tr>
+                <td class="field">                
+                    <s:if test="bean.required || !model.rollerSession.globalAdminUser}">
+                        <s:hidden name="templateLanguage" />
+                    </s:if>
+                    <s:else>
+                        <tr>
+                            <td class="label"><s:text name="pageForm.templateLanguage" />&nbsp;</td>
+                            <td class="field">
+                                <s:select name="templateLanguage" list="templateLanguages" size="1" />
+                            </td>
+                            <td class="description"></td>
+                        </tr>
+                    </s:else>
+                </td>
+                <td class="description"></td>
+            </tr>
+                        
+        </table>
+        <br />
+        
+    </div>
+    
+    <script type="text/javascript">
+    <!--
+    function cancel() {
+        document.weblogTemplateFormEx.method.value="cancel"; 
+        document.weblogTemplateFormEx.submit();
+    }
+    -->
+    </script>
+    <br />
+    
+</s:form>
+
+<%--
+Added by Matt Raible since the focus javascript generated by Struts 
+doesn't seem to work for forms with duplicate named elements.
+--%>
+<script type="text/javascript">
+<!--
+    document.forms[0].elements[0].focus();
+// -->
+</script>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates-list-ajax.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates-list-ajax.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates-list-ajax.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates-list-ajax.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,75 @@
+<%--
+  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" %>
+
+<%-- table of pages --%>
+<table class="rollertable">
+    <tr>
+        <th width="30%"><s:text name="pagesForm.name" /></th>
+        <th width="60%"><s:text name="pagesForm.description" /></th>
+        <th width="10"><s:text name="pagesForm.remove" /></th>
+    </tr>
+    <s:iterator id="p" value="templates" status="rowstatus">
+        <s:if test="#rowstatus.odd == true">
+            <tr class="rollertable_odd">
+        </s:if>
+        <s:else>
+            <tr class="rollertable_even">
+        </s:else>
+
+            <td style="vertical-align:middle">
+                <s:if test="! #p.hidden">
+                    <s:url id="editIcon" value="/images/page_white.png"/>
+                </s:if>
+                <s:else>
+                    <s:url id="editIcon" value="/images/page_white_gear.png"/>
+                </s:else>
+                <img src='<s:url value="%{editIcon}"/>' border="0" alt="icon" />
+                <s:url id="edit" action="template">
+                    <s:param name="weblog" value="actionWeblog.handle" />
+                    <s:param name="bean.id" value="#p.id" />
+                </s:url>
+                <a href="<s:property value="edit"/>"><s:property value="#p.name" /></a>
+            </td>
+            
+            <td style="vertical-align:middle"><s:property value="#p.description" /></td>
+                        
+            <td class="center" style="vertical-align:middle">
+                 <s:if test="!#p.required">
+                     <s:url id="removeUrl" action="templateRemove" method="ddd">
+                         <s:param name="weblog" value="actionWeblog.handle"/>
+                         <s:param name="removeId" value="#p.id"/>
+                     </s:url>
+                     <s:a href="%{removeUrl}" notifyTopics="/refreshTmpls"><img src='<s:url value="/images/delete.png"/>' /></s:a>
+                 </s:if>
+                 <s:else>
+                    <img src='<s:url value="/images/lock.png"/>' border="0" alt="icon" 
+                        title='<s:text name="pagesForm.required"/>' />
+                 </s:else>
+            </td>
+
+        </tr>
+    </s:iterator>
+    <s:if test="templates.isEmpty">
+        <tr class="rollertable_odd">
+            <td style="vertical-align:middle" colspan="3" >
+                no templates defined
+            </td>
+        </tr>
+    </s:if>
+</table>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,58 @@
+<%--
+  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="pagesForm.subtitle" >
+       <s:param value="actionWeblog.handle" />
+   </s:text>
+</p>  
+<p class="pagetip">
+   <s:text name="pagesForm.tip" />
+</p>
+
+<s:if test="actionWeblog.editorTheme != 'custom'">
+    <p><s:text name="pagesForm.themesReminder"><s:param value="actionWeblog.editorTheme"/></s:text></p>
+</s:if>
+
+<%-- table of templates via ajax --%>
+<div class="tmplsHead">
+    <table cellpadding="0">
+        <tr>
+            <td><h2>Your Templates</h2> <img src="<s:url value="/images/help.png"/>"/></td>
+            <td align="right">
+                <s:url id="addTmpl" action="templateAdd">
+                    <s:param name="weblog" value="actionWeblog.handle"/>
+                </s:url>
+                <img src="<s:url value="/images/add.png"/>"/> <s:a theme="ajax" href="%{addTmpl}" targets="addTmplForm">Add Template</s:a>
+            </td>
+        </tr>
+    </table>
+</div>
+<script type="text/javascript" language="javascript">
+dojo.event.topic.subscribe("/refreshTmpls", function(nothing) {
+  // i don't need to do anything :/
+});
+</script>
+<s:url id="listTmpls" action="templates" method="list">
+    <s:param name="weblog" value="actionWeblog.handle"/>
+</s:url>
+<s:div theme="ajax" href="%{listTmpls}" listenTopics="/refreshTmpls" cssClass="tmplsList" />
+
+
+<div id="addTmplForm"></div>

Added: roller/trunk/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp?view=auto&rev=533435
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp Sat Apr 28 15:20:00 2007
@@ -0,0 +1,60 @@
+<%--
+  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="<s:property value="siteURL" />/themes/" + theme + "/sm-theme-" + theme + ".png";
+}
+
+function fullPreview() {
+    selected=document.themes.themeId.selectedIndex;
+    window.open('<s:url value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+document.themes.themeId.options[selected].value, '_preview', '');
+}
+-->
+</script>
+
+<p class="subtitle">
+   <s:text name="themeEditor.subtitle" >
+       <s:param value="actionWeblog.handle" />
+   </s:text>
+</p>  
+<p class="pagetip">
+   <s:text name="themeEditor.tip" />
+</p>
+
+<s:form action="themes!save">
+    <s:hidden name="weblog" value="%{actionWeblog.handle}" />
+    
+    <p><s:text name="themeEditor.yourCurrentTheme" />: <b><s:property value="actionWeblog.theme.name"/></b></p>
+    
+    <p>
+        <s:select name="themeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage(this[selectedIndex].value)"/>
+        <input type="button" value="<s:text name="weblogEdit.fullPreviewMode" />" onclick="fullPreview()" />
+    </p>
+    <p>
+        <img name="preview" src="" />
+        <!-- initialize preview image at page load -->
+        <script type="text/javascript">
+                        previewImage('<s:property value="actionWeblog.theme.id"/>');
+        </script>
+    </p>
+    <p><s:submit key="themeEditor.save" /></p>
+    
+</s:form>

Modified: roller/trunk/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/tiles.xml?view=diff&rev=533435&r1=533434&r2=533435
==============================================================================
--- roller/trunk/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/web/WEB-INF/tiles.xml Sat Apr 28 15:20:00 2007
@@ -35,7 +35,7 @@
         <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="menu"         value="/WEB-INF/jsps/tiles/struts2/menu.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" />
@@ -52,14 +52,6 @@
         <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" >
@@ -89,147 +81,151 @@
     </definition>
     
     
+    <!-- weblog design pages -->
+    <definition name=".Templates" extends=".tiles-tabbedpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Templates.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    <definition name=".TemplateEditForm" extends=".tiles-tabbedpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    
+    <definition name=".ThemeEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp" />
+    </definition>
+    
     <!-- weblog editor pages (and associates) -->
-    <definition name=".WeblogEdit" extends=".tiles-editorpage" >
+    <definition name=".WeblogEdit" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".WeblogEntryManagement" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CommentManagement" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CategoriesForm" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".referers" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/referers.jsp" />
     </definition>
-    <definition name=".BookmarksForm" extends=".tiles-editorpage" >
+    <definition name=".BookmarksForm" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".upload-file" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/UploadFile.jsp" />
     </definition>
     
     <!-- subpages -->
-    <definition name=".WeblogEntryRemove" extends=".tiles-editorpage" >
+    <definition name=".WeblogEntryRemove" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CategoryForm" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CategoryDeleteOK" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".BookmarkForm" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".FolderForm" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".import" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".edit-website" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CommentManagementGlobal" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".MemberPermissions" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CustomPingTargets" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargets.jsp" />
     </definition>
-    <definition name=".PingResult" extends=".tiles-editorpage" >
+    <definition name=".PingResult" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/PingResult.jsp" />
     </definition>
-    <definition name=".Pings" extends=".tiles-editorpage" >
+    <definition name=".Pings" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/Pings.jsp" />
     </definition>
-    <definition name=".Maintenance" extends=".tiles-editorpage" >
+    <definition name=".Maintenance" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/Maintenance.jsp" />
     </definition>
     
     <!-- subpages -->
-    <definition name=".WebsiteRemove" extends=".tiles-editorpage" >
+    <definition name=".WebsiteRemove" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".InviteMember" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".InviteMemberDone" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CustomPingTargetDeleteOK" extends=".tiles-tabbedpage" >
         <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" >
+    <definition name=".CustomPingTargetEdit" extends=".tiles-tabbedpage" >
         <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"  >
+    <definition name=".Invitations" extends=".tiles-tabbedpage"  >
         <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 name=".GlobalConfig" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp" />
+    </definition>
+    <definition name=".UserAdmin" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/UserAdmin.jsp" />
+    </definition>
+    <definition name=".CreateUser" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CreateUser.jsp" />
     </definition>
-    <definition name=".UserAdmin" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/UserAdmin.jsp" />
+    <definition name=".ModifyUser" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/ModifyUser.jsp" />
     </definition>
-    <definition name=".CommonPingTargets" extends=".tiles-adminpage" >
+    <definition name=".CommonPingTargets" extends=".tiles-tabbedpage" >
         <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 name=".CacheInfo" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CacheInfo.jsp" />
     </definition>
     
     <definition name=".CommonPingTargetDeleteOK" extends=".tiles-simplepage" >
@@ -239,13 +235,13 @@
         <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp" />
     </definition>
     
-    <definition name=".PlanetSubscriptions" extends=".tiles-adminpage" >
+    <definition name=".PlanetSubscriptions" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/admin/PlanetSubscriptions.jsp" />
     </definition>
-    <definition name=".PlanetConfig" extends=".tiles-adminpage" >
+    <definition name=".PlanetConfig" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/admin/PlanetConfig.jsp" />
     </definition>
-    <definition name=".PlanetGroups" extends=".tiles-adminpage" >
+    <definition name=".PlanetGroups" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/admin/PlanetGroups.jsp" />
     </definition>
     



Mime
View raw message