[ros-diffs] [frik85] 24512: RosCMS: *improve "diff" interface and output
frik85 at svn.reactos.org
frik85 at svn.reactos.org
Sun Oct 15 12:49:18 CEST 2006
Author: frik85
Date: Sun Oct 15 14:49:18 2006
New Revision: 24512
URL: http://svn.reactos.org/svn/reactos?rev=24512&view=rev
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/inc/admin_content.php?rev=24512&r1=24511&r2=24512&view=diff
==============================================================================
--- 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:49:18 2006
@@ -81,8 +81,7 @@
?>
-<!-- Diff 3 -->
-<script src="js/jsdiff1.js" language="javascript"></script>
+<!-- Diff -->
<script src="js/jsdiff2.js" language="javascript"></script>
<script src="js/diff.js" language="javascript"></script>
<table width="100%" border="0">
@@ -112,7 +111,7 @@
echo '</select>';
- ?> <button name="bdiff" id="bdiff" type="button" value="Diff" onClick="DoDiff()" > Diff </button> <?php
+ ?> <button name="bdiff" id="bdiff" type="button" value="Diff" onclick="DoDiff()" > Diff </button> <?php
$tlang="";
@@ -143,21 +142,7 @@
<tr>
<td colspan="2"> </td>
</tr>
- <tr bgcolor="#CCCCCC">
- <td width="50%" valign="top"><font size="1" face="Verdana, Arial, Helvetica, sans-serif">
- <div id="diff11"></div> </font></td>
- <td width="50%" valign="top"><font size="1" face="Verdana, Arial, Helvetica, sans-serif">
- <div id="diff12"></div> </font></td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr bgcolor="#CCCCCC">
- <td colspan="2"><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><div id="diff13"></div> </font></td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
+
<tr bgcolor="#CCCCCC">
<td colspan="2"><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><div id="diff2"></div> </font></td>
</tr>
@@ -175,19 +160,10 @@
var oOld = document.getElementById('d1');
var oNew = document.getElementById('d2');
- var oDiff = document.getElementById("diff13");
- var oDiff21 = document.getElementById("diff11");
- var oDiff22 = document.getElementById("diff12");
var out = "";
function DoDiff() {
- // Diff 1: (jsdiff1.js)
- oDiff.innerHTML = diffString(oOld.innerHTML, oNew.innerHTML);
-
- out = diffString2(oOld.innerHTML, oNew.innerHTML);
- oDiff21.innerHTML = out.o;
- oDiff22.innerHTML = out.n;
// Diff 2: (jsdiff2.js)
document.getElementById('diff2').innerHTML = diffString_ver2(
More information about the Ros-diffs
mailing list