XHTML bugfixes

This commit is contained in:
Wouter van Oijen 2005-09-21 21:57:01 +00:00
parent 439e40dadf
commit 8243d36d3b
7 changed files with 11 additions and 7 deletions

View file

@ -198,8 +198,8 @@ sub getEditForm {
-size=>7, -size=>7,
-value=>$self->getValue($highlight), -value=>$self->getValue($highlight),
-subtext=>qq{ -subtext=>qq{
<A HREF="#" onClick="cp.select($highlight,'$highlight'); <a href="#" onclick="cp.select($highlight,'$highlight');
return false;" NAME="$highlight" ID="$highlight">Pick</A>} return false;" name="$highlight" id="$highlight">Pick</a>}
); );
} }
return $tabform; return $tabform;

View file

@ -217,6 +217,7 @@ sub getEditForm {
); );
my $start = $self->getValue("startPoint"); my $start = $self->getValue("startPoint");
$tabform->getTab("properties")->raw("<script type=\"text/javascript\"> $tabform->getTab("properties")->raw("<script type=\"text/javascript\">
//<![CDATA[
var displayNavDescendantEndPoint = true; var displayNavDescendantEndPoint = true;
var displayNavAncestorEndPoint = true; var displayNavAncestorEndPoint = true;
function toggleDescendantEndPoint () { function toggleDescendantEndPoint () {
@ -248,6 +249,7 @@ sub getEditForm {
changeStartPoint(); changeStartPoint();
".($descendantsChecked ? "" : "toggleDescendantEndPoint();")." ".($descendantsChecked ? "" : "toggleDescendantEndPoint();")."
".($ancestorsChecked ? "" : "toggleAncestorEndPoint();")." ".($ancestorsChecked ? "" : "toggleAncestorEndPoint();")."
//]]>
</script>"); </script>");
my $previewButton;# = qq{ my $previewButton;# = qq{
# <INPUT TYPE="button" VALUE="Preview" NAME="preview" # <INPUT TYPE="button" VALUE="Preview" NAME="preview"
@ -256,7 +258,7 @@ sub getEditForm {
# this.form.func.value='preview'; # this.form.func.value='preview';
# this.form.target = 'navPreview'; # this.form.target = 'navPreview';
# this.form.submit()">}; # this.form.submit()">};
my $saveButton = ' <input type="button" value="'.WebGUI::International::get(62).'" onClick=" my $saveButton = ' <input type="button" value="'.WebGUI::International::get(62).'" onclick="
this.value=\''.WebGUI::International::get(452).'\'; this.value=\''.WebGUI::International::get(452).'\';
this.form.func.value=\'editSave\'; this.form.func.value=\'editSave\';
this.form.target=\'_self\'; this.form.target=\'_self\';

View file

@ -207,7 +207,7 @@ sub getEditForm {
if ($nr < 5 and ($self->get("dbQuery".($nr+1)) eq "" || ($self->get("dbQuery".($nr)) eq "" and $self->get("dbQuery".($nr+1)) ne ""))) { if ($nr < 5 and ($self->get("dbQuery".($nr+1)) eq "" || ($self->get("dbQuery".($nr)) eq "" and $self->get("dbQuery".($nr+1)) ne ""))) {
$tabform->getTab("properties")->button( $tabform->getTab("properties")->button(
-value=>WebGUI::International::get('Add another query',"Asset_SQLReport"), -value=>WebGUI::International::get('Add another query',"Asset_SQLReport"),
-extras=>'onClick="toggleQuery(\''.($nr+1).'\'); this.style.display=\'none\';"', -extras=>'onclick="toggleQuery(\''.($nr+1).'\'); this.style.display=\'none\';"',
-noWait=>1 -noWait=>1
); );
} }

View file

@ -320,6 +320,7 @@ WebGUI::Style::setLink($session{config}{extrasURL}.'/assetManager/assetManager.c
my $i18n = WebGUI::International->new("Asset"); my $i18n = WebGUI::International->new("Asset");
my $output = " my $output = "
<script type=\"text/javascript\"> <script type=\"text/javascript\">
//<![CDATA[
var assetManager = new AssetManager(); var assetManager = new AssetManager();
assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form'); assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
assetManager.AddColumn('".$i18n->get("99")."','','left',''); assetManager.AddColumn('".$i18n->get("99")."','','left','');
@ -351,6 +352,7 @@ WebGUI::Style::setLink($session{config}{extrasURL}.'/assetManager/assetManager.c
for(var i = 0; i < form.assetId.length; i++) for(var i = 0; i < form.assetId.length; i++)
form.assetId[i].checked = assetListSelectAllToggle; form.assetId[i].checked = assetListSelectAllToggle;
} }
//]]>
</script> <div class="adminConsoleSpacer"> &nbsp;</div>'; </script> <div class="adminConsoleSpacer"> &nbsp;</div>';
return $ac->render($output, $header); return $ac->render($output, $header);
} }

View file

@ -198,7 +198,7 @@ sub www_exportStatus {
$iframeUrl = WebGUI::URL::append($iframeUrl, 'userId='.$session{form}{userId}); $iframeUrl = WebGUI::URL::append($iframeUrl, 'userId='.$session{form}{userId});
$iframeUrl = WebGUI::URL::append($iframeUrl, 'extrasURL='.$session{form}{extrasURL}); $iframeUrl = WebGUI::URL::append($iframeUrl, 'extrasURL='.$session{form}{extrasURL});
$iframeUrl = WebGUI::URL::append($iframeUrl, 'uploadsURL='.$session{form}{uploadsURL}); $iframeUrl = WebGUI::URL::append($iframeUrl, 'uploadsURL='.$session{form}{uploadsURL});
my $output = '<IFRAME SRC="'.$iframeUrl.'" TITLE="'.WebGUI::International::get('Page Export Status',"Asset").'" WIDTH="410" HEIGHT="200"></IFRAME>'; my $output = '<iframe src="'.$iframeUrl.'" title="'.WebGUI::International::get('Page Export Status',"Asset").'" width="410" height="200"></iframe>';
$self->getAdminConsole->render($output,WebGUI::International::get('Page Export Status',"Asset"),"Asset"); $self->getAdminConsole->render($output,WebGUI::International::get('Page Export Status',"Asset"),"Asset");
} }

View file

@ -118,7 +118,7 @@ sub toHtml {
return $self->SUPER::toHtml return $self->SUPER::toHtml
.WebGUI::Form::Button->new( .WebGUI::Form::Button->new(
id=>$self->{id}, id=>$self->{id},
extras=>'style="font-size: 8pt;" onClick="window.timeField = this.form.'.$self->{name}.';clockSet = window.open(\''.$session{config}{extrasURL}. '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"', extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->{name}.';clockSet = window.open(\''.$session{config}{extrasURL}. '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
value=>WebGUI::International::get(970) value=>WebGUI::International::get(970)
)->toHtml; )->toHtml;
} }

View file

@ -207,7 +207,7 @@ sub new {
} }
my $cancel = WebGUI::Form::button({ my $cancel = WebGUI::Form::button({
value=>WebGUI::International::get('cancel'), value=>WebGUI::International::get('cancel'),
extras=>q|onClick="location.href='|.$cancelUrl.q|'"| extras=>q|onclick="location.href='|.$cancelUrl.q|'"|
}); });
bless { _uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class; bless { _uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
} }