diff --git a/WorkFlowProvider/NpgsqlContentProvider.cs b/WorkFlowProvider/NpgsqlContentProvider.cs index 0d6df8e9..34de5455 100644 --- a/WorkFlowProvider/NpgsqlContentProvider.cs +++ b/WorkFlowProvider/NpgsqlContentProvider.cs @@ -47,11 +47,7 @@ namespace WorkFlowProvider throw new NotImplementedException (); } - public bool[] FinalStatuses { - get { - return new bool[] { false, true, true }; - } - } + public string Order (IWFOrder c) { @@ -70,7 +66,12 @@ namespace WorkFlowProvider public string[] StatusLabels { get { - return new string[] { "Created", "Success", "Error" }; + return new string[] { "Created", "Validated", "Success", "Error" }; + } + } + public bool[] FinalStatuses { + get { + return new bool[] { false, false, true, true }; } } diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index 6c86fed2..69807420 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -43,7 +43,6 @@ namespace Yavsc.Controllers public ActionResult Index (string user = null, string title = null, int pageIndex=0, int pageSize=10) { if (string.IsNullOrEmpty (user)) { - ViewData ["Message"] = "Blogs"; return BlogList (pageIndex, pageSize); } else { MembershipUser u = Membership.GetUser (user, false); diff --git a/web/Models/App.master b/web/Models/App.master index b1836c53..3dd81396 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -49,12 +49,12 @@ <% if (ViewData["Error"]!=null) { %> -
+
<%= Html.Encode(ViewData["Error"]) %>
<% } %> <% if (ViewData["Message"]!=null) { %> -
+
<%= Html.Encode(ViewData["Message"]) %>
<% } %> diff --git a/web/Views/Blogs/UserPost.aspx b/web/Views/Blogs/UserPost.aspx index 7837d56f..a6cf64dd 100644 --- a/web/Views/Blogs/UserPost.aspx +++ b/web/Views/Blogs/UserPost.aspx @@ -4,21 +4,13 @@

<%= Html.ActionLink(Model.Title,"UserPost",new{user=Model.UserName,title=Model.Title}) %> - - <%=ViewData["BlogTitle"]%> + +<%=Model.UserName%> <%=ViewData["BlogTitle"]%> <%= YavscHelpers.SiteName %>

- -
(Id:<%=Model.Id%>, <%= Model.Posted.ToString("yyyy/MM/dd") %> - - <%= Model.Modified.ToString("yyyy/MM/dd") %> <%= Model.Visible? "":", Invisible!" %>) -<% if (Membership.GetUser()!=null) - if (Membership.GetUser().UserName==Model.UserName) - { %> - <%= Html.ActionLink("Editer","Edit", new { user=Model.UserName, title = Model.Title }, new { @class="actionlink" }) %> - <%= Html.ActionLink("Supprimer","RemovePost", new { user=Model.UserName, title = Model.Title }, new { @class="actionlink" } ) %> - <% } %> -
- + +
<% BBCodeHelper.Init(); %> diff --git a/web/Views/Blogs/UserPosts.aspx b/web/Views/Blogs/UserPosts.aspx index 2f1e6b24..2d4eaca3 100644 --- a/web/Views/Blogs/UserPosts.aspx +++ b/web/Views/Blogs/UserPosts.aspx @@ -1,13 +1,14 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> +<%@ Page Title="Billets utilisateurs" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> <%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> -<%=Html.Encode(ViewData["BlogTitle"])%> - -

"> - " alt=""/> - <%=ViewData["BlogTitle"]%>

-
<%= Html.Encode(ViewData["Message"])%>
+ +<% Title = (string) ViewData["BlogTitle"] ; %> + +

"> + " alt="ViewData["BlogUser"]"/> + <%=ViewData["BlogTitle"]%> - <%= YavscHelpers.SiteName %>

+
<% foreach (BlogEntry e in this.Model) { %> diff --git a/web/style.css b/web/style.css index 5d8ee9e8..aebc9989 100644 --- a/web/style.css +++ b/web/style.css @@ -56,6 +56,22 @@ label { font-size: medium; } +.message { + color: #7FFF00; + font-size: large; + border: solid green; + background-color: rgba(32,0,32,0.3); + } +.error { + color: #f88; + font-size: large; + border: solid green; + background-color: rgba(64,0,0,0.3); +} +.validation-summary-errors{ + color: #f88; + background-color: rgba(64,0,0,0.3); +} .thanks { display: inline; diff --git a/yavscModel/WorkFlow/IContentProvider.cs b/yavscModel/WorkFlow/IContentProvider.cs index a9d818e0..38e369df 100644 --- a/yavscModel/WorkFlow/IContentProvider.cs +++ b/yavscModel/WorkFlow/IContentProvider.cs @@ -4,7 +4,6 @@ using System.Web.Mvc; namespace yavscModel.WorkFlow { - public interface StatusChange { int Status {get;} DateTime date {get;} } public interface IContentProvider : IProvider, IDisposable { diff --git a/yavscModel/WorkFlow/StatusChange.cs b/yavscModel/WorkFlow/StatusChange.cs new file mode 100644 index 00000000..f9faef9a --- /dev/null +++ b/yavscModel/WorkFlow/StatusChange.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Web.Mvc; + +namespace yavscModel.WorkFlow +{ + public class StatusChange { + public int Status { get; set;} + public DateTime date { get; set;} + } +} diff --git a/yavscModel/yavscModel.csproj b/yavscModel/yavscModel.csproj index 76d578aa..c02363e9 100644 --- a/yavscModel/yavscModel.csproj +++ b/yavscModel/yavscModel.csproj @@ -63,6 +63,7 @@ +