[pLog-svn] r1339 - in plugins/trunk/flickr: . install/templates locale

mark at devel.plogworld.net mark at devel.plogworld.net
Mon Mar 7 03:16:25 GMT 2005 

Author: mark
Date: 2005-03-07 03:16:24 +0000 (Mon, 07 Mar 2005)
New Revision: 1339

Modified:
   plugins/trunk/flickr/install/templates/flickr.template
   plugins/trunk/flickr/locale/locale_en_UK.php
   plugins/trunk/flickr/locale/locale_zh_TW.php
   plugins/trunk/flickr/pluginflickr.class.php
   plugins/trunk/flickr/readme.txt
Log:
Upgrade to 1.1:
1. Add a new css to butify the template page from http://www.worrad.com
2. Fixed a typo error of template
3. Add flickr slide show URL

Modified: plugins/trunk/flickr/install/templates/flickr.template
===================================================================
--- plugins/trunk/flickr/install/templates/flickr.template	2005-03-07 01:23:12 UTC (rev 1338)
+++ plugins/trunk/flickr/install/templates/flickr.template	2005-03-07 03:16:24 UTC (rev 1339)
@@ -4,6 +4,51 @@
  {literal}
   <STYLE TYPE="text/css">
    <!--
+    .flickr-album { 
+     padding: 0; 
+     width: 100%; 
+     clear: both; 
+    } 
+      
+    .flickr-thumbnail { 
+     float: left; 
+     padding-right: 20px; 
+     background-color: #fff; 
+     border: 1px solid #a9a9a9; 
+     margin: 6px 6px 6px 6px; 
+     padding: 4px; 
+     margin-top: 10px; 
+    } 
+      
+    .flickr-photo { 
+     padding-right: 20px; 
+     background-color: #fff; 
+     border: 1px solid #a9a9a9; 
+     margin: 6px 6px 6px 6px; 
+     padding: 4px; 
+     margin-top:10px; 
+    } 
+      
+    .flickr-title { 
+     color: #260; 
+     border-bottom: 1px dashed #CCC; 
+     padding: 5px 0; 
+    } 
+      
+    .flickr-nav { 
+     clear: both; 
+     text-align: left; 
+    } 
+
+    .flickr-slideshow { 
+     clear: both; 
+     text-align: right; 
+    } 
+
+    .flickr-description { 
+     font-size: 11px; 
+    } 
+
     a.annotation {
 	 position: absolute;
 	 border: 2px solid yellow;
@@ -37,10 +82,11 @@
   {assign var=albumId value=$smarty.request.album}
   {assign var=photoId value=$smarty.request.photo}
   {assign var=secretId value=$smarty.request.secret}
-  {if $albumId != NULL && $photoId != NULL && secretId != NULL}
+  {if $albumId != '' && $photoId != '' && $secretId != ''}
+   <div class="flickr-nav"><a href="{$flickr->pluginTemplatePage()}">{$locale->tr("flickr")}</a>  &raquo; <a href="{$flickr->getAlbumUrl($albumId)}">{$locale->tr("flickr_album_id")} {$albumId}</a>  &raquo; <b>{$locale->tr("flickr_photo_id")} {$photoId}</b></div>
    {assign var=flickrPhotoInfo value=$flickr->getPhotoInfo($photoId,$secretId)}
-   <h3>{$locale->tr("flickr_photo_title")} {$flickrPhotoInfo.title}</h3>
-   <a href="{$flickrPhotoInfo.originalimageUrl}"><img class="annotated" src="{$flickrPhotoInfo.resizeimageUrl}" alt="" usemap="imgmap" /></a><br />
+   <h3 class="flickr-title">{$locale->tr("flickr_photo_title")} {$flickrPhotoInfo.title}</h3>
+   <a href="{$flickrPhotoInfo.originalimageUrl}"><img class="annotated flickr-photo" src="{$flickrPhotoInfo.resizeimageUrl}" alt="" usemap="imgmap" /></a><br />
    {assign var=flickrNotes value=$flickrPhotoInfo.notes}
    <map id="imgmap">
     {foreach item=flickrNote from=$flickrNotes}
@@ -48,23 +94,27 @@
     {/foreach}
    </map> 
    {assign var=flickrTags value=$flickrPhotoInfo.tags}
-   {$locale->tr("flickr_photo_description")} {$flickrPhotoInfo.description}<br />
-   {$locale->tr("flickr_photo_date")} {$flickrPhotoInfo.date}<br />
-   {$locale->tr("flickr_photo_tag")} {foreach item=flickrTag from=$flickrTags}<a href="{$flickrTag.tagUrl}">{$flickrTag.tagName}</a> {/foreach}<br />
-   {$locale->tr("flickr_photo_url")} <a href="{$flickrPhotoInfo.flickrUrl}">{$locale->tr("flickr_photo_see_url")} ({$flickrPhotoInfo.comments} {$locale->tr("comments")})</a><br />
-  {elseif $albumId != NULL && ($photoId == NULL || secretId == NULL)}
+   <div class="flickr-description">{$locale->tr("flickr_photo_description")} {$flickrPhotoInfo.description}</div>
+   <div class="flickr-description">{$locale->tr("flickr_photo_date")} {$flickrPhotoInfo.date}</div>
+   <div class="flickr-description">{$locale->tr("flickr_photo_tag")} {foreach item=flickrTag from=$flickrTags}<a href="{$flickrTag.tagUrl}">{$flickrTag.tagName}</a> {/foreach}</div>
+   <div class="flickr-description">{$locale->tr("flickr_photo_url")} <a href="{$flickrPhotoInfo.flickrUrl}">{$locale->tr("flickr_photo_see_url")} ({$flickrPhotoInfo.comments} {$locale->tr("comments")})</a></div>
+  {elseif $albumId != '' && ($photoId == '' || $secretId == '')}
+   <div class="flickr-nav"><a href="{$flickr->pluginTemplatePage()}">{$locale->tr("flickr")}</a>  &raquo; <b>{$locale->tr("flickr_album_id")} {$albumId}</b></div>
+   <div class="flickr-slideshow"><a href="#" onclick="window.open('{$flickr->getSlideShowUrl($albumId)}','slideShowWin','width=500,height=500,top=150,left=70,scrollbars=no, status=no, resizable=no')">{$locale->tr("flickr_view_as_slideshow")}</a></div>
    {assign var=flickrPhotos value=$flickr->getPhotos($albumId)}
    {foreach item=flickrPhoto from=$flickrPhotos}
-    <a href="{$flickrPhoto.photoUrl}"><img src="{$flickrPhoto.thumbnailUrl}" alt="" /></a>
+    <a href="{$flickrPhoto.photoUrl}"><img class="flickr-thumbnail" src="{$flickrPhoto.thumbnailUrl}" alt="" /></a>
    {/foreach}
   {else}
    {assign var=flickrAlbums value=$flickr->getPhotoList()}
    {foreach name=flickrAlbum item=flickrAlbum from=$flickrAlbums}
-    <a href="{$flickrAlbum.albumUrl}"><img src="{$flickrAlbum.thumbnailUrl}" alt="{$flickrAlbum.title}" /></a><br />
-    {$locale->tr("flickr_album_title")} {$flickrAlbum.title} <br />
-    {$locale->tr("flickr_album_description")} {$flickrAlbum.description} <br />
-    {$locale->tr("flickr_album_photos")} <a href="{$flickrAlbum.albumUrl}">{$flickrAlbum.photos}</a> <br />
-    {$locale->tr("flickr_album_url")} <a href="{$flickrAlbum.flickrUrl}">{$locale->tr("flickr_album_see_url")}</a> <br /><br />
+    <div class="flickr-album">
+     <a href="{$flickrAlbum.albumUrl}"><img class="flickr-thumbnail" src="{$flickrAlbum.thumbnailUrl}" alt="{$flickrAlbum.title}" /></a><br />
+     <h4 class="flickr-title">{$locale->tr("flickr_album_title")} {$flickrAlbum.title}</h4>
+     <div class="flickr-description">{$locale->tr("flickr_album_description")} {$flickrAlbum.description}</div>
+     <div class="flickr-description">{$locale->tr("flickr_album_photos")} <a href="{$flickrAlbum.albumUrl}">{$flickrAlbum.photos}</a></div>
+     <div class="flickr-description">{$locale->tr("flickr_album_url")} <a href="{$flickrAlbum.flickrUrl}">{$locale->tr("flickr_album_see_url")}</a></div>
+    </div>
    {/foreach}
    {assign var=totalAlbums value=$smarty.foreach.flickrAlbum.total}
   {/if}

Modified: plugins/trunk/flickr/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/flickr/locale/locale_en_UK.php	2005-03-07 01:23:12 UTC (rev 1338)
+++ plugins/trunk/flickr/locale/locale_en_UK.php	2005-03-07 03:16:24 UTC (rev 1339)
@@ -37,4 +37,14 @@
 $messages["flickr_album_photos"] = "Photos:";
 $messages["flickr_album_url"] = "Flickr URL:";
 $messages["flickr_album_see_url"] = "See the album in Flickr.";
+$messages["flickr_album_id"] = "Album ID:";
+$messages["flickr_photo_id"] = "Photo ID:";
+
+$messages["flickr_photo_title"] = "Photo Title:";
+$messages["flickr_photo_description"] = "Description:";
+$messages["flickr_photo_date"] = "Date:";
+$messages["flickr_photo_tag"] = "Flickr Tag:";
+$messages["flickr_photo_url"] = "Flickr Url:";
+$messages["flickr_photo_see_url"] = "See this photo on Flickr.";
+$messages["flickr_view_as_slideshow"] = "View as Slide Show";
 ?>
\ No newline at end of file

Modified: plugins/trunk/flickr/locale/locale_zh_TW.php
===================================================================
--- plugins/trunk/flickr/locale/locale_zh_TW.php	2005-03-07 01:23:12 UTC (rev 1338)
+++ plugins/trunk/flickr/locale/locale_zh_TW.php	2005-03-07 03:16:24 UTC (rev 1339)
@@ -37,12 +37,14 @@
 $messages["flickr_album_photos"] = "相片：";
 $messages["flickr_album_url"] = "Flickr 連結：";
 $messages["flickr_album_see_url"] = "察看 Flikr 相簿。";
+$messages["flickr_album_id"] = "相簿 ID：";
+$messages["flickr_photo_id"] = "相片 ID：";
 
 $messages["flickr_photo_title"] = "相片名稱：";
 $messages["flickr_photo_description"] = "描述：";
 $messages["flickr_photo_date"] = "日期：";
 $messages["flickr_photo_tag"] = "Flickr 標籤：";
 $messages["flickr_photo_url"] = "Flickr 連結：";
-$messages["flickr_photo_see_url"] = "察看 Flikr 相片。";
-
+$messages["flickr_photo_see_url"] = "察看 Flickr 相片。";
+$messages["flickr_view_as_slideshow"] = "觀看相簿投影片";
 ?>
\ No newline at end of file

Modified: plugins/trunk/flickr/pluginflickr.class.php
===================================================================
--- plugins/trunk/flickr/pluginflickr.class.php	2005-03-07 01:23:12 UTC (rev 1338)
+++ plugins/trunk/flickr/pluginflickr.class.php	2005-03-07 03:16:24 UTC (rev 1339)
@@ -7,6 +7,7 @@
 
     //Used as the root for building the img URLs
     define ('FLICKR_PHOTO_ROOT', 'http://www.flickr.com/photos/'); 
+    define ('FLICKR_SLIDESHOW_ROOT', 'http://www.flickr.com/slideShow/'); 
     
     //Used as the root for Flickr API service URLs
     define ('FLICKR_GET_PHOTOLIST', 'http://www.flickr.com/services/rest/?method=flickr.photosets.getList&api_key='); 
@@ -200,7 +201,7 @@
             }
             return $photos;
         }
-        
+
         /**
          * Get the photo info from specific photo
          */
@@ -265,6 +266,19 @@
         }
 
         /**
+         * Get the slide show of specific photo album
+         */
+        function getSlideShowUrl($albumId)
+        {
+            return FLICKR_SLIDESHOW_ROOT."index.gne?set_id=".$albumId;
+        }
+        
+        function getAlbumUrl($albumId)
+        {
+            return $this->pluginTemplatePage()."&album=".$albumId;
+        }        
+
+        /**
          * Function that reads file from the cache if it is younger than a certain age 
          * and otherwise grabs a fresh copy of it from remote source 
          */

Modified: plugins/trunk/flickr/readme.txt
===================================================================
--- plugins/trunk/flickr/readme.txt	2005-03-07 01:23:12 UTC (rev 1338)
+++ plugins/trunk/flickr/readme.txt	2005-03-07 03:16:24 UTC (rev 1339)
@@ -1,7 +1,8 @@
 Plugin: Flickr
 Author: Mark Wu
+Idea: http://www.worrad.com/archives/2005/01/08/flickr-gallery-07/
 Release Date: 2005/01/24
-Version: 1.0
+Version: 1.1
 
 This plugin offers you to integrate with Flickr service. 
 It is inspired by Wordpress Flickr Gallery Plugin written by Ray.
@@ -15,3 +16,9 @@
 Use the following URL to call your pLog Flickr Plugin Page
 http://your-plog/index.php?op=FlickrShow&blogId=1
 
+History:
+1.1 Add a new css to butify the template page from http://www.worrad.com
+    Fixed a typo error of template
+    Add flickr slide show URL
+1.0 Flickr pLog plugin release
+

More information about the pLog-svn mailing list