notazof
/
yavsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixes 

* Makefile: my deploy config

* NpgsqlMembershipProvider.cs: Fixes a Bug introduced by Npgsql driver
  upgrade

* ResultPages.cs: .

* style.css: other colors

* BlogsController.cs: code cleaning

* GoogleController.cs: refactoring

* ErrorHtmlFormatter.cs: MarkdownDeep calls now come from yavscModel

* YavscHelpers.cs: xmldoc

* Index.aspx: code formatting

* UserPosts.aspx: nothing to note

* Web.csproj: MarkdownHelper has gone to the yavscModel project

* MarkdownHelper.cs:
* BlogEntryCollection.cs: refactoring + extract an intro from Markdown
  for PostInfo*

* YavscModel.csproj: MarkdownHelper integration
main
Paul Schneider 10 years ago
parent bdae927f67
commit ce1689df7b
19 changed files with 193 additions and 129 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape Escape View File

@ -1,3 +1,7 @@
2015-10-04 Paul Schneider <paul@pschneider.fr>
* Makefile: my deploy config
2015-08-20 Paul Schneider <paul@pschneider.fr> 2015-08-20 Paul Schneider <paul@pschneider.fr>
* Yavsc.sln: Adds the `Presta` project * Yavsc.sln: Adds the `Presta` project

27
Makefile
Unescape Escape View File

@ -4,17 +4,17 @@ CONFIG=Debug
LDYDESTDIR=build/web/$(CONFIG) LDYDESTDIR=build/web/$(CONFIG)
COPYUNCHANGED="false" COPYUNCHANGED="false"
HOST_rsync_local=localhost HOST_rsync_yavsc=lua.pschneider.fr
DESTDIR_rsync_local=/srv/www/yavsc DESTDIR_rsync_yavsc=/srv/www/yavsc
HOST_rsync_test=localhost HOST_rsync_lua=lua.pschneider.fr
DESTDIR_rsync_test=/srv/www/lua DESTDIR_rsync_lua=/srv/www/lua
HOST_rsync_pre=lua.localdomain HOST_rsync_pre=lua.pschneider.fr
DESTDIR_rsync_pre=/srv/www/yavsc DESTDIR_rsync_pre=/srv/www/yavscpre
HOST_rsync_prod=lua.localdomain HOST_rsync_prod=lua.pschneider.fr
DESTDIR_rsync_prod=/srv/www/lua DESTDIR_rsync_prod=/srv/www/yavsc
DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll
@ -38,7 +38,6 @@ rsync_% : DESTDIR = $(DESTDIR_$@)
rsync_% : deploy rsync_% : deploy
echo "!Deploying to $(HOST)!" echo "!Deploying to $(HOST)!"
$(RSYNCCMD) build/web/$(CONFIG)/ root@$(HOST):$(DESTDIR) $(RSYNCCMD) build/web/$(CONFIG)/ root@$(HOST):$(DESTDIR)
ssh root@$(HOST) apachectl restart
build: build:
xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln
@ -46,6 +45,8 @@ build:
clean: clean:
xbuild /t:Clean xbuild /t:Clean
find -name "StyleCop.Cache" -exec rm {} \; find -name "StyleCop.Cache" -exec rm {} \;
distclean: clean
rm -rf $(LDYDESTDIR) rm -rf $(LDYDESTDIR)
sourcepkg: sourcepkg:
@ -63,14 +64,10 @@ htmldoc: xmldoc
docdeploy-prod: htmldoc docdeploy-prod: htmldoc
rsync -ravu web/htmldoc root@$(PRODHOSTDIR) rsync -ravu web/htmldoc root@$(PRODHOSTDIR)
rsync_local: rsync_lua:
rsync_test: rsync_yavsc:
rsync_pre: rsync_pre:
rsync_prod: rsync_prod:
bigrsync: rsync_test rsync_local rsync_pre rsync_prod

5
NpgsqlMRPProviders/ChangeLog
Unescape Escape View File

@ -1,3 +1,8 @@
2015-10-04 Paul Schneider <paul@pschneider.fr>
* NpgsqlMembershipProvider.cs: Fixes a Bug introduced by
Npgsql driver upgrade
2015-08-04 Paul Schneider <paul@pschneider.fr> 2015-08-04 Paul Schneider <paul@pschneider.fr>
* NpgsqlMRPProviders.csproj: new NpgsqlUserName provider * NpgsqlMRPProviders.csproj: new NpgsqlUserName provider

5
NpgsqlMRPProviders/NpgsqlMembershipProvider.cs
Unescape Escape View File

@ -358,7 +358,10 @@ namespace Npgsql.Web
} }
MembershipUser u = GetUser (username, false); MembershipUser u = GetUser (username, false);
if (passwordQuestion == null)
passwordQuestion = "";
if (passwordAnswer == null)
passwordAnswer = "";
if (u == null) { if (u == null) {
DateTime createDate = DateTime.Now; DateTime createDate = DateTime.Now;

4
WebControls/ChangeLog
Unescape Escape View File

@ -1,3 +1,7 @@
2015-10-04 Paul Schneider <paul@pschneider.fr>
* ResultPages.cs: .
2015-09-23 Paul Schneider <paul@pschneider.fr> 2015-09-23 Paul Schneider <paul@pschneider.fr>
* InputUserName.cs: formatting * InputUserName.cs: formatting

47
WebControls/ResultPages.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using System.Security.Permissions;
using System.Web.UI; using System.Web.UI;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using System.ComponentModel; using System.ComponentModel;
using System.Collections;
namespace Yavsc.WebControls namespace Yavsc.WebControls
{ {
@ -29,19 +30,16 @@ namespace Yavsc.WebControls
} }
/// <summary> /// <summary>
/// Gets or sets the results per page. /// Gets or sets the results per page.
/// </summary> /// </summary>
/// <value>The results per page.</value> /// <value>The results per page.</value>
[Bindable (true)] public int PageSize {
[DefaultValue(10)]
public int ResultsPerPage {
get { get {
return (int)( ViewState["ResultsPerPage"]==null?10:ViewState["ResultsPerPage"]); return (int)( ViewState["PageSize"]==null?10:ViewState["PageSize"]);
} }
set { set {
ViewState["ResultsPerPage"]=value; ViewState["PageSize"]=value;
} }
} }
@ -50,11 +48,8 @@ namespace Yavsc.WebControls
/// Gets or sets the result count. /// Gets or sets the result count.
/// </summary> /// </summary>
/// <value>The result count.</value> /// <value>The result count.</value>
[Bindable (true)]
[DefaultValue(0)]
public int ResultCount { public int ResultCount {
get { get {
return (int)( ViewState["ResultCount"]==null?0:ViewState["ResultCount"]); return (int)( ViewState["ResultCount"]==null?0:ViewState["ResultCount"]);
} }
set { set {
@ -66,7 +61,6 @@ namespace Yavsc.WebControls
/// Gets or sets the text. /// Gets or sets the text.
/// </summary> /// </summary>
/// <value>The text.</value> /// <value>The text.</value>
[Bindable (true)]
[DefaultValue("Pages:")] [DefaultValue("Pages:")]
[Localizable(true)] [Localizable(true)]
public string Text { public string Text {
@ -85,25 +79,27 @@ namespace Yavsc.WebControls
/// </summary> /// </summary>
/// <value>The action.</value> /// <value>The action.</value>
[Bindable (true)] [Bindable (true)]
[DefaultValue("")] [DefaultValue("?pageIndex=")]
public string Action { public string Action {
get { get {
string s = (string)ViewState["Action"]; string s = (string)ViewState["Action"];
return (s == null) ? String.Empty : s; return (s == null) ? "?pageIndex=" : s;
} }
set { set {
ViewState["Action"] = value; ViewState["Action"] = value;
} }
} }
/// <summary>
/// Gets or sets the none.
/// </summary>
/// <value>The none.</value>
[Bindable (true)] [Bindable (true)]
[DefaultValue("none")] [DefaultValue("none")]
public string None { public string None {
get { get {
return (string) ViewState["None"];
string s = (string) ViewState["None"];
return (s == null) ? String.Empty : s;
} }
set { set {
ViewState["None"] = value; ViewState["None"] = value;
@ -116,41 +112,42 @@ namespace Yavsc.WebControls
/// <value>The current page.</value> /// <value>The current page.</value>
[Bindable (true)] [Bindable (true)]
[DefaultValue(0)] [DefaultValue(0)]
public int CurrentPage { public int PageIndex {
get { get {
int i = (int)(ViewState["CurrentPage"]==null?0:ViewState["CurrentPage"]); int i = (int)(ViewState["PageIndex"]==null?0:ViewState["PageIndex"]);
return i; return i;
} }
set { set {
ViewState["CurrentPage"] = value; ViewState["PageIndex"] = value;
} }
} }
/// <summary> /// <summary>
/// Renders the contents as the list of links to pages of results. /// Renders the contents as the list of links to pages of results.
/// </summary> /// </summary>
/// <param name="writer">Writer.</param> /// <param name="writer">Writer.</param>
protected override void RenderContents (HtmlTextWriter writer) protected override void RenderContents (HtmlTextWriter writer)
{ {
if (ResultCount > 0 && ResultCount > ResultsPerPage ) { if (ResultCount > 0 && ResultCount > PageSize ) {
writer.WriteEncodedText (Text); writer.WriteEncodedText (Text);
int pageCount = ((ResultCount-1) / ResultsPerPage) + 1; int pageCount = ((ResultCount-1) / PageSize) + 1;
for (int pi = (CurrentPage < 5) ? 0 : CurrentPage - 5; pi < pageCount && pi < CurrentPage + 5; pi++) { if ( pageCount > 1 ) {
if (CurrentPage == pi) for (int pi = (PageIndex < 5) ? 0 : PageIndex - 5; pi < pageCount && pi < PageIndex + 5; pi++) {
if (PageIndex == pi)
writer.RenderBeginTag ("b"); writer.RenderBeginTag ("b");
else { else {
writer.AddAttribute (HtmlTextWriterAttribute.Href, writer.AddAttribute (HtmlTextWriterAttribute.Href,
string.Format (Action, pi)); string.Format (Action, pi));
writer.RenderBeginTag ("a"); writer.RenderBeginTag ("a");
} }
writer.Write (pi+1); writer.Write (pi + 1);
writer.RenderEndTag (); writer.RenderEndTag ();
writer.Write ("&nbsp;"); writer.Write ("&nbsp;");
} }
} }
}
if (ResultCount == 0) { if (ResultCount == 0) {
writer.Write ("(");
writer.Write (None); writer.Write (None);
writer.Write (")");
} }
} }

24
web/App_Themes/style.css
Unescape Escape View File

@ -4,7 +4,7 @@ body {
background-color: black; background-color: black;
color: #D0FFD0; color: #D0FFD0;
font-family: 'Arial', cursive; font-family: 'Arial', cursive;
padding: 0em; padding: 2em;
} }
.iconsmall { max-height: 1.3em; max-width: 1.3em; } .iconsmall { max-height: 1.3em; max-width: 1.3em; }
@ -88,7 +88,7 @@ aside {
max-width: 40em; max-width: 40em;
padding: .5em; padding: .5em;
margin: .5em; margin: .5em;
background-color: rgba(32,32,64,0.8); background-color: rgba(32,32,32,0.8);
border-radius:10px; border-radius:10px;
} }
.postpreview video, .postpreview img { .postpreview video, .postpreview img {
@ -99,11 +99,11 @@ aside {
display:block; display:block;
margin:1em; margin:1em;
padding:1em; padding:1em;
background-color: rgba(32,32,64,0.8); background-color: rgba(32,32,32,0.8);
color: #aaa; color: #aaa;
border-radius:10px; border-radius:10px;
} }
.hiddenpost { background-color: rgba(16,16,0,0.3); } .hiddenpost { background-color: rgba(16,16,16,0.5); }
.fullwidth { width: 100%; } .fullwidth { width: 100%; }
textarea.fullwidth { min-height:10em; } textarea.fullwidth { min-height:10em; }
@ -117,7 +117,7 @@ textarea.fullwidth { min-height:10em; }
} }
.panel,.bshpanel, aside { .panel,.bshpanel, aside {
background-color: rgba(32,16,16,0.8); background-color: rgba(32,32,16,0.8);
border-radius:5px; border-radius:5px;
margin:.5em; margin:.5em;
padding: .5em; padding: .5em;
@ -139,13 +139,13 @@ content: ")";
a { a {
text-decoration: none; text-decoration: none;
color: #B0B080; color: #B0B080;
background-color:rgba(20,0,20,0.5); background-color:rgba(20,20,20,0.5);
text-decoration: none; text-decoration: none;
} }
.usertitleref { .usertitleref {
color: #B0B080; color: #B0B080;
border-radius: 5px; border-radius: 5px;
background-color:rgba(0,0,32,0.8); background-color:rgba(0,0,32,0.6);
font-family: 'Arial', cursive; font-family: 'Arial', cursive;
padding: 1em; padding: 1em;
} }
@ -161,19 +161,19 @@ label {
.message, #message { .message, #message {
font-size: large; font-size: large;
background-color: rgba(0,64,0,0.1); background-color: rgba(64,64,0,0.5);
} }
.dirty { .dirty {
background-color: rgba(128,128,0,0.3); background-color: rgba(128,128,0,0.5);
} }
.error, #error { .error, #error {
color: #f88; color: #f88;
font-size: large; font-size: large;
background-color: rgba(128,0,0,0.3); background-color: rgba(256,0,0,0.5);
} }
.validation-summary-errors{ .validation-summary-errors{
color: #f88; color: #f88;
background-color: rgba(64,0,0,0.3); background-color: rgba(256,0,0,0.5);
} }
@ -195,7 +195,7 @@ ul.preview li:nth-child(n) {
.actionlink { .actionlink {
color: #B0B080; color: #B0B080;
border-radius: 5px; border-radius: 5px;
background-color:rgba(0,0,32,0.8); background-color:rgba(0,0,32,0.5);
cursor: pointer; cursor: pointer;
font-family: 'Arial', cursive; font-family: 'Arial', cursive;
padding: .2em; padding: .2em;

20
web/ChangeLog
Unescape Escape View File

@ -1,3 +1,23 @@
2015-10-04 Paul Schneider <paul@pschneider.fr>
* style.css: other colors
* BlogsController.cs: code cleaning
* GoogleController.cs: refactoring
* ErrorHtmlFormatter.cs: MarkdownDeep calls now come from
yavscModel
* YavscHelpers.cs: xmldoc
* Index.aspx: code formatting
* UserPosts.aspx: nothing to note
* Web.csproj: MarkdownHelper has gone to the yavscModel
project
2015-10-02 Paul Schneider <paul@pschneider.fr> 2015-10-02 Paul Schneider <paul@pschneider.fr>
* style.css: yauniformisation small & large screens. * style.css: yauniformisation small & large screens.

5
web/Controllers/BlogsController.cs
Unescape Escape View File

@ -82,11 +82,10 @@ namespace Yavsc.Controllers
/// <param name="pageSize">Page size.</param> /// <param name="pageSize">Page size.</param>
public ActionResult BlogList (int pageIndex = 0, int pageSize = 10) public ActionResult BlogList (int pageIndex = 0, int pageSize = 10)
{ {
ViewData ["SiteName"] = sitename;
int totalRecords; int totalRecords;
var bs = BlogManager.LastPosts (pageIndex, pageSize, out totalRecords); var bs = BlogManager.LastPosts (pageIndex, pageSize, out totalRecords);
ViewData ["RecordCount"] = totalRecords; ViewData ["ResultCount"] = totalRecords;
ViewData ["pageSize"] = pageSize; ViewData ["PageSize"] = pageSize;
ViewData ["PageIndex"] = pageIndex; ViewData ["PageIndex"] = pageIndex;
return View ("Index", new BlogEntryCollection(bs) ); return View ("Index", new BlogEntryCollection(bs) );
} }

2
web/Controllers/GoogleController.cs
Unescape Escape View File

@ -212,7 +212,7 @@ namespace Yavsc.Controllers
HttpContext.Profile.SetPropertyValue ("Name", me.displayName); HttpContext.Profile.SetPropertyValue ("Name", me.displayName);
// TODO use image // TODO use image
if (me.image != null) { if (me.image != null) {
HttpContext.Profile.SetPropertyValue ("avatar", me.image.url); HttpContext.Profile.SetPropertyValue ("Avatar", me.image.url);
} }
if (me.placesLived != null) { if (me.placesLived != null) {
People.Place pplace = me.placesLived.Where (x => x.primary).First (); People.Place pplace = me.placesLived.Where (x => x.primary).First ();

1
web/Formatters/ErrorHtmlFormatter.cs
Unescape Escape View File

@ -29,6 +29,7 @@ using System.Web.Mvc;
using System.Net; using System.Net;
using MarkdownDeep; using MarkdownDeep;
using Yavsc.Helpers; using Yavsc.Helpers;
using Yavsc.Model.Blogs;
namespace Yavsc.Formatters namespace Yavsc.Formatters
{ {

14
web/Helpers/YavscHelpers.cs
Unescape Escape View File

@ -163,13 +163,17 @@ namespace Yavsc.Helpers
foreach (MembershipUser u in users) foreach (MembershipUser u in users)
YavscHelpers.SendActivationMessage (u); YavscHelpers.SendActivationMessage (u);
} }
/// <summary>
/// Avatars the URL.
/// </summary>
/// <returns>The URL.</returns>
/// <param name="helper">Helper.</param>
/// <param name="username">Username.</param>
public static string AvatarUrl (this HtmlHelper helper, string username) { public static string AvatarUrl (this HtmlHelper helper, string username) {
ProfileBase pr = ProfileBase.Create (username); ProfileBase pr = ProfileBase.Create (username);
string avpath = (string ) pr.GetPropertyValue("Avatar") ; var a = pr.GetPropertyValue("Avatar") ;
if (avpath != null) if (a == null || a is DBNull) return "/avatars/" + helper.Encode(username)+".png";
return helper.Encode (avpath); return helper.Encode ((string)a);
return "/avatars/" + helper.Encode(username)+".png";
} }
} }
} }

19
web/Views/Blogs/Index.aspx
Unescape Escape View File

@ -10,7 +10,7 @@
<div class="postpreview"> <div class="postpreview">
<%= Html.ActionLink(p.Title, "UserPost", <%= Html.ActionLink(p.Title, "UserPost",
new { user = g.Key, title = p.Title }, new { @class = "usertitleref" } ) %> new { user = g.Key, title = p.Title }, new { @class = "usertitleref" } ) %>
<p><%= Html.Markdown(p.Intro,"/bfiles/"+p.Id+"/") %></p>
<aside> <aside>
(Posté le <%=p.Posted.ToString("D") %>) (Posté le <%=p.Posted.ToString("D") %>)
@ -24,14 +24,15 @@
</div> <% } %> </div> <% } %>
<% } %> <% } %>
</div> </div>
<form runat="server" id="form1" method="GET">
<form runat="server" id="form1" method="GET"> <% rp1.ResultCount = (int) ViewData["ResultCount"];
<% rp1.ResultCount = Model.Count; rp1.ResultsPerPage = 50; %> rp1.PageSize = (int) ViewData ["PageSize"];
<% rp1.CurrentPage = (int) ViewData["PageIndex"]; %> rp1.PageIndex = (int) ViewData["PageIndex"];
<% rp1.None = Html.Translate("no content"); %> rp1.None = Html.Translate("no content");
<yavsc:ResultPages id="rp1" Action = "?pageIndex={0}" runat="server" > %>
<yavsc:ResultPages id="rp1" runat="server" >
<None>Aucun résultat</None>
</yavsc:ResultPages> </yavsc:ResultPages>
</form>
</form>
</asp:Content> </asp:Content>

17
web/Views/Blogs/UserPosts.aspx
Unescape Escape View File

@ -33,22 +33,19 @@
<%= Html.ActionLink("Editer","Edit", new { id = e.Id }, new { @class="actionlink" }) %> <%= Html.ActionLink("Editer","Edit", new { id = e.Id }, new { @class="actionlink" }) %>
<%= Html.ActionLink("Supprimer","RemovePost", new { id = e.Id }, new { @class="actionlink" } ) %> <%= Html.ActionLink("Supprimer","RemovePost", new { id = e.Id }, new { @class="actionlink" } ) %>
<% } %> <% } %>
</aside>
</aside>
</div> </div>
<% } %> <% } %>
<aside>
<form runat="server" id="form1" method="GET"> <form runat="server" id="form1" method="GET">
<% <%
rp1.ResultCount = (int) ViewData["RecordCount"]; rp1.ResultCount = (int) ViewData["RecordCount"];
rp1.CurrentPage = (int) ViewData["PageIndex"]; rp1.PageIndex = (int) ViewData["PageIndex"];
user.Value = (string) ViewData["BlogUser"]; %><yavsc:ResultPages id="rp1" Action = "?pageIndex={0}" runat="server"></yavsc:ResultPages>
%>
<aside>
<yavsc:ResultPages id="rp1" Action = "?pageIndex={0}" runat="server"></yavsc:ResultPages>
</aside>
<asp:HiddenField id="user" runat="server"></asp:HiddenField>
</form> </form>
</aside>
</asp:Content> </asp:Content>

1
web/Web.csproj
Unescape Escape View File

@ -188,7 +188,6 @@
<Compile Include="IValueProvider.cs" /> <Compile Include="IValueProvider.cs" />
<Compile Include="Formatters\EstimToPdfFormatter.MSAN.cs" /> <Compile Include="Formatters\EstimToPdfFormatter.MSAN.cs" />
<Compile Include="Helpers\TemplateException.cs" /> <Compile Include="Helpers\TemplateException.cs" />
<Compile Include="Helpers\MarkdownHelper.cs" />
<Compile Include="Formatters\FormatterException.cs" /> <Compile Include="Formatters\FormatterException.cs" />
<Compile Include="NUnitTestClass.cs" /> <Compile Include="NUnitTestClass.cs" />
<Compile Include="TestExec.cs" /> <Compile Include="TestExec.cs" />

41
yavscModel/Blogs/BlogEntryCollection.cs
Unescape Escape View File

@ -56,15 +56,11 @@ namespace Yavsc.Model.Blogs
{ {
return this.Where (x => x.Title == title).ToArray (); return this.Where (x => x.Title == title).ToArray ();
} }
/// <summary>
/// Post info.
/// </summary>
public struct PostInfoByTitle {
/// <summary> /// <summary>
/// The name of the user. /// Base post info.
/// </summary> /// </summary>
public string Author; public class BasePostInfo {
/// <summary> /// <summary>
/// The identifier. /// The identifier.
/// </summary> /// </summary>
@ -78,29 +74,32 @@ namespace Yavsc.Model.Blogs
/// </summary> /// </summary>
public DateTime Modified; public DateTime Modified;
}
/// <summary> /// <summary>
/// Post info by user. /// The intro.
/// </summary> /// </summary>
public struct PostInfoByUser { public string Intro;
}
/// <summary> /// <summary>
/// The name of the user. /// Post info.
/// </summary> /// </summary>
public string Title; public class PostInfoByTitle : BasePostInfo {
/// <summary> /// <summary>
/// The identifier. /// The name of the user.
/// </summary> /// </summary>
public long Id; public string Author;
}
/// <summary> /// <summary>
/// The posted. /// Post info by user.
/// </summary> /// </summary>
public DateTime Posted; public class PostInfoByUser : BasePostInfo {
/// <summary> /// <summary>
/// The modified. /// The name of the user.
/// </summary> /// </summary>
public DateTime Modified; public string Title;
} }
/// <summary> /// <summary>
@ -108,11 +107,12 @@ namespace Yavsc.Model.Blogs
/// </summary> /// </summary>
public IEnumerable<IGrouping<string,PostInfoByTitle>> GroupByTitle() public IEnumerable<IGrouping<string,PostInfoByTitle>> GroupByTitle()
{ {
bool truncated;
return from be in this return from be in this
orderby be.Posted descending orderby be.Posted descending
group group
new PostInfoByTitle { Author=be.Author, Id=be.Id, new PostInfoByTitle { Author=be.Author, Id=be.Id,
Posted=be.Posted, Modified=be.Modified } Posted=be.Posted, Modified=be.Modified, Intro = MarkdownHelper.MarkdownIntro(be.Content, out truncated) }
by be.Title by be.Title
into titlegroup into titlegroup
select titlegroup; select titlegroup;
@ -123,11 +123,12 @@ namespace Yavsc.Model.Blogs
/// <returns>The by user.</returns> /// <returns>The by user.</returns>
public IEnumerable<IGrouping<string,PostInfoByUser>> GroupByUser() public IEnumerable<IGrouping<string,PostInfoByUser>> GroupByUser()
{ {
bool truncated;
return from be in this return from be in this
orderby be.Posted descending orderby be.Posted descending
group group
new PostInfoByUser { Title=be.Title, Id=be.Id, new PostInfoByUser { Title=be.Title, Id=be.Id,
Posted=be.Posted, Modified=be.Modified } Posted=be.Posted, Modified=be.Modified, Intro = MarkdownHelper.MarkdownIntro(be.Content, out truncated) }
by be.Author by be.Author
into usergroup into usergroup
select usergroup; select usergroup;

46
web/Helpers/MarkdownHelper.cs → yavscModel/Blogs/MarkdownHelper.cs
Unescape Escape View File

@ -2,7 +2,7 @@
using System.Web.Mvc; using System.Web.Mvc;
using MarkdownDeep; using MarkdownDeep;
namespace Yavsc.Helpers namespace Yavsc.Model.Blogs
{ {
/// <summary> /// <summary>
/// Helper class for transforming Markdown. /// Helper class for transforming Markdown.
@ -44,27 +44,47 @@ namespace Yavsc.Helpers
return new MvcHtmlString(html); return new MvcHtmlString(html);
} }
public static IHtmlString MarkdownToHtmlIntro(this HtmlHelper helper, out bool truncated, string text, string urlBaseLocation="") public static string MarkdownIntro(string markdown, out bool truncated) {
{
int maxLen = 250; int maxLen = 250;
// Transform the supplied text (Markdown) into HTML. if (markdown.Length < maxLen) {
var markdownTransformer = new Markdown();
markdownTransformer.ExtraMode = true;
markdownTransformer.UrlBaseLocation = urlBaseLocation;
if (text.Length < maxLen) {
truncated = false; truncated = false;
return new MvcHtmlString(markdownTransformer.Transform(text)); return markdown;
} }
string intro = text.Remove (maxLen); string intro = markdown.Remove (maxLen);
truncated = true; truncated = true;
int inl = intro.LastIndexOf ("\n"); int inl = intro.LastIndexOf ("\n");
if (inl > 20) if (inl > 20)
intro = intro.Remove (inl); intro = intro.Remove (inl);
intro += " ..."; intro += " ...";
return intro;
string html = markdownTransformer.Transform(intro); }
/// <summary>
/// Markdowns to html intro.
/// </summary>
/// <returns>The to html intro.</returns>
/// <param name="truncated">Truncated.</param>
/// <param name="text">Text.</param>
/// <param name="urlBaseLocation">URL base location.</param>
public static string MarkdownToHtmlIntro(out bool truncated, string text, string urlBaseLocation="") {
var md = MarkdownIntro(text, out truncated);
var markdownTransformer = new Markdown();
markdownTransformer.ExtraMode = true;
markdownTransformer.UrlBaseLocation = urlBaseLocation;
string html = markdownTransformer.Transform(md);
return html;
}
/// <summary>
/// Markdowns to html intro.
/// </summary>
/// <returns>The to html intro.</returns>
/// <param name="helper">Helper.</param>
/// <param name="truncated">Truncated.</param>
/// <param name="text">Text.</param>
/// <param name="urlBaseLocation">URL base location.</param>
public static IHtmlString MarkdownToHtmlIntro(this HtmlHelper helper, out bool truncated, string text, string urlBaseLocation="")
{
// Wrap the html in an MvcHtmlString otherwise it'll be HtmlEncoded and displayed to the user as HTML :( // Wrap the html in an MvcHtmlString otherwise it'll be HtmlEncoded and displayed to the user as HTML :(
return new MvcHtmlString(html); return new MvcHtmlString(MarkdownToHtmlIntro (out truncated, text, urlBaseLocation));
} }
/// <summary> /// <summary>

8
yavscModel/ChangeLog
Unescape Escape View File

@ -1,3 +1,11 @@
2015-10-04 Paul Schneider <paul@pschneider.fr>
* MarkdownHelper.cs:
* BlogEntryCollection.cs: refactoring + extract an intro from
Markdown for PostInfo*
* YavscModel.csproj: MarkdownHelper integration
2015-10-01 Paul Schneider <paul@pschneider.fr> 2015-10-01 Paul Schneider <paul@pschneider.fr>
* Profile.cs: refactoring * Profile.cs: refactoring

4
yavscModel/YavscModel.csproj
Unescape Escape View File

@ -41,6 +41,9 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting" /> <Reference Include="System.Net.Http.Formatting" />
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />
<Reference Include="MarkdownDeep">
<HintPath>..\web\lib\MarkdownDeep.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
@ -167,6 +170,7 @@
<Compile Include="RolesAndMembers\ChangeUserNameProvider.cs" /> <Compile Include="RolesAndMembers\ChangeUserNameProvider.cs" />
<Compile Include="RolesAndMembers\UserManager.cs" /> <Compile Include="RolesAndMembers\UserManager.cs" />
<Compile Include="Circles\CircleBase.cs" /> <Compile Include="Circles\CircleBase.cs" />
<Compile Include="Blogs\MarkdownHelper.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>

Write Preview
Loading…