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 2005/10/21 23:46:28 UTC
svn commit: r327589 [72/72] - in /incubator/roller/branches/roller_1.x: ./
contrib/ contrib/lib/ contrib/plugins/ contrib/plugins/src/
contrib/plugins/src/org/ contrib/plugins/src/org/roller/
contrib/plugins/src/org/roller/presentation/ contrib/plugins...
Added: incubator/roller/branches/roller_1.x/web/website/UserAdmin.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/UserAdmin.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/UserAdmin.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/UserAdmin.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,85 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<%-- If user name is not specified, then allow user to choose a user to be loaded --%>
+<c:if test="${empty userAdminForm.userName}">
+ <br />
+ <h1><fmt:message key="userAdmin.searchUserTitle" /></h1>
+ <br />
+ <html:form action="/admin/user" method="post">
+ <html:hidden property="method" value="edit" />
+ <p><fmt:message key="userAdmin.enterUserName" /></p>
+ <strong><fmt:message key="userAdmin.editUser" />:</strong>
+ <html:text property="userName" size="10" />
+ <input type="submit" value='<fmt:message key="userAdmin.edit" />' />
+ </html:form>
+</c:if>
+
+<%-- If a user name is specified, then show the admin user form --%>
+<c:if test="${not empty userAdminForm.userName}">
+ <br />
+ <h1>
+ <fmt:message key="userAdmin.editUserTitle" >
+ <fmt:param value="${userAdminForm.userName}" />
+ </fmt:message>
+ </h1>
+ <br />
+ <html:form action="/admin/user" method="post">
+ <html:hidden property="method" value="update"/></input>
+
+ <html:hidden property="id"/></input>
+ <html:hidden property="userName" /></input>
+
+ <div class="formrow">
+ <label for="fullName" class="formrow" /><fmt:message key="userAdmin.fullname" /></label>
+ <html:text property="fullName" size="30" maxlength="30" />
+ </div>
+
+ <c:if test="${cookieLogin != 'true'}">
+ <div class="formrow">
+ <label for="passwordText" class="formrow" /><fmt:message key="userAdmin.password" /></label>
+ <html:password property="passwordText" size="20" maxlength="20" />
+ </div>
+ <div class="formrow">
+ <label for="passwordConfirm" class="formrow" />
+ <fmt:message key="userAdmin.passwordConfirm" />
+ </label>
+ <html:password property="passwordConfirm" size="20" maxlength="20" />
+ </div>
+ </c:if>
+
+ <div class="formrow">
+ <label for="emailAddress" class="formrow" /><fmt:message key="userAdmin.email" /></label>
+ <html:text property="emailAddress" size="40" maxlength="40" /></input>
+ </div>
+ <br />
+
+ <div class="formrow">
+ <label for="userEnabled" class="formrow" /><fmt:message key="userAdmin.enabled" /></label>
+ <html:checkbox property="userEnabled" value="true" />
+ </div>
+ <br />
+
+ <div class="formrow">
+ <label for="userAdmin" class="formrow" /><fmt:message key="userAdmin.userAdmin" /></label>
+ <html:checkbox property="userAdmin" value="true" />
+ </div>
+ <br />
+
+ <div class="formrow">
+ <label for="delete" class="formrow" /><fmt:message key="userAdmin.delete" /></label>
+ <html:checkbox property="delete" />
+ <span class="warning"><fmt:message key="userAdmin.warning" /></span>
+ </div>
+ <br />
+
+ <div class="control">
+ <input type="submit" value='<fmt:message key="userAdmin.save" />'/></input>
+ </div>
+
+ </html:form>
+
+</c:if>
+
+<%@ include file="/theme/footer.jsp" %>
+
+
Added: incubator/roller/branches/roller_1.x/web/website/UserEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/UserEdit.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/UserEdit.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/UserEdit.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,67 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<br />
+<h1><fmt:message key="userSettings.userSettings" /></h1>
+
+<br />
+<html:form action="/editor/user" method="post" focus="fullName">
+ <html:hidden property="method" value="update"/></input>
+ <html:hidden property="id"/></input>
+ <html:hidden property="userName" /></input>
+
+ <div class="formrow">
+ <label for="fullName" class="formrow" /><fmt:message key="userSettings.fullname" /></label>
+ <html:text property="fullName" size="30" maxlength="30" />
+ </div>
+
+ <c:if test="${cookieLogin != 'true'}">
+ <div class="formrow">
+ <label for="password" class="formrow" /><fmt:message key="userSettings.password" /></label>
+ <html:password property="passwordText" size="20" maxlength="20" />
+ <html:hidden property="password" />
+ </div>
+ <div class="formrow">
+ <label for="passwordConfirm" class="formrow" /><fmt:message key="userSettings.passwordConfirm" /></label>
+ <html:password property="passwordConfirm" size="20" maxlength="20" />
+ </div>
+ </c:if>
+
+ <div class="formrow">
+ <label for="" class="formrow" /><fmt:message key="userSettings.email" /></label>
+ <html:text property="emailAddress" size="40" maxlength="40" />
+ </div>
+
+ <div class="formrow">
+ <label for="locale" class="formrow" /><fmt:message key="userSettings.locale" /></label>
+ <html:select property="locale" size="1" >
+ <html:options collection="roller.locales" property="value" labelProperty="label"/>
+ </html:select>
+ </div>
+
+ <div class="formrow">
+ <label for="timezone" class="formrow" /><fmt:message key="userSettings.timezone" /></label>
+ <html:select property="timezone" size="1" >
+ <html:options collection="roller.timezones" property="value" labelProperty="label"/>
+ </html:select>
+ </div>
+
+ <html:hidden property="theme" /></input>
+ <%-- Not implemented for the front end yet
+ <div class="formrow">
+ <label for="theme" class="formrow" /><fmt:message key="fixme!" /></label>
+ <html:select property="theme" size="1" >
+ <html:options name="themes"/>
+ </html:select>
+ </div>
+ --%>
+
+ <br />
+ <div class="control">
+ <input type="submit" value='<fmt:message key="userSettings.save" />' /></input>
+ </div>
+
+</html:form>
+
+<%@ include file="/theme/footer.jsp" %>
+
+
Added: incubator/roller/branches/roller_1.x/web/website/UserNew.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/UserNew.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/UserNew.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/UserNew.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,92 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp"%>
+<%
+String ctxPath = request.getContextPath();
+boolean allowNewUsers = RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
+if (!allowNewUsers && !request.isUserInRole("admin"))
+{ %>
+ <span style="warning"><fmt:message key="newuser.newUserCreationDisabled" /></span>
+<% }
+else
+{ %>
+<script>
+ function previewImage(theme)
+ {
+ document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
+ }
+</script>
+
+<br />
+<h1><fmt:message key="newUser.addNewUser" /></h1>
+
+<br />
+<html:form action="/user" method="post" focus="userName">
+ <html:hidden property="method" name="method" value="add"/></input>
+ <html:hidden property="id" /></input>
+ <html:hidden property="adminCreated" /></input>
+
+ <div class="formrow">
+ <label for="fullName" class="formrow" /><fmt:message key="userSettings.fullname" /></label>
+ <html:text property="fullName" size="30" maxlength="30" />
+ </div>
+
+ <div class="formrow">
+ <label for="userName" class="formrow" /><fmt:message key="userSettings.username" /></label>
+ <html:text property="userName" size="30" maxlength="30" />
+ </div>
+
+ <div class="formrow">
+ <label for="password" class="formrow" /><fmt:message key="userSettings.password" /></label>
+ <html:password property="passwordText" size="20" maxlength="20" />
+ <html:hidden property="password" />
+ </div>
+
+ <div class="formrow">
+ <label for="passwordConfirm" class="formrow" /><fmt:message key="userSettings.passwordConfirm" /></label>
+ <html:password property="passwordConfirm" size="20" maxlength="20" />
+ </div>
+
+ <div class="formrow">
+ <label for="" class="formrow" /><fmt:message key="userSettings.email" /></label>
+ <html:text property="emailAddress" size="40" maxlength="40" />
+ </div>
+
+ <div class="formrow">
+ <label for="locale" class="formrow" /><fmt:message key="userSettings.locale" /></label>
+ <html:select property="locale" size="1" >
+ <html:options collection="roller.locales" property="value" labelProperty="label"/>
+ </html:select>
+ </div>
+
+ <div class="formrow">
+ <label for="timezone" class="formrow" /><fmt:message key="userSettings.timezone" /></label>
+ <html:select property="timezone" size="1" >
+ <html:options collection="roller.timezones" property="value" labelProperty="label"/>
+ </html:select>
+ </div>
+
+ <br />
+
+ <div class="formrow">
+ <label for="theme" class="formrow" /><fmt:message key="newuser.theme" /></label>
+ <html:select property="theme" size="1" onchange="previewImage(this[selectedIndex].value)">
+ <html:options name="themes"/>
+ </html:select>
+ </div>
+
+ <div class="formrow">
+ <label for="preview" class="formrow" /> </label>
+ <img name="preview"
+ src="<%= ctxPath %>/images/preview/sm-theme-basic.png" height="268" width="322" />
+ </div>
+
+ <div class="control">
+ <html:submit /></input>
+ </div>
+
+</html:form>
+<%
+} // end allowNewUsers check
+%>
+
+<%@ include file="/theme/footer.jsp"%>
+
Added: incubator/roller/branches/roller_1.x/web/website/edit-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/edit-page.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/edit-page.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/edit-page.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,55 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<roller:StatusMessage/>
+
+<html:form action="/editor/page" method="post">
+
+ <h1><fmt:message key="pageForm.editPage" />:<bean:write name="weblogTemplateForm" property="name" /></h1>
+
+ <table>
+ <tr>
+ <td><fmt:message key="pageForm.name" /><br />
+ <html:text property="name" size="50"/>
+ </td>
+ </tr>
+ <tr>
+ <td><fmt:message key="pageForm.link" /><br />
+ <html:text property="link" size="50"/>
+ </td>
+ </tr>
+ <tr>
+ <td><fmt:message key="pageForm.description" /><br />
+ <html:textarea property="description" rows="3" cols="50"/>
+ </td>
+ </tr>
+ <tr>
+
+ </td>
+ </tr>
+ </table>
+
+ <fmt:message key="pageForm.template" /><br />
+ <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
+
+ <html:hidden property="id"/>
+ <html:hidden property="name"/>
+
+ <br />
+ <input type="submit" value='<fmt:message key="pageForm.save" />' /></input>
+ <html:hidden property="method" value="update"/>
+
+</html: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>
+
+<%@ include file="/theme/footer.jsp" %>
+
+
Added: incubator/roller/branches/roller_1.x/web/website/edit-pages.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/edit-pages.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/edit-pages.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/edit-pages.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,72 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %><%
+request.setAttribute("customTheme", org.roller.pojos.Theme.CUSTOM); %>
+
+<roller:StatusMessage/>
+
+<h1><fmt:message key="pagesForm.title" /></h1>
+
+<c:if test="${website.editorTheme ne customTheme}">
+<p><fmt:message key="pagesForm.themesReminder"><fmt:param value="${website.editorTheme}"/></fmt:message></p>
+</c:if>
+
+<%-- table of pages --%>
+<table class="rollertable">
+ <tr>
+ <th width="10%"><fmt:message key="pagesForm.name" /></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.edit" /></th>
+ <th width="5%"><fmt:message key="pagesForm.remove" /></th>
+ </tr>
+ <logic:iterate id="p" name="pages" >
+ <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>
+
+ <%-- links to edit and remove page actions --%>
+ <td class="center">
+ <roller:link forward="editPage">
+ <roller:linkparam id="username" name="user" property="userName" />
+ <roller:linkparam id="pageid" name="p" property="id" />
+ <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" />
+ </roller:link>
+ </td>
+
+ <td class="center">
+ <c:choose>
+ <c:when test="${p.id != website.defaultPageId}">
+ <roller:link forward="removePage.ok">
+ <roller:linkparam id="username" name="user" property="userName" />
+ <roller:linkparam id="pageid" name="p" property="id" />
+ <img src='<c:url value="/images/Remove16.gif"/>' border="0" alt="icon" />
+ </roller:link>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="pagesForm.required"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+
+ </roller:row>
+ </logic:iterate>
+</table>
+
+<p><fmt:message key="pagesForm.hiddenNote" /></p>
+
+<%-- form to add a new page --%>
+<h2><fmt:message key="pagesForm.addNewPage" /></h2>
+<html:form action="/editor/page" method="post" focus="name">
+
+ <fmt:message key="pagesForm.name"/>: <html:text property="name" size="30"/>
+
+ <input type="submit" value='<fmt:message key="pagesForm.add" />' />
+ <input type="hidden" property="template"
+ value="<html><body><fmt:message key="pagesForm.emptyPage" /></body></html>" />
+ <html:hidden property="method" value="add"/>
+
+</html:form>
+
+<%@ include file="/theme/footer.jsp" %>
+
Added: incubator/roller/branches/roller_1.x/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/edit-website.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/edit-website.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/edit-website.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,141 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<roller:StatusMessage/>
+
+<h1><fmt:message key="websiteSettings.title" /></h1>
+<html:form action="/editor/website" method="post">
+ <html:hidden property="method" value="update"/></input>
+
+ <html:hidden property="id"/></input>
+ <html:hidden property="weblogDayPageId" />
+ <html:hidden property="locale"/></input>
+ <html:hidden property="timezone"/></input>
+ <html:hidden property="editorTheme"/></input>
+ <html:hidden property="isEnabled"/></input>
+
+<table>
+
+ <tr>
+ <td class="propname" width="30%"><fmt:message key="websiteSettings.websiteTitle" />
+ <td><html:text property="name" size="60"/></input></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.websiteDescription" /></td>
+ <td><html:textarea property="description" rows="3" cols="40"/></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.homePage" /></td>
+ <td>
+ <html:select property="defaultPageId" size="1">
+ <html:options collection="pages"
+ property="id" labelProperty="name" />
+ </html:select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.editor" /></td>
+ <td>
+ <html:select property="editorPage" size="1">
+ <html:options name="editorPagesList" />
+ </html:select></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.defaultCategory" /></td>
+ <td>
+ <html:select property="defaultCategoryId" size="1">
+ <html:options collection="categories"
+ property="id" labelProperty="path" />
+ </html:select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.allowComments" /></td>
+ <td><html:checkbox property="allowComments" /></input></td>
+ </tr>
+<%
+boolean emailComments = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
+if (emailComments) { %>
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.emailComments" /></td>
+ <td><html:checkbox property="emailComments" onclick="toggleNextRow(this)" /></input></td>
+ </tr>
+
+ <tr <c:if test="${!websiteFormEx.emailComments}">style="display: none"</c:if>>
+ <td class="propname"><fmt:message key="websiteSettings.emailFromAddress" /></td>
+ <td><html:text size="50" property="emailFromAddress" /></input></td>
+ </tr>
+
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
+ <td></td>
+ </tr>
+<% } %>
+
+<% if (org.roller.presentation.velocity.ContextLoader.hasPlugins()) { %>
+ <tr>
+ <td class="propname">Default Entry Formatters <br />(applied in the listed order)</td>
+ <td>
+ <logic:iterate id="plugin" type="org.roller.presentation.velocity.PagePlugin"
+ collection="<%= org.roller.presentation.velocity.ContextLoader.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>
+ </tr>
+<% } else { %>
+ <html:hidden property="defaultPlugins" />
+<% } %>
+
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.enableBloggerApi" /></td>
+ <td><html:checkbox property="enableBloggerApi" /></input></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.bloggerApiCategory" /></td>
+ <td>
+ <html:select property="bloggerCategoryId" size="1">
+ <html:options collection="bloggerCategories"
+ property="id" labelProperty="path" />
+ </html:select>
+ </td>
+ </tr>
+
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.spamPrevention" /></h2></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.ignoreUrls" /></td>
+ <td><html:textarea property="ignoreWords" rows="7" cols="60"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td class="buttonBox" colspan="2">
+ <input type="submit" value='<fmt:message key="websiteSettings.button.update" />' />
+ </td>
+ </tr>
+</table>
+
+</html:form>
+
+<%@ include file="/theme/footer.jsp" %>
+
Added: incubator/roller/branches/roller_1.x/web/website/remove-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/remove-page.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/remove-page.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/remove-page.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,36 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+
+<h3>
+<jsp:useBean id="weblogTemplateForm" scope="session"
+ class="org.roller.presentation.forms.WeblogTemplateForm"/>
+Remove Page [<jsp:getProperty name="weblogTemplateForm" property="name"/>]
+</h3>
+
+<p>Are you sure you want to remove this page?</p>
+<p>
+Page name = [<jsp:getProperty name="weblogTemplateForm" property="name"/>]<br />
+Page id = [<jsp:getProperty name="weblogTemplateForm" property="id"/>]
+</p>
+
+<table>
+<tr>
+ <td>
+ <html:form action="/editor/page" method="post">
+ <html:submit value="Yes"/></input>
+ <html:hidden property="method" value="remove"/></input>
+ <html:hidden property="id" /></input>
+ </html:form>
+ </td>
+ <td>
+ <html:form action="/editor/page" method="post">
+ <html:hidden name="user" property="userName" /></input>
+ <html:submit value="No"/></input>
+ <html:hidden property="method" value="cancel"/></input>
+ </html:form>
+ </td>
+</tr>
+</table>
+
+<%@ include file="/theme/footer.jsp" %>
+
Added: incubator/roller/branches/roller_1.x/web/website/rollerConfig.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/rollerConfig.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/rollerConfig.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/rollerConfig.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,185 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<roller:StatusMessage/>
+
+<h1><fmt:message key="configForm.title" /></h1>
+<html:form action="/admin/rollerConfig" method="post">
+
+ <html:hidden property="id"/></input>
+ <html:hidden property="databaseVersion"/></input>
+
+ <!-- these are too dangerous to set through the editor/admin UI -->
+ <html:hidden property="encryptPasswords" /></input>
+ <html:hidden property="algorithm" /></input>
+
+ <table border="0">
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="configForm.siteSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.siteName" /></td>
+ <td><html:text property="siteName" size="50" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.siteDescription" /></td>
+ <td><html:text property="siteDescription" size="50" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.siteAdminEmail" /></td>
+ <td><html:text property="emailAddress" size="50" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.absoluteUrl" /></td>
+ <td><html:text property="absoluteURL" size="50" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.enableLinkback" /></td>
+ <td><html:checkbox property="enableLinkback" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.searchIndexDir" /></td>
+ <td><html:text property="indexDir" size="50" /></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="configForm.userSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.allowNewUsers" /></td>
+ <td><html:checkbox property="newUserAllowed" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.newUserThemes" /></td>
+ <td><html:text property="userThemes"/></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.editorPages" /></td>
+ <td><html:textarea property="editorPages" cols="40" rows="2" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.autoformatComments" /></td>
+ <td><html:checkbox property="autoformatComments" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.escapeCommentHtml" /></td>
+ <td><html:checkbox property="escapeCommentHtml" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.emailComments" /></td>
+ <td><html:checkbox property="emailComments" /></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="configForm.fileUploadSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.enableFileUploads" /></td>
+ <td><html:checkbox property="uploadEnabled" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.allowedExtensions" /></td>
+ <td><html:text property="uploadAllow" size="30" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.forbiddenExtensions" /></td>
+ <td><html:text property="uploadForbid" size="30" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.maxFileSize" /></td>
+ <td><html:text property="uploadMaxFileMB" size="5" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.maxDirSize" /></td>
+ <td><html:text property="uploadMaxDirMB" size="5" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.uploadDir" /></td>
+ <td><html:text property="uploadDir" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.uploadPath" /></td>
+ <td><html:text property="uploadPath" /></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="configForm.rssAggregatorSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.enableRssAggregator" /></td>
+ <td><html:checkbox property="enableAggregator" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.cacheIncomingRss" /></td>
+ <td><html:checkbox property="rssUseCache" /></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.rssNewsfeedCacheTime" /></td>
+ <td><html:text property="rssCacheTime" size="10" /></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="configForm.debuggingSettings" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="configForm.enableMemoryDebugging" /></td>
+ <td><html:checkbox property="memDebug" /></td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="websiteSettings.spamPrevention" /></h2></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.ignoreUrls" /></td>
+ <td><html:textarea property="refererSpamWords" rows="7" cols="60"/></td>
+ </tr>
+
+ <tr>
+ <td class="buttonBox" colspan="2">
+ <input class="buttonBox" type="submit" value='<fmt:message key="configForm.save" />'/>
+ </td>
+ </tr>
+
+ </table>
+
+ <html:hidden property="method" value="update"/>
+
+</html:form>
+
+
+<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file
Added: incubator/roller/branches/roller_1.x/web/website/rollerProperties.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/rollerProperties.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/rollerProperties.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/rollerProperties.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,88 @@
+<%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %>
+<%@ include file="/taglibs.jsp" %>
+<%@ include file="/theme/header.jsp" %>
+
+<%-- 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() %>
+</x:parse>
+
+
+<roller:StatusMessage/>
+
+<h1><fmt:message key="configForm.title" /></h1>
+<form action="rollerConfig.do" method="post">
+
+<input type="hidden" name="method" value="update">
+
+ <table border="0">
+
+ <x:forEach select="$configDefs//config-def[@name='global-properties']/display-group">
+ <c:set var="displayGroupKey"><x:out select="@key"/></c:set>
+
+ <tr>
+ <td colspan="2"><h2><fmt:message key="${displayGroupKey}" /></h2></td>
+ </tr>
+
+ <x:forEach select="property-def">
+ <c:set var="propLabelKey"><x:out select="@key"/></c:set>
+ <c:set var="name"><x:out select="@name"/></c:set>
+
+ <tr>
+ <td class="propname"><fmt:message key="${propLabelKey}" /></td>
+
+ <%-- choose the right html input element for the display --%>
+ <x:choose>
+
+ <%-- "string" type means use a simple textbox --%>
+ <x:when select="type='string'">
+ <td><input type="text" name='<c:out value="${name}"/>' value='<c:out value="${RollerProps[name].value}"/>' size="35" /></td>
+ </x:when>
+
+ <%-- "text" type means use a full textarea --%>
+ <x:when select="type='text'">
+ <td>
+ <textarea name='<c:out value="${name}"/>' rows="<x:out select="rows"/>" cols="<x:out select="cols"/>"><c:out value="${RollerProps[name].value}"/></textarea>
+ </td>
+ </x:when>
+
+ <%-- "boolean" type means use a checkbox --%>
+ <x:when select="type='boolean'">
+ <c:choose>
+ <c:when test="${RollerProps[name].value eq 'true'}">
+ <td><input type="checkbox" name='<c:out value="${name}"/>' CHECKED></td>
+ </c:when>
+ <c:otherwise>
+ <td><input type="checkbox" name='<c:out value="${name}"/>'></td>
+ </c:otherwise>
+ </c:choose>
+ </x:when>
+
+ <%-- if it's something we don't understand then use textbox --%>
+ <x:otherwise>
+ <td><input type="text" name='<c:out value="${name}"/>' size="50" /></td>
+ </x:otherwise>
+ </x:choose>
+ </tr>
+
+ </x:forEach>
+
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+
+ </x:forEach>
+
+ <tr>
+ <td class="buttonBox" colspan="2">
+ <input class="buttonBox" type="submit" value="<fmt:message key="configForm.save"/>"/>
+ </td>
+ </tr>
+
+ </table>
+
+<form>
+
+
+<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file
Added: incubator/roller/branches/roller_1.x/web/website/theme-editor.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/theme-editor.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/theme-editor.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/theme-editor.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,115 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.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));
+
+String username = "";
+try {
+ RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ UserData ud = rreq.getUser();
+ username = ud.getUserName();
+} catch (Exception e) {
+ throw new ServletException(e);
+}
+%>
+<h1><fmt:message key="themeEditor.title" /></h1>
+
+<form action="themeEditor.do" method="post">
+
+ <input type=hidden name="method" value="preview" />
+
+ <table width="95%">
+
+ <tr>
+ <td>
+ <p>
+ Your current theme is : <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}">
+ If you like you may customize a personal copy of this theme.<br/>
+ <fmt:message key="themeEditor.saveWarning" /><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/<%= username %>?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="/theme/footer.jsp"%>
Added: incubator/roller/branches/roller_1.x/web/website/upload-file.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/upload-file.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/upload-file.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/upload-file.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,34 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<roller:StatusMessage/>
+
+<h1><fmt:message key="uploadFiles.title" /></h1>
+<roller:FileUpload />
+
+<h2><fmt:message key="uploadFiles.manageFiles" /></h2>
+
+<html:form action="/editor/uploadFiles" method="post">
+ <roller:FileManager />
+ <table>
+ <tr>
+ <td align="left">
+ <input type="submit" value='<fmt:message key="uploadFiles.button.delete" />' /></input>
+ </td>
+ </tr>
+ </table>
+ <input type="hidden" name="method" value="delete"></input>
+</html:form>
+
+<%--
+Added by Matt Raible since the focus javascript generated by Struts uses
+a name reference and IE seems to only focus on file inputs via elements[0]?
+--%>
+<script type="text/javascript">
+<!--
+ document.forms[0].elements[0].focus();
+// -->
+</script>
+
+
+<%@ include file="/theme/footer.jsp" %>
+
Added: incubator/roller/branches/roller_1.x/web/website/welcome.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/web/website/welcome.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/web/website/welcome.jsp (added)
+++ incubator/roller/branches/roller_1.x/web/website/welcome.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,15 @@
+<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+
+<h2><fmt:message key="welcome.title" /></h2>
+
+<p><fmt:message key="welcome.accountCreated" /></p>
+
+<p><b><fmt:message key="welcome.addressIs" />:</b> <c:out value="${weblogURL}"/></p>
+
+<p><b><fmt:message key="welcome.rssAddressIs" />:</b> <c:out value="${rssURL}"/></p>
+
+<p><a href='<c:out value="${contextURL}"/>/editor/weblog.do?method=create&rmik=New%20Entry'><fmt:message key="welcome.clickHere" /></a>
+<fmt:message key="welcome.toLoginAndPost" /></p>
+
+<%@ include file="/theme/footer.jsp" %>
+