updated by deploying process

getrailo · Dec 22, 2010 · 160f3d0 · 160f3d0
1 parent 47a6470
commit 160f3d0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/railo-java/railo-core/src/resource/context/railo-context.ra b/railo-java/railo-core/src/resource/context/railo-context.ra
diff --git a/railo-java/railo-core/src/resource/context/templates/debugging/debugging-cascade.cfm b/railo-java/railo-core/src/resource/context/templates/debugging/debugging-cascade.cfm
@@ -7,8 +7,15 @@
 <cfif request.bDebugQueryOutput><cfabort></cfif>
 <cfparam name="url._debug_action" default="display_debug">
 
-<cfsavecontent variable="plus"><cfinclude template="../../admin/resources/img/debug_plus.gif.cfm"></cfsavecontent>
-<cfsavecontent variable="minus"><cfinclude template="../../admin/resources/img/debug_minus.gif.cfm"></cfsavecontent>
+
+<!--- Plus/minus Image --->
+<cfif structKeyExists(cgi,'http_user_agent') and findNocase('MSIE',cgi.http_user_agent)>
+	<cfset plus="#cgi.context_path#/railo-context/admin/resources/img/debug_plus.gif.cfm">
+	<cfset minus="#cgi.context_path#/railo-context/admin/resources/img/debug_minus.gif.cfm">
+<cfelse>
+    <cfsavecontent variable="plus"><cfinclude template="../../admin/resources/img/debug_plus.gif.cfm"></cfsavecontent>
+    <cfsavecontent variable="minus"><cfinclude template="../../admin/resources/img/debug_minus.gif.cfm"></cfsavecontent>
+</cfif>
 
 <cfoutput>
 <cfsavecontent variable="sImgPlus"><img src="#plus#" style="margin:2px 2px 0px 0px;"></cfsavecontent>

diff --git a/railo-java/railo-core/src/resource/context/templates/display/debugging-console-output.cfm b/railo-java/railo-core/src/resource/context/templates/display/debugging-console-output.cfm
@@ -13,8 +13,14 @@
 </cfif>
 
 
-<cfsavecontent variable="plus"><cfinclude template="../../admin/resources/img/debug_plus.gif.cfm"></cfsavecontent>
-<cfsavecontent variable="minus"><cfinclude template="../../admin/resources/img/debug_minus.gif.cfm"></cfsavecontent>
+<!--- Plus/minus Image --->
+<cfif structKeyExists(cgi,'http_user_agent') and findNocase('MSIE',cgi.http_user_agent)>
+	<cfset plus="#cgi.context_path#/railo-context/admin/resources/img/debug_plus.gif.cfm">
+	<cfset minus="#cgi.context_path#/railo-context/admin/resources/img/debug_minus.gif.cfm">
+<cfelse>
+    <cfsavecontent variable="plus"><cfinclude template="../../admin/resources/img/debug_plus.gif.cfm"></cfsavecontent>
+    <cfsavecontent variable="minus"><cfinclude template="../../admin/resources/img/debug_minus.gif.cfm"></cfsavecontent>
+</cfif>
 
 <cfparam name="url._debug_action" default="display_debug">
 <cfoutput><cfsavecontent variable="sImgPlus"><img src="#plus#" style="margin:2px 2px 0px 0px;"></cfsavecontent>

diff --git a/railo-java/railo-core/src/resource/context/templates/error/error.cfm b/railo-java/railo-core/src/resource/context/templates/error/error.cfm
@@ -1,7 +1,15 @@
 </TD></TD></TD></TH></TH></TH></TR></TR></TR></TABLE></TABLE></TABLE></A></ABBREV></ACRONYM></ADDRESS></APPLET></AU></B></BANNER></BIG></BLINK></BLOCKQUOTE></BQ></CAPTION></CENTER></CITE></CODE></COMMENT></DEL></DFN></DIR></DIV></DL></EM></FIG></FN></FONT></FORM></FRAME></FRAMESET></H1></H2></H3></H4></H5></H6></HEAD></I></INS></KBD></LISTING></MAP></MARQUEE></MENU></MULTICOL></NOBR></NOFRAMES></NOSCRIPT></NOTE></OL></P></PARAM></PERSON></PLAINTEXT></PRE></Q></S></SAMP></SCRIPT></SELECT></SMALL></STRIKE></STRONG></SUB></SUP></TABLE></TD></TEXTAREA></TH></TITLE></TR></TT></U></UL></VAR></WBR></XMP>
 <cfoutput>
-<cfsavecontent variable="plus"><cfinclude template="../../admin/resources/img/debug_plus.gif.cfm"></cfsavecontent>
-<cfsavecontent variable="minus"><cfinclude template="../../admin/resources/img/debug_minus.gif.cfm"></cfsavecontent>
+
+<!--- Plus/minus Image --->
+<cfif structKeyExists(cgi,'http_user_agent') and findNocase('MSIE',cgi.http_user_agent)>
+	<cfset plus="#cgi.context_path#/railo-context/admin/resources/img/debug_plus.gif.cfm">
+	<cfset minus="#cgi.context_path#/railo-context/admin/resources/img/debug_minus.gif.cfm">
+<cfelse>
+    <cfsavecontent variable="plus"><cfinclude template="../../admin/resources/img/debug_plus.gif.cfm"></cfsavecontent>
+    <cfsavecontent variable="minus"><cfinclude template="../../admin/resources/img/debug_minus.gif.cfm"></cfsavecontent>
+</cfif> 
+
 <script>
 <cfoutput>
 var plus='#plus#';
@@ -19,7 +27,7 @@ function oc(id) {
 			code.style.position='absolute';
 			code.style.visibility='hidden';
 		}
-		if(button.src==plus)button.src=minus;
+		if((button.src+"").indexOf(plus)!=-1)button.src=minus;
 		else button.src=plus;
 	}
 }