@@ -17,7 +17,7 @@ import ( | |||
"github.com/gogits/gogs/modules/setting" | |||
) | |||
const APP_VER = "0.6.22.1102 Beta" | |||
const APP_VER = "0.6.22.1103 Beta" | |||
func init() { | |||
runtime.GOMAXPROCS(runtime.NumCPU()) |
@@ -263,7 +263,7 @@ func ActionContent2Commits(act Actioner) *PushCommits { | |||
func DiffTypeToStr(diffType int) string { | |||
diffTypes := map[int]string{ | |||
1: "add", 2: "modify", 3: "del", | |||
1: "add", 2: "modify", 3: "del", 4: "rename", | |||
} | |||
return diffTypes[diffType] | |||
} |
@@ -5,7 +5,7 @@ | |||
"\/css\/dropzone-4.0.1.css": { | |||
"fileType": 16, | |||
"ignore": 0, | |||
"ignoreWasSetByUser": 0, | |||
"ignoreWasSetByUser": 1, | |||
"inputAbbreviatedPath": "\/css\/dropzone-4.0.1.css", | |||
"outputAbbreviatedPath": "No Output Path", | |||
"outputPathIsOutsideProject": 0, | |||
@@ -74,11 +74,11 @@ | |||
"outputPathIsOutsideProject": 0, | |||
"outputPathIsSetByUser": 0 | |||
}, | |||
"\/css\/semantic-2.1.3.min.css": { | |||
"\/css\/semantic-2.1.5.min.css": { | |||
"fileType": 16, | |||
"ignore": 0, | |||
"ignoreWasSetByUser": 0, | |||
"inputAbbreviatedPath": "\/css\/semantic-2.1.3.min.css", | |||
"inputAbbreviatedPath": "\/css\/semantic-2.1.5.min.css", | |||
"outputAbbreviatedPath": "No Output Path", | |||
"outputPathIsOutsideProject": 0, | |||
"outputPathIsSetByUser": 0 | |||
@@ -204,12 +204,12 @@ | |||
"outputStyle": 1, | |||
"syntaxCheckerStyle": 1 | |||
}, | |||
"\/js\/libs\/clipboard-1.3.1.min.js": { | |||
"\/js\/libs\/clipboard-1.5.3.min.js": { | |||
"fileType": 64, | |||
"ignore": 0, | |||
"ignoreWasSetByUser": 0, | |||
"inputAbbreviatedPath": "\/js\/libs\/clipboard-1.3.1.min.js", | |||
"outputAbbreviatedPath": "\/js\/libs\/min\/clipboard-1.3.1.min-min.js", | |||
"inputAbbreviatedPath": "\/js\/libs\/clipboard-1.5.3.min.js", | |||
"outputAbbreviatedPath": "\/js\/libs\/min\/clipboard-1.5.3.min-min.js", | |||
"outputPathIsOutsideProject": 0, | |||
"outputPathIsSetByUser": 0, | |||
"outputStyle": 1, | |||
@@ -281,12 +281,12 @@ | |||
"outputPathIsSetByUser": 0, | |||
"processed": 0 | |||
}, | |||
"\/js\/semantic-2.1.3.min.js": { | |||
"\/js\/semantic-2.1.5.min.js": { | |||
"fileType": 64, | |||
"ignore": 0, | |||
"ignoreWasSetByUser": 0, | |||
"inputAbbreviatedPath": "\/js\/semantic-2.1.3.min.js", | |||
"outputAbbreviatedPath": "\/js\/min\/semantic-2.1.3.min-min.js", | |||
"inputAbbreviatedPath": "\/js\/semantic-2.1.5.min.js", | |||
"outputAbbreviatedPath": "\/js\/min\/semantic-2.1.5.min-min.js", | |||
"outputPathIsOutsideProject": 0, | |||
"outputPathIsSetByUser": 0, | |||
"outputStyle": 1, |
@@ -2288,6 +2288,10 @@ ol.linenums { | |||
.repository .diff-file-box .code-diff tbody tr:hover pre { | |||
background-color: transparent !important; | |||
} | |||
.repository .diff-file-box.file-content img { | |||
max-width: 100%; | |||
padding: 5px 5px 0 5px; | |||
} | |||
.repository .code-view { | |||
overflow: auto; | |||
overflow-x: auto; |
@@ -584,6 +584,12 @@ | |||
} | |||
} | |||
} | |||
} | |||
&.file-content { | |||
img { | |||
max-width: 100%; | |||
padding: 5px 5px 0 5px; | |||
} | |||
} | |||
} | |||
.code-view { |
@@ -1 +1 @@ | |||
0.6.22.1102 Beta | |||
0.6.22.1103 Beta |
@@ -57,33 +57,35 @@ | |||
</div> | |||
</h4> | |||
<div class="ui attached table segment"> | |||
{{$isImage := (call $.IsImageFile $file.Name)}} | |||
{{if $isImage}} | |||
<div class="center"> | |||
<img src="{{$.RawPath}}/{{EscapePound .Name}}"> | |||
</div> | |||
{{else}} | |||
<div class="file-body file-code code-view code-diff"> | |||
<table> | |||
<tbody> | |||
{{range .Sections}} | |||
{{range $k, $line := .Lines}} | |||
<tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}"> | |||
<td class="lines-num lines-num-old"> | |||
<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> | |||
</td> | |||
<td class="lines-num lines-num-new"> | |||
<span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> | |||
</td> | |||
<td class="lines-code"> | |||
<pre>{{$line.Content}}</pre> | |||
</td> | |||
</tr> | |||
{{end}} | |||
{{end}} | |||
</tbody> | |||
</table> | |||
</div> | |||
{{if not $file.IsRenamed}} | |||
{{$isImage := (call $.IsImageFile $file.Name)}} | |||
{{if and $isImage}} | |||
<div class="center"> | |||
<img src="{{$.RawPath}}/{{EscapePound .Name}}"> | |||
</div> | |||
{{else}} | |||
<div class="file-body file-code code-view code-diff"> | |||
<table> | |||
<tbody> | |||
{{range .Sections}} | |||
{{range $k, $line := .Lines}} | |||
<tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$k}} ol-{{$k}}"> | |||
<td class="lines-num lines-num-old"> | |||
<span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span> | |||
</td> | |||
<td class="lines-num lines-num-new"> | |||
<span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> | |||
</td> | |||
<td class="lines-code"> | |||
<pre>{{$line.Content}}</pre> | |||
</td> | |||
</tr> | |||
{{end}} | |||
{{end}} | |||
</tbody> | |||
</table> | |||
</div> | |||
{{end}} | |||
{{end}} | |||
</div> | |||
</div> |