Skip to content

Commit

Permalink
Homepage content now output as html, editor now a wysiwyg text editor
Browse files Browse the repository at this point in the history
  • Loading branch information
NTCoding committed May 27, 2012
1 parent 0108434 commit 1d420a2
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
Binary file modified FubuRaven.NTCoding.sln.docstates.suo
Binary file not shown.
Binary file modified FubuRaven.NTCoding.suo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/app/Web/Endpoints/Homepage.spark
Expand Up @@ -7,7 +7,7 @@
<h1>Welcome to NTCoding</h1>
<br />
<div>
${Model.HomepageContent}
${this.DisplayFor(m => m.HomepageContent_Html)}
</div>

<div id="recentBlogEntries">
Expand Down
10 changes: 5 additions & 5 deletions src/app/Web/Endpoints/HomepageModels/HomepageViewModel.cs
Expand Up @@ -12,13 +12,13 @@ public class HomepageViewModel
{
public HomepageViewModel(string homepageContent, IEnumerable<BlogPostDTO> recentBlogEntries, IEnumerable<TweetDTO> tweets, IEnumerable<Book> books)
{
HomepageContent = homepageContent;
BlogPosts = recentBlogEntries.Select(x => new BlogPostDisplayModel(x));
Tweets = tweets;
Books = books.Select(b => new BookListView(b));
HomepageContent_Html = homepageContent;
BlogPosts = recentBlogEntries.Select(x => new BlogPostDisplayModel(x));
Tweets = tweets;
Books = books.Select(b => new BookListView(b));
}

public String HomepageContent { get; set; }
public String HomepageContent_Html { get; set; }

public IEnumerable<BlogPostDisplayModel> BlogPosts { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions src/app/Web/Endpoints/SiteManagement/HomepageContent.spark
Expand Up @@ -5,8 +5,8 @@
<div>
<ValidationErrors />
<form method="post" action="${this.Urls.UrlFor(new HomepageContentInputModel())}">
${this.LabelFor(m => m.HomepageContent)}
${this.InputFor(m => m.HomepageContent)}
${this.LabelFor(m => m.HomepageContent_BigText)}
${this.InputFor(m => m.HomepageContent_BigText)}
<input type="submit" value="Update" />
</form>
</div>
Expand Up @@ -19,14 +19,14 @@ public HomepageContentEndpoint(IHomepageContentProvider homepageContentProvider)

public FubuContinuation Post(HomepageContentInputModel model)
{
_homepageContentProvider.SetHomepageContent(model.HomepageContent);
_homepageContentProvider.SetHomepageContent(model.HomepageContent_BigText);

return FubuContinuation.RedirectTo<Endpoints.IndexEndpoint>(e => e.Get(new HomepageLinkModel()));
}

public HomepageContentViewModel Get(HomepageContentLinkModel model)
{
return new HomepageContentViewModel {HomepageContent = _homepageContentProvider.GetHomepageContent()};
return new HomepageContentViewModel {HomepageContent_BigText = _homepageContentProvider.GetHomepageContent()};
}
}
}
Expand Up @@ -6,6 +6,6 @@ namespace Web.Endpoints.SiteManagement.HomepageContentModels
public class HomepageContentInputModel
{
[Required]
public String HomepageContent { get; set; }
public String HomepageContent_BigText { get; set; }
}
}
6 changes: 3 additions & 3 deletions src/tests/Web.Tests/Homepage/HomepageContentEndpointTests.cs
Expand Up @@ -32,15 +32,15 @@ public void Get_ModelShouldContainCurrentHomepageContent()

var result = _endpoint.Get(new HomepageContentLinkModel());

Assert.AreEqual(content, result.HomepageContent);
Assert.AreEqual(content, result.HomepageContent_BigText);
}

[Test]
public void Post_GivenNewHomepageContent_ShouldSetTheSitesHomepageContent()
{
var newContent = "Welcome - Show some love for Fubu and Ravennnnnnn";

var model = new HomepageContentInputModel {HomepageContent = newContent};
var model = new HomepageContentInputModel {HomepageContent_BigText = newContent};

_endpoint.Post(model);

Expand All @@ -50,7 +50,7 @@ public void Post_GivenNewHomepageContent_ShouldSetTheSitesHomepageContent()
[Test]
public void Post_ShouldRedirectToHomepage()
{
var model = new HomepageContentInputModel {HomepageContent = "Doesn't matter about me"};
var model = new HomepageContentInputModel {HomepageContent_BigText = "Doesn't matter about me"};

var result = _endpoint.Post(model);

Expand Down
2 changes: 1 addition & 1 deletion src/tests/Web.Tests/Homepage/IndexEndpointTests.cs
Expand Up @@ -54,7 +54,7 @@ public void Get_ShouldReturnViewModelWithHomepageContentOn()

var result = endpoint.Get(new HomepageLinkModel());

Assert.AreEqual(content, result.HomepageContent);
Assert.AreEqual(content, result.HomepageContent_Html);
}

[Test]
Expand Down

0 comments on commit 1d420a2

Please sign in to comment.