[pLog-svn] r829 - in plugins/trunk/flickr: . class class/action class/view locale templates

mark at devel.plogworld.net mark at devel.plogworld.net
Tue Jan 25 11:34:39 GMT 2005


Author: mark
Date: 2005-01-25 11:34:38 +0000 (Tue, 25 Jan 2005)
New Revision: 829

Added:
   plugins/trunk/flickr/class/view/
   plugins/trunk/flickr/class/view/pluginflickrconfigview.class.php
Modified:
   plugins/trunk/flickr/class/action/pluginflickrconfigaction.class.php
   plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php
   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
   plugins/trunk/flickr/templates/flickr.template
Log:


Modified: plugins/trunk/flickr/class/action/pluginflickrconfigaction.class.php
===================================================================
--- plugins/trunk/flickr/class/action/pluginflickrconfigaction.class.php	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/class/action/pluginflickrconfigaction.class.php	2005-01-25 11:34:38 UTC (rev 829)
@@ -1,7 +1,8 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );	
+	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
+	include_once( PLOG_CLASS_PATH."plugins/flickr/class/view/pluginflickrconfigview.class.php" );	
 
 	/**
 	 * shows a form with the current configuration
@@ -16,35 +17,8 @@
 		
 		function perform()
 		{
-			// load some configuration settings
-			$blogSettings = $this->_blogInfo->getSettings();
-			$pluginEnabled = $blogSettings->getValue( "plugin_flickr_enabled" );
-			$email = $blogSettings->getValue( "plugin_flickr_email" );
-            $password = $blogSettings->getValue( "plugin_flickr_password" );
-            $aliasName = $blogSettings->getValue( "plugin_flickr_aliasname" );
-            $albumThumbnailSize = $blogSettings->getValue( "plugin_flickr_albumthumbnailsize" );
-            if ( $albumThumbnailSize == "" ) $albumThumbnailSize = "s";
-            $photoThumbnailSize = $blogSettings->getValue( "plugin_flickr_photothumbnailsize" );
-            if ( $photoThumbnailSize == "" ) $photoThumbnailSize = "s";
-            $showPrivate = $blogSettings->getValue( "plugin_flickr_showprivate" );
-            if ( $showPrivate == "") $showPrivate = 1;
-            $showNote = $blogSettings->getValue( "plugin_flickr_shownote" );
-            if ( $showNote == "") $showNote = 1;
-            $expiredTime = $blogSettings->getValue( "plugin_flickr_expiredtime" );
-            if ( $expiredTime == "") $expiredTime = 3600;
+            $this->_view = new PluginFlickrConfigView( $this->_blogInfo );
 			
-			// create a view and export the settings to the template
-			$this->_view = new AdminPluginTemplatedView( $this->_blogInfo, "flickr", "flickr", true );
-			$this->_view->setValue( "pluginEnabled", $pluginEnabled );
-			$this->_view->setValue( "email", $email );
-			$this->_view->setValue( "password", $password );
-			$this->_view->setValue( "aliasName", $aliasName );
-			$this->_view->setValue( "albumThumbnailSize", $albumThumbnailSize );
-			$this->_view->setValue( "photoThumbnailSize", $photoThumbnailSize );
-			$this->_view->setValue( "showPrivate", $showPrivate );
-			$this->_view->setValue( "showNote", $showNote );
-			$this->_view->setValue( "expiredTime", $expiredTime );
-			
 			$this->setCommonData();
 			
 			return true;

Modified: plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php
===================================================================
--- plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php	2005-01-25 11:34:38 UTC (rev 829)
@@ -1,8 +1,8 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-    include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
+	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
+	include_once( PLOG_CLASS_PATH."plugins/flickr/class/view/pluginflickrconfigview.class.php" );
 		
 	/**
 	 * updates the plugin configuration
@@ -31,26 +31,29 @@
             
             $this->_email = $this->_request->getValue( "email" );
             if( $this->_email == "" ) {
-                $this->_view = new AdminErrorView( $this->_blogInfo );
-                $this->_view->setValue( "message", $this->_locale->tr("flickr_error_email"));
-                $this->setCommonData();  
-                return false;
+                $this->_view = new PluginFlickrConfigView( $this->_blogInfo );
+                $this->_view->setErrorMessage( $this->_locale->tr("flickr_error_email"));
+                $this->setCommonData();
+
+                return false;                
             }  
                            
             $this->_password = $this->_request->getValue( "password" );
             if( $this->_password == "" ) {
-                $this->_view = new AdminErrorView( $this->_blogInfo );
-                $this->_view->setValue( "message", $this->_locale->tr("flickr_error_password"));
-                $this->setCommonData();  
-                return false;
+                $this->_view = new PluginFlickrConfigView( $this->_blogInfo );
+                $this->_view->setErrorMessage( $this->_locale->tr("flickr_error_password"));
+                $this->setCommonData();
+
+                return false;                   
             }
 
             $this->_aliasName = $this->_request->getValue( "aliasName" );
             if( $this->_aliasName == "" ) {
-                $this->_view = new AdminErrorView( $this->_blogInfo );
-                $this->_view->setValue( "message", $this->_locale->tr("flickr_error_aliasname"));
-                $this->setCommonData();  
-                return false;
+                $this->_view = new PluginFlickrConfigView( $this->_blogInfo );
+                $this->_view->setErrorMessage( $this->_locale->tr("flickr_error_aliasname"));
+                $this->setCommonData();
+
+                return false;                
             }             
                         
             $this->_albumThumbnailSize = $this->_request->getValue( "albumThumbnailSize" );
@@ -60,10 +63,11 @@
             
             $this->_expiredTime = $this->_request->getValue( "expiredTime" );
             if( $this->_expiredTime < 3600 ) {
-                $this->_view = new AdminErrorView( $this->_blogInfo );
-                $this->_view->setValue( "message", $this->_locale->tr("flickr_error_expiredtime"));
-                $this->setCommonData();  
-                return false;
+                $this->_view = new PluginFlickrConfigView( $this->_blogInfo );
+                $this->_view->setErrorMessage( $this->_locale->tr("flickr_error_expiredtime"));
+                $this->setCommonData();
+
+                return false;                 
             }        	                
 			return true;
 		}
@@ -86,21 +90,21 @@
 			// save the blogs settings
 			$blogs = new Blogs();
             if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
-                $this->_view = new AdminErrorView( $this->_blogInfo );
-                $this->_view->setValue( "message", $this->_locale->tr("error_updating_settings"));
+                $this->_view = new PluginFlickrConfigView( $this->_blogInfo );
+                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
                 $this->setCommonData();
 
-                return false;
+                return false;                
             }
 			
 			// if everything went ok...
             $this->_blogInfo->setSettings( $blogSettings );
             $this->_session->setValue( "blogInfo", $this->_blogInfo );
             $this->saveSession();
-			
-			$this->_view = new AdminMessageView( $this->_blogInfo );
-			$this->_view->setMessage( $this->_locale->tr("flickr_settings_saved_ok"));
-			$this->setCommonData();
+
+			$this->_view = new PluginFlickrConfigView( $this->_blogInfo );
+			$this->_view->setSuccessMessage( $this->_locale->tr("flickr_settings_saved_ok"));
+			$this->setCommonData();			
             
             return true;		
 		}

Added: plugins/trunk/flickr/class/view/pluginflickrconfigview.class.php
===================================================================
--- plugins/trunk/flickr/class/view/pluginflickrconfigview.class.php	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/class/view/pluginflickrconfigview.class.php	2005-01-25 11:34:38 UTC (rev 829)
@@ -0,0 +1,49 @@
+<?php
+	
+	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
+
+	/**
+	 * implements the main view of the feed reader plugin
+	 */
+	class PluginFlickrConfigView extends AdminPluginTemplatedView
+	{
+
+		function PluginFlickrConfigView( $blogInfo )
+		{
+			$this->AdminPluginTemplatedView( $blogInfo, "flickr", "flickr" );
+		}
+		
+		function render()
+		{
+			// load some configuration settings
+			$blogSettings = $this->_blogInfo->getSettings();
+			$pluginEnabled = $blogSettings->getValue( "plugin_flickr_enabled" );
+			$email = $blogSettings->getValue( "plugin_flickr_email" );
+            $password = $blogSettings->getValue( "plugin_flickr_password" );
+            $aliasName = $blogSettings->getValue( "plugin_flickr_aliasname" );
+            $albumThumbnailSize = $blogSettings->getValue( "plugin_flickr_albumthumbnailsize" );
+            if ( $albumThumbnailSize == "" ) $albumThumbnailSize = "s";
+            $photoThumbnailSize = $blogSettings->getValue( "plugin_flickr_photothumbnailsize" );
+            if ( $photoThumbnailSize == "" ) $photoThumbnailSize = "s";
+            $showPrivate = $blogSettings->getValue( "plugin_flickr_showprivate" );
+            if ( $showPrivate == "") $showPrivate = 1;
+            $showNote = $blogSettings->getValue( "plugin_flickr_shownote" );
+            if ( $showNote == "") $showNote = 1;
+            $expiredTime = $blogSettings->getValue( "plugin_flickr_expiredtime" );
+            if ( $expiredTime == "") $expiredTime = 3600;
+			
+			// create a view and export the settings to the template
+			$this->setValue( "pluginEnabled", $pluginEnabled );
+			$this->setValue( "email", $email );
+			$this->setValue( "password", $password );
+			$this->setValue( "aliasName", $aliasName );
+			$this->setValue( "albumThumbnailSize", $albumThumbnailSize );
+			$this->setValue( "photoThumbnailSize", $photoThumbnailSize );
+			$this->setValue( "showPrivate", $showPrivate );
+			$this->setValue( "showNote", $showNote );
+			$this->setValue( "expiredTime", $expiredTime );		
+			
+			parent::render();
+		}
+	}
+?>
\ No newline at end of file

Modified: plugins/trunk/flickr/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/flickr/locale/locale_en_UK.php	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/locale/locale_en_UK.php	2005-01-25 11:34:38 UTC (rev 829)
@@ -1,7 +1,7 @@
 <?php
-$messages["flickr_email"] = "E-Mail";
-$messages["flickr_password"] = "Password";
-$messages["flickr_aliasname"] = "Alias Name";
+$messages["flickr_email"] = "Input your Flickr Account";
+$messages["flickr_password"] = "Input your Flickr Password";
+$messages["flickr_aliasname"] = "Input your Flickr Alias Name";
 $messages["flickr_albumthumbnailsize"] = "Album Thumbnail Size";
 $messages["flickr_photothumbnailsize"] = "Photo Thumbnail Size";
 $messages["flickr_showprivate"] = "Show Private Photos";
@@ -9,12 +9,21 @@
 $messages["flickr_expiredtime"] = "Cache Expired Time";
 $messages["flickr_yes"] = "Yes";
 $messages["flickr_no"] = "No";
-$messages["flickr_plugin_configuration"] = "Configuration this plugin";
 $messages["flickr_plugin_enabled"] = "Enable this plugin";
 $messages["flickr_plugin"] = "Flickr Integration Plugin";
+
 $messages["flickr_settings_saved_ok"] = "Flickr settings saved successfully!";
 $messages["flickr_error_email"] = "E-Mail can not be empty!";
 $messages["flickr_error_password"] = "Password can not be empty!";
 $messages["flickr_error_aliasname"] = "Alias Name can not be empty";
 $messages["flickr_error_expiredtime"] = "To reduce the loading of Flickr server, the expired time can not shorter then 3600 secs.";
+
+$messages["label_email"] = "E-Mail";
+$messages["label_password"] = "Password";
+$messages["label_aliasname"] = "Alias";
+$messages["label_albumthumbnailsize"] = "Album";
+$messages["label_photothumbnailsize"] = "Photo";
+$messages["label_showprivate"] = "Private";
+$messages["label_shownote"] = "Notes";
+$messages["label_expiredtime"] = "Expired Time";
 ?>
\ No newline at end of file

Modified: plugins/trunk/flickr/locale/locale_zh_TW.php
===================================================================
--- plugins/trunk/flickr/locale/locale_zh_TW.php	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/locale/locale_zh_TW.php	2005-01-25 11:34:38 UTC (rev 829)
@@ -1,7 +1,7 @@
 <?php
-$messages["flickr_email"] = "帳號";
-$messages["flickr_password"] = "密碼";
-$messages["flickr_aliasname"] = "代名";
+$messages["flickr_email"] = "請輸入你的 Flickr 帳號";
+$messages["flickr_password"] = "請輸入你的 Flickr 密碼";
+$messages["flickr_aliasname"] = "請輸入你的 Flickr 代名";
 $messages["flickr_albumthumbnailsize"] = "相簿縮圖大小";
 $messages["flickr_photothumbnailsize"] = "相片縮圖大小";
 $messages["flickr_showprivate"] = "顯示隱藏相片";
@@ -9,12 +9,21 @@
 $messages["flickr_expiredtime"] = "暫存檔有效時間";
 $messages["flickr_yes"] = "是";
 $messages["flickr_no"] = "否";
-$messages["flickr_plugin_configuration"] = "外掛程式設定";
 $messages["flickr_plugin_enabled"] = "啟動外掛程式";
 $messages["flickr_plugin"] = "Flickr 整合外掛程式";
+
 $messages["flickr_settings_saved_ok"] = "Flickr 設定儲存成功。";
 $messages["flickr_error_email"] = "帳號錯誤!不可為空白。";
 $messages["flickr_error_password"] = "密碼錯誤!不可為空白。";
 $messages["flickr_error_aliasname"] = "代名錯誤!不可為空白。";
 $messages["flickr_error_expiredtime"] = "為防止 Flickr 伺服器負荷過重。最短的暫存檔有效期為 3600 秒。";
+
+$messages["label_email"] = "帳號";
+$messages["label_password"] = "密碼";
+$messages["label_aliasname"] = "代名";
+$messages["label_albumthumbnailsize"] = "相簿";
+$messages["label_photothumbnailsize"] = "相片";
+$messages["label_showprivate"] = "隱藏";
+$messages["label_shownote"] = "註記";
+$messages["label_expiredtime"] = "æš«å­˜";
 ?>
\ No newline at end of file

Modified: plugins/trunk/flickr/pluginflickr.class.php
===================================================================
--- plugins/trunk/flickr/pluginflickr.class.php	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/pluginflickr.class.php	2005-01-25 11:34:38 UTC (rev 829)
@@ -41,7 +41,7 @@
             
             $this->id = "flickr";
             $this->author = "Mark Wu";
-            $this->desc = '<p>The pLog Flickr plugin is inspired by <a href="http://www.worrad.com/archives/2004/11/23/flickr-gallery-wp-plugin/">Flickr Gallery Plugin</a> written by Ray. </p><ol><li>Unzip the zip files into temp folder </li><li>Upload <strong>/class/*.*</strong> to <strong>/your-blog/class</strong> </li><li>Upload <strong>/js/*.*</strong> to <strong>/your-blog/js</strong> </li><li>Upload <strong>/plugins/*.*</strong> to <strong>/your-blog/plugins</strong> </li><li>Upload <strong>/templates/*.*</strong> to <strong>/your-blog/templates/grey</strong> (I assume you use grey template) </li><li>Add the follow CSS code to /styles/grey.css (I assume you use grey template)</li></ol><blockquote><p><strong>a.annotation {<br /> position: absolute;<br /> border: 1px solid white;<br /> padding: 0;<br /> display: none;<br />}<br />a.annotation span {<br /> display: block;<br /> width: 100%;<br /> height: 100%;<br /> /* Setup opaque background in notes box with browser specific opacity<br />  * properties (they are not valid CSS - sorry).  If having valid CSS is<br />  * so important to you just get rid of the next 4 lines after these<br />  * comments (you will sacrifice the opaque background in the notes<br />  * boxes though).<br /> */<br /> background: white;<br /> opacity: 0.2;<br /> -moz-opacity: 0.2;<br /> filter: alpha(opacity=20);<br />}</strong></p><p><strong>a.annotation:hover {<br /> border-color: yellow;<br />}</strong></p></blockquote><ol start="7"><li>Add the following template code to your header.template</li></ol><blockquote><p><strong>&lt;script type=&quot;text/javascript&quot; src=&quot;js/annimg/annimg.js&quot;&gt;&lt;/script&gt;</strong> </p></blockquote><ol start="8"><li>Configure the Flickr Parameters through the configuration panel <ul><li>Your Flickr Account </li><li>Your Flickr Password </li><li>Alias Name </li><li>Thumbnail Size of Album </li><li>Thumbnail Size of Photo </li><li>Show Private Photos </li><li>Show Notes</li><li>Cache Expire (Secs)</li></ul></li></ol>';
+            $this->desc = 'This plugin let you integrate your Flickr with pLog. It is inspired by <a href="http://www.worrad.com/archives/2004/11/23/flickr-gallery-wp-plugin/">Wordpress Flickr Gallery Plugin</a> written by Ray.';
 
             $config =& Config::getConfig();
             $this->cacheFolder = $config->getValue('temp_folder');

Modified: plugins/trunk/flickr/readme.txt
===================================================================
--- plugins/trunk/flickr/readme.txt	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/readme.txt	2005-01-25 11:34:38 UTC (rev 829)
@@ -4,7 +4,10 @@
 Version: 1.0
 
 This plugin offers you to integrate with Flickr service. 
-The plugin is inspired by Wordpress Flickr Gallery Plugin written by Ray.
+It is inspired by Wordpress Flickr Gallery Plugin written by Ray.
 
 Example:
-Copy the install\flickr.template to your template folder.
\ No newline at end of file
+Copy the install\flickr.template to your template folder.
+
+Note:
+This plugin only works when smarty cache turned off.
\ No newline at end of file

Modified: plugins/trunk/flickr/templates/flickr.template
===================================================================
--- plugins/trunk/flickr/templates/flickr.template	2005-01-25 11:09:35 UTC (rev 828)
+++ plugins/trunk/flickr/templates/flickr.template	2005-01-25 11:34:38 UTC (rev 829)
@@ -2,65 +2,92 @@
 {include file="$admintemplatepath/navigation.template" showOpt=Flickr title=$locale->tr("flickr_plugin")}
 <form name="flickrPluginConfig" method="post">
  <fieldset class="inputField">
- <legend>{$locale->tr("flickr_plugin_configuration")}</legend> 
+ <legend>{$locale->tr("label_configuration")}</legend> 
+  {include file="$admintemplatepath/successmessage.template"}
+  {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">
-   <label for="pluginEnabled">{$locale->tr("flickr_plugin_enabled")}</label>
-   <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" /><br/>
+   <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
+   <span class="required"></span>   
+   <div class="formHelp">
+    <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("flickr_plugin_enabled")}
+   </div>
   </div>
+  
   <div class="field">
-   <label for="email">{$locale->tr("flickr_email")}</label>
+   <label for="email">{$locale->tr("label_email")}</label>
    <span class="required">*</span>
+   <div class="formHelp">{$locale->tr("flickr_email")}</div>
    <input class="text" type="text" name="email" id="email" value="{$email}" width="10" />
   </div>
+  
   <div class="field">
-   <label for="password">{$locale->tr("flickr_password")}</label>
+   <label for="password">{$locale->tr("label_password")}</label>
    <span class="required">*</span>
+   <div class="formHelp">{$locale->tr("flickr_password")}</div>
    <input class="password" type="password" name="password" id="password" value="{$password}" width="10" />
   </div>
+  
   <div class="field">
-   <label for="aliasName">{$locale->tr("flickr_aliasname")}</label>
+   <label for="aliasName">{$locale->tr("label_aliasname")}</label>
    <span class="required">*</span>
+   <div class="formHelp">{$locale->tr("flickr_aliasname")}</div>
    <input class="text" type="text" name="aliasName" id="aliasName" value="{$aliasName}" width="10" />
   </div>
+  
   <div class="field">
-   <label for="albumThumbnailSize">{$locale->tr("flickr_albumthumbnailsize")}</label>
+   <label for="albumThumbnailSize">{$locale->tr("label_albumthumbnailsize")}</label>
+   <span class="required"></span>
+   <div class="formHelp">{$locale->tr("flickr_albumthumbnailsize")}</div>   
    <select name="albumThumbnailSize" id="albumThumbnailSize">
     <option value="s" {if $albumThumbnailSize=="s"}selected="selected"{/if}>75x75</option>
     <option value="t" {if $albumThumbnailSize=="t"}selected="selected"{/if}>100x75</option>
     <option value="m" {if $albumThumbnailSize=="m"}selected="selected"{/if}>240x180</option>
    </select><br/>
-  </div>  
+  </div> 
+   
   <div class="field">
-   <label for="photoThumbnailSize">{$locale->tr("flickr_photothumbnailsize")}</label>
+   <label for="photoThumbnailSize">{$locale->tr("label_photothumbnailsize")}</label>
+   <span class="required"></span>
+   <div class="formHelp">{$locale->tr("flickr_photothumbnailsize")}</div>    
    <select name="photoThumbnailSize" id="photoThumbnailSize">
     <option value="s" {if $photoThumbnailSize=="s"}selected="selected"{/if}>75x75</option>
     <option value="t" {if $photoThumbnailSize=="t"}selected="selected"{/if}>100x75</option>
     <option value="m" {if $photoThumbnailSize=="m"}selected="selected"{/if}>240x180</option>
    </select><br/>
   </div>
+  
   <div class="field">
-   <label for="showPrivate">{$locale->tr("flickr_showprivate")}</label>
+   <label for="showPrivate">{$locale->tr("label_showprivate")}</label>
+   <span class="required"></span>
+   <div class="formHelp">{$locale->tr("flickr_showprivate")}</div>    
    <select name="showPrivate" id="showPrivate">
     <option value="0" {if $showPrivate==0}selected="selected"{/if}>{$locale->tr("flickr_no")}</option>
     <option value="1" {if $showPrivate==1}selected="selected"{/if}>{$locale->tr("flickr_yes")}</option>
    </select><br/>
   </div>
+  
   <div class="field">
-   <label for="showNote">{$locale->tr("flickr_shownote")}</label>
+   <label for="showNote">{$locale->tr("label_shownote")}</label>
+   <span class="required"></span>
+   <div class="formHelp">{$locale->tr("flickr_shownote")}</div>       
    <select name="showNote" id="showPrivate">
     <option value="0" {if $showNote==0}selected="selected"{/if}>{$locale->tr("flickr_no")}</option>
     <option value="1" {if $showNote==1}selected="selected"{/if}>{$locale->tr("flickr_yes")}</option>
    </select><br/>
-  </div>      
+  </div>
+  
   <div class="field">
-   <label for="expiredTime">{$locale->tr("flickr_expiredtime")}</label>
+   <label for="expiredTime">{$locale->tr("label_expiredtime")}</label>
    <span class="required">*</span>
+   <div class="formHelp">{$locale->tr("flickr_expiredtime")}</div>    
    <input class="text" type="text" name="expiredTime" id="expiredTime" value="{$expiredTime}" width="10" />
   </div>
+  
  </fieldset>
- <br/>
+
  <div class="buttons"> 
   <input type="hidden" name="op" value="updateFlickrConfig" />
+  <input type="reset" name="{$locale->tr("reset")}" />  
   <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
  </div>
 </form>




More information about the pLog-svn mailing list