Permalink
Browse files

Merge branch 'section_9_5' into section_9_6

  • Loading branch information...
2 parents 88163c1 + da81520 commit a659e3f093180a38e0b9382840495734428540bb Noel Rappin committed Nov 25, 2012
View
@@ -4,4 +4,5 @@ log/*.log
tmp/
.sass-cache/
public/assets/
-.idea
+.idea
+.DS_Store
@@ -1,5 +1,5 @@
<div class="trip_header">
- <a href="/trips/{{id}}" class="detail_page_link">{{name}}</a>
+ <a href="/trips/detail/{{id}}" class="detail_page_link">{{name}}</a>
</div>
<div class="trip_tag">{{tag_line}}</div>
<div class="trip_dates">{{startDateDisplay}} - {{endDateDisplay}}</div>
@@ -7,6 +7,7 @@ TimeTravel.Views.TripsView = Backbone.View.extend({
this.collection.bind('reset', this.render, this);
},
+ //##renderWith
render: function() {
this.$el.html(TimeTravel.template('tripsViewTemplate').render());
var $trips = this.$('.trips');

0 comments on commit a659e3f

Please sign in to comment.