oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up Friends templates.

Browse source
This commit is contained in:
Frank Dillon 2008-11-18 08:15:16 +00:00
parent dd56626460
commit f62575445c
5 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
docs/upgrades/packages-7.6.4/root_import_account.wgpkg
View file

Binary file not shown.

2
docs/upgrades/upgrade_7.6.3-7.6.4.pl
View file

@ -421,7 +421,7 @@ sub upgradeAccount {
#Add the settings for the friends module
$setting->add("friendsStyleTemplateId",""); #Use the userStyle by default
$setting->add("friendsLayoutTempalteId","N716tpSna0iIQTKxS4gTWA");
$setting->add("friendsLayoutTempalteId","zrNpGbT3odfIkg6nFSUy8Q");
$setting->add("friendsViewTemplateId","1Yn_zE_dSiNuaBGNLPbxtw");
$setting->add("friendsEditTemplateId","AZFU33p0jpPJ-E6qLSWZng");
$setting->add("friendsSendRequestTemplateId","AGJBGviWGAwjnwziiPjvDg");

2
lib/WebGUI/Account.pm
View file

@ -57,7 +57,7 @@ sub appendCommonVars {
$var->{'user_member_since'} = $user->dateCreated;
$var->{'view_profile_url' } = $user->getProfileUrl;
$var->{'root_url' } = $session->url->page("op=account");
#$var->{'back_url' } = $session->env->get("HTTP_REFERER") || $var->{'view_profile_url'}
$var->{'back_url' } = $session->url->getBackToSiteURL;
}

14
lib/WebGUI/Account/Friends.pm
View file

@ -45,11 +45,12 @@ sub appendCommonVars {
my $user = $session->user;
my $pageUrl = $session->url->page;
$var->{'user_full_name' } = $user->getWholeName;
$var->{'user_member_since' } = $user->dateCreated;
$var->{'view_profile_url' } = $user->getProfileUrl($pageUrl);
$var->{'edit_profile_url' } = $session->url->page("op=account");
$var->{'back_url' } = $session->env->get("HTTP_REFERER") || $var->{'view_profile_url'}
$self->SUPER::appendCommonVars($var);
$var->{'is_edit' } = $self->uid eq "";
$var->{'can_edit_friends'} = ($self->uid eq "" || $self->uid eq $session->user->userId);
$var->{'edit_friends_url'} = $self->getUrl("module=friends;do=view");
$var->{'view_friends_url'} = $self->getUrl("module=friends;do=view;uid=".$session->user->userId);
}
#-------------------------------------------------------------------
@ -225,7 +226,7 @@ This method returns the template ID for the account layout.
sub getLayoutTemplateId {
my $self = shift;
return $self->session->setting->get("friendsLayoutTempalteId") || $self->SUPER::getLayoutTemplateId;
return $self->session->setting->get("friendsLayoutTempalteId") || "zrNpGbT3odfIkg6nFSUy8Q";
}
@ -488,7 +489,6 @@ sub www_view {
$self->appendCommonVars($var);
my $displayView = $uid ne "";
$var->{'can_edit' } = $session->user->userId eq $user->userId;
$var->{'display_message'} = $msg;
#Override these

13
lib/WebGUI/i18n/English/Account_Friends.pm
View file

@ -94,13 +94,13 @@ our $I18N = {
lastUpdated => 1119068809
},
'edit my profile' => {
message => q|edit my profile|,
'edit my friends' => {
message => q|edit my friends|,
lastUpdated => 1068703399
},
'profile as others label' => {
message => q{view my profile as others see it},
'friends as others label' => {
message => q{view my friends as others see them},
lastUpdated => 1119068809
},
@ -167,11 +167,6 @@ Thanks,
message => q{This user prefers not to be added as a friend.},
lastUpdated => 1186264488,
},
'' => {
message => q{},
lastUpdated => 1225724810,
},
'back to user profile' => {
message => q{back to users profile},