Merge commit 'acd2a473bbf4f3006e40384a45413a4db177b082'

Conflicts:
	ChangeLog
	ITContentProvider/ChangeLog
	Makefile
	NpgsqlBlogProvider/ChangeLog
	NpgsqlContentProvider/ChangeLog
	NpgsqlMRPProviders/ChangeLog
	TestAPI/ChangeLog
	web/App_Themes/style.css
	web/ChangeLog
	web/Helpers/YavscHelpers.cs
	web/Models/App.master
	web/Views/Blogs/UserPosts.aspx
This commit is contained in:
Paul Schneider
2015-10-04 16:36:29 +02:00
21 changed files with 149 additions and 1336 deletions

View File

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