Updating from 1.9.x

1.10.x
Julio Montoya 12 years ago
parent 99305282d6
commit 92ec81ec07
  1. 401
      main/wiki/css/default.css
  2. 447
      main/wiki/diff.inc.php
  3. 1995
      main/wiki/index.php
  4. 5074
      main/wiki/wiki.inc.php

@ -1,208 +1,197 @@
/*
==============================================================================
WIKI STYLES
==============================================================================
*/
.wikiTitle h1{
color: Black;
background: none;
font-size: 200%;
font-weight: bold;
/*font-weight: normal;*/
border-bottom: 2px solid #aaaaaa;
}
.wiki2xhtml a.wikiEdit{
color: #0000FF;
}
.diff{
font-family: monospace;
padding: 5px;
margin: 5px;
border:solid 2px #aaaaaa;
}
.diffEqual{
background-color: #FFFFFF;
}
.diffMoved{
background-color: #FFFFAA;
}
.diffAdded{
background-color: #CCFFCC;
}
.diffDeleted{
background-color: #FFAAAA;
}
.diffAddedTex{
background-color: #CCFFCC;
text-decoration:underline;
}
.diffDeletedTex{
background-color: #FFAAAA;
text-decoration:line-through;
}
#wikititle {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 100%;
font-weight: bold;
background-color: #EFEFEF;
border-bottom: 1px solid #cccccc;
padding: 3px;
padding-top:5px;
border-top: 1px solid #ccc;
height: auto!important;
min-height:20px;
}
#wikititle input {
border: 1px solid #333;
padding-left: 3px;
}
#wikicontent {
padding-top:5px;
min-height:300px;
}
#menuwiki {
float:left;
border: 2px solid #cccccc;
margin-right: 10px;
padding: 2px;
background-color: #efefef;
width:74px;
height:30px;
overflow:hidden;
}
#menuwiki li{
list-style-type: square;
}
#mainwiki {
border-left: 1px solid #cccccc;
padding-left:10px;
}
#wikifooter {
background-color: #EFEFEF;
border-top: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
border-left: 1px solid #cccccc;
border-right: 1px solid #cccccc;
}
.fwiki1{
font-size:larger;
font-style:italic;
font-weight:bold;
background-color:#DAFFD9;
}
.fwiki2{
font-size:smaller;
background-color:#ffffff;
}
.message {
color: #cccccc;
}
.wiki_warning{
color: #FF0000;
font-weight:bold;
}
a.new_wiki_link{
color: #FF0000;
border-bottom: 1px dotted #cccccc;
}
a.wiki_link{
border-bottom: 1px dotted #cccccc;
}
a.wiki_link_ext{
background: url(ext.png) center right no-repeat; padding-right: 14px; }
a.wiki_mail_link{
background: url(email.gif) center right no-repeat; padding-right: 18px; }
a.wiki_news_link{
background: url(news.png) center right no-repeat; padding-right: 18px; }
a.wiki_ftp_link{
background: url(ftp.gif) center right no-repeat; padding-right: 18px; }
a.wiki_irc_link{
background: url(irc.gif) center right no-repeat; padding-right: 18px; }
#main_navigation{
height: 20px;
margin: 0;
padding-left: 10px;
background-color:#cccccc;
}
#tabnav{
height: 20px;
margin: 0;
padding-left: 10px;
}
#tabnav_content {
margin: 0;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 10px;
padding-top: 4px;
border: 1px solid #ccc;
}
#tabnav li {
margin: 0;
padding: 0;
display: inline;
list-style-type: none;
}
#tabnav a:link, #tabnav a:visited {
float: left;
background: #fff;
font-size: 10px;
line-height: 14px;
font-weight: bold;
padding: 2px 10px 2px 10px;
margin-right: 4px;
border: 1px solid #ccc;
border-bottom: 1px solid #f3f3f3;
text-decoration: none;
color: #666;
}
#tabnav a:link.active, #tabnav a:visited.active
{
border-bottom: 2px solid #f3f3f3;
background: #f3f3f3;
color: #000;
}
/* WIKI STYLES */
.wikiTitle h1 {
color: Black;
background: none;
font-size: 200%;
font-weight: bold;
/*font-weight: normal;*/
border-bottom: 2px solid #aaaaaa;
}
.wiki2xhtml a.wikiEdit{
color: #0000FF;
}
.diff{
font-family: monospace;
padding: 5px;
margin: 5px;
border:solid 2px #aaaaaa;
}
.diffEqual{
background-color: #FFFFFF;
}
.diffMoved{
background-color: #FFFFAA;
}
.diffAdded{
background-color: #CCFFCC;
}
.diffDeleted{
background-color: #FFAAAA;
}
.diffAddedTex{
background-color: #CCFFCC;
text-decoration:underline;
}
.diffDeletedTex{
background-color: #FFAAAA;
text-decoration:line-through;
}
#wikititle {
font-size: 100%;
font-weight: bold;
background-color: #EFEFEF;
border-bottom: 1px solid #cccccc;
padding: 3px;
padding-top:5px;
border-top: 1px solid #ccc;
height: auto!important;
min-height:20px;
}
#wikititle input {
border: 1px solid #333;
padding-left: 3px;
}
#wikicontent {
padding-top:5px;
}
#menuwiki {
float:left;
border: 2px solid #cccccc;
margin-right: 10px;
padding: 2px;
background-color: #efefef;
width:74px;
height:30px;
overflow:hidden;
}
#menuwiki li{
list-style-type: square;
}
#mainwiki {
}
#wikifooter {
background-color: #EFEFEF;
border-top: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
border-left: 1px solid #cccccc;
border-right: 1px solid #cccccc;
}
.fwiki1{
font-size:larger;
font-style:italic;
font-weight:bold;
background-color:#DAFFD9;
}
.fwiki2{
font-size:smaller;
background-color:#ffffff;
}
.message {
color: #cccccc;
}
.wiki_warning{
color: #FF0000;
font-weight:bold;
}
a.new_wiki_link{
color: #FF0000;
border-bottom: 1px dotted #cccccc;
}
a.wiki_link{
border-bottom: 1px dotted #cccccc;
}
a.wiki_link_ext{
background: url(ext.png) center right no-repeat; padding-right: 14px; }
a.wiki_mail_link{
background: url(email.gif) center right no-repeat; padding-right: 18px; }
a.wiki_news_link{
background: url(news.png) center right no-repeat; padding-right: 18px; }
a.wiki_ftp_link{
background: url(ftp.gif) center right no-repeat; padding-right: 18px; }
a.wiki_irc_link{
background: url(irc.gif) center right no-repeat; padding-right: 18px; }
#main_navigation{
height: 20px;
margin: 0;
padding-left: 10px;
background-color:#cccccc;
}
#tabnav{
height: 20px;
margin: 0;
padding-left: 10px;
}
#tabnav_content {
margin: 0;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 10px;
padding-top: 4px;
border: 1px solid #ccc;
}
#tabnav li {
margin: 0;
padding: 0;
display: inline;
list-style-type: none;
}
#tabnav a:link, #tabnav a:visited {
float: left;
background: #fff;
font-size: 10px;
line-height: 14px;
font-weight: bold;
padding: 2px 10px 2px 10px;
margin-right: 4px;
border: 1px solid #ccc;
border-bottom: 1px solid #f3f3f3;
text-decoration: none;
color: #666;
}
#tabnav a:link.active, #tabnav a:visited.active {
border-bottom: 2px solid #f3f3f3;
background: #f3f3f3;
color: #000;
}
#tabnav a:link.right, #tabnav a:visited.right
{
border-bottom: 1px solid #f3f3f3;
background: #f3f3f3;
color: #666;
margin-left: 100px;
}
#tabnav a:link.rightactive, #tabnav a:visited.rightactive
{
border-bottom: 1px solid #fff;
background: #fff;
color: #000;
margin-left: 170px;
}
#tabnav a:hover
{
background: #fff;
}
{
border-bottom: 1px solid #f3f3f3;
background: #f3f3f3;
color: #666;
margin-left: 100px;
}
#tabnav a:link.rightactive, #tabnav a:visited.rightactive {
border-bottom: 1px solid #fff;
background: #fff;
color: #000;
margin-left: 170px;
}
#tabnav a:hover {
background: #fff;
}

@ -1,298 +1,187 @@
<?php // $Id: lib.diff.php,v 1.12 2005/11/18 20:25:11 zefredz Exp $
// vim: expandtab sw=4 ts=4 sts=4:
/**
* CLAROLINE
*
* @version 1.7 $Revision: 1.12 $
*
* @copyright 2001-2005 Universite catholique de Louvain (UCL)
*
* @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
* This program is under the terms of the GENERAL PUBLIC LICENSE (GPL)
* as published by the FREE SOFTWARE FOUNDATION. The GPL is available
* through the world-wide-web at http://www.gnu.org/copyleft/gpl.html
*
* @author Frederic Minne <zefredz@gmail.com>
*
* @package Wiki
*/
/**
* Code
*/
define( "DIFF_EQUAL", "=" );
define( "DIFF_ADDED", "+" );
define( "DIFF_DELETED", "-" );
define( "DIFF_MOVED", "M" );
/**
* Get difference between two strings
* @param string old first string
* @param string new second string
* @param boolean show_equals set to true to see line that are equal between
* the two strings (default true)
* @param string format_line_function callback function to format line
* (default 'format_line')
* @return string formated diff output
*/
function diff( $old, $new, $show_equals = false, $format_line_function = 'format_line' )
{
$oldArr = str_split_on_new_line( $old );
$newArr = str_split_on_new_line( $new );
$oldCount = count ( $oldArr );
$newCount = count ( $newArr );
$max = max( $oldCount, $newCount );
//get added and deleted lines
$deleted = array_diff_assoc( $oldArr, $newArr );
$added = array_diff_assoc( $newArr, $oldArr );
$moved = array();
foreach ( $added as $key => $candidate )
{
foreach ( $deleted as $index => $content )
{
if ( $candidate == $content )
{
$moved[$key] = $candidate;
unset( $added[$key] );
unset( $deleted[$index] );
break;
}
<?php
/**
* CLAROLINE
*
* @version 1.7 $Revision: 1.12 $
*
* @copyright 2001-2005 Universite catholique de Louvain (UCL)
*
* @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
* This program is under the terms of the GENERAL PUBLIC LICENSE (GPL)
* as published by the FREE SOFTWARE FOUNDATION. The GPL is available
* through the world-wide-web at http://www.gnu.org/copyleft/gpl.html
*
* @author Frederic Minne <zefredz@gmail.com>
*
* @package Wiki
*/
/**
* Code
*/
define("DIFF_EQUAL", "=");
define("DIFF_ADDED", "+");
define("DIFF_DELETED", "-");
define("DIFF_MOVED", "M");
/**
* Get difference between two strings
* @param string old first string
* @param string new second string
* @param boolean show_equals set to true to see line that are equal between
* the two strings (default true)
* @param string format_line_function callback function to format line
* (default 'format_line')
* @return string formated diff output
*/
function diff(
$old,
$new,
$show_equals = false,
$format_line_function = 'format_line'
) {
$oldArr = str_split_on_new_line($old);
$newArr = str_split_on_new_line($new);
$oldCount = count($oldArr);
$newCount = count($newArr);
$max = max($oldCount, $newCount);
//get added and deleted lines
$deleted = array_diff_assoc($oldArr, $newArr);
$added = array_diff_assoc($newArr, $oldArr);
$moved = array();
foreach ($added as $key => $candidate) {
foreach ($deleted as $index => $content) {
if ($candidate == $content) {
$moved[$key] = $candidate;
unset($added[$key]);
unset($deleted[$index]);
break;
}
}
}
$output = '';
$output = '';
for ( $i = 0; $i < $max; $i++ )
{
// line changed
if ( isset ( $deleted[$i] ) && isset( $added[$i] ) )
{
$output .= $format_line_function( $i, DIFF_DELETED, $deleted[$i] );
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
for ($i = 0; $i < $max; $i++) {
// line changed
if (isset ($deleted[$i]) && isset($added[$i])) {
$output .= $format_line_function($i, DIFF_DELETED, $deleted[$i]);
$output .= $format_line_function($i, DIFF_ADDED, $added[$i]);
}
// line deleted
elseif ( isset ( $deleted[$i] ) && ! isset ( $added[$i] ) )
{
$output .= $format_line_function( $i, DIFF_DELETED, $deleted[$i] );
} // line deleted
elseif (isset ($deleted[$i]) && !isset ($added[$i])) {
$output .= $format_line_function($i, DIFF_DELETED, $deleted[$i]);
}
// line added
elseif ( isset ( $added[$i] ) && ! isset ( $deleted[$i] ) )
{
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
} // line added
elseif (isset ($added[$i]) && !isset ($deleted[$i])) {
$output .= $format_line_function($i, DIFF_ADDED, $added[$i]);
}
// line moved
elseif ( isset ( $moved[$i] ) )
{
$output .= $format_line_function( $i, DIFF_MOVED, $newArr[$i] );
} // line moved
elseif (isset ($moved[$i])) {
$output .= $format_line_function($i, DIFF_MOVED, $newArr[$i]);
}
// line unchanged
elseif ( $show_equals )
{
$output .= $format_line_function( $i, DIFF_EQUAL, $newArr[$i] );
} // line unchanged
elseif ($show_equals) {
$output .= $format_line_function($i, DIFF_EQUAL, $newArr[$i]);
}
else
{
// skip
}
} else {
// skip
}
return $output;
}
/**
* Split strings on new line
*/
function str_split_on_new_line( $str )
{
$content = array();
if ( api_strpos( $str, "\r\n" ) !== false )
{
$content = explode("\r\n", $str );
}
elseif ( api_strpos( $str, "\n" ) !== false )
{
$content = explode( "\n", $str );
}
elseif ( api_strpos( $str, "\r" ) !== false )
{
$content = explode( "\r", $str );
}
else
{
$content[] = $str;
}
return $content;
return $output;
}
/**
* Split strings on new line
*/
function str_split_on_new_line($str)
{
$content = array();
if (api_strpos($str, "\r\n") !== false) {
$content = explode("\r\n", $str);
} elseif (api_strpos($str, "\n") !== false) {
$content = explode("\n", $str);
} elseif (api_strpos($str, "\r") !== false) {
$content = explode("\r", $str);
} else {
$content[] = $str;
}
/**
* Default and prototype format line function
* @param int line line number
* @param mixed type line type, must be one of the following :
* DIFF_EQUAL, DIFF_MOVED, DIFF_ADDED, DIFF_DELETED
* @param string value line content
* @param boolean skip_empty skip empty lines (default false)
* @return string formated diff line
*/
function format_line( $line, $type, $value, $skip_empty = false )
{
if ( trim( $value ) == "" && $skip_empty )
{
return "";
}
elseif ( trim( $value ) == "" )
{
$value = '&nbsp;';
}
switch ( $type )
{
case DIFF_EQUAL:
{
// return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffEqual" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
case DIFF_MOVED:
{
//return $line. ' : ' . ' M <span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
case DIFF_ADDED:
{
//return $line . ' : ' . ' + <span class="diffAdded" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffAdded" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
case DIFF_DELETED:
{
//return $line . ' : ' . ' - <span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
}
return $content;
}
/**
* Default and prototype format line function
* @param int line line number
* @param mixed type line type, must be one of the following :
* DIFF_EQUAL, DIFF_MOVED, DIFF_ADDED, DIFF_DELETED
* @param string value line content
* @param boolean skip_empty skip empty lines (default false)
* @return string formated diff line
*/
function format_line($line, $type, $value, $skip_empty = false)
{
if (trim($value) == "" && $skip_empty) {
return "";
} elseif (trim($value) == "") {
$value = '&nbsp;';
}
/**
* Table format line function
* @see format_line
*/
function format_table_line( $line, $type, $value, $skip_empty = false )
{
if ( trim( $value ) == "" && $skip_empty )
{
return "";
}
elseif ( trim( $value ) == "" )
{
$value = '&nbsp;';
}
switch ( $type )
{
case DIFF_EQUAL:
{
//return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;=</td><td><span class="diffEqual" >' . $value . '</span></td></tr>' . "\n"; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFFFFF">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
}
case DIFF_MOVED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta
;
return '<tr><td></td><td bgcolor="#FFFFAA">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
}
case DIFF_ADDED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;+</td><td><span class="diffAdded" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#CCFFCC">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
}
case DIFF_DELETED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;-</td><td><span class="diffDeleted" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFAAAA">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
}
}
switch ($type) {
case DIFF_EQUAL:
// return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffEqual" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
break;
case DIFF_MOVED:
//return $line. ' : ' . ' M <span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffMoved" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
break;
case DIFF_ADDED:
//return $line . ' : ' . ' + <span class="diffAdded" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffAdded" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
break;
case DIFF_DELETED:
//return $line . ' : ' . ' - <span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffDeleted" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
break;
}
}
/**
* Table format line function
* @see format_line
*/
function format_table_line($line, $type, $value, $skip_empty = false)
{
if (trim($value) == "" && $skip_empty) {
return "";
} elseif (trim($value) == "") {
$value = '&nbsp;';
}
if (! function_exists('array_diff_assoc') )
{
/**
* Replace array_diff_assoc()
*
* @link http://php.net/function.array_diff_assoc
* @author Aidan Lister <aidan@php.net>
* @since PHP 4.3.0
* @require PHP 4.0.0 (user_error)
*/
function array_diff_assoc()
{
// Check we have enough arguments
$args = func_get_args();
$count = count($args );
if (count($args ) < 2 )
{
trigger_error('Wrong parameter count for array_diff_assoc()', E_USER_WARNING );
return;
}
// Check arrays
for ($i = 0; $i < $count; $i++ )
{
if (! is_array($args[$i] ) )
{
trigger_error('array_diff_assoc() Argument #' . ($i + 1) . ' is not an array', E_USER_WARNING );
return;
}
}
// Get the comparison array
$array_comp = array_shift($args );
--$count;
// Traverse values of the first array
foreach ($array_comp as $key => $value )
{
// Loop through the other arrays
for ($i = 0; $i < $count; $i++ )
{
// Loop through this arrays key/value pairs and compare
foreach ($args[$i] as $comp_key => $comp_value )
{
if ((string) $key === (string)$comp_key && (string) $value === (string) $comp_value )
{
unset($array_comp[$key] );
}
}
}
}
return $array_comp;
}
switch ($type) {
case DIFF_EQUAL:
//return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;=</td><td><span class="diffEqual" >' . $value . '</span></td></tr>' . "\n"; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFFFFF">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
case DIFF_MOVED:
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta
return '<tr><td></td><td bgcolor="#FFFFAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
case DIFF_ADDED:
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;+</td><td><span class="diffAdded" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#CCFFCC">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
case DIFF_DELETED:
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;-</td><td><span class="diffDeleted" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFAAAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
}
?>
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save