Author: max
Date: 2007-08-31 15:34:50 -0700 (Fri, 31 Aug 2007)
New Revision: 6312
Modified:
openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
openlaszlo/branches/legals/WEB-INF/lps/templates/app-console_jp.xslt
openlaszlo/branches/legals/lps/includes/console.css
Log:
Change 20070831-maxcarlson-I by [EMAIL PROTECTED] on 2007-08-31 14:10:06 PDT
in /Users/maxcarlson/openlaszlo/legals-clean
for http://svn.openlaszlo.org/openlaszlo/branches/legals
Summary: Fix DHTML debugger positioning
New Features:
Bugs Fixed: LPP-4625 - Debugger is positioned over the canvas for DHTML apps
with percentage heights.
Technical Reviewer: promanik
QA Reviewer: jcrowley
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Tests: See LPP-4625. Tested in Firefox mac and IE 7 windows.
Files:
M WEB-INF/lps/templates/app-console.xslt
M lps/includes/console.css
Changeset:
http://svn.openlaszlo.org/openlaszlo/patches/20070831-maxcarlson-I.tar
Modified: openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
2007-08-31 22:09:08 UTC (rev 6311)
+++ openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
2007-08-31 22:34:50 UTC (rev 6312)
@@ -112,7 +112,6 @@
<xsl:template match="canvas">
<xsl:param name="url" select="request/@url"/>
<xsl:param name="query_args" select="request/@query_args"/>
- <div id="magilla" style="height: {$containerheight}">
<xsl:choose>
<!-- In the case of an lzt=html request, ResponderHTML uses string
concatenation to create the <OBJECT>, <object>, and <embed>
@@ -124,18 +123,15 @@
</OBJECT>
</xsl:when>
<xsl:otherwise>
- <div id="application" style="background-color: {/canvas/@bgcolor};
height: {$containerheight}">
-
<xsl:choose>
<xsl:when test="@runtime = 'dhtml'">
<xsl:choose>
<xsl:when test="$debug = 'true'" >
- <div id="dhtml-debugger-application">
<iframe id="dhtml-application"
+ frameborder="0"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
style="width: {$canvaswidth}; height:
{$canvasheight}" />
<!-- bootstrap debugger window -->
- </div>
<div id="dhtml-debugger">
<div title="OpenLaszlo Debugger" id="dhtml-debugger-label">
<span></span>OpenLaszlo Debugger
@@ -161,6 +157,7 @@
<xsl:otherwise>
<!-- just the application -->
<iframe id="dhtml-application"
+ frameborder="0"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
style="width: {$canvaswidth}; height:
{$canvasheight}" />
</xsl:otherwise>
@@ -169,6 +166,7 @@
</xsl:when>
<xsl:otherwise>
<iframe id="dhtml-application"
+ frameborder="0"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
style="width: {$canvaswidth}; height: {$canvasheight}" />
</xsl:otherwise>
@@ -177,11 +175,9 @@
<noscript>
Please enable JavaScript in order to use this application.
</noscript>
- </div>
</xsl:otherwise>
</xsl:choose>
<xsl:call-template name="footer"/>
-</div>
<xsl:if test="not(//[EMAIL PROTECTED]'showTaskBar'])">
<xsl:choose>
<xsl:when test="@runtime = 'dhtml'">
Modified: openlaszlo/branches/legals/WEB-INF/lps/templates/app-console_jp.xslt
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/templates/app-console_jp.xslt
2007-08-31 22:09:08 UTC (rev 6311)
+++ openlaszlo/branches/legals/WEB-INF/lps/templates/app-console_jp.xslt
2007-08-31 22:34:50 UTC (rev 6312)
@@ -112,7 +112,6 @@
<xsl:template match="canvas">
<xsl:param name="url" select="request/@url"/>
<xsl:param name="query_args" select="request/@query_args"/>
- <div id="magilla" style="height: {$containerheight}">
<xsl:choose>
<!-- In the case of an lzt=html request, ResponderHTML uses string
concatenation to create the <OBJECT>, <object>, and <embed>
@@ -124,18 +123,15 @@
</OBJECT>
</xsl:when>
<xsl:otherwise>
- <div id="application" style="background-color: {/canvas/@bgcolor};
height: {$containerheight}">
-
<xsl:choose>
<xsl:when test="@runtime = 'dhtml'">
<xsl:choose>
<xsl:when test="$debug = 'true'" >
- <div id="dhtml-debugger-application">
<iframe id="dhtml-application"
+ frameborder="0"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
style="width: {$canvaswidth}; height:
{$canvasheight}" />
<!-- bootstrap debugger window -->
- </div>
<div id="dhtml-debugger">
<div title="OpenLaszlo Debugger" id="dhtml-debugger-label">
<span></span>OpenLaszloデバッガー
@@ -161,6 +157,7 @@
<xsl:otherwise>
<!-- just the application -->
<iframe id="dhtml-application"
+ frameborder="0"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
style="width: {$canvaswidth}; height:
{$canvasheight}" />
</xsl:otherwise>
@@ -169,6 +166,7 @@
</xsl:when>
<xsl:otherwise>
<iframe id="dhtml-application"
+ frameborder="0"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
style="width: {$canvaswidth}; height: {$canvasheight}" />
</xsl:otherwise>
@@ -177,11 +175,9 @@
<noscript>
アプリケーションを利用するにはJavaScriptを有効にする必要があります。
</noscript>
- </div>
</xsl:otherwise>
</xsl:choose>
<xsl:call-template name="footer"/>
-</div>
<xsl:if test="not(//[EMAIL PROTECTED]'showTaskBar'])">
<xsl:choose>
<xsl:when test="@runtime = 'dhtml'">
Modified: openlaszlo/branches/legals/lps/includes/console.css
===================================================================
--- openlaszlo/branches/legals/lps/includes/console.css 2007-08-31 22:09:08 UTC
(rev 6311)
+++ openlaszlo/branches/legals/lps/includes/console.css 2007-08-31 22:34:50 UTC
(rev 6312)
@@ -19,26 +19,9 @@
padding: 1pt 1pt 1pt 2pt;
}
-#magilla {
- /* width, height, set from canvas in the xslt */
-}
-
-/* Holds the application */
-#application
-{
- /* width, height, background-color is set from canvas in the xslt */
- /* Debug */
- /*
- margin: 2px;
- border: 1px dashed green;
- */
-}
-
/* Holds the dhtml application */
#dhtml-application
{
- /* Mostly for Firefox, which does poorly with height %'s */
- min-height: 400px;
/* width and height are superceded by the canvas in the xslt */
margin: 0;
border: 0 none;
@@ -63,7 +46,7 @@
{
margin: 5px;
border: 1px solid black;
- width: auto;
+ width: 99%;
color: black;
background-color: white;
}
@@ -152,6 +135,6 @@
/* * Stylesheet for LPS console */
/* J_LZ_COPYRIGHT_BEGIN *******************************************************
-* Copyright 2001-2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* J_LZ_COPYRIGHT_END *********************************************************/
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
