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/11/14 05:30:52 UTC
svn commit: r344031 - in /incubator/roller/trunk: metadata/xdoclet/
src/org/roller/presentation/website/actions/ web/WEB-INF/
web/WEB-INF/classes/ web/website/
Author: snoopdave
Date: Sun Nov 13 20:30:45 2005
New Revision: 344031
URL: http://svn.apache.org/viewcvs?rev=344031&view=rev
Log:
Restored missing weblog maintenance page
Modified:
incubator/roller/trunk/metadata/xdoclet/global-forwards.xml
incubator/roller/trunk/src/org/roller/presentation/website/actions/MaintenanceAction.java
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/WEB-INF/editor-menu.xml
incubator/roller/trunk/web/WEB-INF/tiles-defs.xml
incubator/roller/trunk/web/website/Maintenance.jsp
Modified: incubator/roller/trunk/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/global-forwards.xml?rev=344031&r1=344030&r2=344031&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/global-forwards.xml Sun Nov 13 20:30:45 2005
@@ -42,6 +42,7 @@
<forward name="inviteMember" path="/editor/inviteMember.do" />
<forward name="pingSetup" path="/editor/pingSetup.do" />
<forward name="customPingTargets" path="/editor/customPingTargets.do" />
+<forward name="maintenance" path="/editor/maintenance.do" />
<forward name="trackback" path="/editor/trackback.do?method=send"/>
<forward name="toggleLinkback" path="/editor/toggleLinkback.do"/>
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/MaintenanceAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/MaintenanceAction.java?rev=344031&r1=344030&r2=344031&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/MaintenanceAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/MaintenanceAction.java Sun Nov 13 20:30:45 2005
@@ -24,6 +24,7 @@
import org.roller.model.IndexManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.pagecache.PageCacheFilter;
@@ -32,7 +33,8 @@
* Allows user to perform Website maintenence operations such as flushing
* the website page cache or re-indexing the website search index.
*
- * @struts.action path="/editor/maintenance" name="maintenanceForm" scope="request" parameter="method"
+ * @struts.action path="/editor/maintenance" name="maintenanceForm"
+ * scope="request" parameter="method"
*
* @struts.action-forward name="maintenance.page" path=".Maintenance"
*/
@@ -56,6 +58,8 @@
HttpServletResponse response)
throws ServletException
{
+ request.setAttribute("model", new BasePageModel(
+ "maintenance.title", request, response, mapping));
return mapping.findForward("maintenance.page");
}
@@ -85,7 +89,9 @@
messages.add(null, new ActionMessage("maintenance.message.indexed"));
saveMessages(request, messages);
}
- }
+ request.setAttribute("model", new BasePageModel(
+ "maintenance.title", request, response, mapping));
+ }
catch (RollerException re)
{
mLogger.error("Unexpected exception",re.getRootCause());
@@ -122,7 +128,10 @@
ActionMessages messages = new ActionMessages();
messages.add(null, new ActionMessage("maintenance.message.flushed"));
saveMessages(request, messages);
+
}
+ request.setAttribute("model", new BasePageModel(
+ "maintenance.title", request, response, mapping));
}
catch (Exception e)
{
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?rev=344031&r1=344030&r2=344031&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Sun Nov 13 20:30:45 2005
@@ -588,6 +588,7 @@
# ------------------------------------------------------------------ Maintenance
maintenance.title=Weblog Maintenance
+maintenance.subtitle=Perfom weblog maintenance operations.
maintenance.prompt.index=Rebuild the search index for your Roller weblog.
maintenance.button.index=Rebuild Search Index
maintenance.prompt.flush=Flush the page cache for your Roller weblog.
Modified: incubator/roller/trunk/web/WEB-INF/editor-menu.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/editor-menu.xml?rev=344031&r1=344030&r2=344031&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/editor-menu.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/editor-menu.xml Sun Nov 13 20:30:45 2005
@@ -48,6 +48,8 @@
perms="admin" />
<menu-item forward="customPingTargets" name="tabbedmenu.weblog.customPingTargets"
disabledProperty="pings.disallowCustomTargets"
+ perms="admin" />
+ <menu-item forward="maintenance" name="tabbedmenu.website.maintenance"
perms="admin" />
</menu>
Modified: incubator/roller/trunk/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/tiles-defs.xml?rev=344031&r1=344030&r2=344031&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/tiles-defs.xml Sun Nov 13 20:30:45 2005
@@ -167,6 +167,9 @@
<definition name=".Pings" extends=".tiles-editorpage" >
<put name="content" value="/weblog/Pings.jsp" />
</definition>
+<definition name=".Maintenance" extends=".tiles-editorpage" >
+ <put name="content" value="/website/Maintenance.jsp" />
+</definition>
<definition name=".WebsiteRemove" extends=".tiles-simplepage" >
<put name="content" value="/website/WebsiteRemove.jsp" />
Modified: incubator/roller/trunk/web/website/Maintenance.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/Maintenance.jsp?rev=344031&r1=344030&r2=344031&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/Maintenance.jsp (original)
+++ incubator/roller/trunk/web/website/Maintenance.jsp Sun Nov 13 20:30:45 2005
@@ -1,21 +1,26 @@
<%@ include file="/taglibs.jsp" %>
-<h1><fmt:message key="maintenance.title" /></h1>
+<p class="subtitle"><fmt:message key="maintenance.subtitle" /></p>
<html:form action="/editor/maintenance" method="post">
-
<input type="hidden" name="method" value="" />
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
- <fmt:message key="maintenance.prompt.index" /><br />
- <input type="submit" value='<fmt:message key="maintenance.button.index" />'
- onclick="this.form.method.value='index'" />
- <br />
- <br />
-
- <fmt:message key="maintenance.prompt.flush" /><br />
+ <fmt:message key="maintenance.prompt.flush" /><br /><br />
<input type="submit" value='<fmt:message key="maintenance.button.flush" />'
- onclick="this.form.method.value='flushCache'" />
-
+ onclick="this.form.method.value='flushCache'" />
+
+ <%
+ boolean searchEnabled = RollerConfig.getBooleanProperty("search.enabled");
+ request.setAttribute("searchEnabled", new Boolean(searchEnabled));
+ %>
+ <c:if test="${searchEnabled}">
+ <br /><br />
+ <fmt:message key="maintenance.prompt.index" /><br /><br />
+ <input type="submit" value='<fmt:message key="maintenance.button.index" />'
+ onclick="this.form.method.value='index'" />
+ </c:if>
+
</html:form>