coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1078 not show bin when rename a file

This commit is contained in:
Unknwon 2015-11-03 09:52:17 -05:00
parent bc82157216
commit 0af035c37e
7 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.22.1102 Beta" const APP_VER = "0.6.22.1103 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
modules/base/template.go
View File

@ -263,7 +263,7 @@ func ActionContent2Commits(act Actioner) *PushCommits {
func DiffTypeToStr(diffType int) string { func DiffTypeToStr(diffType int) string {
diffTypes := map[int]string{ diffTypes := map[int]string{
1: "add", 2: "modify", 3: "del", 1: "add", 2: "modify", 3: "del", 4: "rename",
} }
return diffTypes[diffType] return diffTypes[diffType]
} }

18
public/config.codekit
View File

@ -5,7 +5,7 @@
"\/css\/dropzone-4.0.1.css": { "\/css\/dropzone-4.0.1.css": {
"fileType": 16, "fileType": 16,
"ignore": 0, "ignore": 0,
"ignoreWasSetByUser": 0, "ignoreWasSetByUser": 1,
"inputAbbreviatedPath": "\/css\/dropzone-4.0.1.css", "inputAbbreviatedPath": "\/css\/dropzone-4.0.1.css",
"outputAbbreviatedPath": "No Output Path", "outputAbbreviatedPath": "No Output Path",
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
@ -74,11 +74,11 @@
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0 "outputPathIsSetByUser": 0
}, },
"\/css\/semantic-2.1.3.min.css": { "\/css\/semantic-2.1.5.min.css": {
"fileType": 16, "fileType": 16,
"ignore": 0, "ignore": 0,
"ignoreWasSetByUser": 0, "ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/css\/semantic-2.1.3.min.css", "inputAbbreviatedPath": "\/css\/semantic-2.1.5.min.css",
"outputAbbreviatedPath": "No Output Path", "outputAbbreviatedPath": "No Output Path",
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0 "outputPathIsSetByUser": 0
@ -204,12 +204,12 @@
"outputStyle": 1, "outputStyle": 1,
"syntaxCheckerStyle": 1 "syntaxCheckerStyle": 1
}, },
"\/js\/libs\/clipboard-1.3.1.min.js": { "\/js\/libs\/clipboard-1.5.3.min.js": {
"fileType": 64, "fileType": 64,
"ignore": 0, "ignore": 0,
"ignoreWasSetByUser": 0, "ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/js\/libs\/clipboard-1.3.1.min.js", "inputAbbreviatedPath": "\/js\/libs\/clipboard-1.5.3.min.js",
"outputAbbreviatedPath": "\/js\/libs\/min\/clipboard-1.3.1.min-min.js", "outputAbbreviatedPath": "\/js\/libs\/min\/clipboard-1.5.3.min-min.js",
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0, "outputPathIsSetByUser": 0,
"outputStyle": 1, "outputStyle": 1,
@ -281,12 +281,12 @@
"outputPathIsSetByUser": 0, "outputPathIsSetByUser": 0,
"processed": 0 "processed": 0
}, },
"\/js\/semantic-2.1.3.min.js": { "\/js\/semantic-2.1.5.min.js": {
"fileType": 64, "fileType": 64,
"ignore": 0, "ignore": 0,
"ignoreWasSetByUser": 0, "ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/js\/semantic-2.1.3.min.js", "inputAbbreviatedPath": "\/js\/semantic-2.1.5.min.js",
"outputAbbreviatedPath": "\/js\/min\/semantic-2.1.3.min-min.js", "outputAbbreviatedPath": "\/js\/min\/semantic-2.1.5.min-min.js",
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0, "outputPathIsSetByUser": 0,
"outputStyle": 1, "outputStyle": 1,

4
public/css/gogs.css
View File

@ -2288,6 +2288,10 @@ ol.linenums {
.repository .diff-file-box .code-diff tbody tr:hover pre { .repository .diff-file-box .code-diff tbody tr:hover pre {
background-color: transparent !important; background-color: transparent !important;
} }
.repository .diff-file-box.file-content img {
max-width: 100%;
padding: 5px 5px 0 5px;
}
.repository .code-view { .repository .code-view {
overflow: auto; overflow: auto;
overflow-x: auto; overflow-x: auto;

6
public/less/_repository.less
View File

@ -584,6 +584,12 @@
} }
} }
} }
}
&.file-content {
img {
max-width: 100%;
padding: 5px 5px 0 5px;
}
} }
} }
.code-view { .code-view {

2
templates/.VERSION
View File

@ -1 +1 @@
0.6.22.1102 Beta 0.6.22.1103 Beta

56
templates/repo/diff_box.tmpl
View File

@ -57,33 +57,35 @@
</div> </div>
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
{{$isImage := (call $.IsImageFile $file.Name)}} {{if not $file.IsRenamed}}
{{if $isImage}} {{$isImage := (call $.IsImageFile $file.Name)}}
<div class="center"> {{if and $isImage}}
<img src="{{$.RawPath}}/{{EscapePound .Name}}"> <div class="center">
</div> <img src="{{$.RawPath}}/{{EscapePound .Name}}">
{{else}} </div>
<div class="file-body file-code code-view code-diff"> {{else}}
<table> <div class="file-body file-code code-view code-diff">
<tbody> <table>
{{range .Sections}} <tbody>
{{range $k, $line := .Lines}} {{range .Sections}}
<tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}"> {{range $k, $line := .Lines}}
<td class="lines-num lines-num-old"> <tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}">
<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> <td class="lines-num lines-num-old">
</td> <span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
<td class="lines-num lines-num-new"> </td>
<span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> <td class="lines-num lines-num-new">
</td> <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
<td class="lines-code"> </td>
<pre>{{$line.Content}}</pre> <td class="lines-code">
</td> <pre>{{$line.Content}}</pre>
</tr> </td>
{{end}} </tr>
{{end}} {{end}}
</tbody> {{end}}
</table> </tbody>
</div> </table>
</div>
{{end}}
{{end}} {{end}}
</div> </div>
</div> </div>