forks/miniflux
1
0
Fork 0
Code Releases Activity

Fix unread count in menu not triggering click

Browse source 
By moving unread count into anchor.

Previously, clicking the unread count would not cause the anchor to be
invoked. This was confusing. This change includes the unread count span
in the anchor.
This commit is contained in:
Pascal Widdershoven 2018-05-21 12:38:44 +02:00
parent 7f2fd1fdd8
commit 44decae557
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
template/common.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2018-05-20 15:22:33.793709932 -0700 PDT m=+0.025180445 // 2018-05-21 12:40:10.613112 +0200 CEST m=+0.010961753
package template package template
@ -115,10 +115,11 @@ var templateCommonMap = map[string]string{
</div> </div>
<ul> <ul>
<li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g u" }}"> <li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g u" }}">
<a href="{{ route "unread" }}" data-page="unread">{{ t "Unread" }}</a> <a href="{{ route "unread" }}" data-page="unread">{{ t "Unread" }}
{{ if gt .countUnread 0 }} {{ if gt .countUnread 0 }}
<span class="unread-counter-wrapper">(<span class="unread-counter">{{ .countUnread }}</span>)</span> <span class="unread-counter-wrapper">(<span class="unread-counter">{{ .countUnread }}</span>)</span>
{{ end }} {{ end }}
</a>
</li> </li>
<li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g b" }}"> <li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g b" }}">
<a href="{{ route "starred" }}" data-page="starred">{{ t "Starred" }}</a> <a href="{{ route "starred" }}" data-page="starred">{{ t "Starred" }}</a>
@ -223,6 +224,6 @@ var templateCommonMap = map[string]string{
var templateCommonMapChecksums = map[string]string{ var templateCommonMapChecksums = map[string]string{
"entry_pagination": "f1465fa70f585ae8043b200ec9de5bf437ffbb0c19fb7aefc015c3555614ee27", "entry_pagination": "f1465fa70f585ae8043b200ec9de5bf437ffbb0c19fb7aefc015c3555614ee27",
"item_meta": "6cff8ae243f19dac936e523867d2975f70aa749b2a461ae63f6ebbca94cf7419", "item_meta": "6cff8ae243f19dac936e523867d2975f70aa749b2a461ae63f6ebbca94cf7419",
"layout": "c7565e2cf904612e236bc1d7167c6c124ffe5d27348608eb5c2336606f266896", "layout": "2226ad243581d200b3d9499787a5ba38d6b2fff38d2ce86a40eb395a6efc17de",
"pagination": "6ff462c2b2a53bc5448b651da017f40a39f1d4f16cef4b2f09784f0797286924", "pagination": "6ff462c2b2a53bc5448b651da017f40a39f1d4f16cef4b2f09784f0797286924",
} }

9
template/html/common/layout.html
View file

@ -40,10 +40,11 @@
</div> </div>
<ul> <ul>
<li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g u" }}"> <li {{ if eq .menu "unread" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g u" }}">
<a href="{{ route "unread" }}" data-page="unread">{{ t "Unread" }}</a> <a href="{{ route "unread" }}" data-page="unread">{{ t "Unread" }}
{{ if gt .countUnread 0 }} {{ if gt .countUnread 0 }}
<span class="unread-counter-wrapper">(<span class="unread-counter">{{ .countUnread }}</span>)</span> <span class="unread-counter-wrapper">(<span class="unread-counter">{{ .countUnread }}</span>)</span>
{{ end }} {{ end }}
</a>
</li> </li>
<li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g b" }}"> <li {{ if eq .menu "starred" }}class="active"{{ end }} title="{{ t "Keyboard Shortcut: %s" "g b" }}">
<a href="{{ route "starred" }}" data-page="starred">{{ t "Starred" }}</a> <a href="{{ route "starred" }}" data-page="starred">{{ t "Starred" }}</a>

6
ui/static/css.go
View file

File diff suppressed because one or more lines are too long

2
ui/static/css/common.css
View file

@ -409,7 +409,7 @@ a.button {
/* Counter */ /* Counter */
.unread-counter-wrapper { .unread-counter-wrapper {
font-size: 0.8em; font-size: 0.9em;
font-weight: 300; font-weight: 300;
color: #666; color: #666;
} }