Load app name and brand from the config and/or environment for flexibility
This commit is contained in:
parent
0f1536fabe
commit
67115542d8
4 changed files with 23 additions and 6 deletions
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"APPNAME": "",
|
||||
"APPBRAND": "",
|
||||
"DBNAME": "smash.db"
|
||||
}
|
|
@ -11,6 +11,18 @@ conf = config.Config('config.json')
|
|||
if 'HEROKU' in os.environ:
|
||||
conf.add(('HEROKU', 1))
|
||||
|
||||
# Load app name from environment if it's not in the config
|
||||
if ('APPNAME' in conf.config and
|
||||
conf.config['APPNAME']=="" and
|
||||
'APPNAME' in os.environ):
|
||||
conf.add(('APPNAME', os.environ['APPNAME']))
|
||||
|
||||
# Load app brand name from environment if it's not in the config
|
||||
if ('APPBRAND' in conf.config and
|
||||
conf.config['APPBRAND']=="" and
|
||||
'APPBRAND' in os.environ):
|
||||
conf.add(('APPBRAND', os.environ['APPBRAND']))
|
||||
|
||||
db = database.Database(conf.config["DBNAME"])
|
||||
models.init_models(db)
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
<div class="container">
|
||||
<nav class="navbar navbar-default navbar-upper">
|
||||
<div class="navbar-header">
|
||||
<a class="navbar-brand navbar-brand-upper" href="">smash</a>
|
||||
<a class="navbar-brand navbar-brand-upper" href="">{{ appbrand }}</a>
|
||||
</div>
|
||||
</nav>
|
||||
<nav class="navbar navbar-static-top navbar-lower">
|
||||
|
|
|
@ -7,7 +7,8 @@ from smash import app, conf, db
|
|||
def index():
|
||||
return render_template(
|
||||
"index.html",
|
||||
appname=conf.config["APPNAME"],
|
||||
appname=conf.config['APPNAME'],
|
||||
appbrand=conf.config['APPBRAND'],
|
||||
title="Quotes",
|
||||
msg="Landing page!"
|
||||
)
|
||||
|
@ -20,7 +21,8 @@ def latest():
|
|||
|
||||
return render_template(
|
||||
"latest.html",
|
||||
appname=conf.config["APPNAME"],
|
||||
appname=conf.config['APPNAME'],
|
||||
appbrand=conf.config['APPBRAND'],
|
||||
title="Latest",
|
||||
quotes=quotes
|
||||
)
|
||||
|
@ -41,7 +43,8 @@ def quote(id):
|
|||
]
|
||||
return render_template(
|
||||
"latest.html",
|
||||
appname=conf.config["APPNAME"],
|
||||
appname=conf.config['APPNAME'],
|
||||
appbrand=conf.config['APPBRAND'],
|
||||
title="Latest",
|
||||
quotes=quote
|
||||
)
|
||||
|
@ -51,6 +54,7 @@ def quote(id):
|
|||
def tags():
|
||||
return render_template(
|
||||
"tags.html",
|
||||
appname=conf.config["APPNAME"],
|
||||
appname=conf.config['APPNAME'],
|
||||
appbrand=conf.config['APPBRAND'],
|
||||
title="Tags"
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue