Merge branch 'master' of bitbucket.org:cakeside/cakeside

9 files changed, 37 insertions, 39 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fc002f2d..d973d0cc 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery.turbolinks
 //= require jquery-migrate
 //= require jquery_ujs
 //= require turbolinks
diff --git a/app/assets/javascripts/backbone/cakeside.js.coffee b/app/assets/javascripts/backbone/cakeside.js.coffee
index e55bb348..6f468e52 100644
--- a/app/assets/javascripts/backbone/cakeside.js.coffee
+++ b/app/assets/javascripts/backbone/cakeside.js.coffee
@@ -37,14 +37,12 @@ window.CakeSide =
 
     @cakes = new CakeSide.Collections.CakesCollection()
     @categories = new CakeSide.Collections.CategoriesCollection()
-    @categories.fetch(reset: true)
     @tutorials = new CakeSide.Collections.TutorialsCollection()
-    @tutorials.fetch(reset: true)
 
-    @disqus_view = new CakeSide.Views.DisqusView
-      disqus_shortname: data.disqus_shortname
-    CakeSide.Application.reqres.setHandler 'CommentView', =>
-      @disqus_view
+    #@disqus_view = new CakeSide.Views.DisqusView
+      #disqus_shortname: data.disqus_shortname
+    #CakeSide.Application.reqres.setHandler 'CommentView', =>
+      #@disqus_view
     CakeSide.Application.reqres.setHandler 'CakesRepository', =>
       @cakes
     CakeSide.Application.reqres.setHandler 'CategoriesRepository', =>
@@ -63,5 +61,7 @@ window.CakeSide =
     CakeSide.Application.reqres.setHandler 'ProfilesRepository', =>
       @profiles ||= new CakeSide.Collections.ProfilesCollection()
 
+    @categories.fetch(reset: true)
+    @tutorials.fetch(reset: true)
     @cakes.fetch(reset: true).done ->
       CakeSide.Application.start()
diff --git a/app/assets/javascripts/backbone/controllers/cakes_controller.js.coffee b/app/assets/javascripts/backbone/controllers/cakes_controller.js.coffee
index c9fe5579..70d99253 100644
--- a/app/assets/javascripts/backbone/controllers/cakes_controller.js.coffee
+++ b/app/assets/javascripts/backbone/controllers/cakes_controller.js.coffee
@@ -3,11 +3,11 @@ class CakeSide.Controllers.CakesController extends Marionette.Controller
   initialize: (options) ->
     @content_region = CakeSide.Application.content_region
     @cakes = CakeSide.Application.request('CakesRepository')
-    @comment_view = CakeSide.Application.request('CommentView')
+    #@comment_view = CakeSide.Application.request('CommentView')
 
   index: ->
     @selectTab()
-    @comment_view.hide()
+    #@comment_view.hide()
     @content_region.show(new @views.IndexView(collection: @cakes))
 
   show: (id, photo_id) ->
@@ -21,13 +21,13 @@ class CakeSide.Controllers.CakesController extends Marionette.Controller
 
   newCake: ->
     @selectTab()
-    @comment_view.hide()
+    #@comment_view.hide()
     @content_region.show(new @views.NewView(collection: @cakes))
 
   edit: (id) ->
     @selectTab()
     @content_region.show(new @views.EditView(model: @cakes.get(id)))
-    @comment_view.hide()
+    #@comment_view.hide()
 
   selectTab: ->
     $('.nav-list').children().removeClass('active')
diff --git a/app/assets/javascripts/backbone/controllers/dashboard_controller.js.coffee b/app/assets/javascripts/backbone/controllers/dashboard_controller.js.coffee
index 45e7196c..23169914 100644
--- a/app/assets/javascripts/backbone/controllers/dashboard_controller.js.coffee
+++ b/app/assets/javascripts/backbone/controllers/dashboard_controller.js.coffee
@@ -1,6 +1,6 @@
 class CakeSide.Controllers.DashboardController extends Marionette.Controller
   initialize: (options) ->
-    @comment_view = CakeSide.Application.request('CommentView')
+    #@comment_view = CakeSide.Application.request('CommentView')
 
   index: ->
-    @comment_view.hide()
+    #@comment_view.hide()
diff --git a/app/assets/javascripts/backbone/controllers/profile_controller.js.coffee b/app/assets/javascripts/backbone/controllers/profile_controller.js.coffee
index e0306805..984cf4d7 100644
--- a/app/assets/javascripts/backbone/controllers/profile_controller.js.coffee
+++ b/app/assets/javascripts/backbone/controllers/profile_controller.js.coffee
@@ -2,11 +2,11 @@ class CakeSide.Controllers.ProfileController extends Marionette.Controller
   views: CakeSide.Views.Profiles
   initialize: (options) ->
     @content_region = CakeSide.Application.content_region
-    @comment_view = CakeSide.Application.request('CommentView')
+    #@comment_view = CakeSide.Application.request('CommentView')
 
   show: (id) ->
     @selectTab()
-    @comment_view.hide()
+    #@comment_view.hide()
     profile = new CakeSide.Models.Profile
       id: id
     profile.fetch
diff --git a/app/assets/javascripts/backbone/controllers/tutorials_controller.js.coffee b/app/assets/javascripts/backbone/controllers/tutorials_controller.js.coffee
index ae1a626f..5f1997c4 100644
--- a/app/assets/javascripts/backbone/controllers/tutorials_controller.js.coffee
+++ b/app/assets/javascripts/backbone/controllers/tutorials_controller.js.coffee
@@ -3,26 +3,26 @@ class CakeSide.Controllers.TutorialsController extends Marionette.Controller
   initialize: (options) ->
     @content_region = CakeSide.Application.content_region
     @tutorials = CakeSide.Application.request('TutorialsRepository')
-    @comment_view = CakeSide.Application.request('CommentView')
+    #@comment_view = CakeSide.Application.request('CommentView')
 
   index: ->
     @selectTab()
-    @comment_view.hide()
+    #@comment_view.hide()
     @content_region.show(new @views.IndexView(collection: @tutorials))
 
   new: ->
     @selectTab()
-    @comment_view.hide()
+    #@comment_view.hide()
     @content_region.show(new @views.NewView(collection: @tutorials))
 
   show: (id) ->
     @selectTab()
     tutorial = @tutorials.get(id)
     @content_region.show(new @views.ShowView(model: tutorial))
-    @comment_view.render
-      identifier: "t-#{tutorial.id}"
-      title: tutorial.get('name')
-      url: tutorial.public_url()
+    #@comment_view.render
+      #identifier: "t-#{tutorial.id}"
+      #title: tutorial.get('heading')
+      #url: tutorial.get('url')
 
   selectTab: ->
     $('.nav-list').children().removeClass('active')
diff --git a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
index c20138b5..e9800ad5 100644
--- a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
@@ -4,18 +4,10 @@
     <img class="media-object" data-src="<%= photo.thumb_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= photo.thumb_url %>">
   </a>
 <% } %>
-  <div class="media-body">
-    <h4 class="media-heading"><%= name %></h4>
-    <%= story %>
-    <p>
-    <a href="#cakes/<%= id %>/edit">
-      <i class="fa fa-edit"></i> edit
-    </a>
-    <a href="<%= Routes.cake_favorites_path(id) %>">
-      <i class="fa fa-heart"></i> fanclub
-    </a>
-    <span class="badge badge-warning">
-      <i class="fa fa-comment"> </i> <a href="/creations/<%= id %>#disqus_thread" data-disqus-identifier="c-<%= id %>"></a>
-      </span>
-    </p>
-  </div>
+<div class="media-body">
+  <h4 class="media-heading"><a href="#cakes/<%= id %>"><%= name %></a></h4>
+  <p>
+    <a href="#cakes/<%= id %>/edit"><i class="fa fa-edit"></i>edit</a>
+    <a href="<%= Routes.cake_favorites_path(id) %>"><i class="fa fa-heart"></i>fanclub</a>
+  </p>
+</div>
diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
index d462642f..e589075f 100644
--- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
@@ -1,11 +1,16 @@
 <div class="row-fluid">
   <div class="span12">
-    <p class="pull-right"> <a class="btn btn-primary add-photo">Add Photo...</a> </p>
     <h1><small>Edit</small> <%= cake.name %></h1>
     <hr />
     <form id="edit-cake" name="cake" class="form-horizontal">
       <fieldset>
         <div class="control-group">
+          <label class="control-label"></label>
+          <div class="controls">
+            <a class="btn btn-primary add-photo">Upload Photo...</a>
+          </div>
+        </div>
+        <div class="control-group">
           <label class="control-label" for="cake_name">Name*</label>
           <div class="controls">
             <input class="input-xxlarge" id="cake_name" name="name" type="text" value="<%= cake.name %>" />
diff --git a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs b/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
index 66bbe946..7f7a7dfb 100644
--- a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
@@ -3,14 +3,14 @@
   <h4>Upload Photo</h4>
 </div>
 <div class="modal-body">
-  <img id="preview-image" src="#" alt="your image" class="hide hidden-phone" />
   <span class="btn btn-default btn-file">
     + Browse... <input id="photo-attachment" name="attachment" type="file" accept="image/*">
   </span>
-  <p>
+  <p class='pull-right'>
     <input id="watermark" name="watermark" maxlength="30" size="30" type="text" placeholder="watermark" /> on CakeSide.com
     <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Watermark your name or company on each uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
   </p>
+  <img id="preview-image" src="#" alt="your image" class="hide hidden-phone" />
 </div>
 <div class="modal-footer">
   <a href="#" class="btn" data-dismiss="modal">Cancel</a>