fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-27 20:18:07 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Design changes

Browse Source
This commit is contained in:
fergalmoran
2013-04-23 09:12:04 +01:00
parent 9cbccb9e61
commit a2281ee3dd
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dss/settings.py
View File

@@ -250,8 +250,11 @@ PIPELINE_CSS = {
COMPRESS_CSS_FILTERS = [
'compressor.filters.css_default.CssAbsoluteFilter',
]
COMPRESS_JS = [
'compressor.filters.closure.ClosureCompilerFilter',
]
import mimetypes
mimetypes.add_type("text/xml", ".plist", False)
#HTML_MINIFY = not localsettings.DEBUG
#HTML_MINIFY = not localsettings.DEBUG

3
static/js/com.podnoms.player.js
View File

@@ -48,7 +48,7 @@ com.podnoms.player = {
if (oSound.instanceOptions.isMovieStar) {
return (oSound.duration);
} else {
return this.soundDuration;
return oSound.durationEstimate;
}
},
_whileLoading: function () {
@@ -140,7 +140,6 @@ com.podnoms.player = {
*/
var markerDuration = duration / 10;
var item = $(document.createElement("li"));
this.soundDuration = duration * 1000; //convert to milliseconds
for (var i = 0; i < 10; i++) {
var sliceDuration = moment.duration(markerDuration * (i + 1), "seconds");
var text = sliceDuration.hours() != 0 ?

8
templates/views/HeaderView.html
View File

@@ -1,6 +1,6 @@
{% load account_tags %}
{% load spa_extras %}
<div class="navbar navbar-fixed-top" xmlns="http://www.w3.org/1999/html">
<div class="navbar navbar-fixed-top navbar-inverse" xmlns="http://www.w3.org/1999/html">
<div class="navbar-inner">
<div class="container">
<a href="/" class="brand">
@@ -17,20 +17,20 @@
<form id="logout-form" method="post" action="{% url "account_logout" %}" style="display: none">
{% csrf_token %}
</form>
<a data-bypass="true" style="cursor: hand; cursor: pointer;" id="header-logout-button" onclick="document.getElementById('logout-form').submit();">Logout&nbsp;<i class="icon-eject icon-black"></i>
<a data-bypass="true" style="cursor: hand; cursor: pointer;" id="header-logout-button" onclick="document.getElementById('logout-form').submit();">Logout&nbsp;<i class="icon-eject icon-white"></i>
</a>
<input type="hidden" name="user_id" value="{{ user.id }}" />
</li>
{% else %}
<li>
<a data-bypass="true" id="header-login-button">Login/Signup&nbsp;<i class="icon-music icon-black"></i></a>
<a data-bypass="true" id="header-login-button">Login/Signup&nbsp;<i class="icon-music icon-white"></i></a>
</li>
{% endif %}
</ul>
<ul class="nav pull-right">
<li>
<a class="volume-button" data-mode="volume" id="header-volume-button">
<i class="icon-volume-up icon-black" id="header-volume-icon"></i>
<i class="icon-volume-up icon-white" id="header-volume-icon"></i>
</a>
<li>
<li>

4
templates/views/MixListView.html
View File

@@ -6,7 +6,7 @@
<li><a href="/mixes/recommended" id='recommended'>Recommended</a></li>
{% if user.is_authenticated %}
<li><a href="/mixes/favourites" id='favourites'>Favourites</a></li>
<li class="pull-right"><a class="btn" href="/mix/upload" id='upload'><i class="icon-hand"></i>Upload</a></li>
<li class="pull-right"><a class="btn btn-success" href="/mix/upload" id='upload'><i class="icon-hand"></i>Upload</a></li>
{% endif %}
</ul>
<div id="mix-list-container"></div>
<div id="mix-list-container"></div>