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/08/16 18:08:15 UTC
svn commit: r431935 - in /incubator/roller/branches/roller_3.0:
src/org/apache/roller/business/hibernate/ src/org/apache/roller/pojos/
src/org/apache/roller/ui/rendering/model/ tests/org/apache/roller/business/
web/themes/frontpage/
Author: snoopdave
Date: Wed Aug 16 09:08:14 2006
New Revision: 431935
URL: http://svn.apache.org/viewvc?rev=431935&view=rev
Log:
Planet model works well in frontpage now
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java
incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java
incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm
incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm
incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm
incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm
incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java Wed Aug 16 09:08:14 2006
@@ -553,7 +553,7 @@
"No published date, assigning fake date for "+feedURL);
entry.setPubTime(new Timestamp(cal.getTimeInMillis()));
}
- if (entry.getPermaLink() == null) {
+ if (entry.getPermalink() == null) {
log.warn("No permalink, rejecting entry from "+feedURL);
} else {
newEntries.add(entry);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java Wed Aug 16 09:08:14 2006
@@ -97,7 +97,7 @@
*/
private void initFromRomeEntry(SyndFeed romeFeed, SyndEntry romeEntry) {
setTitle(romeEntry.getTitle());
- setPermaLink(romeEntry.getLink());
+ setPermalink(romeEntry.getLink());
// Play some games to get the author
DCModule entrydc = (DCModule)romeEntry.getModule(DCModule.URI);
@@ -163,11 +163,11 @@
setAuthor( rollerEntry.getCreator().getFullName());
setTitle( rollerEntry.getTitle());
- setPermaLink( rollerEntry.getLink());
+ setPermalink( rollerEntry.getLink());
setPubTime( rollerEntry.getPubTime());
setText( content);
- setPermaLink(RollerRuntimeConfig.getProperty("site.absoluteurl")
+ setPermalink(RollerRuntimeConfig.getProperty("site.absoluteurl")
+ rollerEntry.getPermaLink());
List cats = new ArrayList();
@@ -261,10 +261,10 @@
* @hibernate.property column="permalink" non-null="true" unique="false"
* @roller.wrapPojoMethod type="simple"
*/
- public String getPermaLink() {
+ public String getPermalink() {
return permalink;
}
- public void setPermaLink(String permalink) {
+ public void setPermalink(String permalink) {
this.permalink = permalink;
}
/**
@@ -376,7 +376,7 @@
*/
public int compareTo(Object o) {
PlanetEntryData other = (PlanetEntryData)o;
- return getPermaLink().compareTo(other.getPermaLink());
+ return getPermalink().compareTo(other.getPermalink());
}
/**
@@ -386,7 +386,7 @@
if(this == other) return true;
if(!(other instanceof PlanetEntryData)) return false;
final PlanetEntryData that = (PlanetEntryData) other;
- return this.permalink.equals(that.getPermaLink());
+ return this.permalink.equals(that.getPermalink());
}
/**
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java Wed Aug 16 09:08:14 2006
@@ -198,10 +198,10 @@
/**
* @roller.wrapPojoMethod type="simple"
*/
- public String getUrl() {
+ public String getURL() {
return siteUrl;
}
- public void setUrl(String url) {
+ public void setURL(String url) {
siteUrl = url;
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java Wed Aug 16 09:08:14 2006
@@ -47,7 +47,7 @@
private static Log log = LogFactory.getLog(PlanetModel.class);
private WeblogRequest weblogRequest = null;
- private Template weblogPage = null;
+ private String pageLink = null;
private int pageNum = 0;
private WebsiteData weblog = null;
@@ -65,7 +65,8 @@
// TODO 3.0: is it better to reparse URL to get these?
if (weblogRequest instanceof WeblogPageRequest) {
- weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
+ Template weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
+ pageLink = (weblogPage != null) ? weblogPage.getLink() : null;
pageNum = ((WeblogPageRequest)weblogRequest).getPageNum();
}
@@ -83,7 +84,7 @@
public Pager getAggregationPager(int sinceDays, int length) {
String pagerUrl = URLUtilities.getWeblogPageURL(weblog,
- weblogRequest.getLocale(), weblogPage.getLink(),
+ weblogRequest.getLocale(), pageLink,
null, null, null, 0, false);
return new PlanetEntriesPager(
@@ -106,7 +107,7 @@
public Pager getAggregationPager(String groupHandle, int sinceDays, int length) {
String pagerUrl = URLUtilities.getWeblogPageURL(weblog,
- weblogRequest.getLocale(), weblogPage.getLink(),
+ weblogRequest.getLocale(), pageLink,
null, null, null, 0, false);
return new PlanetEntriesPager(
@@ -129,7 +130,7 @@
public Pager getFeedPager(String feedURL, int length) {
String pagerUrl = URLUtilities.getWeblogPageURL(weblog,
- weblogRequest.getLocale(), weblogPage.getLink(),
+ weblogRequest.getLocale(), pageLink,
null, null, null, 0, false);
return new PlanetEntriesPager(
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java Wed Aug 16 09:08:14 2006
@@ -59,7 +59,6 @@
private WebsiteData weblog = null;
private WeblogRequest weblogRequest = null;
- //private Template weblogPage = null;
private String pageLink = null;
private int pageNum = 0;
@@ -109,6 +108,29 @@
}
+ /**
+ * Get pager ofWeblogEntry objects across all weblogs,
+ * in reverse chrono order by pubTime.
+ * @param queryWeblog Restrict to this weblog
+ * @param sinceDays Limit to past X days in past (or -1 for no limit)
+ * @param length Max number of results to return
+ */
+ public Pager getWeblogEntriesPager(WebsiteData queryWeblog, int sinceDays, int length) {
+ return getWeblogEntriesPager(queryWeblog, null, null, sinceDays, length);
+ }
+
+ /**
+ * Get pager ofWeblogEntry objects across all weblogs,
+ * in reverse chrono order by pubTime.
+ * @param queryWeblog Restrict to this weblog
+ * @param user Restrict to this user
+ * @param sinceDays Limit to past X days in past (or -1 for no limit)
+ * @param length Max number of results to return
+ */
+ public Pager getWeblogEntriesPager(WebsiteData queryWeblog, UserData user, int sinceDays, int length) {
+ return getWeblogEntriesPager(queryWeblog, user, null, sinceDays, length);
+ }
+
/**
* Get pager ofWeblogEntry objects across all weblogs,
* in reverse chrono order by pubTime.
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java Wed Aug 16 09:08:14 2006
@@ -203,14 +203,14 @@
assertNotNull(sub);
PlanetEntryData entry1 = new PlanetEntryData();
- entry1.setPermaLink("test_entry1");
+ entry1.setPermalink("test_entry1");
entry1.setCategoriesString("test,test2");
entry1.setSubscription(sub);
entry1.setPubTime(new Timestamp(System.currentTimeMillis()));
sub.addEntry(entry1);
PlanetEntryData entry2 = new PlanetEntryData();
- entry2.setPermaLink("test_entry2");
+ entry2.setPermalink("test_entry2");
entry2.setCategoriesString("test_cat1,test_cat2,test_cat3");
entry2.setSubscription(sub);
entry2.setPubTime(new Timestamp(System.currentTimeMillis()));
@@ -230,7 +230,7 @@
assertNotNull(sub);
PlanetEntryData entry3 = new PlanetEntryData();
- entry3.setPermaLink("test_entry3");
+ entry3.setPermalink("test_entry3");
entry3.setCategoriesString("test,test3");
entry3.setSubscription(sub);
entry3.setPubTime(new Timestamp(System.currentTimeMillis()));
Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm Wed Aug 16 09:08:14 2006
@@ -31,53 +31,57 @@
<div id="tabContent">
<div id="recentEntries">
+
+ ## The below pager code should work against either:
+
+ ## 1) SITE-WIDE entries (the default)
+ #set($pager = $site.getWeblogEntriesPager($since, $maxResults))
- #set($pager = $site.getWeblogEntriesPager($since, $maxResults))
+ ## 2) PLANET-entries
+ ## set($pager = $planet.getAggregationPager($since, $maxResults))
- ## or if you want to show planet entries use this pager:
- ## set($pager = $planet.getAggregationPager($since, $maxResults))
- #if($pager.items.size() > 0)
- #set($entryCount = $pager.items.size() - 1)
- #set($startDate = $pager.items.get(0).pubTime)
- #set($endDate = $entries.get($entryCount).pubTime)
- #end
- #foreach($entry in $pager.items)
- #if($velocityCount < $maxResults)
-
- <div class="entry">
- <p class="entryDetails">
- <a href="$utils.escapeHTML($entry.permalink)">
- <b>$utils.truncateNicely($utils.removeHTML($entry.title), 50, 50, "...")</b></a><br />
- <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
- <br/>
- </p>
- <p class="entryDescription">
- #if(!$utils.isEmpty($entry.summary))
- $utils.truncateNicely($utils.removeHTML($entry.transformedSummary), 240, 260, "...")
- #else
- $utils.truncateNicely($utils.removeHTML($entry.transformedText), 240, 260, "...")
+ #if($pager.items.size() > 0)
+ #set($entryCount = $pager.items.size() - 1)
+ #set($startDate = $pager.items.get(0).pubTime)
+ #set($endDate = $entries.get($entryCount).pubTime)
#end
- </p>
- </div>
+ #foreach($entry in $pager.items)
+ #if($velocityCount < $maxResults)
- #end
- #end
- <div class="pagingcontrols">
- #if($pager.nextLink)
- <a href="$pager.nextLink">< $pager.nextName</a>
- #end
- #if($pager.nextLink && $pager.prevLink)
- |
- #end
- #if($pager.prevLink)
- <a href="$pager.prevLink">$pager.prevName ></a>
- #end
- </div>
+ <div class="entry">
+ <p class="entryDetails">
+ <a href="$utils.escapeHTML($entry.permalink)">
+ <b>$utils.truncateNicely($utils.removeHTML($entry.title), 50, 50, "...")</b></a><br />
+ <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
+ <br/>
+ </p>
+ <p class="entryDescription">
+ #if($entry.displayContent)
+ $utils.truncateNicely($utils.removeHTML($entry.displayContent), 240, 260, "...")
+ #else ## planet entries don't have displayContent
+ $utils.truncateNicely($utils.removeHTML($entry.text), 240, 260, "...")
+ #end
+ </p>
+ </div>
+
+ #end
+ #end
+ <div class="pagingcontrols">
+ #if($pager.nextLink)
+ <a href="$pager.nextLink">< $pager.nextName</a>
+ #end
+ #if($pager.nextLink && $pager.prevLink)
+ |
+ #end
+ #if($pager.prevLink)
+ <a href="$pager.prevLink">$pager.prevName ></a>
+ #end
+ </div>
</div>
Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm Wed Aug 16 09:08:14 2006
@@ -1,76 +1,75 @@
- #if($model.getRequestParameter("letter"))
- #set($chosenLetter = $model.getRequestParameter("letter"))
- #end
-
- #set($weblogLetterMap = $site.getWeblogHandleLetterMap())
- <div class="letterMap">
- <p>
- #set($firstLetterDone = 0)
- #foreach($letter in $weblogLetterMap.keySet())
- #if($firstLetterDone == 1) - #end
- #set($firstLetterDone = 1)
- #set($letterCount = $weblogLetterMap.get($letter))
- #if($letter == $chosenLetter)<span style="font-size:120%; font-weight:bold">#end
- #if($letterCount > 0)
- <a href="?letter=$letter" title="$letterCount weblogs">$letter</a>
- #else
- $letter
- #end
- #if($letter == $chosenLetter)</span>#end
- #end
- </p>
- </div>
+#includeTemplate($model.weblog "_header")
- #if($chosenLetter)
- <h2 class="pageTitle">Weblogs starting with $chosenLetter</h2>
- #else
- <h2 class="pageTitle">All weblogs</h2>
- #end
-
- #set($weblogsPager = $site.getWeblogsByLetterPager($chosenLetter, -1, $pageLength))
- <table class="blogdirectory data">
- <thead>
- <tr>
- <th scope="col" class="name">Blog Name</th>
- <th scope="col" class="description">Description</th>
- </tr>
- </thead>
- <tbody>
- #foreach($loopblog in $weblogsPager.items)
- <tr>
- <th scope="row" class="name"><a href="$url.absoluteSite/$loopblog.handle">$loopblog.handle</a></th>
- <td class="description">$loopblog.name</td>
- </tr>
- #end
- </tbody>
- <tfoot>
- <tr class="pagingcontrols">
- <td class="pagingtext"></td>
- <td class="paginglinks">
-
- #if($chosenLetter)
- #if($weblogsPager.prevLink)
- <a href="$weblogsPager.prevLink"><$weblogsPager.prevName</a>
- #end
- #if($weblogsPager.nextLink && $weblogsPager.prevLink())
- |
- #end
- #if($weblogsPager.nextLink)
- <a href="$weblogsPager.nextLink">$weblogsPager.nextName ></a>
- #end
- #else
- #if($weblogsPager.prevLink)
- <a href="$weblogsPager.prevLink"><$weblogsPager.prevName</a>
- #end
- #if($weblogsPager.nextLink && $weblogsPager.prevLink())
- |
- #end
- #if($weblogsPager.nextLink)
- <a href="$weblogsPager.nextLink">$weblogsPager.nextName ></a>
+#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("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="directory">
+ #if($model.getRequestParameter("weblog"))
+ #set($handle = $model.getRequestParameter("weblog"))
+ <a href="?letter=$utils.left($handle,1)">Back to blog directory</a>
+ #set($profileWeblog = $site.getWeblog($handle))
+ #includeTemplate($model.weblog "_blogprofile")
+ #else
+ #set($pageLength = $maxResults)
+ #includeTemplate($model.weblog "_blogdirectory")
#end
- #end
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div id="rightcontent_wrap">
+ <div id="rightcontent">
+
+ <div class="sidebarBodyHead">
+ <div class="menu-tr">
+ <div class="menu-tl">
+ <h3>New blogs</h3>
+ </div>
+ </div>
+ </div>
+
+ <div class="sidebarBody">
+ #set($newblogs = $site.getNewWeblogs($since, $maxResults))
+ <ul>
+ #foreach($blog in $newblogs)
+ <li>$blog.name (<a href="?weblog=$blog.handle" title="$blog.dateCreated">$blog.handle</a>)</li>
+ #end
+ </ul>
+ </div>
+
+ </div>
+ </div>
+</div>
- </td>
- </tr>
- </tfoot>
- </table>
+</div>
+</div>
+#includeTemplate($model.weblog "_footer")
Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm Wed Aug 16 09:08:14 2006
@@ -1,40 +1,38 @@
- <h2 class="pageTitle">Weblog: $weblog.name</h2>
- <table>
+ <h2 class="pageTitle">Weblog: $profileWeblog.name</h2>
+ <table width="70%">
<tr>
- <td>Handle</td>
- <td>$weblog.handle</td>
+ <td width="25%">Handle</td>
+ <td width="75%"><a href="$url.site/$profileWeblog.handle">$profileWeblog.handle</a></td>
</tr>
<tr>
<td>Description</td>
- <td>$weblog.description</td>
+ <td>$profileWeblog.description</td>
</tr>
<tr>
<td>Created by</td>
- <td><$weblog.creator.fullName/td>
+ <td><$profileWeblog.creator.fullName/td>
</tr>
<tr>
<td>Last modified</td>
- <td>$weblog.lastModified</td>
+ <td>$profileWeblog.lastModified</td>
</tr>
<tr>
<td>Locale</td>
- <td>$!weblog.locale</td>
+ <td>$!profileWeblog.locale</td>
</tr>
<tr>
<td>Timezone</td>
- <td>$weblog.timeZone</td>
+ <td>$profileWeblog.timeZone</td>
</tr>
</table>
<h2 class="pageTitle">Weblog users</h2>
- #set($users = $site.getWeblogsUsers($weblog.handle))
- <table class="rollertable">
- <thead>
- <tr>
- <th>Username</th>
- <th>Full name</th>
- </tr>
- </thead>
+ #set($users = $site.getWeblogsUsers($profileWeblog.handle))
+ <table width="70%">
+ <tr>
+ <td width="25%">Username</td>
+ <td width="75%">Full name</td>
+ </tr>
#foreach($user in $users)
<tr>
<td>$user.userName</td>
@@ -44,16 +42,14 @@
</table>
<h2 class="pageTitle">Recent posts</h2>
- #set($entriesPager = $site.getWeblogEntriesPager($weblog, $null, $null, 90, 5))
+ #set($entriesPager = $site.getWeblogEntriesPager($profileWeblog, 90, 5))
#if($entriesPager.items.size() > 0)
- <table class="rollertable">
- <thead>
- <tr>
- <th>User</th>
- <th>Pub. time</th>
- <th>Title</th>
- </tr>
- </thead>
+ <table class="rollertable" width="70%">
+ <tr>
+ <td width="25%">User</td>
+ <td width="25%">Pub. time</td>
+ <td width="50%">Title</td>
+ </tr>
#foreach($entry in $entriesPager.items)
<tr>
<td>$entry.creator.userName</td>
Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm Wed Aug 16 09:08:14 2006
@@ -98,10 +98,10 @@
border: 1px solid #f1ebdf;
}
#directory {
- padding: 5px;
+ padding: 15px;
}
#recentEntries{
- padding: 5px;
+ padding: 10px;
}
Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm?rev=431935&r1=431934&r2=431935&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm Wed Aug 16 09:08:14 2006
@@ -20,7 +20,7 @@
<td class="menuTabSelected">
<div class="menu-tr">
<div class="menu-tl">
- <a href='$url.page("blogs")'>Weblog Directory</a>
+ <a href='$url.page("directory")'>Weblog Directory</a>
</div>
</div>
</td>
@@ -31,10 +31,10 @@
<div id="tabContent">
<div id="directory">
- #if($pageModel.getRequestParameter("weblog"))
- #set($handle = $pageModel.getRequestParameter("weblog"))
- <a href="?letter=$stringUtils.left($handle,1)">Back to blog directory</a>
- #set($weblog = $site.getWeblog($handle))
+ #if($model.getRequestParameter("weblog"))
+ #set($handle = $model.getRequestParameter("weblog"))
+ <a href="?letter=$utils.left($handle,1)">Back to blog directory</a>
+ #set($profileWeblog = $site.getWeblog($handle))
#includeTemplate($model.weblog "_blogprofile")
#else
#set($pageLength = $maxResults)