Permalink
Browse files

Merge branch 'section_9_4' into section_9_5

  • Loading branch information...
2 parents 1c85d35 + bfd5ff0 commit da815202918beef352ece96c1ebd5e16c465649c Noel Rappin committed Nov 25, 2012
View
3 .gitignore
@@ -4,4 +4,5 @@ log/*.log
tmp/
.sass-cache/
public/assets/
-.idea
+.idea
+.DS_Store
View
4 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">{{start_date}} - {{end_date}}</div>
@@ -10,4 +10,4 @@
<div class="trip_links">
<a class="trip_detail_link" href="#">Show Details</a>
<div class="hidden trip_details">{{description}}</div>
-</div>
+</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');

0 comments on commit da81520

Please sign in to comment.