You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/08/09 17:16:39 UTC
svn commit: r430072 - in /incubator/roller/branches/roller_3.0/web/WEB-INF:
classes/ApplicationResources.properties jsps/authoring/edit-page.jsp
jsps/authoring/edit-pages.jsp
Author: snoopdave
Date: Wed Aug 9 08:16:39 2006
New Revision: 430072
URL: http://svn.apache.org/viewvc?rev=430072&view=rev
Log:
Show navbar and hidden in edit-pages page
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
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages.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=430072&r1=430071&r2=430072&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 Wed Aug 9 08:16:39 2006
@@ -20,6 +20,8 @@
application.done=Done
application.yes=Yes
application.no=No
+application.true=True
+application.false=False
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -832,6 +834,8 @@
pageForm.template=Template
pageForm.save=Save
pageForm.save.success=Template updated successfully.
+pagesForm.column.navbar=Navbar
+pagesForm.column.hidden=Hidden
pageRemove.subtitle=Confirm removal of page
pageRemove.youSure=Are you sure you want to remove this page?
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=430072&r1=430071&r2=430072&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 Wed Aug 9 08:16:39 2006
@@ -87,7 +87,7 @@
<c:otherwise>
<tr>
<td class="label"><fmt:message key="pageForm.navbar" /> </td>
- <td class="field"><html:checkbox property="navbar" /> (<fmt:message key="pageForm.navbar.tip" />)</td>
+ <td class="field"><html:checkbox property="navbar" /> <fmt:message key="pageForm.navbar.tip" /></td>
<td class="description"></td>
</tr>
</c:otherwise>
@@ -100,7 +100,7 @@
<c:otherwise>
<tr>
<td class="label"><fmt:message key="pageForm.hidden" /> </td>
- <td class="field"><html:checkbox property="hidden" /> (<fmt:message key="pageForm.hidden.tip" />)</td>
+ <td class="field"><html:checkbox property="hidden" /> <fmt:message key="pageForm.hidden.tip" /></td>
<td class="description"></td>
</tr>
</c:otherwise>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages.jsp?rev=430072&r1=430071&r2=430072&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages.jsp Wed Aug 9 08:16:39 2006
@@ -37,8 +37,10 @@
<table class="rollertable">
<tr>
<th width="10%"><fmt:message key="pagesForm.name" /></th>
+ <th width="60%"><fmt:message key="pagesForm.description" /></th>
<th width="10%"><fmt:message key="pagesForm.link" /></th>
- <th width="70%"><fmt:message key="pagesForm.description" /></th>
+ <th width="5%"><fmt:message key="pagesForm.column.navbar" /></th>
+ <th width="5%"><fmt:message key="pagesForm.column.hidden" /></th>
<th width="5%"><fmt:message key="pagesForm.edit" /></th>
<th width="5%"><fmt:message key="pagesForm.remove" /></th>
</tr>
@@ -46,10 +48,19 @@
<roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
<td><bean:write name="p" property="name" /></td>
- <td><bean:write name="p" property="link" /></td>
<td><bean:write name="p" property="description" /></td>
+ <td><bean:write name="p" property="link" /></td>
+ <td class="center">
+ <logic:equal name="p" property="navbar" value="true">
+ <fmt:message key="application.true" />
+ </logic:equal>
+ </td>
+ <td class="center">
+ <logic:equal name="p" property="hidden" value="true">
+ <fmt:message key="application.true" />
+ </logic:equal>
+ </td>
- <%-- links to edit and remove page actions --%>
<td class="center">
<roller:link forward="editPage">
<roller:linkparam id="username" name="user" property="userName" />