You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/07/05 18:05:09 UTC
svn commit: r553541 - in /roller/trunk/apps/weblogger/web/themes: basic/
brushedmetal/ sotto/
Author: agilliland
Date: Thu Jul 5 09:05:08 2007
New Revision: 553541
URL: http://svn.apache.org/viewvc?view=rev&rev=553541
Log:
updating themes to make use of new Weblogger 4.0 features. Also includes entry titles in header on permalinks per ROL-1355.
Added:
roller/trunk/apps/weblogger/web/themes/basic/permalink.vm
roller/trunk/apps/weblogger/web/themes/basic/searchresults.vm
roller/trunk/apps/weblogger/web/themes/basic/sidebar.vm
roller/trunk/apps/weblogger/web/themes/basic/weblog.vm
- copied, changed from r552896, roller/trunk/apps/weblogger/web/themes/basic/Weblog.vm
roller/trunk/apps/weblogger/web/themes/brushedmetal/permalink.vm
roller/trunk/apps/weblogger/web/themes/brushedmetal/searchresults.vm
roller/trunk/apps/weblogger/web/themes/brushedmetal/sidebar.vm
roller/trunk/apps/weblogger/web/themes/brushedmetal/weblog.vm
- copied, changed from r552896, roller/trunk/apps/weblogger/web/themes/brushedmetal/Weblog.vm
roller/trunk/apps/weblogger/web/themes/sotto/header.vm
roller/trunk/apps/weblogger/web/themes/sotto/permalink.vm
roller/trunk/apps/weblogger/web/themes/sotto/searchresults.vm
roller/trunk/apps/weblogger/web/themes/sotto/sidebar.vm
roller/trunk/apps/weblogger/web/themes/sotto/weblog.vm
- copied, changed from r552896, roller/trunk/apps/weblogger/web/themes/sotto/Weblog.vm
Removed:
roller/trunk/apps/weblogger/web/themes/basic/Weblog.vm
roller/trunk/apps/weblogger/web/themes/brushedmetal/Weblog.vm
roller/trunk/apps/weblogger/web/themes/sotto/Weblog.vm
Modified:
roller/trunk/apps/weblogger/web/themes/basic/theme.xml
roller/trunk/apps/weblogger/web/themes/brushedmetal/theme.xml
roller/trunk/apps/weblogger/web/themes/sotto/theme.xml
Added: roller/trunk/apps/weblogger/web/themes/basic/permalink.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/basic/permalink.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/basic/permalink.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/basic/permalink.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>$model.weblogEntry.title : $model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
+<body>
+
+<div class="content_wrapper">
+ <div class="content">
+ <h1 class="weblogName">$utils.escapeHTML($model.weblog.name)</h1>
+
+ <center>
+ #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+ #showWeblogCategoryLinksList($rootCategory false false)
+ </center>
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showNextPrevEntriesControl($pager)
+ </div>
+
+ ## show entry
+ #showWeblogEntriesPager($pager)
+
+ ## show comments and comment form
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
+
+ </div>
+</div>
+
+<div class="rightbar_wrapper">
+ <div class="rightbar">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+</div>
+
+</body>
+</html>
Added: roller/trunk/apps/weblogger/web/themes/basic/searchresults.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/basic/searchresults.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/basic/searchresults.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/basic/searchresults.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Search Results for '$model.term' : $model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
+<body>
+
+<div class="content_wrapper">
+ <div class="content">
+ <h1 class="weblogName">$utils.escapeHTML($model.weblog.name)</h1>
+
+ <center>
+ #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+ #showWeblogCategoryLinksList($rootCategory false false)
+ </center>
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showWeblogSearchAgainForm($model.weblog)
+ #showNextPrevSearchControl($pager)
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+
+ </div>
+</div>
+
+<div class="rightbar_wrapper">
+ <div class="rightbar">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+</div>
+
+</body>
+</html>
Added: roller/trunk/apps/weblogger/web/themes/basic/sidebar.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/basic/sidebar.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/basic/sidebar.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/basic/sidebar.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,34 @@
+## sidebar contents
+
+ <h2>Calendar</h2>
+ <div class="sidebar">
+ #showWeblogEntryCalendar($model.weblog "nil")
+ </div>
+
+ <h2>Feeds</h2>
+ <div class="sidebar">
+ #showAtomFeedsList($model.weblog)
+ </div>
+
+ <h2>Search</h2>
+ <div class="sidebar">
+ #showWeblogSearchForm($model.weblog false)
+ </div>
+
+ <h2>Links</h2>
+ <div class="sidebar">
+ #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+ #showBookmarkLinksList($rootFolder false false)
+ </div>
+
+ <h2>Navigation</h2>
+ <div class="sidebar">
+ #showPageMenu($model.weblog)
+ #showAuthorMenu(true)
+ </div>
+
+ <h2>Referrers</h2>
+ <div class="sidebar">
+ #set($refs = $model.weblog.getTodaysReferrers())
+ #showReferrersList($refs 30 20 true)
+ </div>
Modified: roller/trunk/apps/weblogger/web/themes/basic/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/basic/theme.xml?view=diff&rev=553541&r1=553540&r2=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/basic/theme.xml (original)
+++ roller/trunk/apps/weblogger/web/themes/basic/theme.xml Thu Jul 5 09:05:08 2007
@@ -19,14 +19,36 @@
<!-- templates -->
<template action="weblog">
- <name>Weblog</name>
- <description>Weblog</description>
+ <name>weblog</name>
+ <description>weblog</description>
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<templateLanguage>velocity</templateLanguage>
<contentType>text/html</contentType>
- <contentsFile>Weblog.vm</contentsFile>
+ <contentsFile>weblog.vm</contentsFile>
+ </template>
+
+ <template action="permalink">
+ <name>permalink</name>
+ <description>permalink</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>permalink.vm</contentsFile>
+ </template>
+
+ <template action="search">
+ <name>searchresults</name>
+ <description>searchresults</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchresults.vm</contentsFile>
</template>
<template action="custom">
@@ -38,6 +60,17 @@
<templateLanguage>velocity</templateLanguage>
<contentType>text/html</contentType>
<contentsFile>_day.vm</contentsFile>
+ </template>
+
+ <template action="custom">
+ <name>sidebar</name>
+ <description>sidebar</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
</template>
<!-- resources -->
Copied: roller/trunk/apps/weblogger/web/themes/basic/weblog.vm (from r552896, roller/trunk/apps/weblogger/web/themes/basic/Weblog.vm)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/basic/weblog.vm?view=diff&rev=553541&p1=roller/trunk/apps/weblogger/web/themes/basic/Weblog.vm&r1=552896&p2=roller/trunk/apps/weblogger/web/themes/basic/weblog.vm&r2=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/basic/Weblog.vm (original)
+++ roller/trunk/apps/weblogger/web/themes/basic/weblog.vm Thu Jul 5 09:05:08 2007
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>$model.weblog.name : $model.weblogPage.name</title>
+ <title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
</head>
@@ -17,63 +17,23 @@
#showWeblogCategoryLinksList($rootCategory false false)
</center>
+ ## show next/previous paging controls
#set($pager = $model.getWeblogEntriesPager())
<div class="next-previous">
- #if ($model.results)
- #showWeblogSearchAgainForm($model.weblog)
- #showNextPrevSearchControl($pager)
- #else
- #showNextPrevEntriesControl($pager)
- #end
+ #showNextPrevEntriesControl($pager)
</div>
+ ## show entries
#showWeblogEntriesPager($pager)
- #if ($model.permalink)
- #showWeblogEntryComments($model.weblogEntry)
- #showWeblogEntryCommentForm($model.weblogEntry)
- #end
-
</div>
</div>
<div class="rightbar_wrapper">
<div class="rightbar">
- <h2>Calendar</h2>
- <div class="sidebar">
- #showWeblogEntryCalendar($model.weblog "nil")
- </div>
-
- <h2>Feeds</h2>
- <div class="sidebar">
- #showAtomFeedsList($model.weblog)
- </div>
-
- <h2>Search</h2>
- <div class="sidebar">
- #showWeblogSearchForm($model.weblog false)
- </div>
-
- <h2>Links</h2>
- <div class="sidebar">
- #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
- #showBookmarkLinksList($rootFolder false false)
- </div>
-
- <h2>Navigation</h2>
- <div class="sidebar">
- #showPageMenu($model.weblog)
- #showAuthorMenu(true)
- </div>
-
- <h2>Referrers</h2>
- <div class="sidebar">
- #set($refs = $model.weblog.getTodaysReferrers())
- #showReferrersList($refs 30 20 true)
- </div>
+ #includeTemplate($model.weblog "sidebar")
</div>
</div>
</body>
</html>
-
Added: roller/trunk/apps/weblogger/web/themes/brushedmetal/permalink.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/brushedmetal/permalink.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/brushedmetal/permalink.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/brushedmetal/permalink.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>$model.weblogEntry.title : $model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
+
+<body>
+<div id="block">
+
+ <div id="container">
+
+ <div id="sidebar-a">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+
+ <div id="content">
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showNextPrevEntriesControl($pager)
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+
+ ## show comments and comment form
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
+
+ <div id="footer">
+ Theme Design by <a href="http://www.bryanbell.com">Bryan Bell</a>
+ </div> <!-- footer -->
+ </div> <!-- content -->
+
+ </div> <!-- container -->
+
+</div> <!-- block -->
+
+</body>
+</html>
Added: roller/trunk/apps/weblogger/web/themes/brushedmetal/searchresults.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/brushedmetal/searchresults.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/brushedmetal/searchresults.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/brushedmetal/searchresults.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Search Results for '$model.term' : $model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
+
+<body>
+<div id="block">
+
+ <div id="container">
+
+ <div id="sidebar-a">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+
+ <div id="content">
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showWeblogSearchAgainForm($model.weblog)
+ #showNextPrevSearchControl($pager)
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+
+ <div id="footer">
+ Theme Design by <a href="http://www.bryanbell.com">Bryan Bell</a>
+ </div> <!-- footer -->
+ </div> <!-- content -->
+
+ </div> <!-- container -->
+
+</div> <!-- block -->
+
+</body>
+</html>
Added: roller/trunk/apps/weblogger/web/themes/brushedmetal/sidebar.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/brushedmetal/sidebar.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/brushedmetal/sidebar.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/brushedmetal/sidebar.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,20 @@
+
+ <h1 id="banner">
+ $model.weblog.name
+ <span class="tagline"><em>$model.weblog.description</em></span>
+ </h1>
+
+ <div id="calendar">
+ #showWeblogEntryCalendar($model.weblog "nil")
+ </div>
+ <hr />
+
+ <h3>Blogroll</h3>
+ #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+ #showBookmarkLinksList($rootFolder false false)
+
+ <h3>Newsfeeds</h3>
+ #showAtomFeedsList($model.weblog)
+
+ <h3>Controls</h3>
+ #showPageMenu($model.weblog)
Modified: roller/trunk/apps/weblogger/web/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/brushedmetal/theme.xml?view=diff&rev=553541&r1=553540&r2=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/brushedmetal/theme.xml (original)
+++ roller/trunk/apps/weblogger/web/themes/brushedmetal/theme.xml Thu Jul 5 09:05:08 2007
@@ -19,14 +19,36 @@
<!-- templates -->
<template action="weblog">
- <name>Weblog</name>
- <description>Weblog</description>
+ <name>weblog</name>
+ <description>weblog</description>
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<templateLanguage>velocity</templateLanguage>
<contentType>text/html</contentType>
- <contentsFile>Weblog.vm</contentsFile>
+ <contentsFile>weblog.vm</contentsFile>
+ </template>
+
+ <template action="permalink">
+ <name>permalink</name>
+ <description>permalink</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>permalink.vm</contentsFile>
+ </template>
+
+ <template action="search">
+ <name>searchresults</name>
+ <description>searchresults</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchresults.vm</contentsFile>
</template>
<template action="custom">
@@ -38,6 +60,17 @@
<templateLanguage>velocity</templateLanguage>
<contentType>text/html</contentType>
<contentsFile>_day.vm</contentsFile>
+ </template>
+
+ <template action="custom">
+ <name>sidebar</name>
+ <description>sidebar</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
</template>
<!-- resources -->
Copied: roller/trunk/apps/weblogger/web/themes/brushedmetal/weblog.vm (from r552896, roller/trunk/apps/weblogger/web/themes/brushedmetal/Weblog.vm)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/brushedmetal/weblog.vm?view=diff&rev=553541&p1=roller/trunk/apps/weblogger/web/themes/brushedmetal/Weblog.vm&r1=552896&p2=roller/trunk/apps/weblogger/web/themes/brushedmetal/weblog.vm&r2=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/brushedmetal/Weblog.vm (original)
+++ roller/trunk/apps/weblogger/web/themes/brushedmetal/weblog.vm Thu Jul 5 09:05:08 2007
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>$model.weblog.name : $model.weblogPage.name</title>
+ <title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
</head>
@@ -13,31 +13,12 @@
<div id="container">
<div id="sidebar-a">
-
- <h1 id="banner">
- $model.weblog.name
- <span class="tagline"><em>$model.weblog.description</em></span>
- </h1>
-
- <div id="calendar">
- #showWeblogEntryCalendar($model.weblog "nil")
- </div>
- <hr />
-
- <h3>Blogroll</h3>
- #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
- #showBookmarkLinksList($rootFolder false false)
-
- <h3>Newsfeeds</h3>
- #showAtomFeedsList($model.weblog)
-
- <h3>Controls</h3>
- #showPageMenu($model.weblog)
-
- </div> <!-- sidebar-a -->
+ #includeTemplate($model.weblog "sidebar")
+ </div>
<div id="content">
+ ## show next/previous paging controls
#set($pager = $model.getWeblogEntriesPager())
<div class="next-previous">
#if ($model.results)
@@ -48,6 +29,7 @@
#end
</div>
+ ## show entries
#showWeblogEntriesPager($pager)
#if ($model.permalink)
Added: roller/trunk/apps/weblogger/web/themes/sotto/header.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/sotto/header.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/sotto/header.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/sotto/header.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,11 @@
+
+ <div id="pageBanner">
+ <h1><a href="$url.home">$model.weblog.name</a></h1>
+ </div>
+ <div id="gutter">
+ <span id="gutterimage1"> </span>
+ <span id="gutterimage2"> </span>
+ <span id="gutterimage3"> </span>
+ <span class="floatSpacer"></span>
+ </div>
+ #showPageMenu($model.weblog)
Added: roller/trunk/apps/weblogger/web/themes/sotto/permalink.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/sotto/permalink.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/sotto/permalink.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/sotto/permalink.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>$model.weblogEntry.title : $model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
+
+<body>
+
+<div id="mainContainer">
+
+ ## show header
+ #includeTemplate($model.weblog "header")
+
+ <div id="midColumn">
+ <div class="standardSpacer"> </div>
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showNextPrevEntriesControl($pager)
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+
+ ## show comments and comment form
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
+ </div>
+
+ <div id="leftColumn">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+
+ <div style="clear:both"> </div>
+
+ <div id="pageFooterBoundingBox"></div>
+</div>
+
+<div id="copyrightBoundingBox">
+ <a class="copyright" href="mailto:$utils.encodeEmail($model.weblog.emailAddress)">© $model.weblog.creator.screenName</a>
+</div>
+
+</body>
+</html>
Added: roller/trunk/apps/weblogger/web/themes/sotto/searchresults.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/sotto/searchresults.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/sotto/searchresults.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/sotto/searchresults.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Search Results for '$model.term' : $model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+</head>
+
+<body>
+
+<div id="mainContainer">
+
+ ## show header
+ #includeTemplate($model.weblog "header")
+
+ <div id="midColumn">
+ <div class="standardSpacer"> </div>
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showWeblogSearchAgainForm($model.weblog)
+ #showNextPrevSearchControl($pager)
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+ </div>
+
+ <div id="leftColumn">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+
+ <div style="clear:both"> </div>
+
+ <div id="pageFooterBoundingBox"></div>
+</div>
+
+<div id="copyrightBoundingBox">
+ <a class="copyright" href="mailto:$utils.encodeEmail($model.weblog.emailAddress)">© $model.weblog.creator.screenName</a>
+</div>
+
+</body>
+</html>
Added: roller/trunk/apps/weblogger/web/themes/sotto/sidebar.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/sotto/sidebar.vm?view=auto&rev=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/sotto/sidebar.vm (added)
+++ roller/trunk/apps/weblogger/web/themes/sotto/sidebar.vm Thu Jul 5 09:05:08 2007
@@ -0,0 +1,48 @@
+
+ <div class="standardSpacer"> </div>
+
+ <div class="sidebarBox">
+ #showWeblogSearchForm($model.weblog false)
+ </div>
+
+ <div class="sidebarBox">
+ #showWeblogEntryCalendar($model.weblog "nil")
+ </div>
+
+ #if( $utils.isUserAuthenticated() )
+ <div class="sidebarBox">
+ <div class="links">
+ <div class="rFolder">Editor Menu</div>
+ #showAuthorMenu(true)
+ </div>
+ </div>
+ #end
+
+ <div class="sidebarBox">
+ <div class="links">
+ #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+ #showBookmarkLinksList($rootFolder false false)
+ </div>
+ </div>
+
+ <p class="sidebarBox">
+ #showAtomFeedsList($model.weblog)
+ </p>
+
+ <p class="sidebarBox">
+ Valid
+ <a title="Valid XHTML?"
+ href="http://validator.w3.org/check?uri=$model.weblog.absoluteURL">XHTML</a>
+ or <a title="Valid CSS?"
+ href="http://jigsaw.w3.org/css-validator/validator?uri=$model.weblog.absoluteURL">CSS</a>?
+ </p>
+
+ <div class="sidebarBox">
+ <a title="This is a Roller site."
+ href="http://rollerweblogger.org"><img class="noBorder"
+ width="80" height="15" alt="[This is a Roller site]"
+ src="$url.resource("images/roller-logo.gif")" /></a>
+ </div>
+ <div class="sidebarBox">
+ Theme by <a href="http://sotto.org">Rowell Sotto</a>.
+ </div>
Modified: roller/trunk/apps/weblogger/web/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/sotto/theme.xml?view=diff&rev=553541&r1=553540&r2=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/sotto/theme.xml (original)
+++ roller/trunk/apps/weblogger/web/themes/sotto/theme.xml Thu Jul 5 09:05:08 2007
@@ -19,14 +19,36 @@
<!-- templates -->
<template action="weblog">
- <name>Weblog</name>
- <description>Weblog</description>
+ <name>weblog</name>
+ <description>weblog</description>
<link></link>
<navbar>false</navbar>
<hidden>true</hidden>
<templateLanguage>velocity</templateLanguage>
<contentType>text/html</contentType>
- <contentsFile>Weblog.vm</contentsFile>
+ <contentsFile>weblog.vm</contentsFile>
+ </template>
+
+ <template action="permalink">
+ <name>permalink</name>
+ <description>permalink</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>permalink.vm</contentsFile>
+ </template>
+
+ <template action="search">
+ <name>searchresults</name>
+ <description>searchresults</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>searchresults.vm</contentsFile>
</template>
<template action="custom">
@@ -38,6 +60,28 @@
<templateLanguage>velocity</templateLanguage>
<contentType>text/html</contentType>
<contentsFile>_day.vm</contentsFile>
+ </template>
+
+ <template action="custom">
+ <name>sidebar</name>
+ <description>sidebar</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
+ </template>
+
+ <template action="custom">
+ <name>header</name>
+ <description>header</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>header.vm</contentsFile>
</template>
<!-- resources -->
Copied: roller/trunk/apps/weblogger/web/themes/sotto/weblog.vm (from r552896, roller/trunk/apps/weblogger/web/themes/sotto/Weblog.vm)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/themes/sotto/weblog.vm?view=diff&rev=553541&p1=roller/trunk/apps/weblogger/web/themes/sotto/Weblog.vm&r1=552896&p2=roller/trunk/apps/weblogger/web/themes/sotto/weblog.vm&r2=553541
==============================================================================
--- roller/trunk/apps/weblogger/web/themes/sotto/Weblog.vm (original)
+++ roller/trunk/apps/weblogger/web/themes/sotto/weblog.vm Thu Jul 5 09:05:08 2007
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>$model.weblog.name : $model.weblogPage.name</title>
+ <title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
</head>
@@ -13,85 +13,34 @@
<div id="mainContainer">
- <div id="pageBanner">
- <h1><a href="$url.home">$model.weblog.name</a></h1>
- </div>
- <div id="gutter">
- <span id="gutterimage1"> </span>
- <span id="gutterimage2"> </span>
- <span id="gutterimage3"> </span>
- <span class="floatSpacer"></span>
- </div>
- #showPageMenu($model.weblog)
+ ## show header
+ #includeTemplate($model.weblog "header")
<div id="midColumn">
<div class="standardSpacer"> </div>
- #set($pager = $model.getWeblogEntriesPager())
- <div class="next-previous">
- #if ($model.results)
- #showWeblogSearchAgainForm($model.weblog)
- #showNextPrevSearchControl($pager)
- #else
- #showNextPrevEntriesControl($pager)
- #end
- </div>
-
- #showWeblogEntriesPager($pager)
- #if ($model.permalink)
- #showWeblogEntryComments($model.weblogEntry)
- #showWeblogEntryCommentForm($model.weblogEntry)
- #end
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #if ($model.results)
+ #showWeblogSearchAgainForm($model.weblog)
+ #showNextPrevSearchControl($pager)
+ #else
+ #showNextPrevEntriesControl($pager)
+ #end
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+
+ #if ($model.permalink)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
+ #end
</div>
<div id="leftColumn">
- <div class="standardSpacer"> </div>
-
- <div class="sidebarBox">
- #showWeblogSearchForm($model.weblog false)
- </div>
-
- <div class="sidebarBox">
- #showWeblogEntryCalendar($model.weblog "nil")
- </div>
-
- #if( $utils.isUserAuthenticated() )
- <div class="sidebarBox">
- <div class="links">
- <div class="rFolder">Editor Menu</div>
- #showAuthorMenu(true)
- </div>
- </div>
- #end
-
- <div class="sidebarBox">
- <div class="links">
- #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
- #showBookmarkLinksList($rootFolder false false)
- </div>
- </div>
-
- <p class="sidebarBox">
- #showAtomFeedsList($model.weblog)
- </p>
-
- <p class="sidebarBox">
- Valid
- <a title="Valid XHTML?"
- href="http://validator.w3.org/check?uri=$model.weblog.absoluteURL">XHTML</a>
- or <a title="Valid CSS?"
- href="http://jigsaw.w3.org/css-validator/validator?uri=$model.weblog.absoluteURL">CSS</a>?
- </p>
-
- <div class="sidebarBox">
- <a title="This is a Roller site."
- href="http://rollerweblogger.org"><img class="noBorder"
- width="80" height="15" alt="[This is a Roller site]"
- src="$url.resource("images/roller-logo.gif")" /></a>
- </div>
- <div class="sidebarBox">
- Theme by <a href="http://sotto.org">Rowell Sotto</a>.
- </div>
+ #includeTemplate($model.weblog "sidebar")
</div>
<div style="clear:both"> </div>