diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index 647d5ebc..325102b0 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,9 @@ +2015-10-17 Paul Schneider + + * NpgsqlTagInfo.cs: + * NpgsqlBlogProvider.cs: + * NpgsqlBlogProvider.csproj: + 2015-10-17 Paul Schneider * NpgsqlBlogProvider.cs: diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index 70a090cd..24d31f67 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -16,10 +16,20 @@ namespace Npgsql.Web.Blog /// public class NpgsqlBlogProvider : BlogProvider { + string applicationName; string connectionString; #region implemented abstract members of BlogProvider + /// + /// Gets the tag info. + /// + /// The tag info. + /// Tagname. + public override TagInfo GetTagInfo (string tagname) + { + return new NpgsqlTagInfo (connectionString, tagname); + } /// /// Tag the specified post by identifier diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index 80491104..22b1b709 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -34,6 +34,7 @@ + diff --git a/NpgsqlBlogProvider/NpgsqlTagInfo.cs b/NpgsqlBlogProvider/NpgsqlTagInfo.cs new file mode 100644 index 00000000..3d7d7bc6 --- /dev/null +++ b/NpgsqlBlogProvider/NpgsqlTagInfo.cs @@ -0,0 +1,96 @@ +// +// NpgsqlTagInfo.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using Yavsc.Model.Blogs; +using System.Collections.Generic; + +namespace Npgsql.Web.Blog +{ + /// + /// Npgsql tag info. + /// + public class NpgsqlTagInfo: TagInfo + { + /// + /// Initializes a new instance of the class. + /// + /// Connection string. + /// Tagname. + public NpgsqlTagInfo (string connectionString, string tagname): base(tagname) + { + titles = new List(); + using (NpgsqlConnection cnx = new NpgsqlConnection (connectionString)) + using (NpgsqlCommand cmd = cnx.CreateCommand ()) { + cmd.CommandText = "SELECT \n" + + " blog.username, \n" + + " blog.posted, \n" + + " blog.modified, \n" + + " blog.title, \n" + + " blog.bcontent, \n" + + " blog.visible, \n" + + " blog._id, \n" + + " blog.photo, \n" + + " tag.name\nFROM \n" + + " public.blog, \n" + + " public.tagged, \n" + + " public.tag\nWHERE \n" + + " tagged.postid = blog._id AND \n" + + " tag._id = tagged.tagid AND \n" + + " public.tag.name = :name"; + cmd.Parameters.AddWithValue ("name", tagname); + + using (NpgsqlDataReader rdr = cmd.ExecuteReader ()) { + while (rdr.Read ()) { + bool truncated; + var pi = new BasePostInfo { + Title = rdr.GetString(3), + Author = rdr.GetString (0), + Id = rdr.GetInt64 (6), + Intro = MarkdownHelper.MarkdownIntro ( + rdr.GetString (4), + out truncated), + Visible = rdr.GetBoolean(5), + Photo = (!rdr.IsDBNull (7))?null:rdr.GetString (7), + Modified = rdr.GetDateTime(2), + Posted = rdr.GetDateTime(1) + }; + titles.Add (pi); + } + } + } + } + + List titles; + + #region implemented abstract members of TagInfo + /// + /// Gets the titles. + /// + /// The titles. + public override System.Collections.Generic.IEnumerable Titles { + get { + return titles; + } + } + #endregion + } +} + diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index 69da7604..31032385 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -39,7 +39,6 @@ body.loading .modal { } .iconsmall { max-height: 1.3em; max-width: 1.3em; } - .photo { width: 100%; } .blogbanner { float: left; top:0; } .subtitle { font-size:small; font-style: italic; } @@ -96,7 +95,7 @@ legend { footer p { display:inline-block; } footer img { max-height: 3em; vertical-align: middle; } -a img, h1 img, .menuitem img { max-height: 1em; vertical-align: middle; } +a img, h1 img, .menuitem img { vertical-align: middle; } #gspacer { background-color: rgba(20,20,20,.8); @@ -275,12 +274,6 @@ input, select, textarea { border-radius:25px; white-space: pre-wrap; } - -.avatar { - max-width: 64px; - max-height: 64px; -} - #avatar { float: left; margin:1em; @@ -323,6 +316,10 @@ header { padding-bottom:1em; } +#avatar { + margin:.5em; + } + header h1, header a , .actionlink, .menuitem, a { padding:.5em;} nav { diff --git a/web/ChangeLog b/web/ChangeLog index 85517ec8..5b32ed4d 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,17 @@ +2015-10-17 Paul Schneider + + * Web.csproj: + * Global.asax.cs: + * yavsc.js: + * App.master: + * style.css: + * NoLogin.master: + * YavscHelpers.cs: + * TagPanel.ascx: + * UserPosts.aspx: + * AccountController.cs: + * FrontOfficeController.cs: + 2015-10-17 Paul Schneider * Web.csproj: diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs index 5ec92924..7f4d7321 100644 --- a/web/Controllers/AccountController.cs +++ b/web/Controllers/AccountController.cs @@ -332,7 +332,7 @@ namespace Yavsc.Controllers UserManager.ChangeName (id, model.Name); FormsAuthentication.SetAuthCookie (model.Name, model.RememberMe); } - ViewData ["Message"] = "Profile enregistré"+((editsMyName)?", nom public inclu.":""); + YavscHelpers.Notify(ViewData, "Profile enregistré"+((editsMyName)?", nom public inclu.":"")); } return View (model); } diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 3711e7ff..64cccc2d 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -14,6 +14,7 @@ using Yavsc.Model.FrontOffice; using Yavsc.Model.FileSystem; using Yavsc.Model.Calendar; using System.Configuration; +using Yavsc.Helpers; namespace Yavsc.Controllers { @@ -206,7 +207,7 @@ namespace Yavsc.Controllers ViewData ["ProdRef"] = pref; Catalog cat = CatalogManager.GetCatalog (); if (cat == null) { - ViewData ["Message"] = "Catalog introuvable"; + YavscHelpers.Notify(ViewData, "Catalog introuvable"); ViewData ["RefType"] = "Catalog"; return View ("ReferenceNotFound"); } @@ -249,10 +250,10 @@ namespace Yavsc.Controllers // Add specified product command to the basket, // saves it in db new Command(collection,HttpContext.Request.Files); - ViewData ["Message"] = LocalizedText.Item_added_to_basket; + YavscHelpers.Notify(ViewData, LocalizedText.Item_added_to_basket); return View (collection); } catch (Exception e) { - ViewData ["Message"] = "Exception:" + e.Message; + YavscHelpers.Notify(ViewData,"Exception:" + e.Message); return View (collection); } } diff --git a/web/Global.asax.cs b/web/Global.asax.cs index 645be2b6..cdef00f3 100644 --- a/web/Global.asax.cs +++ b/web/Global.asax.cs @@ -48,13 +48,13 @@ namespace Yavsc routes.IgnoreRoute ("robots.txt"); // for search engine robots routes.MapRoute ( "Titles", - "t/{title}", + "title/{title}", new { controller = "Blogs", action = "Index", title=UrlParameter.Optional } ); routes.MapRoute ( "Blogs", - "b/{user}", + "blog/{user}", new { controller = "Blogs", action = "UserPosts", user="Paul Schneider" } @@ -75,11 +75,6 @@ namespace Yavsc new { controller = "Blogs", action = "Index", postid=UrlParameter.Optional } ); - /* routes.MapRoute ( - "Artistes", - "a/{artiste}", - new { controller = "Artistes", action = "Index", artiste = UrlParameter.Optional } - ); */ routes.MapRoute ( "Default", "{controller}/{action}/{id}", diff --git a/web/Helpers/YavscHelpers.cs b/web/Helpers/YavscHelpers.cs index 3bf9ee1d..3ba241be 100644 --- a/web/Helpers/YavscHelpers.cs +++ b/web/Helpers/YavscHelpers.cs @@ -55,7 +55,9 @@ namespace Yavsc.Helpers /// User. public static void SendActivationMessage(this System.Web.Http.Routing.UrlHelper helper, MembershipUser user) { - SendActivationMessage (helper.Route("~/Account/Validate/",new { id=user.UserName, key=user.ProviderUserKey.ToString() } ) + SendActivationMessage (helper.Route("Default", new { controller="Account", + action = "Validate", + key=user.ProviderUserKey.ToString() } ) , WebConfigurationManager.AppSettings ["RegistrationMessage"], user); } diff --git a/web/Models/App.master b/web/Models/App.master index 71a0c0ba..1f12e58b 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -1,4 +1,4 @@ -<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" CodeBehind="App.master.cs" %> +<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> @@ -35,20 +35,15 @@ var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
+<%if (ViewData ["Notifications"]!=null) { %> +<% } %>
diff --git a/web/Models/NoLogin.master b/web/Models/NoLogin.master index bc55f1bd..e9f0c901 100644 --- a/web/Models/NoLogin.master +++ b/web/Models/NoLogin.master @@ -2,64 +2,80 @@ -<% -ViewState["orgtitle"] = T.GetString(Page.Title); + +<% ViewState["orgtitle"] = Html.Translate(Page.Title); Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %> - +" /> +" /> +" /> - + + + + + - -
+
-

"> <%=ViewState["orgtitle"]%> - -"><%= YavscHelpers.SiteName %> -

- <% - if (ViewData["Error"]!=null) { - %>
<%= Html.Encode(ViewData["Error"]) %> -
<% } - if (ViewData["Message"]!=null) { - %>
<%= Html.Encode(ViewData["Message"]) %>
<% } - %> +

"> +<%=ViewState["orgtitle"]%> +- "><%= YavscHelpers.SiteName %> +

+ + +
+<%if (ViewData ["Notifications"]!=null) { %> + +<% } %>
-
+ + +
-
- - <%= Html.ActionLink("Contact","Contact","Home",null, new { @class="thanks" }) %> - <% foreach ( Link link in Html.Thanks()) { %> - <% if (link.Image !=null) { - %><%= link.Text %><% - } else { %><%= link.Text %><% }} %> -
-
- +
+
+ +
diff --git a/web/Scripts/yavsc.js b/web/Scripts/yavsc.js index 5d4bde2f..ff5b7979 100644 --- a/web/Scripts/yavsc.js +++ b/web/Scripts/yavsc.js @@ -63,6 +63,13 @@ return self; })(); $(document).ready(function(){ + +$body = $("body"); +$(document).on({ + ajaxStart: function() { $body.addClass("loading"); }, + ajaxStop: function() { $body.removeClass("loading"); } +}); + var $window = $(window); $(window).scroll(function() { var $ns = $('#notifications'); diff --git a/web/Views/Blogs/TagPanel.ascx b/web/Views/Blogs/TagPanel.ascx new file mode 100644 index 00000000..33782b69 --- /dev/null +++ b/web/Views/Blogs/TagPanel.ascx @@ -0,0 +1,10 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +
+<%=Model.Name%> +
    +<% foreach (BasePostInfo be in Model.Titles) { %> +
  • <%= be.Title %> +<%= be.Intro %> +
    • +<% } %>
+
\ No newline at end of file diff --git a/web/Views/Blogs/UserPosts.aspx b/web/Views/Blogs/UserPosts.aspx index 8cc1c06e..9d2ba2b1 100644 --- a/web/Views/Blogs/UserPosts.aspx +++ b/web/Views/Blogs/UserPosts.aspx @@ -14,7 +14,7 @@

"> <%=Html.Encode(ViewData["BlogTitle"])%> -- "><%= YavscHelpers.SiteName %> +- "><%= YavscHelpers.SiteName %>

diff --git a/web/Web.csproj b/web/Web.csproj index 38c87979..baa24842 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -434,6 +434,7 @@ + diff --git a/yavscModel/Blogs/BasePost.cs b/yavscModel/Blogs/BasePost.cs index 2fc487dc..d341f2c2 100644 --- a/yavscModel/Blogs/BasePost.cs +++ b/yavscModel/Blogs/BasePost.cs @@ -30,8 +30,6 @@ using System.ComponentModel.DataAnnotations; namespace Yavsc.Model.Blogs { - - /// /// Base post. /// @@ -55,8 +53,6 @@ namespace Yavsc.Model.Blogs } } - - /// /// The posted. /// @@ -139,12 +135,10 @@ namespace Yavsc.Model.Blogs set; } - /// /// Gets or sets a value indicating whether this is visible. /// /// true if visible; otherwise, false. public bool Visible { get; set ; } } - } diff --git a/yavscModel/Blogs/BasePostInfo.cs b/yavscModel/Blogs/BasePostInfo.cs new file mode 100644 index 00000000..f4f34749 --- /dev/null +++ b/yavscModel/Blogs/BasePostInfo.cs @@ -0,0 +1,42 @@ +// +// BasePostInfo.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . + +using System; +using System.Configuration; +using System.Collections.Generic; +using Yavsc.Model.Blogs; +using System.Linq; +using Yavsc.Model.Circles; + +namespace Yavsc.Model.Blogs +{ + /// + /// Base post info. + /// + public class BasePostInfo: BasePost { + + /// + /// The intro. + /// + public string Intro; + } + +} diff --git a/yavscModel/Blogs/BlogEntryCollection.cs b/yavscModel/Blogs/BlogEntryCollection.cs index 1e0bd7ec..f2c8ffaa 100644 --- a/yavscModel/Blogs/BlogEntryCollection.cs +++ b/yavscModel/Blogs/BlogEntryCollection.cs @@ -18,15 +18,17 @@ namespace Yavsc.Model.Blogs public BlogEntryCollection () { } + /// /// Initializes a new instance of the class. /// /// Items. - public BlogEntryCollection(IEnumerable items) + public BlogEntryCollection (IEnumerable items) { - if (items!=null) + if (items != null) this.AddRange (items); } + /// /// Returns a that represents the current . /// @@ -57,115 +59,81 @@ namespace Yavsc.Model.Blogs { return this.Where (x => x.Title == title).ToArray (); } + /// /// Filters the current collection for a given user by its name. /// Assumes that this user is not an author of any of these posts. /// /// Username. - public BlogEntryCollection FilterFor(string username) + public BlogEntryCollection FilterFor (string username) { BlogEntryCollection res = new BlogEntryCollection (); foreach (BlogEntry be in this) { - if (be.Visible && - (be.AllowedCircles == null || - (username!= null && CircleManager.DefaultProvider.Matches - (be.AllowedCircles,username)))) - { - res.Add(be); - } + if (be.Visible && + (be.AllowedCircles == null || + (username != null && CircleManager.DefaultProvider.Matches + (be.AllowedCircles, username)))) { + res.Add (be); + } } return res; } - - - /// - /// Base post info. - /// - public class BasePostInfo: BasePost { - - /// - /// The intro. - /// - public string Intro; - } - - /// - /// Post info. - /// - public class PostInfoByTitle : BasePostInfo { - - /// - /// The name of the user. - /// - public string Author; - - } - /// - /// Post info by user. - /// - public class PostInfoByUser : BasePostInfo { - - /// - /// The name of the user. - /// - public string Title; - } - /// /// Groups by title. /// - public IEnumerable> GroupByTitle() + public IEnumerable> GroupByTitle () { bool truncated; return from be in this orderby be.Posted descending - group - new PostInfoByTitle { Author=be.Author, Id=be.Id, - Posted=be.Posted, Modified=be.Modified, - Intro = MarkdownHelper.MarkdownIntro(be.Content, out truncated), + group + new PostInfoByTitle { Author = be.Author, Id = be.Id, + Posted = be.Posted, Modified = be.Modified, + Intro = MarkdownHelper.MarkdownIntro (be.Content, out truncated), Visible = be.Visible, Photo = be.Photo } by be.Title into titlegroup - select titlegroup; + select titlegroup; } + /// /// Groups by user. /// /// The by user. - public IEnumerable> GroupByUser() + public IEnumerable> GroupByUser () { bool truncated; return from be in this orderby be.Posted descending - group - new PostInfoByUser { - Title=be.Title, - Id=be.Id, - Posted=be.Posted, - Modified=be.Modified, - Intro = MarkdownHelper.MarkdownIntro(be.Content, out truncated) , + group + new PostInfoByUser { + Title = be.Title, + Id = be.Id, + Posted = be.Posted, + Modified = be.Modified, + Intro = MarkdownHelper.MarkdownIntro (be.Content, out truncated), Photo = be.Photo, Visible = be.Visible } by be.Author into usergroup - select usergroup; + select usergroup; } /// /// Gets the titles. /// /// The titles. - public string[] Titles { get { + public string[] Titles { + get { string[] result = this.Select (x => x.Title).Distinct ().ToArray (); if (result == null) return new string[0]; return result; - } } - + } + } } - } diff --git a/yavscModel/Blogs/BlogProvider.cs b/yavscModel/Blogs/BlogProvider.cs index 5aa16634..a954bb39 100644 --- a/yavscModel/Blogs/BlogProvider.cs +++ b/yavscModel/Blogs/BlogProvider.cs @@ -19,6 +19,8 @@ namespace Yavsc.Model.Blogs /// Postid. public abstract BlogEntry GetPost (long postid); + public abstract TagInfo GetTagInfo (string tagname); + /// /// Gets the post collection from a given user and at a given title. /// diff --git a/yavscModel/Blogs/PostInfoByTitle.cs b/yavscModel/Blogs/PostInfoByTitle.cs new file mode 100644 index 00000000..339f8a67 --- /dev/null +++ b/yavscModel/Blogs/PostInfoByTitle.cs @@ -0,0 +1,44 @@ +// +// PostInfoByTitle.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . + +using System; +using System.Configuration; +using System.Collections.Generic; +using Yavsc.Model.Blogs; +using System.Linq; +using Yavsc.Model.Circles; + +namespace Yavsc.Model.Blogs +{ + + /// + /// Post info. + /// + public class PostInfoByTitle : BasePostInfo { + + /// + /// The name of the user. + /// + public string Author; + + } + +} diff --git a/yavscModel/Blogs/PostInfoByUser.cs b/yavscModel/Blogs/PostInfoByUser.cs new file mode 100644 index 00000000..ef938ff2 --- /dev/null +++ b/yavscModel/Blogs/PostInfoByUser.cs @@ -0,0 +1,43 @@ +// +// PostInfoByUser.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . + +using System; +using System.Configuration; +using System.Collections.Generic; +using Yavsc.Model.Blogs; +using System.Linq; +using Yavsc.Model.Circles; + +namespace Yavsc.Model.Blogs +{ + + /// + /// Post info by user. + /// + public class PostInfoByUser : BasePostInfo { + + /// + /// The name of the user. + /// + public string Title; + } + +} diff --git a/yavscModel/Blogs/TagInfo.cs b/yavscModel/Blogs/TagInfo.cs new file mode 100644 index 00000000..03f67629 --- /dev/null +++ b/yavscModel/Blogs/TagInfo.cs @@ -0,0 +1,60 @@ +// +// TagInfo.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using System.Collections.Generic; + +namespace Yavsc.Model.Blogs +{ + /// + /// Tag info. + /// + public abstract class TagInfo + { + string name; + /// + /// Gets or sets the name. + /// + /// The name. + public string Name { + get { + return name; + } + set { + name = value; + } + } + /// + /// Initializes a new instance of the class. + /// + /// Tagname. + public TagInfo (string tagname) + { + Name = tagname; + } + + /// + /// Gets the titles. + /// + /// The titles. + public abstract IEnumerable Titles { get; } + } +} + diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index b96318a8..c97195e1 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,18 @@ +2015-10-17 Paul Schneider + + * TagInfo.cs: + * YavscModel.csproj: + * BasePost.cs: + * LocalizedText.resx: + * LocalizedText.fr.resx: + * BlogProvider.cs: + * BasePostInfo.cs: + * PostInfoByUser.cs: + * PostInfoByTitle.cs: + * LocalizedText.Designer.cs: + * LocalizedText.fr.Designer.cs: + * BlogEntryCollection.cs: + 2015-10-17 Paul Schneider * PostTag.cs: diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index ec6dd646..37925958 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -64,6 +64,12 @@ namespace Yavsc.Model { } } + public static string Location { + get { + return ResourceManager.GetString("Location", resourceCulture); + } + } + public static string Circles { get { return ResourceManager.GetString("Circles", resourceCulture); @@ -250,9 +256,9 @@ namespace Yavsc.Model { } } - public static string Location { + public static string Tag_name { get { - return ResourceManager.GetString("Location", resourceCulture); + return ResourceManager.GetString("Tag_name", resourceCulture); } } @@ -280,9 +286,9 @@ namespace Yavsc.Model { } } - public static string Tag_name { + public static string Logout { get { - return ResourceManager.GetString("Tag_name", resourceCulture); + return ResourceManager.GetString("Logout", resourceCulture); } } diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index e5af1b95..2ef22bd6 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -46,327 +46,39 @@ namespace Yavsc.Model { } } - public static string was_added_to_the_empty_role { - get { - return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture); - } - } - - public static string Bill_edition { - get { - return ResourceManager.GetString("Bill_edition", resourceCulture); - } - } - - public static string Tex_version { - get { - return ResourceManager.GetString("Tex_version", resourceCulture); - } - } - - public static string Message_sent { - get { - return ResourceManager.GetString("Message_sent", resourceCulture); - } - } - - public static string Count { - get { - return ResourceManager.GetString("Count", resourceCulture); - } - } - - public static string Create { - get { - return ResourceManager.GetString("Create", resourceCulture); - } - } - - public static string Description { - get { - return ResourceManager.GetString("Description", resourceCulture); - } - } - - public static string Profile_edition { - get { - return ResourceManager.GetString("Profile_edition", resourceCulture); - } - } - - public static string Title { - get { - return ResourceManager.GetString("Title", resourceCulture); - } - } - - public static string My_Estimates { - get { - return ResourceManager.GetString("My_Estimates", resourceCulture); - } - } - - public static string Google_error { - get { - return ResourceManager.GetString("Google_error", resourceCulture); - } - } - - public static string StartDate { - get { - return ResourceManager.GetString("StartDate", resourceCulture); - } - } - - public static string no_content { - get { - return ResourceManager.GetString("no_content", resourceCulture); - } - } - - public static string View_source { - get { - return ResourceManager.GetString("View_source", resourceCulture); - } - } - - public static string Ciffer { - get { - return ResourceManager.GetString("Ciffer", resourceCulture); - } - } - - public static string Modify { - get { - return ResourceManager.GetString("Modify", resourceCulture); - } - } - - public static string MaxDate { - get { - return ResourceManager.GetString("MaxDate", resourceCulture); - } - } - - public static string New_Tag { - get { - return ResourceManager.GetString("New_Tag", resourceCulture); - } - } - - public static string ProviderName { - get { - return ResourceManager.GetString("ProviderName", resourceCulture); - } - } - - public static string Date_search { - get { - return ResourceManager.GetString("Date_search", resourceCulture); - } - } - - public static string Members { - get { - return ResourceManager.GetString("Members", resourceCulture); - } - } - - public static string ImportException { - get { - return ResourceManager.GetString("ImportException", resourceCulture); - } - } - - public static string Preview { - get { - return ResourceManager.GetString("Preview", resourceCulture); - } - } - - public static string Register { - get { - return ResourceManager.GetString("Register", resourceCulture); - } - } - - public static string Hide_source { - get { - return ResourceManager.GetString("Hide_source", resourceCulture); - } - } - - public static string access_denied { - get { - return ResourceManager.GetString("access_denied", resourceCulture); - } - } - - public static string DoTag { - get { - return ResourceManager.GetString("DoTag", resourceCulture); - } - } - - public static string Product_reference { - get { - return ResourceManager.GetString("Product_reference", resourceCulture); - } - } - - public static string EndDate { - get { - return ResourceManager.GetString("EndDate", resourceCulture); - } - } - - public static string Google_calendar { - get { - return ResourceManager.GetString("Google_calendar", resourceCulture); - } - } - - public static string Consultant { - get { - return ResourceManager.GetString("Consultant", resourceCulture); - } - } - public static string EventWebPage { get { return ResourceManager.GetString("EventWebPage", resourceCulture); } } - public static string User_List { - get { - return ResourceManager.GetString("User List", resourceCulture); - } - } - - public static string ImgLocator { - get { - return ResourceManager.GetString("ImgLocator", resourceCulture); - } - } - - public static string Submit { - get { - return ResourceManager.GetString("Submit", resourceCulture); - } - } - - public static string Not_Approuved { - get { - return ResourceManager.GetString("Not Approuved", resourceCulture); - } - } - - public static string Remember_me { - get { - return ResourceManager.GetString("Remember_me", resourceCulture); - } - } - - public static string DocTemplateException { - get { - return ResourceManager.GetString("DocTemplateException", resourceCulture); - } - } - - public static string Unitary_cost { - get { - return ResourceManager.GetString("Unitary_cost", resourceCulture); - } - } - - public static string Circles { - get { - return ResourceManager.GetString("Circles", resourceCulture); - } - } - - public static string Location { - get { - return ResourceManager.GetString("Location", resourceCulture); - } - } - - public static string Tag_name { - get { - return ResourceManager.GetString("Tag_name", resourceCulture); - } - } - - public static string Remove { - get { - return ResourceManager.GetString("Remove", resourceCulture); - } - } - - public static string none { - get { - return ResourceManager.GetString("none", resourceCulture); - } - } - - public static string Hide { - get { - return ResourceManager.GetString("Hide", resourceCulture); - } - } - - public static string Estimate_not_found { - get { - return ResourceManager.GetString("Estimate_not_found", resourceCulture); - } - } - public static string ProviderId { get { return ResourceManager.GetString("ProviderId", resourceCulture); } } - public static string Welcome { + public static string Pdf_version { get { - return ResourceManager.GetString("Welcome", resourceCulture); + return ResourceManager.GetString("Pdf_version", resourceCulture); } } - public static string Online { + public static string Location { get { - return ResourceManager.GetString("Online", resourceCulture); + return ResourceManager.GetString("Location", resourceCulture); } } - public static string Home { + public static string Circles { get { - return ResourceManager.GetString("Home", resourceCulture); + return ResourceManager.GetString("Circles", resourceCulture); } } - public static string Offline { + public static string Preview { get { - return ResourceManager.GetString("Offline", resourceCulture); - } - } - - public static string MinDate { - get { - return ResourceManager.GetString("MinDate", resourceCulture); - } - } - - public static string Comment { - get { - return ResourceManager.GetString("Comment", resourceCulture); - } - } - - public static string User_name { - get { - return ResourceManager.GetString("User_name", resourceCulture); + return ResourceManager.GetString("Preview", resourceCulture); } } @@ -376,15 +88,51 @@ namespace Yavsc.Model { } } - public static string Pdf_version { + public static string none { get { - return ResourceManager.GetString("Pdf_version", resourceCulture); + return ResourceManager.GetString("none", resourceCulture); } } - public static string ReadMore { + public static string Count { get { - return ResourceManager.GetString("ReadMore", resourceCulture); + return ResourceManager.GetString("Count", resourceCulture); + } + } + + public static string ProviderName { + get { + return ResourceManager.GetString("ProviderName", resourceCulture); + } + } + + public static string Not_Approuved { + get { + return ResourceManager.GetString("Not Approuved", resourceCulture); + } + } + + public static string User_name { + get { + return ResourceManager.GetString("User_name", resourceCulture); + } + } + + public static string Estimate_not_found { + get { + return ResourceManager.GetString("Estimate_not_found", resourceCulture); + } + } + + public static string Members { + get { + return ResourceManager.GetString("Members", resourceCulture); + } + } + + public static string Google_calendar { + get { + return ResourceManager.GetString("Google_calendar", resourceCulture); } } @@ -394,27 +142,39 @@ namespace Yavsc.Model { } } - public static string Item_added_to_basket { + public static string was_added_to_the_empty_role { get { - return ResourceManager.GetString("Item_added_to_basket", resourceCulture); + return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture); } } - public static string role_created { + public static string access_denied { get { - return ResourceManager.GetString("role_created", resourceCulture); + return ResourceManager.GetString("access_denied", resourceCulture); } } - public static string Edit { + public static string Ciffer { get { - return ResourceManager.GetString("Edit", resourceCulture); + return ResourceManager.GetString("Ciffer", resourceCulture); } } - public static string InternalServerError { + public static string Create { get { - return ResourceManager.GetString("InternalServerError", resourceCulture); + return ResourceManager.GetString("Create", resourceCulture); + } + } + + public static string Submit { + get { + return ResourceManager.GetString("Submit", resourceCulture); + } + } + + public static string ImgLocator { + get { + return ResourceManager.GetString("ImgLocator", resourceCulture); } } @@ -424,10 +184,256 @@ namespace Yavsc.Model { } } + public static string Description { + get { + return ResourceManager.GetString("Description", resourceCulture); + } + } + + public static string Google_error { + get { + return ResourceManager.GetString("Google_error", resourceCulture); + } + } + + public static string Comment { + get { + return ResourceManager.GetString("Comment", resourceCulture); + } + } + + public static string Tex_version { + get { + return ResourceManager.GetString("Tex_version", resourceCulture); + } + } + + public static string Item_added_to_basket { + get { + return ResourceManager.GetString("Item_added_to_basket", resourceCulture); + } + } + + public static string ImportException { + get { + return ResourceManager.GetString("ImportException", resourceCulture); + } + } + + public static string Product_reference { + get { + return ResourceManager.GetString("Product_reference", resourceCulture); + } + } + + public static string Hide { + get { + return ResourceManager.GetString("Hide", resourceCulture); + } + } + + public static string Register { + get { + return ResourceManager.GetString("Register", resourceCulture); + } + } + + public static string Tag_name { + get { + return ResourceManager.GetString("Tag_name", resourceCulture); + } + } + + public static string New_Tag { + get { + return ResourceManager.GetString("New_Tag", resourceCulture); + } + } + + public static string Modify { + get { + return ResourceManager.GetString("Modify", resourceCulture); + } + } + + public static string Remove { + get { + return ResourceManager.GetString("Remove", resourceCulture); + } + } + + public static string Title { + get { + return ResourceManager.GetString("Title", resourceCulture); + } + } + + public static string Logout { + get { + return ResourceManager.GetString("Logout", resourceCulture); + } + } + + public static string Message_sent { + get { + return ResourceManager.GetString("Message_sent", resourceCulture); + } + } + + public static string Offline { + get { + return ResourceManager.GetString("Offline", resourceCulture); + } + } + + public static string Bill_edition { + get { + return ResourceManager.GetString("Bill_edition", resourceCulture); + } + } + + public static string InternalServerError { + get { + return ResourceManager.GetString("InternalServerError", resourceCulture); + } + } + + public static string MaxDate { + get { + return ResourceManager.GetString("MaxDate", resourceCulture); + } + } + + public static string Welcome { + get { + return ResourceManager.GetString("Welcome", resourceCulture); + } + } + + public static string Edit { + get { + return ResourceManager.GetString("Edit", resourceCulture); + } + } + + public static string Date_search { + get { + return ResourceManager.GetString("Date_search", resourceCulture); + } + } + + public static string View_source { + get { + return ResourceManager.GetString("View_source", resourceCulture); + } + } + + public static string role_created { + get { + return ResourceManager.GetString("role_created", resourceCulture); + } + } + + public static string ReadMore { + get { + return ResourceManager.GetString("ReadMore", resourceCulture); + } + } + + public static string EndDate { + get { + return ResourceManager.GetString("EndDate", resourceCulture); + } + } + + public static string MinDate { + get { + return ResourceManager.GetString("MinDate", resourceCulture); + } + } + + public static string Remember_me { + get { + return ResourceManager.GetString("Remember_me", resourceCulture); + } + } + + public static string Home { + get { + return ResourceManager.GetString("Home", resourceCulture); + } + } + + public static string Consultant { + get { + return ResourceManager.GetString("Consultant", resourceCulture); + } + } + public static string was_added_to_the_role { get { return ResourceManager.GetString("was_added_to_the_role", resourceCulture); } } + + public static string DoTag { + get { + return ResourceManager.GetString("DoTag", resourceCulture); + } + } + + public static string DocTemplateException { + get { + return ResourceManager.GetString("DocTemplateException", resourceCulture); + } + } + + public static string no_content { + get { + return ResourceManager.GetString("no_content", resourceCulture); + } + } + + public static string Unitary_cost { + get { + return ResourceManager.GetString("Unitary_cost", resourceCulture); + } + } + + public static string Online { + get { + return ResourceManager.GetString("Online", resourceCulture); + } + } + + public static string StartDate { + get { + return ResourceManager.GetString("StartDate", resourceCulture); + } + } + + public static string Hide_source { + get { + return ResourceManager.GetString("Hide_source", resourceCulture); + } + } + + public static string User_List { + get { + return ResourceManager.GetString("User List", resourceCulture); + } + } + + public static string Profile_edition { + get { + return ResourceManager.GetString("Profile_edition", resourceCulture); + } + } + + public static string My_Estimates { + get { + return ResourceManager.GetString("My_Estimates", resourceCulture); + } + } } } diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index 7fbb8551..39b65d9d 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -41,6 +41,7 @@ Erreur serveur interne Article ajouté au panier Lieu + Déconnection Date maximale du rendez-vous Membres Votre message a été envoyé diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index 001024eb..f7d0f4cd 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -43,6 +43,7 @@ Exception at importing Item added to basket Location + Logout Maximal date for the rendez-vous Members Your message has been sent. diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj index 0b691e62..3c52222e 100644 --- a/yavscModel/YavscModel.csproj +++ b/yavscModel/YavscModel.csproj @@ -174,6 +174,10 @@ + + + +