Merge from booking branch

2015-11-17 22:22:59 +01:00 · 2015-11-17 22:22:59 +01:00 · 9a2652739b
commit 9a2652739b
parent 25906d0227
266 changed files with 12833 additions and 2337 deletions
--- a/booking/Views/Blogs/ChooseMedia.aspx
+++ b/booking/Views/Blogs/ChooseMedia.aspx
@ -0,0 +1,14 @@
+<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %>
+<asp:Content ID="initContent" ContentPlaceHolderID="init" runat="server">
+</asp:Content>
+<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
+</asp:Content>
+<asp:Content ID="overHeaderOneContent" ContentPlaceHolderID="overHeaderOne" runat="server">
+</asp:Content>
+<asp:Content ID="headerContent" ContentPlaceHolderID="header" runat="server">
+</asp:Content>
+<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
+kjgftkgt
+</asp:Content>
+<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
+</asp:Content>
--- a/booking/Views/Blogs/Edit.aspx
+++ b/booking/Views/Blogs/Edit.aspx
@ -0,0 +1,243 @@
+<%@ Page Title="Bill_edition" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntry>" MasterPageFile="~/Models/App.master" %>
+<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> 
+<asp:Content ContentPlaceHolderID="head" ID="HeadContent1" runat="server">
+
+<script type="text/javascript" src="<%=Url.Content("~/Scripts/rangy-core.js")%>"></script>
+<script type="text/javascript" src="<%=Url.Content("~/Scripts/rangy-selectionsaverestore.js")%>"></script>
+<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.htmlClean.min.js")%>"></script>
+<script type="text/javascript" src="<%=Url.Content("~/Scripts/hallo.js")%>"></script>
+<script type="text/javascript" src="<%=Url.Content("~/Scripts/to-markdown.js")%>"></script>
+<script type="text/javascript" src="<%=Url.Content("~/Scripts/showdown.js")%>"></script>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+
+
+<% using(Html.BeginForm("ValidateEdit","Blogs")) { %>
+<fieldset>
+<legend>Contrôle d'accès au Billet</legend>
+<%= Html.LabelFor(model => model.Visible) %> : <%= Html.CheckBox( "Visible" ) %> 
+<i>Note: Si un ou plusieurs cercles sont séléctionnés ici,
+ le billet ne sera visible qu'aux membres de ces cercles.</i>
+<%= Html.ValidationMessage("Visible", "*") %>
+<%= Html.LabelFor(model => model.AllowedCircles) %>
+<%= Html.ListBox("AllowedCircles") %>
+<%= Html.ValidationMessage("AllowedCircles", "*") %>
+</fieldset>
+<span id="viewsource">
+<i class="fa fa-code menuitem"><%=Html.Translate("View_source")%></i></span>
+<span id="hidesource" class="hidden">
+<i class="fa fa-code menuitem"><%=Html.Translate("Hide_source")%></i>
+</span>
+<fieldset id="source" class="hidden">
+<%=Html.Hidden("Author")%>
+<%=Html.Hidden("Id")%>
+<%= Html.LabelFor(model => model.Photo) %>
+<%=Html.TextBox("Photo")%>
+<%=Html.ValidationMessage("Photo")%><br>
+<%= Html.LabelFor(model => model.Title) %>
+<%=Html.TextBox("Title")%>
+<%=Html.ValidationMessage("Title")%><br>
+<%=Html.TextArea("Content")%>
+<%=Html.ValidationMessage("Content")%>
+</fieldset>
+<input type="submit" id="validate" value="Valider" class="fa fa-check menuitem">
+<% } %>
+
+<form id="frmajax">
+<fieldset>
+<legend>Attacher des fichiers</legend>
+<input type="file" name="attached" id="postedfile" multiple>
+<input type="button" value="attacher les ficher" onclick="submitFile()">
+<input type="button" value="importer les documents" onclick="submitImport()">
+</fieldset>
+</form>
+
+<span class="placard editable" for="Photo">
+<img src="<%=Model.Photo%>" alt="photo" id="vphoto" >
+</span>
+<!-- TODO? Model.Photo.(Legend|Date|Location|ref) -->
+<h1 id="vtitle" for="Title" class="editable" ><%=Html.Markdown(Model.Title)%></h1>
+<div id="vcontent" for="Content" class="editable">
+<%=Html.Markdown(Model.Content,"/bfiles/"+Model.Id+"/")%>
+</div>
+<hr><h2>Fichiers attachées</h2> 
+
+<%= Html.FileList("~/bfiles/"+Model.Id) %>
+
+<hr>
+<script>
+
+$(document).ready(function(){
+
+	$('#hidesource').click(function(){
+	$('#source').addClass('hidden');
+	$('#viewsource').removeClass('hidden');
+	$('#hidesource').addClass('hidden');
+	});
+	$('#viewsource').click(function(){
+	$('#source').removeClass('hidden');
+	$('#viewsource').addClass('hidden');
+	$('#hidesource').removeClass('hidden');
+	});
+
+jQuery('.placard').hallo({plugins: {'hallo-image-insert-edit': { lang: 'fr' } } });
+
+jQuery('#vtitle').hallo({
+  plugins: {
+    'halloformat': {},
+      'halloreundo': {}
+  },
+  toolbar: 'halloToolbarFixed',
+  lang: 'fr'
+});
+
+jQuery('#vcontent').hallo({
+  plugins: {
+    'halloformat': {},
+    'halloheadings': {},
+    'hallolists': {},
+    'hallo-image-insert-edit': {
+      lang: 'fr'
+    },
+    'halloreundo': {},
+    'hallocleanhtml': {
+            format: false,
+            allowedTags: [
+                'i',
+                'p',
+                'em',
+                'strong',
+                'br',
+                'ol',
+                'ul',
+                'li',
+                'a',
+                'audio',
+                'video',
+                'img',
+                'table',
+                'tr',
+                'td',
+                'th',
+                'style'
+                ]
+            },
+    'halloblacklist': {tags: ['style']},
+  },
+  toolbar: 'halloToolbarFixed'
+});
+
+var markdownize = function(content) {
+	if (!content) return '';
+    var html = content.split("\n").map($.trim).filter(function(line) { 
+      return line != "";
+    }).join("\n");
+  return toMarkdown(html);
+  };
+
+var converter = new showdown.Converter(),
+    htmlize = function(content) {
+    return converter.makeHtml(content);
+  };
+
+   // Method that converts the HTML contents to Markdown
+var showSource = function(id,content) {
+	if (!content) content = '';
+    var markdown = markdownize(content);
+    if (jQuery('#'+id).val() === markdown) {
+      return;
+    }
+    jQuery('#'+id).val( markdown );
+  };
+
+var updateHtml = function(id,content) {
+  	var jView = jQuery('*[for="'+id+'"]');
+    if (markdownize(jView.html()) === content) {
+      return;
+    }
+    var html = htmlize(content);
+    jView.html(html); 
+  };
+
+  jQuery('.placard').bind('hallomodified', function(event, data) {
+   // TODO get image source from data.content
+      $('#'+this.attributes["for"].value).val(
+       $('#vphoto').attr('src'));
+  });
+
+  // Update Markdown every time content is modified
+  var onMDModified = ( function (event, data) {
+    showSource(this.attributes["for"].value, data.content);
+  });
+  jQuery('#vtitle').bind('hallomodified', onMDModified);
+  jQuery('#vcontent').bind('hallomodified', onMDModified);
+
+  jQuery('#Content').bind('keyup', function() {
+    updateHtml(this.id, this.value);
+  });
+  jQuery('#Title').bind('keyup', function() {
+    updateHtml(this.id, this.value);
+  });
+
+  // showSource("Title",jQuery('#vtitle').html());
+  // showSource("Content",jQuery('#vcontent').html());
+  });
+</script>
+
+	
+<script>
+
+function submitFilesTo(method)
+{
+	var data  = new FormData($('#frmajax').get()[0]);
+	Yavsc.notice('Submitting via '+method);
+	$.ajax({
+	  url: apiBaseUrl+'/Blogs/'+method+'/'+$('#Id').val(),
+	  type: "POST",
+	  data: data,
+	  processData: false, 
+	  contentType: false,
+	  success: function(data) {
+	  $('#Content').val(data+"\n"+$('#Content').val());
+	  Yavsc.notice(false);
+	    },
+	  error: Yavsc.onAjaxError,
+	});
+}
+
+function submitImport()
+{ submitFilesTo('Import'); }
+
+function submitFile()
+{ submitFilesTo('PostFile'); }
+
+function submitBaseDoc()
+{ 
+var data  = new FormData($('#frmajax').get()[0]);
+	Yavsc.notice('Submitting via '+method);
+	$.ajax({
+	  url: apiBaseUrl+'/Blogs/'+method+'/'+$('#Id').val(),
+	  type: "POST",
+	  data: data,
+	  processData: false, 
+	  contentType: false,
+	  success: function(data) {
+	  $('#Content').val(data+"\n"+$('#Content').val());
+	  Yavsc.notice('Posted updated');
+	    },
+	  error: Yavsc.onAjaxError,
+	});
+}
+
+</script>
+
+
+
+<aside>
+	Id:<%= Html.ActionLink( Model.Id.ToString() , "UserPost", new { user= Model.Author, title=Model.Title, id = Model.Id }, new { @class = "usertitleref actionlink" }) %>
+, Posted: <%= Model.Posted.ToString("yyyy/MM/dd") %> - Modified: <%= Model.Modified.ToString("yyyy/MM/dd") %> 
+Visible: <%= Model.Visible? "oui":"non" %> <%= Html.ActionLink("Supprimer","RemovePost", new { user=Model.Author, title = Model.Title, id = Model.Id }, new { @class="actionlink" } ) %>
+</aside>
+
+</asp:Content>
--- a/booking/Views/Blogs/Index.aspx
+++ b/booking/Views/Blogs/Index.aspx
@ -0,0 +1,18 @@
+<%@ Page Title="Articles" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master" EnableTheming="True" StylesheetTheme="dark" %>
+<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> 
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+
+<div>
+<% foreach (var g in Model.GroupByTitle()) { %>
+<div class="panel">
+<h2><a href="<%= Url.RouteUrl("Titles", new { title = g.Key }) %>" class="usertitleref"><%=Html.Encode(g.Key)%></a></h2>
+<% foreach (var p in g) { %> 
+<div class="postpreview">
+ <p><%=  Html.Markdown(p.Intro,"/bfiles/"+p.Id+"/") %></p>
+ <%= Html.Partial("PostActions",p)%>
+</div> <% } %>
+</div>
+ <% } %>
+</div>
+ <%= Html.RenderPageLinks((int)ViewData["PageIndex"],(int)ViewData["PageSize"],(int)ViewData["ResultCount"])%>
+</asp:Content>
--- a/booking/Views/Blogs/NotAuthorized.aspx
+++ b/booking/Views/Blogs/NotAuthorized.aspx
@ -0,0 +1,4 @@
+<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+	Ce contenu est d'accès restreint : &lt;<%= Html.Encode(ViewData["BlogUser"]) %>/<%= Html.Encode(ViewData["PostTitle"]) %>&gt;
+</asp:Content>
--- a/booking/Views/Blogs/PostActions.ascx
+++ b/booking/Views/Blogs/PostActions.ascx
@ -0,0 +1,26 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BasePost>" %>
+<aside>
+(<%= Model.Posted.ToString("D") %>
+	 - <%= Model.Modified.ToString("D") %> <%= Model.Visible? "":", Invisible!" %>)
+	 <% if (Membership.GetUser()!=null) {
+	if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin"))
+	 { %>
+<% if (Model is BlogEntry) { %><%= Html.Partial("TagControl",Model)%>
+<i class="fa fa-pencil"><%=Html.Translate("DoComment")%></i>
+ <aside class="control" class="hidden">
+	 <% using (Html.BeginForm("Comment","Blogs")) { %>
+	 <%=Html.Hidden("Author")%>
+	 <%=Html.Hidden("Title")%>
+	 <%=Html.TextArea("CommentText","")%>
+	 <%=Html.Hidden("PostId",Model.Id)%>
+	 <input type="submit" value="Poster un commentaire"/>
+	 <% } %>
+	  </aside>
+<% } %>
+	 <a href="<%= Url.RouteUrl("Default", new { action = "Edit", postid = Model.Id })%>" class="actionlink">
+	 <i class="fa fa-pencil"><%=Html.Translate("Edit")%></i>
+	 </a>
+	 <a href="<%= Url.RouteUrl("Default", new { action = "RemovePost", postid = Model.Id })%>" class="actionlink">
+	 <i class="fa fa-remove"><%=Html.Translate("Remove")%></i></a>
+<% }} %>
+</aside>
--- a/booking/Views/Blogs/RemovePost.aspx
+++ b/booking/Views/Blogs/RemovePost.aspx
@ -0,0 +1,20 @@
+<%@ Page Title="Bill_removal" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntry>" MasterPageFile="~/Models/App.master" %>
+
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+
+<%= Html.ValidationSummary() %>
+<% using (Html.BeginForm("RemovePost","Blogs",new {postid=Model.Id})) { %>
+
+<%= Html.LabelFor(model => model.Title) %> :
+<%= Html.TextBox( "Title" ) %>
+<%= Html.ValidationMessage("Title", "*") %><br/>
+Identifiant du post : <%= Model.Id %><br/>
+<span class="preview"><%= Html.Markdown(Model.Content) %></span>
+<label for="confirm">supprimer le billet</label>
+<%= Html.CheckBox( "confirm" ) %>
+<%= Html.ValidationMessage("confirm", "*") %>
+<%= Html.Hidden("returnUrl") %>
+ <input type="submit"/>
+ <% } %>
+
+</asp:Content>
--- a/booking/Views/Blogs/RemoveTitle.aspx
+++ b/booking/Views/Blogs/RemoveTitle.aspx
@ -0,0 +1,22 @@
+<%@ Page Title="" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master" %>
+
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+
+<%= Html.ValidationSummary() %>
+<% using (Html.BeginForm("RemoveTitle","Blogs")) { %>
+
+<%= Html.LabelFor(model => model.Titles) %> :
+<%= Html.TextBox( "Titles" ) %>
+<%= Html.ValidationMessage("Titles", "*") %><br/>
+<%= Html.Hidden("Author") %>
+<label for="confirm">supprimer le billet</label>
+<%= Html.CheckBox( "confirm" ) %>
+<%= Html.ValidationMessage("AgreeToRemove", "*") %>
+
+<%= Html.Hidden("returnUrl") %>
+ <input type="submit"/>
+ <% } %>
+
+</asp:Content>
+
+
--- a/booking/Views/Blogs/TagControl.ascx
+++ b/booking/Views/Blogs/TagControl.ascx
@ -0,0 +1,47 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEntry>" %>
+<p id="tags<%=Model.Id%>" data-postid="<%=Model.Id%>" class="fa fa-tag">
+<% if (Model.Tags != null) {
+foreach ( var tagname in Model.Tags) { %>
+<span class="tagname"><%=tagname%></span> <%
+%><% } } %>
+</p>
+<% if (Membership.GetUser()!=null) { %>
+<% if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin"))
+{ // grant all permissions: to choose a given set of tags, also create some new tags %>
+<span id="viewtagger<%=Model.Id%>">
+<i class="fa fa-tag menuitem" id="viewtaggerbtn<%=Model.Id%>"><%=Html.Translate("DoTag")%></i></span>
+<span id="hidetagger<%=Model.Id%>" class="hidden">
+<i class="fa fa-tag menuitem"  id="hidetaggerbtn<%=Model.Id%>" ><%=Html.Translate("Tags")%> - <%=Html.Translate("Hide")%></i>
+Note: Ils sont utilisé pour classifier le document. Par exemple, le tag <code>Accueil</code> rend le document 
+éligible à une place en page d'Accueil.
+</span>
+<form id="tagger<%=Model.Id%>" class="maskable" data-btn-show="viewtagger<%=Model.Id%>" data-btn-hide="hidetagger<%=Model.Id%>" >
+<fieldset>
+<legend>Associer des tags au billet</legend>
+ <label for="newtag"><%= Html.Translate("Tag_name")%>: </label>
+ <span id="Err_tag<%=Model.Id%>" class="error"></span>
+<input type="text" id="newtag<%=Model.Id%>" class="taginput">
+<span id="Err_model<%=Model.Id%>" class="error"></span>
+<input id="sendnewtag<%=Model.Id%>" type="submit" class="submittag fa fa-tag" value="<%=Html.Translate("Submit")%>">
+</fieldset>
+</form>
+<script>
+	$('#sendnewtag<%=Model.Id%>').click(function(e){
+		Tags.tag(<%=Model.Id%>,$('#newtag<%=Model.Id%>').val(),
+		function(postid,tagname){
+			var nTagDisplay = $('<span class="tagname">'+tagname+'</span>');
+			nTagDisplay.click( function() {
+	   var postid=$(this).parent().data('postid');
+	   var $thistag = $(this);
+	   Tags.untag(postid, $thistag.text(), function () { $thistag.remove(); } );
+	   });
+            nTagDisplay.appendTo('#tags'+postid);
+            $('#newtag'+postid).val('');
+            }
+		);
+		e.preventDefault();
+	});
+	$('#sendnewtag<%=Model.Id%>').on('submit', function(e) { e.preventDefault(); });
+</script>
+<% } %>
+<% } %>
--- a/booking/Views/Blogs/TagPanel.ascx
+++ b/booking/Views/Blogs/TagPanel.ascx
@ -0,0 +1,12 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<TagInfo>" %>
+<div class="panel">
+<i class="fa fa-tag"><%=Html.Encode(Model.Name)%></i>
+<% foreach (var t in Model.Titles) { %>
+<a href="<%= Url.RouteUrl("Titles", new { title = t.Title }) %>">
+<img src="<%=Url.Encode(t.Photo)%>" alt="placard" class="photo">
+<%= Html.Markdown(t.Title,"/bfiles/"+t.Id+"/")%></a>
+<div class="postpreview">
+ <p><%=  Html.Markdown(t.Intro,"/bfiles/"+t.Id+"/") %></p>
+</div> 
+<% } %>
+</div>
--- a/booking/Views/Blogs/Title.aspx
+++ b/booking/Views/Blogs/Title.aspx
@ -0,0 +1,34 @@
+<%@ Page Title="Titre" Language="C#" Inherits="System.Web.Mvc.ViewPage<UTBlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
+<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> 
+<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
+<% Title = Model.Title + " - " + YavscHelpers.SiteName; %>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
+<h1>
+<%=Html.ActionLink(Model.Title, "Title", new{title=Model.Title}, null)%>
+- <a href="<%= Url.RouteUrl("Default",new {controller="Home" }) %>"><%= YavscHelpers.SiteName %></a>
+</h1>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+<%  foreach (BlogEntry e in this.Model) { %>
+<div class="post<% if (!e.Visible) { %> hiddenpost<% } %>" >
+<% if (e.Photo!=null) { %><img src="<%=e.Photo%>" alt="" class="photo"><% } %>
+<%= Html.Markdown(e.Content,"/bfiles/"+e.Id+"/") %>
+<%= Html.Partial("PostActions",e)%>
+</div>
+<% } %>
+<%
+if (((int) ViewData["RecordCount"]) > ((int) ViewData["PageSize"])) {
+ rp1.ResultCount = (int) ViewData["RecordCount"];
+ rp1.PageIndex = (int) ViewData["PageIndex"];
+ rp1.PageSize = (int) ViewData["PageSize"];
+%><aside><form runat="server" id="form1">
+<yavsc:ResultPages id="rp1" Action = "?pageIndex={0}" runat="server">
+	 <None><i>Pas de contenu</i></None>
+</yavsc:ResultPages> 
+	</form>
+</aside>
+<% } %>
+</asp:Content>
--- a/booking/Views/Blogs/TitleNotFound.aspx
+++ b/booking/Views/Blogs/TitleNotFound.aspx
@ -0,0 +1,5 @@
+<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+Pas d'article trouvé ici: &lt;<%= Html.Encode(ViewData["BlogUser"]) %>/<%= Html.Encode(ViewData["PostTitle"]) %>&gt;
+<br/> <%= Html.ActionLink("Poster?","Post/", new { user = ViewData["BlogUser"], title = ViewData["PostTitle"]}, new { @class="actionlink" }) %>
+</asp:Content>
--- a/booking/Views/Blogs/UserPost.aspx
+++ b/booking/Views/Blogs/UserPost.aspx
@ -0,0 +1,41 @@
+<%@ Page Title="Billet" Language="C#" Inherits="System.Web.Mvc.ViewPage<UUTBlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
+<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
+<% Title = Model.Title+ " - " + ViewData ["BlogTitle"] ; %>
+</asp:Content>
+<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
+
+<% if (!string.IsNullOrEmpty((string)ViewData["Avatar"])) { %>
+<a href="<%= Url.Action("UserPosts", new{user=Model.Author}) %>" id="avatar">
+<img src="<%=ViewData["Avatar"]%>" />
+</a>
+<% } %>
+<h1 class="blogtitle">
+<a href="<%= Url.RouteUrl("BlogByTitle", new{ user=Model.Author, title = Model.Title}) %>">
+<%=Model.Title%>
+</a>
+ - <%= Html.ActionLink((string)ViewData ["BlogTitle"] ,"UserPosts",new{user=Model.Author}, null) %>
+  - 
+<a href="<%=Url.Content("~/")%>"><%= YavscHelpers.SiteName %></a>
+</h1>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+<% foreach (var be in Model) { %>
+<div class="post">
+<% if (be.Photo != null) { %>
+	<img src="<%=Url.Content(be.Photo)%>" alt="<%=be.Title%>" class="photo">
+<% } %>
+
+<%= Html.Markdown(be.Content,"/bfiles/"+be.Id+"/") %>
+ <%= Html.Partial("PostActions",be)%>
+ <% string username = Membership.GetUser()==null ? null : Membership.GetUser().UserName; %>
+		<% foreach (var c in (Comment[]) BlogManager.GetComments(be.Id)) {  %> 
+<div class="comment" style="min-height:32px;"> 
+<img class="avatar" src="<%= Url.RouteUrl("Default", new { action="Avatar", controller="Account", user = c.From } ) %>" alt="<%=c.From%>"/>
+<%= Html.Markdown(c.CommentText) %>
+	<% if (Model.Author ==  username || c.From == username ) { %>
+	<%= Html.ActionLink("Supprimer","RemoveComment", new { cmtid = c.Id } , new { @class="actionlink" })%>
+	<% } %>
+</div><% } %>
+</div><% } %>
+</asp:Content>
--- a/booking/Views/Blogs/UserPosts.aspx
+++ b/booking/Views/Blogs/UserPosts.aspx
@ -0,0 +1,48 @@
+<%@ Page Title="Blog" Language="C#" Inherits="System.Web.Mvc.ViewPage<UUBlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
+<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> 
+<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
+<% Title = (string) ViewData ["BlogTitle"] ; %>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
+
+<% if (!string.IsNullOrEmpty((string)ViewData["Avatar"])) { %>
+<a href="<%=Url.RouteUrl( "Blogs", new { user = Model.Author } )%>" id="avatar">
+<img src="<%=ViewData["Avatar"]%>" />
+</a>
+<% } %>
+<h1 class="blogtitle">
+<a href="<%=Url.RouteUrl( "Blogs", new { user = Model.Author } )%>">
+<%=Html.Encode(ViewData["BlogTitle"])%></a>
+- <a href="<%= Url.RouteUrl( "Default", new { controller = "Home" } ) %>"><%= YavscHelpers.SiteName %></a>
+</h1>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
+<%  foreach (BlogEntry e in this.Model) { %>
+<div class="postpreview<% if (!e.Visible) { %> hiddenpost<% } %>" >
+<h2><a href="<%= Url.RouteUrl("BlogByTitle", new { user=e.Author, title=e.Title, postid = e.Id })%>" class="usertitleref">
+<%=Html.Markdown(e.Title)%></a></h2>
+<% bool truncated = false; %>
+<%= Html.MarkdownToHtmlIntro(out truncated, e.Content,"/bfiles/"+e.Id+"/") %>
+<% if (truncated) { %>
+<a href="<%= Url.RouteUrl( "BlogByTitle", new { user=e.Author ,  title=e.Title, postid = e.Id}) %>">
+  <i><%=Html.Translate("ReadMore")%></i></a>
+  <% } %>
+<%= Html.Partial("PostActions",e)%>
+</div>
+<% } %>
+<aside>
+	<form runat="server" id="form1" method="GET">
+<%
+ rp1.ResultCount = (int) ViewData["RecordCount"];
+ rp1.PageIndex = (int) ViewData["PageIndex"];
+%>
+<yavsc:ResultPages id="rp1" Action = "?pageIndex={0}" runat="server">
+	 <None><i>Pas de contenu</i></None>
+</yavsc:ResultPages> 
+	</form>
+</aside>
+	
+
+</asp:Content>