src/cm/views/texts.py
changeset 405 3d03b25cd90d
parent 386 555135ac8900
child 411 0056e6cd95e1
equal deleted inserted replaced
400:b82f4f749b44 405:3d03b25cd90d
   562     """
   562     """
   563     Return the inner of the html table for text1 vs text2 diff
   563     Return the inner of the html table for text1 vs text2 diff
   564     """
   564     """
   565     gen = unified_diff(text1.replace('\r\n','\n').split('\n'), text2.replace('\r\n','\n').split('\n'), n=3)
   565     gen = unified_diff(text1.replace('\r\n','\n').split('\n'), text2.replace('\r\n','\n').split('\n'), n=3)
   566     index = 0
   566     index = 0
   567     res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/<col class="diff-marker"/><col class="diff-content"/><tbody>']
   567     res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/><col class="diff-marker"/><col class="diff-content"/><tbody>']
   568     res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2))
   568     res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2))
   569     res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2))
   569     res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2))
   570     res.append('<tr><td colspan="5"></td></tr>')
   570     res.append('<tr><td colspan="5"></td></tr>')
   571     #res.append('<tr><td width="50%" colspan="2"></td><td width="50%" colspan="2"></td></tr>')
   571     #res.append('<tr><td width="50%" colspan="2"></td><td width="50%" colspan="2"></td></tr>')
   572     
   572