Skip to content
Snippets Groups Projects
Commit ab35f2bf authored by Dennis Collinson's avatar Dennis Collinson
Browse files

MS DC posts/new page init

parent f5fdb8ad
No related branches found
No related tags found
No related merge requests found
Showing
with 83 additions and 4 deletions
......@@ -8,11 +8,17 @@ class PostsController < ApplicationController
before_filter :authenticate_user!, :except => :show
before_filter :set_format_if_malformed_from_status_net, :only => :show
layout 'post'
respond_to :html,
:mobile,
:json,
:xml
def new
render :text => "", :layout => true
end
def show
key = params[:id].to_s.length <= 8 ? :id : :guid
......@@ -34,7 +40,7 @@ class PostsController < ApplicationController
format.xml{ render :xml => @post.to_diaspora_xml }
format.mobile{render 'posts/show.mobile.haml'}
format.json{ render :json => PostPresenter.new(@post, current_user).to_json }
format.any{render 'posts/show.html.haml', :layout => 'layouts/post'}
format.any{render 'posts/show.html.haml'}
end
else
......
......@@ -50,5 +50,6 @@
%body
= flash_messages
#container
= yield
......@@ -4,5 +4,3 @@
- content_for :page_title do
= post_page_title @post
#container
......@@ -8,7 +8,7 @@ Diaspora::Application.routes.draw do
resources :status_messages, :only => [:new, :create]
resources :posts, :only => [:show, :destroy] do
resources :posts, :only => [:show, :new, :destroy] do
resources :likes, :only => [:create, :destroy, :index]
resources :participations, :only => [:create, :destroy, :index]
resources :comments, :only => [:new, :create, :destroy, :index]
......
When /^I trumpet$/ do
visit new_post_path
end
When /^I write "([^"]*)"$/ do |text|
fill_in :text, :with => text
end
@javascript
Feature: Creating a new post
Background:
Given a user with username "bob"
And I sign in as "bob@bob.bob"
Scenario: Posting a public message
When I trumpet
And I write "Rectangles are awesome"
And I press "Share"
# When I go to the stream page
# Then I should see "Rectangles are awesome" as the first post in my stream
app.pages.PostNew = app.views.Base.extend({
templateName : "post-new",
subviews : { "#new-post" : "postForm"},
initialize : function(){
console.log("In the page")
this.model = new app.models.Post()
this.postForm = new app.views.PostForm({model : this.model})
}
})
......@@ -16,6 +16,7 @@ app.Router = Backbone.Router.extend({
"followed_tags": "stream",
"tags/:name": "stream",
"posts/new" : "newPost",
"posts/:id": "singlePost",
"p/:id": "singlePost"
},
......@@ -38,6 +39,11 @@ app.Router = Backbone.Router.extend({
$("#main_stream").html(app.page.el);
},
newPost : function(){
var page = new app.pages.PostNew();
$("#container").html(page.render().el)
},
singlePost : function(id) {
var page = new app.pages.PostViewer({ id: id });
$("#container").html(page.el);
......
<form class="new-post">
<label>text<textarea class="text"/></label>
<input type="submit" value="Share" class="btn-primary"></input>
</form>
<div id="new-post"></div>
\ No newline at end of file
app.views.PostForm = app.views.Base.extend({
templateName : "post-form",
initialize : function(){
console.log("In the form")
},
postRenderTemplate: function(){
console.log("I'm getting rendered")
}
});
\ No newline at end of file
describe("app.pages.PostNew", function(){
beforeEach(function(){
this.page = new app.pages.PostNew()
})
it("renders", function(){
this.page.render();
})
});
\ No newline at end of file
describe("app.views.PostForm", function(){
beforeEach(function(){
this.post = new app.models.Post();
this.view = new app.views.PostForm({model : this.post})
})
it("renders", function(){
this.view.render()
})
})
\ No newline at end of file
......@@ -53,6 +53,7 @@ src_files:
- public/javascripts/app/views/content_view.js
- public/javascripts/app/views/*.js
- public/javascripts/app/views/**/*.js
- public/javascripts/app/pages/**/*.js
- public/javascripts/mobile.js
- public/javascripts/contact-list.js
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment