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

Fix header and sign-in form presentation.

Browse Source
This commit is contained in:
takezoe
2013-07-11 03:50:00 +09:00
parent 5d5b642fa9
commit 072290e544
4 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/twirl/main.scala.html
View File

@@ -28,7 +28,7 @@
<script src="@assets/google-code-prettify/prettify.js"></script> <script src="@assets/google-code-prettify/prettify.js"></script>
</head> </head>
<body> <body>
<div class="navbar navbar-inverse"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -37,19 +37,18 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="brand" href="@path/">GitBucket</a> <a class="brand" href="@path/">GitBucket</a>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse pull-right">
<ul class="nav pull-right"> @if(loginAccount.isDefined){
@if(loginAccount.isDefined){ <a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20)@loginAccount.get.userName</a>
<li><a href="@path/new">New repo</a></li> <a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a>
<li><a href="@url(loginAccount.get.userName)">Account</a></li> <a href="@url(loginAccount.get.userName)/_edit" class="menu" data-toggle="tooltip" data-placement="bottom" title="Account settings"><i class="icon-user"></i></a>
@if(loginAccount.get.isAdmin){ @if(loginAccount.get.isAdmin){
<li><a href="@path/admin/users">Administration</a></li> <a href="@path/admin/users" class="menu" data-toggle="tooltip" data-placement="bottom" title="Administration"><i class="icon-wrench"></i></a>
}
<li><a href="@path/signout">Sign out</a></li>
} else {
<li><a href="@path/signin?@currentUrl">Sign in</a></li>
} }
</ul> <a href="@path/signout" class="menu-last" data-toggle="tooltip" data-placement="bottom" title="Sign out"><i class="icon-share-alt"></i></a>
} else {
<a href="@path/signin?@currentUrl" class="btn btn-last">Sign in</a>
}
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>

12
src/main/twirl/signinform.scala.html
View File

@@ -2,7 +2,14 @@
@import context._ @import context._
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th class="metal">Sign in</th> <th class="metal">
@if(systemSettings.allowAccountRegistration){
<div class="pull-right">
<a href="@path/register" class="btn btn-mini">Create new account</a>
</div>
}
Sign in
</th>
</tr> </tr>
<tr> <tr>
<td> <td>
@@ -15,9 +22,6 @@
<input type="password" name="password" id="password" style="width: 95%"/> <input type="password" name="password" id="password" style="width: 95%"/>
<div> <div>
<input type="submit" class="btn btn-success" value="Sign in"/> <input type="submit" class="btn btn-success" value="Sign in"/>
@if(systemSettings.allowAccountRegistration){
<a href="@path/register" class="btn">Create new account</a>
}
</div> </div>
</form> </form>
</td> </td>

25
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -5,6 +5,31 @@ body {
color: #333; color: #333;
} }
div.navbar-inner {
border-radius: 0px;
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-top: none;
border-left: none;
border-right: none;
border-bottom: 1px solid #d4d4d4;
padding-right: 0px;
}
div.nav-collapse a.menu {
margin-right: 12px;
line-height: 40px;
}
div.nav-collapse a.btn-last {
margin-right: 30px;
}
div.nav-collapse a.menu-last {
margin-right: 30px;
line-height: 40px;
}
div.gitbucket-version { div.gitbucket-version {
font-size: small; font-size: small;
color: silver; color: silver;

1
src/main/webapp/assets/common/js/gitbucket.js
View File

@@ -6,6 +6,7 @@ $(function(){
}); });
$('img[data-toggle=tooltip]').tooltip(); $('img[data-toggle=tooltip]').tooltip();
$('a[data-toggle=tooltip]').tooltip();
prettyPrint(); prettyPrint();
}); });