Merge pull request #115 from mpsonntag/customTemplateUpdate

in-house-gin: Custom templates update

.github/workflows/go.yml

@@ -7,9 +7,11 @@ on:
       - 'release/**'
     paths:
       - '**.go'
+      - '.golangci.yml'
   pull_request:
     paths:
       - '**.go'
+      - '.golangci.yml'
 env:
   GOPROXY: "https://proxy.golang.org"
 
@@ -20,20 +22,22 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Run golangci-lint
-        uses: actions-contrib/golangci-lint@v1
+        uses: golangci/golangci-lint-action@v2
         with:
-          args: 'run --timeout=30m'
+          version: latest
+          args: --timeout=30m
+        continue-on-error: true
 
   test:
     name: Test
     strategy:
       matrix:
-        go-version: [1.14.x, 1.15.x]
+        go-version: [1.14.x, 1.15.x, 1.16.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code

.github/workflows/shell.yml

@@ -11,3 +11,4 @@ jobs:
       - uses: actions/checkout@master
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
+        continue-on-error: true

.golangci.yml

@@ -0,0 +1,21 @@
+linters-settings:
+  nakedret:
+    max-func-lines: 0 # Disallow any unnamed return statement
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - nakedret
+    - gofmt
+    - rowserrcheck
+    - unconvert
+    - goimports

templates/base/footer.tmpl

@@ -7,12 +7,7 @@
 	<footer>
 		<div class="ui container">
 			<div class="ui center links item brand footertext">
-				<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>
-				<a href="/G-Node/Info/wiki/about">About</a>
-				<a href="/G-Node/Info/wiki/imprint">Imprint</a>
-				<a href="/G-Node/Info/wiki/contact">Contact</a>
-				<a href="/G-Node/Info/wiki/Terms+of+Use">Terms of Use</a>
-				<a href="/G-Node/Info/wiki/Datenschutz">Datenschutz</a>
+				{{template "base/footer_gin_text" $}}
 				{{if .PageIsAdmin}}<span>{{.i18n.Tr "version"}}: {{AppVer}}</span>{{end}}
 				<div class="ui language bottom floating slide up dropdown link item" data-tooltip="Non-English translations may be incomplete">
 					<i class="world icon"></i>
@@ -25,15 +20,7 @@
 				</div>
 			</div>
 			<div class="ui center links item brand footertext">
-				<span>Powered by:      <a href="https://github.com/gogs/gogs"><img class="ui mini footericon" src="{{AppSubURL}}/img/gogs.svg"/></a>         </span>
-				<span>Hosted by:       <a href="http://neuro.bio.lmu.de"><img class="ui mini footericon" src="{{AppSubURL}}/img/lmu.png"/></a>          </span>
-				<span>Funded by:       <a href="http://www.bmbf.de"><img class="ui mini footericon" src="{{AppSubURL}}/img/bmbf.png"/></a>         </span>
-				<span>Registered with: <a href="http://doi.org/10.17616/R3SX9N"><img class="ui mini footericon" src="{{AppSubURL}}/img/re3data_logo.png"/></a>          </span>
-				<span>Recommended by:  
-					<a href="https://www.nature.com/sdata/policies/repositories#neurosci"><img class="ui mini footericon" src="{{AppSubURL}}/img/sdatarecbadge.jpg"/></a>
-					<a href="https://fairsharing.org/recommendation/PLOS"><img class="ui mini footericon" src="{{AppSubURL}}/img/sm_plos-logo-sm.png"/></a>
-					<a href="https://fairsharing.org/recommendation/eLifeRecommendedRepositoriesandStandards"><img class="ui mini footericon" src="{{AppSubURL}}/img/elife-logo-xs.fd623d00.svg"/></a>
-				</span>
+				{{template "base/footer_gin_brand" $}}
 			</div>
 		</div>
 	</footer>

templates/base/footer_gin_brand.tmpl

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

templates/base/footer_gin_text.tmpl

@@ -0,0 +1,6 @@
+<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>
+<a href="/G-Node/Info/wiki/about">About</a>
+<a href="/G-Node/Info/wiki/imprint">Imprint</a>
+<a href="/G-Node/Info/wiki/contact">Contact</a>
+<a href="/G-Node/Info/wiki/Terms+of+Use">Terms of Use</a>
+<a href="/G-Node/Info/wiki/Datenschutz">Datenschutz</a>

templates/base/head.tmpl

@@ -110,8 +110,7 @@
 									</div>
 									</div>*/}}
 
-								<a class="item" href="/G-Node/info/wiki" rel="noreferrer"><i class="octicon octicon-question"></i>{{.i18n.Tr "help"}}</a>
-								<a class="item" href="/G-Node/Info/wiki/News">News</a>
+								{{template "base/head_gin" $}}
 								{{if .IsLogged}}
 									<div class="right menu">
 										<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

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