roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r429796 [1/4] - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/pojos/ src/org/apache/roller/ui/rendering/model/ src/org/apache/roller/ui/rendering/servlets/ web/WEB-INF/classes/ web/WEB-INF/jsps/authoring/ web/WEB-INF/veloc...
Date Tue, 08 Aug 2006 20:08:49 GMT
Author: snoopdave
Date: Tue Aug  8 13:08:43 2006
New Revision: 429796

URL: http://svn.apache.org/viewvc?rev=429796&view=rev
Log:
In this commit:
   Converted *ALL* themes to Roller 3.0 macros and models
   Removed special _css handling hack from PageServlet
   Add navbar field to edit-pages.jsp
   Switch to entry.

Still more work to do:
   Renaming suggestions from Allen
   Ditching #showCommonJavaScript()
   IE6 testing
   etc.



Added:
    incubator/roller/branches/roller_3.0/web/themes/sotto/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/sunsets/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/_css.vm
Removed:
    incubator/roller/branches/roller_3.0/web/themes/andreas08/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/andreas08/theme.css
    incubator/roller/branches/roller_3.0/web/themes/basic/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/cheb/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/clean/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/currency/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/grey2/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/moonshine/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/movablemanila/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/pacifica/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/robot/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/sotto/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/sunsets/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/werner/_decorator.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/_decorator.vm
Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/ThemeTemplate.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogTemplate.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/andreas08/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/andreas08/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/basic/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/basic/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/cheb/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/cheb/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/clean/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/clean/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/currency-i18n/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/currency/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/currency/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogs.vm
    incubator/roller/branches/roller_3.0/web/themes/frontpage/_header.vm
    incubator/roller/branches/roller_3.0/web/themes/grey2/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/grey2/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/grey2/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/moonshine/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/moonshine/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/moonshine/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/movablemanila/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/movablemanila/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/movablemanila/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/pacifica/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/pacifica/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/pacifica/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/robot/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/robot/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/robot/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/Archives.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_badges.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_header.vm
    incubator/roller/branches/roller_3.0/web/themes/rolling/_sideColumn.vm
    incubator/roller/branches/roller_3.0/web/themes/sotto/   (props changed)
    incubator/roller/branches/roller_3.0/web/themes/sotto/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/sotto/styles/default.css
    incubator/roller/branches/roller_3.0/web/themes/sunsets/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/sunsets/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/sunsets/comments.vm
    incubator/roller/branches/roller_3.0/web/themes/sunsets/styles/simple.css
    incubator/roller/branches/roller_3.0/web/themes/werner/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/werner/_css.vm
    incubator/roller/branches/roller_3.0/web/themes/werner/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/Weblog.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/_day.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/comments.vm
    incubator/roller/branches/roller_3.0/web/themes/x2/styles/general.css

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/ThemeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/ThemeTemplate.java?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/ThemeTemplate.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/ThemeTemplate.java Tue Aug  8 13:08:43 2006
@@ -135,7 +135,7 @@
     }
 
     public boolean isNavbar() {
-        return hidden;
+        return navbar;
     }
 
     public void setNavbar(boolean navbar) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogTemplate.java?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogTemplate.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogTemplate.java Tue Aug  8 13:08:43 2006
@@ -91,6 +91,7 @@
         this.lastModified = (Date)updateTime.clone();
         this.templateLanguage = tempLang;
         this.hidden = hid;
+        this.navbar = navbar;
         this.decoratorName = decorator;
     }
     
@@ -377,6 +378,7 @@
         this.name =         other.getName();
         this.description =  other.getDescription();
         this.link =         other.getLink();
+        this.navbar =         other.isNavbar();
         this.contents =     other.getContents();
         this.lastModified = other.getLastModified()!=null ? (Date)other.getLastModified().clone() : null;
         this.templateLanguage = other.getTemplateLanguage();

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java Tue Aug  8 13:08:43 2006
@@ -125,8 +125,14 @@
     public String themeResource(String theme, String filePath) {
         return getSite()+RollerRuntimeConfig.getProperty("users.themes.path")+"/"+theme+"/"+filePath;
     }
-    
-    
+        
+    public String themeResource(String theme, String filePath, boolean absolute) {
+        if (absolute) {
+            return getAbsoluteSite()+RollerRuntimeConfig.getProperty("users.themes.path")+"/"+theme+"/"+filePath;
+        }
+        return themeResource(theme, filePath);
+    }
+        
     public String getHome() {
         return URLUtilities.getWeblogCollectionURL(weblog, locale, null, null, -1, false);
     }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Tue Aug  8 13:08:43 2006
@@ -302,9 +302,6 @@
         if(mimeType != null) {
             // we found a match ... set the content type
             contentType = mimeType+"; charset=utf-8";
-        } else if ("_css".equals(page.getName())) {
-            // TODO: store content-type for each page so this hack is unnecessary
-            contentType = "text/css; charset=utf-8";
         }
 
         HashMap model = new HashMap();

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties Tue Aug  8 13:08:43 2006
@@ -825,7 +825,9 @@
 pageForm.name=Name
 pageForm.link=Link
 pageForm.hidden=Hidden
-pageForm.hidden.tip=hidden templates cannot be accessed via a weblog url
+pageForm.hidden.tip=Hidden templates cannot be accessed via a weblog URL
+pageForm.navbar=Include in page menu
+pageForm.navbar.tip=Include in menu produced by showPageMenu() macro
 pageForm.description=Description
 pageForm.template=Template
 pageForm.save=Save

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp Tue Aug  8 13:08:43 2006
@@ -82,6 +82,19 @@
         
         <c:choose>
         <c:when test="${page.required}">
+            <html:hidden property="navbar" />
+        </c:when>
+        <c:otherwise>
+            <tr>
+                <td class="label"><fmt:message key="pageForm.navbar" />&nbsp;</td>
+                <td class="field"><html:checkbox property="navbar" /> (<fmt:message key="pageForm.navbar.tip" />)</td>
+                <td class="description"></td>
+            </tr>
+        </c:otherwise>
+        </c:choose>
+        
+        <c:choose>
+        <c:when test="${page.required}">
             <html:hidden property="hidden" />
         </c:when>
         <c:otherwise>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Tue Aug  8 13:08:43 2006
@@ -336,7 +336,7 @@
 Show entries as a HTML ul list.
 *#
 #macro(showWeblogEntryLinksList $entriesList)
-   <ul class="entriesList">
+   <ul class="rEntriesList">
    #foreach ($var in $entriesList)
        <li class="recentposts"><a href="$var.permalink">$var.title</a></li>
    #end
@@ -616,6 +616,13 @@
 *#
 #macro(showWeblogEntryCalendar $weblog $category)
 $calendarModel.showWeblogEntryCalendar($weblog, $category)
+#end
+
+#** 
+Show large format weblog entry calendar, with optional category restriction.
+*#
+#macro(showWeblogEntryCalendarBig $weblog $category)
+$calendarModel.showWeblogEntryCalendarBig($weblog, $category)
 #end
 
 

Modified: incubator/roller/branches/roller_3.0/web/themes/andreas08/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/andreas08/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/andreas08/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/andreas08/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -6,8 +6,9 @@
     <title>$model.weblog.name</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="Content-Language" content="en" />
-
-    <link rel="stylesheet" type="text/css" href="$url.home/page/css" />
+    <style type="text/css">
+    #includeTemplate($model.weblog "_css")
+    </style>
     <link rel="stylesheet" type="text/css" href='$url.themeResource("andreas08", "styles/tools.css")' />
     <link rel="stylesheet" type="text/css" href="$url.themeResource("andreas08", "styles/typo.css")' />
     <link rel="stylesheet" type="text/css" href='$url.themeResource("andreas08", "styles/lightbox.css")' />
@@ -64,7 +65,7 @@
             <div class="editorMenu">#showAuthorMenu(true)</div>
             <div class="small box" id="description">
                 <div id="feed">
-                    <a href="$url.feed.entries.rss"><img class="rssbadge"
+                    <a href="$url.feed.entries.atom"><img class="rssbadge"
                         src="$url.themeResource("andreas08", "images/feed-icon-16x16.jpg")"
                         alt="Click me to subscribe" /></a>
                 </div>

Modified: incubator/roller/branches/roller_3.0/web/themes/andreas08/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/andreas08/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/andreas08/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/andreas08/_css.vm Tue Aug  8 13:08:43 2006
@@ -1,9 +1,183 @@
-<link rel="stylesheet" type="text/css" href="$url.site/themes/base.css" />
-<style type="text/css">
-@import url($url.themeResource("andreas08", "styles/tools.css"));
-@import url($url.themeResource("andreas08", "styles/type.css"));
-@import url($url.themeResource("andreas08", "styles/forms.css"));
-@import url($url.themeResource("andreas08", "styles/layout-navtop-subright.css"));
-@import url($url.themeResource("andreas08", "styles/layout.css"));
-@import url($url.themeResource("andreas08", "styles/andreas08.css"));
-</style>
+/*-------------------------------------------------------------
+Base styles
+--------------------------------------------------------------*/
+
+body {
+    background: white;
+    font-family:"Lucida Grande", lucida, Geneva, Arial, sans-serif;
+}
+.img {
+    border: 0px;
+    margin: 0px; 
+}
+
+/* entries ----------------------------------------------- */
+
+.entryTitle {
+    font-weight: bold;
+    font-size: 130%;
+}
+.entryInfo {
+    font-size: 80%;
+    color: #999;
+}
+div.dayTitle {
+    font-size: 120%;
+    font-weight:bold;	
+    padding: .5em 0 0 0;
+}
+div.next-previous {
+    font-size: 80%;
+    text-align: center;
+    padding: .5em 0 .5em 0;
+
+}
+
+/* category chooser ----------------------------------------------- */
+
+.category-chooser {
+    margin: -50%;
+    width:100%;
+}
+.rCategory li {
+    font-size: 80%;
+    display: inline;
+    list-style-type: none;
+    padding-right: 20px;
+}
+li.selected {
+    font-weight: bold;
+}
+
+/* other lists ----------------------------------------------- */
+
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    font-size: 80%;
+}
+ul.rFeeds li {
+    background-image: url($url.absoluteSite/images/feed-icon-12x12.gif);
+    background-repeat: no-repeat;
+    background-position: 0 .2em; 
+    padding-left: 1.4em;
+    line-height: 1.5em;
+}
+
+/* calendar ----------------------------------------------- */
+
+.hCalendarDay{
+    text-align : center;
+    font-size: small;
+}
+th.hCalendarDayNameRow {
+    text-align : center;
+    font-size : small;
+    font-weight : bold;
+}
+td.hCalendarDayCurrent {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+td.hCalendarDayLinked {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+
+/* comments ----------------------------------------------- */
+
+p.comment-details {
+    font-size: 80%;
+    color: #999;
+}
+.comments-syntax-indicator {
+    font-weight: bold;
+}
+.comments-syntax-indicator span.enabled {
+    background: transparent;
+    color: green;
+    font-style: italic;
+}
+.comments-syntax-indicator span.disabled {
+    background: transparent;
+    color: red;
+    font-style: italic;
+}
+
+form ul{ position: relative; list-style: none; width: 100%; }
+form li{ line-height: 2em; margin: 0; padding: 1px 1px 6px 9px; }
+form li.focused{ background-color: #fff7c0 !important; }
+form li p{ font-size: 9px; line-height: 13px; color: #444; }
+form li{ display: inline-block; }
+form[id] li{ display: block; }
+form li div{ display: inline-block; }
+form[id] li div{ display: inline; }
+form .left{ float: left !important; margin: 0; }
+form .right{ float: right !important; margin: 0; }
+form .clear{ clear: both; } 
+form li div p{ margin: 0 0 5px 0; }
+form div.left{ margin-right: 2px !important; }
+form div.left[class]{ margin-right: 4px !important; }
+form div.left img{ margin: 0 0 -2px 0; }
+form h2{ font-size: 1.8em; clear: left; } 
+form .info{ display: inline-block; margin: 0 0 10px 0; padding: 0 0 4px 0; border-bottom: 1px dotted #ccc !important;}
+form .info[class]{ display: block; }
+form .info p{ font-size: 1em; line-height: 1.3em; margin: 0 0 8px 0; }
+textarea.textarea{margin-bottom: 1px;}
+textarea.textarea[class]{font-family: "Lucida Grande", Tahoma, "Trebuchet MS", Verdana, sans-serif;}
+select.select{ padding: 1px 0 0 0; margin: 1px 0 3px 0; }
+select.select[class]{ margin: 0; padding: 1px 0 1px 0; }
+form .small{ width: 70px; }
+form .medium{ width: 170px; }
+form .large, form textarea.textarea{ width: 340px; }
+form .tags{ width: 320px; }
+form textarea.small{ height: 5.5em; }
+form textarea.medium{ height: 10em; }
+form textarea.large{ height: 20em; }
+.choices input{ width: 200px; margin-right: 3px; }
+.choices ol{ margin: 10px 0 0 0; }
+.choices[class] ol{ margin: 0 !important; }
+.choices img{ margin: 0 0 1px 0; }
+fieldset ol li{ display: list-item !important; margin: 0 5px 2px 3px !important; padding: 0 !important; list-style: inside decimal; }
+input.button, button { width: 6em; padding: 2px 2px 0 0; /* fix for IE */ }
+/* revert to normal for Firefox */
+li>input.button, li>button, input.button>input.button, button>button { padding: 2px; }
+label.desc{
+    margin: 4px 0 3px 0;
+    border: 0;
+    color: #444;
+    font-size: 1em;
+    line-height: 1.3em;
+    display: block;
+    font-weight: bold;
+}
+input.text, input.number, input.url, input.email, input.password, input.file, 
+textarea.textarea, select.select{
+    font-size: 1.2em;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-right: 1px solid #c3c3c3;
+    border-bottom: 1px solid #ddd;
+    color: #333;
+}
+input.text, input.number, input.url, input.email, input.password, input.file{ padding: 2px; }
+input.currency{ text-align: right; }
+input.checkbox, input.radio{
+    display: block;
+    line-height: 1.4em;
+    margin: 8px 0 0 3px;
+    width: 13px;
+    height: 13px;
+}
+input.focus, textarea.focus { background: #ffd; color: #000; }
+label.choice{
+    display: block;
+    line-height: 1.4em;
+    margin: -19px 0 0 25px;
+    padding: 4px 0 5px 0;
+    color: #444;
+    width: 80%;
+}

Modified: incubator/roller/branches/roller_3.0/web/themes/basic/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/basic/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/basic/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/basic/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -1,10 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="$url.home/page/css" />
+    <title>$model.weblog.name : $model.weblogPage.name</title>
     #showAutodiscoveryLinks($model.weblog)
     #showCommonJavascript()
-    <title>$utils.removeHTML($model.weblog.name) : $model.weblogPage.name</title>
+    <style type="text/css">#includeTemplate($model.weblog "_css")</style>
 </head>
 <body>
 
@@ -45,7 +45,7 @@
 
     <h2>RSS Feeds</h2>
     <div class="sidebar">
-    #showRSSFeedsList($model.weblog)
+    #showAtomFeedsList($model.weblog)
     </div>
 
     <h2>Search</h2>

Modified: incubator/roller/branches/roller_3.0/web/themes/basic/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/basic/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/basic/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/basic/_css.vm Tue Aug  8 13:08:43 2006
@@ -15,7 +15,7 @@
 
 .entryTitle {
     font-weight: bold;
-    font-size: %150;
+    font-size: 130%;
 }
 .entryInfo {
     font-size: 80%;
@@ -51,7 +51,7 @@
 
 /* other lists ----------------------------------------------- */
 
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
     list-style-type: none;
     padding: 0;
     margin: 0;

Modified: incubator/roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -1,10 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>
-    <link rel="stylesheet" type="text/css" href="$url.home/page/css" />
+    <style type="text/css">
+    #includeTemplate($model.weblog "_css")
+    </style>
     #showAutodiscoveryLinks($model.weblog)
     #showCommonJavascript()
-   <title>$utils.removeHTML($model.weblog.name) : $model.weblogPage.name</title>
+   <title>$model.weblog.name : $model.weblogPage.name</title>
 </head>
 <body>
 <div id="block">&nbsp;
@@ -28,7 +30,7 @@
          #showBookmarkLinksList($rootFolder false false) 
 
          <h3>Newsfeeds</h3>
-         #showRSSFeedsList($model.weblog)
+         #showAtomFeedsList($model.weblog)
  
          <h3>Controls</h3>
          #showPageMenu($model.weblog)

Modified: incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_css.vm Tue Aug  8 13:08:43 2006
@@ -15,7 +15,7 @@
 
 .entryTitle {
     font-weight: bold;
-    font-size: %150;
+    font-size: 130%;
 }
 .entryInfo {
     font-size: 80%;
@@ -51,7 +51,7 @@
 
 /* other lists ----------------------------------------------- */
 
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
     list-style-type: none;
     padding: 0;
     margin: 0;

Modified: incubator/roller/branches/roller_3.0/web/themes/cheb/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/cheb/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/cheb/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/cheb/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -3,54 +3,70 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    #showContentType("text/html; charset=utf-8")
-    #showContentLanguage($locale.language)
-    #showRSSAutodiscoveryLink()
-    #showRSDLink()
-    <title>#showWebsiteTitle()</title>
-    <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
-    <link rel="stylesheet" type="text/css" href="#showThemePath("cheb")/theme.css" />
-    <style type="text/css">
-    #includePage("_css")
-    </style>
+    <title>$model.weblog.name : $model.weblogPage.name</title>
+    #showAutodiscoveryLinks($model.weblog)
+    #showCommonJavascript()
+    <style type="text/css">#includeTemplate($model.weblog "_css")</style>
 </head>
 <body>
   <div id="content">
-    <h1>#showWebsiteTitle()</h1>
-    #showWeblogCategoryChooser()
+    <h1>$model.weblog.name</h1>
+    <center>
+        #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+        #showWeblogCategoryLinksList($rootCategory false false)
+    </center>
 
     <div id="entries">
-        #displayWeblogEntries()
+        #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($entry)
+           #showWeblogEntryCommentForm($entry)
+        #end
     </div>
   </div>
 
   <div id="menu">
-    #showRSSBadge()
+    <a href="$url.feed.entries.atom">
+        <img class="rssbadge"
+            src="$url.site/images/feed-icon-12x12.gif" border="0"
+            title="To subscribe: right-click, copy link and past into your newsreader" />Subscribe!</a>
     <div id="calendar">
-        #showWeblogCalendar()
+        #showWeblogEntryCalendar($model.weblog "nil")
     </div>
     <div class="item">
-        #showSearchForm()
+        #showWeblogSearchForm($model.weblog false)
     </div>
     <div class="item">
-        #showBlogroll()
+        #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+        #showBookmarkLinksList($rootFolder false false) 
     </div>
     <div class="item">
-        #showEditorNavBar(true)
+        #showAuthorMenu(true)
     </div>
     <div class="item">
-        #showBasicNavBar(false)
+        #showPageMenu($model.weblog)
     </div>
     <div class="item">
         <a href="http://validator.w3.org/check/referer">
-          <img class="w3" src="$ctxPath/images/vcss.png"
+          <img class="w3" src="$url.absoluteSite/images/vcss.png"
             alt="Valid CSS!"/></a>
         <a href="http://validator.w3.org/check/referer"><img
-            src="$ctxPath/images/valid-xhtml10.png"
+            src="$url.absoluteSite/images/valid-xhtml10.png"
             alt="Valid XHTML 1.0!" class="w3"/></a>
     </div>
     <div class="item">
-        #showReferers(20 25)
+        Today's referrers
+        #set($refs = $model.weblog.getTodaysReferrers())
+        #showReferrersList($refs 30 20)
     </div>
 
      <div class="item">design by

Modified: incubator/roller/branches/roller_3.0/web/themes/cheb/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/cheb/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/cheb/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/cheb/_css.vm Tue Aug  8 13:08:43 2006
@@ -0,0 +1,418 @@
+/*-------------------------------------------------------------
+Base styles
+--------------------------------------------------------------*/
+
+body {
+    background: white;
+    font-family:"Lucida Grande", lucida, Geneva, Arial, sans-serif;
+}
+.img {
+    border: 0px;
+    margin: 0px; 
+}
+
+/* entries ----------------------------------------------- */
+
+.entryTitle {
+    font-weight: bold;
+    font-size: 130%;
+}
+.entryInfo {
+    font-size: 80%;
+    color: #999;
+}
+div.dayTitle {
+    font-size: 120%;
+    font-weight:bold;	
+    padding: .5em 0 0 0;
+}
+div.next-previous {
+    font-size: 80%;
+    text-align: center;
+    padding: .5em 0 .5em 0;
+
+}
+
+/* category chooser ----------------------------------------------- */
+
+.category-chooser {
+    margin: -50%;
+    width:100%;
+}
+.rCategory li {
+    font-size: 80%;
+    display: inline;
+    list-style-type: none;
+    padding-right: 20px;
+}
+li.selected {
+    font-weight: bold;
+}
+
+/* other lists ----------------------------------------------- */
+
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    font-size: 80%;
+}
+ul.rFeeds li {
+    background-image: url($url.absoluteSite/images/feed-icon-12x12.gif);
+    background-repeat: no-repeat;
+    background-position: 0 .2em; 
+    padding-left: 1.4em;
+    line-height: 1.5em;
+}
+
+/* calendar ----------------------------------------------- */
+
+.hCalendarDay{
+    text-align : center;
+    font-size: small;
+}
+th.hCalendarDayNameRow {
+    text-align : center;
+    font-size : small;
+    font-weight : bold;
+}
+td.hCalendarDayCurrent {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+td.hCalendarDayLinked {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+
+/* comments ----------------------------------------------- */
+
+p.comment-details {
+    font-size: 80%;
+    color: #999;
+}
+.comments-syntax-indicator {
+    font-weight: bold;
+}
+.comments-syntax-indicator span.enabled {
+    background: transparent;
+    color: green;
+    font-style: italic;
+}
+.comments-syntax-indicator span.disabled {
+    background: transparent;
+    color: red;
+    font-style: italic;
+}
+
+form ul{ position: relative; list-style: none; width: 100%; }
+form li{ line-height: 2em; margin: 0; padding: 1px 1px 6px 9px; }
+form li.focused{ background-color: #fff7c0 !important; }
+form li p{ font-size: 9px; line-height: 13px; color: #444; }
+form li{ display: inline-block; }
+form[id] li{ display: block; }
+form li div{ display: inline-block; }
+form[id] li div{ display: inline; }
+form .left{ float: left !important; margin: 0; }
+form .right{ float: right !important; margin: 0; }
+form .clear{ clear: both; } 
+form li div p{ margin: 0 0 5px 0; }
+form div.left{ margin-right: 2px !important; }
+form div.left[class]{ margin-right: 4px !important; }
+form div.left img{ margin: 0 0 -2px 0; }
+form h2{ font-size: 1.8em; clear: left; } 
+form .info{ display: inline-block; margin: 0 0 10px 0; padding: 0 0 4px 0; border-bottom: 1px dotted #ccc !important;}
+form .info[class]{ display: block; }
+form .info p{ font-size: 1em; line-height: 1.3em; margin: 0 0 8px 0; }
+textarea.textarea{margin-bottom: 1px;}
+textarea.textarea[class]{font-family: "Lucida Grande", Tahoma, "Trebuchet MS", Verdana, sans-serif;}
+select.select{ padding: 1px 0 0 0; margin: 1px 0 3px 0; }
+select.select[class]{ margin: 0; padding: 1px 0 1px 0; }
+form .small{ width: 70px; }
+form .medium{ width: 170px; }
+form .large, form textarea.textarea{ width: 340px; }
+form .tags{ width: 320px; }
+form textarea.small{ height: 5.5em; }
+form textarea.medium{ height: 10em; }
+form textarea.large{ height: 20em; }
+.choices input{ width: 200px; margin-right: 3px; }
+.choices ol{ margin: 10px 0 0 0; }
+.choices[class] ol{ margin: 0 !important; }
+.choices img{ margin: 0 0 1px 0; }
+fieldset ol li{ display: list-item !important; margin: 0 5px 2px 3px !important; padding: 0 !important; list-style: inside decimal; }
+input.button, button { width: 6em; padding: 2px 2px 0 0; /* fix for IE */ }
+/* revert to normal for Firefox */
+li>input.button, li>button, input.button>input.button, button>button { padding: 2px; }
+label.desc{
+    margin: 4px 0 3px 0;
+    border: 0;
+    color: #444;
+    font-size: 1em;
+    line-height: 1.3em;
+    display: block;
+    font-weight: bold;
+}
+input.text, input.number, input.url, input.email, input.password, input.file, 
+textarea.textarea, select.select{
+    font-size: 1.2em;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-right: 1px solid #c3c3c3;
+    border-bottom: 1px solid #ddd;
+    color: #333;
+}
+input.text, input.number, input.url, input.email, input.password, input.file{ padding: 2px; }
+input.currency{ text-align: right; }
+input.checkbox, input.radio{
+    display: block;
+    line-height: 1.4em;
+    margin: 8px 0 0 3px;
+    width: 13px;
+    height: 13px;
+}
+input.focus, textarea.focus { background: #ffd; color: #000; }
+label.choice{
+    display: block;
+    line-height: 1.4em;
+    margin: -19px 0 0 25px;
+    padding: 4px 0 5px 0;
+    color: #444;
+    width: 80%;
+}
+
+/*-------------------------------------------------------------
+Cheb theme styles
+--------------------------------------------------------------*/
+
+body {
+	margin: 0px 0px 0px 0px;
+}
+
+h2 {
+	padding-top: 10px;
+}
+
+#content {
+	margin-right: 185px;
+	padding: 10px;
+	text-align: center; /* centers content */
+}
+
+#content #entries {
+	text-align: left;
+}
+
+#content #title {
+	border: 0px;
+	height: 73px;
+	width: 422px;
+}
+
+#content .rWeblogCategoryChooser {
+	margin-bottom: 10px;
+}
+
+#menu {
+	line-height: 17px;
+	padding: 10px;
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	width: 185px;
+}
+
+#menu #calendar {
+	margin-bottom: 10px;
+	margin-top: 5px;
+	padding: 2px;
+}
+
+/* center the calendar table */
+#menu #calendar table {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#menu .item {
+	padding: 10px 0px 10px 2px;
+}
+
+
+body {
+	/* Here we'll declare the default font-size and font-family. 
+	 * The rest of the typographical rules use relative sizes based on this font-size. 
+	 * We can easily modify overall typography by changing or overriding these values. 
+	 */
+	background: #F4F4D1; 
+	color: #573e93;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 100%;
+    	margin: 0px;
+}
+
+a {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+a:hover {
+	text-decoration: underline overline;
+}
+
+a:active {
+	text-decoration: none;
+}
+
+.dateStamp {
+	background: transparent;
+	color: #825d9c;
+	font-size: 8pt;
+}
+
+.error {
+	background: transparent;
+	color: #FF0000;
+}
+
+#calendar {
+	color: #412FC8;//825d9c
+}
+
+.hCalendarDay {
+	border-width: thin;
+	text-align: center;
+}
+
+.hCalendarDayCurrent {
+	border-style: solid;
+	border-width: medium;
+	font-weight: bolder;
+	text-align: center;
+}
+
+.hCalendarDayLinked {
+	border-width: thin;
+	font-weight: bolder;
+	text-align: center;
+}
+
+.hCalendarDayNameRow {
+	font-weight: bolder;
+	text-align: center;
+}
+
+.hCalendarDayNotInMonth {
+	background: transparent;
+	color: #AAAAAA;
+	text-align: center;
+}
+
+.hCalendarNextPrev {
+	text-align: center;
+}
+
+.hCalendarTitle {
+	font-weight: bolder;
+	text-align: center;
+}
+
+#menu {
+	background-color: #000080;
+	background-image: url($url.themeResource("cheb", "images/background.jpg"));
+	color: #000080;
+	width: 20%;
+}
+
+#menu #calendar {
+	border: 3px solid #575700;
+}
+
+#menu .item {
+	border-top: 2px dashed #575700;
+}
+
+.rFolder, .rNewsfeedTitle {
+	font-weight: 600;
+}
+
+.permalink, .daypermalink {
+	border: 0px;
+	vertical-align: bottom;
+}
+
+/* hide borders for all images with links */
+img a {
+    border: 0px;
+}
+
+#content {
+	background: #F4F4D1;
+	color: #412FC8;
+}
+
+#content a {
+	background: transparent;
+	color: #000080;
+}
+
+#content pre {
+	background: #FFFFCC;
+	color: #573e93;
+	padding: 5px;
+}
+
+.entryHeader, .comments-head {
+	background: #F4F4D1;
+	background-image: url($url.themeResource("cheb", "images/titlebar.jpg"));
+	background-image: no-repeat;
+	color: #000080;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 1.1em;
+	font-variant: small-caps;
+	font-weight: bold;
+	position: relative;
+	top: 0px;
+	left: 10px;
+	width: 490px;
+	margin: 5px;
+	padding: 5px;
+}
+
+.comment {
+   margin-left: 20px;
+   width: 75%;
+}
+
+.entryBox {
+    background: #F4F4D1;
+    color: #000080;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    position: relative;
+    left: 20px; 
+    width: 85%;
+    margin: 5px;
+    padding: 5px;
+}
+
+#menu a {
+	background: transparent;
+	color: #573e93;
+}
+
+#menu .rFolder a, #menu .rNewsfeedTitle a {
+	background: transparent;
+	color: #573E93;
+}
+
+#menu .rFolder span, #menu .rNewsfeedTitle span {
+    font-weight: bold;
+}
+
+.rReferersList {
+	font-size:1em;
+	margin-left: 5px;
+	padding-left: 5px;
+}
+

Modified: incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/cheb/_day.vm Tue Aug  8 13:08:43 2006
@@ -1,21 +1,37 @@
+<div class="dayBox">
 
 <div class="entryHeader">
-   #showDayPermalink( $day )
-   #showEntryDate( $day )
+       <img class="daypermalink" src="$url.site/images/permalink.gif" alt="pageicon"></a>
+       $utils.formatDate($day, "EEEE MMM dd, yyyy")
 </div>
 
-#foreach( $entry in $entries )
-<div class="entryContent">
-    <p>
-        <a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
-        <b>$entry.title</b>
-        #showEntryText($entry)
-        $text.get("macro.weblog.postedby") $entry.creator.userName
-        <span class="dateStamp">(#showTimestamp($entry.pubTime))</span>
-        #showEntryPermalink( $entry )
-        #showCommentsPageLink( $entry )<br />
-        Trackback: #showTrackbackURL($entry)
-    </p>
+    #foreach( $entry in $entries )
+    <div class="entryBox">
+        <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
+        <p class="entryTitle">$entry.title</p>
+         
+            #if($model.permalink)
+                $entry.displayContent
+            #else
+                $entry.displayContent($url.entry($entry.anchor))
+            #end
+        
+        <p class="entryInfo">
+            Posted at <a href="$url.entry($entry.anchor)">
+               $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
+            by $entry.creator.fullName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
+            #if ($utils.isUserAuthorizedToAuthor($entry.website))
+                <a href="$url.editEntry($entry.anchor)">
+                $text.get("macro.weblog.entrypermalink.edit")</a> &nbsp;|&nbsp;
+            #end
+            #set($commentCount = $entry.commentCount)
+            #if($entry.commentsStillAllowed || $commentCount > 0)  
+                #set($link = "$url.comments($entry.anchor)" )
+                <a href="$link" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
+            #end
+        </p>
+    </div>
+    #end
+
 </div>
-#end
 

Modified: incubator/roller/branches/roller_3.0/web/themes/clean/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/clean/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/clean/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/clean/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -1,14 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-    #showContentType("text/html; charset=utf-8")
-    #showContentLanguage($locale.language)
-    #showRSSAutodiscoveryLink()
-    #showRSDLink()
-    <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
-    <link rel="stylesheet" type="text/css" href="#showThemePath("clean")/theme.css" />
-    <style type="text/css">#includePage("_css")</style>
-    <title>#showWebsiteTitle()</title>
+    <title>$model.weblog.name : $model.weblogPage.name</title>
+    #showAutodiscoveryLinks($model.weblog)
+    #showCommonJavascript()
+    <style type="text/css">#includeTemplate($model.weblog "_css")</style>
 </head>
 <body>
     <table cellpadding="5" cellspacing="15" border="0" align="center" width="95%">
@@ -16,19 +12,47 @@
             <tr>
                 <td width="5%" valign="top" bgcolor="#ffffff">&nbsp;</td>
                 <td width="75%" valign="top" bgcolor="#ffffff">
-                    <h2>#showWebsiteTitle()</h2>
-                    <h3>#showWebsiteDescription()</h3>
-                    #showWeblogCategoryChooser()<br>
-                    #displayWeblogEntries()
+                    <h2>$model.weblog.name</h2>
+                    <h3>$utils.removeHTML($model.weblog.description)</h3>
+                    #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+                    #showWeblogCategoryLinksList($rootCategory false false)
+
+                    #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($entry)
+                       #showWeblogEntryCommentForm($entry)
+                    #end
+
                 </td>
                 <td valign="top" bgcolor="#ffffff" width="20%">
-                    <br>#showWeblogCalendar()<br><br>
-                    #showRSSBadge()<br><br><br>
-                    #showBasicNavBar(true)<br>
-                    #showSearchForm()<br>
-                    #showBlogroll()<br>
-                    #showEditorNavBar(true)<br>
-                    #showReferers(30 20)
+                    <br>#showWeblogEntryCalendar($model.weblog "nil")
+
+                    <h3>Feeds</h3>
+                    #showAtomFeedsList($model.weblog)
+
+                    <h3>Search this blog</h3>
+                    #showWeblogSearchForm($model.weblog false)
+
+                    <h3>Search this blog</h3>
+                    #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+                    #showBookmarkLinksList($rootFolder false false)
+
+                    <h3>Weblog menu</h3>
+                    #showPageMenu($model.weblog)
+                    #showAuthorMenu(true)
+
+                    <h3>Today's referrers</h3>
+                    #set($refs = $model.weblog.getTodaysReferrers())
+                    #showReferrersList($refs 30 20)
                 </td>
             </tr>
         </tbody>

Modified: incubator/roller/branches/roller_3.0/web/themes/clean/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/clean/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/clean/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/clean/_css.vm Tue Aug  8 13:08:43 2006
@@ -0,0 +1,257 @@
+/*-------------------------------------------------------------
+Base styles
+--------------------------------------------------------------*/
+
+body {
+    background: white;
+    font-family:"Lucida Grande", lucida, Geneva, Arial, sans-serif;
+}
+.img {
+    border: 0px;
+    margin: 0px; 
+}
+
+/* entries ----------------------------------------------- */
+
+.entryTitle {
+    font-weight: bold;
+    font-size: 130%;
+}
+.entryInfo {
+    font-size: 80%;
+    color: #999;
+}
+div.dayTitle {
+    font-size: 120%;
+    font-weight:bold;	
+    padding: .5em 0 0 0;
+}
+div.next-previous {
+    font-size: 80%;
+    text-align: center;
+    padding: .5em 0 .5em 0;
+
+}
+
+/* category chooser ----------------------------------------------- */
+
+.category-chooser {
+    margin: -50%;
+    width:100%;
+}
+.rCategory li {
+    font-size: 80%;
+    display: inline;
+    list-style-type: none;
+    padding-right: 20px;
+}
+li.selected {
+    font-weight: bold;
+}
+
+/* other lists ----------------------------------------------- */
+
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    font-size: 80%;
+}
+ul.rFeeds li {
+    background-image: url($url.absoluteSite/images/feed-icon-12x12.gif);
+    background-repeat: no-repeat;
+    background-position: 0 .2em; 
+    padding-left: 1.4em;
+    line-height: 1.5em;
+}
+
+/* calendar ----------------------------------------------- */
+
+.hCalendarDay{
+    text-align : center;
+    font-size: small;
+}
+th.hCalendarDayNameRow {
+    text-align : center;
+    font-size : small;
+    font-weight : bold;
+}
+td.hCalendarDayCurrent {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+td.hCalendarDayLinked {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+
+/* comments ----------------------------------------------- */
+
+p.comment-details {
+    font-size: 80%;
+    color: #999;
+}
+.comments-syntax-indicator {
+    font-weight: bold;
+}
+.comments-syntax-indicator span.enabled {
+    background: transparent;
+    color: green;
+    font-style: italic;
+}
+.comments-syntax-indicator span.disabled {
+    background: transparent;
+    color: red;
+    font-style: italic;
+}
+
+form ul{ position: relative; list-style: none; width: 100%; }
+form li{ line-height: 2em; margin: 0; padding: 1px 1px 6px 9px; }
+form li.focused{ background-color: #fff7c0 !important; }
+form li p{ font-size: 9px; line-height: 13px; color: #444; }
+form li{ display: inline-block; }
+form[id] li{ display: block; }
+form li div{ display: inline-block; }
+form[id] li div{ display: inline; }
+form .left{ float: left !important; margin: 0; }
+form .right{ float: right !important; margin: 0; }
+form .clear{ clear: both; } 
+form li div p{ margin: 0 0 5px 0; }
+form div.left{ margin-right: 2px !important; }
+form div.left[class]{ margin-right: 4px !important; }
+form div.left img{ margin: 0 0 -2px 0; }
+form h2{ font-size: 1.8em; clear: left; } 
+form .info{ display: inline-block; margin: 0 0 10px 0; padding: 0 0 4px 0; border-bottom: 1px dotted #ccc !important;}
+form .info[class]{ display: block; }
+form .info p{ font-size: 1em; line-height: 1.3em; margin: 0 0 8px 0; }
+textarea.textarea{margin-bottom: 1px;}
+textarea.textarea[class]{font-family: "Lucida Grande", Tahoma, "Trebuchet MS", Verdana, sans-serif;}
+select.select{ padding: 1px 0 0 0; margin: 1px 0 3px 0; }
+select.select[class]{ margin: 0; padding: 1px 0 1px 0; }
+form .small{ width: 70px; }
+form .medium{ width: 170px; }
+form .large, form textarea.textarea{ width: 340px; }
+form .tags{ width: 320px; }
+form textarea.small{ height: 5.5em; }
+form textarea.medium{ height: 10em; }
+form textarea.large{ height: 20em; }
+.choices input{ width: 200px; margin-right: 3px; }
+.choices ol{ margin: 10px 0 0 0; }
+.choices[class] ol{ margin: 0 !important; }
+.choices img{ margin: 0 0 1px 0; }
+fieldset ol li{ display: list-item !important; margin: 0 5px 2px 3px !important; padding: 0 !important; list-style: inside decimal; }
+input.button, button { width: 6em; padding: 2px 2px 0 0; /* fix for IE */ }
+/* revert to normal for Firefox */
+li>input.button, li>button, input.button>input.button, button>button { padding: 2px; }
+label.desc{
+    margin: 4px 0 3px 0;
+    border: 0;
+    color: #444;
+    font-size: 1em;
+    line-height: 1.3em;
+    display: block;
+    font-weight: bold;
+}
+input.text, input.number, input.url, input.email, input.password, input.file, 
+textarea.textarea, select.select{
+    font-size: 1.2em;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-right: 1px solid #c3c3c3;
+    border-bottom: 1px solid #ddd;
+    color: #333;
+}
+input.text, input.number, input.url, input.email, input.password, input.file{ padding: 2px; }
+input.currency{ text-align: right; }
+input.checkbox, input.radio{
+    display: block;
+    line-height: 1.4em;
+    margin: 8px 0 0 3px;
+    width: 13px;
+    height: 13px;
+}
+input.focus, textarea.focus { background: #ffd; color: #000; }
+label.choice{
+    display: block;
+    line-height: 1.4em;
+    margin: -19px 0 0 25px;
+    padding: 4px 0 5px 0;
+    color: #444;
+    width: 80%;
+}
+
+/*-------------------------------------------------------------
+Clean theme styles
+--------------------------------------------------------------*/
+
+body  {
+    margin:  0;
+    padding:  0;
+    color:  black;
+    background-color: white;
+}
+h1 {
+    color : #0000FAA;
+}
+h2 {
+    color : #0000AA;
+}
+h3 {
+    color : #0000AA;
+}
+ul.rCategory {
+    padding:0px;
+}
+.hCalendarMonthYearRow {
+    font-size: medium;
+    font-weight: bold;
+    color: #0000AA;
+}
+.hCalendarDayNameRow {
+    font-size: x-small;
+    font-weight: bold;
+}
+.hCalendarDay {
+    font-size: x-small;
+}
+.hCalendarDayCurrent {
+    font-size: x-small;
+    font-weight: bold;
+    border-style: dashed;
+    border-width: thin;
+    border-color: #0000AA;
+    color: #0000AA;
+}
+.hCalendarNextPrev {
+    font-size: x-small;
+    font-weight: bold;
+}
+a {
+    text-decoration: none;
+    font-weight: bold;
+}
+a:hover {
+    text-decoration: none;
+    font-weight: bold;
+}
+div.codeblock {
+    color:white;
+    border-style:solid;
+    border-width:1px;
+    border-color:black;
+    background-color:#B0B0B0;
+}
+
+
+.bluebar, .comments-head {
+    height:15px;
+    width:95%;
+    padding: 3px 3px 6px 3px;
+    color: white;
+    background-color:#0000A0;
+    border-color:white;
+    border-style:solid;
+    border-width:1px;
+}

Modified: incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/clean/_day.vm Tue Aug  8 13:08:43 2006
@@ -1 +1 @@
-<table>
    <tr>
       <td style="font-size:11px;">
       #showDayPermalink( $day )
       #showEntryDate( $day )
       </td>
    </tr>
    <tr><td style="font-size:11px;">
    #foreach( $entry in $entries )
        <p><a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
            <div class="belowTitle">
                <div class="title">
                    &nbsp;<b>$entry.title</b>
                </div>
            </div>
            <br>
            #showEntryText($entry)
            <br><br>
            $text.get("macro.weblog.postedby") $entry.creator.userName
            <small>(#showTimestamp($entry.updateTime)/#showTimestamp($entry.pubTime))</small>
           #showEntryPermalink( $entry )
           #showCommentsPageLink( $entry )<br>
           Trackback: #showTrackbackURL( $entry )
        </p>
    #end
    </td></tr>
</table>
\ No newline at end of file
+<div class="dayBox">

<div class="bluebar">
   <div class="entryHeader">
       <img class="daypermalink" src="$url.site/images/permalink.gif" alt="pageicon"></a>
       $utils.formatDate($day, "EEEE MMM dd, yyyy")
   </div>
</div>

    #foreach( $entry in $entries )
    <div class="entryBox">
        <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
        <p class="entryTitle">$entry.title</p>
         
            #if($model.permalink)
                $entry.displayContent
            #else
                $entry.displayContent($url.entry($entry.anchor))
            #end
        
        <p class="entryInfo">
            Posted at <a href="$url.entry($entry.anchor)">
               $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
            by $entry.creator.fullName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
            #if ($utils.isUserAuthorizedToAuthor($entry.website))
                <a href="$url.ed
 itEntry($entry.anchor)">
                $text.get("macro.weblog.entrypermalink.edit")</a> &nbsp;|&nbsp;
            #end
            #set($commentCount = $entry.commentCount)
            #if($entry.commentsStillAllowed || $commentCount > 0)  
                #set($link = "$url.comments($entry.anchor)" )
                <a href="$link" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
            #end
        </p>
    </div>
    #end

</div>
\ No newline at end of file

Modified: incubator/roller/branches/roller_3.0/web/themes/currency-i18n/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency-i18n/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency-i18n/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency-i18n/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -2,11 +2,10 @@
 
 <html>
 <head>
-    #showContentType("text/html; charset=utf-8")
-    #showContentLanguage($locale.language)
-    #showRSSAutodiscoveryLink()
-    #showRSDLink()
-    <title>#showWebsiteTitle()</title>
+    <title>$model.weblog.name : $model.weblogPage.name</title>
+    #showAutodiscoveryLinks($model.weblog)
+    #showCommonJavascript()
+    <style type="text/css">#includeTemplate($model.weblog "_css")</style>
     <script type="text/javascript" language="JavaScript">
     <!--
     if (!((navigator.appVersion.indexOf('MSIE')!=-1) || (parseInt(navigator.appVersion)!=4)))
@@ -17,19 +16,10 @@
     };
     // -->
     </script>
-
-    <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
-    <link rel="stylesheet" type="text/css" href="#showThemePath("currency")/theme.css" />
-    <style type="text/css">
-      #includePage("_css")
-    </style>
-    <script type="text/javascript" src="$ctxPath/theme/scripts/roller.js">
-    </script>
 </head>
 
 <body>
-  <table border="0" cellspacing="0" cellpadding="0" width=
-  "100%">
+  <table border="0" cellspacing="0" cellpadding="0" width= "100%">
      <tbody>
         <tr>
            <td width="100%" bgcolor="#666666">
@@ -42,9 +32,9 @@
         </tr>
 
         <tr>
-           <td class="title" width="100%" bgcolor="#cccc99"
-             valign="top">#showWebsiteTitle()<br>
-             <font class="descrip">#showWebsiteDescription()</font>
+           <td class="title" width="100%" bgcolor="#cccc99" valign="top">
+             <h1 class="title">$model.weblog.name</h1>
+             <font class="descrip">$model.weblog.description</font>
            </td>
         </tr>
 
@@ -59,9 +49,25 @@
      <tbody>
         <tr>
            <td valign="top" width="555" class="body">
-              #showWeblogCategoryChooser()<br />
-
-              #displayWeblogEntries()
+                    <div class="catChooser">
+                    #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+                    #showWeblogCategoryLinksList($rootCategory false false)
+                    </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($entry)
+                       #showWeblogEntryCommentForm($entry)
+                    #end
 
               <hr size="1">
            </td>
@@ -95,8 +101,8 @@
                     <tr>
                        <td class="links">
 
-                       #showWeblogCalendar()<br>
-                       #showRSSBadge()<br>
+                       #showWeblogEntryCalendar($model.weblog "nil")<br>
+                       #showAtomFeedsList($model.weblog)<br>
 
                        </td>
                     </tr>
@@ -107,24 +113,7 @@
                     </tr>
                     <tr>
                        <td class="search">
-                       #showSearchForm()<br/>
-                       </td>
-                    </tr>
-                    <tr>
-                       <td bgcolor="#000000">
-                       </td>
-                    </tr>
-                    <tr>
-                       <td bgcolor="#cccccc"><font class=
-                       "subhead">$text.get("weblogMain.language")</font></td>
-                    </tr>
-                    <tr>
-                       <td bgcolor="#000000">
-                       </td>
-                    </tr>
-                    <tr>
-                       <td class="search">
-                        #showLanguageForm()<br/>
+                       #showWeblogSearchForm($model.weblog false)<br/>
                        </td>
                     </tr>
                     <tr>
@@ -142,9 +131,10 @@
                     <tr>
                        <td class="links">
 
-                       #showBlogroll()<br>
-                       #showBasicNavBar(true)<br>
-                       #showEditorNavBar(true)<br>
+                       #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+                       #showBookmarkLinksList($rootFolder false false)<br>
+                       #showPageMenu($model.weblog)<br>
+                       #showAuthorMenu(true)<br>
 
                        </td>
                     </tr>
@@ -163,7 +153,8 @@
                     <tr>
                        <td class="links">
 
-                        #showReferers(30 20)<br>
+                        #set($refs = $model.weblog.getTodaysReferrers())
+                        #showReferrersList($refs 30 20)<br>
 
                        </td>
                     </tr>

Modified: incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_css.vm Tue Aug  8 13:08:43 2006
@@ -0,0 +1,305 @@
+/*-------------------------------------------------------------
+Base styles
+--------------------------------------------------------------*/
+
+body {
+    background: white;
+    font-family:"Lucida Grande", lucida, Geneva, Arial, sans-serif;
+}
+.img {
+    border: 0px;
+    margin: 0px; 
+}
+
+/* entries ----------------------------------------------- */
+
+.entryTitle {
+    font-weight: bold;
+    font-size: 130%;
+}
+.entryInfo {
+    font-size: 80%;
+    color: #999;
+}
+div.dayTitle {
+    font-size: 120%;
+    font-weight:bold;	
+    padding: .5em 0 0 0;
+}
+div.next-previous {
+    font-size: 80%;
+    text-align: center;
+    padding: .5em 0 .5em 0;
+
+}
+
+/* category chooser ----------------------------------------------- */
+
+.category-chooser {
+    margin: -50%;
+    width:100%;
+}
+.rCategory li {
+    font-size: 80%;
+    display: inline;
+    list-style-type: none;
+    padding-right: 20px;
+}
+li.selected {
+    font-weight: bold;
+}
+
+/* other lists ----------------------------------------------- */
+
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    font-size: 80%;
+}
+ul.rFeeds li {
+    background-image: url($url.absoluteSite/images/feed-icon-12x12.gif);
+    background-repeat: no-repeat;
+    background-position: 0 .2em; 
+    padding-left: 1.4em;
+    line-height: 1.5em;
+}
+
+/* calendar ----------------------------------------------- */
+
+.hCalendarDay{
+    text-align : center;
+    font-size: small;
+}
+th.hCalendarDayNameRow {
+    text-align : center;
+    font-size : small;
+    font-weight : bold;
+}
+td.hCalendarDayCurrent {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+td.hCalendarDayLinked {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+
+/* comments ----------------------------------------------- */
+
+p.comment-details {
+    font-size: 80%;
+    color: #999;
+}
+.comments-syntax-indicator {
+    font-weight: bold;
+}
+.comments-syntax-indicator span.enabled {
+    background: transparent;
+    color: green;
+    font-style: italic;
+}
+.comments-syntax-indicator span.disabled {
+    background: transparent;
+    color: red;
+    font-style: italic;
+}
+
+form ul{ position: relative; list-style: none; width: 100%; }
+form li{ line-height: 2em; margin: 0; padding: 1px 1px 6px 9px; }
+form li.focused{ background-color: #fff7c0 !important; }
+form li p{ font-size: 9px; line-height: 13px; color: #444; }
+form li{ display: inline-block; }
+form[id] li{ display: block; }
+form li div{ display: inline-block; }
+form[id] li div{ display: inline; }
+form .left{ float: left !important; margin: 0; }
+form .right{ float: right !important; margin: 0; }
+form .clear{ clear: both; } 
+form li div p{ margin: 0 0 5px 0; }
+form div.left{ margin-right: 2px !important; }
+form div.left[class]{ margin-right: 4px !important; }
+form div.left img{ margin: 0 0 -2px 0; }
+form h2{ font-size: 1.8em; clear: left; } 
+form .info{ display: inline-block; margin: 0 0 10px 0; padding: 0 0 4px 0; border-bottom: 1px dotted #ccc !important;}
+form .info[class]{ display: block; }
+form .info p{ font-size: 1em; line-height: 1.3em; margin: 0 0 8px 0; }
+textarea.textarea{margin-bottom: 1px;}
+textarea.textarea[class]{font-family: "Lucida Grande", Tahoma, "Trebuchet MS", Verdana, sans-serif;}
+select.select{ padding: 1px 0 0 0; margin: 1px 0 3px 0; }
+select.select[class]{ margin: 0; padding: 1px 0 1px 0; }
+form .small{ width: 70px; }
+form .medium{ width: 170px; }
+form .large, form textarea.textarea{ width: 340px; }
+form .tags{ width: 320px; }
+form textarea.small{ height: 5.5em; }
+form textarea.medium{ height: 10em; }
+form textarea.large{ height: 20em; }
+.choices input{ width: 200px; margin-right: 3px; }
+.choices ol{ margin: 10px 0 0 0; }
+.choices[class] ol{ margin: 0 !important; }
+.choices img{ margin: 0 0 1px 0; }
+fieldset ol li{ display: list-item !important; margin: 0 5px 2px 3px !important; padding: 0 !important; list-style: inside decimal; }
+input.button, button { width: 6em; padding: 2px 2px 0 0; /* fix for IE */ }
+/* revert to normal for Firefox */
+li>input.button, li>button, input.button>input.button, button>button { padding: 2px; }
+label.desc{
+    margin: 4px 0 3px 0;
+    border: 0;
+    color: #444;
+    font-size: 1em;
+    line-height: 1.3em;
+    display: block;
+    font-weight: bold;
+}
+input.text, input.number, input.url, input.email, input.password, input.file, 
+textarea.textarea, select.select{
+    font-size: 1.2em;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-right: 1px solid #c3c3c3;
+    border-bottom: 1px solid #ddd;
+    color: #333;
+}
+input.text, input.number, input.url, input.email, input.password, input.file{ padding: 2px; }
+input.currency{ text-align: right; }
+input.checkbox, input.radio{
+    display: block;
+    line-height: 1.4em;
+    margin: 8px 0 0 3px;
+    width: 13px;
+    height: 13px;
+}
+input.focus, textarea.focus { background: #ffd; color: #000; }
+label.choice{
+    display: block;
+    line-height: 1.4em;
+    margin: -19px 0 0 25px;
+    padding: 4px 0 5px 0;
+    color: #444;
+    width: 80%;
+}
+
+/*-------------------------------------------------------------
+Currency theme styles
+--------------------------------------------------------------*/
+
+A         { color: #CC6633; text-decoration: none; } 
+A:link    { color: #CC6633; text-decoration: none; } 
+A:visited { color: #CC6633; text-decoration: none; } 
+A:active  { color: #FF9966;  } 
+A:hover   { color: #FF9966;  } 
+td.body   { padding:20px;}
+
+body { 
+    margin-top: 0px; 
+    margin-left: 0px; 
+    margin-right: 0px; 
+    background-color:#ffffff;
+}
+td.title { 
+    padding:20px; 
+    font-family: verdana, sans-serif;  
+    color: #666666; 
+    font-weight:bold;
+    letter-spacing:.1em; 
+}
+td.links { 
+    padding:8px; 
+    font-family: verdana, sans-serif; 
+    color: #336699; 
+}
+td.search {
+	padding: 5px;
+}
+font.descrip { 
+    font-family: verdana, sans-serif; 
+    color: #999966; 
+    text-transform:uppercase; 
+    font-weight:bold; 
+    letter-spacing:.2em; 
+    padding:5px;
+}
+font.date { 
+    font-family: verdana, sans-serif;
+    color: #336699;
+}
+font.author { 
+    font-family: verdana, sans-serif;
+    color: #336699;
+    text-transform:lowercase;
+}
+font.time { 
+    font-family: verdana, sans-serif;
+    color: #336699;
+    text-transform:uppercase;
+}
+font { 
+    font-family: verdana, sans-serif;
+    color: #666666;
+    line-height:16px;
+}
+font.subhead { 
+    font-family: verdana, sans-serif;
+    color: #333333;
+    font-weight:bold;
+    padding:8px;
+    letter-spacing:  .1em
+}
+.entryBox { 
+    font-family: verdana, georgia, arial;
+    color:#666666;
+    text-align:justify;
+}
+.hCalendarTitle {
+    text-align : center;
+    font-weight : bolder ;
+}
+.hCalendarDay {
+    text-align : center;
+    font-size : 9px;
+    border-width: thin;
+}
+.hCalendarDayCurrent {
+    text-align : center;
+    font-size : 9px;
+    font-weight : bolder ;
+    border-width: thin;
+    border-style: dotted;
+}
+.hCalendarDayNameRow {
+    text-align : center;
+    font-weight : bolder ;
+    font-size : 9px;
+}
+.hCalendarDayLinked {
+    font-weight : bolder ;
+    text-align : center;
+    font-size : 9px;
+    border-width: thin;
+}
+.hCalendarDayNotInMonth {
+    text-align : center;
+    font-size : 9px;
+    color : #aaaaaa;
+}
+.hCalendarNextPrev {
+    text-align : center;
+    font-style : italic;
+    font-size : small;
+    color : #aaaaaa;
+}
+ul.rCategory {
+    padding: 0px;
+}
+.comments-head {
+    font-size:120%;
+}
+h1.title {
+    font-size:150%;
+}
+div.catChooser {
+    text-align: center;
+}

Modified: incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency-i18n/_day.vm Tue Aug  8 13:08:43 2006
@@ -1,18 +1,35 @@
+<div class="dayBox">
 
-<div class="entry">
-   #showDayPermalink( $day )
-   #showEntryDate( $day )
-</div>
+    <div class="dayTitle">
+       $utils.formatDate($day, "EEEE MMM dd, yyyy")
+    </div>
 
-#foreach( $entry in $entries )
-<p>
-   <a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
-   <b>$entry.title</b>
-    #showEntryText($entry)
-    $text.get("macro.weblog.postedby") $entry.creator.userName
-   <span class="dateStamp">(#showTimestamp($entry.pubTime))</span>
-   #showEntryPermalink( $entry )
-   #showCommentsPageLink( $entry )
-</p>
-#end
-    
+    #foreach( $entry in $entries )
+    <div class="entryBox">
+        <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
+        <p class="entryTitle">$entry.title</p>
+        <p class="entryContent"> 
+            #if($model.permalink)
+                $entry.displayContent
+            #else
+                $entry.displayContent($url.entry($entry.anchor))
+            #end
+        </p>
+        <p class="entryInfo">
+            Posted at <a href="$url.entry($entry.anchor)">
+                $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
+            by $entry.creator.fullName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
+            #if ($utils.isUserAuthorizedToAuthor($entry.website))
+                <a href="$url.editEntry($entry.anchor)">
+                $text.get("macro.weblog.entrypermalink.edit")</a> &nbsp;|&nbsp;
+            #end
+            #set($commentCount = $entry.commentCount)
+            #if($entry.commentsStillAllowed || $commentCount > 0)  
+                #set($link = "$url.comments($entry.anchor)" )
+                <a href="$link" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
+            #end
+        </p>
+    </div>
+    #end
+
+</div>
\ No newline at end of file

Modified: incubator/roller/branches/roller_3.0/web/themes/currency/Weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency/Weblog.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency/Weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency/Weblog.vm Tue Aug  8 13:08:43 2006
@@ -2,11 +2,10 @@
 
 <html>
 <head>
-    #showContentType("text/html; charset=utf-8")
-    #showContentLanguage($locale.language)
-    #showRSSAutodiscoveryLink()
-    #showRSDLink()
-    <title>#showWebsiteTitle()</title>
+    <title>$model.weblog.name : $model.weblogPage.name</title>
+    #showAutodiscoveryLinks($model.weblog)
+    #showCommonJavascript()
+    <style type="text/css">#includeTemplate($model.weblog "_css")</style>
     <script type="text/javascript" language="JavaScript">
     <!--
     if (!((navigator.appVersion.indexOf('MSIE')!=-1) || (parseInt(navigator.appVersion)!=4)))
@@ -17,19 +16,10 @@
     };
     // -->
     </script>
-
-    <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
-    <link rel="stylesheet" type="text/css" href="#showThemePath("currency")/theme.css" />
-    <style type="text/css">
-      #includePage("_css")
-    </style>
-    <script type="text/javascript" src="$ctxPath/theme/scripts/roller.js">
-    </script>
 </head>
 
 <body>
-  <table border="0" cellspacing="0" cellpadding="0" width=
-  "100%">
+  <table border="0" cellspacing="0" cellpadding="0" width= "100%">
      <tbody>
         <tr>
            <td width="100%" bgcolor="#666666">
@@ -42,9 +32,9 @@
         </tr>
 
         <tr>
-           <td class="title" width="100%" bgcolor="#cccc99"
-             valign="top">#showWebsiteTitle()<br>
-             <font class="descrip">#showWebsiteDescription()</font>
+           <td class="title" width="100%" bgcolor="#cccc99" valign="top">
+             <h1 class="title">$model.weblog.name</h1>
+             <font class="descrip">$model.weblog.description</font>
            </td>
         </tr>
 
@@ -59,9 +49,25 @@
      <tbody>
         <tr>
            <td valign="top" width="555" class="body">
-              #showWeblogCategoryChooser()<br />
-
-              #displayWeblogEntries()
+                    <div class="catChooser">
+                    #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+                    #showWeblogCategoryLinksList($rootCategory false false)
+                    </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($entry)
+                       #showWeblogEntryCommentForm($entry)
+                    #end
 
               <hr size="1">
            </td>
@@ -95,8 +101,8 @@
                     <tr>
                        <td class="links">
 
-                       #showWeblogCalendar()<br>
-                       #showRSSBadge()<br>
+                       #showWeblogEntryCalendar($model.weblog "nil")<br>
+                       #showAtomFeedsList($model.weblog)<br>
 
                        </td>
                     </tr>
@@ -107,24 +113,7 @@
                     </tr>
                     <tr>
                        <td class="search">
-                       #showSearchForm()<br/>
-                       </td>
-                    </tr>
-                    <tr>
-                       <td bgcolor="#000000">
-                       </td>
-                    </tr>
-                    <tr>
-                       <td bgcolor="#cccccc"><font class=
-                       "subhead">$text.get("weblogMain.language")</font></td>
-                    </tr>
-                    <tr>
-                       <td bgcolor="#000000">
-                       </td>
-                    </tr>
-                    <tr>
-                       <td class="search">
-                        #showLanguageForm()<br/>
+                       #showWeblogSearchForm($model.weblog false)<br/>
                        </td>
                     </tr>
                     <tr>
@@ -142,9 +131,10 @@
                     <tr>
                        <td class="links">
 
-                       #showBlogroll()<br>
-                       #showBasicNavBar(true)<br>
-                       #showEditorNavBar(true)<br>
+                       #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+                       #showBookmarkLinksList($rootFolder false false)<br>
+                       #showPageMenu($model.weblog)<br>
+                       #showAuthorMenu(true)<br>
 
                        </td>
                     </tr>
@@ -163,7 +153,8 @@
                     <tr>
                        <td class="links">
 
-                        #showReferers(30 20)<br>
+                        #set($refs = $model.weblog.getTodaysReferrers())
+                        #showReferrersList($refs 30 20)<br>
 
                        </td>
                     </tr>

Modified: incubator/roller/branches/roller_3.0/web/themes/currency/_css.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency/_css.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency/_css.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency/_css.vm Tue Aug  8 13:08:43 2006
@@ -0,0 +1,305 @@
+/*-------------------------------------------------------------
+Base styles
+--------------------------------------------------------------*/
+
+body {
+    background: white;
+    font-family:"Lucida Grande", lucida, Geneva, Arial, sans-serif;
+}
+.img {
+    border: 0px;
+    margin: 0px; 
+}
+
+/* entries ----------------------------------------------- */
+
+.entryTitle {
+    font-weight: bold;
+    font-size: 130%;
+}
+.entryInfo {
+    font-size: 80%;
+    color: #999;
+}
+div.dayTitle {
+    font-size: 120%;
+    font-weight:bold;	
+    padding: .5em 0 0 0;
+}
+div.next-previous {
+    font-size: 80%;
+    text-align: center;
+    padding: .5em 0 .5em 0;
+
+}
+
+/* category chooser ----------------------------------------------- */
+
+.category-chooser {
+    margin: -50%;
+    width:100%;
+}
+.rCategory li {
+    font-size: 80%;
+    display: inline;
+    list-style-type: none;
+    padding-right: 20px;
+}
+li.selected {
+    font-weight: bold;
+}
+
+/* other lists ----------------------------------------------- */
+
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    font-size: 80%;
+}
+ul.rFeeds li {
+    background-image: url($url.absoluteSite/images/feed-icon-12x12.gif);
+    background-repeat: no-repeat;
+    background-position: 0 .2em; 
+    padding-left: 1.4em;
+    line-height: 1.5em;
+}
+
+/* calendar ----------------------------------------------- */
+
+.hCalendarDay{
+    text-align : center;
+    font-size: small;
+}
+th.hCalendarDayNameRow {
+    text-align : center;
+    font-size : small;
+    font-weight : bold;
+}
+td.hCalendarDayCurrent {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+td.hCalendarDayLinked {
+    text-align : center;
+    font-size  : small;
+    font-weight: bold;
+}
+
+/* comments ----------------------------------------------- */
+
+p.comment-details {
+    font-size: 80%;
+    color: #999;
+}
+.comments-syntax-indicator {
+    font-weight: bold;
+}
+.comments-syntax-indicator span.enabled {
+    background: transparent;
+    color: green;
+    font-style: italic;
+}
+.comments-syntax-indicator span.disabled {
+    background: transparent;
+    color: red;
+    font-style: italic;
+}
+
+form ul{ position: relative; list-style: none; width: 100%; }
+form li{ line-height: 2em; margin: 0; padding: 1px 1px 6px 9px; }
+form li.focused{ background-color: #fff7c0 !important; }
+form li p{ font-size: 9px; line-height: 13px; color: #444; }
+form li{ display: inline-block; }
+form[id] li{ display: block; }
+form li div{ display: inline-block; }
+form[id] li div{ display: inline; }
+form .left{ float: left !important; margin: 0; }
+form .right{ float: right !important; margin: 0; }
+form .clear{ clear: both; } 
+form li div p{ margin: 0 0 5px 0; }
+form div.left{ margin-right: 2px !important; }
+form div.left[class]{ margin-right: 4px !important; }
+form div.left img{ margin: 0 0 -2px 0; }
+form h2{ font-size: 1.8em; clear: left; } 
+form .info{ display: inline-block; margin: 0 0 10px 0; padding: 0 0 4px 0; border-bottom: 1px dotted #ccc !important;}
+form .info[class]{ display: block; }
+form .info p{ font-size: 1em; line-height: 1.3em; margin: 0 0 8px 0; }
+textarea.textarea{margin-bottom: 1px;}
+textarea.textarea[class]{font-family: "Lucida Grande", Tahoma, "Trebuchet MS", Verdana, sans-serif;}
+select.select{ padding: 1px 0 0 0; margin: 1px 0 3px 0; }
+select.select[class]{ margin: 0; padding: 1px 0 1px 0; }
+form .small{ width: 70px; }
+form .medium{ width: 170px; }
+form .large, form textarea.textarea{ width: 340px; }
+form .tags{ width: 320px; }
+form textarea.small{ height: 5.5em; }
+form textarea.medium{ height: 10em; }
+form textarea.large{ height: 20em; }
+.choices input{ width: 200px; margin-right: 3px; }
+.choices ol{ margin: 10px 0 0 0; }
+.choices[class] ol{ margin: 0 !important; }
+.choices img{ margin: 0 0 1px 0; }
+fieldset ol li{ display: list-item !important; margin: 0 5px 2px 3px !important; padding: 0 !important; list-style: inside decimal; }
+input.button, button { width: 6em; padding: 2px 2px 0 0; /* fix for IE */ }
+/* revert to normal for Firefox */
+li>input.button, li>button, input.button>input.button, button>button { padding: 2px; }
+label.desc{
+    margin: 4px 0 3px 0;
+    border: 0;
+    color: #444;
+    font-size: 1em;
+    line-height: 1.3em;
+    display: block;
+    font-weight: bold;
+}
+input.text, input.number, input.url, input.email, input.password, input.file, 
+textarea.textarea, select.select{
+    font-size: 1.2em;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-right: 1px solid #c3c3c3;
+    border-bottom: 1px solid #ddd;
+    color: #333;
+}
+input.text, input.number, input.url, input.email, input.password, input.file{ padding: 2px; }
+input.currency{ text-align: right; }
+input.checkbox, input.radio{
+    display: block;
+    line-height: 1.4em;
+    margin: 8px 0 0 3px;
+    width: 13px;
+    height: 13px;
+}
+input.focus, textarea.focus { background: #ffd; color: #000; }
+label.choice{
+    display: block;
+    line-height: 1.4em;
+    margin: -19px 0 0 25px;
+    padding: 4px 0 5px 0;
+    color: #444;
+    width: 80%;
+}
+
+/*-------------------------------------------------------------
+Currency theme styles
+--------------------------------------------------------------*/
+
+A         { color: #CC6633; text-decoration: none; } 
+A:link    { color: #CC6633; text-decoration: none; } 
+A:visited { color: #CC6633; text-decoration: none; } 
+A:active  { color: #FF9966;  } 
+A:hover   { color: #FF9966;  } 
+td.body   { padding:20px;}
+
+body { 
+    margin-top: 0px; 
+    margin-left: 0px; 
+    margin-right: 0px; 
+    background-color:#ffffff;
+}
+td.title { 
+    padding:20px; 
+    font-family: verdana, sans-serif;  
+    color: #666666; 
+    font-weight:bold;
+    letter-spacing:.1em; 
+}
+td.links { 
+    padding:8px; 
+    font-family: verdana, sans-serif; 
+    color: #336699; 
+}
+td.search {
+	padding: 5px;
+}
+font.descrip { 
+    font-family: verdana, sans-serif; 
+    color: #999966; 
+    text-transform:uppercase; 
+    font-weight:bold; 
+    letter-spacing:.2em; 
+    padding:5px;
+}
+font.date { 
+    font-family: verdana, sans-serif;
+    color: #336699;
+}
+font.author { 
+    font-family: verdana, sans-serif;
+    color: #336699;
+    text-transform:lowercase;
+}
+font.time { 
+    font-family: verdana, sans-serif;
+    color: #336699;
+    text-transform:uppercase;
+}
+font { 
+    font-family: verdana, sans-serif;
+    color: #666666;
+    line-height:16px;
+}
+font.subhead { 
+    font-family: verdana, sans-serif;
+    color: #333333;
+    font-weight:bold;
+    padding:8px;
+    letter-spacing:  .1em
+}
+.entryBox { 
+    font-family: verdana, georgia, arial;
+    color:#666666;
+    text-align:justify;
+}
+.hCalendarTitle {
+    text-align : center;
+    font-weight : bolder ;
+}
+.hCalendarDay {
+    text-align : center;
+    font-size : 9px;
+    border-width: thin;
+}
+.hCalendarDayCurrent {
+    text-align : center;
+    font-size : 9px;
+    font-weight : bolder ;
+    border-width: thin;
+    border-style: dotted;
+}
+.hCalendarDayNameRow {
+    text-align : center;
+    font-weight : bolder ;
+    font-size : 9px;
+}
+.hCalendarDayLinked {
+    font-weight : bolder ;
+    text-align : center;
+    font-size : 9px;
+    border-width: thin;
+}
+.hCalendarDayNotInMonth {
+    text-align : center;
+    font-size : 9px;
+    color : #aaaaaa;
+}
+.hCalendarNextPrev {
+    text-align : center;
+    font-style : italic;
+    font-size : small;
+    color : #aaaaaa;
+}
+ul.rCategory {
+    padding: 0px;
+}
+.comments-head {
+    font-size:120%;
+}
+h1.title {
+    font-size:150%;
+}
+div.catChooser {
+    text-align: center;
+}

Modified: incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/currency/_day.vm Tue Aug  8 13:08:43 2006
@@ -1,18 +1,35 @@
+<div class="dayBox">
 
-<div class="entry">
-   #showDayPermalink( $day )
-   #showEntryDate( $day )
-</div>
+    <div class="dayTitle">
+       $utils.formatDate($day, "EEEE MMM dd, yyyy")
+    </div>
 
-#foreach( $entry in $entries )
-<p>
-   <a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
-   <b>$entry.title</b>
-    #showEntryText($entry)
-    $text.get("macro.weblog.postedby") $entry.creator.userName
-   <span class="dateStamp">(#showTimestamp($entry.pubTime))</span>
-   #showEntryPermalink( $entry )
-   #showCommentsPageLink( $entry )
-</p>
-#end
+    #foreach( $entry in $entries )
+    <div class="entryBox">
+        <a name="$utils.encode($entry.anchor)" id="$utils.encode($entry.anchor)"></a>
+        <p class="entryTitle">$entry.title</p>
+        <p class="entryContent"> 
+            #if($model.permalink)
+                $entry.displayContent
+            #else
+                $entry.displayContent($url.entry($entry.anchor))
+            #end
+        </p>
+        <p class="entryInfo">
+            Posted at <a href="$url.entry($entry.anchor)">
+                $utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
+            by $entry.creator.fullName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
+            #if ($utils.isUserAuthorizedToAuthor($entry.website))
+                <a href="$url.editEntry($entry.anchor)">
+                $text.get("macro.weblog.entrypermalink.edit")</a> &nbsp;|&nbsp;
+            #end
+            #set($commentCount = $entry.commentCount)
+            #if($entry.commentsStillAllowed || $commentCount > 0)  
+                #set($link = "$url.comments($entry.anchor)" )
+                <a href="$link" class="commentsLink">$text.get("macro.weblog.comments")[$commentCount]</a>
+            #end
+        </p>
+    </div>
+    #end
 
+</div>
\ No newline at end of file

Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogs.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogs.vm?rev=429796&r1=429795&r2=429796&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogs.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogs.vm Tue Aug  8 13:08:43 2006
@@ -1,4 +1,4 @@
-#includePage("_header")
+#includeTemplate($model.weblog "_header")
 
 #set($maxResults = 25) 
 #set($since = 365) 
@@ -20,7 +20,7 @@
                <td class="menuTabSelected">
                   <div class="menu-tr">
                      <div class="menu-tl">
-                        &nbsp;&nbsp;<a href="$url.home/page/blogs">Weblog Directory</a>&nbsp;&nbsp; 
+                        &nbsp;&nbsp;<a href='$url.page("blogs")'>Weblog Directory</a>&nbsp;&nbsp; 
                      </div>
                   </div>
                </td>	    



Mime
View raw message