[pLog-svn] r793 - in plog/trunk: class/action/admin locale
templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Sat Jan 22 16:59:46 GMT 2005
Author: oscar
Date: 2005-01-22 16:59:45 +0000 (Sat, 22 Jan 2005)
New Revision: 793
Modified:
plog/trunk/class/action/admin/adminaddbloguseraction.class.php
plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/admin/addbloguser.template
plog/trunk/templates/admin/blogusers.template
plog/trunk/templates/admin/usersettings.template
Log:
more changes...
Modified: plog/trunk/class/action/admin/adminaddbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddbloguseraction.class.php 2005-01-22 13:51:53 UTC (rev 792)
+++ plog/trunk/class/action/admin/adminaddbloguseraction.class.php 2005-01-22 16:59:45 UTC (rev 793)
@@ -67,10 +67,11 @@
$users = new Users();
$userInfo = $users->getUserInfoFromUsername( $this->_newUsername );
if( !$userInfo ) {
- $this->log( "error could not find user ".$this->_newUsername );
+ $this->log->debug( "error could not find user ".$this->_newUsername );
$this->_view = new AdminTemplatedView( $this->_blogInfo, "addbloguser" );
- $this->_view->setErrorMessage( $this->_locale->pr("error_could_not_find_user"), $this->_newUsername );
- $this->setCommonData();
+ $this->_view->setErrorMessage( $this->_locale->pr("error_invalid_user"), $this->_newUsername );
+ $this->_form->setFieldValidationStatus( "newBlogUserName", false );
+ $this->setCommonData( true );
return false;
}
@@ -83,7 +84,7 @@
if( !$res ) {
// there was an error adding the user to the blog
$this->_view = new AdminTemplatedView( $this->_blogInfo, "addbloguser" );
- $this->_view->setErrorMessage( $this->_locale->pr("error_adding_user_to_blog", $userInfo->getUsername()));
+ $this->_view->setErrorMessage( $this->_locale->pr("error_adding_user", $userInfo->getUsername()));
$this->setCommonData();
return false;
Modified: plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php 2005-01-22 13:51:53 UTC (rev 792)
+++ plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php 2005-01-22 16:59:45 UTC (rev 793)
@@ -31,7 +31,7 @@
else
$this->registerFieldValidator( "userIds", new ArrayValidator());
$view = new AdminBlogUsersListView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_no_users_selected_to_remove_from_blog" ));
+ $view->setErrorMessage( $this->_locale->tr("error_no_users_selected" ));
$this->setValidationErrorView( $view );
}
@@ -69,8 +69,12 @@
else
$successMessage = $this->_locale->pr("users_removed_from_blog_ok", $totalOk);
}
- else
- $errorMessage .= $this->_locale->pr("error_removing_user_from_blog", $userInfo->getUsername())."<br/>";
+ else {
+ if( $userInfo )
+ $errorMessage .= $this->_locale->pr("error_removing_user_from_blog", $userInfo->getUsername())."<br/>";
+ else
+ $errorMessage .= $this->_locale->pr("error_removing_user_from_blog2", $userId)."<br/>";
+ }
}
$this->_view = new AdminBlogUsersListView( $this->_blogInfo );
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-01-22 13:51:53 UTC (rev 792)
+++ plog/trunk/locale/locale_en_UK.php 2005-01-22 16:59:45 UTC (rev 793)
@@ -526,11 +526,19 @@
$messages["error_invalid_password"] = "The password is not correct. Please make sure that it is not too short";
$messages["error_passwords_dont_match"] = "Sorry, passwords do not match";
$messages["error_incorrect_email_address"] = "The email address is not correct";
+$messages["error_updating_user_settings"] = "There was an error updating your user settings. Please check the data and try again";
+$messages["user_settings_updated_ok"] = "User settings updated successfully";
// plugin center
$messages["identifier"] = "Identifier";
// blog users
+$messages["revoke_permissions"] = "Revoke permissions";
+$messages["error_no_users_selected"] = "There were no users selected";
+$messages["user_removed_from_blog_ok"] = "User \"%s\" was removed from this blog successfully";
+$messages["users_removed_from_blog_ok"] = "%s users removed from this blog successfully";
+$messages["error_removing_user_from_blog"] = "There was an error removing user \"%s\" from this blog";
+$messages["error_removing_user_from_blog2"] = "There was an error removing user with identifier \"%s\" from this blog";
// new blog user
$messages["new_blog_username_help"] = "Username of the user to whom you would like to give access to this blog. New users will only have access to the 'Manage' and 'Resources' sections.";
@@ -538,15 +546,18 @@
$messages["send_user_notification_help"] = "Send an email notification to this user";
$messages["notification_text"] = "Notification Text";
$messages["notification_text_help"] = "Text that will be included in the notification message";
-
$messages["error_adding_user"] = "There was an error granting access to the user. Please check the data and try again";
-$messages["error_invalid_user"] = "The user is not correc t";
+$messages["error_invalid_user"] = "The user is not correct";
$messages["error_empty_text"] = "You must provide some text";
+$messages["error_adding_user"] = "There was an error adding the user. Please check the data and try again";
+$messages["error_invalid_user"] = "The user \"%s\" is not valid or does not exist";
+$messages["user_added_to_blog_ok"] = "User \"%s\" has been given access to this blog successfully";
// blog templates
+$messages["error_no_templates_selected"] = "No templaes were selected to delete";
// new blog template
// global settings
$messages["help_comments_enabled"] = "Enable comments by default in all new blogs";
-?>
+?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/addbloguser.template
===================================================================
--- plog/trunk/templates/admin/addbloguser.template 2005-01-22 13:51:53 UTC (rev 792)
+++ plog/trunk/templates/admin/addbloguser.template 2005-01-22 16:59:45 UTC (rev 793)
@@ -17,9 +17,11 @@
<div class="field">
<label for="sendNotification">{$locale->tr("send_notification")}</label>
- <span class="required"></span>
- <div class="formHelp">{$locale->tr("send_user_notification_help")}</div>
- <input class="checkbox" type="checkbox" id="sendNotification" name="sendNotification" value="{$sendNotification}" />
+ <span class="required"></span>
+ <div class="formHelp">
+ <input class="checkbox" type="checkbox" id="sendNotification" name="sendNotification" value="{$sendNotification}" />
+ {$locale->tr("send_user_notification_help")}
+ </div>
</div>
<div class="field">
Modified: plog/trunk/templates/admin/blogusers.template
===================================================================
--- plog/trunk/templates/admin/blogusers.template 2005-01-22 13:51:53 UTC (rev 792)
+++ plog/trunk/templates/admin/blogusers.template 2005-01-22 16:59:45 UTC (rev 793)
@@ -14,10 +14,9 @@
<thead>
<tr>
<th style="width:10px;"><input class="checkbox" type="checkbox" class="check" name="all" id="all" value="1" onclick="toggleAllChecks('blogUsers');" /></th>
- <th style="width:25px;">UID</a></th>
<th style="width:145px;">{$locale->tr("username")}</th>
- <th style="width:315px;">{$locale->tr("full_name")}</th>
- <th style="width:200px;">{$locale->tr("email")}</th>
+ <th style="width:325px;">{$locale->tr("full_name")}</th>
+ <th style="width:210px;">{$locale->tr("email")}</th>
<th style="width:90px;">{$locale->tr("actions")}</th>
</tr>
</thead>
@@ -28,9 +27,6 @@
<input class="checkbox" type="checkbox" name="userIds[{$bloguser->getId()}]" id="checks_1" value="{$bloguser->getId()}" />
</td>
<td class="col_highlighted">
- {$bloguser->getId()}
- </td>
- <td class="col_highlighted">
{$bloguser->getUsername()}
</td>
<td>
Modified: plog/trunk/templates/admin/usersettings.template
===================================================================
--- plog/trunk/templates/admin/usersettings.template 2005-01-22 13:51:53 UTC (rev 792)
+++ plog/trunk/templates/admin/usersettings.template 2005-01-22 16:59:45 UTC (rev 793)
@@ -53,7 +53,7 @@
<div style="width:20%;float:left;margin-left:18px;">
<div class="field">
<label for="userPictureId">{$locale->tr("picture")}</label>
- <div class="formHelp">{$locale->tr("user_picture_help")}</div>
+ <br/>
{if $user->hasPicture()}
{assign var=userPicture value=$user->getPicture()}
{assign var=imgInfo value=$userPicture->getMetadataReader()}
@@ -61,7 +61,7 @@
{else}
<img alt="Picture" src="imgs/no-user-picture.jpg" id="userPicture" style="display:block;margin-left:auto;margin-right:auto"/>
{/if}
- <br/>
+ <div class="formHelp">{$locale->tr("user_picture_help")}</div>
<a href="javascript:userPictureSelectWindow();">{$locale->tr("choose")}...</a>
<input type="hidden" name="userPictureId" id="userPictureId" value="{$user->getPictureId()}" />
</div>
More information about the pLog-svn
mailing list