Continued:

- /api/info.json doesn't need to return slogan while it can be taken directly
  from configuration
- exclude empty origins, not software

diff --git a/api.py b/api.py
index 9b8276c0c30fd18bd56658ee1814bdf705aa03b3..282b6810aec9bea2691dd62d78ee1e426d35db34 100644 (file)
--- a/api.py
+++ b/api.py
@@ -59,7 +59,6 @@ def api_info():
         "supported_instances": row[1],
         "blocks_recorded"    : row[2],
         "erroneous_instances": row[3],
-        "slogan"             : config.get("slogan"),
     }
 
 @router.get(config.get("base_url") + "/api/scoreboard.json", response_class=JSONResponse)
@@ -72,7 +71,7 @@ def api_scoreboard(mode: str, amount: int):
     elif mode == "blocker":
         database.cursor.execute("SELECT blocker, COUNT(blocker) AS score FROM blocks GROUP BY blocker ORDER BY score DESC LIMIT ?", [amount])
     elif mode == "reference":
-        database.cursor.execute("SELECT origin, COUNT(domain) AS score FROM instances WHERE software IS NOT NULL GROUP BY origin ORDER BY score DESC LIMIT ?", [amount])
+        database.cursor.execute("SELECT origin, COUNT(domain) AS score FROM instances WHERE origin IS NOT NULL GROUP BY origin ORDER BY score DESC LIMIT ?", [amount])
     elif mode == "software":
         database.cursor.execute("SELECT software, COUNT(domain) AS score FROM instances WHERE software IS NOT NULL GROUP BY software ORDER BY score DESC, software ASC LIMIT ?", [amount])
     elif mode == "command":
@@ -267,7 +266,8 @@ def index(request: Request):
     return templates.TemplateResponse("views/index.html", {
         "request": request,
         "theme"  : config.get("theme"),
-        "info"   : response.json()
+        "info"   : response.json(),
+        "slogan" : config.get("slogan"),
     })
 
 @router.get(config.get("base_url") + "/top")

diff --git a/templates/base.html b/templates/base.html
index 809dd3a7c8497ada3ab7decc2becf257e4989f2c..7191ba4c9eeffca7f17c1dae496c7996b55aa4fc 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,9 +24,7 @@
         {% block footer %}
             Source code:
             <a href="https://git.mxchange.org/?p=fba.git;a=summary" rel="source" target="_blank">git.mxchange.org</a><br /><br />
-            {% if info %}
-                {{info.slogan}}
-            {% elif slogan %}
+            {% if slogan %}
                 {{slogan}}
             {% else %}
                 <b>No slogan was found!</b>