[gentoo-commits] proj/gentoo-mirrorstats:master commit in: html/

["Max Magorsch" <arzano@gentoo.org>]

commit:     65aa6442fc6d8cc3d5688255911667bd133b97fc
Author:     Max Magorsch <arzano <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 23:07:46 2020 +0000
Commit:     Max Magorsch <arzano <AT> gentoo <DOT> org>
CommitDate: Sun May  3 23:07:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=65aa6442

Use index.html instead of all.html for the landing page

Signed-off-by: Max Magorsch <arzano <AT> gentoo.org>

 html/generate.py  | 4 +++-
 html/help.jinja2  | 2 +-
 html/stats.jinja2 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/generate.py b/html/generate.py
index abb7100..8ab5898 100755
--- a/html/generate.py
+++ b/html/generate.py
@@ -69,12 +69,14 @@ def getIp(hostname):
 def renderStatsTemplate(templateEnv, page):
     if page == "all":
         mirrorstatsList = mirrorstats
+        page_name = "index"
     else:
         mirrorstatsList = ['https://mirrorstats.gentoo.org/' + page + '/state.json']
+        page_name = page
 
     lastUpdate, hostList = getHostList(mirrorstatsList)
     template = templateEnv.get_template("stats.jinja2")
-    template.stream(lastUpdate=lastUpdate, type=page, mirrors=hostList, locations=json.dumps(hostList)).dump(html_folder + page + ".html")
+    template.stream(lastUpdate=lastUpdate, type=page, mirrors=hostList, locations=json.dumps(hostList)).dump(html_folder + page_name + ".html")
     return lastUpdate
 
 

diff --git a/html/help.jinja2 b/html/help.jinja2
index 6e08363..678e649 100644
--- a/html/help.jinja2
+++ b/html/help.jinja2
@@ -55,7 +55,7 @@
         </div>
         <div class="collapse navbar-collapse navbar-main-collapse" id="navbar-main-collapse">
           <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="all.html">Home</a></li>
+            <li class="nav-item"><a class="nav-link" href="index.html">Home</a></li>
             <li class="nav-item"><a class="nav-link" href="rsync.html">Rsync</a></li>
             <li class="nav-item"><a class="nav-link" href="distfiles.html">Distfiles</a></li>
             <li class="nav-item"><a class="nav-link" href="snapshots.html">Snapshots</a></li>

diff --git a/html/stats.jinja2 b/html/stats.jinja2
index e13cd45..35f012a 100644
--- a/html/stats.jinja2
+++ b/html/stats.jinja2
@@ -57,7 +57,7 @@
         </div>
         <div class="collapse navbar-collapse navbar-main-collapse" id="navbar-main-collapse">
           <ul class="navbar-nav mr-auto">
-            <li class="nav-item {%if type == 'all'%}active{%endif%}"><a class="nav-link" href="all.html">Home</a></li>
+            <li class="nav-item {%if type == 'all'%}active{%endif%}"><a class="nav-link" href="index.html">Home</a></li>
             <li class="nav-item {%if type == 'rsync'%}active{%endif%}"><a class="nav-link" href="rsync.html">Rsync</a></li>
             <li class="nav-item {%if type == 'distfiles'%}active{%endif%}"><a class="nav-link" href="distfiles.html">Distfiles</a></li>
             <li class="nav-item {%if type == 'snapshots'%}active{%endif%}"><a class="nav-link" href="snapshots.html">Snapshots</a></li>