save a new tutorial and their tags.

5 files changed, 21 insertions, 4 deletions

diff --git a/app/assets/javascripts/backbone/templates/tutorials/new.jst.ejs b/app/assets/javascripts/backbone/templates/tutorials/new.jst.ejs
index b9785b16..4aaf4c51 100644
--- a/app/assets/javascripts/backbone/templates/tutorials/new.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/tutorials/new.jst.ejs
@@ -13,7 +13,7 @@
         <div class="control-group">
           <label for="tags" class="control-label">Tags</label>
             <div class="controls">
-              <input type="text" id="tags" name="tutorial_tags" value="" class="input-xxlarge" autocomplete="off" />
+              <input type="text" id="tutorial_tags" name="tags" value="" class="input-xxlarge" autocomplete="off" />
               <p class="help-block">
                 Note: help people find this tutorial by adding some keyword tags
               </p>
diff --git a/app/assets/javascripts/backbone/templates/tutorials/tutorial.jst.ejs b/app/assets/javascripts/backbone/templates/tutorials/tutorial.jst.ejs
index 4c10d825..9b79b685 100644
--- a/app/assets/javascripts/backbone/templates/tutorials/tutorial.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/tutorials/tutorial.jst.ejs
@@ -1,7 +1,17 @@
 <div class="thumbnail">
-  <a href="#tutorials/<%= id %>"><img src="<%= image_url %>" /></a>
+  <a href="#tutorials/<%= id %>">
+    <img src="<%= image_url %>" />
+  </a>
   <div class="caption">
-    <h3><a href="#tutorials/<%= id %>"><%= heading %></a></h3>
+    <h3><a href="#tutorials/<%= id %>"><%= heading %></a> <small><%= displayDate(created_at) %></small></h3>
+    <p>
+      <% _.each(tags, function(tag) { %> 
+        <a href="">
+          <span class="label"><%= tag.name %></span>
+        </a>
+      <% }); %>
+    </p>
     <p><%= description %></p>
+    <p><a href="#tutorials/<%= id %>" class="btn">View</a></p>
   </div>
 </div>
diff --git a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
index f9b10888..c568ca95 100644
--- a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
@@ -36,7 +36,7 @@ class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView
 
   onRender: ->
     @$("#cake_category_id").val(@model.category_id())
-    @$('#cake_tags').tagit({ availableTags: ALL_TAGS })
+    @ui.tags.tagit({ availableTags: ALL_TAGS })
     @disableSaveButton()
 
   savedSuccessfully: (cake) =>
diff --git a/app/assets/javascripts/backbone/views/tutorials/new_view.js.coffee b/app/assets/javascripts/backbone/views/tutorials/new_view.js.coffee
index 2fd2be3b..ca13a571 100644
--- a/app/assets/javascripts/backbone/views/tutorials/new_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/tutorials/new_view.js.coffee
@@ -6,6 +6,7 @@ class CakeSide.Views.Tutorials.NewView extends Marionette.ItemView
     url_group: '#url-group'
     save_button: '#save-button'
     preview: '#preview-panel'
+    tags: '#tutorial_tags'
 
   modelEvents:
     'invalid': 'displayError'
@@ -34,6 +35,7 @@ class CakeSide.Views.Tutorials.NewView extends Marionette.ItemView
       author_url: attributes.provider_url
 
   onRender: ->
+    @ui.tags.tagit({ availableTags: ALL_TAGS })
     @model.isValid()
 
   displayError: (model, error) ->
@@ -46,6 +48,7 @@ class CakeSide.Views.Tutorials.NewView extends Marionette.ItemView
   save: (event) ->
     event.preventDefault()
     event.stopPropagation()
+    @model.set('tags', @ui.tags.val())
     @ui.save_button.attr('disabled', 'disabled')
     @collection.create(@model,
       success: @savedSuccessfully
diff --git a/app/assets/javascripts/backbone/views/tutorials/tutorial_view.js.coffee b/app/assets/javascripts/backbone/views/tutorials/tutorial_view.js.coffee
index addc5b2f..489269e0 100644
--- a/app/assets/javascripts/backbone/views/tutorials/tutorial_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/tutorials/tutorial_view.js.coffee
@@ -4,3 +4,7 @@ class CakeSide.Views.Tutorials.TutorialView extends Marionette.ItemView
   template: JST['backbone/templates/tutorials/tutorial']
   tagName: 'li'
   className: 'span3'
+
+  templateHelpers:
+    displayDate: (date) ->
+      new Date(date).toLocaleDateString()