From a2281ee3dd5fedbe8140afd415974db3ca439a89 Mon Sep 17 00:00:00 2001
From: fergalmoran <fergal.moran@gmail.com>
Date: Tue, 23 Apr 2013 09:12:04 +0100
Subject: [PATCH] Design changes

---
 dss/settings.py                  | 5 ++++-
 static/js/com.podnoms.player.js  | 3 +--
 templates/views/HeaderView.html  | 8 ++++----
 templates/views/MixListView.html | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dss/settings.py b/dss/settings.py
index 3b57a51..cb6c91d 100644
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -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
\ No newline at end of file
+#HTML_MINIFY = not localsettings.DEBUG
diff --git a/static/js/com.podnoms.player.js b/static/js/com.podnoms.player.js
index f58422f..2d33d70 100644
--- a/static/js/com.podnoms.player.js
+++ b/static/js/com.podnoms.player.js
@@ -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 ?
diff --git a/templates/views/HeaderView.html b/templates/views/HeaderView.html
index 0fb99e2..70adbd3 100644
--- a/templates/views/HeaderView.html
+++ b/templates/views/HeaderView.html
@@ -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>
diff --git a/templates/views/MixListView.html b/templates/views/MixListView.html
index 612dd22..f3ca45c 100644
--- a/templates/views/MixListView.html
+++ b/templates/views/MixListView.html
@@ -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>
\ No newline at end of file
+<div id="mix-list-container"></div>