mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-12 16:35:52 +01:00
Fix Wiki font style of Wiki editing form
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
enableTaskList: Boolean,
|
enableTaskList: Boolean,
|
||||||
hasWritePermission: Boolean,
|
hasWritePermission: Boolean,
|
||||||
style: String = "",
|
style: String = "",
|
||||||
|
styleClass: String = "",
|
||||||
placeholder: String = "Leave a comment",
|
placeholder: String = "Leave a comment",
|
||||||
elastic: Boolean = false,
|
elastic: Boolean = false,
|
||||||
uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
|
uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
|
||||||
@@ -20,7 +21,9 @@
|
|||||||
<div class="tab-pane active" id="tab@uid">
|
<div class="tab-pane active" id="tab@uid">
|
||||||
<span id="error-content" class="error"></span>
|
<span id="error-content" class="error"></span>
|
||||||
@textarea = {
|
@textarea = {
|
||||||
<textarea id="content@uid" name="content"@if(style.nonEmpty){ style="@style"} placeholder="@placeholder">@content</textarea>
|
<textarea id="content@uid" name="content" placeholder="@placeholder"
|
||||||
|
@if(style.nonEmpty){ style="@style"}
|
||||||
|
@if(styleClass.nonEmpty){ class="@styleClass" }>@content</textarea>
|
||||||
}
|
}
|
||||||
@if(enableWikiLink){
|
@if(enableWikiLink){
|
||||||
@textarea
|
@textarea
|
||||||
|
|||||||
@@ -10,7 +10,16 @@
|
|||||||
<div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
|
<div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
|
||||||
<div class="box issue-comment-box">
|
<div class="box issue-comment-box">
|
||||||
<div class="box-content">
|
<div class="box-content">
|
||||||
@helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
|
@helper.html.preview(
|
||||||
|
repository = repository,
|
||||||
|
content = "",
|
||||||
|
enableWikiLink = false,
|
||||||
|
enableRefsLink = true,
|
||||||
|
enableTaskList = true,
|
||||||
|
hasWritePermission = hasWritePermission,
|
||||||
|
style = "width: 635px; height: 100px; max-height: 150px;",
|
||||||
|
elastic = true
|
||||||
|
)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
|
|||||||
@@ -57,7 +57,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
@helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 565px; height: 200px; max-height: 250px;", elastic = true)
|
@helper.html.preview(
|
||||||
|
repository = repository,
|
||||||
|
content = "",
|
||||||
|
enableWikiLink = false,
|
||||||
|
enableRefsLink = true,
|
||||||
|
enableTaskList = true,
|
||||||
|
hasWritePermission = hasWritePermission,
|
||||||
|
style = "width: 565px; height: 200px; max-height: 250px;",
|
||||||
|
elastic = true
|
||||||
|
)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
|
|||||||
@@ -59,7 +59,15 @@
|
|||||||
<div style="width: 600px; border-right: 1px solid #d4d4d4;">
|
<div style="width: 600px; border-right: 1px solid #d4d4d4;">
|
||||||
<span class="error" id="error-title"></span>
|
<span class="error" id="error-title"></span>
|
||||||
<input type="text" name="title" style="width: 580px" placeholder="Title"/>
|
<input type="text" name="title" style="width: 580px" placeholder="Title"/>
|
||||||
@helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 580px; height: 200px;")
|
@helper.html.preview(
|
||||||
|
repository = repository,
|
||||||
|
content = "",
|
||||||
|
enableWikiLink = false,
|
||||||
|
enableRefsLink = true,
|
||||||
|
enableTaskList = true,
|
||||||
|
hasWritePermission = hasWritePermission,
|
||||||
|
style = "width: 580px; height: 200px;"
|
||||||
|
)
|
||||||
<input type="hidden" name="targetUserName" value="@originRepository.owner"/>
|
<input type="hidden" name="targetUserName" value="@originRepository.owner"/>
|
||||||
<input type="hidden" name="targetBranch" value="@originId"/>
|
<input type="hidden" name="targetBranch" value="@originId"/>
|
||||||
<input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
|
<input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
|
||||||
|
|||||||
@@ -15,7 +15,16 @@
|
|||||||
}
|
}
|
||||||
<div class="box issue-comment-box">
|
<div class="box issue-comment-box">
|
||||||
<div class="box-content">
|
<div class="box-content">
|
||||||
@helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
|
@helper.html.preview(
|
||||||
|
repository = repository,
|
||||||
|
content = "",
|
||||||
|
enableWikiLink = false,
|
||||||
|
enableRefsLink = true,
|
||||||
|
enableTaskList = true,
|
||||||
|
hasWritePermission = hasWritePermission,
|
||||||
|
style = "width: 635px; height: 100px; max-height: 150px;",
|
||||||
|
elastic = true
|
||||||
|
)
|
||||||
</div>
|
</div>
|
||||||
@if(fileName.isDefined){
|
@if(fileName.isDefined){
|
||||||
<div class="pull-right" style="margin-top: 10px;">
|
<div class="pull-right" style="margin-top: 10px;">
|
||||||
|
|||||||
@@ -22,7 +22,17 @@
|
|||||||
<form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
|
<form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
|
||||||
<span id="error-pageName" class="error"></span>
|
<span id="error-pageName" class="error"></span>
|
||||||
<input type="text" name="pageName" value="@pageName" style="width: 850px; font-weight: bold;" placeholder="Input a page name."/>
|
<input type="text" name="pageName" value="@pageName" style="width: 850px; font-weight: bold;" placeholder="Input a page name."/>
|
||||||
@helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, false, "width: 850px; height: 400px;", "")
|
@helper.html.preview(
|
||||||
|
repository = repository,
|
||||||
|
content = page.map(_.content).getOrElse(""),
|
||||||
|
enableWikiLink = true,
|
||||||
|
enableRefsLink = false,
|
||||||
|
enableTaskList = false,
|
||||||
|
hasWritePermission = false,
|
||||||
|
style = "width: 850px; height: 400px;",
|
||||||
|
styleClass = "monospace",
|
||||||
|
placeholder = ""
|
||||||
|
)
|
||||||
<input type="text" name="message" value="" style="width: 850px;" placeholder="Write a small message here explaining this change. (Optional)"/>
|
<input type="text" name="message" value="" style="width: 850px;" placeholder="Write a small message here explaining this change. (Optional)"/>
|
||||||
<input type="hidden" name="currentPageName" value="@pageName"/>
|
<input type="hidden" name="currentPageName" value="@pageName"/>
|
||||||
<input type="hidden" name="id" value="@page.map(_.id)"/>
|
<input type="hidden" name="id" value="@page.map(_.id)"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user