From frik85@svn.reactos.org Sun Oct 15 12:38:16 2006
From: frik85@svn.reactos.org
To: ros-diffs@reactos.org
Subject:
 [ros-diffs] [frik85] 24512: RosCMS: *improve "diff" interface and	output
Date: Sun, 15 Oct 2006 10:49:18 +0000
Message-ID: <20061015104538.7E74A98E35@mail.reactos.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5850574933555870961=="

--===============5850574933555870961==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: frik85
Date: Sun Oct 15 14:49:18 2006
New Revision: 24512

URL: http://svn.reactos.org/svn/reactos?rev=3D24512&view=3Drev
Log:
RosCMS:

*improve "diff" interface and output

Modified:
    trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/i=
nc/admin_content.php?rev=3D24512&r1=3D24511&r2=3D24512&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php Sun Oct 15 14:4=
9:18 2006
@@ -81,8 +81,7 @@
 	=09
 ?>
=20
-<!-- Diff 3 -->
-<script src=3D"js/jsdiff1.js" language=3D"javascript"></script>
+<!-- Diff  -->
 <script src=3D"js/jsdiff2.js" language=3D"javascript"></script>
 <script src=3D"js/diff.js" language=3D"javascript"></script>
 <table width=3D"100%"  border=3D"0">
@@ -112,7 +111,7 @@
 =09
 	echo '</select>';
 =09
-	?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button name=3D"bdiff" id=3D"bdiff" type=3D=
"button" value=3D"Diff" onClick=3D"DoDiff()" >&nbsp;Diff&nbsp;</button>&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;<?php=20
+	?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button name=3D"bdiff" id=3D"bdiff" type=3D=
"button" value=3D"Diff" onclick=3D"DoDiff()" >&nbsp;Diff&nbsp;</button>&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;<?php=20
 =09
 	$tlang=3D"";
 =09
@@ -143,21 +142,7 @@
   <tr>
     <td colspan=3D"2">&nbsp;</td>
   </tr>
-  <tr bgcolor=3D"#CCCCCC">
-    <td width=3D"50%" valign=3D"top"><font size=3D"1" face=3D"Verdana, Arial=
, Helvetica, sans-serif">
-      <div id=3D"diff11"></div>&nbsp;</font></td>
-    <td width=3D"50%" valign=3D"top"><font size=3D"1" face=3D"Verdana, Arial=
, Helvetica, sans-serif">
-      <div id=3D"diff12"></div>&nbsp;</font></td>
-  </tr>
-  <tr>
-    <td colspan=3D"2">&nbsp;</td>
-  </tr>
-  <tr bgcolor=3D"#CCCCCC">
-    <td colspan=3D"2"><font size=3D"1" face=3D"Verdana, Arial, Helvetica, sa=
ns-serif"><div id=3D"diff13"></div>&nbsp;</font></td>
-  </tr>
-  <tr>
-    <td colspan=3D"2">&nbsp;</td>
-  </tr>
+
   <tr bgcolor=3D"#CCCCCC">
     <td colspan=3D"2"><font size=3D"1" face=3D"Verdana, Arial, Helvetica, sa=
ns-serif"><div id=3D"diff2"></div>&nbsp;</font></td>
     </tr>
@@ -175,19 +160,10 @@
=20
 	var oOld =3D document.getElementById('d1');
 	var oNew =3D document.getElementById('d2');
-	var oDiff =3D document.getElementById("diff13");
-	var oDiff21 =3D document.getElementById("diff11");
-	var oDiff22 =3D document.getElementById("diff12");
 	var out =3D "";
=20
 	function DoDiff() {
=20
-		// Diff 1: (jsdiff1.js)
-		oDiff.innerHTML =3D diffString(oOld.innerHTML, oNew.innerHTML);
-
-		out =3D diffString2(oOld.innerHTML, oNew.innerHTML);
-		oDiff21.innerHTML =3D out.o;
-		oDiff22.innerHTML =3D out.n;
=20
 		// Diff 2: (jsdiff2.js)
 		document.getElementById('diff2').innerHTML =3D diffString_ver2(=20



--===============5850574933555870961==--