diff --git a/server/djrandom/frontend/templates/_base.html b/server/djrandom/frontend/templates/_base.html
deleted file mode 100644
index dafc8c07a6d9856f9dc5205eb0393f31517ebf20..0000000000000000000000000000000000000000
--- a/server/djrandom/frontend/templates/_base.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!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>
diff --git a/server/djrandom/frontend/templates/_std_base.html b/server/djrandom/frontend/templates/_std_base.html
index eef79cf7d907e9963a66c3b4f25464903642e1a8..2387b98bb2379c8be0f56d9233acef7f227c9fcb 100644
--- a/server/djrandom/frontend/templates/_std_base.html
+++ b/server/djrandom/frontend/templates/_std_base.html
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<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 rel="stylesheet" type="text/css" href="/static/css/login.css">
</head>
@@ -13,5 +13,6 @@
{% endblock %}
</div>
</div>
+
</body>
</html>
diff --git a/server/djrandom/frontend/templates/index.html b/server/djrandom/frontend/templates/index.html
index 7daa4031f232f791f3dd1906f5c0dd1b0357787c..a341f8cd93714556544f252aa9f27757118230b0 100644
--- a/server/djrandom/frontend/templates/index.html
+++ b/server/djrandom/frontend/templates/index.html
@@ -1,102 +1,152 @@
-{% 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">
-{% block head %}
-<script type="text/javascript">
+ <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 %}
+
+ <script type="text/javascript">
$(document).ready(function() {
// Initialize DJR.
djr.init();
});
-</script>
-{% endblock %}
-
-{% block title %}
-{{ config['SITE_NAME'] }}
-{% endblock %}
+ </script>
+ </head>
-{% block body %}
+ <body>
-<div id="rbox">
- <div id="djr_player" class="cp-jplayer"></div>
- <div id="cp_container" class="cp-container">
- <div class="cp-buffer-holder">
- <div class="cp-buffer-1"></div>
- <div class="cp-buffer-2"></div>
+ <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 class="cp-progress-holder">
- <div class="cp-progress-1"></div>
- <div class="cp-progress-2"></div>
- </div>
- <div class="cp-circle-control"></div>
- <ul class="cp-controls">
- <li><a href="#" class="cp-play" tabindex="1">play</a></li>
- <li><a href="#" class="cp-pause" style="display:none;" tabindex="1">pause</a></li>
- </ul>
- </div>
-
- <div id="songInfoDiv">
- </div>
-
- <div id="pllistDiv" >
- <a id="pllistbtn">Playlists</a>
- <div id="pllist" style="display: none"></div>
- </div>
-
- <div id="lyricsDiv" >
- <a id="lyricsbtn">Lyrics</a>
- <iframe id="lyrics" width="100%" height="300" style="display: none">
- <p>Your browser does not support iframes.</p>
- </iframe>
- </div>
+ <div id="main">
+
+ <div id="rbox">
+ <div id="djr_player" class="cp-jplayer"></div>
+ <div id="cp_container" class="cp-container">
+ <div class="cp-buffer-holder">
+ <div class="cp-buffer-1"></div>
+ <div class="cp-buffer-2"></div>
+ </div>
+ <div class="cp-progress-holder">
+ <div class="cp-progress-1"></div>
+ <div class="cp-progress-2"></div>
+ </div>
+ <div class="cp-circle-control"></div>
+ <ul class="cp-controls">
+ <li><a href="#" class="cp-play" tabindex="1">play</a></li>
+ <li><a href="#" class="cp-pause" style="display:none;" tabindex="1">pause</a></li>
+ </ul>
+ </div>
+
+ <div id="songInfoDiv">
+ </div>
+
+ <div id="pllistDiv">
+ <a id="pllistbtn">Playlists</a>
+ <div id="pllist" style="display: none"></div>
+ </div>
+
+ <div id="lyricsDiv">
+ <a id="lyricsbtn">Lyrics</a>
+ <iframe id="lyrics" width="100%" height="300" style="display: none">
+ <p>Your browser does not support iframes.</p>
+ </iframe>
+ </div>
- <div id="wikiDiv" >
- <a id="wikibtn">Wikipedia Author</a>
- <iframe id="wikipedia" width="100%" height="300" style="display: none">
- <p>Your browser does not support iframes.</p>
- </iframe>
- </div>
+ <div id="wikiDiv">
+ <a id="wikibtn">Wikipedia Author</a>
+ <iframe id="wikipedia" width="100%" height="300" style="display: none">
+ <p>Your browser does not support iframes.</p>
+ </iframe>
+ </div>
- <div id="lastfmDiv" >
- <a id="lastfmbtn">LastFM Song Info</a>
- <iframe id="lastfm" width="100%" height="300" style="display: none">
- <p>Your browser does not support iframes.</p>
- </iframe>
- </div>
-</div>
-
-<div id="lbox">
- <div id="titleDiv">
- <h1 class="title">DJ:Random</h1>
- </div>
-
- <div id="searchDiv">
- <form id="searchForm" action="/" method="get">
- <div id="loaderImgDiv">
- <img id="loaderImg" src="/static/img/loader.gif" style="display:none">
+ <div id="lastfmDiv">
+ <a id="lastfmbtn">LastFM Song Info</a>
+ <iframe id="lastfm" width="100%" height="300" style="display: none">
+ <p>Your browser does not support iframes.</p>
+ </iframe>
+ </div>
</div>
- <div id="searchBoxDiv">
- <input type="text" name="q" size="40" id="queryField">
- <input type="submit" value="->">
+
+ <div id="lbox">
+ <div id="titleDiv">
+ <h1 class="title">{{ config['SITE_NAME'] }}</h1>
+ </div>
+
+ <div id="searchDiv">
+ <form id="searchForm" action="/" method="get">
+ <div id="loaderImgDiv">
+ <img id="loaderImg" src="/static/img/loader.gif"
+ style="display:none">
+ </div>
+ <div id="searchBoxDiv">
+ <input type="text" name="q" size="40" id="queryField">
+ <input type="submit" value="->">
+ </div>
+ </form>
+ </div>
+
+ <div id="playlistButtons" class="buttonbox">
+ <a id="playlistLast5">Last 5</a> <a id="playlistLast25">(25)</a>
+ | <a id="playlistRandom5">Random 5</a> <a id="playlistRandom25">(25)</a>
+ | <a id="playlistMost5">Most 5</a> <a id="playlistMost25">(25)</a>
+ | <a id="playlistNever5">Never 5</a> <a id="playlistNever25">(25)</a>
+ | <a id="playlistSave">Save as</a><div id="saveForm" style="display:none;" >
+ <input type="text" name="s" size="15" id="savetext" ><a id="playlistSaveBtn" >Save</a></div>
+ | <a id="playlistExtendBtn">Extend</a>
+ | <a id="playlistClearBtn">Clear</a>
+ | <a id="playlistStreamBtn">Stream</a>
+ <span id="playlistStreamUrl"></span>
+ </div>
+ <div id="playlistDiv">
+ </div>
+
</div>
- </form>
- </div>
-
- <div id="playlistButtons" class="buttonbox">
- <a id="playlistLast5">Last 5</a> <a id="playlistLast25">(25)</a>
- | <a id="playlistRandom5">Random 5</a> <a id="playlistRandom25">(25)</a>
- | <a id="playlistMost5">Most 5</a> <a id="playlistMost25">(25)</a>
- | <a id="playlistNever5">Never 5</a> <a id="playlistNever25">(25)</a>
- | <a id="playlistSave">Save as</a><div id="saveForm" style="display:none;" >
- <input type="text" name="s" size="15" id="savetext" ><a id="playlistSaveBtn" >Save</a></div>
- | <a id="playlistExtendBtn">Extend</a>
- | <a id="playlistClearBtn">Clear</a>
- | <a id="playlistStreamBtn">Stream</a>
- <span id="playlistStreamUrl"></span>
- </div>
- <div id="playlistDiv">
- </div>
-
-</div>
-
-<img id="albumart_fs" style="display:none;">
-
-{% endblock %}
+
+ <img id="albumart_fs" style="display:none;">
+
+ <div id="debug"></div>
+
+ </div>
+ </body>
+</html>
+
diff --git a/server/djrandom/frontend/user_views.py b/server/djrandom/frontend/user_views.py
index fc594faff6886bb82f4ea0ff07ac9b5f37fb0b5d..ea2a136614d89f53b01b3613fd42834b621e4a6d 100644
--- a/server/djrandom/frontend/user_views.py
+++ b/server/djrandom/frontend/user_views.py
@@ -54,7 +54,8 @@ def login():
return redirect('/')
log.info('failed login for %s' % email)
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')
@@ -77,7 +78,7 @@ def user_details():
Session.commit()
api_keys = APIKey.query.filter_by(userid=user.id)
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'])
@@ -128,7 +129,7 @@ def user_send_invite():
flash('invitation sent to %s' % email)
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>')