Skip to content

Commit 966e925

Browse files
achilleas-kachilleas-k
authored
Merge pull request #115 from mpsonntag/customTemplateUpdate
in-house-gin: Custom templates update
2 parents 2efac57 + 11b31e5 commit 966e925

File tree

10 files changed

+1659
-1561
lines changed

10 files changed

+1659
-1561
lines changed

‎.github/workflows/go.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
- 'release/**'
88
paths:
99
- '**.go'
10+
- '.golangci.yml'
1011
pull_request:
1112
paths:
1213
- '**.go'
14+
- '.golangci.yml'
1315
env:
1416
GOPROXY: "https://proxy.golang.org"
1517

@@ -20,20 +22,22 @@ jobs:
2022
steps:
2123
- uses: actions/checkout@v2
2224
- name: Run golangci-lint
23-
uses: actions-contrib/golangci-lint@v1
25+
uses: golangci/golangci-lint-action@v2
2426
with:
25-
args: 'run --timeout=30m'
27+
version: latest
28+
args: --timeout=30m
29+
continue-on-error: true
2630

2731
test:
2832
name: Test
2933
strategy:
3034
matrix:
31-
go-version: [1.14.x, 1.15.x]
35+
go-version: [1.14.x, 1.15.x, 1.16.x]
3236
platform: [ubuntu-latest, macos-latest, windows-latest]
3337
runs-on: ${{ matrix.platform }}
3438
steps:
3539
- name: Install Go
36-
uses: actions/setup-go@v1
40+
uses: actions/setup-go@v2
3741
with:
3842
go-version: ${{ matrix.go-version }}
3943
- name: Checkout code

‎.github/workflows/shell.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ jobs:
1111
- uses: actions/checkout@master
1212
- name: Run ShellCheck
1313
uses: ludeeus/action-shellcheck@master
14+
continue-on-error: true

‎.golangci.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
linters-settings:
2+
nakedret:
3+
max-func-lines: 0 # Disallow any unnamed return statement
4+
5+
linters:
6+
enable:
7+
- deadcode
8+
- errcheck
9+
- gosimple
10+
- govet
11+
- ineffassign
12+
- staticcheck
13+
- structcheck
14+
- typecheck
15+
- unused
16+
- varcheck
17+
- nakedret
18+
- gofmt
19+
- rowserrcheck
20+
- unconvert
21+
- goimports

‎internal/assets/public/public_gen.go

+1,377-1,377
Large diffs are not rendered by default.

‎internal/assets/templates/templates_gen.go

+232-163
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/base/footer.tmpl

+2-15
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77
<footer>
88
<div class="ui container">
99
<div class="ui center links item brand footertext">
10-
<a href="http://www.g-node.org"><img class="ui mini footericon" src="https://projects.g-node.org/assets/gnode-bootstrap-theme/1.2.0-snapshot/img/gnode-icon-50x50-transparent.png"/>© 2016-{{Year}} G-Node</a>
11-
<a href="/G-Node/Info/wiki/about">About</a>
12-
<a href="/G-Node/Info/wiki/imprint">Imprint</a>
13-
<a href="/G-Node/Info/wiki/contact">Contact</a>
14-
<a href="/G-Node/Info/wiki/Terms+of+Use">Terms of Use</a>
15-
<a href="/G-Node/Info/wiki/Datenschutz">Datenschutz</a>
10+
{{template "base/footer_gin_text" $}}
1611
{{if .PageIsAdmin}}<span>{{.i18n.Tr "version"}}: {{AppVer}}</span>{{end}}
1712
<div class="ui language bottom floating slide up dropdown link item" data-tooltip="Non-English translations may be incomplete">
1813
<i class="world icon"></i>
@@ -25,15 +20,7 @@
2520
</div>
2621
</div>
2722
<div class="ui center links item brand footertext">
28-
<span>Powered by: <a href="https://github.com/gogs/gogs"><img class="ui mini footericon" src="{{AppSubURL}}/img/gogs.svg"/></a> </span>
29-
<span>Hosted by: <a href="http://neuro.bio.lmu.de"><img class="ui mini footericon" src="{{AppSubURL}}/img/lmu.png"/></a> </span>
30-
<span>Funded by: <a href="http://www.bmbf.de"><img class="ui mini footericon" src="{{AppSubURL}}/img/bmbf.png"/></a> </span>
31-
<span>Registered with: <a href="http://doi.org/10.17616/R3SX9N"><img class="ui mini footericon" src="{{AppSubURL}}/img/re3data_logo.png"/></a> </span>
32-
<span>Recommended by:
33-
<a href="https://www.nature.com/sdata/policies/repositories#neurosci"><img class="ui mini footericon" src="{{AppSubURL}}/img/sdatarecbadge.jpg"/></a>
34-
<a href="https://fairsharing.org/recommendation/PLOS"><img class="ui mini footericon" src="{{AppSubURL}}/img/sm_plos-logo-sm.png"/></a>
35-
<a href="https://fairsharing.org/recommendation/eLifeRecommendedRepositoriesandStandards"><img class="ui mini footericon" src="{{AppSubURL}}/img/elife-logo-xs.fd623d00.svg"/></a>
36-
</span>
23+
{{template "base/footer_gin_brand" $}}
3724
</div>
3825
</div>
3926
</footer>

‎templates/base/footer_gin_brand.tmpl

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<span>Powered by: <a href="https://github.com/gogs/gogs"><img class="ui mini footericon" src="{{AppSubURL}}/img/gogs.svg"/></a> </span>
2+
<span>Hosted by: <a href="http://neuro.bio.lmu.de"><img class="ui mini footericon" src="{{AppSubURL}}/img/lmu.png"/></a> </span>
3+
<span>Funded by: <a href="http://www.bmbf.de"><img class="ui mini footericon" src="{{AppSubURL}}/img/bmbf.png"/></a> </span>
4+
<span>Registered with: <a href="http://doi.org/10.17616/R3SX9N"><img class="ui mini footericon" src="{{AppSubURL}}/img/re3data_logo.png"/></a> </span>
5+
<span>Recommended by:
6+
<a href="https://www.nature.com/sdata/policies/repositories#neurosci"><img class="ui mini footericon" src="{{AppSubURL}}/img/sdatarecbadge.jpg"/></a>
7+
<a href="https://fairsharing.org/recommendation/PLOS"><img class="ui mini footericon" src="{{AppSubURL}}/img/sm_plos-logo-sm.png"/></a>
8+
<a href="https://fairsharing.org/recommendation/eLifeRecommendedRepositoriesandStandards"><img class="ui mini footericon" src="{{AppSubURL}}/img/elife-logo-xs.fd623d00.svg"/></a>
9+
</span>

‎templates/base/footer_gin_text.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<a href="http://www.g-node.org"><img class="ui mini footericon" src="https://projects.g-node.org/assets/gnode-bootstrap-theme/1.2.0-snapshot/img/gnode-icon-50x50-transparent.png"/>© 2016-{{Year}} G-Node</a>
2+
<a href="/G-Node/Info/wiki/about">About</a>
3+
<a href="/G-Node/Info/wiki/imprint">Imprint</a>
4+
<a href="/G-Node/Info/wiki/contact">Contact</a>
5+
<a href="/G-Node/Info/wiki/Terms+of+Use">Terms of Use</a>
6+
<a href="/G-Node/Info/wiki/Datenschutz">Datenschutz</a>

‎templates/base/head.tmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@
110110
</div>
111111
</div>*/}}
112112

113-
<a class="item" href="/G-Node/info/wiki" rel="noreferrer"><i class="octicon octicon-question"></i>{{.i18n.Tr "help"}}</a>
114-
<a class="item" href="/G-Node/Info/wiki/News">News</a>
113+
{{template "base/head_gin" $}}
115114
{{if .IsLogged}}
116115
<div class="right menu">
117116
<div class="ui dropdown head link jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">

‎templates/base/head_gin.tmpl

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<a class="item" href="/G-Node/info/wiki" rel="noreferrer"><i class="octicon octicon-question"></i>{{.i18n.Tr "help"}}</a>
2+
<a class="item" href="/G-Node/Info/wiki/News">News</a>

0 commit comments

Comments
 (0)