You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/22 02:45:24 UTC

svn commit: r424505 - in /incubator/roller/branches/roller_3.0/web/WEB-INF: classes/ApplicationResources.properties jsps/authoring/edit-page.jsp

Author: agilliland
Date: Fri Jul 21 17:45:24 2006
New Revision: 424505

URL: http://svn.apache.org/viewvc?rev=424505&view=rev
Log:
UI control for toggeling "hidden" attribute of templates.


Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties?rev=424505&r1=424504&r2=424505&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties Fri Jul 21 17:45:24 2006
@@ -797,6 +797,8 @@
 pageForm.editPage=Edit Template
 pageForm.name=Name
 pageForm.link=Link
+pageForm.hidden=Hidden
+pageForm.hidden.tip=hidden templates cannot be accessed via a weblog url
 pageForm.description=Description
 pageForm.template=Template
 pageForm.save=Save

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp?rev=424505&r1=424504&r2=424505&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp Fri Jul 21 17:45:24 2006
@@ -1,4 +1,4 @@
-<!--
+<%--
   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
@@ -14,14 +14,10 @@
   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="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
-function previewImage(theme) {
-    <% String ctxPath = request.getContextPath(); %>
-    document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
-}
 function cancel() {
     document.weblogTemplateForm.method.value="cancel"; 
     document.weblogTemplateForm.submit();
@@ -38,9 +34,10 @@
         <bean:write name="weblogTemplateForm" property="name" />
 	</p>
 	
-    <table>
+    <table cellspacing="5">
         <tr>
-            <td><fmt:message key="pageForm.name" /><br />
+            <td class="label"><fmt:message key="pageForm.name" />&nbsp;</td>
+            <td class="field">
                 <c:choose>
                     <c:when test="${page.required}">
                         <html:text style="background: #e5e5e5" property="name" size="50" readonly="true"/>
@@ -50,9 +47,12 @@
                     </c:otherwise>
                 </c:choose>
             </td>
+            <td class="description"></td>
         </tr>
+        
         <tr>
-            <td><fmt:message key="pageForm.link" /><br />
+            <td class="label"><fmt:message key="pageForm.link" />&nbsp;</td>
+            <td class="field">
                 <c:choose>
                     <c:when test="${page.required}">
                         <html:text style="background: #e5e5e5" property="link" size="50" readonly="true"/>
@@ -62,26 +62,46 @@
                     </c:otherwise>
                 </c:choose>
             </td>
+            <td class="description"></td>
         </tr>
+        
         <tr>
-            <td><fmt:message key="pageForm.description" /><br />
+            <td class="label" valign="top" style="padding-top: 4px"><fmt:message key="pageForm.description" />&nbsp;</td>
+            <td class="field">
                 <c:choose>
                     <c:when test="${page.required}">
-                        <html:textarea style="background: #e5e5e5" property="description" rows="3" cols="50" readonly="true"/>
+                        <html:textarea style="background: #e5e5e5" property="description" cols="50" rows="2" readonly="true"/>
                     </c:when>
                     <c:otherwise>
-                        <html:textarea property="description" rows="3" cols="50"/>
+                        <html:textarea property="link" cols="50" rows="2" />
                     </c:otherwise>
                 </c:choose>
             </td>
+            <td class="description"></td>
         </tr>
+        
+        <c:choose>
+        <c:when test="${page.required}">
+            <html:hidden property="hidden" />
+        </c:when>
+        <c:otherwise>
+            <tr>
+                <td class="label"><fmt:message key="pageForm.hidden" />&nbsp;</td>
+                <td class="field"><html:checkbox property="hidden" /> (<fmt:message key="pageForm.hidden.tip" />)</td>
+                <td class="description"></td>
+            </tr>
+        </c:otherwise>
+        </c:choose>
     </table>
     
-    <fmt:message key="pageForm.template" /><br />
+    <br />
     <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
             
     <html:hidden property="id"/>
     <html:hidden property="name"/>
+    <html:hidden property="templateLanguage" />
+    <html:hidden property="decoratorName" />
+    
     <input type="hidden" name="method" value="update" />
     <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />