website/news: Make links unique

Every time a news item is added, the entire chain of links is changed.

This adds the old behavior, which counts news items for each day and
adds that to the ID.

This commit follows e06f3556be

4 files changed, 43 insertions, 11 deletions

diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html
index b4b175fbb0..26409dfdfe 100644
--- a/website/themes/beastie/layouts/news/list.html
+++ b/website/themes/beastie/layouts/news/list.html
@@ -40,7 +40,8 @@
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
-        {{ $newsCounter := 0 }}
+        {{ $newsDayCounter := 1 }}
+        {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
@@ -51,14 +52,20 @@
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
+                      {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+                      {{ if eq $newsDayCur $newsDayPrev }}
+                        {{ $newsDayCounter = add $newsDayCounter 1 }}
+                      {{ else }}
+                        {{ $newsDayCounter = 1 }}
+                      {{ end }}
                       <li>
                         <p class="localized">
-                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"></a>
+                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
-                      {{ $newsCounter = add $newsCounter 1 }}
+                      {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
diff --git a/website/themes/beastie/layouts/news/news.rss.xml b/website/themes/beastie/layouts/news/news.rss.xml
index d119936093..f109d6ca67 100644
--- a/website/themes/beastie/layouts/news/news.rss.xml
+++ b/website/themes/beastie/layouts/news/news.rss.xml
@@ -16,8 +16,16 @@
     {{ $newsData := $data.news }}
     {{ with $newsData.news }}
       {{ $newsCounter := 0 }}
+      {{ $newsDayCounter := 1 }}
+      {{ $newsDayPrev := false }}
         {{ range (sort .news "date" "desc") }}
           {{ if lt $newsCounter 10 }}
+            {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+            {{ if eq $newsDayCur $newsDayPrev }}
+              {{ $newsDayCounter = add $newsDayCounter 1 }}
+            {{ else }}
+              {{ $newsDayCounter = 1 }}
+            {{ end }}
             <item>
               {{ if .title }}
                 <title>
@@ -33,12 +41,13 @@
                   {{ $description }}
                 </description>
               {{ end }}
-              <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</link>
-              <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</guid>
+              <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</link>
+              <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</guid>
               <pubDate>{{ dateFormat "2006-01-02" .date }}</pubDate>
             </item>
+            {{ $newsCounter = add $newsCounter 1 }}
+            {{ $newsDayPrev = $newsDayCur }}
           {{ end }}
-        {{ $newsCounter = add $newsCounter 1 }}
       {{ end }}
     {{ end }}
   </channel>
diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html
index b4b175fbb0..26409dfdfe 100644
--- a/website/themes/beastie/layouts/news/single.html
+++ b/website/themes/beastie/layouts/news/single.html
@@ -40,7 +40,8 @@
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
-        {{ $newsCounter := 0 }}
+        {{ $newsDayCounter := 1 }}
+        {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
@@ -51,14 +52,20 @@
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
+                      {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+                      {{ if eq $newsDayCur $newsDayPrev }}
+                        {{ $newsDayCounter = add $newsDayCounter 1 }}
+                      {{ else }}
+                        {{ $newsDayCounter = 1 }}
+                      {{ end }}
                       <li>
                         <p class="localized">
-                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"></a>
+                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
-                      {{ $newsCounter = add $newsCounter 1 }}
+                      {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
diff --git a/website/themes/beastie/layouts/partials/news.html b/website/themes/beastie/layouts/partials/news.html
index e3fb22646d..23b22fbaa7 100644
--- a/website/themes/beastie/layouts/partials/news.html
+++ b/website/themes/beastie/layouts/partials/news.html
@@ -11,12 +11,20 @@
 
 {{ with $newsData.news }}
   {{ $newsCounter := 0 }}
+  {{ $newsDayCounter := 1 }}
+  {{ $newsDayPrev := false }}
   {{ range (sort .news "date" "desc") }}
     {{ if lt $newsCounter 6 }}
+      {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+      {{ if eq $newsDayCur $newsDayPrev }}
+        {{ $newsDayCounter = add $newsDayCounter 1 }}
+      {{ else }}
+        {{ $newsDayCounter = 1 }}
+      {{ end }}
     <p>
       <span class="txtdate">{{ dateFormat "2006-01-02" .date }}</span>
       <br />
-      <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}">
+      <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}">
       {{ if .title }}
         {{ $title := replaceRE "<a .*\">" "" .title }}
         {{ $title = replaceRE "</a>" "" $title }}
@@ -28,7 +36,8 @@
       {{ end }}
       </a>
     </p>
+      {{ $newsCounter = add $newsCounter 1 }}
+      {{ $newsDayPrev = $newsDayCur }}
     {{ end }}
-    {{ $newsCounter = add $newsCounter 1 }}
   {{ end }}
 {{ end }}