From 441a0fed32971b7e9f0167af86fa53e1cc3ab410 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 22 Oct 2015 20:37:41 +0200 Subject: [PATCH] little improvments * style.css: no max width for panels, it's too abstract for a notion * RemovePost.aspx: Adds a Title and fixes the action call * Contact.aspx: cleans the code from totem * LocalizedText.resx: * LocalizedText.fr.resx: * LocalizedText.Designer.cs: * LocalizedText.fr.Designer.cs: Localizes a "bill removal" --- web/App_Themes/style.css | 2 +- web/ChangeLog | 9 +++++++++ web/Views/Blogs/RemovePost.aspx | 4 ++-- web/Views/Home/Contact.aspx | 25 ++++++++++++------------- yavscModel/ChangeLog | 7 +++++++ yavscModel/LocalizedText.Designer.cs | 6 ++++++ yavscModel/LocalizedText.fr.Designer.cs | 6 ++++++ yavscModel/LocalizedText.fr.resx | 1 + yavscModel/LocalizedText.resx | 1 + 9 files changed, 45 insertions(+), 16 deletions(-) diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index d15e3ff7..c43f8935 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -156,7 +156,7 @@ textarea.fullwidth { min-height:10em; } display:inline; bottom:0; } -.panel { max-width: 24em; display:inline-block; } +.panel { display:inline-block; } .panel,.bshpanel, aside { background-color: rgba(20,20,20,.8); diff --git a/web/ChangeLog b/web/ChangeLog index 965c18c0..8521bdef 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,12 @@ +2015-10-22 Paul Schneider + + * style.css: no max width for panels, it's too abstract for a + notion + + * RemovePost.aspx: Adds a Title and fixes the action call + + * Contact.aspx: cleans the code from totem + 2015-10-20 Paul Schneider * Web.config: diff --git a/web/Views/Blogs/RemovePost.aspx b/web/Views/Blogs/RemovePost.aspx index 9e4917db..dbcfaa76 100644 --- a/web/Views/Blogs/RemovePost.aspx +++ b/web/Views/Blogs/RemovePost.aspx @@ -1,9 +1,9 @@ -<%@ Page Title="" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> +<%@ Page Title="Bill_removal" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> <%= Html.ValidationSummary() %> -<% using (Html.BeginForm("RemovePost","Blogs",new {id=Model.Id})) { %> +<% using (Html.BeginForm("RemovePost","Blogs",new {postid=Model.Id})) { %> <%= Html.LabelFor(model => model.Title) %> : <%= Html.TextBox( "Title" ) %> diff --git a/web/Views/Home/Contact.aspx b/web/Views/Home/Contact.aspx index 74119cc9..0c30f7cc 100644 --- a/web/Views/Home/Contact.aspx +++ b/web/Views/Home/Contact.aspx @@ -1,6 +1,16 @@ <%@ Page Title="Contact" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> +
+

+Directeur :
+Adresse postale :
+Tél. : +33
+Tél. : +33
+SIREN :
+SIRET :
+Activité Principalement Exercée (APE) :
+

<% using (Html.BeginForm("Contact", "Home")) { %>
Message @@ -21,18 +31,7 @@

"> -

-Directeur : Boudjouraf Brahim
-Adresse postale : 29 rue des près, 92 71200 LE CREUSOT
-Tél. : +33 6.58.91.36.78
-Tél. : +33 6.78.65.36.31
-Facebook : Brahms Totem Officiel (Totem Prod)
-Twitter : Totem Officiel
-Skyblog : Totem-Production.skyrock.com
-SIREN : 517 942 991
-SIRET : 517 942 991 000 12
-Activité Principalement Exercée (APE) : 9329Z Autres activités récréatives et de loisirs
-

-<% } %> +<% } %> +
 \ No newline at end of file diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 5780490d..a52af342 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,10 @@ +2015-10-22 Paul Schneider + + * LocalizedText.resx: + * LocalizedText.fr.resx: + * LocalizedText.Designer.cs: + * LocalizedText.fr.Designer.cs: Localizes a "bill removal" + 2015-10-19 Paul Schneider * YavscModel.csproj: diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index 37925958..822de80c 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -268,6 +268,12 @@ namespace Yavsc.Model { } } + public static string Bill_removal { + get { + return ResourceManager.GetString("Bill_removal", resourceCulture); + } + } + public static string Modify { get { return ResourceManager.GetString("Modify", resourceCulture); diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index cf627045..0f359176 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -256,6 +256,12 @@ namespace Yavsc.Model { } } + public static string Bill_removal { + get { + return ResourceManager.GetString("Bill_removal", resourceCulture); + } + } + public static string Modify { get { return ResourceManager.GetString("Modify", resourceCulture); diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index f46744dd..1e25b2da 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -15,6 +15,7 @@ Accès refusé Édition d'un billet + Suppression d'un billet Consultant Nombre Chiffre diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index f7d0f4cd..aa9c14fd 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -14,6 +14,7 @@ Access denied Bill edition + Bill removal Create Count Ciffer