You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by el...@apache.org on 2006/09/21 07:01:58 UTC
svn commit: r448460 [2/2] - in /incubator/roller/trunk: ./
metadata/database/ metadata/database/hibernate/
src/org/apache/roller/business/hibernate/ src/org/apache/roller/model/
src/org/apache/roller/pojos/ src/org/apache/roller/ui/authoring/struts/for...
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp?view=diff&rev=448460&r1=448459&r2=448460
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp Wed Sep 20 22:01:56 2006
@@ -148,7 +148,13 @@
<html:select property="categoryId" size="1" tabindex="4">
<html:optionsCollection name="model" property="categories" value="id" label="path" />
</html:select>
- </td></tr>
+ </td></tr>
+
+ <tr><td class="entryEditFormLabel">
+ <label style="width:10%; float:left;" for="title"><fmt:message key="weblogEdit.tags" /></label>
+ </td><td>
+ <html:text property="tags" size="70" maxlength="255" tabindex="2" /><br/>
+ </td></tr>
<c:choose>
<c:when test="${model.weblog.enableMultiLang}">
Modified: incubator/roller/trunk/web/themes/frontpage/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/themes/frontpage/Weblog.vm?view=diff&rev=448460&r1=448459&r2=448460
==============================================================================
--- incubator/roller/trunk/web/themes/frontpage/Weblog.vm (original)
+++ incubator/roller/trunk/web/themes/frontpage/Weblog.vm Wed Sep 20 22:01:56 2006
@@ -20,7 +20,15 @@
<td class="menuTabUnselected">
<div class="menu-tr">
<div class="menu-tl">
- <a href="$url.home/page/directory">Weblog Directory</a>
+ <a href="$url.page("tags")">Site Tags</a>
+ </div>
+ </div>
+ </td>
+ <td class="menuTabSeparator"></td>
+ <td class="menuTabUnselected">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <a href="$url.page("directory")">Weblog Directory</a>
</div>
</div>
</td>
@@ -109,7 +117,7 @@
</div>
</div>
-
+
<br />
<a href='$url.feed.entries.rss' title='Combined RSS feed for site.'>
<img src='$url.absoluteSite/images/rssbadge.gif' border="0" alt='Combined RSS feed for site.' />
@@ -154,6 +162,48 @@
</ul>
<br />
</div>
+
+ <br />
+ <div class="sidebarBodyHead">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <h3>Hot Tags (past week)</h3>
+ </div>
+ </div>
+ </div>
+
+ <div class="sidebarBody">
+
+ <style>
+ span.tag a { color: #ad3537;; text-decoration: none; padding: 3px; }
+ </style>
+
+ <center>
+ #set($tags = $site.getHotTags(7, $maxResults))
+
+ #set ( $minSize = 12 )
+ #set ( $maxSize = 28 )
+
+ #set ( $max = 0 )
+ #foreach ( $tag in $tags )
+ #if ( $tag.count > $max )
+ #set ( $max = $tag.count )
+ #end
+ #end
+
+ #set ( $step = $max / ($maxSize - $minSize) )
+
+ #set ( $step = $max / ($maxSize - $minSize) )
+ #if ( $step < 1 )
+ #set ( $step = 1 )
+ #end
+ #foreach ($tag in $tags)
+ #set( $size = $minSize + ($tag.count / $step) )
+ <span class="tag" style="font-size:${size}px"><a href="#">$tag.name</span></a>
+ #end
+ </center>
+ </div>
+
</div>
</div>
Modified: incubator/roller/trunk/web/themes/frontpage/_entry.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/themes/frontpage/_entry.vm?view=diff&rev=448460&r1=448459&r2=448460
==============================================================================
--- incubator/roller/trunk/web/themes/frontpage/_entry.vm (original)
+++ incubator/roller/trunk/web/themes/frontpage/_entry.vm Wed Sep 20 22:01:56 2006
@@ -4,9 +4,10 @@
</a><br />
<p class="entryDetails">
<a href="$utils.escapeHTML($entry.website.URL)">$entry.website.name</a>
- #if($entry.category.name)| $entry.category.name #end
- #if($entry.pubTime) | $utils.formatDate($entry.pubTime, $text.get("macro.weblog.date.toStringFormat")) #end
- #if($entry.creator.userName)| By $entry.creator.userName #end
+ #if($entry.tagSet.size() > 0) $entry.getTags() |#end
+ #if($entry.category.name)$entry.category.name |#end
+ #if($entry.pubTime) $utils.formatDate($entry.pubTime, $text.get("macro.weblog.date.toStringFormat")) |#end
+ #if($entry.creator.userName) By $entry.creator.userName #end
<br/>
</p>
<p class="entryDescription">
Modified: incubator/roller/trunk/web/themes/frontpage/directory.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/themes/frontpage/directory.vm?view=diff&rev=448460&r1=448459&r2=448460
==============================================================================
--- incubator/roller/trunk/web/themes/frontpage/directory.vm (original)
+++ incubator/roller/trunk/web/themes/frontpage/directory.vm Wed Sep 20 22:01:56 2006
@@ -17,6 +17,14 @@
</div>
</td>
<td class="menuTabSeparator"></td>
+ <td class="menuTabUnselected">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <a href="$url.page("tags")">Site Tags</a>
+ </div>
+ </div>
+ </td>
+ <td class="menuTabSeparator"></td>
<td class="menuTabSelected">
<div class="menu-tr">
<div class="menu-tl">
Added: incubator/roller/trunk/web/themes/frontpage/tags.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/themes/frontpage/tags.vm?view=auto&rev=448460
==============================================================================
--- incubator/roller/trunk/web/themes/frontpage/tags.vm (added)
+++ incubator/roller/trunk/web/themes/frontpage/tags.vm Wed Sep 20 22:01:56 2006
@@ -0,0 +1,118 @@
+#includeTemplate($model.weblog "_header")
+
+#set($maxResults = 25)
+#set($since = 365)
+
+ <div id="centercontent_wrap">
+ <div id="centercontent">
+ <h1>$config.siteName</h1>
+ <p class="subtitle">$config.siteDescription</p>
+
+ <table class="menuTabTable" cellspacing="0"><tbody><tr>
+ <td class="menuTabUnselected">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <a href="$url.home">Recent Entries</a>
+ </div>
+ </div>
+ </td>
+ <td class="menuTabSeparator"></td>
+ <td class="menuTabSelected">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <a href="$url.page("tags")">Site Tags</a>
+ </div>
+ </div>
+ </td>
+ <td class="menuTabSeparator"></td>
+ <td class="menuTabUnselected">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <a href="$url.page("directory")">Weblog Directory</a>
+ </div>
+ </div>
+ </td>
+ <td class="menuTabSeparator"></td>
+ </tr></tbody></table>
+ <table class="menuItemTable" cellspacing="0"><tbody><tr>
+ <td class="padleft"></td></tr></tbody></table>
+
+ <div id="tabContent">
+
+ <div id='cloud' style="overflow: hidden; padding: 30px" >
+ <style>
+ span.tag a { color: #ad3537;; text-decoration: none; padding: 3px; }
+ </style>
+
+ <center>
+ #set ($tags = $site.getTags(90))
+
+ #set ( $minSize = 14 )
+ #set ( $maxSize = 50 )
+
+ #set ( $max = 0 )
+ #foreach ( $tag in $tags )
+ #if ( $tag.count > $max )
+ #set ( $max = $tag.count )
+ #end
+ #end
+
+ #set ( $step = $max / ($maxSize - $minSize) )
+ #if ( $step < 1 )
+ #set ( $step = 1 )
+ #end
+
+ #foreach ($tag in $tags)
+ #set( $size = $minSize + ($tag.count / $step) )
+ <span class="tag" style="font-size:${size}px"><a href="#">$tag.name</span></a>
+ #end
+ </center>
+ <br/>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ <div id="rightcontent_wrap">
+ <div id="rightcontent">
+
+ <div class="searchSidebarHead">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <h3> </h3>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="searchSidebarBody">
+ <h3>Search for blogs</h3>
+ #showWeblogSearchForm($model.weblog false)
+ </div>
+
+ <br />
+ <div class="sidebarBodyHead">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <h3>Hot blogs (today's hits)</h3>
+ </div>
+ </div>
+ </div>
+
+ <div class="sidebarBody">
+ #set($hotblogs = $site.getHotWeblogs($since, $maxResults))
+ <ul>
+ #foreach($blog in $hotblogs)
+ <li>$blog.subjectNameShort | $blog.count</li>
+ #end
+ </ul>
+ <br />
+ </div>
+
+ </div>
+ </div>
+
+</div> <!-- wrapper -->
+
+#includeTemplate($model.weblog "_footer")