From b6558425447eb4229fa8b8030afd43c3465e1b2a Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 8 Sep 2012 15:04:08 +0100 Subject: [PATCH] Re-enabled twitter side bar --- static/css/deepsouthsounds.css | 65 +++++++++++++++++++++- static/img/twitter-ico.png | Bin 0 -> 3453 bytes static/js/app/app.js | 4 +- static/js/app/views/sidebar.js | 8 +-- templates/inc/twitter.html | 92 +++++++++++++++++-------------- templates/views/SidebarView.html | 21 ++++++- 6 files changed, 139 insertions(+), 51 deletions(-) create mode 100644 static/img/twitter-ico.png diff --git a/static/css/deepsouthsounds.css b/static/css/deepsouthsounds.css index 0c91650..aef21b2 100644 --- a/static/css/deepsouthsounds.css +++ b/static/css/deepsouthsounds.css @@ -471,4 +471,67 @@ input[type=submit] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -} \ No newline at end of file +} + +.widget_woo_twitter +.back { + padding: 0px +} + +.widget_woo_twitter +ul { + background: none; + padding-left: 0 +} + +.widget_woo_twitter ul +li { + background: #fff; + border: 1px solid #BFD4D9; + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + padding: 5px 10px; + margin-bottom: 5px; + list-style: none +} + +.widget_woo_twitter ul li +a { + padding: 0px +} + +.widget_woo_twitter ul li +.time { + color: #999 +} + +.widget_woo_twitter +p { + padding-top: 10px +} + +.widget_woo_twitter p +a { + color: #222 +} + +.widget_woo_twitter ul li +.content { + font-size: 12px +} + +.widget_woo_twitter ul li +.time { + display: block +} + +.widget.widget_woo_twitter +h3 { + border-bottom: none; + padding: 0; + margin: 0; + padding: 15px 0 15px 70px; + background: url(/static/img/twitter-ico.png) no-repeat left; + margin-bottom: 10px +} diff --git a/static/img/twitter-ico.png b/static/img/twitter-ico.png new file mode 100644 index 0000000000000000000000000000000000000000..69568a1edff299a142f169d8c4c5c427c206f354 GIT binary patch literal 3453 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 literal 0 HcmV?d00001 diff --git a/static/js/app/app.js b/static/js/app/app.js index 2165145..3151840 100644 --- a/static/js/app/app.js +++ b/static/js/app/app.js @@ -37,8 +37,8 @@ var AppRouter = Backbone.Router.extend({ var mixList = new MixCollection(); mixList.type = type || 'latest'; $('#site-content-fill').html(''); - //this.sidebarView = new SidebarView(); - //$('#sidebar').html(this.sidebarView.el); + this.sidebarView = new SidebarView(); + $('#sidebar').html(this.sidebarView.el); var data = type != undefined ? $.param({sort:type}) : null; mixList.fetch({ data:data, diff --git a/static/js/app/views/sidebar.js b/static/js/app/views/sidebar.js index e7c144f..d2587e2 100644 --- a/static/js/app/views/sidebar.js +++ b/static/js/app/views/sidebar.js @@ -1,10 +1,4 @@ -/** - * Created with PyCharm. - * User: fergalm - * Date: 08/08/12 - * Time: 22:10 - * To change this template use File | Settings | File Templates. - */ + window.SidebarView = Backbone.View.extend({ initialize: function(){ this.render(); diff --git a/templates/inc/twitter.html b/templates/inc/twitter.html index 558ac47..75327e8 100644 --- a/templates/inc/twitter.html +++ b/templates/inc/twitter.html @@ -1,41 +1,53 @@ - - - - \ No newline at end of file + document.getElementById('twitter_update_list_woo_twitter-3').innerHTML = statusHTML.join(''); + } + function relative_time(time_value) { + var values = time_value.split(" "); + time_value = values[1] + " " + values[2] + ", " + values[5] + " " + values[3]; + var parsed_date = Date.parse(time_value); + var relative_to = (arguments.length > 1) ? arguments[1] : new Date(); + var delta = parseInt((relative_to.getTime() - parsed_date) / 1000); + delta = delta + (relative_to.getTimezoneOffset() * 60); + if (delta < 60) { + return'less than a minute ago'; + } else if (delta < 120) { + return'about a minute ago'; + } else if (delta < (60 * 60)) { + return(parseInt(delta / 60)).toString() + ' minutes ago'; + } else if (delta < (120 * 60)) { + return'about an hour ago'; + } else if (delta < (24 * 60 * 60)) { + return'about ' + (parseInt(delta / 3600)).toString() + ' hours ago'; + } else if (delta < (48 * 60 * 60)) { + return'1 day ago'; + } else { + return(parseInt(delta / 86400)).toString() + ' days ago'; + } + } + /*]]>*/ + + + \ No newline at end of file diff --git a/templates/views/SidebarView.html b/templates/views/SidebarView.html index eec58de..5ab4901 100644 --- a/templates/views/SidebarView.html +++ b/templates/views/SidebarView.html @@ -1 +1,20 @@ -{% include 'inc/twitter.html' %} \ No newline at end of file + +
+ {% if user.is_staff %} +
+ Player goes here... +
+ {% endif %} +
+
+ {% include 'inc/twitter.html' %} +
\ No newline at end of file