Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ruby 1.9.3

  • Loading branch information...
commit 166a2ebdff64c450f061fb50343f3daecee0b510 1 parent 7e6d260
@brownman authored
View
BIN  .sass-cache/dde4918d3d6e6208f003e8a059cae43f879f4cbf/bootstrap_and_overrides.css.scssc
Binary file not shown
View
2  Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
-#ruby '1.9.3'
+ruby '1.9.3'
#gem 'bundler', '1.2.0.pre'
#gem 'rails', '3.2.3'
View
2  Gemfile~
@@ -15,7 +15,7 @@ gem 'will_paginate', '3.0.3'
gem 'bootstrap-will_paginate', '0.0.6'
gem 'jquery-rails', '2.0.2'
-gem 'twitter-bootstrap-rails'
+#gem 'twitter-bootstrap-rails'
gem 'rails-backbone'
#, '0.7.0'
View
11 app/assets/javascripts/backbone/templates/comments/comment.jst.ejs
@@ -7,14 +7,22 @@
<input type="checkbox" name="direction" class="direction checkbox span12" <%= obj.direction ? 'checked="checked"' : '' %> />
<input class='span12' height='1em' type='text' value='<%= obj.title %>'></input>
+
+
+
+
+
<input label='time: ' tooltip='delay in seconds' class='seconds span12' height='1em' type='text' value='<%= obj3 %>'></input>
-<input height='1em' class=' span12' name="content" value='<%= obj.content %>' />
+<textarea rows="4" height='1em' class='span12' name="content1" >
+
+<%= obj.content %>
+</textarea>
@@ -36,6 +44,5 @@
<a href="/comments#/<%= obj.id %>/destroy" class="destroy">kill</a>
-
</div>
View
14 app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~
@@ -7,10 +7,19 @@
<input type="checkbox" name="direction" class="direction checkbox span12" <%= obj.direction ? 'checked="checked"' : '' %> />
<input class='span12' height='1em' type='text' value='<%= obj.title %>'></input>
-<input tooltip='delay in seconds' class='seconds span12' height='1em' type='text' value='<%= obj3 %>'></input>
-<input height='1em' class=' span12' name="content" value='<%= obj.content %>' />
+
+<input height='1em' class='span12' name="content" value= '<%= obj.content %>' />
+
+<textarea rows="4" height='1em' class='span12' name="content1" >
+
+<%= obj.content %>
+</textarea>
+
+
+<input label='time: ' tooltip='delay in seconds' class='seconds span12' height='1em' type='text' value='<%= obj3 %>'></input>
+
@@ -36,6 +45,5 @@
<a href="/comments#/<%= obj.id %>/destroy" class="destroy">kill</a>
-
</div>
View
3  app/assets/javascripts/backbone/views/comments/comment_view.js.coffee
@@ -60,7 +60,8 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View
comment = @model.toJSON()
status = @status.toString()
seconds = @seconds.toString()
-
+
+ console.log(comment)
tmp = @template(
'obj': comment
'listed2': listed2
View
4 app/assets/javascripts/backbone/views/posts/index_view.js.coffee~
@@ -9,13 +9,13 @@ class RailsBackboneRelational.Views.Posts.IndexView extends Backbone.View
addAll: () =>
@view = new RailsBackboneRelational.Views.Posts.NewView(collection: @options.posts)
$("#new_post").html(@view.render().el)
- @options.posts.each(@addOne)
+ #@options.posts.each(@addOne)
addOne: (post) =>
comments1 = post.get('comments')
num = comments1.length
-
+
view = new RailsBackboneRelational.Views.Posts.PostView({model : post})
@$("#posts-list").prepend(view.render().el)
View
5 app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -16,9 +16,12 @@ padding-top: 1em;
*vertical-align:top;
*/
text-align:left;
-height: 100%;
+
+}
+.span1{
+
}
tr {
/*
Please sign in to comment.
Something went wrong with that request. Please try again.