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

merging 5.4.4 changes

Browse source
This commit is contained in:
JT Smith 2003-09-14 21:43:20 +00:00
parent 2b6d4a36fc
commit 6272369816
12 changed files with 1842 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Operation/Account.pm
View file

@ -557,6 +557,9 @@ sub www_viewMessageLogMessage {
if ($data{url} ne "") {
$output .= '</a>';
}
unless ($data{message} =~ /\<div\>/ig || $data{message} =~ /\<br\>/ig || $data{message} =~ /\<p\>/ig) {
$data{message} =~ s/\n/\<br\>/g;
}
$output .= '<br>'.$data{message}.'<p>';
if ($data{url} ne "" && $data{status} eq 'pending') {
$output .= '<a href="'.$data{url}.'">'.WebGUI::International::get(554).'</a> &middot; ';

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

@ -92,7 +92,13 @@ sub _selectPositions {
my ($templates, $output, $f, $key);
$f = WebGUI::HTMLForm->new(1);
$templates = WebGUI::Page::getTemplateList();
$f->select("templateId",$templates,'',[$_[0]],'','','onChange="changeTemplatePreview(this.form.templateId.value)"');
$f->selectList(
-name=>"templateId",
-options=>$templates,
-value=>[$_[0]],
-extras=>'onChange="changeTemplatePreview(this.form.templateId.value)"',
-subtext=>' &nbsp; <a href="'.WebGUI::URL::page("op=listTemplates&namespace=Page").'">'.WebGUI::International::get(742).'</a>'
);
$output = '
<script language="JavaScript">
function checkBrowser(){

3
lib/WebGUI/Operation/Theme.pm
View file

@ -353,6 +353,7 @@ sub www_importThemeValidate {
$extracted->untar($filename);
my $propertiesFile = WebGUI::Attachment->new("_theme.properties","temp",$subnode);
my $theme = $propertiesFile->getHashref;
my @themes = WebGUI::SQL->buildArray("select name from theme");
my $f = WebGUI::HTMLForm->new;
$f->hidden(
-name=>"op",
@ -384,7 +385,7 @@ sub www_importThemeValidate {
);
if ($theme->{webguiVersion} > $WebGUI::VERSION) {
$output .= WebGUI::International::get(926);
} elsif (0) {
} elsif (isIn($theme->{name},@themes)) {
$output .= WebGUI::International::get(925);
} else {
$output .= WebGUI::International::get(928);