Proper custom CTF name

I should have better pushing habits
hkwany · Mar 15, 2015 · 95e015a · 95e015a
1 parent 0179fa7
commit 95e015a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CTFd/utils.py b/CTFd/utils.py
@@ -23,12 +23,12 @@ def init_utils(app):
     app.jinja_env.globals.update(pages=pages)
     app.jinja_env.globals.update(can_register=can_register)
     app.jinja_env.globals.update(mailserver=mailserver)
-    app.jinja_env.globals.update(ctf_name=ctf_name())
+    app.jinja_env.globals.update(ctf_name=ctf_name)
 
 
 def ctf_name():
     name = get_config('ctf_name')
-    return name if name else 'CTF'
+    return name if name else 'CTFd'
 
 
 def pages():

diff --git a/templates/base.html b/templates/base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>{{ ctf_name }} - </title>
+    <title>{{ ctf_name() }}</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon">
@@ -17,7 +17,7 @@
     <nav class="top-bar" data-topbar>
       <ul class="title-area">
         <li class="name">
-          <h1><a href="/">{{ ctf_name|upper }}</a></h1>
+          <h1><a href="/">{{ ctf_name() }}</a></h1>
         </li>
         <li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
       </ul>