paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Makefile: typo

Browse Source 
* ResultPages.cs: Documentation

* Global.asax.cs: cleanning

* packages.config: Newtonsoft.Json update
This commit is contained in:
Paul Schneider
2015-01-31 16:17:20 +01:00
parent 5d19dc2dcf
commit 210c9bed58
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ DESTDIR=build/web/$(CONFIG)
COPYUNCHANGED="false" COPYUNCHANGED="false"
LOCALHOSTDIR=localhost:/srv/www/lua LOCALHOSTDIR=localhost:/srv/www/lua
TESTHOSTDIR=localhost:/srv/www/yavsc TESTHOSTDIR=localhost:/srv/www/yavsc
PREPRODHOSTDIR=lua.localdomain:/srv/yavsc PREPRODHOSTDIR=lua.localdomain:/srv/www/yavsc
PRODHOSTDIR=lua.localdomain:/srv/www/lua PRODHOSTDIR=lua.localdomain:/srv/www/lua
DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll

13
WebControls/ResultPages.cs
View File

@ -86,7 +86,10 @@ namespace Yavsc.WebControls
ViewState["CurrentPage"] = value; 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) protected override void RenderContents (HtmlTextWriter writer)
{ {
if (ResultCount > 0 && ResultCount > ResultsPerPage ) { if (ResultCount > 0 && ResultCount > ResultsPerPage ) {
@ -105,11 +108,15 @@ namespace Yavsc.WebControls
writer.RenderEndTag (); writer.RenderEndTag ();
writer.Write ("&nbsp;"); writer.Write ("&nbsp;");
} }
}
if (ResultCount == 0) {
writer.Write ("Pas de resultat");
} else {
writer.Write (ResultCount.ToString () + " resultat"); writer.Write (ResultCount.ToString () + " resultat");
if (ResultCount>1) writer.Write("s"); if (ResultCount>1) writer.Write("s");
} else if ( ResultCount == 0 ) {
writer.Write ("Pas de resultat");
} }
} }
} }
} }

6
web/Global.asax.cs
View File

@ -35,12 +35,6 @@ namespace Yavsc
"Blog/{user}/{title}", "Blog/{user}/{title}",
new { controller = "Blogs", action = "Index", user=UrlParameter.Optional, title = UrlParameter.Optional } 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 ( routes.MapRoute (
"Default", "Default",
"{controller}/{action}/{user}/{title}", "{controller}/{action}/{user}/{title}",

2
web/packages.config
View File

@ -3,6 +3,6 @@
<package id="jQuery" version="2.1.3" targetFramework="net45" /> <package id="jQuery" version="2.1.3" targetFramework="net45" />
<package id="jquery-globalize" version="0.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="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" /> <package id="PayPalCoreSDK" version="1.6.0" targetFramework="net451" />
</packages> </packages>