roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r429318 - in /incubator/roller/branches/roller_3.0/web/themes/brushedmetal: Weblog.vm _css.vm _day.vm
Date Mon, 07 Aug 2006 12:47:47 GMT
Author: snoopdave
Date: Mon Aug  7 05:47:46 2006
New Revision: 429318

URL: http://svn.apache.org/viewvc?rev=429318&view=rev
Log:
Conversion to 3.0

Modified:
    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/brushedmetal/_day.vm

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=429318&r1=429317&r2=429318&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 Mon Aug  7 05:47:46
2006
@@ -1,17 +1,10 @@
-#setContentType("text/html; charset=utf-8")
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>
-   #showContentType("text/html; charset=utf-8")
-   #showContentLanguage($locale.language)
-   #showRSSAutodiscoveryLink()
-   #showRSDLink()
-    <link rel="stylesheet" type="text/css" href="$ctxPath/themes/base.css" />
-   <script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
-   <title>#showWebsiteTitle() : #showPageName()</title><title>Brushed Metal:
It Worked!</title>
-   <style type="text/css">
-   #includePage("_css")
-   </style>
+    <link rel="stylesheet" type="text/css" href="$url.home/page/css.css" />
+    #showAutodiscoveryLinks($model.weblog)
+    #showCommonJavascript()
+   <title>$utils.removeHTML($model.weblog.name) : $model.weblogPage.name</title>
 </head>
 <body>
 <div id="block">&nbsp;
@@ -21,25 +14,43 @@
       <div id="sidebar-a">
 
          <h1 id="banner">
-            #showWebsiteTitle()
-            <span class="tagline"><em>#showWebsiteDescription()</em></span>
+            $model.weblog.name
+            <span class="tagline"><em>$model.weblog.description</em></span>
          </h1>
 
-         <div id="calendar">#showWeblogCalendar()</div>
-	 <hr />
-
-         <h3>BlogRoll</h3>
-         #showBlogroll()
+         <div id="calendar">
+            #showWeblogEntryCalendar($model.weblog "nil")
+         </div>
+	     <hr />
+
+         <h3>Blogroll</h3>
+         #set($rootFolder = $model.weblog.getBookmarkFolder("/"))
+         #showBookmarkLinksList($rootFolder false false) 
 
          <h3>Newsfeeds</h3>
-         #showRSSBadge()<br />
-         #showRSSLinks()<br />
-         #showBasicNavBar(true)
+         #showRSSFeedsList($model.weblog)
+ 
+         <h3>Controls</h3>
+         #showPageMenu($model.weblog)
 
       </div> <!-- sidebar-a -->
 
       <div id="content">
-         #displayWeblogEntries()<br/>
+
+        #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 id="footer">
              Theme Design by <a href="http://www.bryanbell.com">Bryan Bell</a>

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=429318&r1=429317&r2=429318&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 Mon Aug  7 05:47:46
2006
@@ -1,4 +1,190 @@
-	/* Layout ----------------------------------------------*/
+/*-------------------------------------------------------------
+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: %150;
+}
+.entryInfo {
+    font-size: 80%;
+    color: #ccc;
+}
+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 {
+    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; }
+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;
+    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;
+}
+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;
+    width: 80%;
+}
+
+
+/*-------------------------------------------------------------
+Brushedmetal theme styles
+--------------------------------------------------------------*/
+	
+/* Layout ----------------------------------------------*/
 		#container {
 			width: 760px;
 			\width: 780px;
@@ -14,7 +200,7 @@
 			w\idth: 240px;
 			margin: 0;
 			margin-right: 5px;
-			background: url(#showThemeImagePath("brushedmetal" "metalLine.gif")) top right repeat-y;
+			background: url($url.themeResource("brushedmetal", "images/metalLine.gif")) top right
repeat-y;
 			padding: 0px 25px 0px 0px;
 			}
 		#content {
@@ -28,10 +214,10 @@
 			font-family:Geneva, Arial, Helvetica, san-serif;
 			line-height:140%;
 			color:#FFF;
-			background:#848484 url(#showThemeImagePath("brushedmetal" "metalBGBG.jpg")) top left repeat-x;
+			background:#848484 url($url.themeResource("brushedmetal", "images/metalBGBG.jpg")) top
left repeat-x;
 			}
 		#block {
-			background: url(#showThemeImagePath("brushedmetal" "metalBG.jpg")) top left no-repeat;
+			background: url($url.themeResource("brushedmetal", "images/metalBG.jpg")) top left no-repeat;
 			}
 		A {
 			text-decoration: underline;

Modified: incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm?rev=429318&r1=429317&r2=429318&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/brushedmetal/_day.vm Mon Aug  7 05:47:46
2006
@@ -1,15 +1,27 @@
-<div class="date">
-#showDayPermalink( $day )
-#showEntryDate( $day )
-</div>
-<div class="newsItems">
-#foreach( $entry in $entries )
-  <a name="$utilities.encode($entry.anchor)" id="$utilities.encode($entry.anchor)"></a>
-  <h2>$entry.title</h2>
-  #showEntryText($entry)
-  $text.get("macro.weblog.postedby") $entry.creator.userName
-  <span class="dateStamp">(#showTimestamp($entry.pubTime))</span>
-  #showEntryPermalink( $entry )
-  #showCommentsPageLink( $entry )
-#end
+<div class="dayBox">
+
+    <div class="dayTitle">
+       $utils.formatDate($day, "EEEE MMM dd, yyyy")
+    </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>
+        <p class="entryContent">#showWeblogEntryContent($entry $model.permalink)</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>



Mime
View raw message