From d394c3842eb1118d46bdcee985d2ba7b08a0586c Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 23 Dec 2015 19:38:00 +0100
Subject: [PATCH] * .gitignore: une typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Web.config: Ajoute le paramètre obligatoire "Themes" au fichier de
  configuration

* WorkFlowManager.cs: une note à faire : envoyer le lieu de la
  prestation à la demande de devis

* YavscHelpers.cs: fixe l'absence de configuration des thèmes
  disponibles
---
 .gitignore                             | 2 +-
 ChangeLog                              | 4 ++++
 web/ChangeLog                          | 8 ++++++++
 web/Helpers/YavscHelpers.cs            | 4 ++--
 web/Web.config                         | 5 +++--
 yavscModel/ChangeLog                   | 5 +++++
 yavscModel/WorkFlow/WorkFlowManager.cs | 1 +
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0c1febb..96a48f3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ web/Web.Debug.config
 web/Web.Release.config
 web/Web.Lua.config
 web/Web.TotemPre.config
-web/Web.TotemProd.config
+web/Web.Totemprod.config
 .nuget
 .gitignore
 web/Web.YavscPre.config
diff --git a/ChangeLog b/ChangeLog
index 6c87b1a5..e83fc68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-23  Paul Schneider  <paul@pschneider.fr>
+
+	* .gitignore: une typo
+
 2015-12-15  Paul Schneider  <paul@pschneider.fr>
 
 	* Makefile: utilise le fichier de conf généré pour débugger.
diff --git a/web/ChangeLog b/web/ChangeLog
index 546c3f33..b9ad517c 100644
--- a/web/ChangeLog
+++ b/web/ChangeLog
@@ -1,3 +1,11 @@
+2015-12-23  Paul Schneider  <paul@pschneider.fr>
+
+	* Web.config: Ajoute le paramètre obligatoire "Themes" au
+	fichier de configuration
+
+	* YavscHelpers.cs: fixe l'absence de configuration des thèmes
+	disponibles
+
 2015-12-23  Paul Schneider  <paul@pschneider.fr>
 
 	* blanc.png:
diff --git a/web/Helpers/YavscHelpers.cs b/web/Helpers/YavscHelpers.cs
index 973c9b0a..9595d2d9 100644
--- a/web/Helpers/YavscHelpers.cs
+++ b/web/Helpers/YavscHelpers.cs
@@ -406,8 +406,8 @@ namespace Yavsc.Helpers
 		/// <param name="baseName">Base name.</param>
 		public static IHtmlString ThemeCSSLinks (
 			this System.Web.Mvc.HtmlHelper html, string theme, string baseName) {
-
-			if (!AvailableThemes.Contains (theme))
+			if (AvailableThemes==null) return null;
+			if (!AvailableThemes.Contains (theme)) 
 			if (AvailableThemes.Length > 0)
 				theme = AvailableThemes [0];
 			else
diff --git a/web/Web.config b/web/Web.config
index d6c86d9a..841bf4a8 100644
--- a/web/Web.config
+++ b/web/Web.config
@@ -273,13 +273,14 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
     <add key="AdminEMail" value="[YOUR_ADMIN_EMAIL]" />
     <add key="OwnerEMail" value="[YOUR_OWNER_EMAIL]" />
     <add key="Name" value="[YOUR_SITE_NAME]" />
+    <add key="Themes" value="clear,dark,itdark,itclear,blue,green,base" />
     <add key="DefaultAvatar" value="/App_Themes/images/noavatar.png;image/png" />
     <add key="RegistrationMessage" value="/RegistrationMail.txt" />
     <!-- <add key="ClientValidationEnabled" value="true" />
-		<add key="UnobtrusiveJavaScriptEnabled" value="true" /> -->
+	<add key="UnobtrusiveJavaScriptEnabled" value="true" /> -->
     <add key="PayPalLogger" value="PayPal.Log.Log4netLogger" />
     <add key="GOOGLE_API_KEY" value="[YOUR_GOOGLE_API_KEY]" />
     <add key="GOOGLE_CLIENT_ID" value="[YOUR_GOOGLE_CLIENT_ID.apps.googleusercontent.com]" />
     <add key="GOOGLE_CLIENT_SECRET" value="[YOUR_GOOGLE_CLIENT_SECRET]" />
   </appSettings>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog
index 0bc3e1ed..ff779cbe 100644
--- a/yavscModel/ChangeLog
+++ b/yavscModel/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-23  Paul Schneider  <paul@pschneider.fr>
+
+	* WorkFlowManager.cs: une note à faire : envoyer le lieu de la
+	prestation à la demande de devis
+
 2015-12-23  Paul Schneider  <paul@pschneider.fr>
 
 	* EventCirclesPub.cs:
diff --git a/yavscModel/WorkFlow/WorkFlowManager.cs b/yavscModel/WorkFlow/WorkFlowManager.cs
index 6794db3e..619970eb 100644
--- a/yavscModel/WorkFlow/WorkFlowManager.cs
+++ b/yavscModel/WorkFlow/WorkFlowManager.cs
@@ -84,6 +84,7 @@ namespace Yavsc.Model.WorkFlow
 				NominativeEventPub ev = new NominativeEventPub ();
 				ev.PerformerName = cmdn.PerformerName;
 				ev.Description = com.GetDescription ();
+				// TODO send a location
 				GoogleHelpers.NotifyEvent (ev);
 			}
 			return cmdid;