openidec

commit 1f5f4035282a4468b33e7482d6341d1ac0fef0d0
parent d1345c28564f5ba86c9d03a45e3ddc70e1a5ba4b
Author: Peter Kosyh <p.kosyh@gmail.com>
Date:   Sun, 31 Jan 2021 08:57:53 +0000

Merge branch 'master' of https://github.com/gl00my/ii-go

Diffstat:
M
ii-node/tpl/blog.tpl
 | 
2
+-
M
ii-node/tpl/header.tpl
 | 
14
+++++++++-----
M
ii-node/tpl/topics.tpl
 | 
1
+

3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ii-node/tpl/blog.tpl b/ii-node/tpl/blog.tpl
@@ -1,6 +1,6 @@
 {{template "header.tpl" $}}
 {{template "pager.tpl" $}}
-<a class="rss" href="{{.PfxPath}}/echo+topics/{{.Echo}}/rss">RSS</a>
+<a class="rss" href="/{{.BasePath}}">Echo</a> :: <a class="rss" href="{{.PfxPath}}/echo+topics/{{.Echo}}/rss">RSS</a>
 <div id="topic">
 {{range $k, $v := .Topics }}
 {{ with .Head }}
diff --git a/ii-node/tpl/header.tpl b/ii-node/tpl/header.tpl
@@ -16,13 +16,17 @@
 <table id="header">
   <tr>
     <td class="title">
-      <span class="logo"><a href="{{$.PfxPath}}/"><img class="logo" src="/lib/icon.png">{{.Sysname}}</a></span>
+      <span class="logo"><a href="/"><img class="logo" src="/lib/icon.png">{{.Sysname}}</a></span>
 {{ if eq .BasePath "" }}
       <span class="info">II/IDEC networks :: <a href="{{ $.PfxPath }}/echo/all">New posts</a>
 {{ else if gt (len .Topics) 0}}
       <span class="info">II/IDEC networks {{ with .Echo }} :: <a href="{{$.PfxPath}}/echo/{{.}}">{{.}}</a> :: <span class="info">{{index $.Echolist.Info .}}</span>{{end}}
 {{ else }}
+      {{ if eq .Template "query.tpl" }}
+      <span class="info">II/IDEC networks {{ with .Echo }} :: <a href="{{$.PfxPath}}/{{.}}">{{.}}</a> :: <span class="info">{{index $.Echolist.Info .}} / feed</span>{{end}}
+      {{ else }}
       <span class="info">II/IDEC networks {{ with .Echo }} :: <a href="{{$.PfxPath}}/{{.}}">{{.}}</a> :: <span class="info">{{index $.Echolist.Info .}}</span>{{end}}
+      {{ end }}
 {{ end }}
 </span>
     </td>
@@ -31,9 +35,9 @@
       {{ template "links.tpl" }}
       {{ if .User.Name }}
       {{ if eq .BasePath "profile" }}
-      <a href="{{$.PfxPath}}/logout">Logout</a>
+      <a href="/logout">Logout</a>
       {{ else }}
-      <a href="{{$.PfxPath}}/profile">{{.User.Name}}</a>
+      <a href="/profile">{{.User.Name}}</a>
       {{ end }}
 
       {{ with .Echo }}
@@ -45,9 +49,9 @@
       {{ end }}
 
       {{ else if eq .BasePath "login" }}
-      <a href="{{$.PfxPath}}/register">Register</a>
+      <a href="/register">Register</a>
       {{ else }}
-      <a href="{{$.PfxPath}}/login">Login</a>
+      <a href="/login">Login</a>
       {{ end }}
 
       </span>
diff --git a/ii-node/tpl/topics.tpl b/ii-node/tpl/topics.tpl
@@ -1,5 +1,6 @@
 {{template "header.tpl" $}}
 {{template "pager.tpl" $}}
+<a class="rss" href="/blog/{{.BasePath}}">Blog</a> :: <a class="rss" href="/echo/{{.BasePath}}">Feed</a>
 <table id="topiclist" cellspacing=0 cellpadding=0>
 <tr class="title">
 <th>Topics</th>