Index: branches/5.2.x/core/admin_templates/logs/system_logs/system_log_edit.tpl
===================================================================
diff -u -N -r16715 -r16754
--- branches/5.2.x/core/admin_templates/logs/system_logs/system_log_edit.tpl	(.../system_log_edit.tpl)	(revision 16715)
+++ branches/5.2.x/core/admin_templates/logs/system_logs/system_log_edit.tpl	(.../system_log_edit.tpl)	(revision 16754)
@@ -56,22 +56,27 @@
 		font-size: 12px;
 	}
 
-	.highlight-area {
+	div.highlight-area {
 		border: 1px solid black;
 		padding: 8px;
 		font-family: serif;
 		background-color: #F6F6F6;
 		overflow: auto;
+		margin-top: 4px;
 	}
 
 	.log_backtrace {
 		margin: 0;
 		padding-left: 25px;
 	}
 
-	.log_backtrace div {
-		margin: 4px 0;
+	div.expandable-area {
+		margin: 4px 0 4px 0;
 	}
+
+	div.expandable-area div.highlight-area:first-child {
+		margin-bottom: 4px;
+	}
 </style>
 
 <inp2:m_DefineElement name="inp_serialized_label">
@@ -84,13 +89,27 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="backtrace_element">
+<inp2:m_DefineElement name="backtrace_element" expandable="">
 	<li>
 		<inp2:m_if check="m_Param" name="has_args">
-			<a href="#" title="<inp2:m_Phrase name='hint:la_LogBacktraceFunction' html_escape='1'/>" trace_index="<inp2:m_Param name='index'/>"><inp2:m_Phrase name="la_LogBacktraceFunction"/>:</a> <inp2:m_Param name="file_info"/>
+			<inp2:m_SetParam expandable="1"/>
+		<inp2:m_elseif check="m_Param" name="has_code_fragment"/>
+			<inp2:m_SetParam expandable="1"/>
+		</inp2:m_if>
 
-			<div class="highlight-area" style="display: none;" id="trace_args_<inp2:m_Param name='index'/>">
-				<inp2:m_Param name="args"/>
+		<inp2:m_if check="m_Param" name="expandable">
+			<a href="#" class="expandable" title="<inp2:m_Phrase name='hint:la_LogBacktraceFunction' html_escape='1'/>" trace_index="<inp2:m_Param name='index'/>"><inp2:m_Phrase name="la_LogBacktraceFunction"/>:</a> <inp2:m_Param name="file_info"/>
+
+			<div style="display: none;" class="expandable-area">
+				<inp2:m_if check="m_Param" name="has_args">
+					<inp2:m_Phrase name="la_text_Arguments"/>:
+					<div class="highlight-area"><inp2:m_Param name="args"/></div>
+				</inp2:m_if>
+
+				<inp2:m_if check="m_Param" name="has_code_fragment">
+					<a href="#" class="expandable"><inp2:m_Phrase name="la_btn_ToggleCode"/></a>
+					<div class="highlight-area expandable-area" style="display: none;"><inp2:m_Param name="code_fragment"/></div>
+				</inp2:m_if>
 			</div>
 		<inp2:m_else/>
 			<inp2:m_Phrase name="la_LogBacktraceFunction"/>: <inp2:m_Param name="file_info"/>
@@ -144,6 +163,11 @@
 			<inp2:m_RenderElement design="form_row" prefix="system-log" field="LogSourceFilename">
 				<td class="control-cell" valign="top">
 					<strong><inp2:$prefix_Filename/></strong> <inp2:m_Phrase name="la_OnLine"/> <strong><inp2:$prefix_Field field="LogSourceFileLine"/></strong>
+
+					<inp2:m_if check="{$prefix}_Field" name="LogCodeFragment" db="db">
+						<a href="#" class="expandable"><inp2:m_Phrase name="la_btn_ToggleCode"/></a>
+						<div class="highlight-area expandable-area" style="display: none;"><inp2:$prefix_PrintCodeFragment/></div>
+					</inp2:m_if>
 				</td>
 			</inp2:m_RenderElement>
 
@@ -155,7 +179,7 @@
 				<inp2:m_RenderElement design="form_row" prefix="system-log" field="LogBacktrace">
 					<td class="control-cell" valign="top">
 						<ol class="log_backtrace">
-							<inp2:$prefix_PrintBacktrace render_as="backtrace_element" include_args="1"/>
+							<inp2:$prefix_PrintBacktrace render_as="backtrace_element" include_args="1" include_code_fragment="1"/>
 						</ol>
 					</td>
 				</inp2:m_RenderElement>
@@ -183,10 +207,10 @@
 
 <script type="text/javascript">
 	$(document).ready(function () {
-		$('a', '.log_backtrace').click(function () {
-			$('#trace_args_' + $(this).attr('trace_index')).toggle();
+		$(document).on('click', 'a.expandable', function ($e) {
+			$(this).siblings('.expandable-area:first').toggle();
 
-			return false;
+			$e.preventDefault();
 		});
 	});
 </script>