added new article for 10 articles so it's never divisible by 3 or 4; pagination showing the proper number of the correct articles per page

4 years ago · d3f23965f3
parent 7bb825de1f
commit d3f23965f3
21 changed files with 141 additions and 27 deletions
--- a/src/entries/200801.html
+++ b/src/entries/200801.html
@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+
+<!-- Header -->
+<head>
+  <title>chimchooree's dev space - blessfrey</title>
+  <meta http-equiv="Content-Type" content="text/html; charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="../../../res/styles/feature.css"/>
+</head>
+
+<!-- Body -->
+<body>
+
+<div class="grid">
+    <div class="whitespace">
+        blessfrey.me<br>
+    </div>
+
+    <div class="blessfrey-logo"></div>
+    <div class="nav-row"></div>
+
+<!--Navigation Bar-->
+    <div class="nav-grid">
+        <div class="nav-bar"></div>
+        <div class="nav-index">
+            <a href="index.html">
+                <div class="button">home</div>
+            </a>
+        </div>
+        <div class="nav-game">
+            <a href="game.html">
+                <div class="button">game</div>
+            </a>
+        </div>
+        <div class="nav-diary">
+            <a href="diary.php">
+                <div class="button">diary</div>
+            </a>
+        </div>
+        <div class="nav-presskit">
+            <a href="presskit.html">
+                <div class="button">presskit</div>
+            </a>
+        </div>
+    </div>
+
+    <div class="body-row"> </div>
+    
+    <div class="diary-entry">
+    <h1>10 keyboard spam</h1>
+    early
+<br>
+    sdoifsdoijfsdoifjsoidfoisd sdjfoisdu fsdjf oisdjf osdjf osd f dsfoisdfh iusdhisd sdh fsiuhasi u dsiu fsdiuh fdsihdsfiusdahiufdhsiuasf lazy
+    <br>
+    </div>
+
+<!--right column-->
+    <div class="about-box">
+        <h1>about blessfrey</h1>
+        It's a game.<br>
+    </div>
+
+    <div class="twitter-box">
+        <h1>follow on twitter</h1>
+        <a href="https://twitter.com/lilchimchooree">@lilchimchooree</a><br>
+    </div>
+
+    <div class="latest">
+        <h1>latest</h1>
+        Some articles.<br>
+    </div>
+
+    <div class="disclosure">
+        <h1>disclosure</h1>
+        No sponsored posts or affiliate links appear in this blog. If they do, they will be <a href="https://www.ftc.gov/tips-advice/business-center/guidance/ftcs-endorsement-guides-what-people-are-asking">properly</a> <a href="https://www.ftc.gov/sites/default/files/attachments/press-releases/ftc-publishes-final-guides-governing-endorsements-testimonials/091005revisedendorsementguides.pdf">disclosed</a>.<br>
+        <br>
+        blessfrey.me does not collect personal information + has no cookies.<br>
+    </div>
+
+<!--Footer-->
+    <div class="footer-row">
+        <footer>
+            <div class="footer">
+                &#169 chimchooree<br>
+            </div>
+        </footer>
+    </div>
+</div>
+
+</body>
+
+</html>
--- a/src/entries/200808.html
+++ b/src/entries/200808.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-    <h1>weekly roundup</h1>
+    <h1>9 weekly roundup</h1>
    august 4-8, 2020
    css, html, php, server, website<br>
    <br>
--- a/src/entries/200810.html
+++ b/src/entries/200810.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>what is blessfrey? </h1>
+<h1>8 what is blessfrey? </h1>
 august 10, 2020<br>
 <br>
 <b>Blessfrey</b> is a 2D action RPG developed for PC by me, chimchooree. <br>
--- a/src/entries/200813.html
+++ b/src/entries/200813.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>all weekly updates</h1>
+<h1>7 all weekly updates</h1>
 august 13, 2020<br>
 <br>
 I've kept a more or less consistent private development diary for blessfrey since 2018. Here are the bulleted highlights, broken into weekly portions. I mostly keep it for myself to track progress. <br>
--- a/src/entries/200815.html
+++ b/src/entries/200815.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>weekly roundup</h1>
+<h1>6 weekly roundup</h1>
 august 9-15, 2020
 apache, automation, css, html, jenkins, nginx, php, server, website<br>
 <br>
--- a/src/entries/200918.html
+++ b/src/entries/200918.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>my favorite GDC talks </h1>
+<h1>5 my favorite GDC talks </h1>
 september 18, 2020<br>
 <br>
 I really should be keeping a list of these with descriptions, so why not keep them in an article?<br>
--- a/src/entries/200919.html
+++ b/src/entries/200919.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>weekly roundup</h1>
+<h1>4 weekly roundup</h1>
 september 13-19, 2020
 bottle<br>
 <br>
--- a/src/entries/200926.html
+++ b/src/entries/200926.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>weekly roundup</h1>
+<h1>3 weekly roundup</h1>
 september 20-26, 2020
 bottle<br>
 <br>
--- a/src/entries/201001.html
+++ b/src/entries/201001.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>why bottle over php? </h1>
+<h1>2 why bottle over php? </h1>
 october 1, 2020<br>
 <br>
 <b>Bottle</b> is a Python framework for server-side web development.<br>
--- a/src/entries/201003.html
+++ b/src/entries/201003.html
@ -47,7 +47,7 @@
    <div class="body-row"> </div>
    
    <div class="diary-entry">
-<h1>this week</h1>
+<h1>1 this week</h1>
 september 27-october 3, 2020
 bottle, css, git, html, regex, regular expressions, website<br>
 <br>
--- a/src/entries/raw/entries/200801.html
+++ b/src/entries/raw/entries/200801.html
@ -0,0 +1,5 @@
+    <h1>10 keyboard spam</h1>
+    early
+<br>
+    sdoifsdoijfsdoifjsoidfoisd sdjfoisdu fsdjf oisdjf osdjf osd f dsfoisdfh iusdhisd sdh fsiuhasi u dsiu fsdiuh fdsihdsfiusdahiufdhsiuasf lazy
+    <br>
--- a/src/entries/raw/entries/200808.html
+++ b/src/entries/raw/entries/200808.html
@ -1,4 +1,4 @@
-    <h1>weekly roundup</h1>
+    <h1>9 weekly roundup</h1>
    august 4-8, 2020
    css, html, php, server, website<br>
    <br>
--- a/src/entries/raw/entries/200810.html
+++ b/src/entries/raw/entries/200810.html
@ -1,4 +1,4 @@
-<h1>what is blessfrey? </h1>
+<h1>8 what is blessfrey? </h1>
 august 10, 2020<br>
 <br>
 <b>Blessfrey</b> is a 2D action RPG developed for PC by me, chimchooree. <br>
--- a/src/entries/raw/entries/200813.html
+++ b/src/entries/raw/entries/200813.html
@ -1,4 +1,4 @@
-<h1>all weekly updates</h1>
+<h1>7 all weekly updates</h1>
 august 13, 2020<br>
 <br>
 I've kept a more or less consistent private development diary for blessfrey since 2018. Here are the bulleted highlights, broken into weekly portions. I mostly keep it for myself to track progress. <br>
--- a/src/entries/raw/entries/200815.html
+++ b/src/entries/raw/entries/200815.html
@ -1,4 +1,4 @@
-<h1>weekly roundup</h1>
+<h1>6 weekly roundup</h1>
 august 9-15, 2020
 apache, automation, css, html, jenkins, nginx, php, server, website<br>
 <br>
--- a/src/entries/raw/entries/200918.html
+++ b/src/entries/raw/entries/200918.html
@ -1,4 +1,4 @@
-<h1>my favorite GDC talks </h1>
+<h1>5 my favorite GDC talks </h1>
 september 18, 2020<br>
 <br>
 I really should be keeping a list of these with descriptions, so why not keep them in an article?<br>
--- a/src/entries/raw/entries/200919.html
+++ b/src/entries/raw/entries/200919.html
@ -1,4 +1,4 @@
-<h1>weekly roundup</h1>
+<h1>4 weekly roundup</h1>
 september 13-19, 2020
 bottle<br>
 <br>
--- a/src/entries/raw/entries/200926.html
+++ b/src/entries/raw/entries/200926.html
@ -1,4 +1,4 @@
-<h1>weekly roundup</h1>
+<h1>3 weekly roundup</h1>
 september 20-26, 2020
 bottle<br>
 <br>
--- a/src/entries/raw/entries/201001.html
+++ b/src/entries/raw/entries/201001.html
@ -1,4 +1,4 @@
-<h1>why bottle over php? </h1>
+<h1>2 why bottle over php? </h1>
 october 1, 2020<br>
 <br>
 <b>Bottle</b> is a Python framework for server-side web development.<br>
--- a/src/entries/raw/entries/201003.html
+++ b/src/entries/raw/entries/201003.html
@ -1,4 +1,4 @@
-<h1>this week</h1>
+<h1>1 this week</h1>
 september 27-october 3, 2020
 bottle, css, git, html, regex, regular expressions, website<br>
 <br>
--- a/src/views/diary.tpl
+++ b/src/views/diary.tpl
@ -3,34 +3,51 @@
    <div class="dir-row"> </div>
    <div class="diary-dir">
    <center>
+        % max_pages = int(total - 1 / limit)
 <%
        if page <= 0:
            page = 0
        end
-        if page > int(total - 1 / limit):
-            page = int(total - 1 / limit)
+        if page > max_pages:
+            page = max_pages
        end 
 %>
-        % if page >= limit + 1:
-            <a href=/diary/0>first</a>
+        <a href=/diary/0><<</a>
+
+        % if page <= 0:
+            <a href=/diary/0><</a>
+        % else:
+            <a href=/diary/{{page - 1}}><</a>
        % end
-        % for i in range(max(0,page - limit), min(total,page + limit)):
+
+        % for i in range(max(0,page - limit), min(total,page + limit + 1)):
            % if i == page:
                <b>{{i}}</b>
            % else:
                <a href=/diary/{{i}}>{{i}}</a>
            % end
        % end
-        % if page <= total - limit:
-            <a href=/diary/{{total-1}}>last</a>
+
+        % if page <= 2:
+            % for j in range(3 - page):
+                <a href=/diary/{{page + j + 3}}>{{page + j + 3}}</a>
+            % end
        % end
+
+        % if page >= total - limit:
+            <a href=/diary/{{total -1}}>></a>
+        % else:
+            <a href=/diary/{{page + 1}}>></a>
+        % end
+
+        <a href=/diary/{{total - 1}}>>></a>
    </center>
    </div>

 <!--left column-->

    <div class="diary-pages">
-        % for s in snippets:
+        % for s in snippets[page * limit:page * limit + limit]:
            <div class="snippet">
                <div class="snippet-title">
                    <a href={{s[4]}}>{{!s[0]}}</a>