From fa2768ea50affab96df2397dc4915ca57d485d98 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 17 Apr 2009 15:59:05 +0000 Subject: [PATCH] Remove package with modified dragger tags. 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. --- docs/gotcha.txt | 11 ----------- .../packages-7.7.4/root_import_layout.wgpkg | Bin 5971 -> 0 bytes lib/WebGUI/Asset/Wobject/Layout.pm | 12 +++++++----- lib/WebGUI/Help/Asset_Layout.pm | 10 +++++++--- 4 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 docs/upgrades/packages-7.7.4/root_import_layout.wgpkg diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 6151f22b5..6198ae206 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -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: -
- after: -
- - All default WebGUI Page Layout templates have already been updated. - - 7.7.2 -------------------------------------------------------------------- * WebGUI now requires Clone version 0.31 or greater. diff --git a/docs/upgrades/packages-7.7.4/root_import_layout.wgpkg b/docs/upgrades/packages-7.7.4/root_import_layout.wgpkg deleted file mode 100644 index 428695fab8385efe806bf07254c6ca629221c4a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5971 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 B=2rj! diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm index 5965308ed..e854ad2c4 100644 --- a/lib/WebGUI/Asset/Wobject/Layout.pm +++ b/lib/WebGUI/Asset/Wobject/Layout.pm @@ -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 '
%s
', $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 { } '); - $vars{"dragger.icon"} = '
'.$session->icon->drag('class="dragTrigger"').'
'; $vars{"dragger.init"} = '