[pLog-svn] r6353 - in templates/branches/lifetype-1.2: . Blix buggy unported

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Apr 28 13:40:06 EDT 2008


Author: jondaley
Date: 2008-04-28 13:40:06 -0400 (Mon, 28 Apr 2008)
New Revision: 6353

Added:
   templates/branches/lifetype-1.2/Blix/
   templates/branches/lifetype-1.2/Blix/favicon.ico
   templates/branches/lifetype-1.2/Blix/layout.css
   templates/branches/lifetype-1.2/Blix/links.template
   templates/branches/lifetype-1.2/Blix/main.template
   templates/branches/lifetype-1.2/Blix/post.template
   templates/branches/lifetype-1.2/Blix/postandcomments.template
   templates/branches/lifetype-1.2/Blix/spring_flavour.css
   templates/branches/lifetype-1.2/buggy/
   templates/branches/lifetype-1.2/buggy/buggy.css
   templates/branches/lifetype-1.2/buggy/footer.template
   templates/branches/lifetype-1.2/buggy/post.template
   templates/branches/lifetype-1.2/buggy/postandcomments.template
Removed:
   templates/branches/lifetype-1.2/Blix/favicon.ico
   templates/branches/lifetype-1.2/Blix/layout.css
   templates/branches/lifetype-1.2/Blix/links.template
   templates/branches/lifetype-1.2/Blix/main.template
   templates/branches/lifetype-1.2/Blix/post.template
   templates/branches/lifetype-1.2/Blix/postandcomments.template
   templates/branches/lifetype-1.2/Blix/spring_flavour.css
   templates/branches/lifetype-1.2/buggy/buggy.css
   templates/branches/lifetype-1.2/buggy/footer.template
   templates/branches/lifetype-1.2/buggy/post.template
   templates/branches/lifetype-1.2/buggy/postandcomments.template
   templates/branches/lifetype-1.2/unported/Blix/
   templates/branches/lifetype-1.2/unported/buggy/
Log:
blix and buggy ported to 1.2

Copied: templates/branches/lifetype-1.2/Blix (from rev 6348, templates/branches/lifetype-1.2/unported/Blix)

Deleted: templates/branches/lifetype-1.2/Blix/favicon.ico
===================================================================
(Binary files differ)

Copied: templates/branches/lifetype-1.2/Blix/favicon.ico (from rev 6350, templates/branches/lifetype-1.2/unported/Blix/favicon.ico)
===================================================================
(Binary files differ)

Deleted: templates/branches/lifetype-1.2/Blix/layout.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Blix/layout.css	2008-04-28 17:22:29 UTC (rev 6348)
+++ templates/branches/lifetype-1.2/Blix/layout.css	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,578 +0,0 @@
-/* reset
---------------------------------------------------*/
-body,h1,h2,h3,h4,h5,h6,p,form,fieldset {margin:0;padding:0;}
-.low {display:none;}
-
-
-/* body
---------------------------------------------------*/
-body {
-  margin:0;
-  padding:15px 0;
-  font-family:Arial, Helvetica, sans-serif;
-  font-size:75%;
-  line-height:1.6em;
-  text-align:center;
-}
-
-body#commentspopup {padding:0;}
-
-
-/* headings
---------------------------------------------------*/
-h1 {font-size:30px;}
-
-#content h2 {
-  margin:0 0 18px 0;
-  font-family:Georgia, serif;
-  font-size:1.6em;
-  font-weight:normal;
-}
-
-#content h3 {
-  margin:0 0 18px 0;
-  font-size:1em;
-}
-
-#content h4 {
-  margin:0;
-  font-size:1em;
-}
-
-#content.archive h2 {margin:0 0 26px 0;}
-
-#content.archive h3 {
-  margin:0 0 10px 0;
-  font-family:Georgia, serif;
-  font-size:1.3em;
-  font-weight:normal;
-}
-
-#content.archive h4 {
-  margin:0 0 18px 0;
-  font-size:1em;
-}
-
-#content.archive h5 {
-  margin:0;
-  font-size:1em;
-}
-
-
-/* links
---------------------------------------------------*/
-a {text-decoration:none;}
-
-a img {border:none;}
-
-
-/* paragraphs, lists, etc
---------------------------------------------------*/
-p {
-  margin:0;
-  padding:0 0 18px 0;
-}
-
-ul {
-  margin:0 0 0 1.4em;
-  padding:0 0 18px 0;
-}
-
-ul ul {padding:0;}
-
-blockquote {
-  margin:0;
-  padding:0 18px;
-  font-style:italic;
-}
-
-pre {
-  overflow:auto;
-  margin:0 0 18px 0;
-  padding:4px;
-}
-
-pre, code, kbr {font-family:Courier, Monaco, monospace;}
-
-code, kbr {padding:0 2px;}
-
-abbr, acronym {
-  font-size:0.9em;
-  letter-spacing:1px;
-}
-
-
-/* images
---------------------------------------------------*/
-img.left {
-  float:left;
-  margin:0 12px 0 0;
-}
-
-img.right {
-  float:right;
-  margin:0 0 0 12px;
-}
-
-img.center {
-  display: block;
-  margin:0 auto;
-}
-
-
-/* container
---------------------------------------------------*/
-#container {
-  width:690px;
-  margin:0 auto;
-  padding:30px 30px 0 30px;
-  text-align:left;
-}
-
-#commentspopup #container {
-  width:455px;
-  padding:0 15px;
-}
-
-
-/* header
---------------------------------------------------*/
-#header {
-  height:115px;
-  padding:0 0 0 18px;
-}
-
-#header h1 {
-  /*display:none; This will hide the text in your header */
-  padding-top:50px;
-}
-
-
-
-/* navigation
---------------------------------------------------*/
-#navigation {
-  height:2.7em;
-  line-height:2.7em;
-}
-
-#navigation ul {
-  margin:0;
-  padding:0;
-}
-
-#navigation li {
-  float:left;
-  margin:0;
-  padding:0;
-  list-style-type:none;
-  border-right:1px solid;
-  white-space:nowrap;
-}
-
-#navigation li a {
-  display:block;
-  padding:0 18px;
-  font-size:0.8em;
-  text-transform:uppercase;
-  letter-spacing:1px;
-}
-
-* html #navigation a {width:1%;} /* see http://www.positioniseverything.net/explorer/escape-floats.html */
-
-#navigation form {
-  float:right;
-  height:100%;
-  width:189px;
-  padding:0 15px;
-  border-left:1px solid;
-  line-height:0;
-}
-
-#navigation form fieldset {
-  /* centering the search form could've
-  been done way more elegant but IEWin
-  and Opera refused to follow the rules */
-  margin-top:7px;
-  border:0 solid; /* Opera */
-}
-
-* html #navigation form fieldset {margin-top:7px;}
-
-#navigation #s {
-  height:1.5em;
-  width:140px;
-  margin:0 5px 0 0;
-  padding:0;
-  border:1px solid;
-  font-size:0.8em;
-  vertical-align:middle;
-}
-
-#navigation #searchbutton {
-  height:2em;
-  width:auto;
-  padding:0 1px;
-  border:1px solid;
-  font-size:9px;
-  letter-spacing:1px;
-  text-align:center;
-  vertical-align:middle;
-}
-
-
-/* content
---------------------------------------------------*/
-#content {
-  float:left;
-  width:455px;
-  padding-top:32px;
-}
-
-.singlecol #content {
-  float:none;
-  width:550px;
-  margin:0 70px;
-}
-
-#commentspopup #content {
-  float:none;
-  padding-top:0;
-}
-
-
-/* entry
---------------------------------------------------*/
-.entry {margin:0 0 40px 0;}
-
-.entry .info {
-  position:relative;
-  margin-top:-3px;
-  padding:3px;
-  border-top:1px solid;
-  border-bottom:1px solid;
-  font-size:0.9em;
-}
-
-.entry.single {clear:both;}
-
-.entry.single .info {margin:0 0 22px 0;}
-
-.entry .info a {
-  margin-right:6px;
-  padding-right:9px;
-  border-right:1px solid;
-}
-
-.entry .info em {
-  padding-right:6px;
-  font-style:normal;
-}
-
-.entry .author,
-.entry .editlink a {
-  margin:0;
-  padding:0 0 0 10px;
-  border-left:1px solid;
-  border-right:none
-}
-
-.entry #filedunder {
-  clear:both;
-  padding:3px 0 0 0;
-  font-size:0.9em;
-  border-top:1px solid;
-}
-
-
-/* mini-entry
---------------------------------------------------*/
-.minientry {
-  position:relative;
-  margin:0px 0 35px 0;
-  padding:10px 0;
-  border-top:1px dotted;
-  border-bottom:1px dotted;
-}
-
-.minientry p {padding:0;}
-
-.minientry .commentlink {
-  margin-left:3px;
-  padding-right:7px;
-  border-right:1px solid;
-  font-size:0.9em;
-}
-
-.minientry .permalink {
-  margin-left:3px;
-  font-size:0.9em;
-  font-style:normal;
-}
-
-.minientry .author,
-.minientry .editlink a {
-  margin-left:6px;
-  padding:0 8px 0 10px;
-  border-left:1px solid;
-  font-size:0.9em;
-  font-style:normal;
-}
-
-.minientry .editlink a {margin:0;}
-
-
-/* comments
---------------------------------------------------*/
-#comments h2 {margin-bottom:24px;}
-
-#comments h2 a {
-  margin-left:2px;
-  padding-left:6px;
-  border-left:1px solid;
-  font-family:Arial,Helvetica,sans-serif;
-  font-size:0.55em;
-}
-
-#comments ul {margin:0 0 0 20px;}
-
-#comments li {
-  position:relative;
-  margin-bottom:18px;
-}
-
-
-#comments li p {padding:0 0 10px 0;}
-
-#comments .header {
-  position:relative;
-  min-height:19px; /* 19 + 3 +3 = 25px = height of gravatar */
-  margin:0 0 10px 0;
-  padding:3px 6px;
-}
-
-* html #comments .header {height:19px;} /* IEWin */
-
-#comments .header strong {font-family:Georgia,sans-serif;}
-
-#comments .header .gravatar {
-  position:absolute;
-  top:1px;
-  right:1px;
-}
-
-
-/* form
---------------------------------------------------*/
-form {padding:6px 0;}
-
-#commentform, #contactform {margin-bottom:18px;}
-
-form fieldset {border:0 solid;} /* Opera */
-
-form p {
-  padding:6px 0;
-  border-bottom:1px solid;
-}
-
-form label {
-  display:block;
-  float:left;
-  width:60px;
-}
-
-#commentform label {margin:0 15px 0 15px;}
-#contactform label {margin:0 15px 0 0;}
-
-form em {
-  margin-left:5px;
-  font-size:0.9em;
-  font-style:normal;
-}
-
-form input, form textarea {
-  padding:3px;
-  width:200px;
-  border:1px solid;
-  font-family:Arial,Helvetica,sans-serif;
-  font-size:0.9em;
-}
-
-form textarea {overflow:auto;}
-
-#commentform input {width:200px;}
-#commentform textarea {width:325px;}
-#contactform textarea, #contactform #bx_subject {width:465px;}
-
-* html #commentform textarea {width:320px;} /* IE WIN; but why? */
-* html #contactform textarea,
-* html #contactform #bx_subject {width:445px;} /* IE WIN; but why? */
-
-form .button {
-  width:90px !important;
-  border-bottom:1px solid;
-  font-weight:bold;
-}
-
-#commentform .button {margin-left:90px;}
-#contactform .button {margin-left:75px;}
-
-form .hiddenfield {display:none;}
-
-form .info {padding-left:90px;}
-
-
-/* archives
---------------------------------------------------*/
-.archive .postspermonth {
-  margin:0;
-  list-style:none;
-}
-
-
-/* content misc
---------------------------------------------------*/
-.next a {float:right;}
-.previous a {float:left;}
-
-
-#entrynavigation {
-  overflow: auto;
-  height:1%;
-  margin-bottom:13px;
-  padding-bottom:13px;
-  border-bottom:1px solid;
-  font-size:0.9em;
-}
-
-
-/* subcontent
---------------------------------------------------*/
-#subcontent {
-  float:right;
-  width:205px;
-  padding:15px 0 0 15px;
-  font-size:0.9em;
-  line-height:1.5em;
-}
-
-* html #subcontent {padding-top:32px;} /* dirty fix for IEWIN; temporary! */
-
-#subcontent ul, #subcontent p {margin:0 10px;}
-
-
-/* subcontent headings
---------------------------------------------------*/
-#subcontent h2 {
-  margin:18px 0 10px 0;
-  font-family:Georgia,serif;
-  font-size:1em;
-  line-height:1em;
-}
-
-#subcontent h2 em {
-  display:block;
-  padding:5px 10px;
-  font-style:normal;
-}
-
-
-/* subcontent list
---------------------------------------------------*/
-#subcontent ul li {
-  margin:2px 0 2px 18px;
-  padding-bottom:2px;
-  border-bottom:1px solid;
-}
-
-#subcontent li a {
-  display:block;
-  padding:1px 0;
-  height:1%; /* IE WIN */
-}
-
-#subcontent ul.categories li ul {margin:0;}
-
-#subcontent ul.categories li li {
-  margin:0;
-  padding:0 0 3px 0;
-  border-bottom:none;
-}
-
-#subcontent ul.categories li ul ul {margin:0 0 0 16px;}
-
-
-/* calendar
---------------------------------------------------*/
-#wp-calendar {
-  display:inline-table;
-  border-collapse:collapse;
-  width:185px;
-  margin:0px 10px 0 10px;
-  text-align:center;
-}
-
-#subcontent table caption {
-  margin:-5px 10px 0 10px;
-  padding-bottom:5px;
-  border-bottom:1px solid;
-  letter-spacing:0.1em;
-}
-
-#subcontent table thead tr {border-bottom:1px solid;}
-
-#subcontent table th {border-bottom:1px solid;}
-
-#subcontent table td {
-  width:200px; /* maximaize width; honestly, I don't know much about tables... */
-  padding:1px;
-  font-size:0.9em;
-}
-
-#subcontent table td#today {
-  padding:0;
-  border:1px solid;
-  font-size:1em;
-  font-weight:bold;
-}
-
-#subcontent table td a {
-  display:block;
-  border-bottom:1px solid;
-  font-weight:bold;
-  font-size:1.15em;
-}
-
-#subcontent table tfoot {border-top:1px solid;}
-
-#subcontent table tfoot a {
-  border:none;
-  font-weight:bold;
-}
-
-#subcontent table tfoot #prev a {text-align:left;}
-#subcontent table tfoot #next a {text-align:right;}
-
-
-/* footer
---------------------------------------------------*/
-#footer {
-  clear:both;
-  padding:40px 0 15px 0;
-  font-size:0.9em;
-}
-
-.singlecol #footer {
-  padding:25px 0 15px 0;
-}
-
-#footer p {
-  padding:12px 0 18px 0;
-  border-top:1px solid;
-}
-
-#footer strong {font-weight:normal;}
-
-.singlecol #footer p {
-  padding:12px 70px 18px 70px;
-}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/Blix/layout.css (from rev 6350, templates/branches/lifetype-1.2/unported/Blix/layout.css)
===================================================================
--- templates/branches/lifetype-1.2/Blix/layout.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Blix/layout.css	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,578 @@
+/* reset
+--------------------------------------------------*/
+body,h1,h2,h3,h4,h5,h6,p,form,fieldset {margin:0;padding:0;}
+.low {display:none;}
+
+
+/* body
+--------------------------------------------------*/
+body {
+  margin:0;
+  padding:15px 0;
+  font-family:Arial, Helvetica, sans-serif;
+  font-size:75%;
+  line-height:1.6em;
+  text-align:center;
+}
+
+body#commentspopup {padding:0;}
+
+
+/* headings
+--------------------------------------------------*/
+h1 {font-size:30px;}
+
+#content h2 {
+  margin:0 0 18px 0;
+  font-family:Georgia, serif;
+  font-size:1.6em;
+  font-weight:normal;
+}
+
+#content h3 {
+  margin:0 0 18px 0;
+  font-size:1em;
+}
+
+#content h4 {
+  margin:0;
+  font-size:1em;
+}
+
+#content.archive h2 {margin:0 0 26px 0;}
+
+#content.archive h3 {
+  margin:0 0 10px 0;
+  font-family:Georgia, serif;
+  font-size:1.3em;
+  font-weight:normal;
+}
+
+#content.archive h4 {
+  margin:0 0 18px 0;
+  font-size:1em;
+}
+
+#content.archive h5 {
+  margin:0;
+  font-size:1em;
+}
+
+
+/* links
+--------------------------------------------------*/
+a {text-decoration:none;}
+
+a img {border:none;}
+
+
+/* paragraphs, lists, etc
+--------------------------------------------------*/
+p {
+  margin:0;
+  padding:0 0 18px 0;
+}
+
+ul {
+  margin:0 0 0 1.4em;
+  padding:0 0 18px 0;
+}
+
+ul ul {padding:0;}
+
+blockquote {
+  margin:0;
+  padding:0 18px;
+  font-style:italic;
+}
+
+pre {
+  overflow:auto;
+  margin:0 0 18px 0;
+  padding:4px;
+}
+
+pre, code, kbr {font-family:Courier, Monaco, monospace;}
+
+code, kbr {padding:0 2px;}
+
+abbr, acronym {
+  font-size:0.9em;
+  letter-spacing:1px;
+}
+
+
+/* images
+--------------------------------------------------*/
+img.left {
+  float:left;
+  margin:0 12px 0 0;
+}
+
+img.right {
+  float:right;
+  margin:0 0 0 12px;
+}
+
+img.center {
+  display: block;
+  margin:0 auto;
+}
+
+
+/* container
+--------------------------------------------------*/
+#container {
+  width:690px;
+  margin:0 auto;
+  padding:30px 30px 0 30px;
+  text-align:left;
+}
+
+#commentspopup #container {
+  width:455px;
+  padding:0 15px;
+}
+
+
+/* header
+--------------------------------------------------*/
+#header {
+  height:115px;
+  padding:0 0 0 18px;
+}
+
+#header h1 {
+  /*display:none; This will hide the text in your header */
+  padding-top:50px;
+}
+
+
+
+/* navigation
+--------------------------------------------------*/
+#navigation {
+  height:2.7em;
+  line-height:2.7em;
+}
+
+#navigation ul {
+  margin:0;
+  padding:0;
+}
+
+#navigation li {
+  float:left;
+  margin:0;
+  padding:0;
+  list-style-type:none;
+  border-right:1px solid;
+  white-space:nowrap;
+}
+
+#navigation li a {
+  display:block;
+  padding:0 18px;
+  font-size:0.8em;
+  text-transform:uppercase;
+  letter-spacing:1px;
+}
+
+* html #navigation a {width:1%;} /* see http://www.positioniseverything.net/explorer/escape-floats.html */
+
+#navigation form {
+  float:right;
+  height:100%;
+  width:189px;
+  padding:0 15px;
+  border-left:1px solid;
+  line-height:0;
+}
+
+#navigation form fieldset {
+  /* centering the search form could've
+  been done way more elegant but IEWin
+  and Opera refused to follow the rules */
+  margin-top:7px;
+  border:0 solid; /* Opera */
+}
+
+* html #navigation form fieldset {margin-top:7px;}
+
+#navigation #s {
+  height:1.5em;
+  width:140px;
+  margin:0 5px 0 0;
+  padding:0;
+  border:1px solid;
+  font-size:0.8em;
+  vertical-align:middle;
+}
+
+#navigation #searchbutton {
+  height:2em;
+  width:auto;
+  padding:0 1px;
+  border:1px solid;
+  font-size:9px;
+  letter-spacing:1px;
+  text-align:center;
+  vertical-align:middle;
+}
+
+
+/* content
+--------------------------------------------------*/
+#content {
+  float:left;
+  width:455px;
+  padding-top:32px;
+}
+
+.singlecol #content {
+  float:none;
+  width:550px;
+  margin:0 70px;
+}
+
+#commentspopup #content {
+  float:none;
+  padding-top:0;
+}
+
+
+/* entry
+--------------------------------------------------*/
+.entry {margin:0 0 40px 0;}
+
+.entry .info {
+  position:relative;
+  margin-top:-3px;
+  padding:3px;
+  border-top:1px solid;
+  border-bottom:1px solid;
+  font-size:0.9em;
+}
+
+.entry.single {clear:both;}
+
+.entry.single .info {margin:0 0 22px 0;}
+
+.entry .info a {
+  margin-right:6px;
+  padding-right:9px;
+  border-right:1px solid;
+}
+
+.entry .info em {
+  padding-right:6px;
+  font-style:normal;
+}
+
+.entry .author,
+.entry .editlink a {
+  margin:0;
+  padding:0 0 0 10px;
+  border-left:1px solid;
+  border-right:none
+}
+
+.entry #filedunder {
+  clear:both;
+  padding:3px 0 0 0;
+  font-size:0.9em;
+  border-top:1px solid;
+}
+
+
+/* mini-entry
+--------------------------------------------------*/
+.minientry {
+  position:relative;
+  margin:0px 0 35px 0;
+  padding:10px 0;
+  border-top:1px dotted;
+  border-bottom:1px dotted;
+}
+
+.minientry p {padding:0;}
+
+.minientry .commentlink {
+  margin-left:3px;
+  padding-right:7px;
+  border-right:1px solid;
+  font-size:0.9em;
+}
+
+.minientry .permalink {
+  margin-left:3px;
+  font-size:0.9em;
+  font-style:normal;
+}
+
+.minientry .author,
+.minientry .editlink a {
+  margin-left:6px;
+  padding:0 8px 0 10px;
+  border-left:1px solid;
+  font-size:0.9em;
+  font-style:normal;
+}
+
+.minientry .editlink a {margin:0;}
+
+
+/* comments
+--------------------------------------------------*/
+#comments h2 {margin-bottom:24px;}
+
+#comments h2 a {
+  margin-left:2px;
+  padding-left:6px;
+  border-left:1px solid;
+  font-family:Arial,Helvetica,sans-serif;
+  font-size:0.55em;
+}
+
+#comments ul {margin:0 0 0 20px;}
+
+#comments li {
+  position:relative;
+  margin-bottom:18px;
+}
+
+
+#comments li p {padding:0 0 10px 0;}
+
+#comments .header {
+  position:relative;
+  min-height:19px; /* 19 + 3 +3 = 25px = height of gravatar */
+  margin:0 0 10px 0;
+  padding:3px 6px;
+}
+
+* html #comments .header {height:19px;} /* IEWin */
+
+#comments .header strong {font-family:Georgia,sans-serif;}
+
+#comments .header .gravatar {
+  position:absolute;
+  top:1px;
+  right:1px;
+}
+
+
+/* form
+--------------------------------------------------*/
+form {padding:6px 0;}
+
+#commentform, #contactform {margin-bottom:18px;}
+
+form fieldset {border:0 solid;} /* Opera */
+
+form p {
+  padding:6px 0;
+  border-bottom:1px solid;
+}
+
+form label {
+  display:block;
+  float:left;
+  width:60px;
+}
+
+#commentform label {margin:0 15px 0 15px;}
+#contactform label {margin:0 15px 0 0;}
+
+form em {
+  margin-left:5px;
+  font-size:0.9em;
+  font-style:normal;
+}
+
+form input, form textarea {
+  padding:3px;
+  width:200px;
+  border:1px solid;
+  font-family:Arial,Helvetica,sans-serif;
+  font-size:0.9em;
+}
+
+form textarea {overflow:auto;}
+
+#commentform input {width:200px;}
+#commentform textarea {width:325px;}
+#contactform textarea, #contactform #bx_subject {width:465px;}
+
+* html #commentform textarea {width:320px;} /* IE WIN; but why? */
+* html #contactform textarea,
+* html #contactform #bx_subject {width:445px;} /* IE WIN; but why? */
+
+form .button {
+  width:90px !important;
+  border-bottom:1px solid;
+  font-weight:bold;
+}
+
+#commentform .button {margin-left:90px;}
+#contactform .button {margin-left:75px;}
+
+form .hiddenfield {display:none;}
+
+form .info {padding-left:90px;}
+
+
+/* archives
+--------------------------------------------------*/
+.archive .postspermonth {
+  margin:0;
+  list-style:none;
+}
+
+
+/* content misc
+--------------------------------------------------*/
+.next a {float:right;}
+.previous a {float:left;}
+
+
+#entrynavigation {
+  overflow: auto;
+  height:1%;
+  margin-bottom:13px;
+  padding-bottom:13px;
+  border-bottom:1px solid;
+  font-size:0.9em;
+}
+
+
+/* subcontent
+--------------------------------------------------*/
+#subcontent {
+  float:right;
+  width:205px;
+  padding:15px 0 0 15px;
+  font-size:0.9em;
+  line-height:1.5em;
+}
+
+* html #subcontent {padding-top:32px;} /* dirty fix for IEWIN; temporary! */
+
+#subcontent ul, #subcontent p {margin:0 10px;}
+
+
+/* subcontent headings
+--------------------------------------------------*/
+#subcontent h2 {
+  margin:18px 0 10px 0;
+  font-family:Georgia,serif;
+  font-size:1em;
+  line-height:1em;
+}
+
+#subcontent h2 em {
+  display:block;
+  padding:5px 10px;
+  font-style:normal;
+}
+
+
+/* subcontent list
+--------------------------------------------------*/
+#subcontent ul li {
+  margin:2px 0 2px 18px;
+  padding-bottom:2px;
+  border-bottom:1px solid;
+}
+
+#subcontent li a {
+  display:block;
+  padding:1px 0;
+  height:1%; /* IE WIN */
+}
+
+#subcontent ul.categories li ul {margin:0;}
+
+#subcontent ul.categories li li {
+  margin:0;
+  padding:0 0 3px 0;
+  border-bottom:none;
+}
+
+#subcontent ul.categories li ul ul {margin:0 0 0 16px;}
+
+
+/* calendar
+--------------------------------------------------*/
+#wp-calendar {
+  display:inline-table;
+  border-collapse:collapse;
+  width:185px;
+  margin:0px 10px 0 10px;
+  text-align:center;
+}
+
+#subcontent table caption {
+  margin:-5px 10px 0 10px;
+  padding-bottom:5px;
+  border-bottom:1px solid;
+  letter-spacing:0.1em;
+}
+
+#subcontent table thead tr {border-bottom:1px solid;}
+
+#subcontent table th {border-bottom:1px solid;}
+
+#subcontent table td {
+  width:200px; /* maximaize width; honestly, I don't know much about tables... */
+  padding:1px;
+  font-size:0.9em;
+}
+
+#subcontent table td#today {
+  padding:0;
+  border:1px solid;
+  font-size:1em;
+  font-weight:bold;
+}
+
+#subcontent table td a {
+  display:block;
+  border-bottom:1px solid;
+  font-weight:bold;
+  font-size:1.15em;
+}
+
+#subcontent table tfoot {border-top:1px solid;}
+
+#subcontent table tfoot a {
+  border:none;
+  font-weight:bold;
+}
+
+#subcontent table tfoot #prev a {text-align:left;}
+#subcontent table tfoot #next a {text-align:right;}
+
+
+/* footer
+--------------------------------------------------*/
+#footer {
+  clear:both;
+  padding:40px 0 15px 0;
+  font-size:0.9em;
+}
+
+.singlecol #footer {
+  padding:25px 0 15px 0;
+}
+
+#footer p {
+  padding:12px 0 18px 0;
+  border-top:1px solid;
+}
+
+#footer strong {font-weight:normal;}
+
+.singlecol #footer p {
+  padding:12px 70px 18px 70px;
+}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/Blix/links.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Blix/links.template	2008-04-28 17:22:29 UTC (rev 6348)
+++ templates/branches/lifetype-1.2/Blix/links.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,64 +0,0 @@
-
-</div> <!-- /content -->
-<hr class="low" />
-
-<!-- subcontent ................................. -->
-<div id="subcontent">
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}
-  	<h2>{$locale->tr("about_myself")}</h2>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
-  	<p>{$AboutMyself}</p>
-{/if}
-
-
-<H2><em>Around here</em></H2>
-<UL class="feeds">
-{foreach from=$recentposts item=recentpost}
-<LI><A title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a></LI>
-{/foreach}
-</UL>
-
-
-	<h2><em>Categories</em></h2>
-		<ul class="categories">
-		{foreach from=$articlecategories item=articleCategory}
-			<LI><A href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} ({$articleCategory->getNumArticles()})</A></LI>
-		{/foreach}
-		</ul>
-
-	<h2><em>{$locale->tr("my_links")}</em></h2>
-
-	
-				{foreach from=$mylinkscategories item=linkcategory}
-				<STRONG><P>{$linkcategory->getName()}</P></STRONG>
-				<ul class="links">
-					{foreach from=$linkcategory->getLinks() item=link}
-					<li>
-						<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>
-					</li>
-					{/foreach}
-				</ul>
-				{/foreach}
-
-	
-
-	<h2><em>Feeds</em></h2>
-
-	<ul class="feeds">
-	<li><A href="{$url->rssLink("rss10")}">RSS</A></li>
-	<LI><A title="This page validates as XHTML 1.0 Transitional" href="http://validator.w3.org/check/referer">Valid <ABBR title="eXtensible HyperText Markup Language">XHTML</ABBR></A> </LI>
-<LI><A href="http://gmpg.org/xfn/"><ABBR title="XHTML Friends Network">XFN</ABBR></A> </LI>
-<LI><A title="Powered by LifeType, state-of-the-art semantic personal publishing platform." href="http://www.lifetype.net/">LifeType</A> </LI>
-
-	</ul>
-
-
-
-
-
-
-
-</div> <!-- /subcontent -->
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/Blix/links.template (from rev 6350, templates/branches/lifetype-1.2/unported/Blix/links.template)
===================================================================
--- templates/branches/lifetype-1.2/Blix/links.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Blix/links.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,64 @@
+
+</div> <!-- /content -->
+<hr class="low" />
+
+<!-- subcontent ................................. -->
+<div id="subcontent">
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}
+  	<h2>{$locale->tr("about_myself")}</h2>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
+  	<p>{$AboutMyself}</p>
+{/if}
+
+
+<H2><em>Around here</em></H2>
+<UL class="feeds">
+{foreach from=$recentposts item=recentpost}
+<LI><A title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a></LI>
+{/foreach}
+</UL>
+
+
+	<h2><em>Categories</em></h2>
+		<ul class="categories">
+		{foreach from=$articlecategories item=articleCategory}
+			<LI><A href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} ({$articleCategory->getNumArticles()})</A></LI>
+		{/foreach}
+		</ul>
+
+	<h2><em>{$locale->tr("my_links")}</em></h2>
+
+	
+				{foreach from=$mylinkscategories item=linkcategory}
+				<STRONG><P>{$linkcategory->getName()}</P></STRONG>
+				<ul class="links">
+					{foreach from=$linkcategory->getLinks() item=link}
+					<li>
+						<a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a>
+					</li>
+					{/foreach}
+				</ul>
+				{/foreach}
+
+	
+
+	<h2><em>Feeds</em></h2>
+
+	<ul class="feeds">
+	<li><A href="{$url->rssLink("rss10")}">RSS</A></li>
+	<LI><A title="This page validates as XHTML 1.0 Transitional" href="http://validator.w3.org/check/referer">Valid <ABBR title="eXtensible HyperText Markup Language">XHTML</ABBR></A> </LI>
+<LI><A href="http://gmpg.org/xfn/"><ABBR title="XHTML Friends Network">XFN</ABBR></A> </LI>
+<LI><A title="Powered by LifeType, state-of-the-art semantic personal publishing platform." href="http://www.lifetype.net/">LifeType</A> </LI>
+
+	</ul>
+
+
+
+
+
+
+
+</div> <!-- /subcontent -->
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/Blix/main.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Blix/main.template	2008-04-28 17:22:29 UTC (rev 6348)
+++ templates/branches/lifetype-1.2/Blix/main.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,22 +0,0 @@
-{include file="$blogtemplate/header.template"}
-	<!-- Loop Start -->
-	{if $showAll}
-	<div class=entry>
-		{if $showAll == 1 && $category}
-			<h2>{$locale->tr("posts")}: {$category->getName()}</h2>
-		{/if}
-		{foreach from=$posts item=post}
-			<!-- showing only the topic of the post, in case we have too many! -->
-			{assign var="postDate" value=$post->getDateObject()}
-			{$locale->formatDate($postDate,"%Y.%B%d")} <a href="{$url->postPermalink($post)}">{$post->getTopic()}</a><br/>
-		{/foreach}
-        
-	</div>
-	{else}
-		{foreach from=$posts item=post}
-			{include file="$blogtemplate/post.template"}
-		{/foreach}
-	{/if}
-    <div style="text-align:center">{pager style="links"}</div>
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/Blix/main.template (from rev 6350, templates/branches/lifetype-1.2/unported/Blix/main.template)
===================================================================
--- templates/branches/lifetype-1.2/Blix/main.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Blix/main.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,22 @@
+{include file="$blogtemplate/header.template"}
+	<!-- Loop Start -->
+	{if $showAll}
+	<div class=entry>
+		{if $showAll == 1 && $category}
+			<h2>{$locale->tr("posts")}: {$category->getName()}</h2>
+		{/if}
+		{foreach from=$posts item=post}
+			<!-- showing only the topic of the post, in case we have too many! -->
+			{assign var="postDate" value=$post->getDateObject()}
+			{$locale->formatDate($postDate,"%Y.%B%d")} <a href="{$url->postPermalink($post)}">{$post->getTopic()}</a><br/>
+		{/foreach}
+        
+	</div>
+	{else}
+		{foreach from=$posts item=post}
+			{include file="$blogtemplate/post.template"}
+		{/foreach}
+	{/if}
+    <div style="text-align:center">{pager style="links"}</div>
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}
\ No newline at end of file

Deleted: templates/branches/lifetype-1.2/Blix/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Blix/post.template	2008-04-28 17:22:29 UTC (rev 6348)
+++ templates/branches/lifetype-1.2/Blix/post.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,14 +0,0 @@
-<!-- {$url->postTrackbackLink($post)} -->
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-		<div class="entry">
-			<h2><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></h2>
-			<P>{$post->getText()}</P>
-			<p class="info"><A class="commentlink" href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A>
-			Posted to {foreach name=categories from=$post->getCategories() item=postcategory}
-					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-				{if !$smarty.foreach.categories.last}, {/if}
-				{/foreach} <em class="date">{$locale->formatDate($postDate,"%m/%d/%Y")}</em>
-			<span class="editlink"> <A title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">Edit</a> </span></p>
-
-		</div>

Copied: templates/branches/lifetype-1.2/Blix/post.template (from rev 6351, templates/branches/lifetype-1.2/unported/Blix/post.template)
===================================================================
--- templates/branches/lifetype-1.2/Blix/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Blix/post.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,13 @@
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+		<div class="entry">
+			<h2><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></h2>
+			<P>{$post->getText()}</P>
+			<p class="info"><A class="commentlink" href="{$url->postPermalink($post)}#comments">Comments ({$post->getNumComments()})</A>
+			Posted to {foreach name=categories from=$post->getCategories() item=postcategory}
+					<a href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+				{if !$smarty.foreach.categories.last}, {/if}
+				{/foreach} <em class="date">{$locale->formatDate($postDate,"%m/%d/%Y")}</em>
+			<span class="editlink"> <A title="{$locale->tr("admin")}" href="{$url->getAdminUrl()}">Edit</a> </span></p>
+
+		</div>

Deleted: templates/branches/lifetype-1.2/Blix/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/Blix/postandcomments.template	2008-04-28 17:22:29 UTC (rev 6348)
+++ templates/branches/lifetype-1.2/Blix/postandcomments.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,79 +0,0 @@
-{assign var="postPageTitle" value=$post->getTopic()}
-{assign var="postPageTitle" value=" | $postPageTitle"}
-
-{include file="$blogtemplate/header.template"}
-	
-<div class="entry single">
-		{assign var="postDate" value=$post->getDateObject()}
-		{assign var="postOwner" value=$post->getUserInfo()}
-
-
-		<h2><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></h2>
-
-		<p class="info">
-		   		<em class="date">{$locale->formatDate($postDate,"%m/%d/%Y")}</em>
-
-   		   		</p>
-
-			<P>{$post->getText()}</P>
-			
-	<DIV class=feedback>
-		<DIV class=meta>Posted by {$postOwner->getUsername()} at
-			{$locale->formatDate($postDate,"%H:%M")}
-			<A class=aposted href="{$url->postPermalink($post)}#comments">{$locale->tr("comment on this")} ({$post->getNumComments()})</A>,
-			<A class=aposted href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</A>,
-			{foreach name=categories from=$post->getCategories() item=postcategory}
-				<a class=aposted href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
-				{if !$smarty.foreach.categories.last}, {/if}
-			{/foreach}<br>
-			{* Prevpost and nextpost use *}
-			<a href="{$url->blogLink()}">Back to Home</a>
-			{assign var=nextpost value=$post->getNextArticle()}
-			{assign var=prevpost value=$post->getPrevArticle()}
-			{if $prevpost == true}
-				<a href="{$url->postPermalink($prevpost)}" 
-                   title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a>
-			{/if}
-			{if $nextpost == true}
-				<a href="{$url->postPermalink($nextpost)}" 
-                   title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a>
-			{/if}
-			{* End of article_index *}
-		</DIV>
-	</DIV>
-	</DIV>
-	
-		<!-- comments ................................. -->
-		<div id="comments">		
-		
-		<h2>{$post->getNumComments()} Comments <a href="#commentform" class="more">Add your own</a></h2>
- {pager style="links"}
- <br/>
-	<ul>
-	
-	{assign var="counter" value=1}
-	{foreach name=comment from=$comments item=comment}
-		<li class="comment" id="comment-{$comment->getId()}">
-		{if $counter%2!=0}
-		<p class="header"><strong>{$counter}.</strong>
-		
-		{else}
-		<p class="header alt"><strong>{$counter}.</strong>
-		{/if}
-			<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a> &nbsp;|&nbsp; {assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%m/%d,%Y")}</p>
-			<p>{$comment->getText()}</p>
-		</LI>
-		{assign var="counter" value="`$counter+1`"}
-	{/foreach}
-	</UL>
- {pager style="links"}<br/>
-	<a name="commentform"></a>
-
-	<h2 id="commentsformheader">Leave a Reply</h2>
-	{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
-		{include file="$blogtemplate/commentform.template"}
-	{/if}
-	</div> <!-- /comments -->
-
-{include file="$blogtemplate/links.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/Blix/postandcomments.template (from rev 6351, templates/branches/lifetype-1.2/unported/Blix/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/Blix/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/Blix/postandcomments.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,80 @@
+{assign var="postPageTitle" value=$post->getTopic()}
+{assign var="postPageTitle" value=" | $postPageTitle"}
+
+{include file="$blogtemplate/header.template"}
+	
+<div class="entry single">
+		{assign var="postDate" value=$post->getDateObject()}
+		{assign var="postOwner" value=$post->getUserInfo()}
+
+
+		<h2><A href="{$url->postPermalink($post)}">{$post->getTopic()}</A></h2>
+
+		<p class="info">
+		   		<em class="date">{$locale->formatDate($postDate,"%m/%d/%Y")}</em>
+
+   		   		</p>
+
+			<P>{$post->getText()}</P>
+			
+	<DIV class=feedback>
+		<DIV class=meta>Posted by {$postOwner->getUsername()} at
+			{$locale->formatDate($postDate,"%H:%M")}
+			<A class=aposted href="{$url->postPermalink($post)}#comments">{$locale->tr("comment on this")} ({$post->getNumComments()})</A>,
+			<A class=aposted href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</A>,
+			{foreach name=categories from=$post->getCategories() item=postcategory}
+				<a class=aposted href="{$url->categoryLink($postcategory)}">{$postcategory->getName()}</a>
+				{if !$smarty.foreach.categories.last}, {/if}
+			{/foreach}<br>
+			{* Prevpost and nextpost use *}
+			<a href="{$url->blogLink()}">Back to Home</a>
+			{assign var=nextpost value=$post->getNextArticle()}
+			{assign var=prevpost value=$post->getPrevArticle()}
+			{if $prevpost == true}
+				<a href="{$url->postPermalink($prevpost)}" 
+                   title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a>
+			{/if}
+			{if $nextpost == true}
+				<a href="{$url->postPermalink($nextpost)}" 
+                   title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a>
+			{/if}
+			{* End of article_index *}
+		</DIV>
+	</DIV>
+	</DIV>
+<!-- {$url->postTrackbackLink($post)} -->
+	
+		<!-- comments ................................. -->
+		<div id="comments">		
+		
+		<h2>{$post->getNumComments()} Comments <a href="#commentform" class="more">Add your own</a></h2>
+ {pager style="links"}
+ <br/>
+	<ul>
+	
+	{assign var="counter" value=1}
+	{foreach name=comment from=$comments item=comment}
+		<li class="comment" id="comment-{$comment->getId()}">
+		{if $counter%2!=0}
+		<p class="header"><strong>{$counter}.</strong>
+		
+		{else}
+		<p class="header alt"><strong>{$counter}.</strong>
+		{/if}
+			<a href="{$comment->getUserUrl()}">{$comment->getUsername()}</a> &nbsp;|&nbsp; {assign var=commentDate value=$comment->getDateObject()} {$locale->formatDate($commentDate, "%m/%d,%Y")}</p>
+			<p>{$comment->getText()}</p>
+		</LI>
+		{assign var="counter" value="`$counter+1`"}
+	{/foreach}
+	</UL>
+ {pager style="links"}<br/>
+	<a name="commentform"></a>
+
+	<h2 id="commentsformheader">Leave a Reply</h2>
+	{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
+		{include file="$blogtemplate/commentform.template"}
+	{/if}
+	</div> <!-- /comments -->
+
+{include file="$blogtemplate/links.template"}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/branches/lifetype-1.2/Blix/spring_flavour.css
===================================================================
--- templates/branches/lifetype-1.2/unported/Blix/spring_flavour.css	2008-04-28 17:22:29 UTC (rev 6348)
+++ templates/branches/lifetype-1.2/Blix/spring_flavour.css	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,326 +0,0 @@
-/* body
---------------------------------------------------*/
-body {
-  color:#414141;
-  background:#EDE8E2;
-}
-
-body#commentspopup {background:white;}
-
-
-/* headings
---------------------------------------------------*/
-h1, h1 a,
-h2, h2 a,
-h3 a,
-h4 a
-  {color:#009193;}
-
-h1 a:hover,
-h2 a:hover,
-h3 a:hover,
-h4 a:hover
-  {color:#1BA6B2;}
-
-
-/* links
---------------------------------------------------*/
-a {color:#6C8C37;}
-
-a:hover {color:#009193;}
-
-a.commentlink {
-  padding-left:16px;
-  background:url(images/spring_flavour/comments.gif) center left no-repeat;
-}
-
-a.more {
-  padding-right:10px;
-  background:url(images/spring_flavour/more.gif) center right no-repeat;
-}
-
-
-/* paragraphs, lists, etc
---------------------------------------------------*/
-pre,
-code
-  {background-color:#F8FAF2;}
-
-kbr {color:#009193;}
-
-
-/* container
---------------------------------------------------*/
-#container {
-  padding-top:0;
-  border-top:30px solid white;
-  background:white url(images/spring_flavour/container_bg.gif) 500px 0px repeat-y;
-}
-
-#container.singlecol,
-#commentspopup #container {background-image:none;}
-
-
-
-/* header
---------------------------------------------------*/
-#header {
-  background-color:#F0F9F9;
-  background-image:url(images/spring_flavour/header_bg.jpg);
-}
-
-
-/* navigation
---------------------------------------------------*/
-#navigation {background-color:#A3C159;}
-
-#navigation li {border-color:white;}
-
-#navigation a {color:white;}
-
-#navigation .selected,
-#navigation a:hover
-  {background-color:#1BA6B2}
-
-#navigation form {
-  border-color:white;
-  background:#FEC42D url(images/spring_flavour/corner_bottom_right.gif) bottom right no-repeat;
-}
-
-#navigation #s {border-color:#FFF9EA;}
-
-#navigation #searchbutton {
-  color:white;
-  background-color:#A3C159;
-}
-
-
-/* Entry
---------------------------------------------------*/
-.entry {margin:0 0 40px 0;}
-
-.entry .author {}
-
-.entry .info {
-  border-color:#F3F4F4;
-  background-color:#FAFAFA;
-}
-
-.entry .info a {border-color:#949494;}
-
-.entry a.more {
-  padding-left:12px;
-  background:url(images/spring_flavour/more.gif) center left no-repeat;
-}
-
-.entry .info .date {
-  padding-left:15px;
-  background:url(images/spring_flavour/post.gif) center left no-repeat;
-}
-
-.entry .info .author {
-  padding-left:23px;
-  border-color:#949494;
-  background:url(images/spring_flavour/author.gif) 10px 2px no-repeat;
-}
-
-.entry #filedunder {border-color:#F3F4F4;}
-
-
-/* Mini-Entry
---------------------------------------------------*/
-.minientry  {border-color:#D9D9D9;}
-
-.minientry .commentlink {border-color:#949494;}
-
-.minientry .permalink {
-  padding-left:15px;
-  background:url(images/spring_flavour/post.gif) center left no-repeat;
-}
-
-.minientry .author {
-  padding-left:23px;
-  border-color:#949494;
-  background:url(images/spring_flavour/author.gif) 10px 2px no-repeat;
-}
-
-
-/* Comments
---------------------------------------------------*/
-#comments h2 {margin-bottom:24px;}
-
-#comments h2 a {color:#6C8C37;}
-
-#comments li.comment {list-style-image:url(images/spring_flavour/comments.gif);}
-
-#comments li.trackback,#comments li.pingback {list-style-image:url(images/spring_flavour/pingtrackback.gif);}
-
-#commentform {background-color:#EDF3DE;}
-
-#comments .header {background-color:#EDF3DE;}
-
-#comments .header.alt {background-color:#E9F7F6;}
-
-
-/* form
---------------------------------------------------*/
-form p {border-color:white;}
-
-#CommentForm label {
-	width:13em;
-	float:left;
-	display:block;
-	clear:both; 
-	float:left;
-	margin-top:8px;
-	margin-bottom:0px;
-	color:#6C8C37;	
-}
-
-#CommentForm input {
-	margin-top:
-	8px;margin-bottom:8px;
-	color:#414141;	
-}
-
-#CommentForm input, #CommentForm textarea {
-  border-color:#DCDCDC #F0F0F0 #F0F0F0 #DCDCDC;
-}
-
-#CommentForm img {
-	float:left;
-}
-
-#CommentForm #Submit {
-	clear:left;
-}
-
-/* Archives
---------------------------------------------------*/
-.archive .postspermonth {color:#A0A0A0;}
-
-
-/* content misc
---------------------------------------------------*/
-.next a {
-  padding-right:10px;
-  background:url(images/spring_flavour/next.gif) center right no-repeat;
-}
-
-.previous a {
-  padding-left:10px;
-  background:url(images/spring_flavour/previous.gif) center left no-repeat;
-}
-
-#entrynavigation {border-color:#F3F4F4;}
-
-.editlink {
-  position:absolute;
-  height:14px;
-  width:14px;
-  right:2px;
-  background:url(images/spring_flavour/edit.gif) 0 -14px;
-}
-
-html>body .editlink {bottom:6px;}
-
-.entry .info .editlink a,
-.minientry .editlink a,
-#comments li .editlink a {
-  display:block;
-  height:14px;
-  width:14px;
-  margin:0;
-  padding:0;
-  border:none;
-  font-size:1px; /* IEWin */
-  line-height:0; /* IEWin */
-  text-indent:-9999px;
-  background:url(images/spring_flavour/edit.gif) 0 0;
-}
-
-.entry .info .editlink a:hover,
-.minientry .editlink a:hover,
-#comments li .editlink a:hover
-  {background:none;}
-
-
-/* subcontent
---------------------------------------------------*/
-#subcontent {background:url(images/spring_flavour/subcontent_bg.gif) top left no-repeat;}
-
-
-/* subcontent headings
---------------------------------------------------*/
-#subcontent h2 {
-  color:white;
-  background:#A3C159 url(images/spring_flavour/corner_top_left.gif) top left no-repeat;
-}
-
-#subcontent h2 em {background:url(images/spring_flavour/corner_bottom_right.gif) bottom right no-repeat;}
-
-
-/* subcontent list
---------------------------------------------------*/
-#subcontent ul li {border-bottom-color:#F0F0F0;}
-
-#subcontent li a:hover {background-color:#FFFBF0;}
-
-#subcontent ul.pages li {list-style-image:url(images/spring_flavour/post_yellow.gif);}
-
-#subcontent ul.categories li,
-#subcontent ul.months li {list-style-image:url(images/spring_flavour/categories_yellow.gif);}
-
-#subcontent ul.links li {list-style-image:url(images/spring_flavour/links_yellow.gif);}
-
-#subcontent ul.feeds li {list-style-image:url(images/spring_flavour/feeds_yellow.gif);}
-
-#subcontent ul.posts li {list-style-image:url(images/spring_flavour/post_yellow.gif);}
-
-#subcontent ul.categories li li {list-style-image:url(images/spring_flavour/sub_categories_yellow.gif);}
-
-
-/* calendar
---------------------------------------------------*/
-#wp-calendar {color:#A0A0A0;}
-
-#subcontent table caption {border-bottom-color:#F3F4F4;}
-
-#subcontent table thead tr {
-  border-bottom-color:#F3F4F4;
-  color:#414141;
-}
-
-#subcontent table th {border-bottom-color:#F3F4F4;}
-
-#subcontent table td#today {
-  border-color:#F3F4F4;
-  color:#414141;
-}
-
-#subcontent table td a {
-  border-bottom-color:#A3C159;
-  background-color:#EDF3DE;
-}
-
-#subcontent table tfoot {border-top-color:#F3F4F4;}
-
-#subcontent table tfoot a {background:none;}
-
-
-/* footer
---------------------------------------------------*/
-#footer {
-  color:#A0A0A0;
-  background:white url(images/spring_flavour/footer_bg.gif) 470px 0px no-repeat;
-}
-
-.singlecol #footer {background-image:none;}
-
-#footer p {border-top:6px solid #E9F7F6;}
-
-#footer a {color:#A0A0A0;}
-
-#footer a:hover {color:#414141;}
-
-#footer strong {color:#009193;}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/Blix/spring_flavour.css (from rev 6350, templates/branches/lifetype-1.2/unported/Blix/spring_flavour.css)
===================================================================
--- templates/branches/lifetype-1.2/Blix/spring_flavour.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/Blix/spring_flavour.css	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,326 @@
+/* body
+--------------------------------------------------*/
+body {
+  color:#414141;
+  background:#EDE8E2;
+}
+
+body#commentspopup {background:white;}
+
+
+/* headings
+--------------------------------------------------*/
+h1, h1 a,
+h2, h2 a,
+h3 a,
+h4 a
+  {color:#009193;}
+
+h1 a:hover,
+h2 a:hover,
+h3 a:hover,
+h4 a:hover
+  {color:#1BA6B2;}
+
+
+/* links
+--------------------------------------------------*/
+a {color:#6C8C37;}
+
+a:hover {color:#009193;}
+
+a.commentlink {
+  padding-left:16px;
+  background:url(images/spring_flavour/comments.gif) center left no-repeat;
+}
+
+a.more {
+  padding-right:10px;
+  background:url(images/spring_flavour/more.gif) center right no-repeat;
+}
+
+
+/* paragraphs, lists, etc
+--------------------------------------------------*/
+pre,
+code
+  {background-color:#F8FAF2;}
+
+kbr {color:#009193;}
+
+
+/* container
+--------------------------------------------------*/
+#container {
+  padding-top:0;
+  border-top:30px solid white;
+  background:white url(images/spring_flavour/container_bg.gif) 500px 0px repeat-y;
+}
+
+#container.singlecol,
+#commentspopup #container {background-image:none;}
+
+
+
+/* header
+--------------------------------------------------*/
+#header {
+  background-color:#F0F9F9;
+  background-image:url(images/spring_flavour/header_bg.jpg);
+}
+
+
+/* navigation
+--------------------------------------------------*/
+#navigation {background-color:#A3C159;}
+
+#navigation li {border-color:white;}
+
+#navigation a {color:white;}
+
+#navigation .selected,
+#navigation a:hover
+  {background-color:#1BA6B2}
+
+#navigation form {
+  border-color:white;
+  background:#FEC42D url(images/spring_flavour/corner_bottom_right.gif) bottom right no-repeat;
+}
+
+#navigation #s {border-color:#FFF9EA;}
+
+#navigation #searchbutton {
+  color:white;
+  background-color:#A3C159;
+}
+
+
+/* Entry
+--------------------------------------------------*/
+.entry {margin:0 0 40px 0;}
+
+.entry .author {}
+
+.entry .info {
+  border-color:#F3F4F4;
+  background-color:#FAFAFA;
+}
+
+.entry .info a {border-color:#949494;}
+
+.entry a.more {
+  padding-left:12px;
+  background:url(images/spring_flavour/more.gif) center left no-repeat;
+}
+
+.entry .info .date {
+  padding-left:15px;
+  background:url(images/spring_flavour/post.gif) center left no-repeat;
+}
+
+.entry .info .author {
+  padding-left:23px;
+  border-color:#949494;
+  background:url(images/spring_flavour/author.gif) 10px 2px no-repeat;
+}
+
+.entry #filedunder {border-color:#F3F4F4;}
+
+
+/* Mini-Entry
+--------------------------------------------------*/
+.minientry  {border-color:#D9D9D9;}
+
+.minientry .commentlink {border-color:#949494;}
+
+.minientry .permalink {
+  padding-left:15px;
+  background:url(images/spring_flavour/post.gif) center left no-repeat;
+}
+
+.minientry .author {
+  padding-left:23px;
+  border-color:#949494;
+  background:url(images/spring_flavour/author.gif) 10px 2px no-repeat;
+}
+
+
+/* Comments
+--------------------------------------------------*/
+#comments h2 {margin-bottom:24px;}
+
+#comments h2 a {color:#6C8C37;}
+
+#comments li.comment {list-style-image:url(images/spring_flavour/comments.gif);}
+
+#comments li.trackback,#comments li.pingback {list-style-image:url(images/spring_flavour/pingtrackback.gif);}
+
+#commentform {background-color:#EDF3DE;}
+
+#comments .header {background-color:#EDF3DE;}
+
+#comments .header.alt {background-color:#E9F7F6;}
+
+
+/* form
+--------------------------------------------------*/
+form p {border-color:white;}
+
+#CommentForm label {
+	width:13em;
+	float:left;
+	display:block;
+	clear:both; 
+	float:left;
+	margin-top:8px;
+	margin-bottom:0px;
+	color:#6C8C37;	
+}
+
+#CommentForm input {
+	margin-top:
+	8px;margin-bottom:8px;
+	color:#414141;	
+}
+
+#CommentForm input, #CommentForm textarea {
+  border-color:#DCDCDC #F0F0F0 #F0F0F0 #DCDCDC;
+}
+
+#CommentForm img {
+	float:left;
+}
+
+#CommentForm #Submit {
+	clear:left;
+}
+
+/* Archives
+--------------------------------------------------*/
+.archive .postspermonth {color:#A0A0A0;}
+
+
+/* content misc
+--------------------------------------------------*/
+.next a {
+  padding-right:10px;
+  background:url(images/spring_flavour/next.gif) center right no-repeat;
+}
+
+.previous a {
+  padding-left:10px;
+  background:url(images/spring_flavour/previous.gif) center left no-repeat;
+}
+
+#entrynavigation {border-color:#F3F4F4;}
+
+.editlink {
+  position:absolute;
+  height:14px;
+  width:14px;
+  right:2px;
+  background:url(images/spring_flavour/edit.gif) 0 -14px;
+}
+
+html>body .editlink {bottom:6px;}
+
+.entry .info .editlink a,
+.minientry .editlink a,
+#comments li .editlink a {
+  display:block;
+  height:14px;
+  width:14px;
+  margin:0;
+  padding:0;
+  border:none;
+  font-size:1px; /* IEWin */
+  line-height:0; /* IEWin */
+  text-indent:-9999px;
+  background:url(images/spring_flavour/edit.gif) 0 0;
+}
+
+.entry .info .editlink a:hover,
+.minientry .editlink a:hover,
+#comments li .editlink a:hover
+  {background:none;}
+
+
+/* subcontent
+--------------------------------------------------*/
+#subcontent {background:url(images/spring_flavour/subcontent_bg.gif) top left no-repeat;}
+
+
+/* subcontent headings
+--------------------------------------------------*/
+#subcontent h2 {
+  color:white;
+  background:#A3C159 url(images/spring_flavour/corner_top_left.gif) top left no-repeat;
+}
+
+#subcontent h2 em {background:url(images/spring_flavour/corner_bottom_right.gif) bottom right no-repeat;}
+
+
+/* subcontent list
+--------------------------------------------------*/
+#subcontent ul li {border-bottom-color:#F0F0F0;}
+
+#subcontent li a:hover {background-color:#FFFBF0;}
+
+#subcontent ul.pages li {list-style-image:url(images/spring_flavour/post_yellow.gif);}
+
+#subcontent ul.categories li,
+#subcontent ul.months li {list-style-image:url(images/spring_flavour/categories_yellow.gif);}
+
+#subcontent ul.links li {list-style-image:url(images/spring_flavour/links_yellow.gif);}
+
+#subcontent ul.feeds li {list-style-image:url(images/spring_flavour/feeds_yellow.gif);}
+
+#subcontent ul.posts li {list-style-image:url(images/spring_flavour/post_yellow.gif);}
+
+#subcontent ul.categories li li {list-style-image:url(images/spring_flavour/sub_categories_yellow.gif);}
+
+
+/* calendar
+--------------------------------------------------*/
+#wp-calendar {color:#A0A0A0;}
+
+#subcontent table caption {border-bottom-color:#F3F4F4;}
+
+#subcontent table thead tr {
+  border-bottom-color:#F3F4F4;
+  color:#414141;
+}
+
+#subcontent table th {border-bottom-color:#F3F4F4;}
+
+#subcontent table td#today {
+  border-color:#F3F4F4;
+  color:#414141;
+}
+
+#subcontent table td a {
+  border-bottom-color:#A3C159;
+  background-color:#EDF3DE;
+}
+
+#subcontent table tfoot {border-top-color:#F3F4F4;}
+
+#subcontent table tfoot a {background:none;}
+
+
+/* footer
+--------------------------------------------------*/
+#footer {
+  color:#A0A0A0;
+  background:white url(images/spring_flavour/footer_bg.gif) 470px 0px no-repeat;
+}
+
+.singlecol #footer {background-image:none;}
+
+#footer p {border-top:6px solid #E9F7F6;}
+
+#footer a {color:#A0A0A0;}
+
+#footer a:hover {color:#414141;}
+
+#footer strong {color:#009193;}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/buggy (from rev 6344, templates/branches/lifetype-1.2/unported/buggy)

Deleted: templates/branches/lifetype-1.2/buggy/buggy.css
===================================================================
--- templates/branches/lifetype-1.2/unported/buggy/buggy.css	2008-04-28 15:00:32 UTC (rev 6344)
+++ templates/branches/lifetype-1.2/buggy/buggy.css	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,197 +0,0 @@
-/*
-  The Buggy pLog Template stylesheet
-  pLog Version: 1.0
-  
-  (c) BuggyBrain.com
-  Released under the terms of the GPL
- */
-
-#header {
-	background: #AF1517;
-	padding: 5px 0px 0px 0px;
-}
-
-#header div.title {
-	border-top: 5px solid #FFF;
-	color: #FFF;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 24px;
-	padding: 5px 0px 0px 10px;
-}
-
-#header div.subtitle {
-	color: #EBEBEB;
-	font-size: 10px;
-	font-weight: bold;
-	padding: 5px 0px 10px 20px;
-}
-
-#photo {
-	position: absolute;
-	left: 630px;
-	top: 20px;
-}
-
-#menu {
-	background: #F2F2F2;
-	font-size: 11px;
-	margin-top: 5px;
-	padding: 5px;
-	position: absolute;
-	text-align: right;
-	width: 615px;
-}
-
-#menu a {
-	font-weight: bold;
-	text-decoration: none;
-}
-
-#col1 {
-	left: 0px;
-	position: absolute;
-	top: 101px;
-	width: 150px;
-}
-
-#col1 .content {
-	background: #E8EBD7;
-	margin-right: 5px;
-	padding: 0px 5px 5px 5px;
-}
-
-#col2 {
-	left: 150px;
-	position: absolute;
-	top: 106px;
-	width: 475px;
-}
-
-#col2 .content {
-	font-size: 13px;
-	font-family: Trebuchet MS, Verdana, Arial, Helvetica, sans-serif;
-	padding: 5px 0px 5px 0px;
-}
-
-#colresource {
-	left: 15px;
-	position: absolute;
-	top: 106px;
-}
-
-#colresource .content {
-	font-size: 13px;
-	font-family: Trebuchet MS, Verdana, Arial, Helvetica, sans-serif;
-	padding: 5px 0px 5px 0px;
-}
-
-#col3 {
-	left: 625px;
-	position: absolute;
-	top: 215px;
-	width: 155px;
-}
-
-#col3 .content {
-	background: #E8EBD7;
-	margin-left: 5px;
-	padding: 0px 5px 5px 5px;
-}
-
-#col1 .content, #col3 .content {
-	font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-}
-
-#footer {
-	background: #F2F2F2;
-	font-size: 11px;
-	line-height: 16px;
-	padding: 5px;
-	position: absolute;
-	vertical-align: bottom;
-	visibility: hidden;
-	width: 770px;
-}
-
-body {
-	background: #FFF;
-	color: #000;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	margin: 10px 0px 0px 0px;
-	padding: 0px;
-}
-
-a:link {
-	color: #900;
-}
-
-a:visited {
-	color: #900;
-}
-
-a:hover {
-	color: Gray;
-}
-
-img {
-	border: 0px;
-}
-
-h1 {
-	color: #6B6B6B;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 16px;
-	margin: 10px 0px 2px 0px;
-}
-
-h5, h6 {
-	border-top: 5px solid #FFF;
-	color: #FFF;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	letter-spacing: 2px;
-	margin: 5px -5px 10px -5px;
-	padding: 3px;
-	text-align: center;
-}
-
-h5 {
-	background: #8F8D5A;
-}
-
-h6 {
-	background: #AF1517;
-}
-
-p {
-	line-height: 130%;
-}
-
-.shadelight, .shadedark {
-	font-size: 10px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	padding: 2px 4px 2px 4px;
-}
-
-.shadelight {
-	background: #CCC;
-}
-
-.shadedark {
-	background: #B6B6B6;
-	color: #FFF;
-	font-weight: bold;
-}
-
-.shadedark a, .shadelight a	 {
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.upgrade {
-	display: none;
-	font-weight: bold;
-}
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/buggy/buggy.css (from rev 6352, templates/branches/lifetype-1.2/unported/buggy/buggy.css)
===================================================================
--- templates/branches/lifetype-1.2/buggy/buggy.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/buggy/buggy.css	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,197 @@
+/*
+  The Buggy LifeType Template stylesheet
+  LifeType Version: 1.2
+  
+  (c) BuggyBrain.com
+  Released under the terms of the GPL
+ */
+
+#header {
+	background: #AF1517;
+	padding: 5px 0px 0px 0px;
+}
+
+#header div.title {
+	border-top: 5px solid #FFF;
+	color: #FFF;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 24px;
+	padding: 5px 0px 0px 10px;
+}
+
+#header div.subtitle {
+	color: #EBEBEB;
+	font-size: 10px;
+	font-weight: bold;
+	padding: 5px 0px 10px 20px;
+}
+
+#photo {
+	position: absolute;
+	left: 630px;
+	top: 20px;
+}
+
+#menu {
+	background: #F2F2F2;
+	font-size: 11px;
+	margin-top: 5px;
+	padding: 5px;
+	position: absolute;
+	text-align: right;
+	width: 615px;
+}
+
+#menu a {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+#col1 {
+	left: 0px;
+	position: absolute;
+	top: 101px;
+	width: 150px;
+}
+
+#col1 .content {
+	background: #E8EBD7;
+	margin-right: 5px;
+	padding: 0px 5px 5px 5px;
+}
+
+#col2 {
+	left: 150px;
+	position: absolute;
+	top: 106px;
+	width: 475px;
+}
+
+#col2 .content {
+	font-size: 13px;
+	font-family: Trebuchet MS, Verdana, Arial, Helvetica, sans-serif;
+	padding: 5px 0px 5px 0px;
+}
+
+#colresource {
+	left: 15px;
+	position: absolute;
+	top: 106px;
+}
+
+#colresource .content {
+	font-size: 13px;
+	font-family: Trebuchet MS, Verdana, Arial, Helvetica, sans-serif;
+	padding: 5px 0px 5px 0px;
+}
+
+#col3 {
+	left: 625px;
+	position: absolute;
+	top: 215px;
+	width: 155px;
+}
+
+#col3 .content {
+	background: #E8EBD7;
+	margin-left: 5px;
+	padding: 0px 5px 5px 5px;
+}
+
+#col1 .content, #col3 .content {
+	font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+}
+
+#footer {
+	background: #F2F2F2;
+	font-size: 11px;
+	line-height: 16px;
+	padding: 5px;
+	position: absolute;
+	vertical-align: bottom;
+	visibility: hidden;
+	width: 770px;
+}
+
+body {
+	background: #FFF;
+	color: #000;
+	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	margin: 10px 0px 0px 0px;
+	padding: 0px;
+}
+
+a:link {
+	color: #900;
+}
+
+a:visited {
+	color: #900;
+}
+
+a:hover {
+	color: Gray;
+}
+
+img {
+	border: 0px;
+}
+
+h1 {
+	color: #6B6B6B;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 16px;
+	margin: 10px 0px 2px 0px;
+}
+
+h5, h6 {
+	border-top: 5px solid #FFF;
+	color: #FFF;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	letter-spacing: 2px;
+	margin: 5px -5px 10px -5px;
+	padding: 3px;
+	text-align: center;
+}
+
+h5 {
+	background: #8F8D5A;
+}
+
+h6 {
+	background: #AF1517;
+}
+
+p {
+	line-height: 130%;
+}
+
+.shadelight, .shadedark {
+	font-size: 10px;
+	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+	padding: 2px 4px 2px 4px;
+}
+
+.shadelight {
+	background: #CCC;
+}
+
+.shadedark {
+	background: #B6B6B6;
+	color: #FFF;
+	font-weight: bold;
+}
+
+.shadedark a, .shadelight a	 {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.upgrade {
+	display: none;
+	font-weight: bold;
+}

Deleted: templates/branches/lifetype-1.2/buggy/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/buggy/footer.template	2008-04-28 15:00:32 UTC (rev 6344)
+++ templates/branches/lifetype-1.2/buggy/footer.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,62 +0,0 @@
-	</div>
-</div>
-
-<div id="col3">
-	<div class="content">
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}  
-  	<h6>{$locale->tr("about_myself")}</h6>
-  	{assign var=picture value=$blogOwner->getPicture()}
-  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
-  	<p>{$AboutMyself}</p>
-{/if}
-
-
-		<h6>{$locale->tr("archives")|lower}</h6>
-		{foreach from=$archives item=post}
-			<a href="{$post->getUrl()}">{$post->getName()}</a><br/>
-		{/foreach}
-		
-		<h5>{$locale->tr("categories")|lower}</h5>
-		{foreach from=$articlecategories item=articleCategory}
-			<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]<br/>
-		{/foreach}
-		
-		<h6>{$locale->tr("my_links")|lower}</h6>
-		{foreach from=$mylinkscategories item=linkcategory}
-			{$linkcategory->getName()}<br />
-      {foreach from=$linkcategory->getLinks() item=link}
-				<a href="{$link->getUrl()}" title="{$link->getDescription()}" rel="external">{$link->getName()}</a><br />
-      {/foreach}
-   {/foreach}
-		
-	</div>
-</div>
-
-<div id="footer">
-	powered by pLog, copyright &copy; the <a href="http://www.lifetype.net/" rel="external">LifeType team</a> |
-	design by <a href="http://www.buggybrain.com/" rel="external">BuggyBrain.com</a>
-</div>
-
-<!--
-    Copyright (C) 2005 Mike Paluchowski of BuggyBrain.com
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//-->
-
-</body>
-</html>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/buggy/footer.template (from rev 6352, templates/branches/lifetype-1.2/unported/buggy/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/buggy/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/buggy/footer.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,62 @@
+	</div>
+</div>
+
+<div id="col3">
+	<div class="content">
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture() && $AboutMyself}  
+  	<h6>{$locale->tr("about_myself")}</h6>
+  	{assign var=picture value=$blogOwner->getPicture()}
+  	<img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" /><br/>
+  	<p>{$AboutMyself}</p>
+{/if}
+
+
+		<h6>{$locale->tr("archives")|lower}</h6>
+		{foreach from=$archives item=post}
+			<a href="{$post->getUrl()}">{$post->getName()}</a><br/>
+		{/foreach}
+		
+		<h5>{$locale->tr("categories")|lower}</h5>
+		{foreach from=$articlecategories item=articleCategory}
+			<a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()}</a> [{$articleCategory->getNumArticles()}]<br/>
+		{/foreach}
+		
+		<h6>{$locale->tr("my_links")|lower}</h6>
+		{foreach from=$mylinkscategories item=linkcategory}
+			{$linkcategory->getName()}<br />
+      {foreach from=$linkcategory->getLinks() item=link}
+				<a href="{$link->getUrl()}" title="{$link->getDescription()}" rel="external">{$link->getName()}</a><br />
+      {/foreach}
+   {/foreach}
+		
+	</div>
+</div>
+
+<div id="footer">
+	powered by <a href="http://www.lifetype.net/">LifeType</a> |
+	design by <a href="http://www.buggybrain.com/" rel="external">BuggyBrain.com</a>
+</div>
+
+<!--
+    Copyright (C) 2005 Mike Paluchowski of BuggyBrain.com
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//-->
+
+</body>
+</html>

Deleted: templates/branches/lifetype-1.2/buggy/post.template
===================================================================
--- templates/branches/lifetype-1.2/unported/buggy/post.template	2008-04-28 15:00:32 UTC (rev 6344)
+++ templates/branches/lifetype-1.2/buggy/post.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,11 +0,0 @@
-<h1>{$post->getTopic()}</h1>
-{assign var="postDate" value=$post->getDateObject()}
-{assign var="postOwner" value=$post->getUserInfo()}
-<span class="shadedark">{$postOwner->getUsername()}</span>
-<span class="shadelight">{$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</span>
-<span class="shadedark">{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->postCategoryLink($post)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach}</span>
-<span class="shadelight"><a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a></span>
-<span class="shadedark"><a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a></span>
-<p>
- {$post->getText()}
-</p>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/buggy/post.template (from rev 6349, templates/branches/lifetype-1.2/unported/buggy/post.template)
===================================================================
--- templates/branches/lifetype-1.2/buggy/post.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/buggy/post.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,11 @@
+<h1>{$post->getTopic()}</h1>
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}
+<span class="shadedark">{$postOwner->getUsername()}</span>
+<span class="shadelight">{$locale->formatDate($postDate,"%d %B, %Y %H:%M")}</span>
+<span class="shadedark">{foreach name=categories from=$post->getCategories() item=postCategory}<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}{/foreach}</span>
+<span class="shadelight"><a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a></span>
+<span class="shadedark"><a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a></span>
+<p>
+ {$post->getText()}
+</p>

Deleted: templates/branches/lifetype-1.2/buggy/postandcomments.template
===================================================================
--- templates/branches/lifetype-1.2/unported/buggy/postandcomments.template	2008-04-28 15:00:32 UTC (rev 6344)
+++ templates/branches/lifetype-1.2/buggy/postandcomments.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -1,14 +0,0 @@
-{include file="$blogtemplate/header.template"}
-	<p style="text-align: center">
-	{* I am not so keen on using if's in templates, but can't think of another way... *}
-	{if $nextpost == true}
-		<a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">&laquo;</a> |
-	{/if}
-	{if $prevpost == true}
-		<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">&raquo;</a>
-	{/if}
-	</p>
-	{assign var="poster" value=$post->getUserInfo()}
-    <!-- {$url->postTrackbackLink($post)} -->
-	{include file="$blogtemplate/post.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/buggy/postandcomments.template (from rev 6349, templates/branches/lifetype-1.2/unported/buggy/postandcomments.template)
===================================================================
--- templates/branches/lifetype-1.2/buggy/postandcomments.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/buggy/postandcomments.template	2008-04-28 17:40:06 UTC (rev 6353)
@@ -0,0 +1,51 @@
+{include file="$blogtemplate/header.template"}
+	<p style="text-align: center">
+	{* I am not so keen on using if's in templates, but can't think of another way... *}
+	{if $nextpost == true}
+		<a href="{$url->postPermalink($nextpost)}" title="Next post: {$nextpost->getTopic()}">&laquo;</a> |
+	{/if}
+	{if $prevpost == true}
+		<a href="{$url->postPermalink($prevpost)}" title="Previous post: {$prevpost->getTopic()}">&raquo;</a>
+	{/if}
+	</p>
+    <!-- {$url->postTrackbackLink($post)} -->
+	{include file="$blogtemplate/post.template"}
+
+{if $blogsettings->getValue("comments_enabled") &&
+$post->getCommentsEnabled()==1 || $comments }<h2
+id="comments">{$locale->tr("comments")|capitalize}</h2>
+{/if}
+ {pager style="links"}
+                {foreach from=$comments item=comment}
+<div class="comment">
+<h3 class="commentheader">{if $comment->getTopic() != null}
+{$comment->getTopic()|strip_tags}{else}Re:
+<em>{$post->getTopic()|strip_tags}</em>{/if}</h3>
+
+<p class="commentposterinfo">
+                {assign var="postDate" value=$comment->getTimestamp()}
+                {if $comment->getUserUrl() != ""}<a
+                href="{$comment->getUserUrl()}">{$comment->getUsername()}</a>
+                {else}
+                        {$comment->getUsername()}
+                {/if} | {$locale->formatDate($postDate, "%d/%m/%Y,
+                %H:%M")}
+</p>
+
+<div class="commenttext">
+{if $comment->IsPosterAuthenticated()}
+ {assign var=poster value=$comment->getUser()}
+ {if $poster->hasPicture()}
+   {assign var=posterimg value=$poster->getPicture()}
+   {assign var=commenter value=$comment->getUser()}
+   <img src="{$posterimg->getPreviewLink()}"
+   alt="{$commenter->getUserName()}" />
+  {/if}
+{/if}
+{$comment->getText()}
+</div>
+</div>
+        {/foreach}
+
+{include file="$blogtemplate/commentform.template"}
+{include file="$blogtemplate/footer.template"}



More information about the pLog-svn mailing list