Author: gmazza
Date: Wed Jul 16 18:00:26 2014
New Revision: 1611118
URL: http://svn.apache.org/r1611118
Log:
ROL-2021, ROL-2022: Get tag cloud to appear again on fauxcoly and gaurav themes.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm
roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1611118&r1=1611117&r2=1611118&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Wed Jul 16 18:00:26 2014
@@ -899,8 +899,8 @@ public class Weblog implements Serializa
* @param length Max number of tags to return.
* @return Collection of WeblogEntryTag objects
*/
- public List getPopularTags(int sinceDays, int length) {
- List results = new ArrayList();
+ public List<TagStat> getPopularTags(int sinceDays, int length) {
+ List<TagStat> results = new ArrayList();
Date startDate = null;
if(sinceDays > 0) {
Calendar cal = Calendar.getInstance();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1611118&r1=1611117&r2=1611118&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
Wed Jul 16 18:00:26 2014
@@ -21,6 +21,7 @@ package org.apache.roller.weblogger.pojo
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.URLStrategy;
+import org.apache.roller.weblogger.pojos.TagStat;
import org.apache.roller.weblogger.util.HTMLSanitizer;
import java.util.*;
@@ -376,8 +377,7 @@ public final class WeblogWrapper {
return this.pojo.getTodaysHits();
}
- // TODO: needs wrapping
- public List getPopularTags(int sinceDays,int length) {
+ public List<TagStat> getPopularTags(int sinceDays,int length) {
return this.pojo.getPopularTags(sinceDays,length);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?rev=1611118&r1=1611117&r2=1611118&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
Wed Jul 16 18:00:26 2014
@@ -33,6 +33,7 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryManager;
+import org.apache.roller.weblogger.pojos.TagStat;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.StatCount;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
@@ -529,7 +530,7 @@ public class SiteModel implements Model
* @param length
* @return
*/
- public List getPopularTags(int sinceDays, int length) {
+ public List<TagStat> getPopularTags(int sinceDays, int length) {
List results = new ArrayList();
Date startDate = null;
if(sinceDays > 0) {
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm?rev=1611118&r1=1611117&r2=1611118&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm Wed Jul 16
18:00:26 2014
@@ -92,18 +92,16 @@ Click the link below to subscribe via yo
<a href="$url.feed.entries.atom">Subscribe to this blog</a>
</div>
-<h3>Hot tags</h3>
-
-<p class="details">Below are the most often used tags in the blog. Hover over
a tag to see a count of entries, click a tag to see the most recent posts with
the tag.</p>
-
-<div id="tagcloud">
#set($mytags = $model.weblog.getPopularTags(-1, 30))
-#foreach ($tag in $mytags)
- #if ($tag.count > 5)
- <a class="tag s${tag.intensity}" href="$url.tag($tag.name)"
title="$tag.count">$tag.name</a>
- #end
+#if ($mytags && $mytags.size() > 4)
+ <h3>Hot tags</h3>
+ <p class="details">Below are the most often used tags in the blog. Hover
over a tag to see a count of entries, click a tag to see the most recent posts
with the tag.</p>
+ <div id="tagcloud">
+ #foreach ($tag in $mytags)
+ <a class="tag s${tag.intensity}" href="$url.tag($tag.name)"
title="$tag.count">$tag.name</a>
+ #end
+ </div>
#end
-</div>
</div> <!-- close sidebar_content -->
</div> <!-- close yui3-u-1-3 -->
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm?rev=1611118&r1=1611117&r2=1611118&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm Wed Jul 16
18:00:26 2014
@@ -41,16 +41,16 @@
<!-- BODY - SIDEBAR -->
<div id="sidebar_content" class="col-lg-4">
<div class="well">
- <h3>Hot tags</h3>
- <div id="tagcloud">
- #set($mytags = $model.weblog.getPopularTags(-1,
30))
- #foreach ($tag in $mytags)
- #if ($tag.count > 5)
- <a class="tag s${tag.intensity}"
href="$url.tag($tag.name)" title="$tag.count">$tag.name</a>
- #end
- #end
- </div>
-
+ #set($mytags = $model.weblog.getPopularTags(-1, 30))
+ #if ($mytags && $mytags.size() > 4)
+ <h3>Hot tags</h3>
+ <p class="details">Below are the most often used tags
in the blog. Hover over a tag to see a count of entries, click a tag to see the
most recent posts with the tag.</p>
+ <div id="tagcloud">
+ #foreach ($tag in $mytags)
+ <a class="tag s${tag.intensity}"
href="$url.tag($tag.name)" title="$tag.count">$tag.name</a>
+ #end
+ </div>
+ #end
</div>
</div> <!-- close sidebar_content -->
</div>
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm?rev=1611118&r1=1611117&r2=1611118&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm Wed Jul 16
18:00:26 2014
@@ -60,16 +60,16 @@
</div>
</div>
<div class="well">
- <h3>Hot tags</h3>
- <p class="details">Below are the most
often used tags in the blog. Hover over a tag to see a count of entries, click
a tag to see the most recent posts with the tag.</p>
- <div id="tagcloud">
- #set($mytags =
$model.weblog.getPopularTags(-1, 30))
- #foreach ($tag in $mytags)
- #if ($tag.count > 5)
- <a class="tag
s${tag.intensity}" href="$url.tag($tag.name)" title="$tag.count">$tag.name</a>
- #end
- #end
- </div>
+ #set($mytags = $model.weblog.getPopularTags(-1, 30))
+ #if ($mytags && $mytags.size() > 4)
+ <h3>Hot tags</h3>
+ <p class="details">Below are the most often used tags
in the blog. Hover over a tag to see a count of entries, click a tag to see the
most recent posts with the tag.</p>
+ <div id="tagcloud">
+ #foreach ($tag in $mytags)
+ <a class="tag s${tag.intensity}"
href="$url.tag($tag.name)" title="$tag.count">$tag.name</a>
+ #end
+ </div>
+ #end
</div>
</div> <!-- close sidebar_content -->
</div> <!-- /.row -->
