Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-11 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

updete bootstrap 3

Browse Source
This commit is contained in:
nazoking
2015-12-27 23:32:42 +09:00
parent 1081c0f16c
commit 79251ef1d1
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/twirl/gitbucket/core/settings/brancheprotection.scala.html
View File

@@ -12,9 +12,9 @@
@menu("branches", repository){ @menu("branches", repository){
@helper.html.information(info) @helper.html.information(info)
<div class="alert alert-info" style="display:none" id="saved-info">Branch protection options saved</div> <div class="alert alert-info" style="display:none" id="saved-info">Branch protection options saved</div>
<div class="box"><form name="branchProtection" onsubmit="submitForm(event)"> <form name="branchProtection" onsubmit="submitForm(event)"><div class="panel panel-default">
<div class="box-header">Branch protection for <b>@branch</b></div> <div class="panel-heading">Branch protection for <b>@branch</b></div>
<div class="box-content"> <div class="panel-body">
<div class="checkbox"> <div class="checkbox">
<label class="strong"><input type="checkbox" name="enabled" onclick="update()" @check(protection.enabled)>Protect this branch</label> <label class="strong"><input type="checkbox" name="enabled" onclick="update()" @check(protection.enabled)>Protect this branch</label>
@@ -32,9 +32,9 @@
<p class="help-block">Enforce required status checks for repository administrators.</p> <p class="help-block">Enforce required status checks for repository administrators.</p>
</div> </div>
<div class="box"> <div class="panel panel-default">
<div class="box-header">Status checks found in the last week for this repository</div> <div class="panel-heading">Status checks found in the last week for this repository</div>
<div class="box-content"> <div class="panel-body">
@knownContexts.map{ br => @knownContexts.map{ br =>
<div class="checkbox"> <div class="checkbox">
<label> <label>
@@ -49,7 +49,7 @@
</div> </div>
<input class="btn btn-success" type="submit" value="Save changes" /> <input class="btn btn-success" type="submit" value="Save changes" />
</div> </div>
</form></div> </div></form>
} }
} }
} }

39
src/main/twirl/gitbucket/core/settings/branches.scala.html
View File

@@ -17,40 +17,43 @@
</div> </div>
}else{ }else{
@helper.html.information(info) @helper.html.information(info)
<div class="box"> <div class="panel panel-default">
<div class="box-header">Default branch</div> <div class="panel-heading">Default branch</div>
<div class="box-content"> <div class="panel-body">
<p>The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.</p> <p>The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.</p>
<form id="form" method="post" action="@url(repository)/settings/update_default_branch" validate="true" class="form-inline"> <form id="form" method="post" action="@url(repository)/settings/update_default_branch" validate="true" class="form-inline">
<span class="error" id="error-defaultBranch"></span> <span class="error" id="error-defaultBranch"></span>
<select name="defaultBranch" id="defaultBranch"> <select name="defaultBranch" id="defaultBranch" class="form-control">
@repository.branchList.map { branch => @repository.branchList.map { branch =>
<option @if(branch==repository.repository.defaultBranch){ selected}>@branch</option> <option @if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
} }
</select> </select>
<input type="submit" class="btn" value="Update" /> <input type="submit" class="btn btn-default" value="Update" />
</form> </form>
</div> </div>
</div>
<div class="box-header">Protected branches</div> <div class="panel panel-default">
<div class="box-content"> <div class="panel-heading">Protected branches</div>
<p>Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches?</p> <div class="panel-body">
<fieldset class="margin"> <p>Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches?
<select name="protectBranch" id="protectBranch" onchange="location=$(this).val()"> <form class="form-inline">
<option>Choose a branch...</option> <select name="protectBranch" id="protectBranch" onchange="location=$(this).val()" class="form-control">
@repository.branchList.map { branch => <option>Choose a branch...</option>
<option value="@url(repository)/settings/branches/@encodeRefName(branch)">@branch</option> @repository.branchList.map { branch =>
} <option value="@url(repository)/settings/branches/@encodeRefName(branch)">@branch</option>
</select> }
<span class="error" id="error-protectBranch"></span> </select>
</fieldset> <span class="error" id="error-protectBranch"></span>
</form>
</p>
<table class="table table-bordered table-hover branches"> <table class="table table-bordered table-hover branches">
@protectedBranchList.map{ branch => @protectedBranchList.map{ branch =>
<tr><td> <tr><td>
<span class="branch-name">@branch</span> <span class="branch-name">@branch</span>
<span class="branch-action"> <span class="branch-action">
<a href="@url(repository)/settings/branches/@encodeRefName(branch)" class="btn btn-small">Edit</a> <a href="@url(repository)/settings/branches/@encodeRefName(branch)" class="btn btn-small btn-default">Edit</a>
</span> </span>
</td></tr> </td></tr>
} }