mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-06 05:25:50 +01:00
Fix commit log presentation.
This commit is contained in:
@@ -14,11 +14,28 @@ object helpers {
|
||||
* Format java.util.Date to "yyyy/MM/dd".
|
||||
*/
|
||||
def date(date: Date): String = new SimpleDateFormat("yyyy/MM/dd").format(date)
|
||||
|
||||
|
||||
def format(value: String): Html =
|
||||
Html(value.replaceAll(" ", " ").replaceAll("\t", " ").replaceAll("\n", "<br>"))
|
||||
|
||||
// TODO escape html tags using HtmlEscapeUtils (Commons Lang)
|
||||
def format(value: String): Html = Html(
|
||||
value.replaceAll(" ", " ").replaceAll("\t", " ").replaceAll("\n", "<br>"))
|
||||
|
||||
def formatCommitLog(message: String): Html = {
|
||||
val i = message.trim.indexOf("\n")
|
||||
val (firstLine, description) = if(i >= 0){
|
||||
(message.trim.substring(0, i).trim, Some(message.trim.substring(i).trim))
|
||||
} else {
|
||||
(message.trim, None)
|
||||
}
|
||||
|
||||
val sb = new StringBuilder()
|
||||
sb.append("<div class=\"summary\">").append(format(firstLine).text).append("</div>")
|
||||
if(description.isDefined){
|
||||
sb.append("<div class=\"description\">").append(format(description.get).text).append("</div>")
|
||||
}
|
||||
|
||||
Html(sb.toString)
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts Markdown of Wiki pages to HTML.
|
||||
*/
|
||||
@@ -27,15 +44,15 @@ object helpers {
|
||||
Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink))
|
||||
}
|
||||
|
||||
/**
|
||||
* Cut the given string by specified length.
|
||||
*/
|
||||
def cut(message: String, length: Int): String = {
|
||||
if(message.length > length){
|
||||
message.substring(0, length) + "..."
|
||||
} else {
|
||||
message
|
||||
}
|
||||
}
|
||||
// /**
|
||||
// * Cut the given string by specified length.
|
||||
// */
|
||||
// def cut(message: String, length: Int): String = {
|
||||
// if(message.length > length){
|
||||
// message.substring(0, length) + "..."
|
||||
// } else {
|
||||
// message
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user