Skip to content
Snippets Groups Projects
Commit 06611d57 authored by ale's avatar ale
Browse files

use the SITE_NAME config everywhere; remove useless subclassing of the... 

use the SITE_NAME config everywhere; remove useless subclassing of the homepage; if DEBUG=True, do not use the minified js
parent 06fc1241
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
server/djrandom/frontend/templates/_base.html deleted 100644 → 0
+ 0
− 45
View file @ 06fc1241
<!doctype html>
<html>
<head>
<title>DJ RANDOM :: {% block title %}{% endblock -%}</title>
<link href="/static/favicon.ico" type="image/x-icon" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="/static/css/style.css">
<link rel="stylesheet" type="text/css"
href="/static/css/blitzer/jquery-ui-1.8.13.custom.css">
<link rel="stylesheet" type="text/css"
href="/static/circle.skin/circle.player.css">
<script type="text/javascript"
src="/static/js/jquery-1.5.1.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery-ui-1.8.13.custom.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.fullbg.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.transform.js"></script>
<script type="text/javascript"
src="/static/js/jquery.grab.js"></script>
<script type="text/javascript"
src="/static/js/mod.csstransforms.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.jplayer.min.js"></script>
<script type="text/javascript"
src="/static/js/circle.player.js"></script>
<script type="text/javascript"
src="/static/js/djr.min.js"></script>
{% block head %}{% endblock %}
</head>
<body>
<div id="tophdr">
<a href="/user/details" target="_blank"><b>{{ user.email | e }}</b></a>
| <a href="/about" target="_blank">About</a>
| <a href="http://git.autistici.org/djrandom/tree/client/README.txt" target="_blank">
Get Client</a>
| <a href="/logout">Sign out</a>
</div>
<div id="main">
{% block body %}{% endblock %}
<div id="debug"></div>
</div>
</body>
</html>
server/djrandom/frontend/templates/_std_base.html
+ 2
− 1
View file @ 06611d57
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>DJ RANDOM :: {% block title %}{% endblock %}</title> <title>{{ config['SITE_NAME'] }} :: {% block title %}{% endblock %}</title>
<link href="/static/favicon.ico" type="image/x-icon" rel="shortcut icon"> <link href="/static/favicon.ico" type="image/x-icon" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="/static/css/login.css"> <link rel="stylesheet" type="text/css" href="/static/css/login.css">
</head> </head>
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
{% endblock %} {% endblock %}
</div> </div>
</div> </div>
</body> </body>
</html> </html>
server/djrandom/frontend/templates/index.html
+ 140
− 90
View file @ 06611d57
{% extends "_base.html" %} <!doctype html>
<html>
<head>
<title>{{ config['SITE_NAME'] }}</title>
<link href="/static/favicon.ico" type="image/x-icon" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="/static/css/style.css">
<link rel="stylesheet" type="text/css"
href="/static/css/blitzer/jquery-ui-1.8.13.custom.css">
<link rel="stylesheet" type="text/css"
href="/static/circle.skin/circle.player.css">
<script type="text/javascript"
src="/static/js/jquery-1.5.1.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery-ui-1.8.13.custom.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.fullbg.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.transform.js"></script>
<script type="text/javascript"
src="/static/js/jquery.grab.js"></script>
<script type="text/javascript"
src="/static/js/mod.csstransforms.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.jplayer.min.js"></script>
<script type="text/javascript"
src="/static/js/circle.player.js"></script>
{% if not config['DEBUG'] %}
<script type="text/javascript"
src="/static/js/djr.min.js"></script>
{% else %}
<script type="text/javascript"
src="/static/js/djr/djr.js"></script>
<script type="text/javascript"
src="/static/js/djr/backend.js"></script>
<script type="text/javascript"
src="/static/js/djr/playlist.js"></script>
<script type="text/javascript"
src="/static/js/djr/player.js"></script>
{% endif %}
{% block head %}
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
// Initialize DJR. // Initialize DJR.
djr.init(); djr.init();
}); });
</script> </script>
{% endblock %} </head>
{% block title %} <body>
{{ config['SITE_NAME'] }}
{% endblock %}
{% block body %} <div id="tophdr">
<a href="/user/details" target="_blank"><b>{{ user.email | e }}</b></a>
| <a href="/about" target="_blank">About</a>
| <a href="http://git.autistici.org/djrandom/tree/client/README.txt" target="_blank">
Get Client</a>
| <a href="/logout">Sign out</a>
</div>
<div id="main">
<div id="rbox"> <div id="rbox">
<div id="djr_player" class="cp-jplayer"></div> <div id="djr_player" class="cp-jplayer"></div>
...@@ -65,13 +109,14 @@ $(document).ready(function() { ...@@ -65,13 +109,14 @@ $(document).ready(function() {
<div id="lbox"> <div id="lbox">
<div id="titleDiv"> <div id="titleDiv">
<h1 class="title">DJ:Random</h1> <h1 class="title">{{ config['SITE_NAME'] }}</h1>
</div> </div>
<div id="searchDiv"> <div id="searchDiv">
<form id="searchForm" action="/" method="get"> <form id="searchForm" action="/" method="get">
<div id="loaderImgDiv"> <div id="loaderImgDiv">
<img id="loaderImg" src="/static/img/loader.gif" style="display:none"> <img id="loaderImg" src="/static/img/loader.gif"
style="display:none">
</div> </div>
<div id="searchBoxDiv"> <div id="searchBoxDiv">
<input type="text" name="q" size="40" id="queryField"> <input type="text" name="q" size="40" id="queryField">
...@@ -99,4 +144,9 @@ $(document).ready(function() { ...@@ -99,4 +144,9 @@ $(document).ready(function() {
<img id="albumart_fs" style="display:none;"> <img id="albumart_fs" style="display:none;">
{% endblock %} <div id="debug"></div>
</div>
</body>
</html>
server/djrandom/frontend/user_views.py
+ 4
− 3
View file @ 06611d57
...@@ -54,7 +54,8 @@ def login(): ...@@ -54,7 +54,8 @@ def login():
return redirect('/') return redirect('/')
log.info('failed login for %s' % email) log.info('failed login for %s' % email)
login_failed = True login_failed = True
return render_template('login.html', form=form, login_failed=login_failed) return render_template('login.html', form=form, login_failed=login_failed,
config=app.config)
@app.route('/logout') @app.route('/logout')
...@@ -77,7 +78,7 @@ def user_details(): ...@@ -77,7 +78,7 @@ def user_details():
Session.commit() Session.commit()
api_keys = APIKey.query.filter_by(userid=user.id) api_keys = APIKey.query.filter_by(userid=user.id)
return render_template('user_details.html', user=user, form=form, return render_template('user_details.html', user=user, form=form,
api_keys=api_keys) api_keys=api_keys, config=app.config)
@app.route('/user/apikey/create', methods=['POST']) @app.route('/user/apikey/create', methods=['POST'])
...@@ -128,7 +129,7 @@ def user_send_invite(): ...@@ -128,7 +129,7 @@ def user_send_invite():
flash('invitation sent to %s' % email) flash('invitation sent to %s' % email)
return redirect('/user/details') return redirect('/user/details')
return render_template('user_invite.html', form=form) return render_template('user_invite.html', form=form, config=app.config)
@app.route('/user/activate/<token>') @app.route('/user/activate/<token>')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment