From 347ffc8a5a529af562d6c1d4dc126e27a6e49b9c Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Tue, 7 Oct 2014 23:15:56 +0200
Subject: [PATCH] * Tests.cs: * Web.csproj: * T.cs: * Global.asax.cs: *
 UserPost.aspx: * UserPosts.aspx:

* HomeController.cs: * Request.UserLanguages may be null

* App.master: a side

* README: yavsc

* TestByteA.cs: if TEST only

* Profile.aspx: nicer

* Web.config: no need of Newtonsoft.Json

* style.css: little buttons

* T.cs: moved to helpers ...
---
 web/Controllers/HomeController.cs |  4 +++-
 web/Global.asax.cs                |  4 ++--
 web/{Controllers => Helpers}/T.cs |  0
 web/Models/App.master             |  5 +++++
 web/README                        |  2 +-
 web/Test/TestByteA.cs             |  2 ++
 web/Tests.cs                      | 19 -------------------
 web/Views/Account/Profile.aspx    |  2 +-
 web/Views/Blogs/UserPost.aspx     |  9 +++++++++
 web/Views/Blogs/UserPosts.aspx    |  7 +------
 web/Web.config                    | 15 ++++++---------
 web/Web.csproj                    |  9 ++-------
 web/style.css                     |  2 ++
 13 files changed, 34 insertions(+), 46 deletions(-)
 rename web/{Controllers => Helpers}/T.cs (100%)
 delete mode 100644 web/Tests.cs

diff --git a/web/Controllers/HomeController.cs b/web/Controllers/HomeController.cs
index c4e54ffb..c972236a 100644
--- a/web/Controllers/HomeController.cs
+++ b/web/Controllers/HomeController.cs
@@ -68,7 +68,9 @@ namespace Yavsc.Controllers
 		public void InitCulture() { 
 			CultureInfo culture = null;
 			string defaultCulture = "fr";
-
+			if (Request.UserLanguages==null)
+				culture = CultureInfo.CreateSpecificCulture(defaultCulture);
+			else
 			if (Request.UserLanguages.Length > 0) {
 				try {
 				culture = new CultureInfo (Request.UserLanguages [0]);
diff --git a/web/Global.asax.cs b/web/Global.asax.cs
index d42253d7..73321a12 100644
--- a/web/Global.asax.cs
+++ b/web/Global.asax.cs
@@ -30,8 +30,8 @@ namespace Yavsc
 
 			routes.MapRoute (
 				"Default",
-				"{controller}/{action}/{id}",
-				new { controller = "Home", action = "Index", id = "" }
+				"{controller}/{action}/{user}",
+				new { controller = "Home", action = "Index", user="" }
 			);
 
 		}
diff --git a/web/Controllers/T.cs b/web/Helpers/T.cs
similarity index 100%
rename from web/Controllers/T.cs
rename to web/Helpers/T.cs
diff --git a/web/Models/App.master b/web/Models/App.master
index 538e5478..27290821 100644
--- a/web/Models/App.master
+++ b/web/Models/App.master
@@ -59,6 +59,11 @@
 
 		</asp:ContentPlaceHolder>
    </main>
+   <aside>
+   <asp:ContentPlaceHolder ID="MASContent" runat="server">
+		</asp:ContentPlaceHolder>
+	</aside>
+
    <footer>
    <hr/>
      <%= string.Join("\n",Yavsc.ThanksHelper.Links()) %>
diff --git a/web/README b/web/README
index c999c3dd..ff3a63f8 100644
--- a/web/README
+++ b/web/README
@@ -18,7 +18,7 @@ You may contact me at <paulschneider@free.fr>
 
 -------
 
-Yavsc ("Mon Auto Entreprise")
+Yavsc ("Yet Another Very Small Company")
 
 Les services :
 
diff --git a/web/Test/TestByteA.cs b/web/Test/TestByteA.cs
index bad66d98..7215db1f 100644
--- a/web/Test/TestByteA.cs
+++ b/web/Test/TestByteA.cs
@@ -1,3 +1,4 @@
+#if TEST
 using NUnit.Framework;
 using System;
 using System.Configuration;
@@ -85,3 +86,4 @@ namespace Yavsc
 	}
 }
 
+#endif
\ No newline at end of file
diff --git a/web/Tests.cs b/web/Tests.cs
deleted file mode 100644
index 975f22a3..00000000
--- a/web/Tests.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#if TEST
-
-using System;
-using NUnit.Framework;
-
-namespace Yavsc
-{
-	[TestFixture()]
-	public class Tests
-	{
-		[Test()]
-		public void TestCase ()
-		{
-		}
-	}
-}
-
-#endif
diff --git a/web/Views/Account/Profile.aspx b/web/Views/Account/Profile.aspx
index 1e650255..320fa5dd 100644
--- a/web/Views/Account/Profile.aspx
+++ b/web/Views/Account/Profile.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="Profile" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<yavscModel.RolesAndMembers.Profile>" %>
+<%@ Page Title="Profile" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<Profile>" %>
 
 <asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
 <% Title = ViewData["UserName"]+" at "+ YavscHelpers.SiteName +" - profile edition" ; %>
diff --git a/web/Views/Blogs/UserPost.aspx b/web/Views/Blogs/UserPost.aspx
index 44bb14a2..ceb5967f 100644
--- a/web/Views/Blogs/UserPost.aspx
+++ b/web/Views/Blogs/UserPost.aspx
@@ -39,3 +39,12 @@
 	  </div>
 
 </asp:Content>
+	  <asp:Content ContentPlaceHolderID="MASContent" ID="mas1" runat="server">
+	  <% 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" } ) %>
+	 <% } %>
+
+	 </asp:Content>
\ No newline at end of file
diff --git a/web/Views/Blogs/UserPosts.aspx b/web/Views/Blogs/UserPosts.aspx
index fd839a7a..e0baa842 100644
--- a/web/Views/Blogs/UserPosts.aspx
+++ b/web/Views/Blogs/UserPosts.aspx
@@ -18,12 +18,7 @@
 <div class="metablog">(<%= e.Posted.ToString("yyyy/MM/dd") %>
 	 - <%= e.Modified.ToString("yyyy/MM/dd") %> <%= e.Visible? "":", Invisible!" %>)
 </div>
-<% if (Membership.GetUser()!=null)
-	if (Membership.GetUser().UserName==e.UserName)
-	 { %>
-	 <%= Html.ActionLink("Editer","Edit", new { user = e.UserName, title = e.Title }, new { @class="actionlink" }) %>
-	 <%= Html.ActionLink("Supprimer","RemovePost", new { user = e.UserName, title = e.Title }, new { @class="actionlink" } ) %>
-	 <% } %>
+
 </div>
 <% } %>
 	
diff --git a/web/Web.config b/web/Web.config
index 3612e3b1..2823b313 100644
--- a/web/Web.config
+++ b/web/Web.config
@@ -55,7 +55,6 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
         <add assembly="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
         <add assembly="Npgsql, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7" />
         <add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-        <add assembly="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
         <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
         <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
         <add assembly="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
@@ -63,15 +62,15 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
         <add assembly="System.ServiceModel.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
         <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
         <add assembly="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-        <add assembly="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=c7439020c8fedf87" />
         <add assembly="System.Configuration.Install, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
         <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
         <add assembly="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <add assembly="System.Web.Http.WebHost" />
-        <add assembly="System.Net.Http.Formatting" />
+        <add assembly="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        <add assembly="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
       </assemblies>
     </compilation>
-    <!-- samarcheupa
+    <customErrors mode="Off" />
+    <!-- 
     <customErrors mode="RemoteOnly" defaultRedirect="~/errors/GeneralError.aspx">
       <error statusCode="404" redirect="~/errors/PageNotFound.aspx" />
     </customErrors> -->
@@ -154,9 +153,8 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
         <add name="Postgresql" url="http://www.postgresql.org" image="/images/pgsql.png" />
       </to>
     </thanks>
-    <machineKey validationKey="13CA2E37A5A99AD8CE4A6B895BAF0ED3A022AA584B8D922256BA072189CEB085EEB4E573CA833D9B34FBF68687F6A6B3E008FB4EB67585A4D90551B9D36D42A1" decryptionKey="DA89CC83F6FB2EB12D5929DABC89299AC3928E0751705D33D02DB4162ED56536" validation="SHA1" decryption="AES" />
-    <!--- <sessionState cookieless="true"
-      regenerateExpiredSessionId="true" timeout="120"/> -->
+    <!-- <machineKey validationKey="13CA2E37A5A99AD8CE4A6B895BAF0ED3A022AA584B8D922256BA072189CEB085EEB4E573CA833D9B34FBF68687F6A6B3E008FB4EB67585A4D90551B9D36D42A1" decryptionKey="DA89CC83F6FB2EB12D5929DABC89299AC3928E0751705D33D02DB4162ED56536" validation="SHA1" decryption="AES" /> -->
+    <!--- <sessionState cookieless="true" regenerateExpiredSessionId="true" timeout="120"/> -->
   </system.web>
   <system.codedom>
     <compilers>
@@ -217,6 +215,5 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
     <add key="Name" value="Psc" />
     <add key="DefaultAvatar" value="/images/noavatar.png;image/png" />
     <add key="RegistrationMessage" value="/RegistrationMail.txt" />
-    <add key="YavscWebApiUrl" value="http://localhost:8081" />
   </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/web/Web.csproj b/web/Web.csproj
index 73e6b1f9..b3fc74d9 100644
--- a/web/Web.csproj
+++ b/web/Web.csproj
@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin</OutputPath>
-    <DefineConstants>DEBUG;TEST</DefineConstants>
+    <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -62,7 +62,6 @@
     <Reference Include="Npgsql" />
     <Reference Include="System.Data" />
     <Reference Include="System.Security" />
-    <Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
     <Reference Include="CodeKicker.BBCode">
       <HintPath>lib\CodeKicker.BBCode.dll</HintPath>
     </Reference>
@@ -73,9 +72,6 @@
     <Reference Include="System.ServiceModel.Routing" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=c7439020c8fedf87">
-      <Package>monodevelop</Package>
-    </Reference>
     <Reference Include="System.Web.Http.WebHost">
       <HintPath>..\..\..\..\..\usr\lib\mono\4.5\System.Web.Http.WebHost.dll</HintPath>
       <Private>False</Private>
@@ -120,7 +116,6 @@
     <Compile Include="Thanks\ThanksHelper.cs" />
     <Compile Include="Controllers\BlogsController.cs" />
     <Compile Include="Views\RegisterPage.cs" />
-    <Compile Include="Tests.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Helpers\BBCodeHelper.cs" />
     <Compile Include="Test\TestByteA.cs" />
@@ -129,7 +124,6 @@
     <Compile Include="Admin\Export.cs" />
     <Compile Include="Admin\DataManager.cs" />
     <Compile Include="Admin\TaskOutput.cs" />
-    <Compile Include="Controllers\T.cs" />
     <Compile Include="Controllers\FileSystemController.cs" />
     <Compile Include="CatExts\WebCatalogExtensions.cs" />
     <Compile Include="Controllers\WorkFlowController.cs" />
@@ -140,6 +134,7 @@
     <Compile Include="MvcActionValueBinder.cs" />
     <Compile Include="Controllers\BlogsApiController.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Helpers\T.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Web.config" />
diff --git a/web/style.css b/web/style.css
index 42350dac..838b2204 100644
--- a/web/style.css
+++ b/web/style.css
@@ -8,6 +8,7 @@ body {
 	padding:1em;
 	font-family: 'Arial', cursive;
 }
+	aside { float: right; }
 
 video,img {
 	max-width:100%;
@@ -108,6 +109,7 @@ padding-left: 20px;
    padding: 4px;
 	border-radius:25px;
    background-color:rgba(0,0,64,0.7);
+   font-size:x-small;
 }
 
 .code {