Changeset 45575 in spip-zone


Ignore:
Timestamp:
Mar 19, 2011, 3:03:27 PM (9 years ago)
Author:
cedric@…
Message:

n'utiliser que des span dans le diff, pour eviter des colisions de <div> et de <p>. Il suffit de faire display:block en css pour retrouver ce qu'on veut.

Location:
_core_/plugins/revisions
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • _core_/plugins/revisions/inc/diff.php

    r43409 r45575  
    213213        function ajouter($p) {
    214214                $p = trim($p);
    215                 $this->r .= "\n\n\n<div class=\"diff-para-ajoute\" title=\""._T('diff_para_ajoute')."\">".$p."</div rem=\"diff-\">";
     215                $this->r .= "\n\n\n<span class=\"diff-para-ajoute\" title=\""._T('diff_para_ajoute')."\">".$p."</span rem=\"diff-\">";
    216216        }
    217217// http://doc.spip.org/@supprimer
    218218        function supprimer($p_old) {
    219219                $p_old = trim($p_old);
    220                 $this->r .= "\n\n\n<div class=\"diff-para-supprime\" title=\""._T('diff_para_supprime')."\">".$p_old."</div rem=\"diff-\">";
     220                $this->r .= "\n\n\n<span class=\"diff-para-supprime\" title=\""._T('diff_para_supprime')."\">".$p_old."</span rem=\"diff-\">";
    221221        }
    222222// http://doc.spip.org/@deplacer
    223223        function deplacer($p, $p_old) {
    224                 $this->r .= "\n\n\n<div class=\"diff-para-deplace\" title=\""._T('diff_para_deplace')."\">";
     224                $this->r .= "\n\n\n<span class=\"diff-para-deplace\" title=\""._T('diff_para_deplace')."\">";
    225225                $this->r .= trim($this->_diff($p, $p_old));
    226                 $this->r .= "</div rem=\"diff-\">";
     226                $this->r .= "</span rem=\"diff-\">";
    227227        }
    228228// http://doc.spip.org/@comparer
  • _core_/plugins/revisions/prive/style_prive_plugin_revisions.html

    r45570 r45575  
    2323
    2424/* * Comparaison d articles */
    25 .diff-para-deplace { background: #e8e8ff; }
    26 .diff-para-ajoute { background: #d0ffc0; color: #000; }
    27 .diff-para-supprime { background: #ffd0c0; color: #904040; text-decoration: line-through; }
     25.diff-para-deplace { display:block;background: #e8e8ff; }
     26.diff-para-ajoute { display:block;background: #d0ffc0; color: #000; }
     27.diff-para-supprime { display:block;background: #ffd0c0; color: #904040; text-decoration: line-through; }
    2828.diff-deplace { background: #e8e8ff; }
    2929.diff-ajoute { background: #d0ffc0; }
Note: See TracChangeset for help on using the changeset viewer.