roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1517701 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/rendering/servlets/ resources/ webapp/WEB-INF/jsps/editor/
Date Mon, 26 Aug 2013 21:16:46 GMT
Author: gmazza
Date: Mon Aug 26 21:16:46 2013
New Revision: 1517701

URL: http://svn.apache.org/r1517701
Log:
Requiring at least one category on the Categories page to prevent hiccups that occur when
trying to create blog entries without a category attached to it.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
Mon Aug 26 21:16:46 2013
@@ -37,9 +37,6 @@ import org.apache.roller.weblogger.ui.re
  * comment authentication.  This is done outside of the normal rendering process
  * so that we can cache full pages and still set the comment authentication
  * section dynamically.
- *
- * @web.servlet name="CommentAuthenticatorServlet" load-on-startup="7"
- * @web.servlet-mapping url-pattern="/CommentAuthenticatorServlet"
  */
 public class CommentAuthenticatorServlet extends HttpServlet {
     

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Mon Aug 26 21:16:46 2013
@@ -50,9 +50,6 @@ import org.apache.roller.weblogger.ui.re
 
 /**
  * Responsible for rendering weblog feeds.
- *
- * @web.servlet name="FeedServlet" load-on-startup="5"
- * @web.servlet-mapping url-pattern="/roller-ui/rendering/feed/*"
  */
 public class FeedServlet extends HttpServlet {
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
Mon Aug 26 21:16:46 2013
@@ -45,9 +45,6 @@ import org.apache.roller.weblogger.ui.re
  * Since we keep resources in a location outside of the webapp
  * context we need a way to serve them up.  This servlet assumes that
  * resources are stored on a filesystem in the "uploads.dir" directory.
- *
- * @web.servlet name="MediaResourceServlet" load-on-startup="5"
- * @web.servlet-mapping url-pattern="/roller-ui/rendering/media-resources/*"
  */
 public class MediaResourceServlet extends HttpServlet {
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
Mon Aug 26 21:16:46 2013
@@ -46,10 +46,7 @@ import org.apache.roller.weblogger.util.
 
 
 /**
- * Planet Roller (i.e. NOT for Planet Tool) RSS feed.
- *
- * @web.servlet name="PlanetFeedServlet" load-on-startup="7"
- * @web.servlet-mapping url-pattern="/planetrss/*"
+ * Planet Roller RSS feed.
  */
 public class PlanetFeedServlet extends HttpServlet {
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
Mon Aug 26 21:16:46 2013
@@ -47,9 +47,6 @@ import org.apache.roller.weblogger.ui.re
  * static resources in shared themes.  This servlet differs from the normal
  * ResourceServlet because it can accept urls parameters which affect how it
  * behaves which are used for previewing.
- *
- * @web.servlet name="PreviewResourceServlet" load-on-startup="9"
- * @web.servlet-mapping url-pattern="/roller-ui/authoring/previewresource/*"
  */
 public class PreviewResourceServlet extends HttpServlet {
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
Mon Aug 26 21:16:46 2013
@@ -48,9 +48,6 @@ import org.apache.roller.weblogger.util.
  *
  * This servlet supports 304 If-Modified-Since checking, but does not do any
  * level of content caching.
- *
- * @web.servlet name="RSDServlet" load-on-startup="7"
- * @web.servlet-mapping url-pattern="/roller-ui/rendering/rsd/*"
  */
 public class RSDServlet extends HttpServlet {
     

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
Mon Aug 26 21:16:46 2013
@@ -43,9 +43,6 @@ import org.apache.roller.weblogger.ui.re
 /**
  * Serves fixed-path files such as old-style uploads and theme resources,
  * which must exist at a fixed-path even if moved in media file folders.
- *
- * @web.servlet name="ResourcesServlet" load-on-startup="5"
- * @web.servlet-mapping url-pattern="/roller-ui/rendering/resources/*"
  */
 public class ResourceServlet extends HttpServlet {
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
Mon Aug 26 21:16:46 2013
@@ -48,10 +48,7 @@ import org.apache.roller.weblogger.util.
 /**
  * Roller's Trackback server implementation. POSTing to this Servlet will add a
  * Trackback to a Weblog Entry. For more info on Trackback, read the spec:
- * <a href="http://www.movabletype.org/docs/mttrackback.html">MT Trackback</a>.
- *
- * @web.servlet name="TrackbackServlet"
- * @web.servlet-mapping url-pattern="/roller-ui/rendering/trackback/*"
+ * <a href="http://www.movabletype.org/documentation/trackback/specification.html">MT
Trackback</a>.
  */
 public class TrackbackServlet extends HttpServlet { 
     

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Aug 26 21:16:46
2013
@@ -168,8 +168,9 @@ categoriesForm.edit=Edit
 categoriesForm.root=root
 categoriesForm.rootTitle=Categories
 categoriesForm.rootPrompt=\
-These are your top-level weblog categories. \
-You can use categories to organize your weblog entries and your readers can \
+These are your top-level weblog categories. Roller requires at least one \
+category to be defined. \
+Categories are used to organize your weblog entries and your readers can \
 choose to subscribe to separate newsfeeds for each of your categories. \
 You can also define sub-categories, but many of the Roller macros display \
 only top-level categories.

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=1517701&r1=1517700&r2=1517701&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Mon Aug 26 21:16:46
2013
@@ -124,11 +124,13 @@ function onMove()
                 </td>
                 
                 <td class="rollertable" align="center">
-                    <s:url id="removeUrl" action="categoryRemove">
-                        <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="removeId" value="#category.id" />
-                    </s:url>
-                    <s:a href="%{removeUrl}"><img src='<s:url value="/images/delete.png"/>'
border="0" alt="icon" /></s:a>
+                    <s:if test="!categoryPath.isEmpty || category.weblogCategories.size()
> 1">
+                        <s:url id="removeUrl" action="categoryRemove">
+                            <s:param name="weblog" value="%{actionWeblog.handle}" />
+                            <s:param name="removeId" value="#category.id" />
+                        </s:url>
+                        <s:a href="%{removeUrl}"><img src='<s:url value="/images/delete.png"/>'
border="0" alt="icon" /></s:a>
+                    </s:if>
                 </td>
                 
             </tr>



Mime
View raw message