Author: spadkins
Date: Fri Oct 9 10:03:56 2009
New Revision: 13385
Modified:
p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/AppFrame.pm
Log:
working revision
Modified: p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/AppFrame.pm
==============================================================================
--- p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/AppFrame.pm
(original)
+++ p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/AppFrame.pm Fri Oct
9 10:03:56 2009
@@ -140,6 +140,9 @@
my ($screen_wname, $screen, $screen_widget, $screen_bgcolor);
my ($screentitle_widget, $screentitle_bgcolor, $screentitle_value);
+ my $top = $context->widget("$name-top", class =>
"App::Widget::Template")->html();
+ $top = "" if ($top =~ /not found/i);
+
#$menu = $context->widget("$name-menu",
# class => "App::Widget::Menu",
# )->html();
@@ -223,15 +226,23 @@
</table>
EOF
}
+ my $script = "";
+ if ($screen =~ s!(<script[^<>]*>.*?</script>)!!is) {
+ $script = $1;
+ }
$screen =~ s/'/\\'/g;
+ $screen =~ s/\s+$//s;
$screen =~ s/\n/\\n' + \n'/sg;
+ #$screen =~ s!'</script>\\n'!"<\\/script>\\n"!sg;
$selector =~ s/{PANEL}/$screen/;
$html = <<EOF;
<div id="$name">
<div id="$name-selector">
+$top
$selector
+$script
</div>
</div>
EOF
