diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000054.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000054.tmpl new file mode 100644 index 000000000..aff076cb0 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000054.tmpl @@ -0,0 +1,41 @@ +#PBtmpl0000000000000054 +
+ + +

+ + + +

+ + + +

+ + +
+ + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000094.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000094.tmpl new file mode 100644 index 000000000..504374220 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000094.tmpl @@ -0,0 +1,127 @@ +#PBtmpl0000000000000094 +
+ + +

+ + + +

+ + + +

+ + + +
+ + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
 
+ + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000109.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000109.tmpl new file mode 100644 index 000000000..0cea0f7c5 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000109.tmpl @@ -0,0 +1,129 @@ +#PBtmpl0000000000000109 +
+ + +

+ + + + +

+ + + +

+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000118.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000118.tmpl new file mode 100644 index 000000000..49b67f2e9 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000118.tmpl @@ -0,0 +1,125 @@ +#PBtmpl0000000000000118 +
+ + +

+ + + +

+ + + +

+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000125.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000125.tmpl new file mode 100644 index 000000000..5fe0687ea --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000125.tmpl @@ -0,0 +1,73 @@ +#PBtmpl0000000000000125 + + + +

+ + + +

+ + + +

+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000131.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000131.tmpl new file mode 100644 index 000000000..3d3176d18 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000131.tmpl @@ -0,0 +1,73 @@ +#PBtmpl0000000000000131 +
+ + +

+ + + +

+ + + +

+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl0000000000000135.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000135.tmpl new file mode 100644 index 000000000..0fb32bd5a --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl0000000000000135.tmpl @@ -0,0 +1,74 @@ +#PBtmpl0000000000000135 +
+ + +

+ + + + +

+ + + +

+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
 
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl000000000table54.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl000000000table54.tmpl new file mode 100644 index 000000000..86033768e --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl000000000table54.tmpl @@ -0,0 +1,45 @@ +#PBtmpl000000000table54 +
+ + +

+ + + +

+ + + +

+ + +
+ + + + + + + + + + + +
+ + + + + + +
+ + +
+ +
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl00000000table094.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl00000000table094.tmpl new file mode 100644 index 000000000..a7e80c454 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl00000000table094.tmpl @@ -0,0 +1,136 @@ +#PBtmpl00000000table094 +
+ + +

+ + + + +

+ + + +

+ + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl00000000table109.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl00000000table109.tmpl new file mode 100644 index 000000000..3b19bbee0 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl00000000table109.tmpl @@ -0,0 +1,135 @@ +#PBtmpl00000000table109 +
+ + +

+ + + +

+ + + +

+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ + + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl00000000table118.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl00000000table118.tmpl new file mode 100644 index 000000000..038a968b6 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl00000000table118.tmpl @@ -0,0 +1,135 @@ +#PBtmpl00000000table118 +
+ + +

+ + + + +

+ + + +

+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl00000000table125.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl00000000table125.tmpl new file mode 100644 index 000000000..d20a7277c --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl00000000table125.tmpl @@ -0,0 +1,80 @@ +#PBtmpl00000000table125 +
+ + +

+ + + + +

+ + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + +
+ + +

+ + + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl00000000table131.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl00000000table131.tmpl new file mode 100644 index 000000000..7c6f2b9f0 --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl00000000table131.tmpl @@ -0,0 +1,78 @@ +#PBtmpl00000000table131 +
+ + +

+ + + +

+ + + +

+ + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ + +
+ + diff --git a/docs/upgrades/templates-7.4.0/PBtmpl00000000table135.tmpl b/docs/upgrades/templates-7.4.0/PBtmpl00000000table135.tmpl new file mode 100644 index 000000000..d5aac76df --- /dev/null +++ b/docs/upgrades/templates-7.4.0/PBtmpl00000000table135.tmpl @@ -0,0 +1,78 @@ +#PBtmpl00000000table135 +
+ + +

+ + + +

+ + + +

+ + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ + 		+ +
+ + + + + + + + + + + + + +
+ + +
+ + +
+ +
+ +
+ + +
+ + diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm index 7dc689a33..1a6a0c7bf 100644 --- a/lib/WebGUI/Asset/Wobject/Layout.pm +++ b/lib/WebGUI/Asset/Wobject/Layout.pm @@ -175,12 +175,14 @@ sub prepareView { $placeHolder{$child->getId} = $child; push(@{$vars{"position1_loop"}},{ id=>$child->getId, + isUncommitted=> $child->get('status') eq 'pending', content=>"~~~".$child->getId."~~~~~" }); } else { $placeHolder{$child->getId} = $child; push(@{$vars{"position".$i."_loop"}},{ id=>$child->getId, + isUncommitted=>$child->get('status') eq 'pending', content=>"~~~".$child->getId."~~~~~" }); } @@ -229,6 +231,8 @@ sub prepareView { #------------------------------------------------------------------- sub view { my $self = shift; + $self->session->errorHandler->warn('count: '. @{ $self->{_viewVars}{position1_loop} }); + $self->session->errorHandler->warn('first: '. Dumper($self->{_viewVars}{position1_loop}->[0]) ); if ($self->{_viewVars}{showAdmin} && $self->canEditIfLocked) { # 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 @@ -243,6 +247,8 @@ sub view { my $showPerformance = $self->session->errorHandler->canShowPerformanceIndicators(); my $out = $self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate}); my @parts = split("~~~~~",$self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate})); + use Data::Dumper; +# $self->session->errorHandler->warn('parts: '.Dumper(\@parts)); my $output = ""; foreach my $part (@parts) { my ($outputPart, $assetId) = split("~~~",$part,2);