[pLog-svn] r5177 - in templates/branches/lifetype-1.2: . SimpleRules SimpleRules/css kubrick unported

reto at devel.lifetype.net reto at devel.lifetype.net
Sat Mar 24 18:52:27 EDT 2007


Author: reto
Date: 2007-03-24 18:52:26 -0400 (Sat, 24 Mar 2007)
New Revision: 5177

Added:
   templates/branches/lifetype-1.2/SimpleRules/
   templates/branches/lifetype-1.2/SimpleRules/css/poolie.css
   templates/branches/lifetype-1.2/SimpleRules/footer.template
   templates/branches/lifetype-1.2/kubrick/
   templates/branches/lifetype-1.2/kubrick/album.template
   templates/branches/lifetype-1.2/kubrick/searchresults.template
Removed:
   templates/branches/lifetype-1.2/SimpleRules/css/poolie.css
   templates/branches/lifetype-1.2/SimpleRules/footer.template
   templates/branches/lifetype-1.2/kubrick/album.template
   templates/branches/lifetype-1.2/kubrick/searchresults.template
   templates/branches/lifetype-1.2/unported/kubrick/
Log:
hmm. svn didn't move properly because I locked a folder...sorry.


Copied: templates/branches/lifetype-1.2/SimpleRules (from rev 5174, templates/branches/lifetype-1.2/unported/SimpleRules)

Deleted: templates/branches/lifetype-1.2/SimpleRules/css/poolie.css
===================================================================
--- templates/branches/lifetype-1.2/unported/SimpleRules/css/poolie.css	2007-03-24 21:48:17 UTC (rev 5174)
+++ templates/branches/lifetype-1.2/SimpleRules/css/poolie.css	2007-03-24 22:52:26 UTC (rev 5177)
@@ -1,292 +0,0 @@
-/* SimpleRules CSS 1.0 - Alexander Kaiser */
-/* poolie.kulando.de - alex at poolie.de */
-/* released for pLog (plogworld.net) unter the GPL */
-
- at import url("typography.css");
-
-body {
-background-color: #444444;
-margin-left: 0px;
-margin-top: 0px;
-margin-right: 0px;
-margin-bottom: 0px;
-}
-
-p {
-margin: 0px;
-padding: 0px;
-}
-
-img {
-border: 0px;
-}
-
-li h2 {
-text-transform:capitalize;
-}
-
-#head {
-width: 100%;
-height: 50px;
-background-image: url(../i/head/bg.gif);
-background-repeat: repeat-x;
-}
-
-#geek {
-margin-left: auto;
-margin-right: auto;
-width: 740px;
-}
-
-#logo {
-height: 60px;
-padding-top: 10px;
-}
-
-.logoImage {
-padding-top: 20px;
-}
-
-#blog {
-width: 500px;
-background-image: url(../i/main/blogbg.gif);
-background-repeat: repeat-x;
-float: left;
-border-top: 3px solid #ffffff;
-}
-
-#menu {
-width: 200px;
-background-color: #9B1B34;
-float: right;
-border-top: 3px solid #ffffff;
-border-bottom: 5px solid #ffffff;
-}
-
-#main {
-width: 100%;
-background-image: url(../i/main/bg.gif);
-background-repeat: repeat-x;
-background-color: #E7E0D0;
-border-bottom:3px solid #ffffff;
-}
-
-#mainContent {
-margin-left: auto;
-margin-right: auto;
-width: 740px;
-}
-
-#footer {
-margin-left: auto;
-margin-right: auto;
-width: 715px;
-clear:both;
-}
-
-.icons {
-padding-left:15px;
-}
-
-#menuContent ul, #menuContent ul ol {
-margin: 0px;
-padding: 0px;
-list-style: none;
-margin-bottom: 15px;
-}
-
-fieldset {
-margin: 0px;
-padding: 0px;
-border-width : 0px;
-border-style : solid;
-/*  IE 5 Hack \*/
-display: inline;
-/* end hack */
-}
-
-.postmetadata {
-margin: 0;
-padding-bottom: 25px;
-}
-
-#footer p {
-padding-top:25px;
-padding-bottom: 25px;
-}
-
-.navigation {
-display: block;
-text-align: center;
-margin-top: 10px;
-padding-bottom: 25px;
-}
-
-.alignright {
-float: right;
-}
-
-.alignleft {
-float: left;
-}
-
-/* Begin Comments*/
-.alt {
-margin: 0;
-padding: 10px;
-}
-
-.alt {
-background-color: #f8f8f8;
-border-top: 1px solid #ddd;
-border-bottom: 1px solid #ddd;
-}
-
-.commentBox {
-margin: 0;
-padding: 10px;
-background-color: #f8f8f8;
-border-top: 1px solid #ddd;
-border-bottom: 1px solid #ddd;
-}
-
-.commentlist {
-padding: 0;
-text-align: justify;
-}
-
-.commentlist li {
-margin: 15px 0 3px;
-padding: 5px 10px 3px;
-list-style: none;
-}
-
-.commentlist p {
-margin: 10px 5px 10px 0;
-}
-
-#commentform p {
-margin: 5px 0;
-}
-
-.nocomments {
-text-align: center;
-margin: 0;
-padding: 0;
-}
-
-.commentmetadata {
-margin: 0;
-display: block;
-}
-/* End Comments */
-
-.flickr-photo-post { border: solid 1px #000000; }
-.flickr-frame-post {	float: right; text-align: center; margin-left: 15px; margin-bottom: 15px; }
-.flickr-caption-post { font-size: 9px; margin-top: 0px; }
-.pager {
-	clear:all;
-	text-align: center;
-	margin-bottom: 20px;
-	margin-top: 20px;
-	font-size: 12px;
-	padding-top: 10px;
-	padding-bottom: 10px;
-}
-.pager a, .pager a:link, .pager a:href, .pager a:hover {
- text-decoration: none;
- border: 0px;
-}
-
-.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
-	padding: 2px 6px;
-}
-
-.pager .pagerLinkPrevPage{
-	margin-right:20px;
-}
-.pager .pagerLinkNextPage {
-	margin-left:20px;
-}
-
-.pager .pagerCurrent {
-	padding: 2px 6px; 
-	border-color: #999; 
-	font-weight: bold; 
-	font-size: 13px; 
-	vertical-align: top; 
-	background: #fff; 
-	color: #FF0084;	
-}
-
-/**
- * styles for the comment form
- */
-#CommentForm {
-	border:2px solid #9B1B34; 
-	padding-top:10px; 
-	margin-top:10px; 
-	padding-left:10px; 
-	padding-bottom:10px;
-	width:100%;
-}
-
-#CommentForm legend {
-	color:#525150;
-	padding:2px 4px 2px 4px;
-	background-color: #ffffff;
-	font-weight : bold;
-}
-
-#CommentForm label {
-	width:150px;
-	display:block;
-	clear:both; 
-	float:left;
-	margin-top:8px;
-	margin-bottom:0px;
-}
-	
-#CommentForm input {
-	width: 170px;
-	padding: 2px;
-	margin: 5px 5px 1px 0;
-}
-	
-#Submit {
-	margin: 0;
-	float: right;
-}
-	
-#CommentForm textarea {
-	width: 270px;
-	padding: 2px;
-	margin: 5px 5px 1px 0;
-}
-
-select {
-width: 130px;
-}
-
-/** styles for the album display **/
-
-div.album {
-	text-align: center;
-        float: left;
-        width:150px;
-        margin-bottom:20px;
-        margin-right:5px;
-  	}
-
-.album p {
-   	text-align: center;
-   	padding: 0;
-   	margin:0;
-   	width:150px;     
-	overflow: hidden;
-   	}
-   
-a img {border:none;}
-#album a:link {color: #004ca1;}
-#album a:visited {color: #b50394;}
-#album a:hover, #album a:active, #album a:focus {color: #004ca1;background:none;}

Copied: templates/branches/lifetype-1.2/SimpleRules/css/poolie.css (from rev 5176, templates/branches/lifetype-1.2/unported/SimpleRules/css/poolie.css)
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/css/poolie.css	                        (rev 0)
+++ templates/branches/lifetype-1.2/SimpleRules/css/poolie.css	2007-03-24 22:52:26 UTC (rev 5177)
@@ -0,0 +1,281 @@
+/* SimpleRules CSS 1.0 - Alexander Kaiser */
+/* poolie.kulando.de - alex at poolie.de */
+/* released for pLog (plogworld.net) unter the GPL */
+
+ at import url("typography.css");
+
+body {
+background-color: #444444;
+margin-left: 0px;
+margin-top: 0px;
+margin-right: 0px;
+margin-bottom: 0px;
+}
+
+p {
+margin: 0px;
+padding: 0px;
+}
+
+img {
+border: 0px;
+}
+
+li h2 {
+text-transform:capitalize;
+}
+
+#head {
+width: 100%;
+height: 50px;
+background-image: url(../i/head/bg.gif);
+background-repeat: repeat-x;
+}
+
+#geek {
+margin-left: auto;
+margin-right: auto;
+width: 740px;
+}
+
+#logo {
+height: 60px;
+padding-top: 10px;
+}
+
+.logoImage {
+padding-top: 20px;
+}
+
+#blog {
+width: 500px;
+background-image: url(../i/main/blogbg.gif);
+background-repeat: repeat-x;
+float: left;
+border-top: 3px solid #ffffff;
+}
+
+#menu {
+width: 200px;
+background-color: #9B1B34;
+float: right;
+border-top: 3px solid #ffffff;
+border-bottom: 5px solid #ffffff;
+}
+
+#main {
+width: 100%;
+background-image: url(../i/main/bg.gif);
+background-repeat: repeat-x;
+background-color: #E7E0D0;
+border-bottom:3px solid #ffffff;
+}
+
+#mainContent {
+margin-left: auto;
+margin-right: auto;
+width: 740px;
+}
+
+#footer {
+margin-left: auto;
+margin-right: auto;
+width: 715px;
+clear:both;
+}
+
+.icons {
+padding-left:15px;
+}
+
+#menuContent ul, #menuContent ul ol {
+margin: 0px;
+padding: 0px;
+list-style: none;
+margin-bottom: 15px;
+}
+
+fieldset {
+margin: 0px;
+padding: 0px;
+border-width : 0px;
+border-style : solid;
+/*  IE 5 Hack \*/
+display: inline;
+/* end hack */
+}
+
+.postmetadata {
+margin: 0;
+padding-bottom: 25px;
+}
+
+#footer p {
+padding-top:25px;
+padding-bottom: 25px;
+}
+
+.navigation {
+display: block;
+text-align: center;
+margin-top: 10px;
+padding-bottom: 25px;
+}
+
+.alignright {
+float: right;
+}
+
+.alignleft {
+float: left;
+}
+
+/* Begin Comments*/
+.alt {
+margin: 0;
+padding: 10px;
+}
+
+.alt {
+background-color: #f8f8f8;
+border-top: 1px solid #ddd;
+border-bottom: 1px solid #ddd;
+}
+
+.commentBox {
+margin: 0;
+padding: 10px;
+background-color: #f8f8f8;
+border-top: 1px solid #ddd;
+border-bottom: 1px solid #ddd;
+}
+
+.commentlist {
+padding: 0;
+text-align: justify;
+}
+
+.commentlist li {
+margin: 15px 0 3px;
+padding: 5px 10px 3px;
+list-style: none;
+}
+
+.commentlist p {
+margin: 10px 5px 10px 0;
+}
+
+#commentform p {
+margin: 5px 0;
+}
+
+.nocomments {
+text-align: center;
+margin: 0;
+padding: 0;
+}
+
+.commentmetadata {
+margin: 0;
+display: block;
+}
+/* End Comments */
+
+.flickr-photo-post { border: solid 1px #000000; }
+.flickr-frame-post {	float: right; text-align: center; margin-left: 15px; margin-bottom: 15px; }
+.flickr-caption-post { font-size: 9px; margin-top: 0px; }
+.pager {
+	clear:all;
+	text-align: center;
+	margin-bottom: 20px;
+	margin-top: 20px;
+	font-size: 12px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.pager a, .pager a:link, .pager a:href, .pager a:hover {
+ text-decoration: none;
+ border: 0px;
+}
+
+.pager .pagerLinkPrevPage, .pagerLink, .pagerLinkNextPage{
+	padding: 2px 6px;
+}
+
+.pager .pagerLinkPrevPage{
+	margin-right:20px;
+}
+.pager .pagerLinkNextPage {
+	margin-left:20px;
+}
+
+.pager .pagerCurrent {
+	padding: 2px 6px; 
+	border-color: #999; 
+	font-weight: bold; 
+	font-size: 13px; 
+	vertical-align: top; 
+	background: #fff; 
+	color: #FF0084;	
+}
+
+/**
+ * styles for the comment form
+ */
+#CommentForm {
+	border:2px solid #9B1B34; 
+	padding-top:10px; 
+	margin-top:10px; 
+	padding-left:10px; 
+	padding-bottom:10px;
+	width:100%;
+}
+
+#CommentForm legend {
+	color:#525150;
+	padding:2px 4px 2px 4px;
+	font-weight : bold;
+}
+
+#CommentForm label {
+	display:block;
+	margin-top:8px;
+	margin-bottom:0px;
+}
+	
+#CommentForm input, textarea {
+	width: 350px;
+	padding: 2px;
+	margin: 5px 5px 1px 0px;
+}
+	
+#Submit input {
+    width: 150px;
+}
+	
+select {
+width: 130px;
+}
+
+/** styles for the album display **/
+
+div.album {
+	text-align: center;
+        float: left;
+        width:150px;
+        margin-bottom:20px;
+        margin-right:5px;
+  	}
+
+.album p {
+   	text-align: center;
+   	padding: 0;
+   	margin:0;
+   	width:150px;     
+	overflow: hidden;
+   	}
+   
+a img {border:none;}
+#album a:link {color: #004ca1;}
+#album a:visited {color: #b50394;}
+#album a:hover, #album a:active, #album a:focus {color: #004ca1;background:none;}

Deleted: templates/branches/lifetype-1.2/SimpleRules/footer.template
===================================================================
--- templates/branches/lifetype-1.2/unported/SimpleRules/footer.template	2007-03-24 21:48:17 UTC (rev 5174)
+++ templates/branches/lifetype-1.2/SimpleRules/footer.template	2007-03-24 22:52:26 UTC (rev 5177)
@@ -1,95 +0,0 @@
-</div>
-</div>
-<div id="menu">
-<div id="menuContent" style="padding:10px;">
-<ul>
-<li>
-<form method="post" action="{$url->getIndexUrl()}">
-<div>
-<input type="text" name="searchTerms" size="15" value="" />
-<input type="hidden" name="op" value="Search" />
-<input type="hidden" name="blogId" value="{$blog->getId()}" />
-<input type="submit" name="Search" value="{$locale->tr("search")}" />
-</div>
-</form>
-</li>
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{if $blogOwner->hasPicture()}
-
-<li><h2>{$locale->tr("about_myself")}</h2>
-<ul>
-<li><div align="center">
-{assign var=picture value=$blogOwner->getPicture()}
-<a href="{$url->templatePage("about")}">
-  <img style="border:0px" src="{$picture->getPreviewLink()}" alt="{$picture->getDescription()}" />
-</a>
-</div>
-</li>
-</ul>
-</li>
-{/if}
-
-<li><h2>{$locale->tr("recently")}</h2>
-<ul>
-{foreach from=$recentposts item=post}
-<li><a title="{$post->getTopic()|strip_tags}"
-href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
-{/foreach}
-</ul>
-</li>
-<li><h2>{$locale->tr("categories")}</h2>
-<ul>
-{foreach from=$articlecategories item=articleCategory}
-<li><a href="{$url->categoryLink($articleCategory)}">
-{$articleCategory->getName()}</a>
-[{$articleCategory->getNumArticles()}]</li>
-{/foreach}
-</ul>
-</li>
-<li><h2>{$locale->tr("archives")}</h2>
-<ul>
-{foreach from=$archives item=archivelink}
-<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a>
-[{$archivelink->getNumArticles()}]</li>
-{/foreach}
-</ul>
-</li>
-<li><h2>{$locale->tr("links")}</h2>
-<ul>
-{foreach name=linkcategories from=$mylinkscategories item=linkcategory}
-{if $linkcategory->getNumLinks()>0}
-<li>
-<b>{$linkcategory->getName()}</b>
-
-{foreach name=linkcategorylinks from=$linkcategory->getLinks() item=link}
-{if $smarty.foreach.linkcategorylinks.first}<ul>{/if}
-<li><a href="{$link->getUrl()}"
-title="{$link->getDescription()}">{$link->getName()}</a></li>
-{if $smarty.foreach.linkcategorylinks.last}</ul>{/if}
-{/foreach}
-
-</li>
-{/if}
-{/foreach}
-</ul>
-</li>
-</ul>
-</div>
-</div>
-
-</div>
-<br style="clear:both;" />
-</div>
-
-<div id="footer">
-<p style="float:left;">Design by <a href="http://poolie.kulando.de/">Alexander Kaiser</a>, Powered by <a href="http://www.lifetype.net">Lifetype</a></p>
-<p style="float:right; text-align:right;"><span>
-
-<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a> | <a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
-
-<br />
-<a title="RSS 0.90 feed." href="{$url->rssLink("rss090")}" style="color:#898989;">RSS 0.90</a> | <a title="RSS 1.0 feed." href="{$url->rssLink("rss10")}" style="color:#898989;">RSS 1.0</a> | <a title="RSS 2.0 feed." href="{$url->rssLink("rss20")}" style="color:#898989;">RSS 2.0</a> | <a title="Atom 0.3 feed." href="{$url->rssLink("atom")}" style="color:#898989;">Atom 0.3</a></span></p>
-</div>
-</body>
-</html>
\ No newline at end of file

Copied: templates/branches/lifetype-1.2/SimpleRules/footer.template (from rev 5176, templates/branches/lifetype-1.2/unported/SimpleRules/footer.template)
===================================================================
--- templates/branches/lifetype-1.2/SimpleRules/footer.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/SimpleRules/footer.template	2007-03-24 22:52:26 UTC (rev 5177)
@@ -0,0 +1,97 @@
+</div>
+</div>
+<div id="menu">
+<div id="menuContent" style="padding:10px;">
+<ul>
+<li>
+<form method="post" action="{$url->getIndexUrl()}">
+<div>
+<input type="text" name="searchTerms" size="15" value="" />
+<input type="hidden" name="op" value="Search" />
+<input type="hidden" name="blogId" value="{$blog->getId()}" />
+<input type="submit" name="Search" value="{$locale->tr("search")}" />
+</div>
+</form>
+</li>
+
+{assign var=blogOwner value=$blog->getOwnerInfo()}
+{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
+{if $blogOwner->hasPicture()}
+
+<li><h2>{$locale->tr("about_myself")}</h2>
+<ul>
+<li><div align="center">
+{assign var=picture value=$blogOwner->getPicture()}
+<a href="{$url->templatePage("about")}">
+  <img style="border:0px" src="{$picture->getPreviewLink()}" alt="{$picture->getDescription()}" />
+</a>
+<p>{$AboutMyself}</p>
+</div>
+</li>
+</ul>
+</li>
+{/if}
+
+<li><h2>{$locale->tr("recently")}</h2>
+<ul>
+{foreach from=$recentposts item=post}
+<li><a title="{$post->getTopic()|strip_tags}"
+href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
+{/foreach}
+</ul>
+</li>
+<li><h2>{$locale->tr("categories")}</h2>
+<ul>
+{foreach from=$articlecategories item=articleCategory}
+<li><a href="{$url->categoryLink($articleCategory)}">
+{$articleCategory->getName()}</a>
+[{$articleCategory->getNumArticles()}]</li>
+{/foreach}
+</ul>
+</li>
+<li><h2>{$locale->tr("archives")}</h2>
+<ul>
+{foreach from=$archives item=archivelink}
+<li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a>
+[{$archivelink->getNumArticles()}]</li>
+{/foreach}
+</ul>
+</li>
+<li><h2>{$locale->tr("links")}</h2>
+<ul>
+{foreach name=linkcategories from=$mylinkscategories item=linkcategory}
+{if $linkcategory->getNumLinks()>0}
+<li>
+<b>{$linkcategory->getName()}</b>
+
+{foreach name=linkcategorylinks from=$linkcategory->getLinks() item=link}
+{if $smarty.foreach.linkcategorylinks.first}<ul>{/if}
+<li><a href="{$link->getUrl()}"
+title="{$link->getDescription()}">{$link->getName()}</a></li>
+{if $smarty.foreach.linkcategorylinks.last}</ul>{/if}
+{/foreach}
+
+</li>
+{/if}
+{/foreach}
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+</div>
+<br style="clear:both;" />
+</div>
+
+<div id="footer">
+<p style="float:left;">Design by <a href="http://poolie.kulando.de/">Alexander Kaiser</a>, Powered by <a href="http://www.lifetype.net">Lifetype</a></p>
+<p style="float:right; text-align:right;"><span>
+
+<a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a> | <a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a>
+
+<br />
+<a title="RSS 0.90 feed." href="{$url->rssLink("rss090")}" style="color:#898989;">RSS 0.90</a> | <a title="RSS 1.0 feed." href="{$url->rssLink("rss10")}" style="color:#898989;">RSS 1.0</a> | <a title="RSS 2.0 feed." href="{$url->rssLink("rss20")}" style="color:#898989;">RSS 2.0</a> | <a title="Atom 0.3 feed." href="{$url->rssLink("atom")}" style="color:#898989;">Atom 0.3</a></span></p>
+</div>
+</body>
+</html>

Copied: templates/branches/lifetype-1.2/kubrick (from rev 5174, templates/branches/lifetype-1.2/unported/kubrick)

Deleted: templates/branches/lifetype-1.2/kubrick/album.template
===================================================================
--- templates/branches/lifetype-1.2/unported/kubrick/album.template	2007-03-24 21:48:17 UTC (rev 5174)
+++ templates/branches/lifetype-1.2/kubrick/album.template	2007-03-24 22:52:26 UTC (rev 5177)
@@ -1,95 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-{assign var="postDate" value=$album->getTimestamp()}
-<div class="blog">
- <h2><a href="{$url->parentAlbumLink($album)}">&lt;&lt;</a> {$album->getName()}</h2>
- <div class="post">
-  <div class="entry">
-     <p><a href="{$url->albumLink($album)}">
-     {$locale->tr("resources")} ({$album->getNumResources()})
-    </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}<br/>
-    {$album->getDescription()}</p>
-  </div>
- </div>
- 
- 
-{** 
-    smarty template gets a bit complicated here since we want to show the contents of the album in a nicely
-    arranged table, and that needs some very basic maths... we also need to check after every iteration
-    wether we have to close the current row or start a new one, and so on...
- **}
- 
-   
- <!-- album contents go here -->
-   {assign var="counter" value=1}
-  {assign var=children value=$album->getChildren()}
-    {foreach from=$children item=childalbum}
-<div class="post">
- <h2 class="date">{$childalbum->getName()}</h2>
-  <div class="entry">
-   <a href="{$url->albumLink($childalbum)}">
-     {$locale->tr("resources")} ({$childalbum->getNumResources()})
-    </a>
-  </div>
-{$childalbum->getDescription()|strip_tags|truncate:255:"..."|escape}
-</div> 
-{/foreach}
-
-
- <!--- show the resources here -->
-
- <table style="border:0px;width:100%;" summary="Album Resources">
- <tr>
- {foreach from=$resources item=resource}
-  <td style="width:25%;" align="center" >
-  {if $resource->hasPreview()}
-   {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
-   <a href="{$url->resourceLink($resource)}">
-    <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
-    <br/>{$resource->getFileName()}
-   </a>
-  {else}
-   <a href="{$url->resourceLink($resource)}">
-   {if $resource->isSound()}
-    <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
-   {elseif $resource->isVideo()}
-    <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
-   {elseif $resource->isZip()}
-    <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
-   {else}
-    <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
-   {/if}
-   <br/>{$resource->getFileName()}
-   </a>
-  {/if}
-  <br/>
-  {assign var=metadata value=$resource->getMetadataReader()}
-  {$metadata->getRoundedSize()}<br/>
-  {if $resource->isImage()}
-   {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
-  {elseif $resource->isSound()}
-   {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
-  {elseif $resource->isVideo()}
-   {$metadata->getFormat()|upper}
-   {$metadata->getWidth()} x {$metadata->getHeight()}, 
-   {$metadata->getLengthString()}<br/>
-  {elseif $resource->isZip()}
-   {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
-  {/if}
-  {assign var="counter" value="`$counter+1`"}
-  </td>
-  {if $counter%3 == 0}
-   </tr>
-   <tr>
-  {/if}
- {/foreach}
- <td></td></tr>
-</table>
-{pager style="links"}
- <!-- end of album contents -->
- 
- </div>
-</div>
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
-

Copied: templates/branches/lifetype-1.2/kubrick/album.template (from rev 5176, templates/branches/lifetype-1.2/unported/kubrick/album.template)
===================================================================
--- templates/branches/lifetype-1.2/kubrick/album.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/kubrick/album.template	2007-03-24 22:52:26 UTC (rev 5177)
@@ -0,0 +1,95 @@
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+{assign var="postDate" value=$album->getTimestamp()}
+<div class="blog">
+ <h2><a href="{$url->parentAlbumLink($album)}">&lt;&lt;</a> {$album->getName()}</h2>
+ <div class="post">
+  <div class="entry">
+     <p><a href="{$url->albumLink($album)}">
+     {$locale->tr("resources")} ({$album->getNumResources()})
+    </a> | {$locale->tr("created")} {$locale->formatDate($postDate,"%d %b, %Y")}<br/>
+    {$album->getDescription()}</p>
+  </div>
+ </div>
+ 
+ 
+{** 
+    smarty template gets a bit complicated here since we want to show the contents of the album in a nicely
+    arranged table, and that needs some very basic maths... we also need to check after every iteration
+    wether we have to close the current row or start a new one, and so on...
+ **}
+ 
+   
+ <!-- album contents go here -->
+   {assign var="counter" value=1}
+  {assign var=children value=$album->getChildren()}
+    {foreach from=$children item=childalbum}
+<div class="post">
+ <h2 class="date">{$childalbum->getName()}</h2>
+  <div class="entry">
+   <a href="{$url->albumLink($childalbum)}">
+     {$locale->tr("resources")} ({$childalbum->getNumResources()})
+    </a>
+  </div>
+{$childalbum->getDescription()|strip_tags|truncate:255:"..."|escape}
+</div> 
+{/foreach}
+
+
+ <!--- show the resources here -->
+
+ <table style="border:0px;width:100%;" summary="Album Resources">
+ <tr>
+ {foreach from=$resources item=resource}
+  <td style="width:25%;" align="center" >
+  {if $resource->hasPreview()}
+   {*<a target="_blank" href="resserver.php?blogId={$blog->getId()}&amp;resource={$resource->getFileName()}">*}
+   <a href="{$url->resourceLink($resource)}">
+    <img alt="{$resource->getDescription()}" style="border:0px;" src="{$url->resourcePreviewLink($resource)}" />
+    <br/>{$resource->getFileName()}
+   </a>
+  {else}
+   <a href="{$url->resourceLink($resource)}">
+   {if $resource->isSound()}
+    <img alt="Sound" src="{$url->getUrl("/imgs/sound.gif")}" height="64" width="64" style="border:0px;" />
+   {elseif $resource->isVideo()}
+    <img alt="Video" src="{$url->getUrl("/imgs/video.gif")}" height="64" width="64" style="border:0px;" />
+   {elseif $resource->isZip()}
+    <img alt="Zip" src="{$url->getUrl("/imgs/compressed.gif")}" height="64" width="64" style="border:0px;" />   
+   {else}
+    <img alt="File" src="{$url->getUrl("/imgs/file.gif")}" height="64" width="64" style="border:0px;" />    
+   {/if}
+   <br/>{$resource->getFileName()}
+   </a>
+  {/if}
+  <br/>
+  {assign var=metadata value=$resource->getMetadataReader()}
+  {$metadata->getRoundedSize()}<br/>
+  {if $resource->isImage()}
+   {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
+  {elseif $resource->isSound()}
+   {$metadata->getFormat()|upper} {$metadata->getSampleRate()} bps<br/>
+  {elseif $resource->isVideo()}
+   {$metadata->getFormat()|upper}
+   {$metadata->getWidth()} x {$metadata->getHeight()}, 
+   {$metadata->getLengthString()}<br/>
+  {elseif $resource->isZip()}
+   {$metadata->getTotalFiles()} {$locale->tr("files")}<br/>
+  {/if}
+  {assign var="counter" value="`$counter+1`"}
+  </td>
+  {if $counter%3 == 0}
+   </tr>
+   <tr>
+  {/if}
+ {/foreach}
+ <td></td></tr>
+</table>
+<div>{pager style="links"}</div>
+ <!-- end of album contents -->
+ 
+ </div>
+</div>
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}
+

Deleted: templates/branches/lifetype-1.2/kubrick/searchresults.template
===================================================================
--- templates/branches/lifetype-1.2/unported/kubrick/searchresults.template	2007-03-24 21:48:17 UTC (rev 5174)
+++ templates/branches/lifetype-1.2/kubrick/searchresults.template	2007-03-24 22:52:26 UTC (rev 5177)
@@ -1,33 +0,0 @@
-{include file="$blogtemplate/header.template"}
-<div id="content" class="narrowcolumn">
-  <h2>{$locale->tr("search_results")}: 
-    {foreach from=$searchterms item=term}{$term} {/foreach}
-  </h2>
-  {foreach from=$searchresults item=result}
-    <div class="post">
-      {assign var=article value=$result->getArticle()}
-      {assign var="postDate" value=$article->getDateObject()}
-      {assign var="postOwner" value=$article->getUserInfo()}
-      <div class="entry">
-        <h2>
-          <a href="{$url->postPermalink($article)}">
-				{$article->getTopic()}</a>
-	</h2><br />
-        <small>{$locale->tr("posted_by")}
-          {$postOwner->getUsername()} {$locale->formatDate($postDate,"%H:%M")}
-
-		  | {foreach name=categories 
-				 from=$article->getCategories() item=postcategory}
-			   <a href="{$url->categoryLink($postcategory)}">
-			     {$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
-          {/foreach}
-                  | {$locale->formatDate($postDate,"%j %b, %Y")}
-        </small>
-      </div>
-      {$article->getText()|strip_tags|truncate:300:"...":false}
-    </div>
-  {/foreach}
-</div>
-
-{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}

Copied: templates/branches/lifetype-1.2/kubrick/searchresults.template (from rev 5176, templates/branches/lifetype-1.2/unported/kubrick/searchresults.template)
===================================================================
--- templates/branches/lifetype-1.2/kubrick/searchresults.template	                        (rev 0)
+++ templates/branches/lifetype-1.2/kubrick/searchresults.template	2007-03-24 22:52:26 UTC (rev 5177)
@@ -0,0 +1,34 @@
+{include file="$blogtemplate/header.template"}
+<div id="content" class="narrowcolumn">
+  <h2>{$locale->tr("search_results")}: 
+    {foreach from=$searchterms item=term}{$term} {/foreach}
+  </h2>
+  {foreach from=$searchresults item=result}
+    <div class="post">
+      {assign var=article value=$result->getArticle()}
+      {assign var="postDate" value=$article->getDateObject()}
+      {assign var="postOwner" value=$article->getUserInfo()}
+      <div class="entry">
+        <h2>
+          <a href="{$url->postPermalink($article)}">
+				{$article->getTopic()}</a>
+	</h2><br />
+        <small>{$locale->tr("posted_by")}
+          {$postOwner->getUsername()} {$locale->formatDate($postDate,"%H:%M")}
+
+		  | {foreach name=categories 
+				 from=$article->getCategories() item=postcategory}
+			   <a href="{$url->categoryLink($postcategory)}">
+			     {$postcategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+          {/foreach}
+                  | {$locale->formatDate($postDate,"%j %b, %Y")}
+        </small>
+      </div>
+      {$article->getText()|strip_tags|truncate:300:"...":false}
+    </div>
+  {/foreach}
+  <div>{pager style="links"}</div>
+</div>
+
+{include file="$blogtemplate/panel.template"}
+{include file="$blogtemplate/footer.template"}



More information about the pLog-svn mailing list