[pLog-svn] r1495 - in templates/trunk/standard_happy: . imgs

jondaley at devel.plogworld.net jondaley at devel.plogworld.net
Tue Mar 15 04:18:27 GMT 2005


Author: jondaley
Date: 2005-03-15 04:18:27 +0000 (Tue, 15 Mar 2005)
New Revision: 1495

Added:
   templates/trunk/standard_happy/imgs/
   templates/trunk/standard_happy/imgs/compressed.gif
   templates/trunk/standard_happy/imgs/file.gif
   templates/trunk/standard_happy/imgs/folder.gif
   templates/trunk/standard_happy/imgs/parentfolder.gif
   templates/trunk/standard_happy/imgs/sound.gif
   templates/trunk/standard_happy/imgs/video.gif
Removed:
   templates/trunk/standard_happy/compressed.gif
   templates/trunk/standard_happy/file.gif
   templates/trunk/standard_happy/folder.gif
   templates/trunk/standard_happy/parentfolder.gif
   templates/trunk/standard_happy/sound.gif
   templates/trunk/standard_happy/video.gif
Modified:
   templates/trunk/standard_happy/album.template
   templates/trunk/standard_happy/albums.template
   templates/trunk/standard_happy/archives.template
   templates/trunk/standard_happy/error.template
   templates/trunk/standard_happy/header.template
   templates/trunk/standard_happy/main.template
   templates/trunk/standard_happy/post.template
   templates/trunk/standard_happy/resource.template
   templates/trunk/standard_happy/searchresults.template
Log:
copied stuff from standard_red

Modified: templates/trunk/standard_happy/album.template
===================================================================
--- templates/trunk/standard_happy/album.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/album.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,4 +1,4 @@
-   		{include file="$blogtemplate/header.template"}
+   		{include file="$blogtemplate/header.template"} 
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -13,7 +13,7 @@
  
 	<div class="album">
 	<a href="{$url->parentAlbumLink($album)}">
-    	<img src="{$url->getTemplateFile("parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
+    	<img src="{$url->getTemplateFile("imgs/parentfolder.gif")}" alt="{$locale->tr("parent")}" /></a>
     	<p>{$locale->tr("parent")}</p>
 	</div>
 
@@ -22,7 +22,7 @@
    		{foreach from=$children item=childalbum}
 	<div class="album">
    	<a href="{$url->albumLink($childalbum)}">
-   	<img src="{$url->getTemplateFile("folder.gif")}" alt="{$childalbum->getName()}" /></a>
+   	<img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$childalbum->getName()}" /></a>
    	<p>{$childalbum->getName()} ({$childalbum->getNumResources()})</p>
    		{assign var="counter" value="`$counter+1`"}
    		{if $counter%3 == 0}
@@ -43,13 +43,13 @@
    		{else}
    	<a href="{$url->resourceLink($resource)}">
    		{if $resource->isSound()}
-    	<img alt="Sound" src="{$url->getTemplateFile("sound.gif")}" /></a>
+    	<img alt="Sound" src="{$url->getTemplateFile("imgs/sound.gif")}" /></a>
    		{elseif $resource->isVideo()}
-    	<img alt="Video" src="{$url->getTemplateFile("video.gif")}" /></a>
+    	<img alt="Video" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
    		{elseif $resource->isZip()}
-    	<img alt="Zip" src="{$url->getTemplateFile("compressed.gif")}" /></a>  
+    	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>  
    		{else}
-   	<img alt="File" src="{$url->getTemplateFile("file.gif")}" /></a>
+   	<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
    		{/if}  
    	<p>{$resource->getFileName()}</p>
    		{/if}
@@ -75,4 +75,4 @@
 </div>
 
 <!-- end of album contents --> 
-		{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: templates/trunk/standard_happy/albums.template
===================================================================
--- templates/trunk/standard_happy/albums.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/albums.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -11,7 +11,7 @@
 		{assign var="counter" value=0}
   		{foreach from=$albums item=album}
 	<div class="album">
-	<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("folder.gif")}" alt="{$album->getName()}" /></a>
+	<a href="{$url->albumLink($album)}"><img src="{$url->getTemplateFile("imgs/folder.gif")}" alt="{$album->getName()}" /></a>
   	<p>{$album->getName()} ({$album->getNumResources()})</p>
   		{assign var="counter" value="`$counter+1`"}
 		{if $counter%3 == 0}
@@ -25,4 +25,4 @@
 
 <!-- end of the albums -->
 		
-		{include file="$blogtemplate/footer.template"}
+		{include file="$blogtemplate/footer.template"} 

Modified: templates/trunk/standard_happy/archives.template
===================================================================
--- templates/trunk/standard_happy/archives.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/archives.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,13 +1,15 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 <h2>{$locale->tr("archives")}</h2>
 
 <div id="Archives">
 	
 	<ul>
 		{foreach from=$archives item=month}
-    	<li><a href="{$month->getUrl()}">{$month->getName()}</a></li>
+    	<li><a href="{$month->getUrl()}">{$month->getName()}</a> [{$month->getNumArticles()}]</li>
     		{/foreach}
+    		
+    		
     	</ul>
 </div>
    	
-   		{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+   		{include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Deleted: templates/trunk/standard_happy/compressed.gif
===================================================================
(Binary files differ)

Modified: templates/trunk/standard_happy/error.template
===================================================================
--- templates/trunk/standard_happy/error.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/error.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,6 +1,5 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
  	<h2>{$locale->tr("error")}</h2>
- 		{$locale->tr($message)}
- <br /><a href="javascript:history.go(-1)">{$locale->tr("back")}</a>
-
-		{include file="$blogtemplate/footer.template"}
+ 		<p>{$locale->tr($message)}</p>
+		<p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
+		{include file="$blogtemplate/footer.template"} 

Deleted: templates/trunk/standard_happy/file.gif
===================================================================
(Binary files differ)

Deleted: templates/trunk/standard_happy/folder.gif
===================================================================
(Binary files differ)

Modified: templates/trunk/standard_happy/header.template
===================================================================
--- templates/trunk/standard_happy/header.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/header.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -17,4 +17,4 @@
 
 <div id="Subcontainer">  
 
-<div id="Content">
\ No newline at end of file
+<div id="Content">

Copied: templates/trunk/standard_happy/imgs/compressed.gif (from rev 1393, templates/trunk/standard_happy/compressed.gif)

Copied: templates/trunk/standard_happy/imgs/file.gif (from rev 1393, templates/trunk/standard_happy/file.gif)

Copied: templates/trunk/standard_happy/imgs/folder.gif (from rev 1393, templates/trunk/standard_happy/folder.gif)

Copied: templates/trunk/standard_happy/imgs/parentfolder.gif (from rev 1393, templates/trunk/standard_happy/parentfolder.gif)

Copied: templates/trunk/standard_happy/imgs/sound.gif (from rev 1393, templates/trunk/standard_happy/sound.gif)

Copied: templates/trunk/standard_happy/imgs/video.gif (from rev 1393, templates/trunk/standard_happy/video.gif)

Modified: templates/trunk/standard_happy/main.template
===================================================================
--- templates/trunk/standard_happy/main.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/main.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,5 +1,5 @@
 {include file="$blogtemplate/header.template"}
 {foreach from=$posts item=post}
 {include file="$blogtemplate/post.template"}
-{/foreach}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+{/foreach}
+{include file="$blogtemplate/footer.template"}

Deleted: templates/trunk/standard_happy/parentfolder.gif
===================================================================
(Binary files differ)

Modified: templates/trunk/standard_happy/post.template
===================================================================
--- templates/trunk/standard_happy/post.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/post.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -10,7 +10,7 @@
 
 <p class="footer">
 {foreach name=categories from=$post->getCategories() item=postCategory}
-<a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
+  <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
 {/foreach}
  :: <a href="{$url->postPermalink($post)}">{$locale->tr("comment on this")} ({$post->getTotalComments()})</a> :: <a title="{$locale->tr("permalink_title")}" href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> :: <a href="{$url->postTrackbackStatsLink($post)}">{$locale->tr("trackbacks")} ({$post->getNumTrackbacks()})</a>
 </p>

Modified: templates/trunk/standard_happy/resource.template
===================================================================
--- templates/trunk/standard_happy/resource.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/resource.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,4 +1,4 @@
-		{include file="$blogtemplate/header.template"}
+		{include file="$blogtemplate/header.template"} 
 
 <h2>{$locale->tr("albums")}</h2>
 
@@ -14,21 +14,21 @@
  	<div id="Resource">    
   	<p>{$resource->getDescription()}</p>
   		{if $resource->isImage()}
-   	<img src="{$url->resourceDownloadLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
+   	<img src="{$url->resourceMediumSizePreviewLink($resource)}" alt="{$resource->getFileName()}, {$metadata->getRoundedSize()}" />
   
   		{else}
      	<a href="{$url->resourceDownloadLink($resource)}">
    		{* show some information about the file *}
    
    		{if $resource->isSound()}
-     	<img alt="Sound" src="{$url->getTemplateFile("sound.gif")}" /></a>
+     	<img alt="Sound" src="{$url->getTemplateFile("imgs/sound.gif")}" /></a>
      	<p>{$resource->getFileName()}</p>
      	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
      	<p>{$locale->tr("length")}: {$metadata->getLengthString()}</p>
      	<p>{$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz</p>
    
    		{elseif $resource->isVideo()}
-     	<img alt="Sound" src="{$url->getTemplateFile("video.gif")}" /></a>
+     	<img alt="Sound" src="{$url->getTemplateFile("imgs/video.gif")}" /></a>
      	<p>{$resource->getFileName()}</p>
      	<p>{$locale->tr("format")}: {$metadata->getFormat()|upper}</p>
     	<p>{$locale->tr("size")}: {$metadata->getHeight()} x {$metadata->getWidth()}</p>
@@ -37,13 +37,13 @@
     	<p>{$locale->tr("audio_codec")}: {$metadata->getAudioCodec()}</p>
    
    		{elseif $resource->isZip()}
-     	<img alt="Zip" src="{$url->getTemplateFile("compressed.gif")}" /></a>
+     	<img alt="Zip" src="{$url->getTemplateFile("imgs/compressed.gif")}" /></a>
      	<p>{$resource->getFileName()}</p> 
     	<p>{$metadata->getTotalFiles()} {$locale->tr("files")}</p>
     	<p>{$locale->tr("uncompressed_size")}: {$metadata->getRoundedUncompressedSize()}</p>
    
    		{else}
-     	<img alt="File" src="{$url->getTemplateFile("file.gif")}" /></a>
+     	<img alt="File" src="{$url->getTemplateFile("imgs/file.gif")}" /></a>
      	<p>{$resource->getFileName()}</p>
          
    		{/if}   
@@ -51,8 +51,8 @@
  	</div>
  
  
-		{assign var=album value=$resource->getAlbum()} 
-	<p><a href="{$url->albumLink($album)}">{$locale->tr("back")}</a></p>
+		{assign var=album value=$resource->getAlbum()} 
+	<p><a href="{$url->albumLink($album)}">{$locale->tr("parent")}</a></p>
 
 </div>
 

Modified: templates/trunk/standard_happy/searchresults.template
===================================================================
--- templates/trunk/standard_happy/searchresults.template	2005-03-15 04:16:20 UTC (rev 1494)
+++ templates/trunk/standard_happy/searchresults.template	2005-03-15 04:18:27 UTC (rev 1495)
@@ -1,6 +1,5 @@
 {include file="$blogtemplate/header.template"} 
    <h2>{$locale->tr("search_results")}: {foreach from=$searchterms item=term}{$term} {/foreach}</h2>
-   <div id="SearchResults">
     {foreach from=$searchresults item=result}
     
     
@@ -13,5 +12,5 @@
           <a href="{$url->categoryLink($postCategory)}">{$postCategory->getName()}</a>{if !$smarty.foreach.categories.last}, {/if}
       {/foreach}</p>
     {/foreach}
-   </div> 
+
 {include file="$blogtemplate/footer.template"} 

Deleted: templates/trunk/standard_happy/sound.gif
===================================================================
(Binary files differ)

Deleted: templates/trunk/standard_happy/video.gif
===================================================================
(Binary files differ)




More information about the pLog-svn mailing list