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

Added per page language settings.

Browse source
This commit is contained in:
JT Smith 2002-12-01 01:13:05 +00:00
parent da906bbee6
commit 009e52320b
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/upgrades/upgrade_4.8.0-4.9.0.sql
View file

@ -975,6 +975,7 @@ alter table SiteMap drop column bullet;
alter table SiteMap drop column lineSpacing; alter table SiteMap drop column lineSpacing;
INSERT INTO template VALUES (1,'Default Site Map','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_loop page_loop>\r\n <tmpl_var page.indent>&middot;<a href=\"<tmpl_var page.url>\"><tmpl_var page.title></a><br/>\r\n</tmpl_loop>','SiteMap'); INSERT INTO template VALUES (1,'Default Site Map','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_loop page_loop>\r\n <tmpl_var page.indent>&middot;<a href=\"<tmpl_var page.url>\"><tmpl_var page.title></a><br/>\r\n</tmpl_loop>','SiteMap');
INSERT INTO template VALUES (2,'Descriptive Site Map','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_loop page_loop>\r\n <tmpl_var page.indent><a href=\"<tmpl_var page.url>\"><tmpl_var page.title></a> \r\n <tmpl_if page.synopsis>\r\n - <tmpl_var page.synopsis>\r\n </tmpl_if>\r\n <p/>\r\n</tmpl_loop>','SiteMap'); INSERT INTO template VALUES (2,'Descriptive Site Map','<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_loop page_loop>\r\n <tmpl_var page.indent><a href=\"<tmpl_var page.url>\"><tmpl_var page.title></a> \r\n <tmpl_if page.synopsis>\r\n - <tmpl_var page.synopsis>\r\n </tmpl_if>\r\n <p/>\r\n</tmpl_loop>','SiteMap');
alter table page add column languageId int not null default 1;

10
lib/WebGUI/Operation/Page.pm
View file

@ -190,11 +190,18 @@ sub www_editPage {
-value=>$page{urlizedTitle}, -value=>$page{urlizedTitle},
-uiLevel=>3 -uiLevel=>3
); );
$f->select(
-name=>"languageId",
-label=>WebGUI::International::get(304),
-value=>[$page{internationalId}],
-uiLevel=>1,
-options=>WebGUI::International::getLanguages()
);
$f->url( $f->url(
-name=>"redirectURL", -name=>"redirectURL",
-label=>WebGUI::International::get(715), -label=>WebGUI::International::get(715),
-value=>$page{redirectURL}, -value=>$page{redirectURL},
-uiLevel=>8 -uiLevel=>9
); );
$f->textarea( $f->textarea(
-name=>"synopsis", -name=>"synopsis",
@ -357,6 +364,7 @@ sub www_editPageSave {
metaTags=".quote($session{form}{metaTags}).", metaTags=".quote($session{form}{metaTags}).",
urlizedTitle='$session{form}{urlizedTitle}', urlizedTitle='$session{form}{urlizedTitle}',
redirectURL='$session{form}{redirectURL}', redirectURL='$session{form}{redirectURL}',
languageId='$session{form}{languageId}',
defaultMetaTags='$session{form}{defaultMetaTags}', defaultMetaTags='$session{form}{defaultMetaTags}',
templateId='$session{form}{templateId}', templateId='$session{form}{templateId}',
menuTitle=".quote($session{form}{menuTitle}).", menuTitle=".quote($session{form}{menuTitle}).",

7
lib/WebGUI/Session.pm
View file

@ -97,6 +97,7 @@ sub _setupUserInfo {
from userProfileData, userProfileField where userProfileData.fieldName=userProfileField.fieldName from userProfileData, userProfileField where userProfileData.fieldName=userProfileField.fieldName
and userProfileData.userId='$user{userId}'"); and userProfileData.userId='$user{userId}'");
%user = (%user, %profile); %user = (%user, %profile);
$user{language} = $session{page}{languageId} if ($user{userId} == 1);
%default = WebGUI::SQL->buildHash("select fieldName, dataDefault from userProfileField %default = WebGUI::SQL->buildHash("select fieldName, dataDefault from userProfileField
where profileCategoryId=4"); where profileCategoryId=4");
foreach $key (keys %default) { foreach $key (keys %default) {
@ -331,13 +332,13 @@ sub open {
} else { } else {
_setupSessionVars($session{cookie}{wgSession},$session{setting}{sessionTimeout}); _setupSessionVars($session{cookie}{wgSession},$session{setting}{sessionTimeout});
} }
###----------------------------
### current page's properties (from page table)
_setupPageInfo("",$session{setting}{notFoundPage},$session{config}{scripturl});
###---------------------------- ###----------------------------
### current user's account and profile information (from users and userProfileData tables) ### current user's account and profile information (from users and userProfileData tables)
_setupUserInfo($session{var}{userId}); _setupUserInfo($session{var}{userId});
###---------------------------- ###----------------------------
### current page's properties (from page table)
_setupPageInfo("",$session{setting}{notFoundPage},$session{config}{scripturl});
###----------------------------
### language settings ### language settings
$session{language} = WebGUI::SQL->quickHashRef("select * from language where languageId=$session{user}{language}"); $session{language} = WebGUI::SQL->quickHashRef("select * from language where languageId=$session{user}{language}");
###---------------------------- ###----------------------------