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

mark at devel.plogworld.net mark at devel.plogworld.net
Tue Feb 15 18:47:11 GMT 2005 

Author: mark
Date: 2005-02-15 18:47:11 +0000 (Tue, 15 Feb 2005)
New Revision: 1098

Removed:
   plugins/trunk/flickr/install/css/
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/readme.txt
Log:
Remove CSS file. Becasuse I already integrate it to flickr.template.

Modified: plugins/trunk/flickr/install/templates/flickr.template
===================================================================
--- plugins/trunk/flickr/install/templates/flickr.template	2005-02-15 18:46:17 UTC (rev 1097)
+++ plugins/trunk/flickr/install/templates/flickr.template	2005-02-15 18:47:11 UTC (rev 1098)
@@ -1,40 +1,75 @@
 {include file="$blogtemplate/header.template"} 
-{if $flickr->isEnabled()}
-    {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}
-        {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 />
-        {assign var=flickrNotes value=$flickrPhotoInfo.notes}
-        <map id="imgmap">
-        {foreach item=flickrNote from=$flickrNotes}
-            <area alt="" title="{$flickrNote.noteDesc}" nohref="nohref" shape="rect" coords="{$flickrNote.noteX},{$flickrNote.noteY},{$flickrNote.noteX+$flickrNote.noteW-1},{$flickrNote.noteY+$flickrNote.noteH-1}" />
-        {/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)}
-        {assign var=flickrPhotos value=$flickr->getPhotos($albumId)}
-        {foreach item=flickrPhoto from=$flickrPhotos}
-            <a href="{$flickrPhoto.photoUrl}"><img 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 />
-        {/foreach}
-        {assign var=totalAlbums value=$smarty.foreach.flickrAlbum.total}
-    {/if}
-{else}
-    {$locale->tr("error_flickr_not_enabled")}
-{/if}    
+{if !empty($flickr)}
+ <script type="text/javascript" src="plugins/flickr/js/annotation/annotation.js"></script>
+ {literal}
+  <STYLE TYPE="text/css">
+   <!--
+    a.annotation {
+	 position: absolute;
+	 border: 2px solid yellow;
+	 padding: 0;
+	 display: none;
+	 opacity: 0.2;
+	 -moz-opacity: 0.2;
+	 filter: alpha(opacity=20);	
+    }
+    a.annotation span {
+	 display: block;
+	 width: 100%;
+	 height: 100%;
+	 background: white;
+	 opacity: 0.2;
+	 -moz-opacity: 0.2;
+	 filter: alpha(opacity=20);
+    }
+    a.annotation:hover {
+	 background: white;
+	 opacity: 0.2;
+	 -moz-opacity: 0.2;
+	 filter: alpha(opacity=20);
+	 border: 2px solid blue;
+    }
+   -->
+  </STYLE>
+ {/literal}
+
+ {if $flickr->isEnabled()}
+  {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}
+   {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 />
+   {assign var=flickrNotes value=$flickrPhotoInfo.notes}
+   <map id="imgmap">
+    {foreach item=flickrNote from=$flickrNotes}
+     <area alt="" title="{$flickrNote.noteDesc}" nohref="nohref" shape="rect" coords="{$flickrNote.noteX},{$flickrNote.noteY},{$flickrNote.noteX+$flickrNote.noteW-1},{$flickrNote.noteY+$flickrNote.noteH-1}" />
+    {/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)}
+   {assign var=flickrPhotos value=$flickr->getPhotos($albumId)}
+   {foreach item=flickrPhoto from=$flickrPhotos}
+    <a href="{$flickrPhoto.photoUrl}"><img 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 />
+   {/foreach}
+   {assign var=totalAlbums value=$smarty.foreach.flickrAlbum.total}
+  {/if}
+ {else}
+  {$locale->tr("error_flickr_not_enabled")}
+ {/if}
+{/if}   
 {include file="$blogtemplate/footer.template"} 
\ No newline at end of file

Modified: plugins/trunk/flickr/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/flickr/locale/locale_en_UK.php	2005-02-15 18:46:17 UTC (rev 1097)
+++ plugins/trunk/flickr/locale/locale_en_UK.php	2005-02-15 18:47:11 UTC (rev 1098)
@@ -1,6 +1,7 @@
 <?php
 $messages["manageIntegrationPlugins"] = "Integration Management";
 $messages["Flickr"] = "Flickr Gallery";
+$messages["flickr"] = "Flickr Gallery";
 
 $messages["flickr_email"] = "Input your Flickr Account";
 $messages["flickr_password"] = "Input your Flickr Password";

Modified: plugins/trunk/flickr/locale/locale_zh_TW.php
===================================================================
--- plugins/trunk/flickr/locale/locale_zh_TW.php	2005-02-15 18:46:17 UTC (rev 1097)
+++ plugins/trunk/flickr/locale/locale_zh_TW.php	2005-02-15 18:47:11 UTC (rev 1098)
@@ -1,6 +1,7 @@
 <?php
 $messages["manageIntegrationPlugins"] = "站外系統整合管理";
 $messages["Flickr"] = "Flickr 相簿整合設定";
+$messages["flickr"] = "Flickr 相簿";
 
 $messages["flickr_email"] = "請輸入你的 Flickr 帳號";
 $messages["flickr_password"] = "請輸入你的 Flickr 密碼";

Modified: plugins/trunk/flickr/readme.txt
===================================================================
--- plugins/trunk/flickr/readme.txt	2005-02-15 18:46:17 UTC (rev 1097)
+++ plugins/trunk/flickr/readme.txt	2005-02-15 18:47:11 UTC (rev 1098)
@@ -8,10 +8,7 @@
 
 Install:
 1. Copy the install/templates/flickr.template to your plog template folder.
-2. Add the following to your header.template to include the javascript
-   <script type="text/javascript" src="plugins/flickr/js/annotation/annotation.js"></script> 
-3. Add the content of install/css/annotation.css to your template style.css.
-4. Configurate your Flickr plugin in your pLog control center
+2. Configurate your Flickr plugin in your pLog control center
 
 Usage:
 Use the following URL to call your pLog Flickr Plugin Page

More information about the pLog-svn mailing list