bug fixes

This commit is contained in:
JT Smith 2005-08-25 19:55:23 +00:00
parent ed161ce282
commit 3fc44f2bc4
4 changed files with 675 additions and 9 deletions

View file

@ -25,6 +25,11 @@
- fix [ 1262002 ] no "next Thread" or "previous Thread" links (mwilson)
- fix [ 1252626 ] navigation relative to current url broken (mwilson)
- fix [ 1261994 ] getLineageLength (mwilson)
- Updated references to Ruling WebGUI to be changed to WebGUI Done Right in
the default content.
- Changed the page templates to float better in IE.
- Fixed a bug that caused the page layout template not to change immediately
upon an edit.
6.7.1

File diff suppressed because one or more lines are too long

View file

@ -16,9 +16,670 @@ fixSpelling();
fixCSTemplate();
speedUpAdminConsole();
removeOldFiles();
updatePageTemplates();
finish();
#-------------------------------------------------
sub updatePageTemplates {
print "\tMaking page templates float better in IE.\n" unless ($quiet);
# news
my $template = <<END;
<a href="<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
<h1><tmpl_var title></h1>
</tmpl_if>
<tmpl_if description>
<p><tmpl_var description></p>
</tmpl_if>
<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>
<!-- begin position 1 -->
<div>
<tmpl_if showAdmin>
<table border="0" id="position1" class="content"><tbody>
</tmpl_if>
<tmpl_loop position1_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 1 -->
<div style="clear: both;">&nbsp;</div>
<div>
<!-- begin position 2 -->
<div style="width: 49%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position2" class="content"><tbody>
</tmpl_if>
<tmpl_loop position2_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 2 -->
<!-- begin position 3 -->
<div style="width: 49%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position3" class="content"><tbody>
</tmpl_if>
<tmpl_loop position3_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 3 -->
</div>
<div style="clear: both;">&nbsp;</div>
<!-- begin position 4 -->
<div>
<tmpl_if showAdmin>
<table border="0" id="position4" class="content"><tbody>
</tmpl_if>
<tmpl_loop position4_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 4 -->
<tmpl_if showAdmin>
<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
<tmpl_var dragger.init>
</tmpl_if>
END
WebGUI::Asset->new("PBtmpl0000000000000094","WebGUI::Asset::Template")->addRevision({template=>$template})->commit;
# side by side
$template = <<END;
<a href="<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
<h1><tmpl_var title></h1>
</tmpl_if>
<tmpl_if description>
<p><tmpl_var description></p>
</tmpl_if>
<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>
<div style="clear: both;">&nbsp;</div>
<div>
<!-- begin position 1 -->
<div style="width: 49%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position1" class="content"><tbody>
</tmpl_if>
<tmpl_loop position1_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 1 -->
<!-- begin position 2 -->
<div style="width: 49%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position2" class="content"><tbody>
</tmpl_if>
<tmpl_loop position2_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 2 -->
</div>
<div style="clear: both;">&nbsp;</div>
<tmpl_if showAdmin>
<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
<tmpl_var dragger.init>
</tmpl_if>
END
WebGUI::Asset->new("PBtmpl0000000000000135","WebGUI::Asset::Template")->addRevision({template=>$template})->commit;
# left column
$template = <<END;
<a href="<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
<h1><tmpl_var title></h1>
</tmpl_if>
<tmpl_if description>
<p><tmpl_var description></p>
</tmpl_if>
<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>
<div style="clear: both;">&nbsp;</div>
<div>
<!-- begin position 1 -->
<div style="width: 33%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position1" class="content"><tbody>
</tmpl_if>
<tmpl_loop position1_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 1 -->
<!-- begin position 2 -->
<div style="width: 65%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position2" class="content"><tbody>
</tmpl_if>
<tmpl_loop position2_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 2 -->
</div>
<div style="clear: both;">&nbsp;</div>
<tmpl_if showAdmin>
<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
<tmpl_var dragger.init>
</tmpl_if>
END
WebGUI::Asset->new("PBtmpl0000000000000125","WebGUI::Asset::Template")->addRevision({template=>$template})->commit;
# right column
$template = <<END;
<a href="<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
<h1><tmpl_var title></h1>
</tmpl_if>
<tmpl_if description>
<p><tmpl_var description></p>
</tmpl_if>
<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>
<div style="clear: both;">&nbsp;</div>
<div>
<!-- begin position 1 -->
<div style="width: 65%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position1" class="content"><tbody>
</tmpl_if>
<tmpl_loop position1_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 1 -->
<!-- begin position 2 -->
<div style="width: 33%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position2" class="content"><tbody>
</tmpl_if>
<tmpl_loop position2_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 2 -->
</div>
<div style="clear: both;">&nbsp;</div>
<tmpl_if showAdmin>
<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
<tmpl_var dragger.init>
</tmpl_if>
END
WebGUI::Asset->new("PBtmpl0000000000000131","WebGUI::Asset::Template")->addRevision({template=>$template})->commit;
# one over three
$template = <<END;
<a href="<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
<h1><tmpl_var title></h1>
</tmpl_if>
<tmpl_if description>
<p><tmpl_var description></p>
</tmpl_if>
<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>
<!-- begin position 1 -->
<div>
<tmpl_if showAdmin>
<table border="0" id="position1" class="content"><tbody>
</tmpl_if>
<tmpl_loop position1_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 1 -->
<div style="clear: both;">&nbsp;</div>
<div>
<!-- begin position 2 -->
<div style="width: 32%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position2" class="content"><tbody>
</tmpl_if>
<tmpl_loop position2_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 2 -->
<!-- begin position 3 -->
<div style="width: 33%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position3" class="content"><tbody>
</tmpl_if>
<tmpl_loop position3_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 3 -->
<!-- begin position 4 -->
<div style="width: 32%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position4" class="content"><tbody>
</tmpl_if>
<tmpl_loop position4_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 4 -->
</div>
<div style="clear: both;">&nbsp;</div>
<tmpl_if showAdmin>
<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
<tmpl_var dragger.init>
</tmpl_if>
END
WebGUI::Asset->new("PBtmpl0000000000000109","WebGUI::Asset::Template")->addRevision({template=>$template})->commit;
# three over one
$template = <<END;
<a href="<tmpl_var assetId>"></a>
<tmpl_if displayTitle>
<h1><tmpl_var title></h1>
</tmpl_if>
<tmpl_if description>
<p><tmpl_var description></p>
</tmpl_if>
<tmpl_if showAdmin>
<p><tmpl_var controls></p>
</tmpl_if>
<div style="clear: both;">&nbsp;</div>
<div>
<!-- begin position 1 -->
<div style="width: 32%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position1" class="content"><tbody>
</tmpl_if>
<tmpl_loop position1_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 1 -->
<!-- begin position 2 -->
<div style="width: 33%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position2" class="content"><tbody>
</tmpl_if>
<tmpl_loop position2_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 2 -->
<!-- begin position 3 -->
<div style="width: 32%; float: left;">
<tmpl_if showAdmin>
<table border="0" id="position3" class="content"><tbody>
</tmpl_if>
<tmpl_loop position3_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 3 -->
</div>
<div style="clear: both;">&nbsp;</div>
<!-- begin position 4 -->
<div>
<tmpl_if showAdmin>
<table border="0" id="position4" class="content"><tbody>
</tmpl_if>
<tmpl_loop position4_loop>
<tmpl_if showAdmin>
<tr id="td<tmpl_var id>">
<td><div id="td<tmpl_var id>_div" class="dragable">
</tmpl_if>
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
<tmpl_if showAdmin>
</div></td>
</tr>
</tmpl_if>
</tmpl_loop>
<tmpl_if showAdmin>
</tbody></table>
</tmpl_if>
</div>
<!-- end position 4 -->
<tmpl_if showAdmin>
<table><tr id="blank" class="hidden"><td><div><div class="empty">&nbsp;</div></div></td></tr></table>
<tmpl_var dragger.init>
</tmpl_if>
END
WebGUI::Asset->new("PBtmpl0000000000000118","WebGUI::Asset::Template")->addRevision({template=>$template})->commit;
}
#-------------------------------------------------
sub removeOldFiles {
print "\tRemoving files that are no longer needed.\n" unless ($quiet);
@ -35,9 +696,6 @@ sub speedUpAdminConsole {
<div id="application_title">
<tmpl_var application.title>
</div>
<div id="console_title">
<tmpl_var console.title>
</div>
<div id="application_workarea">
<tmpl_var application.workArea>
</div>
@ -77,6 +735,9 @@ sub speedUpAdminConsole {
^LoginToggle;<br />
</div>
</div>
<div id="console_title">
<tmpl_var console.title>
</div>
<div id="application_help">
<tmpl_if help.url>
<a href="<tmpl_var help.url>" target="_blank"><img src="^Extras;/adminConsole/small/help.gif" alt="?" border="0" /></a>

View file

@ -1399,15 +1399,15 @@ sub www_editSave {
$object->updateHistory("edited");
if ($session{form}{proceed} eq "manageAssets") {
$session{asset} = $object->getParent;
return $object->getParent->www_manageAssets;
return $session{asset}->www_manageAssets;
}
if ($session{form}{proceed} ne "") {
my $method = "www_".$session{form}{proceed};
$session{asset} = $object;
return $object->$method();
return $session{asset}->$method();
}
$session{asset} = $object->getContainer;
return $self->getContainer->www_view;
return $session{asset}->www_view;
}