diff --git a/src/main/webapp/WEB-INF/templates/repo_summary.ftl b/src/main/webapp/WEB-INF/templates/repo_summary.ftl index 8cc3b8157a657426953bb135e7275c4e611fde61..ae3ce3b5ca1478305c459bace6ef5894c7ad959f 100644 --- a/src/main/webapp/WEB-INF/templates/repo_summary.ftl +++ b/src/main/webapp/WEB-INF/templates/repo_summary.ftl @@ -66,16 +66,18 @@ current = "none" ${file.oldPath()} </div> <#list file.lines() as line> - <#if line.operation() == "INSERT"> - <div class="insert"></div> + <#if line.original() == "" && line.replacement() != ""> + <div class="context"></div> + <#elseif line.operation() == "INSERT"> + <div class="context"></div> <#elseif line.operation() == "DELETE"> - <div class="delete">${line.original()}</div> - <#elseif line.operation() == "MODIFY" && line.original() != ""> - <div class="delete">${line.original()}</div> + <div class="delete">${line.original()?no_esc}</div> + <#elseif line.operation() == "MODIFY" && line.original() != line.replacement()> + <div class="delete">${line.original()?no_esc}</div> <#elseif line.operation() == "OMITTED"> <div class="space">…</div> <#else> - <div class="context">${line.original()}</div> + <div class="context">${line.original()?no_esc}</div> </#if> </#list> </div> @@ -84,16 +86,18 @@ current = "none" ${file.newPath()} </div> <#list file.lines() as line> - <#if line.operation() == "INSERT"> - <div class="insert">${line.replacement()}</div> + <#if line.replacement() == "" && line.original() != ""> + <div class="context"></div> + <#elseif line.operation() == "INSERT"> + <div class="insert">${line.replacement()?no_esc}</div> <#elseif line.operation() == "DELETE"> - <div class="insert"></div> - <#elseif line.operation() == "MODIFY"> - <div class="insert">${line.replacement()}</div> + <div class="context"></div> + <#elseif line.operation() == "MODIFY" && line.original() != line.replacement()> + <div class="insert">${line.replacement()?no_esc}</div> <#elseif line.operation() == "OMITTED"> <div class="space">…</div> <#else> - <div class="context">${line.replacement()}</div> + <div class="context">${line.replacement()?no_esc}</div> </#if> </#list> </div> @@ -109,16 +113,18 @@ current = "none" ${file.newPath()} </div> <#list file.lines() as line> - <#if line.operation() == "INSERT"> - <div class="insert">${line.replacement()}</div> + <#if line.replacement() == "" && line.original() !=""> + <div class="context"></div> + <#elseif line.operation() == "INSERT"> + <div class="insert">${line.replacement()?no_esc}</div> <#elseif line.operation() == "DELETE"> <div>${line.replacement()}</div> <#elseif line.operation() == "MODIFY"> - <div class="insert">${line.replacement()}</div> + <div class="insert">${line.replacement()?no_esc}</div> <#elseif line.operation() == "OMITTED"> <div class="space">…</div> <#else> - <div>${line.replacement()}</div> + <div class="context">${line.replacement()?no_esc}</div> </#if> </#list> </div> diff --git a/src/main/webapp/details.css b/src/main/webapp/details.css index 10a0ed9e5d120f40f294fecb337a2566fd882e70..d74fac29868e8f83f5c948aae481739c62713ffa 100644 --- a/src/main/webapp/details.css +++ b/src/main/webapp/details.css @@ -12,26 +12,29 @@ code { background-color: lavenderblush; white-space: pre; height: 1.5em; - + overflow: hidden; + text-overflow: ellipsis; } .insert { background-color: #e2fee2; white-space: pre; height: 1.5em; - + overflow: hidden; + text-overflow: ellipsis; } .context { white-space: pre; height: 1.5em; + overflow: hidden; + text-overflow: ellipsis; } .side { float: left; font-family: monospace; - padding-right: 1em; - padding-left: 1em; + margin:0; width: 50%; white-space: nowrap; overflow: hidden;