roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1619231 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ webapp/WEB-INF/velocity/templates/feeds/
Date Wed, 20 Aug 2014 21:01:34 GMT
Author: gmazza
Date: Wed Aug 20 21:01:33 2014
New Revision: 1619231

URL: http://svn.apache.org/r1619231
Log:
Fixed the enclosure URL string, removed the incubating references on the Atom page.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java?rev=1619231&r1=1619230&r2=1619231&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
Wed Aug 20 21:01:33 2014
@@ -90,11 +90,11 @@ public class EntryAddWithMediaFile exten
                 }
             }
 
-            if (bean.getEnclosureURL() != null) {
+            if (!StringUtils.isEmpty(bean.getEnclosureURL())) {
                 sb.append("<p>")
                   .append(getText("mediaFileEdit.includesEnclosure"))
                   .append("<br />")
-                  .append("<a href=''>")
+                  .append("<a href='" + bean.getEnclosureURL() + "'>")
                   .append(bean.getEnclosureURL())
                   .append("</a></p>");
             }

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm?rev=1619231&r1=1619230&r2=1619231&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
Wed Aug 20 21:01:33 2014
@@ -27,7 +27,7 @@
         #showFeedHistory($pager)
     #end
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
-    <generator uri="http://roller.apache.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache
Roller (incubating)</generator>
+    <generator uri="http://roller.apache.org" version="$config.rollerVersion">Apache
Roller</generator>
     #showCommentsAtom10($pager.items)
 </feed>
 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm?rev=1619231&r1=1619230&r2=1619231&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
Wed Aug 20 21:01:33 2014
@@ -28,7 +28,7 @@
   <language>en-us</language>
   <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
   <lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
-  <generator>Apache Roller (incubating) $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
+  <generator>Apache Roller $config.rollerVersion</generator>
   #showCommentsRSS20($model.commentsPager.items)
 </channel>
 </rss>
\ No newline at end of file

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm?rev=1619231&r1=1619230&r2=1619231&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
Wed Aug 20 21:01:33 2014
@@ -34,7 +34,7 @@
         #showFeedHistory($pager)
     #end
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
-    <generator uri="http://roller.apache.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache
Roller (incubating)</generator>
+    <generator uri="http://roller.apache.org" version="$config.rollerVersion">Apache
Roller</generator>
     #showEntriesAtom10($pager.items)
 </feed>
 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm?rev=1619231&r1=1619230&r2=1619231&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
Wed Aug 20 21:01:33 2014
@@ -34,7 +34,7 @@
   <language>en-us</language>
   <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
   <lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
-  <generator>Apache Roller (incubating) $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
+  <generator>Apache Roller $config.rollerVersion</generator>
   #set($entries = $model.weblogEntriesPager.items)
   #showEntriesRSS20($entries)
 </channel>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm?rev=1619231&r1=1619230&r2=1619231&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
Wed Aug 20 21:01:33 2014
@@ -25,7 +25,6 @@
     <link rel="self" type="application/atom+xml" href="$url.feed.mediaFiles.atom" />
     <link rel="alternate" type="text/html" href="$url.home" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
-    <generator uri="http://roller.apache.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache
Roller (incubating)</generator>
+    <generator uri="http://roller.apache.org" version="$config.rollerVersion">Apache
Roller</generator>
     #showFilesAtom10($pager.items)
 </feed>
-



Mime
View raw message