Merge branch 'master' of github.com:gogits/gogs

This commit is contained in:
Unknown 2014-03-16 10:35:29 -04:00
commit 2fd3608388
4 changed files with 132 additions and 76 deletions

View file

@ -223,7 +223,18 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
return err return err
} }
return nil pu, err := os.OpenFile(filepath.Join(f, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777)
if err != nil {
return err
}
defer pu.Close()
ep, err := exePath()
if err != nil {
return err
}
_, err = pu.WriteString(fmt.Sprintf("#!/usr/bin/env bash\n%s update\n", ep))
return err
} }
func GetRepositoryByName(user *User, repoName string) (*Repository, error) { func GetRepositoryByName(user *User, repoName string) (*Repository, error) {

File diff suppressed because one or more lines are too long

View file

@ -463,56 +463,6 @@ html, body {
padding: 0; padding: 0;
} }
/* #gogs-source */
#gogs-source-toolbar:after {
clear: both;
}
#gogs-source-toolbar .branch-switch {
display: inline-block;
}
#gogs-source-toolbar .breadcrumb {
margin: 0 .5em;
font-size: 16px;
vertical-align: middle;
display: inline-block;
background-color: transparent;
}
#gogs-source-table {
margin-top: 1.5em;
font-size: 14px;
}
#gogs-source-table .fa{
font-size: 15px;
width: 16px;
text-align: center;
color: #666;
}
#gogs-source-table .name{
width: 160px;
}
#gogs-source-table .size{
width: 80px;
}
#gogs-source-table .date{
width: 120px;
}
#gogs-source-table .is-dir .name {
font-weight: bold;
}
#gogs-source-table.table-hover > tbody > tr:hover > td {
background-color: #FEFEFE;
}
.activity-list { .activity-list {
font-size: 14px; font-size: 14px;
} }
@ -574,6 +524,70 @@ html, body {
color: #999; color: #999;
} }
/* #gogs-source */
#gogs-source .source-toolbar:after {
clear: both;
}
#gogs-source .source-toolbar .branch-switch {
display: inline-block;
}
#gogs-source .source-toolbar .breadcrumb {
margin: 0 .5em;
padding: 6px 15px;
font-size: 16px;
vertical-align: middle;
display: inline-block;
background-color: transparent;
}
#gogs-source .source-toolbar,
#gogs-source .info-box,
#gogs-source .file-content {
margin: 0 0 10px;
}
.info-box .info-head,
.info-box .info-content {
padding: 9px 20px;
}
.file-list {
background-color: #fafafa;
}
.file-list .icon {
font-size: 17px;
padding: 5px 0 4px 10px;
width: 40px;
}
.file-list .wrap {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
}
.file-list .name .wrap {
max-width: 180px;
}
.file-list .text .wrap {
max-width: 450px;
}
.file-list .date .wrap {
max-width: 100px;
padding: 0 20px 0 0;
}
.file-list .date {
text-align: right;
}
#wrapper { #wrapper {
min-height: 100%; min-height: 100%;
height: auto !important; height: auto !important;

View file

@ -4,7 +4,7 @@
{{template "repo/toolbar" .}} {{template "repo/toolbar" .}}
<div id="gogs-body" class="container"> <div id="gogs-body" class="container">
<div id="gogs-source"> <div id="gogs-source">
<div id="gogs-source-toolbar"> <div class="source-toolbar">
<button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button> <button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button>
<div class="dropdown branch-switch"> <div class="dropdown branch-switch">
<a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>master&nbsp;&nbsp; <a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>master&nbsp;&nbsp;
@ -32,29 +32,60 @@
{{end}} {{end}}
</ol> </ol>
</div> </div>
<table id="gogs-source-table" class="table table-hover"> <div class="panel panel-default info-box">
<div class="panel-heading info-head">
Merge branch 'release/1.1.1'
</div>
<div class="panel-body info-content">
slene authored 4 days ago
</div>
<table class="panel-footer table file-list">
<thead class="hidden"> <thead class="hidden">
<tr> <tr>
<th class="icon"></th>
<th class="name">Filename</th> <th class="name">Filename</th>
<th class="date">Date modified</th>
<th class="text">Message</th> <th class="text">Message</th>
<th class="date">Date modified</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{range .Files}} {{range .Files}}
<tr {{if .IsDir}}class="is-dir"{{end}}> <tr {{if .IsDir}}class="is-dir"{{end}}>
<td class="name"><i class="fa {{if .IsDir}}fa-folder{{else}}fa-file{{end}}"></i> <td class="icon">
<i class="fa {{if .IsDir}}fa-folder{{else}}fa-file-text-o{{end}}"></i>
</td>
<td class="name">
<span class="wrap">
{{if .IsDir}} {{if .IsDir}}
<a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}/{{.Path}}">{{.Name}}</a> <a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}/{{.Path}}">{{.Name}}</a>
{{else}} {{else}}
<a href="/{{$username}}/{{$reponame}}/blob/{{$branchname}}/{{.Name}}">{{.Name}} - {{FileSize .Size}}</a> <a href="/{{$username}}/{{$reponame}}/blob/{{$branchname}}/{{.Name}}">{{.Name}}</a>
{{end}}</td> {{end}}
<td class="date"><time datetime="{{.Created}}" data-title="true" title="{{.Created}}">{{TimeSince .Created}}</time></td> </span>
<td class="text">{{.Message}}</td> </td>
<td class="text">
<span class="wrap">
{{.Message}}
</span>
</td>
<td class="date">
<span class="wrap">
{{TimeSince .Created}}
</span>
</td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="panel panel-default file-content">
<div class="panel-heading">
README.md
</div>
<div class="panel-body markdown">
httplib
</div>
</div>
</div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}