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

Remove package with modified dragger tags.

Browse source 
Put the new dragger tags into the template variables generated by the Layout.
Update the Layout Help now that dragger.icon is inside the position loops.
Remove the gotcha text for the manual modification solution.
This commit is contained in:
Colin Kuskie 2009-04-17 15:59:05 +00:00
parent ded86ab837
commit fa2768ea50
4 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docs/gotcha.txt
View file

@ -12,17 +12,6 @@ save you many hours of grief.
--------------------------------------------------------------------
* WebGUI now requires XML::FeedPP version 0.40 or greater.
* Due to a change in the way that assets are dragged in Page Layouts,
custom layout templates need to be changed to add another div:
before:
<div class="content"><tmpl_var dragger.icon><tmpl_var content></div>
after:
<div class="content"><div id="td<tmpl_var id>_handle" class="dragable"><tmpl_var dragger.icon></div><tmpl_var content></div>
All default WebGUI Page Layout templates have already been updated.
7.7.2
--------------------------------------------------------------------
* WebGUI now requires Clone version 0.31 or greater.

BIN
docs/upgrades/packages-7.7.4/root_import_layout.wgpkg
View file

Binary file not shown.

12
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -175,6 +175,7 @@ sub prepareView {
}
my %vars;
$vars{showAdmin} = ($session->var->isAdminOn && $self->canEdit && $self->canEditIfLocked);
my $splitter = $self->{_viewSplitter} = $self->getSeparator;
@ -194,9 +195,12 @@ sub prepareView {
$child->prepareView;
$placeHolder{$assetId} = $child;
push @children, {
id => $assetId,
isUncommitted => $child->get('status') eq 'pending',
content => $splitter . $assetId . '~~',
id => $assetId,
isUncommitted => $child->get('status') eq 'pending',
content => $splitter . $assetId . '~~',
};
if ($vars{showAdmin}) {
$children[-1]->{'dragger.icon'} = sprintf '<div id="td%s_handle" class="dragable"><div class="dragTrigger dragTriggerWrap">%s</div></div>', $assetId, $session->icon->drag('class="dragTrigger"');
};
}
@ -230,7 +234,6 @@ sub prepareView {
unshift @{ $vars{"position1_loop"} }, reverse @children;
}
$vars{showAdmin} = ($session->var->isAdminOn && $self->canEdit && $self->canEditIfLocked);
if ($vars{showAdmin}) {
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
# for end users to work with our templates
@ -247,7 +250,6 @@ sub prepareView {
}
</style>
');
$vars{"dragger.icon"} = '<div class="dragTrigger dragTriggerWrap">'.$session->icon->drag('class="dragTrigger"').'</div>';
$vars{"dragger.init"} = '
<iframe id="dragSubmitter" style="display: none;" src="'.$session->url->extras('spacer.gif').'"></iframe>
<script type="text/javascript">

10
lib/WebGUI/Help/Asset_Layout.pm
View file

@ -18,11 +18,15 @@ our $HELP = {
},
],
variables => [
{ 'name' => 'showAdmin' },
{ 'name' => 'dragger.icon' },
{ 'name' => 'showAdmin' },
{ 'name' => 'dragger.init' },
{ 'name' => 'position1_loop',
'variables' => [ { 'name' => 'id' }, { 'name' => 'content' }, { 'name' => 'isUncommitted' }, ]
'variables' => [
{ 'name' => 'id' },
{ 'name' => 'content' },
{ 'name' => 'isUncommitted' },
{ 'name' => 'dragger.icon' },
]
},
],
fields => [],