Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-12-30 12:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1597 from tkgdsg/dropdown_filter_modification

Browse Source 
function helper.html.dropdown supports filter placeholder
This commit is contained in:
Naoki Takezoe
2017-05-18 11:19:15 +09:00
committed by GitHub
parent 4fc221f4f9 e919505f4e
commit 2143760185
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/twirl/gitbucket/core/helper/dropdown.scala.html
View File

@@ -2,8 +2,8 @@
prefix: String = "",
style : String = "",
right : Boolean = false,
filter: String = "")(body: Html)
@defining(if(filter.isEmpty) "" else filter + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
filter: (String, String) = ("",""))(body: Html)
@defining(if(filter._1.isEmpty) "" else filter._1 + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
<div class="btn-group" @if(style.nonEmpty){style="@style"}>
<button
class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
@@ -19,7 +19,7 @@
</button>
<ul class="dropdown-menu@if(right){ pull-right}">
@if(filterId.nonEmpty) {
<li><input id="@filterId-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="@filter"/></li>
<li><input id="@filterId-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="@filter._2"/></li>
}
@body
</ul>

6
src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
View File

@@ -11,7 +11,7 @@
<span class="muted small strong">Labels</span>
@if(isManageable){
<div class="pull-right">
@gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "labels") {
@gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("labels", "Filter Labels")) {
@labels.map { label =>
<li>
<a href="#" class="toggle-label" data-label-id="@label.labelId">
@@ -36,7 +36,7 @@
<span class="muted small strong">Milestone</span>
@if(isManageable){
<div class="pull-right">
@gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "milestone") {
@gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("milestone", "Filter Milestone")) {
<li><a href="javascript:void(0);" class="milestone" data-id=""><i class="octicon octicon-x"></i> Clear this milestone</a></li>
@milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
<li>
@@ -88,7 +88,7 @@
<span class="muted small strong">Assignee</span>
@if(isManageable){
<div class="pull-right">
@gitbucket.core.helper.html.dropdown("Edit", right = true, filter = "assignee") {
@gitbucket.core.helper.html.dropdown("Edit", right = true, filter = ("assignee", "Filter Assignee")) {
<li><a href="javascript:void(0);" class="assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
@collaborators.map { collaborator =>
<li>