| 1 |
commit: 65aa6442fc6d8cc3d5688255911667bd133b97fc |
| 2 |
Author: Max Magorsch <arzano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 23:07:46 2020 +0000 |
| 4 |
Commit: Max Magorsch <arzano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 23:07:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=65aa6442 |
| 7 |
|
| 8 |
Use index.html instead of all.html for the landing page |
| 9 |
|
| 10 |
Signed-off-by: Max Magorsch <arzano <AT> gentoo.org> |
| 11 |
|
| 12 |
html/generate.py | 4 +++- |
| 13 |
html/help.jinja2 | 2 +- |
| 14 |
html/stats.jinja2 | 2 +- |
| 15 |
3 files changed, 5 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/html/generate.py b/html/generate.py |
| 18 |
index abb7100..8ab5898 100755 |
| 19 |
--- a/html/generate.py |
| 20 |
+++ b/html/generate.py |
| 21 |
@@ -69,12 +69,14 @@ def getIp(hostname): |
| 22 |
def renderStatsTemplate(templateEnv, page): |
| 23 |
if page == "all": |
| 24 |
mirrorstatsList = mirrorstats |
| 25 |
+ page_name = "index" |
| 26 |
else: |
| 27 |
mirrorstatsList = ['https://mirrorstats.gentoo.org/' + page + '/state.json'] |
| 28 |
+ page_name = page |
| 29 |
|
| 30 |
lastUpdate, hostList = getHostList(mirrorstatsList) |
| 31 |
template = templateEnv.get_template("stats.jinja2") |
| 32 |
- template.stream(lastUpdate=lastUpdate, type=page, mirrors=hostList, locations=json.dumps(hostList)).dump(html_folder + page + ".html") |
| 33 |
+ template.stream(lastUpdate=lastUpdate, type=page, mirrors=hostList, locations=json.dumps(hostList)).dump(html_folder + page_name + ".html") |
| 34 |
return lastUpdate |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
diff --git a/html/help.jinja2 b/html/help.jinja2 |
| 39 |
index 6e08363..678e649 100644 |
| 40 |
--- a/html/help.jinja2 |
| 41 |
+++ b/html/help.jinja2 |
| 42 |
@@ -55,7 +55,7 @@ |
| 43 |
</div> |
| 44 |
<div class="collapse navbar-collapse navbar-main-collapse" id="navbar-main-collapse"> |
| 45 |
<ul class="navbar-nav mr-auto"> |
| 46 |
- <li class="nav-item"><a class="nav-link" href="all.html">Home</a></li> |
| 47 |
+ <li class="nav-item"><a class="nav-link" href="index.html">Home</a></li> |
| 48 |
<li class="nav-item"><a class="nav-link" href="rsync.html">Rsync</a></li> |
| 49 |
<li class="nav-item"><a class="nav-link" href="distfiles.html">Distfiles</a></li> |
| 50 |
<li class="nav-item"><a class="nav-link" href="snapshots.html">Snapshots</a></li> |
| 51 |
|
| 52 |
diff --git a/html/stats.jinja2 b/html/stats.jinja2 |
| 53 |
index e13cd45..35f012a 100644 |
| 54 |
--- a/html/stats.jinja2 |
| 55 |
+++ b/html/stats.jinja2 |
| 56 |
@@ -57,7 +57,7 @@ |
| 57 |
</div> |
| 58 |
<div class="collapse navbar-collapse navbar-main-collapse" id="navbar-main-collapse"> |
| 59 |
<ul class="navbar-nav mr-auto"> |
| 60 |
- <li class="nav-item {%if type == 'all'%}active{%endif%}"><a class="nav-link" href="all.html">Home</a></li> |
| 61 |
+ <li class="nav-item {%if type == 'all'%}active{%endif%}"><a class="nav-link" href="index.html">Home</a></li> |
| 62 |
<li class="nav-item {%if type == 'rsync'%}active{%endif%}"><a class="nav-link" href="rsync.html">Rsync</a></li> |
| 63 |
<li class="nav-item {%if type == 'distfiles'%}active{%endif%}"><a class="nav-link" href="distfiles.html">Distfiles</a></li> |
| 64 |
<li class="nav-item {%if type == 'snapshots'%}active{%endif%}"><a class="nav-link" href="snapshots.html">Snapshots</a></li> |
Archives