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

Fix styles of system administration page

Browse Source
This commit is contained in:
Naoki Takezoe
2015-12-05 19:38:02 +09:00
parent 44aa12108c
commit 38e8247483
7 changed files with 126 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/twirl/gitbucket/core/account/application.scala.html
View File

@@ -12,7 +12,7 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="box"> <div class="box">
<div class="box-header">Personal access tokens</div> <div class="box-header">Personal access tokens</div>
<div class="box-content"> <div class="box-content-bottom">
@if(personalTokens.isEmpty && gneratedToken.isEmpty){ @if(personalTokens.isEmpty && gneratedToken.isEmpty){
No tokens. No tokens.
} else { } else {
@@ -40,11 +40,11 @@
<form method="POST" action="@path/@account.userName/_personalToken" validate="true"> <form method="POST" action="@path/@account.userName/_personalToken" validate="true">
<div class="box"> <div class="box">
<div class="box-header">Generate new token</div> <div class="box-header">Generate new token</div>
<div class="box-content"> <div class="box-content-bottom">
<fieldset> <fieldset>
<label for="note" class="strong">Token description</label> <label for="note" class="strong">Token description</label>
<div><span id="error-note" class="error"></span></div> <div><span id="error-note" class="error"></span></div>
<input type="text" name="note" id="note" style="width: 400px;"/> <input type="text" name="note" id="note" class="form-control" style="width: 400px;"/>
<p class="muted">What's this token for?</p> <p class="muted">What's this token for?</p>
</fieldset> </fieldset>
<input type="submit" class="btn btn-success" value="Generate token"/> <input type="submit" class="btn btn-success" value="Generate token"/>

20
src/main/twirl/gitbucket/core/account/edit.scala.html
View File

@@ -4,41 +4,41 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main("Edit your profile"){ @html.main("Edit your profile"){
<div class="container"> <div class="container">
<div class="row-fluid"> <div class="row">
<div class="span3"> <div class="col-md-3">
@menu("profile", settings.ssh) @menu("profile", settings.ssh)
</div> </div>
<div class="span9"> <div class="col-md-9">
@helper.html.information(info) @helper.html.information(info)
@if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>} @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
<form action="@url(account.userName)/_edit" method="POST" validate="true"> <form action="@url(account.userName)/_edit" method="POST" validate="true">
<div class="box"> <div class="box">
<div class="box-header">Profile</div> <div class="box-header">Profile</div>
<div class="box-content"> <div class="box-content-bottom">
<div class="row"> <div class="row">
<div class="coil-md-6"> <div class="col-md-6">
@if(account.password.nonEmpty){ @if(account.password.nonEmpty){
<fieldset> <fieldset>
<label for="password" class="strong"> <label for="password" class="strong">
Password (input to change password): Password (input to change password):
</label> </label>
<input type="password" name="password" id="password" value="" autocomplete="off"/> <input type="password" name="password" id="password" class="form-control" value="" autocomplete="off"/>
<span id="error-password" class="error"></span> <span id="error-password" class="error"></span>
</fieldset> </fieldset>
} }
<fieldset> <fieldset>
<label for="fullName" class="strong">Full Name:</label> <label for="fullName" class="strong">Full Name:</label>
<input type="text" name="fullName" id="fullName" value="@account.fullName"/> <input type="text" name="fullName" id="fullName" class="form-control" value="@account.fullName"/>
<span id="error-fullName" class="error"></span> <span id="error-fullName" class="error"></span>
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="mailAddress" class="strong">Mail Address:</label> <label for="mailAddress" class="strong">Mail Address:</label>
<input type="text" name="mailAddress" id="mailAddress" value="@if(!LDAPUtil.isDummyMailAddress(account)){@account.mailAddress}"/> <input type="text" name="mailAddress" id="mailAddress" class="form-control" value="@if(!LDAPUtil.isDummyMailAddress(account)){@account.mailAddress}"/>
<span id="error-mailAddress" class="error"></span> <span id="error-mailAddress" class="error"></span>
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="url" class="strong">URL (optional):</label> <label for="url" class="strong">URL (optional):</label>
<input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/> <input type="text" name="url" id="url" class="form-control" value="@account.url"/>
<span id="error-url" class="error"></span> <span id="error-url" class="error"></span>
</fieldset> </fieldset>
</div> </div>
@@ -54,7 +54,7 @@
<a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a> <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
</div> </div>
<input type="submit" class="btn btn-success" value="Save"/> <input type="submit" class="btn btn-success" value="Save"/>
@if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn">Cancel</a>} @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn btn-default">Cancel</a>}
</div> </div>
</div> </div>
</div> </div>

6
src/main/twirl/gitbucket/core/admin/menu.scala.html
View File

@@ -1,8 +1,8 @@
@(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context) @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
@import context._ @import context._
<div class="container"> <div class="container">
<div class="row-fluid"> <div class="row">
<div class="span3"> <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked side-menu" id="system-admin-menu-container"> <ul class="nav nav-tabs nav-stacked side-menu" id="system-admin-menu-container">
<li@if(active=="users"){ class="active"}> <li@if(active=="users"){ class="active"}>
<a href="@path/admin/users">User Management</a> <a href="@path/admin/users">User Management</a>
@@ -18,7 +18,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="span9"> <div class="col-md-9">
@body @body
</div> </div>
</div> </div>

191
src/main/twirl/gitbucket/core/admin/system.scala.html
View File

@@ -5,10 +5,10 @@
@html.main("System Settings"){ @html.main("System Settings"){
@menu("system"){ @menu("system"){
@helper.html.information(info) @helper.html.information(info)
<form action="@path/admin/system" method="POST" validate="true"> <form action="@path/admin/system" method="POST" validate="true" class="form-horizontal">
<div class="box"> <div class="box">
<div class="box-header">System Settings</div> <div class="box-header">System Settings</div>
<div class="box-content"> <div class="box-content-bottom">
<!--====================================================================--> <!--====================================================================-->
<!-- GITBUCKET_HOME --> <!-- GITBUCKET_HOME -->
<!--====================================================================--> <!--====================================================================-->
@@ -21,7 +21,7 @@
<label><span class="strong">Base URL</span> (e.g. <code>http://example.com/gitbucket</code>)</label> <label><span class="strong">Base URL</span> (e.g. <code>http://example.com/gitbucket</code>)</label>
<fieldset> <fieldset>
<div class="controls"> <div class="controls">
<input type="text" name="baseUrl" id="baseUrl" style="width: 400px" value="@settings.baseUrl"/> <input type="text" name="baseUrl" id="baseUrl" class="form-control" style="width: 400px" value="@settings.baseUrl"/>
<span id="error-baseUrl" class="error"></span> <span id="error-baseUrl" class="error"></span>
</div> </div>
</fieldset> </fieldset>
@@ -36,7 +36,7 @@
<hr> <hr>
<label><span class="strong">Information</span> (HTML is available)</label> <label><span class="strong">Information</span> (HTML is available)</label>
<fieldset> <fieldset>
<textarea name="information" style="width: 600px; height: 100px;">@settings.information</textarea> <textarea name="information" class="form-control" style="width: 600px; height: 100px;">@settings.information</textarea>
</fieldset> </fieldset>
<!--====================================================================--> <!--====================================================================-->
<!-- Account registration --> <!-- Account registration -->
@@ -46,11 +46,11 @@
<fieldset> <fieldset>
<label class="radio"> <label class="radio">
<input type="radio" name="allowAccountRegistration" value="true"@if(settings.allowAccountRegistration){ checked}> <input type="radio" name="allowAccountRegistration" value="true"@if(settings.allowAccountRegistration){ checked}>
<span class="strong">Allow</span> - Users can create accounts by themselves. <span class="strong">Allow</span> <span class="normal">- Users can create accounts by themselves.</span>
</label> </label>
<label class="radio"> <label class="radio">
<input type="radio" name="allowAccountRegistration" value="false"@if(!settings.allowAccountRegistration){ checked}> <input type="radio" name="allowAccountRegistration" value="false"@if(!settings.allowAccountRegistration){ checked}>
<span class="strong">Deny</span> - Only administrators can create accounts. <span class="strong">Deny</span> - <span class="normal">Only administrators can create accounts.</span>
</label> </label>
</fieldset> </fieldset>
<hr> <hr>
@@ -58,11 +58,11 @@
<fieldset> <fieldset>
<label class="radio"> <label class="radio">
<input type="radio" name="isCreateRepoOptionPublic" value="true"@if(settings.isCreateRepoOptionPublic){ checked}> <input type="radio" name="isCreateRepoOptionPublic" value="true"@if(settings.isCreateRepoOptionPublic){ checked}>
<span class="strong">Public</span> - All users and guests can read that repository. <span class="strong">Public</span> <span class="normal">- All users and guests can read that repository.</span>
</label> </label>
<label class="radio"> <label class="radio">
<input type="radio" name="isCreateRepoOptionPublic" value="false"@if(!settings.isCreateRepoOptionPublic){ checked}> <input type="radio" name="isCreateRepoOptionPublic" value="false"@if(!settings.isCreateRepoOptionPublic){ checked}>
<span class="strong">Private</span> - Only collaborators can read that repository. <span class="strong">Private</span> <span class="normal">- Only collaborators can read that repository.</span>
</label> </label>
</fieldset> </fieldset>
<!--====================================================================--> <!--====================================================================-->
@@ -73,11 +73,11 @@
<fieldset> <fieldset>
<label class="radio"> <label class="radio">
<input type="radio" name="allowAnonymousAccess" value="true"@if(settings.allowAnonymousAccess){ checked}> <input type="radio" name="allowAnonymousAccess" value="true"@if(settings.allowAnonymousAccess){ checked}>
<span class="strong">Allow</span> - Anyone can view public repositories, user/group profiles. <span class="strong">Allow</span> <span class="normal">- Anyone can view public repositories, user/group profiles.</span>
</label> </label>
<label class="radio"> <label class="radio">
<input type="radio" name="allowAnonymousAccess" value="false"@if(!settings.allowAnonymousAccess){ checked}> <input type="radio" name="allowAnonymousAccess" value="false"@if(!settings.allowAnonymousAccess){ checked}>
<span class="strong">Deny</span> - Users must authenticate before viewing any information <span class="strong">Deny</span> <span class="normal">- Users must authenticate before viewing any information.</span>
</label> </label>
</fieldset> </fieldset>
<!--====================================================================--> <!--====================================================================-->
@@ -86,7 +86,7 @@
<hr> <hr>
<label><span class="strong">Limit of activity logs</span> (Unlimited if it's not specified or zero)</label> <label><span class="strong">Limit of activity logs</span> (Unlimited if it's not specified or zero)</label>
<div class="controls"> <div class="controls">
<input type="text" id="activityLogLimit" name="activityLogLimit" class="input-mini" value="@settings.activityLogLimit"/> <input type="text" id="activityLogLimit" name="activityLogLimit" class="form-control input-mini" value="@settings.activityLogLimit"/>
<span id="error-activityLogLimit" class="error"></span> <span id="error-activityLogLimit" class="error"></span>
</div> </div>
<!--====================================================================--> <!--====================================================================-->
@@ -111,15 +111,13 @@
Enable SSH access to git repository Enable SSH access to git repository
</label> </label>
</fieldset> </fieldset>
<div class="form-horizontal ssh"> <div class="form-group ssh">
<div class="control-group"> <label class="control-label col-md-3" for="sshPort">SSH Port</label>
<label class="control-label" for="sshPort">SSH Port</label> <div class="col-md-9">
<div class="controls"> <input type="text" id="sshPort" name="sshPort" class="form-control" value="@settings.sshPort"/>
<input type="text" id="sshPort" name="sshPort" value="@settings.sshPort"/>
<span id="error-sshPort" class="error"></span> <span id="error-sshPort" class="error"></span>
</div> </div>
</div> </div>
</div>
<p class="muted"> <p class="muted">
Base URL is required if SSH access is enabled. Base URL is required if SSH access is enabled.
</p> </p>
@@ -134,88 +132,86 @@
LDAP LDAP
</label> </label>
</fieldset> </fieldset>
<div class="form-horizontal ldap"> <div class="ldap">
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapHost">LDAP Host</label> <label class="control-label col-md-3" for="ldapHost">LDAP Host</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapHost" name="ldap.host" value="@settings.ldap.map(_.host)"/> <input type="text" id="ldapHost" name="ldap.host" class="form-control" value="@settings.ldap.map(_.host)"/>
<span id="error-ldap_host" class="error"></span> <span id="error-ldap_host" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapPort">LDAP Port</label> <label class="control-label col-md-3" for="ldapPort">LDAP Port</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapPort" name="ldap.port" class="input-mini" value="@settings.ldap.map(_.port)"/> <input type="text" id="ldapPort" name="ldap.port" class="form-control input-mini" value="@settings.ldap.map(_.port)"/>
<span id="error-ldap_port" class="error"></span> <span id="error-ldap_port" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapBindDN">Bind DN</label> <label class="control-label col-md-3" for="ldapBindDN">Bind DN</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapBindDN" name="ldap.bindDN" value="@settings.ldap.map(_.bindDN)"/> <input type="text" id="ldapBindDN" name="ldap.bindDN" class="form-control" value="@settings.ldap.map(_.bindDN)"/>
<span id="error-ldap_bindDN" class="error"></span> <span id="error-ldap_bindDN" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapBindPassword">Bind Password</label> <label class="control-label col-md-3" for="ldapBindPassword">Bind Password</label>
<div class="controls"> <div class="col-md-9">
<input type="password" id="ldapBindPassword" name="ldap.bindPassword" value="@settings.ldap.map(_.bindPassword)"/> <input type="password" id="ldapBindPassword" name="ldap.bindPassword" class="form-control" value="@settings.ldap.map(_.bindPassword)"/>
<span id="error-ldap_bindPassword" class="error"></span> <span id="error-ldap_bindPassword" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapBaseDN">Base DN</label> <label class="control-label col-md-3" for="ldapBaseDN">Base DN</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapBaseDN" name="ldap.baseDN" value="@settings.ldap.map(_.baseDN)"/> <input type="text" id="ldapBaseDN" name="ldap.baseDN" class="form-control" value="@settings.ldap.map(_.baseDN)"/>
<span id="error-ldap_baseDN" class="error"></span> <span id="error-ldap_baseDN" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapUserNameAttribute">User name attribute</label> <label class="control-label col-md-3" for="ldapUserNameAttribute">User name attribute</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapUserNameAttribute" name="ldap.userNameAttribute" value="@settings.ldap.map(_.userNameAttribute)"/> <input type="text" id="ldapUserNameAttribute" name="ldap.userNameAttribute" class="form-control" value="@settings.ldap.map(_.userNameAttribute)"/>
<span id="error-ldap_userNameAttribute" class="error"></span> <span id="error-ldap_userNameAttribute" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapAdditionalFilterCondition">Additional filter condition</label> <label class="control-label col-md-3" for="ldapAdditionalFilterCondition">Additional filter condition</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapAdditionalFilterCondition" name="ldap.additionalFilterCondition" value="@settings.ldap.map(_.additionalFilterCondition)"/> <input type="text" id="ldapAdditionalFilterCondition" name="ldap.additionalFilterCondition" class="form-control" value="@settings.ldap.map(_.additionalFilterCondition)"/>
<span id="error-ldap_additionalFilterCondition" class="error"></span> <span id="error-ldap_additionalFilterCondition" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapFullNameAttribute">Full name attribute</label> <label class="control-label col-md-3" for="ldapFullNameAttribute">Full name attribute</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapFullNameAttribute" name="ldap.fullNameAttribute" value="@settings.ldap.map(_.fullNameAttribute)"/> <input type="text" id="ldapFullNameAttribute" name="ldap.fullNameAttribute" class="form-control" value="@settings.ldap.map(_.fullNameAttribute)"/>
<span id="error-ldap_fullNameAttribute" class="error"></span> <span id="error-ldap_fullNameAttribute" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapMailAttribute">Mail address attribute</label> <label class="control-label col-md-3" for="ldapMailAttribute">Mail address attribute</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapMailAttribute" name="ldap.mailAttribute" value="@settings.ldap.map(_.mailAttribute)"/> <input type="text" id="ldapMailAttribute" name="ldap.mailAttribute" class="form-control" value="@settings.ldap.map(_.mailAttribute)"/>
<span id="error-ldap_mailAttribute" class="error"></span> <span id="error-ldap_mailAttribute" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<div class="controls"> <label class="control-label col-md-3">Enable TLS</label>
<label class="checkbox"> <div class="col-md-9">
<input type="checkbox" name="ldap.tls"@if(settings.ldap.flatMap(_.tls).getOrElse(false)){ checked}/> Enable TLS <input type="checkbox" name="ldap.tls"@if(settings.ldap.flatMap(_.tls).getOrElse(false)){ checked}/>
</label>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<div class="controls"> <label class="control-label col-md-3">Enable SSL</label>
<label class="checkbox"> <div class="col-md-9">
<input type="checkbox" name="ldap.ssl"@if(settings.ldap.flatMap(_.ssl).getOrElse(false)){ checked}/> Enable SSL <input type="checkbox" name="ldap.ssl"@if(settings.ldap.flatMap(_.ssl).getOrElse(false)){ checked}/>
</label>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="ldapBindDN">Keystore</label> <label class="control-label col-md-3" for="ldapBindDN">Keystore</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="ldapKeystore" name="ldap.keystore" value="@settings.ldap.map(_.keystore)"/> <input type="text" id="ldapKeystore" name="ldap.keystore" class="form-control" value="@settings.ldap.map(_.keystore)"/>
<span id="error-ldap_keystore" class="error"></span> <span id="error-ldap_keystore" class="error"></span>
</div> </div>
</div> </div>
@@ -242,50 +238,49 @@
SMTP SMTP
</label> </label>
</fieldset> </fieldset>
<div class="form-horizontal useSMTP"> <div class="useSMTP">
<div class="control-group"> <div class="form-group">
<label class="control-label" for="smtpHost">SMTP Host</label> <label class="control-label col-md-3" for="smtpHost">SMTP Host</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="smtpHost" name="smtp.host" value="@settings.smtp.map(_.host)"/> <input type="text" id="smtpHost" name="smtp.host" class="form-control" value="@settings.smtp.map(_.host)"/>
<span id="error-smtp_host" class="error"></span> <span id="error-smtp_host" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="smtpPort">SMTP Port</label> <label class="control-label col-md-3" for="smtpPort">SMTP Port</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="smtpPort" name="smtp.port" class="input-mini" value="@settings.smtp.map(_.port)"/> <input type="text" id="smtpPort" name="smtp.port" class="form-control input-mini" value="@settings.smtp.map(_.port)"/>
<span id="error-smtp_port" class="error"></span> <span id="error-smtp_port" class="error"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="smtpUser">SMTP User</label> <label class="control-label col-md-3" for="smtpUser">SMTP User</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="smtpUser" name="smtp.user" value="@settings.smtp.map(_.user)"/> <input type="text" id="smtpUser" name="smtp.user" class="form-control" value="@settings.smtp.map(_.user)"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="smtpPassword">SMTP Password</label> <label class="control-label col-md-3" for="smtpPassword">SMTP Password</label>
<div class="controls"> <div class="col-md-9">
<input type="password" id="smtpPassword" name="smtp.password" value="@settings.smtp.map(_.password)"/> <input type="password" id="smtpPassword" name="smtp.password" class="form-control" value="@settings.smtp.map(_.password)"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<div class="controls"> <label class="control-label col-md-3" for="smtpPassword">Enable SSL</label>
<label class="checkbox"> <div class="col-md-9">
<input type="checkbox" name="smtp.ssl"@if(settings.smtp.flatMap(_.ssl).getOrElse(false)){ checked}/> Enable SSL <input type="checkbox" name="smtp.ssl"@if(settings.smtp.flatMap(_.ssl).getOrElse(false)){ checked}/>
</label>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="fromAddress">FROM Address</label> <label class="control-label col-md-3" for="fromAddress">FROM Address</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="fromAddress" name="smtp.fromAddress" value="@settings.smtp.map(_.fromAddress)"/> <input type="text" id="fromAddress" name="smtp.fromAddress" class="form-control" value="@settings.smtp.map(_.fromAddress)"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label" for="fromName">FROM Name</label> <label class="control-label col-md-3" for="fromName">FROM Name</label>
<div class="controls"> <div class="col-md-9">
<input type="text" id="fromName" name="smtp.fromName" value="@settings.smtp.map(_.fromName)"/> <input type="text" id="fromName" name="smtp.fromName" class="form-control" value="@settings.smtp.map(_.fromName)"/>
</div> </div>
</div> </div>
<p class="muted"> <p class="muted">

12
src/main/twirl/gitbucket/core/admin/users/group.scala.html
View File

@@ -4,8 +4,8 @@
@html.main(if(account.isEmpty) "New Group" else "Update Group"){ @html.main(if(account.isEmpty) "New Group" else "Update Group"){
@admin.html.menu("users"){ @admin.html.menu("users"){
<form method="POST" action="@if(account.isEmpty){@path/admin/users/_newgroup} else {@path/admin/users/@account.get.userName/_editgroup}" validate="true"> <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newgroup} else {@path/admin/users/@account.get.userName/_editgroup}" validate="true">
<div class="row-fluid"> <div class="row">
<div class="span5"> <div class="col-md-5">
<fieldset> <fieldset>
<label for="groupName" class="strong">Group name</label> <label for="groupName" class="strong">Group name</label>
<div> <div>
@@ -24,20 +24,20 @@
<div> <div>
<span id="error-url" class="error"></span> <span id="error-url" class="error"></span>
</div> </div>
<input type="text" name="url" id="url" value="@account.map(_.url)"/> <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="avatar" class="strong">Image (Optional)</label> <label for="avatar" class="strong">Image (Optional)</label>
@helper.html.uploadavatar(account) @helper.html.uploadavatar(account)
</fieldset> </fieldset>
</div> </div>
<div class="span7"> <div class="col-md-7">
<fieldset> <fieldset>
<label class="strong">Members</label> <label class="strong">Members</label>
<ul id="member-list" class="collaborator"> <ul id="member-list" class="collaborator">
</ul> </ul>
@helper.html.account("memberName", 200) @helper.html.account("memberName", 200)
<input type="button" class="btn" value="Add" id="addMember"/> <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(",")"/> <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
<div> <div>
<span class="error" id="error-members"></span> <span class="error" id="error-members"></span>
@@ -47,7 +47,7 @@
</div> </div>
<fieldset class="margin"> <fieldset class="margin">
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/> <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
<a href="@path/admin/users" class="btn">Cancel</a> <a href="@path/admin/users" class="btn btn-default">Cancel</a>
</fieldset> </fieldset>
</form> </form>
} }

4
src/main/twirl/gitbucket/core/admin/users/list.scala.html
View File

@@ -4,8 +4,8 @@
@html.main("Manage Users"){ @html.main("Manage Users"){
@admin.html.menu("users"){ @admin.html.menu("users"){
<div class="pull-right" style="margin-bottom: 4px;"> <div class="pull-right" style="margin-bottom: 4px;">
<a href="@path/admin/users/_newuser" class="btn">New User</a> <a href="@path/admin/users/_newuser" class="btn btn-default">New User</a>
<a href="@path/admin/users/_newgroup" class="btn">New Group</a> <a href="@path/admin/users/_newgroup" class="btn btn-default">New Group</a>
</div> </div>
<label for="includeRemoved"> <label for="includeRemoved">
<input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/> <input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>

12
src/main/twirl/gitbucket/core/admin/users/user.scala.html
View File

@@ -10,7 +10,7 @@
<div> <div>
<span id="error-userName" class="error"></span> <span id="error-userName" class="error"></span>
</div> </div>
<input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/> <input type="text" name="userName" id="userName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
@if(account.isDefined){ @if(account.isDefined){
<label for="removed"> <label for="removed">
<input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/> <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
@@ -33,7 +33,7 @@
<div> <div>
<span id="error-password" class="error"></span> <span id="error-password" class="error"></span>
</div> </div>
<input type="password" name="password" id="password" value="" autocomplete="off"/> <input type="password" name="password" id="password" class="form-control" value="" autocomplete="off"/>
</fieldset> </fieldset>
} }
<fieldset> <fieldset>
@@ -41,14 +41,14 @@
<div> <div>
<span id="error-fullName" class="error"></span> <span id="error-fullName" class="error"></span>
</div> </div>
<input type="text" name="fullName" id="fullName" value="@account.map(_.fullName)"/> <input type="text" name="fullName" id="fullName" class="form-control" value="@account.map(_.fullName)"/>
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="mailAddress" class="strong">Mail Address:</label> <label for="mailAddress" class="strong">Mail Address:</label>
<div> <div>
<span id="error-mailAddress" class="error"></span> <span id="error-mailAddress" class="error"></span>
</div> </div>
<input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/> <input type="text" name="mailAddress" id="mailAddress" class="form-control" value="@account.map(_.mailAddress)"/>
</fieldset> </fieldset>
<fieldset> <fieldset>
<label class="strong">User Type:</label> <label class="strong">User Type:</label>
@@ -64,7 +64,7 @@
<div> <div>
<span id="error-url" class="error"></span> <span id="error-url" class="error"></span>
</div> </div>
<input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/> <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
</fieldset> </fieldset>
</div> </div>
<div class="span6"> <div class="span6">
@@ -76,7 +76,7 @@
</div> </div>
<fieldset class="margin"> <fieldset class="margin">
<input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/> <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
<a href="@path/admin/users" class="btn">Cancel</a> <a href="@path/admin/users" class="btn btn-default">Cancel</a>
</fieldset> </fieldset>
</form> </form>
} }