[pLog-svn] r840 - in plog/trunk: class/summary/action class/summary/mail locale styles templates/misc templates/summary

oscar at devel.plogworld.net oscar at devel.plogworld.net
Tue Jan 25 20:36:07 GMT 2005


Author: oscar
Date: 2005-01-25 20:36:07 +0000 (Tue, 25 Jan 2005)
New Revision: 840

Added:
   plog/trunk/templates/summary/agreement.template
   plog/trunk/templates/summary/email_confirm.template
Removed:
   plog/trunk/templates/misc/agreement.template
   plog/trunk/templates/misc/email_confirm.template
   plog/trunk/templates/summary/error.template
Modified:
   plog/trunk/class/summary/action/chooseblogtemplateaction.class.php
   plog/trunk/class/summary/action/dofinishregister.class.php
   plog/trunk/class/summary/action/dousercreation.class.php
   plog/trunk/class/summary/mail/confirmemailmessage.class.php
   plog/trunk/locale/locale_en_UK.php
   plog/trunk/styles/summary.css
   plog/trunk/templates/summary/blogprofile.template
   plog/trunk/templates/summary/formvalidate.template
   plog/trunk/templates/summary/registererror.template
   plog/trunk/templates/summary/registerstep0.template
   plog/trunk/templates/summary/registerstep1.template
   plog/trunk/templates/summary/registerstep2.template
   plog/trunk/templates/summary/registerstep3.template
   plog/trunk/templates/summary/registerstep5.template
   plog/trunk/templates/summary/userlist.template
   plog/trunk/templates/summary/userprofile.template
Log:
despite one major issue that I've just noticed, it seems to work well...

Modified: plog/trunk/class/summary/action/chooseblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/summary/action/chooseblogtemplateaction.class.php	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/class/summary/action/chooseblogtemplateaction.class.php	2005-01-25 20:36:07 UTC (rev 840)
@@ -41,12 +41,13 @@
             
 			
 			// show some info, and we're all happy!
-			$this->_view = new SummaryView( "registerstep4" );
+			//$this->_view = new SummaryView( "registerstep4" );
             //$rg =$blogInfo->getBlogRequestGenerator();
             //$blogUrl = $rg->blogLink($blogInfo);
             //$this->_view->setValue( "blogurl", $blogUrl );
-
-            $this->setValues();
+            //$this->setValues();
+			
+			SummaryController::setForwardAction( "RegisterStep5" );
         }
     }
 ?>

Modified: plog/trunk/class/summary/action/dofinishregister.class.php
===================================================================
--- plog/trunk/class/summary/action/dofinishregister.class.php	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/class/summary/action/dofinishregister.class.php	2005-01-25 20:36:07 UTC (rev 840)
@@ -20,14 +20,8 @@
          */
 		function doFinishRegister( $actionInfo, $request )
 		{
-			$this->RegisterAction( $actionInfo, $request );
-			
-			$view = new SummaryView( "registerstep4" );
-			$view->setErrorMessage( $this->_locale->tr("register_error_adding_user" ));
-			$this->setValidationErrorView( $view );
-
+			$this->RegisterAction( $actionInfo, $request );			
             $this->_view = new SummaryView( "registererror" );
-
             $this->need_confirm = $this->_config->getValue("need_email_confirm_registration");
 		}	
         //}}}
@@ -39,12 +33,14 @@
         function perform()
         {
             $userId = $this->createUser();
+			if( !$userId )
+				return false;
+				
             $blogId = $this->createBlog($userId);
+			if( !$blogId )
+				return false;
 
-
-            // FIXME:what if blog creation failed?
-            // how to throw an exception and roll back?
-
+			// let's assume that everything went fine at this point...
             $this->doneRegister();
         }
         //}}}
@@ -80,7 +76,7 @@
             $userId = $users->addUser( $user );
             if( !$userId ) {
                 $this->_view = new SummaryView( "registererror" );
-                $this->_view->setErrorMessage( $this->_locale->tr("register_error_adding_user" ));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_adding_user" ));
                 $this->setCommonData( true );
                 return false;
             }
@@ -123,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("register_error_creating_blog"));
+                $this->_view->setValue( "message", $this->_locale->tr("error_creating_blog"));
                 return false;
             }
 
@@ -131,6 +127,8 @@
 
             // get info about the blog
             $blogInfo = $blogs->getBlogInfo( $newblogId );
+			
+			$this->_blogInfo = $blogInfo;
 
             // if the blog was created, we can add some basic information
             // add a category
@@ -165,6 +163,10 @@
                 $this->_view->setValue("need_email_confirm",1);
                 $this->sendConfirmEmail();
             }
+			else {
+				// add the blog object to the template
+				$this->_view->setValue( "blog", $this->_blogInfo );
+			}
             
             $this->setCommonData();
             return true;

Modified: plog/trunk/class/summary/action/dousercreation.class.php
===================================================================
--- plog/trunk/class/summary/action/dousercreation.class.php	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/class/summary/action/dousercreation.class.php	2005-01-25 20:36:07 UTC (rev 840)
@@ -25,7 +25,7 @@
 			$this->registerFieldValidator( "userEmail", new EmailValidator());
 			$this->registerField( "userFullName" );
 			$view = new SummaryView( "registerstep1" );
-			$view->setErrorMessage( $this->_locale->tr("register_error_adding_user" ));
+			$view->setErrorMessage( $this->_locale->tr("error_adding_user" ));
 			$this->setValidationErrorView( $view );
 		}	
 
@@ -66,7 +66,7 @@
 			// check if the passwords match, and stop processing if so too
             if( $this->userPassword != $this->confirmPassword ) {
 	            $this->_view = new SummaryView( "registerstep1" );
-                $this->_view->setErrorMessage( $this->_locale->tr("register_error_passwords_dont_match"));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_passwords_dont_match"));
 				$this->_form->setFieldValidationStatus( "userPasswordCheck", false );                
                 $this->setCommonData( true );
                 return false;

Modified: plog/trunk/class/summary/mail/confirmemailmessage.class.php
===================================================================
--- plog/trunk/class/summary/mail/confirmemailmessage.class.php	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/class/summary/mail/confirmemailmessage.class.php	2005-01-25 20:36:07 UTC (rev 840)
@@ -35,7 +35,7 @@
      * create the message body
      */
     function createBody(){
-        $body = $this->renderBodyTemplate(CONFIRM_MAIL_TEMPLATE,"misc");
+        $body = $this->renderBodyTemplate(CONFIRM_MAIL_TEMPLATE,"summary");
         $this->setBody($body) ;
     }
 

Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/locale/locale_en_UK.php	2005-01-25 20:36:07 UTC (rev 840)
@@ -496,7 +496,6 @@
 $messages['comments_order_help'] = 'Order in which comments should be displayed in the front page';
 $messages['oldest_first'] = 'Oldest first';
 $messages['newest_first'] = 'Newest first';
-
 $messages['categories_order'] = 'Categories order';
 $messages['categories_order_help'] = 'Order in which categories should be displayed in the front page';
 $messages['most_recent_updated_first'] = 'Most recently updated first';
@@ -802,6 +801,32 @@
 $messages['blog'] = 'Blog';
 $messages['latest_posts'] = 'Latest posts';
 
-// user list
-
+// registration
+$messages['register_step0_title'] = 'Service terms acceptance';
+$messages['decline'] = 'Decline';
+$messages['accept'] = 'Accept';
+$messages['read_service_agreement'] = 'Please read the terms of this service and click the "Accept" button if you agree';
+$messages['register_step1_title'] = 'Create a user [1/4]';
+$messages['register_step1_help'] = 'First you need to create a new user in order to get a blog. This user will be the owner of the blog and will have access to all its functionalities';
+$messages['register_next'] = 'Next »';
+$messages['register_step2_title'] = 'Create a blog [2/4]';
+$messages['register_blog_name_help'] = 'Name for your new blog';
+$messages['register_step3_title'] = 'Choose a Template [3/4]';
+$messages['step1'] = 'Step 1';
+$messages['step2'] = 'Step 2';
+$messages['step3'] = 'Step 3';
+$messages['register_step3_help'] = 'Please select one of the available templates as the default one for your blog. If you do not like it later on, it can always be changed';
+$messages['error_must_choose_template'] = 'Please select one template';
+$messages['select_template'] = 'Select template';
+$messages['register_step5_title'] = 'Congratulations! [4/4]';
+$messages['finish'] = 'Finish';
+$messages['register_need_confirmation'] = 'An email message including the confirmation has been sent to your email address, please click the link as soon as you receive the message to start blogging!';
+$messages['register_step5_help'] = 'Congratulations, your new user and blog have been successfully created!';
+$messages['register_blog_link'] = 'If you would like to take a look at your new blog, you can go there now: <a href="%1$s">%2$s</a>';
+$messages['register_blog_admin_link'] = 'If you prefer to start posting right away, please click to go to the <a href="admin.php">administration interface</a>';
+$messages['register_error'] = 'There was an error during the process';
+// registration article topic and text
+$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';
 ?>
\ No newline at end of file

Modified: plog/trunk/styles/summary.css
===================================================================
--- plog/trunk/styles/summary.css	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/styles/summary.css	2005-01-25 20:36:07 UTC (rev 840)
@@ -26,7 +26,7 @@
 
 #onecolumn {
   float:left;
-  width: 436px;
+  width: 636px;
   padding-left: 80px;
   padding-right: 80px;
 }
@@ -82,4 +82,22 @@
 .item a:hover {
     background       : #818181;
     color            : #FFFFFF;
+}
+
+h5
+{
+    font-family      : trebuchet ms, tahoma, sans-serif;
+    font-size        : 1.1em;
+    font-weight      : bold;
+    vertical-align   : bottom;
+    padding          : 0px;
+    text-align       : left;
+    text-transform   : capitalize;
+	margin-bottom: 5px;
+	margin-top: 9px;
+}
+
+#FormError
+{
+ padding-bottom: 11px;
 }
\ No newline at end of file

Deleted: plog/trunk/templates/misc/agreement.template
===================================================================
--- plog/trunk/templates/misc/agreement.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/misc/agreement.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,2 +0,0 @@
-1 read carefully
-2 read carefully above

Deleted: plog/trunk/templates/misc/email_confirm.template
===================================================================
--- plog/trunk/templates/misc/email_confirm.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/misc/email_confirm.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,5 +0,0 @@
-{$locale->tr("welcome_to_plog")}
-
-{$activeLink}
-
-{$locale->tr("good_wish_and_good_bye")}

Copied: plog/trunk/templates/summary/agreement.template (from rev 838, plog/trunk/templates/misc/agreement.template)
===================================================================
--- plog/trunk/templates/misc/agreement.template	2005-01-25 18:26:42 UTC (rev 838)
+++ plog/trunk/templates/summary/agreement.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -0,0 +1,5 @@
+Please edit the contents of the file
+templates/summary/agreement.template to suit your needs.
+If you do not need a service agreement to be accepted by end users, please
+disable this feature by setting 'summary_show_agreement' to 'No' via the
+administration interface.
\ No newline at end of file

Modified: plog/trunk/templates/summary/blogprofile.template
===================================================================
--- plog/trunk/templates/summary/blogprofile.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/blogprofile.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,4 +1,6 @@
-{include file="summary/header.template" selected="blogslist" columns=1 section=$locale->tr("blog")}
+{assign value=$locale->tr("blog") var=title}
+{assign value=$blog->getBlog() var=blogName}
+{include file="summary/header.template" selected="blogslist" columns=1 section="$title $blogName"}
 <div id="onecolumn">
 	{assign var="url" value=$blog->getBlogRequestGenerator()}
     <h4><a href="{$url->blogLink()}">&raquo; {$blog->getBlog()|strip_tags}</a></h4>

Copied: plog/trunk/templates/summary/email_confirm.template (from rev 838, plog/trunk/templates/misc/email_confirm.template)

Deleted: plog/trunk/templates/summary/error.template
===================================================================
--- plog/trunk/templates/summary/error.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/error.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,5 +0,0 @@
-{include file="summary/header.template" section=$locale->tr("error")}
-<div id="onecolumn">
- {$message}
-</div>
-{include file="summary/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/formvalidate.template
===================================================================
--- plog/trunk/templates/summary/formvalidate.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/formvalidate.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -3,7 +3,7 @@
 **}
   {if ($form->formHasRun() && !$form->formIsValid()) || $viewIsError}
 	  <div id="FormError">
-	   <!--<img src="imgs/icon_warning-16.png" alt="Info" />&nbsp;-->
+	   <img src="imgs/icon_warning-16.png" alt="Info" class="InfoIcon" />
 	   <span style="color:red">{$message}</span>
 	  </div>
   {/if}  

Modified: plog/trunk/templates/summary/registererror.template
===================================================================
--- plog/trunk/templates/summary/registererror.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/registererror.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,15 +1,13 @@
-{include file="summary/header.template" selected="register" columns=1}
+{include file="summary/header.template" selected="register" columns=1 section=$locale->tr("error")}
 <div id="onecolumn">
-
- <h1>{$locale->tr("register_error")}</h1>
  <p>
-  {$locale->tr("register_error_message")}
+  {$locale->tr("register_error")}
  </p>
  <p>
-  <span style="color: red">{$message}</span>
+  <span style="color: red">{$viewErrorMessage}</span>
  </p>
  <p>
-<input type="button" onclick="javascript:history.go(-1)" name="back" value="&laquo; Back" />
+<a href="#" onclick="javascript:history.go(-1)">&laquo; {$locale->tr("back")}</a>
  </p>
 </div>
 {include file="summary/footer.template"}

Modified: plog/trunk/templates/summary/registerstep0.template
===================================================================
--- plog/trunk/templates/summary/registerstep0.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/registerstep0.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,13 +1,13 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step0_title")}
+{include file="summary/header.template" section=$locale->tr("register_step0_title")}
 <form action="summary.php" method="post">
   <fieldset class="inputField">
-   <legend>{$locale->tr("service_use_agreement")}</legend>
+   <legend>{$locale->tr("agreement")}</legend>
    <div class="field">
     <!--user aggreement-->
     <label for="contract">{$locale->tr("read_service_agreement")}</label>
     <div class="formHelp"></div>
-    <textarea name="contract" class="contract" readonly="readonly" style="width:100%">
-{include file="misc/agreement.template"}
+    <textarea name="contract" class="contract" readonly="readonly" style="width:100%" rows="15">
+{include file="summary/agreement.template"}
     </textarea>
     <!--end user agreement-->
    </div>

Modified: plog/trunk/templates/summary/registerstep1.template
===================================================================
--- plog/trunk/templates/summary/registerstep1.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/registerstep1.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,9 +1,9 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step1_title")}
+{include file="summary/header.template" section=$locale->tr("register_step1_title")}
   <form name="newUser" action="summary.php" method="post">
     <fieldset class="inputField">
-        <legend>{$locale->tr("register_user")}</legend>
+        <legend>{$locale->tr("step1")}</legend>
         <p>
-          {$locale->tr("register_step1_fill_in_title")}
+          {$locale->tr("register_step1_help")}
         </p>        
         {include file="summary/formvalidate.template" message=$locale->tr("error_adding_user")}
         <div class="field">
@@ -11,7 +11,7 @@
 			<span class="required">*</span>
 			<div class="formHelp">{$locale->tr("username_help")}</div>
             <input type="text" name="userName" value="{$userName}" id="userName" />
-            {include file="summary/validate.template" field=userName message=$locale->tr("register_error_incorrect_username")}
+            {include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
         </div>
         <div class="field">
             <label for="userFullName">{$locale->tr("full_name")}</label>
@@ -23,22 +23,22 @@
             <label for="userPassword">{$locale->tr("password")}</label>
 			<span class="required">*</span>
             <input type="password" name="userPassword" id="userPassword" value="{$userPassword}"/>
-            {include file="summary/validate.template" field=userPassword message=$locale->tr("register_error_incorrect_password")}            
+            {include file="summary/validate.template" field=userPassword message=$locale->tr("error_invalid_password")}            
 			<div class="formHelp">{$locale->tr("password_help")}</div>
-            <label for="userPasswordCheck">{$locale->tr("password_confirm")}</label><br />
+            <label for="userPasswordCheck">{$locale->tr("confirm_password")}</label><br />
             <input type="password" name="userPasswordCheck" id="userPasswordCheck" value="{$userPasswordCheck}"/>
-            {include file="summary/validate.template" field=userPasswordCheck message=$locale->tr("register_error_passwords_dont_match")}            
+            {include file="summary/validate.template" field=userPasswordCheck message=$locale->tr("error_passwords_dont_match")}            
         </div>
         <div class="field">
             <label for="userPasswordCheck">{$locale->tr("email")}</label>
 			<span class="required">*</span>
-			<div class="formHelp">{$locale->tr("user_email_info")}</div>
+			<div class="formHelp">{$locale->tr("email_help")}</div>
             <input type="text" name="userEmail" id="userEmail" value="{$userEmail}"/>
-            {include file="summary/validate.template" field=userEmail message=$locale->tr("register_error_incorrect_email")}
+            {include file="summary/validate.template" field=userEmail message=$locale->tr("error_incorrect_email_address")}
         </div>
     </fieldset>
     <div class="buttons">
-      <input type="submit"  value="{$locale->tr("register_next")}" name="Register"/>
+      <input type="submit"  value="&raquo; {$locale->tr("register_next")}" name="Register"/>
       <input type="hidden" name="op" value="RegisterStep2"/>
     </div>
   </form>

Modified: plog/trunk/templates/summary/registerstep2.template
===================================================================
--- plog/trunk/templates/summary/registerstep2.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/registerstep2.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,20 +1,19 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step2_title")}
- <p>{$locale->tr("register_user_created")}</p>
+{include file="summary/header.template" section=$locale->tr("register_step2_title")}
  <form name="createBlog" action="summary.php" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step2")}</legend>
-   {include file="summary/formvalidate.template" message=$locale->tr("register_error_creating_blog")}     
+   {include file="summary/formvalidate.template" message=$locale->tr("error_adding_blog")}     
    <div class="field">
-     <label for="blogName">{$locale->tr("register_step2_blog_name")}</label>
+     <label for="blogName">{$locale->tr("name")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("blog_name_help")}</div>
+     <div class="formHelp">{$locale->tr("register_blog_name_help")}</div>
      <input type="text" name="blogName" value="{$blogName}" id="blogName" />
-     {include file="summary/validate.template" field=blogName message=$locale->tr("register_error_blog_name")}
+     {include file="summary/validate.template" field=blogName message=$locale->tr("error_empty_name")}
    </div>  
    <div class="field">
-     <label for="blogLocale">{$locale->tr("locales")}</label>
+     <label for="blogLocale">{$locale->tr("language")}</label>
      <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("blog_locale_help")}</div>
+     <div class="formHelp">{$locale->tr("blog_language_help")}</div>
      <select name="blogLocale" id="blogLocale">
       {foreach from=$locales item=localeObject}
         <option value="{$localeObject->getLocaleCode()}" {if $blogLocale == $localeObject->getLocaleCode()}selected="selected"{/if}>{$localeObject->getDescription()}</option>

Modified: plog/trunk/templates/summary/registerstep3.template
===================================================================
--- plog/trunk/templates/summary/registerstep3.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/registerstep3.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,9 +1,11 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step3_title")}
+{include file="summary/header.template" section=$locale->tr("register_step3_title")}
  <form name="templateChooser" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step3")}</legend>
    <div class="field">
-    {**include file="summary/validate.template" field=templateId message=$locale->tr("error_must_choose_template")**}
+	<label for="">{$locale->tr("select_template")}</label>
+	<div class="formHelp">{$locale->tr("register_step3_help")}</div>
+    {include file="summary/validate.template" field=templateId message=$locale->tr("error_must_choose_template")}	
     {foreach from=$templates item=template}
      {assign var=templateName value=$template->getName()}
      <img src="{$template->getScreenshotUrl()}" alt="{$templateName}" height="300" width="400" /><br/>

Modified: plog/trunk/templates/summary/registerstep5.template
===================================================================
--- plog/trunk/templates/summary/registerstep5.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/registerstep5.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,18 +1,20 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step5_title")}
+{include file="summary/header.template" section=$locale->tr("register_step5_title")}
 <div id="onecolumn">
  <form name="formDone"> 
   <fieldset class="inputField">
-   {$locale->tr("register_new_blog_step5_description")}
-
+   <p>
+    <b>{$locale->tr("register_step5_help")}</b>
+   </p>
+   <p>	
    {if $need_email_confirm == 1}
-       {$locale->tr("register_need_confirm")}<br>
+       {$locale->tr("register_need_confirmation")}<br/>
    {else}
-       {$locale->tr("register_step5_admin_link")}<br>
-       {$locale->tr("register_step5_blog_link1")}<br>
-       {$blogurl}<br>
-       {$locale->tr("register_step5_blog_link2")}<br>
-       {$locale->tr("register_step5_final_message")}<br>
+       {assign var=url value=$blog->getBlogRequestGenerator()}
+	   {assign var=blogName value=$blog->getBlog()}
+       {$locale->pr("register_blog_link",$blogName)}<br/>   
+       {$locale->tr("register_blog_admin_link")}<br/>
    {/if}
+   </p>
   </fieldset>
   <div class="buttons">
    <input type="hidden" name="op" value="Default" />

Modified: plog/trunk/templates/summary/userlist.template
===================================================================
--- plog/trunk/templates/summary/userlist.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/userlist.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,4 +1,4 @@
-{include file="summary/header.template" section=$locale->tr("summary_user_list")}
+{include file="summary/header.template" section=$locale->tr("users")}
 <div id="onecolumn">
     {foreach from=$users item=user}
         <h3><a href="?op=UserProfile&amp;userId={$user->getId()}">{$user->getUsername()}</a></h3>

Modified: plog/trunk/templates/summary/userprofile.template
===================================================================
--- plog/trunk/templates/summary/userprofile.template	2005-01-25 19:22:34 UTC (rev 839)
+++ plog/trunk/templates/summary/userprofile.template	2005-01-25 20:36:07 UTC (rev 840)
@@ -1,5 +1,5 @@
 {assign var=userName value=$user->getUsername()}
-{assign var=title value=$locale->tr("user_profile")}
+{assign var=title value=$locale->tr("user")}
 {assign var=sectionTitle value="$title $userName"}
 {include file="summary/header.template" selected="userslist" section="$title $userName"}
 <div id="onecolumn">




More information about the pLog-svn mailing list