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/07/21 21:16:59 UTC
svn commit: r424425 - in /incubator/roller/branches/roller_3.0/web/WEB-INF:
classes/ApplicationResources.properties jsps/authoring/edit-website.jsp
Author: snoopdave
Date: Fri Jul 21 12:16:59 2006
New Revision: 424425
URL: http://svn.apache.org/viewvc?rev=424425&view=rev
Log:
Always allow weblog removal
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-website.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=424425&r1=424424&r2=424425&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 12:16:59 2006
@@ -1606,9 +1606,10 @@
websiteSettings.removeWebsiteHeading=Remove Weblog?
websiteSettings.removeWebsite=You are the last contributor to this weblog, \
would you like to remove it?
-websiteSettings.removeWebsiteWarning=WARNING: removing a weblog will remove \
-everything: all of the weblog entries, bookmarks, comments and settings. \
-Weblog removal is NOT REVERSIBLE.
+websiteSettings.removeWebsiteWarning=\
+<b>WARNING</b>: removing a weblog will remove everything: all of the weblog \
+entries,<br />bookmarks, comments and settings. <b>Weblog removal is \
+NOT REVERSIBLE</b>.
websiteRemove.title=Confirm Weblog Remove
websiteRemove.subtitle=Weblog removal is <b>NOT REVERSABLE</b>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp?rev=424425&r1=424424&r2=424425&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp Fri Jul 21 12:16:59 2006
@@ -273,24 +273,24 @@
<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 />
+<br />
+
+<h2><fmt:message key="websiteSettings.removeWebsiteHeading" /></h2>
+<p>
+ <fmt:message key="websiteSettings.removeWebsite" /><br/><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 />
+<br />
+
</html:form>