Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

gMerge branch 'section_9_7' into section_9_8

  • Loading branch information...
commit feaff05fa074ed147b27d220a98b444f9f0412d8 2 parents a4e19df + 55f78c1
Noel Rappin authored
View
3  .gitignore
@@ -4,4 +4,5 @@ log/*.log
tmp/
.sass-cache/
public/assets/
-.idea
+.idea
+.DS_Store
View
2  app/assets/javascripts/backbone/templates/tripViewTemplate.mustache
@@ -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>
View
1  app/assets/javascripts/backbone/views/tripsView.js
@@ -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');
Please sign in to comment.
Something went wrong with that request. Please try again.