You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2009/02/19 23:23:32 UTC

svn commit: r746033 - in /tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main: java/components/ java/pages/ resources/components/ webapp/ webapp/layout/

Author: hlship
Date: Thu Feb 19 22:23:31 2009
New Revision: 746033

URL: http://svn.apache.org/viewvc?rev=746033&view=rev
Log:
TAP5-528: The new quickstart layout should be simplified to remove "lorem ipson" text

Added:
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/About.java
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Contact.java
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml
Modified:
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml
    tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java?rev=746033&r1=746032&r2=746033&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/components/Layout.java Thu Feb 19 22:23:31 2009
@@ -1,6 +1,8 @@
 package ${package}.components;
 
+import org.apache.tapestry5.*;
 import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.*;
 import org.apache.tapestry5.BindingConstants;
 
 /**
@@ -13,4 +15,30 @@
     @Property
     @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL)
     private String title;
+
+    @Property
+    private String pageName;
+
+    @Property
+    @Parameter(defaultPrefix = BindingConstants.LITERAL)
+    private String sidebarTitle;
+
+    @Property
+    @Parameter(defaultPrefix = BindingConstants.LITERAL)
+    private Block sidebar;
+
+    @Inject
+    private ComponentResources resources;
+
+    public String getClassForPageName()
+    {
+      return resources.getPageName().equalsIgnoreCase(pageName)
+             ? "current_page_item"
+             : null;
+    }
+
+    public String[] getPageNames()
+    {
+      return new String[] { "Index", "About", "Contact" };
+    }
 }

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/About.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/About.java?rev=746033&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/About.java (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/About.java Thu Feb 19 22:23:31 2009
@@ -0,0 +1,6 @@
+package ${package}.pages;
+
+public class About
+{
+
+}

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Contact.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Contact.java?rev=746033&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Contact.java (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Contact.java Thu Feb 19 22:23:31 2009
@@ -0,0 +1,6 @@
+package ${package}.pages;
+
+public class Contact
+{
+
+}

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml?rev=746033&r1=746032&r2=746033&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/resources/components/Layout.tml Thu Feb 19 22:23:31 2009
@@ -9,18 +9,14 @@
 Version    : 1.0
 Released   : 20080825
 Description: A Web 2.0 design with fluid width suitable for blogs and small websites.
-
 -->
-#set( $D = '$' )
+        #set( $D = '$' )
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"
       xmlns:p="tapestry:parameter">
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
         <title>${D}{title}</title>
-        <meta name="keywords" content=""/>
-        <meta name="description" content=""/>
-        <link href="default.css" rel="stylesheet" type="text/css" media="screen"/>
     </head>
     <body>
         <!-- start header -->
@@ -32,14 +28,8 @@
             </div>
             <div id="menu">
                 <ul>
-                    <li class="current_page_item">
-                        <t:pagelink page="index">Home</t:pagelink>
-                    </li>
-                    <li>
-                        <a href="#">About</a>
-                    </li>
-                    <li class="last">
-                        <a href="#">Contact</a>
+                    <li t:type="loop" source="pageNames" value="pageName" class="prop:classForPageName">
+                        <t:pagelink page="prop:pageName">${D}{pageName}</t:pagelink>
                     </li>
                 </ul>
             </div>
@@ -51,79 +41,18 @@
             <div id="sidebar">
                 <ul>
                     <li id="search" style="background: none;">
-                        <form id="searchform" method="get" action="">
-                            <div>
-                                <input type="text" name="s" id="s" size="15"/>
-                                <br/>
-                                <input type="submit" value="Search"/>
-                            </div>
-                        </form>
-                    </li>
-                    <li id="categories">
-                        <h2>Categories</h2>
-                        <ul>
-                            <li>
-                                <a href="#">Lorem Ipsum</a>
-                                (1)
-                            </li>
-                            <li>
-                                <a href="#">Uncategorized</a>
-                                (4)
-                            </li>
-                        </ul>
-                    </li>
-                    <li>
-                        <h2>Lorem Ipsum Dolor</h2>
-                        <ul>
-                            <li>
-                                <a href="#">Nulla luctus eleifend purus</a>
-                            </li>
-                            <li>
-                                <a href="#">Praesent scelerisque scelerisque</a>
-                            </li>
-                            <li>
-                                <a href="#">Ut nonummy rutrum sem</a>
-                            </li>
-                            <li>
-                                <a href="#">Pellentesque tempus quis nulla</a>
-                            </li>
-                            <li>
-                                <a href="#">Fusce ultrices fringilla metus</a>
-                            </li>
-                            <li>
-                                <a href="#">Praesent mattis condimentum</a>
-                            </li>
-                        </ul>
                     </li>
-                    <li>
-                        <h2>Lorem Ipsum Dolor</h2>
-                        <ul>
-                            <li>
-                                <a href="#">Nulla luctus eleifend purus</a>
-                            </li>
-                            <li>
-                                <a href="#">Praesent scelerisque scelerisque</a>
-                            </li>
-                            <li>
-                                <a href="#">Ut nonummy rutrum sem</a>
-                            </li>
-                            <li>
-                                <a href="#">Pellentesque tempus quis nulla</a>
-                            </li>
-                            <li>
-                                <a href="#">Fusce ultrices fringilla metus</a>
-                            </li>
-                            <li>
-                                <a href="#">Praesent mattis condimentum</a>
-                            </li>
-                        </ul>
+                    <li t:type="if" test="sidebar">
+                        <h2>${D}{sidebarTitle}</h2>
+                        <div class="sidebar-content">
+                            <t:delegate to="sidebar"/>
+                        </div>
                     </li>
                 </ul>
             </div>
             <!-- end sidebar -->
             <!-- start content -->
             <div id="content">
-
                 <div class="post">
                     <div class="title">
                         <h2>${D}{title}</h2>
@@ -132,64 +61,6 @@
                         <t:body/>
                     </div>
                 </div>
-
-                <!-- The rest of the template is placeholder text that can easily be removed. -->
-
-
-                <div class="post">
-                    <div class="title">
-                        <h2>
-                            <a href="#">Etiam rhoncus volutpat</a>
-                        </h2>
-                        <p>
-                            <small>Posted on August 20th, 2007 by
-                                <a href="#">Free CSS Templates</a>
-                            </small>
-                        </p>
-                    </div>
-                    <div class="entry">
-                        <p>Maecenas pede nisl, elementum eu, ornare ac, malesuada at, erat. Proin gravida orci porttitor
-                            enim accumsan lacinia. Donec condimentum, urna non molestie semper, ligula enim ornare nibh,
-                            quis laoreet eros quam eget ante. Aliquam libero. Vivamus nisl nibh, iaculis vitae, viverra
-                            sit amet, ullamcorper vitae, turpis. Aliquam erat volutpat. Vestibulum dui sem, pulvinar
-                            sed, imperdiet nec, iaculis nec, leo. Fusce odio.
-                        </p>
-                        <p>Etiam arcu dui, faucibus eget, placerat vel, sodales eget, orci. Donec ornare neque ac sem.
-                            Mauris aliquet. Aliquam sem leo, vulputate sed, convallis at, ultricies quis, justo. Donec
-                            nonummy magna quis risus. Quisque eleifend. Phasellus tempor vehicula justo. Aliquam lacinia
-                            metus ut elit. Suspendisse iaculis mauris nec lorem.
-                            <br/>
-                        </p>
-                    </div>
-                    <p class="links">
-                        <a href="#" class="more">Read More</a>
-                        <a href="#" class="comments">No Comments</a>
-                    </p>
-                </div>
-                <div class="post">
-                    <div class="title">
-                        <h2>
-                            <a href="#">Praesent condimentum</a>
-                        </h2>
-                        <p>
-                            <small>Posted on August 20th, 2007 by
-                                <a href="#">Free CSS Templates</a>
-                            </small>
-                        </p>
-                    </div>
-                    <div class="entry">
-                        <p>Etiam arcu dui, faucibus eget, placerat vel, sodales eget, orci. Donec ornare neque ac sem.
-                            Mauris aliquet. Aliquam sem leo, vulputate sed, convallis at, ultricies quis, justo. Donec
-                            nonummy magna quis risus. Quisque eleifend. Phasellus tempor vehicula justo. Aliquam lacinia
-                            metus ut elit. Suspendisse iaculis mauris nec lorem.
-                            <br/>
-                        </p>
-                    </div>
-                    <p class="links">
-                        <a href="#" class="more">Read More</a>
-                        <a href="#" class="comments">No Comments</a>
-                    </p>
-                </div>
             </div>
             <!-- end content -->
             <br style="clear: both;"/>
@@ -197,9 +68,8 @@
         <!-- end page -->
         <!-- start footer -->
         <div id="footer">
-
             <p class="legal">
-                &copy;2009 ${groupId}. All Rights Reserved.
+                &copy;2009 groupid. All Rights Reserved.
                 &nbsp;&nbsp;&bull;&nbsp;&nbsp;
                 Design by
                 <a href="http://www.freecsstemplates.org/">Free CSS Templates</a>

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml?rev=746033&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/About.tml Thu Feb 19 22:23:31 2009
@@ -0,0 +1,7 @@
+<html t:type="layout" title="About ${artifactId}"
+      xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"
+      xmlns:p="tapestry:parameter">
+
+    <p>About ${artifactId} application ...</p>
+
+</html>

Added: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml?rev=746033&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml (added)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Contact.tml Thu Feb 19 22:23:31 2009
@@ -0,0 +1,7 @@
+<html t:type="layout" title="Contact ${groupId}"
+      xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"
+      xmlns:p="tapestry:parameter">
+
+    <p>Contact ${groupId} ...</p>
+
+</html>

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml?rev=746033&r1=746032&r2=746033&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/Index.tml Thu Feb 19 22:23:31 2009
@@ -1,20 +1,24 @@
-<html t:type="layout" title="${artifactId} Home Page"
+<html t:type="layout" title="${artifactId} Index"
+      t:sidebarTitle="Current Time"
       xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"
       xmlns:p="tapestry:parameter">
-#set( $D = '$' )
+    #set( $D = '$' )
     <!-- Most of the page content, including <head>, <body>, etc. tags, comes from Layout.tml -->
 
     <p>${D}{message:greeting}</p>
 
-    <p>
-        Just to prove this is live:
-    </p>
+    <p:sidebar>
 
-    <p>The current time is: ${D}{currentTime}.</p>
+        <p>
+            Just to prove this is live:
+        </p>
 
+        <p>The current time is: ${D}{currentTime}.</p>
 
-    <p>
-        [<t:pagelink t:page="Index">refresh</t:pagelink>]
-    </p>
+
+        <p>
+            [<t:pagelink t:page="Index">refresh</t:pagelink>]
+        </p>
+    </p:sidebar>
 
 </html>

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css?rev=746033&r1=746032&r2=746033&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/webapp/layout/layout.css Thu Feb 19 22:23:31 2009
@@ -5,133 +5,134 @@
 */
 
 body {
-	margin: 0;
-	padding: 0;
-	background: #FFFFFF url(images/img01.jpg) repeat-x;
-	text-align: justify;
-	font: 15px Arial, Helvetica, sans-serif;
-	color: #626262;
+    margin: 0;
+    padding: 0;
+    background: #FFFFFF url( images/img01.jpg ) repeat-x;
+    text-align: justify;
+    font: 15px Arial, Helvetica, sans-serif;
+    color: #626262;
 }
 
 form {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 input {
-	padding: 5px;
-	background: #FEFEFE url(images/img13.gif) repeat-x;
-	border: 1px solid #626262;
-	font: normal 1em Arial, Helvetica, sans-serif;
+    padding: 5px;
+    background: #FEFEFE url( images/img13.gif ) repeat-x;
+    border: 1px solid #626262;
+    font: normal 1em Arial, Helvetica, sans-serif;
 }
 
 h1, h1 a, h2, h2 a, h3, h3 a {
-	margin: 0;
-	text-decoration: none;
-	font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
-	font-weight: normal;
-	color: #444444;
+    margin: 0;
+    text-decoration: none;
+    font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
+    font-weight: normal;
+    color: #444444;
 }
 
 h1 {
-	letter-spacing: -1px;
-	font-size: 2.2em;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
+    letter-spacing: -1px;
+    font-size: 2.2em;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 
 h2 {
-	letter-spacing: -1px;
-	font-size: 2em;
+    letter-spacing: -1px;
+    font-size: 2em;
 }
 
 h3 {
-	font-size: 1em;
+    font-size: 1em;
 }
 
 p, ol, ul {
-	margin-bottom: 2em;
-	line-height: 200%;
+    margin-bottom: 2em;
+    line-height: 200%;
 }
 
 blockquote {
-	margin: 0 0 0 1.5em;
-	padding-left: 1em;
-	border-left: 5px solid #DDDDDD;
+    margin: 0 0 0 1.5em;
+    padding-left: 1em;
+    border-left: 5px solid #DDDDDD;
 }
 
 a {
-	color: #1692B8;
+    color: #1692B8;
 }
 
 a:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 /* Header */
 
 #header {
-	height: 42px;
+    height: 42px;
 }
 
 #logo h1, #logo p {
-	float: left;
-	text-transform: lowercase;
+    float: left;
+    text-transform: lowercase;
 }
 
 #logo h1 {
-	padding: 0px 0 0 40px;
+    padding: 0px 0 0 40px;
 }
 
 #logo p {
-	margin: 0;
-	padding: 14px 0 0 4px;
-	line-height: normal;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
+    margin: 0;
+    padding: 14px 0 0 4px;
+    line-height: normal;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 14px;
 }
 
 #logo a {
-	text-decoration: none;
-	color: #D0C7A6;
+    text-decoration: none;
+    color: #D0C7A6;
 }
 
 #menu {
-	float: right;
+    float: right;
 }
 
 #menu ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
+    margin: 0;
+    padding: 0;
+    list-style: none;
 }
 
 #menu li {
-	display: block;
-	float: left;
-	height: 42px;
+    display: block;
+    float: left;
+    height: 42px;
 }
 
 #menu a {
-	display: block;
-	padding: 8px 20px 0px 20px;
-	text-decoration: none;
-	text-align: center;
-	text-transform: lowercase;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	font-size: 14px;
-	color: #CEC5A4;
+    display: block;
+    padding: 8px 20px 0px 20px;
+    text-decoration: none;
+    text-align: center;
+    text-transform: lowercase;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    font-size: 14px;
+    color: #CEC5A4;
 }
 
 #menu .last {
-	margin-right: 20px;
+    margin-right: 20px;
 }
 
 #menu a:hover {
-	color: #FFFFFF;
+    color: #FFFFFF;
 }
 
-#menu .current_page_item {
+#menu .current_page_item A {
+    text-decoration: underline;
 }
 
 #menu .current_page_item a {
@@ -140,225 +141,229 @@
 /* Page */
 
 #page {
-	padding: 40px 40px 0 40px;
+    padding: 40px 40px 0 40px;
 }
 
 /* Content */
 
 #content {
-	margin-right: 340px;
+    margin-right: 340px;
 }
 
 .post {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 
 .post .title {
-	border-bottom: 1px #999999 dashed;
-	font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
+    border-bottom: 1px #999999 dashed;
+    font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
 }
 
 .post .title h2 {
-	padding: 30px 30px 0 0px;
-	text-transform: lowercase;
-	font-weight: normal;
-	font-size: 2.2em;
+    padding: 30px 30px 0 0px;
+    text-transform: lowercase;
+    font-weight: normal;
+    font-size: 2.2em;
 }
 
 .post .title p {
-	margin: 0;
-	padding: 0 0 10px 0px;
-	line-height: normal;
-	color: #BABABA;
+    margin: 0;
+    padding: 0 0 10px 0px;
+    line-height: normal;
+    color: #BABABA;
 }
 
 .post .title p a {
-	color: #BABABA;
+    color: #BABABA;
 }
 
 .post .entry {
-	padding: 20px 0px 20px 0px;
+    padding: 20px 0px 20px 0px;
 }
 
 .post .links {
-	margin: 0;
-	padding: 0 30px 30px 0px;
+    margin: 0;
+    padding: 0 30px 30px 0px;
 }
 
 .post .links a {
-	display: block;
-	float: left;
-	margin-right: 10px;
-	margin-bottom: 5px;
-	text-align: center;
-	text-decoration: none;
-	font-weight: bold;
-	color: #FFFFFF;
+    display: block;
+    float: left;
+    margin-right: 10px;
+    margin-bottom: 5px;
+    text-align: center;
+    text-decoration: none;
+    font-weight: bold;
+    color: #FFFFFF;
 }
 
 .post .links a:hover {
 }
 
 .post .links .more {
-	width: 128px;
-	height: 30px;
-	background: url(images/img03.jpg) no-repeat left center;
+    width: 128px;
+    height: 30px;
+    background: url( images/img03.jpg ) no-repeat left center;
 }
 
 .post .links .comments {
-	width: 152px;
-	height: 30px;
-	background: url(images/img04.jpg) no-repeat left center;
+    width: 152px;
+    height: 30px;
+    background: url( images/img04.jpg ) no-repeat left center;
 }
 
 /* Sidebar */
 
 #sidebar {
-	float: right;
-	width: 300px;
-	margin-top: 30px;
+    float: right;
+    width: 300px;
+    margin-top: 30px;
 }
 
 #sidebar ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
+    margin: 0;
+    padding: 0;
+    list-style: none;
 }
 
 #sidebar li {
-	margin-bottom: 10px;
-	background: url(images/img10.gif) no-repeat left bottom;
+    margin-bottom: 10px;
+    background: url( images/img10.gif ) no-repeat left bottom;
 }
 
 #sidebar li ul {
-	padding: 0 30px 40px 30px;
+    padding: 0 30px 40px 30px;
 }
 
 #sidebar li li {
-	margin: 0;
-	padding-left: 20px;
-	background: url(images/img11.gif) no-repeat 5px 50%;
+    margin: 0;
+    padding-left: 20px;
 }
 
 #sidebar h2 {
-	padding: 30px 30px 20px 30px;
-	background: url(images/img09.gif) no-repeat;
-	text-transform: lowercase;
-	font-weight: normal;
-	font-size: 1.6em;
-	color: #302D26;
+    padding: 30px 30px 5px 10px;
+    background: url( images/img09.gif ) no-repeat;
+    text-transform: lowercase;
+    font-weight: normal;
+    font-size: 1.6em;
+    color: #302D26;
 }
 
+#sidebar DIV.sidebar-content {
+    width: 265px;
+    margin-left: 10px;
+    padding-bottom: 1px;
+}
 
 /* Search */
 
 #search {
-	padding: 20px 30px 40px 30px;
+    padding: 20px 30px 40px 30px;
 }
 
 #search input {
-	padding: 0;
-	width: 70px;
-	height: 29px;
-	background: #DFDFDF url(images/img14.gif) repeat-x;
-	font-weight: bold;
+    padding: 0;
+    width: 70px;
+    height: 29px;
+    background: #DFDFDF url( images/img14.gif ) repeat-x;
+    font-weight: bold;
 }
 
 #search #s {
-	padding: 5px;
-	width: 150px;
-	height: auto;
-	background: #FEFEFE url(images/img13.gif) repeat-x;
-	border: 1px solid #626262;
-	font: normal 1em Arial, Helvetica, sans-serif;
+    padding: 5px;
+    width: 150px;
+    height: auto;
+    background: #FEFEFE url( images/img13.gif ) repeat-x;
+    border: 1px solid #626262;
+    font: normal 1em Arial, Helvetica, sans-serif;
 }
 
 #search br {
-	display: none;
+    display: none;
 }
 
 /* Categories */
 
 #sidebar #categories li {
-	background: url(images/img12.gif) no-repeat left center;
+    background: url( images/img12.gif ) no-repeat left center;
 }
 
 /* Calendar */
 
 #calendar_wrap {
-	padding: 0 30px 40px 30px;
+    padding: 0 30px 40px 30px;
 }
 
 #calendar table {
-	width: 100%;
-	text-align: center;
+    width: 100%;
+    text-align: center;
 }
 
 #calendar thead {
-	background: #F1F1F1;
+    background: #F1F1F1;
 }
 
 #calendar tbody td {
-	border: 1px solid #F1F1F1;
+    border: 1px solid #F1F1F1;
 }
 
 #calendar #prev {
-	text-align: left;
+    text-align: left;
 }
 
 #calendar #next {
-	text-align: right;
+    text-align: right;
 }
 
 #calendar tfoot a {
-	text-decoration: none;
-	font-weight: bold;
+    text-decoration: none;
+    font-weight: bold;
 }
 
 #calendar #today {
-	background: #FFF3A7;
-	border: 1px solid #EB1400;
-	font-weight: bold;
-	color: #EB1400
+    background: #FFF3A7;
+    border: 1px solid #EB1400;
+    font-weight: bold;
+    color: #EB1400
 }
 
 /* Footer */
 
 #footer {
-	padding: 70px 0 50px 0;
-	background: #757575 url(images/img08.gif) repeat-x;
+    padding: 70px 0 50px 0;
+    background: #757575 url( images/img08.gif ) repeat-x;
 }
 
 #footer p {
-	margin-bottom: 1em;
-	text-align: center;
-	line-height: normal;
-	font-size: .9em;
-	color: #BABABA;
+    margin-bottom: 1em;
+    text-align: center;
+    line-height: normal;
+    font-size: .9em;
+    color: #BABABA;
 }
 
 #footer a {
-	padding: 0 20px;
-	text-decoration: none;
-	color: #DDDDDD;
+    padding: 0 20px;
+    text-decoration: none;
+    color: #DDDDDD;
 }
 
 #footer a:hover {
-	color: #FFFFFF;
+    color: #FFFFFF;
 }
 
 #footer .rss {
-	background: url(images/img18.gif) no-repeat left center;
+    background: url( images/img18.gif ) no-repeat left center;
 }
 
 #footer .xhtml {
-	background: url(images/img19.gif) no-repeat left center;
+    background: url( images/img19.gif ) no-repeat left center;
 }
 
 #footer .css {
-	background: url(images/img20.gif) no-repeat left center;
+    background: url( images/img20.gif ) no-repeat left center;
 }
 
 #footer .legal a {
-	padding: 0;
-}
\ No newline at end of file
+    padding: 0;
+}