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/05/02 00:10:56 UTC
svn commit: r398709 [2/2] - in /incubator/roller/trunk:
contrib/plugins/src/org/roller/ metadata/database/hibernate/
metadata/xdoclet/ src/org/roller/ web/ web/WEB-INF/ web/WEB-INF/classes/
web/WEB-INF/jsps/ web/bookmarks/ web/planet/ web/tags/ web/the...
Modified: incubator/roller/trunk/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/edit-website.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/edit-website.jsp (original)
+++ incubator/roller/trunk/web/website/edit-website.jsp Mon May 1 15:10:52 2006
@@ -15,255 +15,255 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.website.actions.WebsiteFormAction" %>
-<%
-WebsiteFormAction.WebsitePageModel model =
- (WebsiteFormAction.WebsitePageModel)request.getAttribute("model");
-%>
-<p class="subtitle">
- <fmt:message key="websiteSettings.subtitle" >
- <fmt:param value="${model.website.handle}" />
- </fmt:message>
-</p>
-
-<html:form action="/editor/website" method="post">
- <html:hidden property="method" value="update"/></input>
-
- <html:hidden property="id"/></input>
- <html:hidden property="defaultPageId" /></input>
- <html:hidden property="weblogDayPageId" /></input>
- <html:hidden property="handle"/></input>
- <html:hidden property="editorTheme"/></input>
- <html:hidden property="enabled"/></input>
- <html:hidden property="defaultCategoryId"/></input>
-
-<table class="formtableNoDesc">
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.websiteTitle" />
- <td class="field"><html:text property="name" size="40"/></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.websiteDescription" /></td>
- <td class="field"><html:textarea property="description" rows="3" cols="40"/></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.emailAddress" />
- <td class="field"><html:text property="emailAddress" size="40"/></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="createWebsite.locale" />
- <td class="field">
- <html:select property="locale" size="1" >
- <html:options collection="locales" property="value" labelProperty="label"/>
- </html:select>
- </td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="createWebsite.timeZone" />
- <td class="field">
- <html:select property="timeZone" size="1" >
- <html:options collection="timeZones" property="value" labelProperty="label"/>
- </html:select>
- </td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.editor" /></td>
- <td class="field">
- <html:select property="editorPage" size="1">
- <html:options name="editorPagesList" />
- </html:select></p>
- </td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.entryDisplayCount" /></td>
- <td class="field"><html:text property="entryDisplayCount" size="4"/></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.active" /></td>
- <td class="field"><html:checkbox property="active" /></input></td>
- <td class="description"></td>
- </tr>
-
-
- <%-- ***** Comment settings ***** --%>
-
- <tr>
- <td colspan="3"><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.allowComments" /></td>
- <td class="field"><html:checkbox property="allowComments" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <c:if test="${!model.moderationRequired}">
- <tr>
- <td class="label"><fmt:message key="websiteSettings.moderateComments" /></td>
- <td class="field"><html:checkbox property="moderateComments" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
- </c:if>
-
- <c:if test="${model.emailNotificationEnabled}">
- <tr>
- <td class="label"><fmt:message key="websiteSettings.emailComments" /></td>
- <td class="field"><html:checkbox property="emailComments" onclick="toggleNextRow(this)" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr <c:if test="${!websiteFormEx.emailComments}">style="display: none"</c:if>>
- <td class="label"><fmt:message key="websiteSettings.emailFromAddress" /></td>
- <td class="field"><html:text size="50" property="emailFromAddress" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
- </c:if>
-
- <%-- ***** Default entry comment settings ***** --%>
-
- <tr>
- <td colspan="3"><h2><fmt:message key="websiteSettings.defaultCommentSettings" /></h2></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.defaultAllowComments" /></td>
- <td class="field"><html:checkbox property="defaultAllowComments" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.defaultCommentDays" /></td>
- <td class="field">
- <html:select property="defaultCommentDays">
- <html:option key="weblogEdit.unlimitedCommentDays" value="0" />
- <html:option key="weblogEdit.days1" value="1" />
- <html:option key="weblogEdit.days2" value="2" />
- <html:option key="weblogEdit.days3" value="3" />
- <html:option key="weblogEdit.days4" value="4" />
- <html:option key="weblogEdit.days5" value="5" />
- <html:option key="weblogEdit.days7" value="7" />
- <html:option key="weblogEdit.days10" value="10" />
- <html:option key="weblogEdit.days20" value="20" />
- <html:option key="weblogEdit.days30" value="30" />
- <html:option key="weblogEdit.days60" value="60" />
- <html:option key="weblogEdit.days90" value="90" />
- </html:select>
- </td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.applyCommentDefaults" /></td>
- <td class="field"><html:checkbox property="applyCommentDefaults" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <%-- ***** Blogger API setting settings ***** --%>
-
- <tr>
- <td colspan="3"><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.enableBloggerApi" /></td>
- <td class="field"><html:checkbox property="enableBloggerApi" /></input></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.bloggerApiCategory" /></td>
- <td class="field">
- <html:select property="bloggerCategoryId" size="1">
- <html:options collection="bloggerCategories"
- property="id" labelProperty="path" />
- </html:select>
- </td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
- <%-- ***** Plugins "formatting" settings ***** --%>
-
- <tr>
- <td colspan="3"><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
- </tr>
-
-<c:choose>
- <c:when test="${model.hasPagePlugins}">
- <tr>
- <td class="label">Default Entry Formatters <br />(applied in the listed order)</td>
- <td class="field">
- <logic:iterate id="plugin" type="org.roller.model.PagePlugin"
- collection="<%= model.getPagePlugins() %>">
- <html:multibox property="defaultPluginsArray"
- title="<%= plugin.getName() %>" value="<%= plugin.getName() %>" /></input>
- <label for="<%= plugin.getName() %>"><%= plugin.getName() %></label>
- <a href="javascript:void(0);" onmouseout="return nd();"
- onmouseover="return overlib('<%= plugin.getDescription() %>', STICKY, MOUSEOFF, TIMEOUT, 3000);">?</a>
- <br />
- </logic:iterate>
- </td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
- </c:when>
- <c:otherwise>
- <html:hidden property="defaultPlugins" />
- </c:otherwise>
-</c:choose>
-
-
- <%-- ***** Spam prevention settings ***** --%>
-
- <tr>
- <td colspan="3"><h2><fmt:message key="websiteSettings.spamPrevention" /></h2></td>
- </tr>
-
- <tr>
- <td class="label"><fmt:message key="websiteSettings.ignoreUrls" /></td>
- <td class="field"><html:textarea property="blacklist" rows="7" cols="40"/></td>
- <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
- </tr>
-
-</table>
-
-<br />
-<div class="control">
- <input type="submit" value='<fmt:message key="websiteSettings.button.update" />' />
-</div>
-
-<c:if test="${model.website.adminUserCount == 1 && model.groupBloggingEnabled}">
- <br />
- <br />
- <h2><fmt:message key="websiteSettings.removeWebsiteHeading" /></h2>
- <p>
- <fmt:message key="websiteSettings.removeWebsite" /><br/>
- <span class="warning">
- <fmt:message key="websiteSettings.removeWebsiteWarning" />
- </span>
- </p>
- <br />
- <input type="button" value='<fmt:message key="websiteSettings.button.remove" />'
- onclick='document.websiteFormEx.method.value="removeOk"; document.websiteFormEx.submit()' />
- <br />
- <br />
-</c:if>
-
-<br />
-</html:form>
-
-
+<%@ include file="/taglibs.jsp" %>
+<%@ page import="org.apache.roller.presentation.website.actions.WebsiteFormAction" %>
+<%
+WebsiteFormAction.WebsitePageModel model =
+ (WebsiteFormAction.WebsitePageModel)request.getAttribute("model");
+%>
+<p class="subtitle">
+ <fmt:message key="websiteSettings.subtitle" >
+ <fmt:param value="${model.website.handle}" />
+ </fmt:message>
+</p>
+
+<html:form action="/editor/website" method="post">
+ <html:hidden property="method" value="update"/></input>
+
+ <html:hidden property="id"/></input>
+ <html:hidden property="defaultPageId" /></input>
+ <html:hidden property="weblogDayPageId" /></input>
+ <html:hidden property="handle"/></input>
+ <html:hidden property="editorTheme"/></input>
+ <html:hidden property="enabled"/></input>
+ <html:hidden property="defaultCategoryId"/></input>
+
+<table class="formtableNoDesc">
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.websiteTitle" />
+ <td class="field"><html:text property="name" size="40"/></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.websiteDescription" /></td>
+ <td class="field"><html:textarea property="description" rows="3" cols="40"/></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.emailAddress" />
+ <td class="field"><html:text property="emailAddress" size="40"/></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="createWebsite.locale" />
+ <td class="field">
+ <html:select property="locale" size="1" >
+ <html:options collection="locales" property="value" labelProperty="label"/>
+ </html:select>
+ </td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="createWebsite.timeZone" />
+ <td class="field">
+ <html:select property="timeZone" size="1" >
+ <html:options collection="timeZones" property="value" labelProperty="label"/>
+ </html:select>
+ </td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.editor" /></td>
+ <td class="field">
+ <html:select property="editorPage" size="1">
+ <html:options name="editorPagesList" />
+ </html:select></p>
+ </td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.entryDisplayCount" /></td>
+ <td class="field"><html:text property="entryDisplayCount" size="4"/></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.active" /></td>
+ <td class="field"><html:checkbox property="active" /></input></td>
+ <td class="description"></td>
+ </tr>
+
+
+ <%-- ***** Comment settings ***** --%>
+
+ <tr>
+ <td colspan="3"><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.allowComments" /></td>
+ <td class="field"><html:checkbox property="allowComments" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <c:if test="${!model.moderationRequired}">
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.moderateComments" /></td>
+ <td class="field"><html:checkbox property="moderateComments" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+ </c:if>
+
+ <c:if test="${model.emailNotificationEnabled}">
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.emailComments" /></td>
+ <td class="field"><html:checkbox property="emailComments" onclick="toggleNextRow(this)" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr <c:if test="${!websiteFormEx.emailComments}">style="display: none"</c:if>>
+ <td class="label"><fmt:message key="websiteSettings.emailFromAddress" /></td>
+ <td class="field"><html:text size="50" property="emailFromAddress" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+ </c:if>
+
+ <%-- ***** Default entry comment settings ***** --%>
+
+ <tr>
+ <td colspan="3"><h2><fmt:message key="websiteSettings.defaultCommentSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.defaultAllowComments" /></td>
+ <td class="field"><html:checkbox property="defaultAllowComments" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.defaultCommentDays" /></td>
+ <td class="field">
+ <html:select property="defaultCommentDays">
+ <html:option key="weblogEdit.unlimitedCommentDays" value="0" />
+ <html:option key="weblogEdit.days1" value="1" />
+ <html:option key="weblogEdit.days2" value="2" />
+ <html:option key="weblogEdit.days3" value="3" />
+ <html:option key="weblogEdit.days4" value="4" />
+ <html:option key="weblogEdit.days5" value="5" />
+ <html:option key="weblogEdit.days7" value="7" />
+ <html:option key="weblogEdit.days10" value="10" />
+ <html:option key="weblogEdit.days20" value="20" />
+ <html:option key="weblogEdit.days30" value="30" />
+ <html:option key="weblogEdit.days60" value="60" />
+ <html:option key="weblogEdit.days90" value="90" />
+ </html:select>
+ </td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.applyCommentDefaults" /></td>
+ <td class="field"><html:checkbox property="applyCommentDefaults" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <%-- ***** Blogger API setting settings ***** --%>
+
+ <tr>
+ <td colspan="3"><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.enableBloggerApi" /></td>
+ <td class="field"><html:checkbox property="enableBloggerApi" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.bloggerApiCategory" /></td>
+ <td class="field">
+ <html:select property="bloggerCategoryId" size="1">
+ <html:options collection="bloggerCategories"
+ property="id" labelProperty="path" />
+ </html:select>
+ </td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+ <%-- ***** Plugins "formatting" settings ***** --%>
+
+ <tr>
+ <td colspan="3"><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
+ </tr>
+
+<c:choose>
+ <c:when test="${model.hasPagePlugins}">
+ <tr>
+ <td class="label">Default Entry Formatters <br />(applied in the listed order)</td>
+ <td class="field">
+ <logic:iterate id="plugin" type="org.apache.roller.model.PagePlugin"
+ collection="<%= model.getPagePlugins() %>">
+ <html:multibox property="defaultPluginsArray"
+ title="<%= plugin.getName() %>" value="<%= plugin.getName() %>" /></input>
+ <label for="<%= plugin.getName() %>"><%= plugin.getName() %></label>
+ <a href="javascript:void(0);" onmouseout="return nd();"
+ onmouseover="return overlib('<%= plugin.getDescription() %>', STICKY, MOUSEOFF, TIMEOUT, 3000);">?</a>
+ <br />
+ </logic:iterate>
+ </td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+ </c:when>
+ <c:otherwise>
+ <html:hidden property="defaultPlugins" />
+ </c:otherwise>
+</c:choose>
+
+
+ <%-- ***** Spam prevention settings ***** --%>
+
+ <tr>
+ <td colspan="3"><h2><fmt:message key="websiteSettings.spamPrevention" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.ignoreUrls" /></td>
+ <td class="field"><html:textarea property="blacklist" rows="7" cols="40"/></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
+</table>
+
+<br />
+<div class="control">
+ <input type="submit" value='<fmt:message key="websiteSettings.button.update" />' />
+</div>
+
+<c:if test="${model.website.adminUserCount == 1 && model.groupBloggingEnabled}">
+ <br />
+ <br />
+ <h2><fmt:message key="websiteSettings.removeWebsiteHeading" /></h2>
+ <p>
+ <fmt:message key="websiteSettings.removeWebsite" /><br/>
+ <span class="warning">
+ <fmt:message key="websiteSettings.removeWebsiteWarning" />
+ </span>
+ </p>
+ <br />
+ <input type="button" value='<fmt:message key="websiteSettings.button.remove" />'
+ onclick='document.websiteFormEx.method.value="removeOk"; document.websiteFormEx.submit()' />
+ <br />
+ <br />
+</c:if>
+
+<br />
+</html:form>
+
+
Modified: incubator/roller/trunk/web/website/rollerProperties.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/rollerProperties.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/rollerProperties.jsp (original)
+++ incubator/roller/trunk/web/website/rollerProperties.jsp Mon May 1 15:10:52 2006
@@ -21,7 +21,7 @@
<%-- Start by parsing our config defs using the jstl xml toolkit --%>
<%-- Then we'll progress through the config defs and print out the form --%>
<x:parse var="configDefs">
- <%= org.roller.config.RollerRuntimeConfig.getRuntimeConfigDefsAsString() %>
+ <%= org.apache.roller.config.RollerRuntimeConfig.getRuntimeConfigDefsAsString() %>
</x:parse>
Modified: incubator/roller/trunk/web/website/theme-editor.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/theme-editor.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/theme-editor.jsp (original)
+++ incubator/roller/trunk/web/website/theme-editor.jsp Mon May 1 15:10:52 2006
@@ -15,117 +15,117 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%
-// this just makes the name for a custom theme available to our jstl EL
-String customTheme = org.roller.pojos.Theme.CUSTOM;
-request.setAttribute("customTheme", customTheme);
-
-boolean allowCustom = org.roller.config.RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed");
-request.setAttribute("allowCustom", new Boolean(allowCustom));
-%>
-<p class="subtitle">
- <fmt:message key="themeEditor.subtitle" >
- <fmt:param value="${model.website.handle}" />
- </fmt:message>
-</p>
-<p class="pagetip">
- <fmt:message key="themeEditor.tip" />
-</p>
-
-<form action="themeEditor.do" method="post">
-
- <input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
- <input type=hidden name="method" value="preview" />
-
- <table width="95%">
-
- <tr>
- <td>
- <p>
- <fmt:message key="themeEditor.yourCurrentTheme" />: <b><c:out value="${currentTheme}"/></b><br/>
-
- <c:choose>
- <c:when test="${currentTheme ne previewTheme}" >
- <fmt:message key="themeEditor.themeBelowIsCalled" /> <b><c:out value="${previewTheme}" /></b><br/>
- <fmt:message key="themeEditor.savePrompt" /><br/>
- <input type="button"
- value='<fmt:message key="themeEditor.save" />'
- name="saveButton"
- onclick="this.form.method.value='save';this.form.submit()"
- tabindex="4" />
-
- <input type="button"
- value='<fmt:message key="themeEditor.cancel" />'
- name="cancelButton"
- onclick="this.form.method.value='edit';this.form.submit()"
- tabindex="4" />
- </c:when>
-
- <c:when test="${(currentTheme ne customTheme) and allowCustom}">
- <fmt:message key="themeEditor.youMayCustomize" /><br/>
- <input type="button"
- value='<fmt:message key="themeEditor.customize" />'
- name="customizeButton"
- onclick="this.form.method.value='customize';this.form.submit()"
- tabindex="4" />
- </c:when>
- </c:choose>
- </p>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- <tr>
- <td>
- <p>
- <fmt:message key="themeEditor.selectTheme" /> :
- <select name="theme" size="1" onchange="this.form.submit()" >
- <c:forEach var="themeName" items="${themesList}">
- <c:choose>
- <c:when test="${themeName eq previewTheme}">
- <option value="<c:out value="${themeName}"/>" selected>
- <c:out value="${themeName}"/>
- </option>
- </c:when>
- <c:otherwise>
- <option value="<c:out value="${themeName}"/>">
- <c:out value="${themeName}"/>
- </option>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- </select>
- </p>
- </td>
- </tr>
-
- <tr>
- <td>
- <iframe name="preview" id="preview"
- src='<%= request.getContextPath() %>/preview/<c:out value="${model.website.handle}" />?theme=<c:out value="${previewTheme}"/>'
- frameborder=1 width="100%" height="400"
- marginheight="0" marginwidth="0"></iframe>
- </td>
- </tr>
-
- </table>
-
-</form>
-
-
-<script type="text/javascript">
- <!--
- function save()
- {
- //alert(document.themeEditorForm.method.value);
- document.themeEditorForm.method.value = "save";
- document.themeEditorForm.submit();
- }
- // -->
-</script>
-
-
+<%@ include file="/taglibs.jsp" %>
+<%
+// this just makes the name for a custom theme available to our jstl EL
+String customTheme = org.apache.roller.pojos.Theme.CUSTOM;
+request.setAttribute("customTheme", customTheme);
+
+boolean allowCustom = org.apache.roller.config.RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed");
+request.setAttribute("allowCustom", new Boolean(allowCustom));
+%>
+<p class="subtitle">
+ <fmt:message key="themeEditor.subtitle" >
+ <fmt:param value="${model.website.handle}" />
+ </fmt:message>
+</p>
+<p class="pagetip">
+ <fmt:message key="themeEditor.tip" />
+</p>
+
+<form action="themeEditor.do" method="post">
+
+ <input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
+ <input type=hidden name="method" value="preview" />
+
+ <table width="95%">
+
+ <tr>
+ <td>
+ <p>
+ <fmt:message key="themeEditor.yourCurrentTheme" />: <b><c:out value="${currentTheme}"/></b><br/>
+
+ <c:choose>
+ <c:when test="${currentTheme ne previewTheme}" >
+ <fmt:message key="themeEditor.themeBelowIsCalled" /> <b><c:out value="${previewTheme}" /></b><br/>
+ <fmt:message key="themeEditor.savePrompt" /><br/>
+ <input type="button"
+ value='<fmt:message key="themeEditor.save" />'
+ name="saveButton"
+ onclick="this.form.method.value='save';this.form.submit()"
+ tabindex="4" />
+
+ <input type="button"
+ value='<fmt:message key="themeEditor.cancel" />'
+ name="cancelButton"
+ onclick="this.form.method.value='edit';this.form.submit()"
+ tabindex="4" />
+ </c:when>
+
+ <c:when test="${(currentTheme ne customTheme) and allowCustom}">
+ <fmt:message key="themeEditor.youMayCustomize" /><br/>
+ <input type="button"
+ value='<fmt:message key="themeEditor.customize" />'
+ name="customizeButton"
+ onclick="this.form.method.value='customize';this.form.submit()"
+ tabindex="4" />
+ </c:when>
+ </c:choose>
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td> </td>
+ </tr>
+
+ <tr>
+ <td>
+ <p>
+ <fmt:message key="themeEditor.selectTheme" /> :
+ <select name="theme" size="1" onchange="this.form.submit()" >
+ <c:forEach var="themeName" items="${themesList}">
+ <c:choose>
+ <c:when test="${themeName eq previewTheme}">
+ <option value="<c:out value="${themeName}"/>" selected>
+ <c:out value="${themeName}"/>
+ </option>
+ </c:when>
+ <c:otherwise>
+ <option value="<c:out value="${themeName}"/>">
+ <c:out value="${themeName}"/>
+ </option>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ </select>
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <iframe name="preview" id="preview"
+ src='<%= request.getContextPath() %>/preview/<c:out value="${model.website.handle}" />?theme=<c:out value="${previewTheme}"/>'
+ frameborder=1 width="100%" height="400"
+ marginheight="0" marginwidth="0"></iframe>
+ </td>
+ </tr>
+
+ </table>
+
+</form>
+
+
+<script type="text/javascript">
+ <!--
+ function save()
+ {
+ //alert(document.themeEditorForm.method.value);
+ document.themeEditorForm.method.value = "save";
+ document.themeEditorForm.submit();
+ }
+ // -->
+</script>
+
+