Fixed leading slash in user link in Activity

This commit is contained in:
Fergal Moran
2013-07-09 14:55:39 +01:00
parent c51b60aae2
commit 5bc35d69be
3 changed files with 7 additions and 15 deletions

View File

@@ -24,14 +24,6 @@ define ['underscore', 'backbone', 'marionette', 'vent', 'views/activity/activity
console.log "SidebarView: onShow"
@streamRegion.show(new ActivityListView())
$(@topRegion.el).hide()
"""
@topRegion.show(
new NowPlayingView(
model: new Backbone.Model({
item_url: "fdskjfhdsk", title: "Argle bargle", user_profile_url: "/", user_name: "Foo Ferra"
})
))
"""
return
mixInit: (model) ->

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3
// Generated by CoffeeScript 1.6.2
(function() {
var __hasProp = {}.hasOwnProperty,
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
define(['underscore', 'backbone', 'marionette', 'vent', 'views/activity/activityListView', 'views/widgets/nowPlayingView', 'text!/tpl/SidebarView'], function(_, Backbone, Marionette, vent, ActivityListView, NowPlayingView, Template) {
var SidebarView;
SidebarView = (function(_super) {
var SidebarView, _ref;
SidebarView = (function(_super) {
__extends(SidebarView, _super);
function SidebarView() {
return SidebarView.__super__.constructor.apply(this, arguments);
_ref = SidebarView.__super__.constructor.apply(this, arguments);
return _ref;
}
SidebarView.prototype.template = _.template(Template);
@@ -36,8 +37,6 @@
console.log("SidebarView: onShow");
this.streamRegion.show(new ActivityListView());
$(this.topRegion.el).hide();
"@topRegion.show(\n new NowPlayingView(\n model: new Backbone.Model({\n item_url: \"fdskjfhdsk\", title: \"Argle bargle\", user_profile_url: \"/\", user_name: \"Foo Ferra\"\n })\n ))";
};
SidebarView.prototype.mixInit = function(model) {
@@ -50,6 +49,7 @@
SidebarView.prototype.liveStarted = function() {
var _this = this;
console.log("SidebarView: livePlay");
$.getJSON("ajax/live_now_playing/", function(data) {
$(_this.topRegion.el).show();

View File

@@ -6,7 +6,7 @@
<div class="media-body">
<div class="media">
<a class="activity-user" href="/<%= user_profile %>">
<a class="activity-user" href="<%= user_profile %>">
<%= user_name %>
</a>
<%= verb %> <a href="<%= item_url %>"><%= item_name %></a>