Tweak group editing form template

This commit is contained in:
Naoki Takezoe
2017-06-24 18:59:00 +09:00
parent 0b76307354
commit 626e68eae8
4 changed files with 76 additions and 70 deletions

View File

@@ -3,7 +3,12 @@
<div class="content-wrapper main-center">
<div class="content body">
<h2>Create group</h2>
@gitbucket.core.account.html.groupform(None, members, s"${context.path}/groups/new", false)
<form id="form" method="post" action="@context.path/groups/new" validate="true">
@gitbucket.core.account.html.groupform(None, members, false)
<fieldset class="border-top">
<input type="submit" class="btn btn-success" value="Create group"/>
</fieldset>
</form>
</div>
</div>
}

View File

@@ -1,10 +1,19 @@
@(account: gitbucket.core.model.Account,
members: List[gitbucket.core.model.GroupMember],
info: Option[Any])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("Edit group"){
@gitbucket.core.account.html.menu("profile", account.userName, true){
@gitbucket.core.helper.html.information(info)
<h2>Edit group</h2>
@gitbucket.core.account.html.groupform(Some(account), members, s"${context.path}/${account.userName}/_editgroup", false)
<form id="form" method="post" action="@context.path/@account.userName/_editgroup" validate="true">
@gitbucket.core.account.html.groupform(Some(account), members, false)
<fieldset class="border-top">
<div class="pull-right">
<a href="@helpers.url(account.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
</div>
<input type="submit" class="btn btn-success" value="Update group"/>
</fieldset>
</form>
}
}

View File

@@ -1,68 +1,53 @@
@(account: Option[gitbucket.core.model.Account],
members: List[gitbucket.core.model.GroupMember],
formUrl: String,
admin: Boolean)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
<form id="form" method="post" action="@formUrl" validate="true">
<div class="row">
<div class="col-md-5">
<fieldset class="form-group">
<label for="groupName" class="strong">Group name</label>
<div>
<span id="error-groupName" class="error"></span>
</div>
<input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
@if(account.isDefined && admin){
<label for="removed">
<input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
Disable
</label>
}
</fieldset>
<fieldset class="form-group">
<label class="strong">URL (Optional)</label>
<div>
<span id="error-url" class="error"></span>
</div>
<input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
</fieldset>
<fieldset class="form-group">
<label for="groupDescription" class="strong">Description (Optional)</label>
<div>
<textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
</div>
</fieldset>
<fieldset class="form-group">
<label for="avatar" class="strong">Image (Optional)</label>
@gitbucket.core.helper.html.uploadavatar(account)
</fieldset>
</div>
<div class="col-md-7">
<fieldset class="form-group">
<label class="strong">Members</label>
<ul id="member-list" class="collaborator">
</ul>
@gitbucket.core.helper.html.account("memberName", 200, true, false)
<input type="button" class="btn btn-default" value="Add" id="addMember"/>
<input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
<div>
<span class="error" id="error-members"></span>
</div>
</fieldset>
</div>
</div>
<fieldset class="border-top">
@if(account.isDefined && !admin){
<div class="pull-right">
<a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
<div class="row">
<div class="col-md-5">
<fieldset class="form-group">
<label for="groupName" class="strong">Group name</label>
<div>
<span id="error-groupName" class="error"></span>
</div>
}
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
@if(admin){
<a href="@context.path/admin/users" class="btn btn-default">Cancel</a>
}
</fieldset>
</form>
<input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
@if(account.isDefined && admin){
<label for="removed">
<input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
Disable
</label>
}
</fieldset>
<fieldset class="form-group">
<label class="strong">URL (Optional)</label>
<div>
<span id="error-url" class="error"></span>
</div>
<input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
</fieldset>
<fieldset class="form-group">
<label for="groupDescription" class="strong">Description (Optional)</label>
<div>
<textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
</div>
</fieldset>
<fieldset class="form-group">
<label for="avatar" class="strong">Image (Optional)</label>
@gitbucket.core.helper.html.uploadavatar(account)
</fieldset>
</div>
<div class="col-md-7">
<fieldset class="form-group">
<label class="strong">Members</label>
<ul id="member-list" class="collaborator">
</ul>
@gitbucket.core.helper.html.account("memberName", 200, true, false)
<input type="button" class="btn btn-default" value="Add" id="addMember"/>
<input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
<div>
<span class="error" id="error-members"></span>
</div>
</fieldset>
</div>
</div>
<script>
$(function(){
$('input[type=submit]').click(function(){

View File

@@ -1,12 +1,19 @@
@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main(if(account.isEmpty) "New group" else "Update group"){
@gitbucket.core.admin.html.menu("users"){
@gitbucket.core.account.html.groupform(account, members,
account match {
case Some(x) => s"${context.path}/admin/users/${x.userName}/_editgroup"
case None => s"${context.path}/admin/users/_newgroup"
},
true
)
<form id="form" method="post" action="@context.path/admin/users/@(account.map(x => s"${x.userName}/_editgroup").getOrElse("_newgroup"))" validate="true">
@gitbucket.core.account.html.groupform(account, members, true
)
<fieldset class="border-top">
@if(account.isDefined){
<div class="pull-right">
<a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
</div>
}
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
<a href="@context.path/admin/users" class="btn btn-default">Cancel</a>
</fieldset>
</form>
}
}