From 210c9bed58cc6648de22ff381ae6e74c7e635dd9 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Sat, 31 Jan 2015 16:17:20 +0100
Subject: [PATCH] * Makefile: typo

* ResultPages.cs: Documentation

* Global.asax.cs: cleanning

* packages.config: Newtonsoft.Json update
---
 Makefile                   |  2 +-
 WebControls/ResultPages.cs | 13 ++++++++++---
 web/Global.asax.cs         |  6 ------
 web/packages.config        |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a8098505..acf217a3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ DESTDIR=build/web/$(CONFIG)
 COPYUNCHANGED="false"
 LOCALHOSTDIR=localhost:/srv/www/lua
 TESTHOSTDIR=localhost:/srv/www/yavsc
-PREPRODHOSTDIR=lua.localdomain:/srv/yavsc
+PREPRODHOSTDIR=lua.localdomain:/srv/www/yavsc
 PRODHOSTDIR=lua.localdomain:/srv/www/lua
 DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll
 
diff --git a/WebControls/ResultPages.cs b/WebControls/ResultPages.cs
index 79e9b402..39c6bf8d 100644
--- a/WebControls/ResultPages.cs
+++ b/WebControls/ResultPages.cs
@@ -86,7 +86,10 @@ namespace Yavsc.WebControls
 				ViewState["CurrentPage"]  = value;
 			}
 		}
-
+		/// <summary>
+		/// Renders the contents as the list of links to pages of results.
+		/// </summary>
+		/// <param name="writer">Writer.</param>
 		protected override void RenderContents (HtmlTextWriter writer)
 		{
 			if (ResultCount > 0 &&  ResultCount > ResultsPerPage ) {
@@ -105,11 +108,15 @@ namespace Yavsc.WebControls
 					writer.RenderEndTag ();
 					writer.Write ("&nbsp;");
 				}
+			} 
+
+			if (ResultCount == 0) {
+				writer.Write ("Pas de resultat");
+			} else {
 				writer.Write (ResultCount.ToString () + " resultat");
 				if (ResultCount>1) writer.Write("s");
-			} else if ( ResultCount == 0 ) {
-				writer.Write ("Pas de resultat");
 			}
+
 		}
 	}
 }
diff --git a/web/Global.asax.cs b/web/Global.asax.cs
index fed7766c..345e8dd8 100644
--- a/web/Global.asax.cs
+++ b/web/Global.asax.cs
@@ -35,12 +35,6 @@ namespace Yavsc
 				"Blog/{user}/{title}",
 				new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional }
 			); 
-
-			/*routes.MapRoute (
-				"Default", 
-				"{controller}/{action}/{id}",
-				new { controller = "Home", action = "Index", id = UrlParameter.Optional }
-				);*/
 			routes.MapRoute (
 				"Default",
 				"{controller}/{action}/{user}/{title}",
diff --git a/web/packages.config b/web/packages.config
index a676dd8c..d5accee7 100644
--- a/web/packages.config
+++ b/web/packages.config
@@ -3,6 +3,6 @@
   <package id="jQuery" version="2.1.3" targetFramework="net45" />
   <package id="jquery-globalize" version="0.1.3" targetFramework="net45" />
   <package id="log4net" version="2.0.3" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
   <package id="PayPalCoreSDK" version="1.6.0" targetFramework="net451" />
 </packages>
\ No newline at end of file