[pLog-svn] r849 - in plog/trunk: class/summary/action
class/summary/data class/summary/view locale templates/summary
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Wed Jan 26 19:10:28 GMT 2005
Author: oscar
Date: 2005-01-26 19:10:27 +0000 (Wed, 26 Jan 2005)
New Revision: 849
Modified:
plog/trunk/class/summary/action/activeaccountaction.class.php
plog/trunk/class/summary/action/dofinishregister.class.php
plog/trunk/class/summary/action/summarysearchaction.class.php
plog/trunk/class/summary/action/summarysendresetemail.class.php
plog/trunk/class/summary/action/summarysetnewpassword.class.php
plog/trunk/class/summary/action/summaryshowresetpasswordform.class.php
plog/trunk/class/summary/action/summaryupdatepassword.class.php
plog/trunk/class/summary/data/summarytools.class.php
plog/trunk/class/summary/view/summarymessageview.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/summary/changepassword.template
plog/trunk/templates/summary/email_confirm.template
plog/trunk/templates/summary/message.template
plog/trunk/templates/summary/resetpassword.template
plog/trunk/templates/summary/searchresults.template
Log:
the summary should now work sooo much better. And now it has been translated 100% so all the strings are pretty much already in the lcoale file
Modified: plog/trunk/class/summary/action/activeaccountaction.class.php
===================================================================
--- plog/trunk/class/summary/action/activeaccountaction.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/activeaccountaction.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -32,7 +32,8 @@
$userInfo = $users->getUserInfoFromUsername($this->username);
if(!$userInfo){
- $this->_view = new SummaryMessageView( $this->_locale->tr("no_user_found"), $this->_locale->tr("error"));
+ $this->_view = new SummaryView( "summaryerror" );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_invalid_user"))
return false;
}
@@ -42,7 +43,7 @@
if($activeCode != $this->activeCode){
$this->log->debug("active code in db is:".$activeCode);
$this->log->debug("active code from user is:".$this->activeCode);
- $this->_view = new SummaryMessageView($this->_locale->tr("wrong_active_code"), $this->_locale->tr("error"));
+ $this->_view = new SummaryView( "summaryerror", $this->_locale->tr("error_invalid_activation_code"));
return false;
}
@@ -57,8 +58,13 @@
$blog = $blogs->getBlogInfo($blogId);
$blog->setStatus(BLOG_STATUS_ACTIVE);
$blogs->updateBlog($blogId,$blog);
+
+ // create the message that we're going to show
+ $message = "<p>".$this->_locale->tr("blog_activated_ok")."</p><p>".
+ $this->_locale->pr("register_blog_link", $blog->getBlog(), $blogUrl->blogLink())."</p><p>".
+ $this->_locale->tr("register_blog_admin_link")."</p>";
- $this->_view = new SummaryMessageView($this->_locale->tr("active_account_ok"));
+ $this->_view = new SummaryMessageView($this->_locale->tr("blog_activated_ok"));
$this->setCommonData();
return true;
}
Modified: plog/trunk/class/summary/action/dofinishregister.class.php
===================================================================
--- plog/trunk/class/summary/action/dofinishregister.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/dofinishregister.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -119,7 +119,7 @@
if( !$newblogId ) {
$this->log->debug("add blog failed,blog name is ".$this->blogName);
$this->_view = new SummaryView( "registererror" );
- $this->_view->setValue( "message", $this->_locale->tr("error_creating_blog"));
+ $this->_view->setErrorMessage( $this->_locale->tr("error_creating_blog"));
return false;
}
Modified: plog/trunk/class/summary/action/summarysearchaction.class.php
===================================================================
--- plog/trunk/class/summary/action/summarysearchaction.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/summarysearchaction.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -20,9 +20,8 @@
// if the search terms are not correct, let's return an error message
$val = new StringValidator();
if( !$val->validate( $this->_searchTerms )) {
- $this->_view = new SummaryView( "error" );
- $this->_view->setValue( "message", $this->_locale->tr("error_incorrect_search_terms" ));
- $this->_view->setValue( "locale", $this->_locale );
+ $this->_view = new SummaryView( "summaryerror" );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_incorrect_search_terms" ));
return false;
}
@@ -41,15 +40,13 @@
if( !$results || empty($results)) {
// if not, then quit
$this->_view = new SummaryView( "error" );
- $this->_view->setValue( "message", $this->_locale->tr("error_no_search_results" ));
- $this->_view->setValue( "locale", $this->_locale );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_no_search_results" ));
return false;
}
// but if so, then continue...
$this->_view = new SummaryView( "searchresults" );
$this->_view->setValue( "searchresults", $results );
- $this->_view->setValue( "locale", $this->_locale );
return true;
}
Modified: plog/trunk/class/summary/action/summarysendresetemail.class.php
===================================================================
--- plog/trunk/class/summary/action/summarysendresetemail.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/summarysendresetemail.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -29,7 +29,7 @@
}
function perform()
- {
+ {
// fetch the data
$this->_userName = $this->_request->getValue( "userName" );
$this->_userEmail = $this->_request->getValue( "userEmail" );
@@ -48,7 +48,7 @@
}
// if the user exists but this is not his/her mailbox, then quit too
- if( $userInfo->getEmail() != $this->_userEmail ) {
+ if( $userInfo->getEmail() != $this->_userEmail ) {
$this->_view = new SummaryView( "resetpassword" );
$this->_form->setFieldValidationStatus( "userEmail", false );
$this->setCommonData( true );
Modified: plog/trunk/class/summary/action/summarysetnewpassword.class.php
===================================================================
--- plog/trunk/class/summary/action/summarysetnewpassword.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/summarysetnewpassword.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -29,9 +29,8 @@
$val = new StringValidator();
if( !$val->validate( $this->_userNameHash ) || !$val->validate( $this->_requestHash )) {
$this->log->debug("1");
- $this->_view = new SummaryView( "error" );
- $this->_view->setValue( "message", $this->_locale->tr("error_incorrect_request" ));
- $this->_view->setValue( "locale", $this->_locale );
+ $this->_view = new SummaryView( "summaryerror" );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_incorrect_request" ));
return false;
}
@@ -43,9 +42,8 @@
// make sure that the request is correct
$userInfo = SummaryTools::verifyRequest( $this->_userNameHash, $this->_requestHash );
if( !$userInfo ) {
- $this->_view = new SummaryView( "error" );
- $this->_view->setValue( "message", $this->_locale->tr("error_incorrect_request" ));
- $this->_view->setValue( "locale", $this->_locale );
+ $this->_view = new SummaryView( "summaryerror" );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_incorrect_request" ));
return false;
}
@@ -54,7 +52,8 @@
$this->_view = new SummaryView( "changepassword" );
$this->_view->setValue( "a", $this->_requestHash );
$this->_view->setValue( "b", $this->_userNameHash );
- $this->_view->setValue( "user", $userInfo );
+ $this->_view->setValue( "userId", $userInfo->getId());
+ $this->setCommonData();
return true;
}
Modified: plog/trunk/class/summary/action/summaryshowresetpasswordform.class.php
===================================================================
--- plog/trunk/class/summary/action/summaryshowresetpasswordform.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/summaryshowresetpasswordform.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -7,13 +7,7 @@
* shows the form to reset a password
*/
class SummaryShowResetPasswordForm extends SummaryAction
- {
-
- function SummaryShowResetPasswordForm( $actionInfo, $request )
- {
- $this->SummaryAction( $actionInfo, $request );
- }
-
+ {
function perform()
{
$this->_view = new SummaryView( "resetpassword" );
Modified: plog/trunk/class/summary/action/summaryupdatepassword.class.php
===================================================================
--- plog/trunk/class/summary/action/summaryupdatepassword.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/action/summaryupdatepassword.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -2,6 +2,7 @@
include_once( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
include_once( PLOG_CLASS_PATH."class/summary/data/summarytools.class.php" );
@@ -11,66 +12,53 @@
var $_requestHash;
var $_newPassword;
var $_retypeNewPassword;
+ var $_userId;
- function SummaryAction( $actionInfo, $request )
+ function SummaryUpdatePassword( $actionInfo, $request )
{
- $this->Action( $actionInfo, $request );
+ $this->SummaryAction( $actionInfo, $request );
+
+ $this->registerFieldValidator( "a", new StringValidator());
+ $this->registerFieldValidator( "b", new StringValidator());
+ $this->registerFieldValidator( "newPassword", new PasswordValidator());
+ $this->registerFieldValidator( "retypePassword", new PasswordValidator());
+ $this->registerFieldValidator( "userId", new IntegerValidator());
+ $view = new SummaryView( "changepassword" );
+ $view->setErrorMessage( $this->_locale->tr("error_updating_password"));
+ $this->setValidationErrorView( $view );
}
- function validate()
+ function perform()
{
$this->_userNameHash = $this->_request->getValue( "b" );
$this->_requestHash = $this->_request->getValue( "a" );
$this->_newPassword = $this->_request->getValue( "newPassword" );
$this->_retypeNewPassword = $this->_request->getValue( "retypePassword" );
+ $this->_userId = $this->_request->getValue( "userId" );
- // check that the parameters are there...
- $val = new StringValidator();
- if( !$val->validate( $this->_userNameHash ) || !$val->validate( $this->_requestHash )) {
- $this->log->debug("1");
- $this->_view = new SummaryView( "error" );
- $this->_view->setValue( "message", $this->_locale->tr("error_incorrect_request" ));
- $this->_view->setValue( "locale", $this->_locale );
- return false;
- }
-
// check if the passwords are correct and are the same
- if( !$val->validate( $this->_newPassword ) || !$val->validate( $this->_retypeNewPassword )) {
- $this->log->debug("2");
- $this->_view = new SummaryView( "error" );
- $message = $this->_locale->tr("error_passwords_do_not_match" )."<br/><br/>";
- $message .= "<a href=\"javascript:history.go(-1);\">".$this->_locale->tr("back")."</a>";
- $this->_view->setValue( "message", $message );
+ if( $this->_newPassword != $this->_retypeNewPassword ) {
+ $this->_view = new SummaryView( "changepassword" );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_passwords_do_not_match" ));
+ $this->setCommonData( true );
return false;
- }
-
- return true;
- }
-
- function perform()
- {
+ }
$userInfo = SummaryTools::verifyRequest( $this->_userNameHash, $this->_requestHash );
if( !$userInfo ) {
- $this->_view = new SummaryView( "error" );
- $this->_view->setValue( "message", $this->_locale->tr("error_incorrect_request" ));
- $this->_view->setValue( "locale", $this->_locale );
+ $this->_view = new SummaryView( "summaryerror" );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_incorrect_request" ));
+ $this->setCommonData( true );
return false;
}
// so if everything went fine, we can *FINALLY* change the password!
$users = new Users();
$userInfo->setPassword( $this->_newPassword );
- if( !$users->updateUser( $userInfo )) {
- $this->_view = new SummaryView( "error" );
- $message = $this->_locale->tr("error_updating_password" )."<br/><br/>";
- $message .= "<a href=\"javascript:history.go(-1);\">".$this->_locale->tr("back")."</a>";
- $this->_view->setValue( "message", $message );
- return false;
- }
-
+ $users->updateUser( $userInfo );
+ print("password = ".$this->_newPassword);
$this->_view = new SummaryView( "message" );
- $this->_view->setValue( "message", $this->_locale->tr("password_updated_ok" ));
+ $this->_view->setSuccessMessage( $this->_locale->tr("password_updated_ok" ));
return true;
}
Modified: plog/trunk/class/summary/data/summarytools.class.php
===================================================================
--- plog/trunk/class/summary/data/summarytools.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/data/summarytools.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -52,9 +52,10 @@
// make sure that the request is correct
$users = new Users();
// it's not a good idea to do this but it makes things a bit easier...
+ $prefix = $users->getPrefix();
$query = "SELECT u.id AS id, u.user AS user, u.password AS password, u.email AS email,
u.about AS about, u.full_name AS full_name, u.properties AS properties,
- IF(p.permission_id = 1, 1, 0 ) AS site_admin
+ IF(p.permission_id = 1, 1, 0 ) AS site_admin, u.resource_picture_id AS resource_picture_id
FROM {$prefix}users u LEFT JOIN {$prefix}users_permissions p ON u.id = p.user_id
WHERE MD5(u.user) = '".Db::qstr($userNameHash)."'";
$userInfo = $users->_getUserInfoFromQuery( $query );
@@ -62,7 +63,6 @@
// try to see if we can load the user...
if( !$userInfo )
return false;
-
// and if so, validate the hash
$originalRequestHash = SummaryTools::calculatePasswordResetHash( $userInfo );
Modified: plog/trunk/class/summary/view/summarymessageview.class.php
===================================================================
--- plog/trunk/class/summary/view/summarymessageview.class.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/class/summary/view/summarymessageview.class.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -9,27 +9,12 @@
class SummaryMessageView extends SummaryView
{
- function SummaryMessageView( $messageBody, $messageTitle = "" )
+ function SummaryMessageView( $messageBody = "" )
{
$this->SummaryView( "message" );
- // keep the message body
- $this->_body = $messageBody;
-
- // and the message title
- if( $messageTitle == "" ) {
- $locale =& Locales::getLocale();
- $messageTitle = $locale->tr( "message" );
- }
- $this->_title = $messageTitle;
+ if( $messageBody != "" )
+ $this->setSuccessMessage( $messageBody );
}
-
- function render()
- {
- $this->_params->setValue( "message", $this->_body );
- $this->_params->setValue( "title", $this->_title );
-
- parent::render();
- }
}
?>
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/locale/locale_en_UK.php 2005-01-26 19:10:27 UTC (rev 849)
@@ -124,6 +124,8 @@
$messages['error_parameter_missing'] = 'There is one parameter missing from the request.';
$messages['error_blog_has_no_links'] = 'This blog has no links yet.';
$messages['error_comments_not_enabled'] = 'The commenting feature has been disabled in this site.';
+$messages['error_incorrect_search_terms'] = 'The search terms were not valid';
+$messages['error_no_search_results'] = 'No items matching the search terms were found';
///////////////// //////////////////
///////////////// STRINGS FOR THE ADMINISTRATION INTERFACE //////////////////
@@ -831,4 +833,22 @@
$messages['register_default_article_topic'] = 'Congratulations!';
$messages['register_default_article_text'] = 'If you can read this post, it means that the registration process was successful and that you can start blogging';
$messages['register_default_category'] = 'General';
+// confirmation email
+$messages['register_confirmation_email_text'] = 'Please click the link below in order to activate your blog:\n\n%s\n\nHave a nice day';
+$messages['error_invalid_activation_code'] = 'Sorry, the confirmation code is not valid';
+$messages['blog_activated_ok'] = 'Congratulations, your new user and blog have been successfully validated!';
+// forgot your password?
+$messages['reset_password'] = 'Reset your password';
+$messages['reset_password_username_help'] = 'Name of the user whose password you would like to reset';
+$messages['reset_password_email_help'] = 'Email address which was used to register this user';
+$messages['reset_password_help'] = 'Use this form to reset the password of your user, should you not remember it. Please type the name of the user whose password you would like to reset, as well as the email address that was used to register this user';
+$messages['error_resetting_password'] = 'There was an error resetting the password. Please check the data and try again';
+$messages['reset_password_error_incorrect_email_address'] = 'The email address is not correct or it is not the email address used to register this user';
+$messages['password_reset_message_sent_ok'] = 'An email message with a link has been sent to your email address. Please click the link in order to reset your password';
+$messages['error_incorrect_request'] = 'The parameters in the URL are not correct';
+$messages['change_password'] = 'Set new password';
+$messages['change_password_help'] = 'Please type and confirm your new password';
+$messages['new_password'] = 'New password';
+$messages['new_password_help'] = 'Type here your new password';
+$messages['password_updated_ok'] = 'Your password has been successfully updated';
?>
\ No newline at end of file
Modified: plog/trunk/templates/summary/changepassword.template
===================================================================
--- plog/trunk/templates/summary/changepassword.template 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/templates/summary/changepassword.template 2005-01-26 19:10:27 UTC (rev 849)
@@ -1,16 +1,31 @@
-{include file="summary/header.template"}
+{include file="summary/header.template" section=$locale->tr("change_password")}
<div id="onecolumn">
- <p>
- {$locale->tr("change_password_info")}
- </p>
<form name="changePassword" method="post">
- {$locale->tr("new_password")}: <input type="password" name="newPassword" value="" /><br/><br/>
- {$locale->tr("retype_new_password")}: <input type="password" name="retypePassword" value="" /><br/><br/>
- <input type="submit" name="changePassword" value="{$locale->tr("change_password")}" />
- <input type="hidden" name="a" value="{$a}" />
- <input type="hidden" name="b" value="{$b}" />
- <input type="hidden" name="op" value="updatePassword" />
- <input type="hidden" name="userId" value="{$user->getId()}" />
+ <fieldset class="inputField">
+ <legend>{$locale->tr("change_password")}</legend>
+ <p>
+ {$locale->tr("change_password_help")}
+ </p>
+ {include file="summary/formvalidate.template" message=$locale->tr("error_resetting_password")}
+ <div class="field">
+ <label for="newPassword">{$locale->tr("new_password")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("new_password_help")}</div>
+ <input type="password" name="newPassword" value="" />
+ {include file="summary/validate.template" field=newPassword message=$locale->tr("error_invalid_password")}
+ <br/>
+ <div class="formHelp">{$locale->tr("confirm_password")}</div>
+ <input type="password" name="retypePassword" value="" />
+ {include file="summary/validate.template" field=retypePassword message=$locale->tr("error_passwords_dont_match")}
+ </div>
+ </fieldset>
+ <div class="buttons">
+ <input type="submit" name="changePassword" value="{$locale->tr("register_next")} »" />
+ <input type="hidden" name="a" value="{$a}" />
+ <input type="hidden" name="b" value="{$b}" />
+ <input type="hidden" name="op" value="updatePassword" />
+ <input type="hidden" name="userId" value="{$userId}" />
+ </div>
</form>
</div>
{include file="summary/footer.template"}
\ No newline at end of file
Modified: plog/trunk/templates/summary/email_confirm.template
===================================================================
--- plog/trunk/templates/summary/email_confirm.template 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/templates/summary/email_confirm.template 2005-01-26 19:10:27 UTC (rev 849)
@@ -1,5 +1 @@
-{$locale->tr("welcome_to_plog")}
-
-{$activeLink}
-
-{$locale->tr("good_wish_and_good_bye")}
+{$locale->pr("register_confirmation_email_text", $activeLink)}
\ No newline at end of file
Modified: plog/trunk/templates/summary/message.template
===================================================================
--- plog/trunk/templates/summary/message.template 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/templates/summary/message.template 2005-01-26 19:10:27 UTC (rev 849)
@@ -1,5 +1,5 @@
-{include file="summary/header.template" section=$title}
+{include file="summary/header.template" section=$locale->tr("message")}
<div id="onecolumn">
-{$message}
+{$viewSuccessMessage}
</div>
{include file="summary/footer.template"}
\ No newline at end of file
Modified: plog/trunk/templates/summary/resetpassword.template
===================================================================
--- plog/trunk/templates/summary/resetpassword.template 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/templates/summary/resetpassword.template 2005-01-26 19:10:27 UTC (rev 849)
@@ -1,24 +1,29 @@
{include file="summary/header.template" section=$locale->tr("reset_password")}
<div id="onecolumn">
- <p>
- {$locale->tr("reset_password_info")}
- </p>
<form name="resetPasswordForm" method="post">
<fieldset class="inputField">
+ <legend>{$locale->tr("reset_password")}</legend>
+ <p>
+ {$locale->tr("reset_password_help")}
+ </p>
{include file="summary/formvalidate.template" message=$locale->tr("error_resetting_password")}
<div class="field">
- <label for="userName">{$locale->tr("username")}</label><br/>
+ <label for="userName">{$locale->tr("username")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("reset_password_username_help")}</div>
<input type="text" name="userName" id="userName" value="{$userName}" />
{include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
</div>
<div class="field">
- <label for="userEmail">{$locale->tr("email_address")}</label><br/>
+ <label for="userEmail">{$locale->tr("email")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("reset_password_email_help")}</div>
<input type="text" name="userEmail" id="userEmail" value="{$userEmail}" />
- {include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_email_address")}
+ {include file="summary/validate.template" field=userEmail message=$locale->tr("reset_password_error_incorrect_email_address")}
</div>
</fieldset>
<div class="buttons">
- <input type="submit" name="resetPasswordButton" value="{$locale->tr("reset_password")}" />
+ <input type="submit" name="resetPasswordButton" value="{$locale->tr("register_next")} »" />
<input type="hidden" name="op" value="sendResetEmail" />
</div>
</div>
Modified: plog/trunk/templates/summary/searchresults.template
===================================================================
--- plog/trunk/templates/summary/searchresults.template 2005-01-26 10:21:49 UTC (rev 848)
+++ plog/trunk/templates/summary/searchresults.template 2005-01-26 19:10:27 UTC (rev 849)
@@ -4,25 +4,7 @@
{assign var="post" value=$result->getArticle()}
{assign var="blog" value=$post->getBlogInfo()}
{assign var="request" value=$blog->getBlogRequestGenerator()}
- <h3>{$post->getTopic()}</h3>
- <div class="subtitle">
- {$locale->tr("summary_in")} <a href="{$request->postPermalink($post)}">{$blog->getBlog()}</a>
- </div>
- <p>
- {$post->getIntroText()|strip_tags|truncate:200:"..."}
- </p>
- <div class="peu">
- {assign var="postCategories" value=$post->getCategories()}
- {assign var="postOwner" value=$post->getUserInfo()}
- {assign var="postDate" value=$post->getDateObject()}
- <a href="{$request->postPermalink($post)}" title="{$locale->tr("permalink_title")}" class="noborder">
- <img src="imgs/post.png" width="10" height="11" alt="{$locale->tr("permalink_title")}" />
- </a>
- {$locale->tr("summary_posted_by")} {$postOwner->getUsername()}, {$locale->formatDate($postDate,"%e %B %Y")} |
- <img src="imgs/comment.png" width="11" height="10" alt="{$locale->tr("comments")}" />
- <a href="{$request->postPermalink($post)}#comments" title="{$locale->tr("comment on this")}">{if $post->getTotalComments() eq 0}{$locale->tr("comment on this")}{else}{$post->getTotalComments()} {$locale->tr("comments")|capitalize}{/if}</a>
- <br style="clear: both;" />
- </div>
+ {include file="summary/post.template"}
{/foreach}
{** bloglistpager links=$linkslist current=$currentPage **}
</div>
More information about the pLog-svn
mailing list