recupération de mot de passe + prise de commande
* ResetPassword.txt: Un message pour le mot de passe oublié
* style.css: fixe un 404
* UpdatePassword.aspx: Implémente le formulaire de mise à jour du mot
de passe,
accessible depuis l'e-mail.
* Contact.aspx: implémente la page de contact préstataire
* UpdatePassword.cs: modèle de la modification de mot de passe au
jeton de securité (qui est encore un fake en l'état)
* CommandRegistration.cs: un enregistrement de commande
* NominativeCommandRegistration.cs: un enregistrement de commande
nominative
* .gitignore: ignore ma config LuaDebug
* NpgsqlMembershipProvider.cs: ne pas crasher à la lecture en base de
la question de
recupération du mot de passe quand elle est nulle.
* BasketController.cs: renvoie l'objet décrivant la prise de commande
* Global.asax.cs: ignorer les routes vers App_Data et App_Code
* instdbws.sql: passage du type json à jsonb pour les paramètres de la
commande
* RegistrationMail.txt: un piti message à l'enregistrement
* AccountController.cs: Envoi du message du mot de passe oublié,
methode de changemnet du mot de passe.
* AdminController.cs: xmldoc + refabrication helper Notify
* HomeController.cs:
* BlogsController.cs:
* GoogleController.cs: refabrication helper Notify
* FrontOfficeController.cs: Refabrication: Utilisation du nouvel
enregistrement de commande.
+ refabrication helper Notify
* YavscHelpers.cs: implémente la methode d'envoi du message de mot de
passe oublié
+ refabrication helper Notify
* App.master: Corrige la notification Html
* AppAdmin.master: Le lien vers la page de contact était associé
à tort à la classe css "thanks"
* yavsc.js: message plus parlant en cas de requête Ajax mal formée.
* Login.aspx: Implémente le lien vers le formulaire de recupération du
mot de passe
* UserPost.aspx: .
* Booking.aspx: format du code
* Performer.ascx: l'e-mail préstataire ne sera jamais fourni par
l'application,
aussi, on parlera de "prendre contact", d'échanger ... mais pas de
donner l'adresse e-mail.
L'information "son email" n'est donc pas disponible meme à
l'utilisateur autorisé.
La prise de contact, ou autre fux de comunication le sont.
* Performers.aspx: affiche la notification à l'envoi de la demande de
devis
* Product.aspx:
* Service.aspx: les periodes du catalogue et du calendrier sont
fondue.
* Contact.aspx: traduction en français
* Web.config:
* la procédure de recupération du mot de passe est
activée
* l'e-message envoyé est construit à partir d'un modèle, un fichier
texte trouvé dans /App_Data, et indiqué à l'application
par le paramêtre applicatif "LostPasswordMessage"
* Yavsc.csproj: reference les nouveaux fichiers
* Product.cs: utilise la période du calendrier
* Commande.cs: renvoie un objet à la prise de commande, indiquant
l'identifiant de commande, et les messages envoyés
en cas de commande nominative.
* GoogleHelpers.cs: icone à la notification mobile
* LocalizedText.resx:
* LocalizedText.fr.resx:
* LocalizedText.Designer.cs:
* LocalizedText.fr.Designer.cs: traductions
* UserNameBase.cs: fixe la dé-sérialisation
* WorkFlowManager.cs: refabrication de la prise de commande
* YavscModel.csproj: nouveaux objets du modèle
* OtherWebException.aspx: page obsolete
* Period.cs: fondre la période: celle du catalogue disparait, au
profit de celle du calendrier.
This commit is contained in:
parent
5a4179d051
commit
a14e63d26f
49 changed files with 793 additions and 218 deletions
|
|
@ -42,7 +42,7 @@ namespace Yavsc.ApiControllers
|
|||
/// <summary>
|
||||
/// Create the specified basket item using specified command parameters.
|
||||
/// </summary>
|
||||
public long Create()
|
||||
public CommandRegistration Create()
|
||||
{
|
||||
return YavscHelpers.CreateCommandFromRequest ();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ namespace Yavsc
|
|||
routes.IgnoreRoute ("{resource}.axd/{*pathInfo}"); // not used
|
||||
routes.IgnoreRoute ("Scripts/{*pathInfo}"); // web user side scripts
|
||||
routes.IgnoreRoute ("App_Theme/{*pathInfo}"); // sites themes
|
||||
routes.IgnoreRoute ("App_Data/{*pathInfo}"); // sites themes
|
||||
routes.IgnoreRoute ("App_Code/{*pathInfo}"); // sites themes
|
||||
routes.IgnoreRoute ("users/{*pathInfo}"); // user's files
|
||||
routes.IgnoreRoute ("avatars/{*pathInfo}"); // user's avatar
|
||||
routes.IgnoreRoute ("bfiles/{*pathInfo}"); // Blog files
|
||||
|
|
|
|||
|
|
@ -214,10 +214,11 @@ CREATE TABLE commandes
|
|||
id bigserial NOT NULL, -- Identifiant unique de commande e, cours
|
||||
validation date, -- Date de validation
|
||||
prdref character varying(255) NOT NULL, -- Product reference from the unique valid catalog at the validation date
|
||||
creation timestamp with time zone NOT NULL, -- creation date
|
||||
creation timestamp with time zone NOT NULL DEFAULT now(), -- creation date
|
||||
clientname character varying(255), -- user who created the command, client of this command
|
||||
applicationname character varying(255), -- application concerned by this command
|
||||
params json,
|
||||
class character varying(512), -- Classe de commande:...
|
||||
params jsonb,
|
||||
CONSTRAINT commandes_pkey PRIMARY KEY (id),
|
||||
CONSTRAINT commforeignuser FOREIGN KEY (clientname, applicationname)
|
||||
REFERENCES users (username, applicationname) MATCH SIMPLE
|
||||
|
|
@ -226,13 +227,19 @@ CREATE TABLE commandes
|
|||
WITH (
|
||||
OIDS=FALSE
|
||||
);
|
||||
|
||||
ALTER TABLE commandes
|
||||
OWNER TO yavscdev;
|
||||
COMMENT ON COLUMN commandes.id IS 'Identifiant unique de commande e, cours';
|
||||
COMMENT ON COLUMN commandes.validation IS 'Date de validation';
|
||||
COMMENT ON COLUMN commandes.prdref IS 'Product reference from the unique valid catalog at the validation date';
|
||||
COMMENT ON COLUMN commandes.creation IS 'creation date';
|
||||
COMMENT ON COLUMN commandes.clientname IS 'user who created the command, client of this command';
|
||||
COMMENT ON COLUMN commandes.applicationname IS 'application concerned by this command';
|
||||
COMMENT ON COLUMN commandes.class IS 'Classe de commande:
|
||||
Utilisé pour l''instanciation de l''objet du SI,
|
||||
le nom du contrôle Html, et
|
||||
determiner les fournisseurs du Workflow
|
||||
à mettre en oeuvre pour traiter la commande.';
|
||||
|
||||
|
||||
-- Index: fki_commforeignuser
|
||||
|
|
|
|||
|
|
@ -7,3 +7,7 @@ Pour l'activer, veuillez suivre le lien suivant :
|
|||
<%UserActivatonUrl%>
|
||||
|
||||
Merci d'avoir créé un compte utilisateur.
|
||||
|
||||
Puissiez-vous avoir beaucoup de fun.
|
||||
--
|
||||
L'équipe d'administration
|
||||
15
web/App_Data/ResetPassword.txt
Normal file
15
web/App_Data/ResetPassword.txt
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
|
||||
Une demande de mise à jour de votre mot de passe <%SiteName%> a été faite en ligne.
|
||||
|
||||
Vous pouvez changer votre mot de passe en suivant le lien suivant :
|
||||
|
||||
<%UserActivatonUrl%>
|
||||
|
||||
Si vous n'êtes pas à l'origine de cette demande, qu'elle est indésirée,
|
||||
veuillez nous excuser pour la gêne occasionnée, et nous en avertir
|
||||
par retour de ce courrier.
|
||||
|
||||
Que le fun avec vous soit.
|
||||
--
|
||||
l'administration
|
||||
<%SiteName%>
|
||||
1
web/App_Themes/base/style.css
Normal file
1
web/App_Themes/base/style.css
Normal file
|
|
@ -0,0 +1 @@
|
|||
|
||||
|
|
@ -1,3 +1,87 @@
|
|||
2015-12-30 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* ResetPassword.txt: Un message pour le mot de passe oublié
|
||||
|
||||
* style.css: fixe un 404
|
||||
|
||||
* UpdatePassword.aspx: Implémente le formulaire de mise à jour
|
||||
du mot de passe,
|
||||
accessible depuis l'e-mail.
|
||||
|
||||
* Contact.aspx: implémente la page de contact préstataire
|
||||
|
||||
* BasketController.cs: renvoie l'objet décrivant la prise de
|
||||
commande
|
||||
|
||||
* Global.asax.cs: ignorer les routes vers App_Data et App_Code
|
||||
|
||||
* instdbws.sql: passage du type json à jsonb pour les
|
||||
paramètres de la commande
|
||||
|
||||
* RegistrationMail.txt: un piti message à l'enregistrement
|
||||
|
||||
* AccountController.cs: Envoi du message du mot de passe
|
||||
oublié,
|
||||
methode de changemnet du mot de passe.
|
||||
|
||||
* AdminController.cs: xmldoc + refabrication helper Notify
|
||||
|
||||
* HomeController.cs:
|
||||
* BlogsController.cs:
|
||||
* GoogleController.cs: refabrication helper Notify
|
||||
|
||||
* FrontOfficeController.cs: Refabrication: Utilisation du
|
||||
nouvel enregistrement de commande.
|
||||
+ refabrication helper Notify
|
||||
|
||||
* YavscHelpers.cs: implémente la methode d'envoi du message de
|
||||
mot de passe oublié
|
||||
+ refabrication helper Notify
|
||||
|
||||
* App.master: Corrige la notification Html
|
||||
|
||||
* AppAdmin.master: Le lien vers la page de contact était
|
||||
associé
|
||||
à tort à la classe css "thanks"
|
||||
|
||||
* yavsc.js: message plus parlant en cas de requête Ajax mal
|
||||
formée.
|
||||
|
||||
* Login.aspx: Implémente le lien vers le formulaire de
|
||||
recupération du mot de passe
|
||||
|
||||
* UserPost.aspx: .
|
||||
|
||||
* Booking.aspx: format du code
|
||||
|
||||
* Performer.ascx: l'e-mail préstataire ne sera jamais fourni
|
||||
par l'application,
|
||||
aussi, on parlera de "prendre contact", d'échanger ... mais
|
||||
pas de donner l'adresse e-mail.
|
||||
L'information "son email" n'est donc pas disponible meme à
|
||||
l'utilisateur autorisé.
|
||||
La prise de contact, ou autre fux de comunication le sont.
|
||||
|
||||
* Performers.aspx: affiche la notification à l'envoi de la
|
||||
demande de devis
|
||||
|
||||
* Product.aspx:
|
||||
* Service.aspx: les periodes du catalogue et du calendrier
|
||||
sont fondue.
|
||||
|
||||
* Contact.aspx: traduction en français
|
||||
|
||||
* Web.config: * la procédure de recupération du mot de passe
|
||||
est activée
|
||||
* l'e-message envoyé est construit à partir d'un modèle, un
|
||||
fichier texte trouvé dans /App_Data, et indiqué à
|
||||
l'application
|
||||
par le paramêtre applicatif "LostPasswordMessage"
|
||||
|
||||
* Yavsc.csproj: reference les nouveaux fichiers
|
||||
|
||||
* OtherWebException.aspx: page obsolete
|
||||
|
||||
2015-12-24 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* App.master: traductions
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ using System.Net;
|
|||
using System.Configuration;
|
||||
using Yavsc.Model;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
using Yavsc.Model.Messaging;
|
||||
|
||||
namespace Yavsc.Controllers
|
||||
{
|
||||
|
|
@ -62,7 +63,7 @@ namespace Yavsc.Controllers
|
|||
/// <returns>The login.</returns>
|
||||
/// <param name="model">Model.</param>
|
||||
/// <param name="returnUrl">Return URL.</param>
|
||||
[HttpPost,ValidateAntiForgeryToken]
|
||||
[HttpPost,ValidateAntiForgeryToken]
|
||||
public ActionResult Login (LoginModel model, string returnUrl)
|
||||
{
|
||||
if (ModelState.IsValid) {
|
||||
|
|
@ -362,7 +363,7 @@ namespace Yavsc.Controllers
|
|||
FormsAuthentication.SetAuthCookie (model.NewUserName, model.RememberMe);
|
||||
model.UserName = model.NewUserName;
|
||||
}
|
||||
YavscHelpers.Notify(ViewData, "Profile enregistré"+((editsTheUserName)?", nom public inclu.":""));
|
||||
ViewData.Notify( "Profile enregistré"+((editsTheUserName)?", nom public inclu.":""));
|
||||
}
|
||||
SetMEACodeViewData (model);
|
||||
SetUIThemeViewData (model);
|
||||
|
|
@ -404,8 +405,10 @@ namespace Yavsc.Controllers
|
|||
foreach (string key in errors.Keys)
|
||||
ModelState.AddModelError (key, errors [key]);
|
||||
|
||||
if (user != null && ModelState.IsValid)
|
||||
Url.SendActivationMessage (user);
|
||||
if (user != null && ModelState.IsValid) {
|
||||
YavscHelpers.SendNewPasswordMessage (user);
|
||||
ViewData.Notify ( new Notification () { body = LocalizedText.NewPasswordMessageSent } );
|
||||
}
|
||||
}
|
||||
return View (model);
|
||||
}
|
||||
|
|
@ -420,22 +423,69 @@ namespace Yavsc.Controllers
|
|||
{
|
||||
MembershipUser u = Membership.GetUser (id, false);
|
||||
if (u == null) {
|
||||
YavscHelpers.Notify( ViewData,
|
||||
ViewData.Notify(
|
||||
string.Format ("Cet utilisateur n'existe pas ({0})", id));
|
||||
} else if (u.ProviderUserKey.ToString () == key) {
|
||||
if (u.IsApproved) {
|
||||
YavscHelpers.Notify( ViewData,
|
||||
ViewData.Notify(
|
||||
string.Format ("Votre compte ({0}) est déjà validé.", id));
|
||||
} else {
|
||||
u.IsApproved = true;
|
||||
Membership.UpdateUser (u);
|
||||
YavscHelpers.Notify( ViewData,
|
||||
ViewData.Notify(
|
||||
string.Format ("La création de votre compte ({0}) est validée.", id));
|
||||
}
|
||||
} else
|
||||
YavscHelpers.Notify( ViewData, "La clé utilisée pour valider ce compte est incorrecte" );
|
||||
ViewData.Notify( "La clé utilisée pour valider ce compte est incorrecte" );
|
||||
return View ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the password.
|
||||
/// </summary>
|
||||
/// <returns>The password.</returns>
|
||||
/// <param name="id">Identifier.</param>
|
||||
/// <param name="key">Key.</param>
|
||||
[HttpGet]
|
||||
public ActionResult UpdatePassword (string id, string key)
|
||||
{
|
||||
MembershipUser u = Membership.GetUser (id, false);
|
||||
if (u == null) {
|
||||
return Content(
|
||||
string.Format("Cet utilisateur n'existe pas ({0})", id));
|
||||
}
|
||||
if (u.ProviderUserKey.ToString () != key) {
|
||||
return Content("Clé invalide");
|
||||
}
|
||||
ViewData["UserName"] = id;
|
||||
ViewData["UserKey"] = key;
|
||||
return View ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the password.
|
||||
/// </summary>
|
||||
/// <returns>The password.</returns>
|
||||
/// <param name="model">Model.</param>
|
||||
[HttpPost]
|
||||
public ActionResult UpdatePassword (UpdatePassword model)
|
||||
{
|
||||
if (ModelState.IsValid) {
|
||||
if (model.Password == model.ConfirmPassword) {
|
||||
MembershipUser u = Membership.GetUser (model.UserName, false);
|
||||
if (u == null) {
|
||||
return Content(
|
||||
string.Format("Cet utilisateur n'existe pas ({0})", model.UserName));
|
||||
}
|
||||
if (u.ProviderUserKey.ToString () != model.UserKey) {
|
||||
return Content("Clé invalide");
|
||||
}
|
||||
u.ChangePassword(u.GetPassword (),model.Password);
|
||||
ViewData.Notify( "La mise à jour du mot de passe a été effectuée.");
|
||||
return View("Index");
|
||||
}
|
||||
}
|
||||
return View();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace Yavsc.Controllers
|
|||
// FIXME do this in a new installation script.
|
||||
if (!Roles.RoleExists (_adminRoleName)) {
|
||||
Roles.CreateRole (_adminRoleName);
|
||||
YavscHelpers.Notify (ViewData, _adminRoleName + " " + LocalizedText.role_created);
|
||||
ViewData.Notify( _adminRoleName + " " + LocalizedText.role_created);
|
||||
}
|
||||
return View ();
|
||||
}
|
||||
|
|
@ -159,6 +159,13 @@ namespace Yavsc.Controllers
|
|||
return Redirect(returnUrl);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds the user to role.
|
||||
/// </summary>
|
||||
/// <returns>The user to role.</returns>
|
||||
/// <param name="username">Username.</param>
|
||||
/// <param name="rolename">Rolename.</param>
|
||||
/// <param name="returnUrl">Return URL.</param>
|
||||
[Authorize(Roles="Admin")]
|
||||
public ActionResult AddUserToRole(string username, string rolename, string returnUrl)
|
||||
{
|
||||
|
|
@ -178,7 +185,7 @@ namespace Yavsc.Controllers
|
|||
ViewData ["usertoremove"] = username;
|
||||
if (submitbutton == "Supprimer") {
|
||||
Membership.DeleteUser (username);
|
||||
YavscHelpers.Notify(ViewData, string.Format("utilisateur \"{0}\" supprimé",username));
|
||||
ViewData.Notify( string.Format("utilisateur \"{0}\" supprimé",username));
|
||||
ViewData ["usertoremove"] = null;
|
||||
}
|
||||
return View ();
|
||||
|
|
@ -273,7 +280,7 @@ namespace Yavsc.Controllers
|
|||
public ActionResult AddRole (string rolename)
|
||||
{
|
||||
Roles.CreateRole(rolename);
|
||||
YavscHelpers.Notify(ViewData, LocalizedText.role_created+ " : "+rolename);
|
||||
ViewData.Notify(LocalizedText.role_created+ " : "+rolename);
|
||||
return View ();
|
||||
}
|
||||
|
||||
|
|
@ -310,7 +317,7 @@ namespace Yavsc.Controllers
|
|||
ViewData ["useritems"] = users;
|
||||
if (ModelState.IsValid) {
|
||||
Roles.AddUserToRole (model.UserName, _adminRoleName);
|
||||
YavscHelpers.Notify(ViewData, model.UserName + " "+LocalizedText.was_added_to_the_role+" '" + _adminRoleName + "'");
|
||||
ViewData.Notify(model.UserName + " "+LocalizedText.was_added_to_the_role+" '" + _adminRoleName + "'");
|
||||
} else {
|
||||
if (admins.Length > 0) {
|
||||
if (! admins.Contains (Membership.GetUser ().UserName)) {
|
||||
|
|
@ -321,7 +328,7 @@ namespace Yavsc.Controllers
|
|||
// No admin, gives the Admin Role to the current user
|
||||
Roles.AddUserToRole (currentUser, _adminRoleName);
|
||||
admins = new string[] { currentUser };
|
||||
YavscHelpers.Notify(ViewData, string.Format (
|
||||
ViewData.Notify( string.Format (
|
||||
LocalizedText.was_added_to_the_empty_role,
|
||||
currentUser, _adminRoleName));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -289,11 +289,11 @@ namespace Yavsc.Controllers
|
|||
// ensures rights to update
|
||||
BlogManager.GetForEditing (model.Id, true);
|
||||
BlogManager.UpdatePost (model.Id, model.Title, model.Content, model.Visible, model.AllowedCircles);
|
||||
YavscHelpers.Notify (ViewData, LocalizedText.BillUpdated);
|
||||
ViewData.Notify( LocalizedText.BillUpdated);
|
||||
|
||||
} else {
|
||||
model.Id = BlogManager.Post (model.Author, model.Title, model.Content, model.Visible, model.AllowedCircles);
|
||||
YavscHelpers.Notify (ViewData, LocalizedText.BillCreated);
|
||||
ViewData.Notify( LocalizedText.BillCreated);
|
||||
}
|
||||
BlogManager.UpdatePostPhoto (model.Id, model.Photo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ namespace Yavsc.Controllers
|
|||
ViewData ["ProdRef"] = pref;
|
||||
Catalog cat = CatalogManager.GetCatalog ();
|
||||
if (cat == null) {
|
||||
YavscHelpers.Notify (ViewData, "Catalog introuvable");
|
||||
ViewData.Notify( "Catalog introuvable");
|
||||
ViewData ["RefType"] = "Catalog";
|
||||
return View ("ReferenceNotFound");
|
||||
}
|
||||
|
|
@ -257,10 +257,12 @@ namespace Yavsc.Controllers
|
|||
// * Make the workflow register this command
|
||||
// * Render the resulting basket
|
||||
|
||||
long cmdid = YavscHelpers.CreateCommandFromRequest ();
|
||||
NominativeCommandRegistration cmdreg = YavscHelpers.CreateCommandFromRequest ()
|
||||
as NominativeCommandRegistration;
|
||||
var basket = WorkFlowManager.GetCommands (User.Identity.Name);
|
||||
ViewData["Commanded"] = basket[cmdid];
|
||||
YavscHelpers.Notify (ViewData,
|
||||
ViewData["Commanded"] = basket[cmdreg.CommandId];
|
||||
ViewData["CommandResult"] = cmdreg ;
|
||||
ViewData.Notify(
|
||||
LocalizedText.Item_added_to_basket);
|
||||
return View ("Basket",basket);
|
||||
} catch (Exception e) {
|
||||
|
|
@ -315,7 +317,7 @@ namespace Yavsc.Controllers
|
|||
/// <summary>
|
||||
/// Activities the specified search and toPower.
|
||||
/// </summary>
|
||||
/// <param name="search">Search.</param>
|
||||
/// <param name="id">Activity identifier.</param>
|
||||
/// <param name="toPower">If set to <c>true</c> to power.</param>
|
||||
public ActionResult Activities (string id, bool toPower = false)
|
||||
{
|
||||
|
|
@ -329,7 +331,7 @@ namespace Yavsc.Controllers
|
|||
/// <summary>
|
||||
/// Activity at the specified id.
|
||||
/// </summary>
|
||||
/// <param name="id">Identifier.</param>
|
||||
/// <param name="MEACode">Identifier.</param>
|
||||
public ActionResult Activity (string MEACode)
|
||||
{
|
||||
return View (WorkFlowManager.GetActivity (MEACode));
|
||||
|
|
@ -356,7 +358,7 @@ namespace Yavsc.Controllers
|
|||
// That filters the view in order to only edit the given fieldset
|
||||
|
||||
if (mea == "none")
|
||||
YavscHelpers.Notify (ViewData, "Vous devez choisir une activité avant de pouvoir déclarer vos compétences " +
|
||||
ViewData.Notify( "Vous devez choisir une activité avant de pouvoir déclarer vos compétences " +
|
||||
"(Editez la rubrique <a href=\"" +
|
||||
Url.RouteUrl ("Default", new { controller = "Account", action = "Profile", id = User.Identity.Name, fs="infopub" }) + "\">Informations publiques</a> votre profile)");
|
||||
|
||||
|
|
@ -398,7 +400,7 @@ namespace Yavsc.Controllers
|
|||
response = reader.ReadToEnd ();
|
||||
stream.Close ();
|
||||
}
|
||||
YavscHelpers.Notify (ViewData,
|
||||
ViewData.Notify(
|
||||
string.Format (
|
||||
"Google calendar API exception {0} : {1}<br><pre>{2}</pre>",
|
||||
ex.Status.ToString (),
|
||||
|
|
@ -498,7 +500,7 @@ namespace Yavsc.Controllers
|
|||
stream.Dispose ();
|
||||
|
||||
}
|
||||
YavscHelpers.Notify (ViewData,
|
||||
ViewData.Notify(
|
||||
string.Format (
|
||||
"{3} exception {0} : {1}<br><pre>{2}</pre>",
|
||||
ex.Status.ToString (),
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ namespace Yavsc.Controllers
|
|||
OAuth2 oa = GoogleHelpers.CreateOAuth2 (CalendarGRU);
|
||||
AuthToken gat = oa.GetToken (Request, (string) Session ["state"], out msg);
|
||||
if (gat == null) {
|
||||
YavscHelpers.Notify(ViewData, msg);
|
||||
ViewData.Notify( msg);
|
||||
return View ("Auth");
|
||||
}
|
||||
SaveToken (HttpContext.Profile,gat);
|
||||
|
|
@ -147,7 +147,7 @@ namespace Yavsc.Controllers
|
|||
OAuth2 oa = GoogleHelpers.CreateOAuth2 (AuthGRU);
|
||||
AuthToken gat = oa.GetToken (Request, (string)Session ["state"], out msg);
|
||||
if (gat == null) {
|
||||
YavscHelpers.Notify(ViewData, msg);
|
||||
ViewData.Notify(msg);
|
||||
return View ();
|
||||
}
|
||||
string returnUrl = (string)Session ["returnUrl"];
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ namespace Yavsc.Controllers
|
|||
using (System.Net.Mail.SmtpClient sc = new SmtpClient())
|
||||
{
|
||||
sc.Send (msg);
|
||||
YavscHelpers.Notify(ViewData, LocalizedText.Message_sent);
|
||||
ViewData.Notify(LocalizedText.Message_sent);
|
||||
return View (new { email=email, reason="", body="" });
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ using System.Linq;
|
|||
using System.Reflection;
|
||||
using System.Web.Routing;
|
||||
using Yavsc.Model.FrontOffice;
|
||||
using Yavsc.Model.WorkFlow;
|
||||
|
||||
namespace Yavsc.Helpers
|
||||
{
|
||||
|
|
@ -51,21 +52,23 @@ namespace Yavsc.Helpers
|
|||
"APPL_PHYSICAL_PATH", "CERT_SECRETKEYSIZE", "CERT_SERVER_ISSUER",
|
||||
"INSTANCE_META_PATH", "SERVER_PORT_SECURE",
|
||||
"CERT_SERVER_SUBJECT", "HTTPS_SECRETKEYSIZE", "HTTPS_SERVER_ISSUER",
|
||||
"HTTP_CONTENT_LENGTH", "HTTPS_SERVER_SUBJECT", "HTTP_ACCEPT_ENCODING", "HTTP_ACCEPT_LANGUAGE"
|
||||
"HTTP_CONTENT_LENGTH", "HTTPS_SERVER_SUBJECT", "HTTP_ACCEPT_ENCODING", "HTTP_ACCEPT_LANGUAGE",
|
||||
"HTTP_CACHE_CONTROL", "__RequestVerificationToken"
|
||||
};
|
||||
public static long CreateCommandFromRequest()
|
||||
public static CommandRegistration CreateCommandFromRequest()
|
||||
{
|
||||
var keys = HttpContext.Current.Request.Params.AllKeys.Where (
|
||||
x => !YavscHelpers.FilteredKeys.Contains (x)).ToArray();
|
||||
var prms = new Dictionary<string,string> ();
|
||||
|
||||
CommandRegistration cmdreg;
|
||||
foreach (var key in keys) {
|
||||
prms.Add (key, HttpContext.Current.Request.Params [key]);
|
||||
}
|
||||
Command cmd = Command.CreateCommand(
|
||||
Command.CreateCommand(
|
||||
prms,
|
||||
HttpContext.Current.Request.Files);
|
||||
return cmd.Id;
|
||||
HttpContext.Current.Request.Files,
|
||||
out cmdreg);
|
||||
return cmdreg;
|
||||
}
|
||||
|
||||
private static string siteName = null;
|
||||
|
|
@ -115,7 +118,8 @@ namespace Yavsc.Helpers
|
|||
{
|
||||
SendActivationMessage (
|
||||
string.Format("{2}://{3}/Account/Validate/{1}?key={0}",
|
||||
user.ProviderUserKey.ToString(), user.UserName ,
|
||||
user.ProviderUserKey.ToString(),
|
||||
HttpUtility.UrlEncode(user.UserName),
|
||||
helper.RequestContext.HttpContext.Request.Url.Scheme,
|
||||
helper.RequestContext.HttpContext.Request.Url.Authority
|
||||
)
|
||||
|
|
@ -123,13 +127,30 @@ namespace Yavsc.Helpers
|
|||
user);
|
||||
}
|
||||
|
||||
public static void SendNewPasswordMessage(MembershipUser user)
|
||||
{
|
||||
SendActivationMessage (
|
||||
string.Format("{2}://{3}/Account/UpdatePassword/{1}?key={0}",
|
||||
user.ProviderUserKey.ToString(),
|
||||
HttpUtility.UrlEncode(user.UserName),
|
||||
HttpContext.Current.Request.Url.Scheme,
|
||||
HttpContext.Current.Request.Url.Authority
|
||||
)
|
||||
, WebConfigurationManager.AppSettings ["LostPasswordMessage"],
|
||||
user,
|
||||
"Mot de passe {0} perdu"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Sends the activation message.
|
||||
/// </summary>
|
||||
/// <param name="validationUrl">Validation URL.</param>
|
||||
/// <param name="registrationMessage">Registration message.</param>
|
||||
/// <param name="user">User.</param>
|
||||
public static void SendActivationMessage(string validationUrl, string registrationMessage, MembershipUser user) {
|
||||
public static void SendActivationMessage(string validationUrl,
|
||||
string registrationMessage, MembershipUser user,string title = "Validation de votre compte {0}") {
|
||||
FileInfo fi = new FileInfo (
|
||||
HttpContext.Current.Server.MapPath (registrationMessage));
|
||||
if (!fi.Exists) {
|
||||
|
|
@ -148,7 +169,7 @@ namespace Yavsc.Helpers
|
|||
|
||||
using (MailMessage msg = new MailMessage (
|
||||
Admail, user.Email,
|
||||
string.Format ("Validation de votre compte {0}", YavscHelpers.SiteName),
|
||||
string.Format (title, YavscHelpers.SiteName),
|
||||
body)) {
|
||||
using (SmtpClient sc = new SmtpClient ()) {
|
||||
sc.Send (msg);
|
||||
|
|
@ -166,6 +187,7 @@ namespace Yavsc.Helpers
|
|||
/// <param name="user">User.</param>
|
||||
public static void ValidatePasswordReset(LostPasswordModel model, out StringDictionary errors, out MembershipUser user)
|
||||
{
|
||||
MembershipUser user1 = null;
|
||||
MembershipUserCollection users = null;
|
||||
errors = new StringDictionary ();
|
||||
user = null;
|
||||
|
|
@ -180,23 +202,26 @@ namespace Yavsc.Helpers
|
|||
errors.Add ("UserName", "Found more than one user!(sic)");
|
||||
return ;
|
||||
}
|
||||
foreach (var u in users) user1 = u as MembershipUser;
|
||||
}
|
||||
if (!string.IsNullOrEmpty (model.Email)) {
|
||||
users =
|
||||
Membership.FindUsersByEmail (model.Email);
|
||||
if (string.IsNullOrEmpty (model.Email))
|
||||
errors.Add ("Email", "Please, specify an e-mail");
|
||||
else {
|
||||
users = Membership.FindUsersByEmail (model.Email);
|
||||
if (users.Count < 1) {
|
||||
errors.Add ( "Email", "Email not found");
|
||||
return ;
|
||||
errors.Add ("Email", "Email not found");
|
||||
return;
|
||||
}
|
||||
if (users.Count != 1) {
|
||||
errors.Add ("Email", "Found more than one user!(sic)");
|
||||
return ;
|
||||
}
|
||||
}
|
||||
if (users==null)
|
||||
return;
|
||||
// Assert users.Count == 1
|
||||
foreach (MembershipUser u in users) user = u;
|
||||
MembershipUser user2 = null;
|
||||
foreach (var u in users) user2 = u as MembershipUser;
|
||||
if (user1.UserName != user2.UserName)
|
||||
errors.Add("UserName", "This user is not registered with this e-mail");
|
||||
user = user1;
|
||||
}
|
||||
/// <summary>
|
||||
/// Avatars the URL.
|
||||
|
|
@ -267,12 +292,13 @@ namespace Yavsc.Helpers
|
|||
return serializer.Serialize(obj);
|
||||
}
|
||||
|
||||
public static void Notify(ViewDataDictionary ViewData, string message, string click_action=null, string clickActionName="Ok") {
|
||||
public static void Notify(this ViewDataDictionary ViewData, string message, string click_action=null, string clickActionName="Ok") {
|
||||
Notify(ViewData, new Notification { body = YavscAjaxHelper.QuoteJavascriptString(message),
|
||||
click_action = click_action, click_action_name = YavscAjaxHelper.QuoteJavascriptString(clickActionName)} ) ;
|
||||
}
|
||||
|
||||
public static void Notify(ViewDataDictionary ViewData, Notification note) {
|
||||
public static void Notify(this ViewDataDictionary ViewData, Notification note) {
|
||||
|
||||
if (ViewData ["Notifications"] == null)
|
||||
ViewData ["Notifications"] = new List<Notification> ();
|
||||
(ViewData ["Notifications"] as List<Notification>).Add (
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
|
|||
<script>
|
||||
$(document).ready(function(){
|
||||
<% foreach (Notification note in (IEnumerable<Notification>) ViewData ["Notifications"] ) {
|
||||
if (note.click_action == null) {%> Yavsc.notice(<%=note.body%>); <% }
|
||||
if (note.click_action == null) {%> Yavsc.notice(<%=Ajax.JString(note.body)%>); <% }
|
||||
else {%> Yavsc.notice(<%=note.body%>, <%=note.click_action%>, <%=note.click_action_name%>); <% } %>
|
||||
<% } %>
|
||||
});
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ Vos billets
|
|||
</main>
|
||||
<footer>
|
||||
|
||||
<%= Html.TranslatedActionLink("Formulaire de contact","Contact","Home",null, new { @class="thanks" }) %>
|
||||
<%= Html.TranslatedActionLink("Contact","Contact","Home") %>
|
||||
|
||||
<div id="copyr">
|
||||
<a href="http://yavsc.pschneider.fr/Blogs/UserPost/paul/License">
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@ self.apiBaseUrl = (apiBaseUrl || '/api');
|
|||
self.dumpprops = function (obj) {
|
||||
var str = "";
|
||||
for(var k in obj)
|
||||
if (obj.hasOwnProperty(k))
|
||||
str += " "+k + " = " + obj[k] + "\n";
|
||||
return (str); };
|
||||
|
||||
if (obj.hasOwnProperty(k))
|
||||
str += "."+k + " = " + obj[k] + "\n";
|
||||
return str;}
|
||||
self.logObj = function(obj) {
|
||||
console.log('obj:'+obj);
|
||||
console.log('-props:'+self.dumpprops(obj));
|
||||
console.log(self.dumpprops(obj));
|
||||
};
|
||||
|
||||
self.showHide = function () {
|
||||
|
|
@ -74,8 +73,8 @@ self.notice = function (msg, callback, msgok) {
|
|||
|
||||
self.onAjaxBadInput = function (data)
|
||||
{
|
||||
if (!data) { Yavsc.notice('no data'); return; }
|
||||
if (!data.responseJSON) { Yavsc.notice('no json data:'+data); return; }
|
||||
if (!data) { Yavsc.notice('Bad input, no data'); return; }
|
||||
if (!data.responseJSON) { Yavsc.notice('Bad input, no json data response'); return; }
|
||||
if (!Array.isArray(data.responseJSON)) { Yavsc.notice('Bad Input: '+data.responseJSON); return; }
|
||||
$.each(data.responseJSON, function (key, value) {
|
||||
var errspanid = "Err_" + value.key;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
<%= Html.AntiForgeryToken() %>
|
||||
<!-- Html.AntiForgeryToken() -->
|
||||
<input type="submit"/>
|
||||
<%= Html.TranslatedActionLink("ResetPassword")%>
|
||||
<% } %></div>
|
||||
<div class="panel">
|
||||
<%= Html.TranslatedActionLink("S'enregistrer","GetRegister",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %>
|
||||
|
|
|
|||
25
web/Views/Account/UpdatePassword.aspx
Normal file
25
web/Views/Account/UpdatePassword.aspx
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<%@ Page Title="Reset your Password" Language="C#" Inherits="System.Web.Mvc.ViewPage<LostPasswordModel>" MasterPageFile="~/Models/App.master" %>
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<%= Html.ValidationSummary("Modification de mot de passe") %>
|
||||
|
||||
<% using(Html.BeginForm("UpdatePassword", "Account")) { %>
|
||||
<%= Html.ValidationSummary() %>
|
||||
Modifiez votre mot de passe (<%= Html.Encode(ViewData["UserName"]) %>):
|
||||
<ul><li>
|
||||
<label for="Password">Saisissez ci après votre nouveau mot de passe:</label>
|
||||
<%= Html.Password( "Password" ) %>
|
||||
<%= Html.ValidationMessage("Password", "*") %></li>
|
||||
<li>
|
||||
<label for="ConfirmPassword">Confirmez votre nouveau mot de passe:</label>
|
||||
<%= Html.Password( "ConfirmPassword" ) %>
|
||||
<%= Html.ValidationMessage("ConfirmPassword", "*") %>
|
||||
</li>
|
||||
</ul>
|
||||
Puis, actionnez ce bouton:
|
||||
<input type="submit" value="Modifiez mon mot de passe!"/>
|
||||
<%= Html.Hidden("UserKey") %>
|
||||
<%= Html.Hidden("UserName") %>
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<%@ Page Title="Billet" Language="C#" Inherits="System.Web.Mvc.ViewPage<UUTBlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
|
||||
<%@ Page Title="Post" Language="C#" Inherits="System.Web.Mvc.ViewPage<UUTBlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
|
||||
<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
|
||||
<% Title = Model.Title+ " - " + ViewData ["BlogTitle"] ; %>
|
||||
</asp:Content>
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ Intervention souhaitée le : <input type="text" id="PreferedDate" name="Prefered
|
|||
|
||||
// $('#PreferedHour').timepicker(tpconfig);
|
||||
$('#PreferedDate').datepicker(dpconfig).zIndex(4);
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
|
|||
30
web/Views/FrontOffice/Contact.aspx
Normal file
30
web/Views/FrontOffice/Contact.aspx
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
<%@ Page Title="Contact" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<div class="bigpanel">
|
||||
<p>
|
||||
<%= Html.Translate("ContactThisPerformer") %>
|
||||
</p>
|
||||
<% using (Html.BeginForm("Contact", "Home")) { %>
|
||||
<fieldset style="width:100%">
|
||||
<legend>Message</legend>
|
||||
<p>
|
||||
<%= Html.Label("email",LocalizedText.email) %>:
|
||||
<%= Html.ValidationMessage("email") %><br/>
|
||||
<%= Html.TextBox("email") %>
|
||||
</p>
|
||||
<p>
|
||||
<%= Html.Label("reason",LocalizedText.reason) %>:
|
||||
<%= Html.ValidationMessage("reason") %><br/>
|
||||
<%= Html.TextBox("reason") %>
|
||||
</p>
|
||||
<p>
|
||||
<%= Html.Label("body",LocalizedText.body) %>:
|
||||
<%= Html.ValidationMessage("body") %><br/>
|
||||
<%= Html.TextArea("body",new {@rows="25"}) %>
|
||||
</p>
|
||||
</fieldset>
|
||||
<input type="submit" value="<%=Html.Translate("Submit")%>">
|
||||
<% } %>
|
||||
</div>
|
||||
</asp:Content>
|
||||
|
|
@ -20,7 +20,7 @@ data-roles="<%=string.Join (" ",Roles.GetRolesForUser (Model.UserName)) %>"
|
|||
<% } else { %>
|
||||
<i class="fa fa-envelope"></i>
|
||||
<%=Html.LabelFor(m => m.EMail)%>:
|
||||
<%= Html.Translate("AuthenticatedOnly") %>
|
||||
<%= Html.Translate("OnlyAuthorizedMayContact") %>
|
||||
<% }%>
|
||||
</address>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
<%@ Page Language="C#" Title="Performers" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<IEnumerable<PerformerAvailability>>" %>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="head" ID="headContent" runat="server">
|
||||
|
||||
<script type="text/javascript" src="/Scripts/yavsc.user.js"></script>
|
||||
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
|
|
@ -11,33 +9,64 @@
|
|||
<div class="panel">
|
||||
<%= Html.Partial("Performer", available.Profile ) %>
|
||||
<div class="availability">
|
||||
<% if (available.DateAvailable) { %>
|
||||
|
||||
<% if (available.DateAvailable) { %><p>
|
||||
<%= Html.Translate("ThisPerformerGivesAccessToHisCalendarAndSeemsToBeAvailableThis") %>
|
||||
<%= available.PerformanceDate.ToString("D") %>
|
||||
<% } else if (available.Profile.HasCalendar()) { %>
|
||||
<%= available.PerformanceDate.ToString("D") %>.</p>
|
||||
<% } else if (available.Profile.HasCalendar()) { %><p>
|
||||
<%= Html.Translate("ThisPerformerGivesAccessToHisCalendarAndItAppearsHeShouldNotBeAvailableThis") %>
|
||||
<%= available.PerformanceDate.ToString("D") %>
|
||||
<% } else {%>
|
||||
<%= Html.Translate("ThisPerformerDoesntGiveAccessToHisCalendar") %>
|
||||
<%= available.PerformanceDate.ToString("D") %>.</p>
|
||||
<% } else {%><p>
|
||||
<%= Html.Translate("ThisPerformerDoesntGiveAccessToHisCalendar") %></p>
|
||||
<% } %>
|
||||
|
||||
<form action="/api/Basket/Create" method="POST">
|
||||
<div id="AskForAnEstimateResult"></div>
|
||||
<% if (User.Identity!=null && User.Identity.IsAuthenticated) { %>
|
||||
|
||||
<form data-ajax-action="Basket/Create" method="post" >
|
||||
<input type="hidden" name="productref" value="main">
|
||||
<input type="hidden" name="clientname" value="<%= ViewBag.ClientName %>">
|
||||
<input type="hidden" name="clientname" value="<%= ViewBag.ClientName %>">
|
||||
<input type="hidden" name="type" value="Yavsc.Model.FrontOffice.NominativeSimpleBookingQuery">
|
||||
<input type="hidden" name="MEACode" value="<%=ViewBag.SimpleBookingQuery.MEACode%>" >
|
||||
<input type="hidden" name="Need" value="<%=ViewBag.SimpleBookingQuery.Need%>" >
|
||||
<input type="hidden" name="PreferedDate" value="<%=ViewBag.SimpleBookingQuery.PreferedDate%>" >
|
||||
<input type="hidden" name="PerformerName" value="<%=available.Profile.UserName%>" >
|
||||
<input type="submit" class="actionlink" value="<%= Html.Translate("AskForAnEstimate") %>">
|
||||
<input type="submit" name="submit" class="actionlink" id="btnAskFAE" value="<%=Html.Translate("AskForAnEstimate")%>">
|
||||
</form>
|
||||
<div id="AskForAnEstimateResult"></div>
|
||||
|
||||
<% } else { %>
|
||||
<p><%= Html.Translate("YouNeedToBeAuthenticatedIOToContact") %></p>
|
||||
<p>
|
||||
<a href="<%= Url.RouteUrl("Default", new { controller = "Account", action = "Login", returnUrl=Request.Url.PathAndQuery}) %>" class="link" accesskey = "C">
|
||||
<i class="fa fa-sign-in"></i> Connexion
|
||||
</a></p>
|
||||
|
||||
<% } %>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<% } %>
|
||||
<script>
|
||||
function receiveCmdRef(response) {
|
||||
var msg = 'Votre commande a été enregistrée sous le numéro '+
|
||||
response.CommandId+' <br>'+
|
||||
(response.NotifiedOnMobile?'Une notification a été poussée sur le mobile du préstataire.<br>':'')+
|
||||
(response.EmailSent?'Un e-mail lui a été envoyé.':'');
|
||||
Yavsc.notice (msg);
|
||||
}
|
||||
$(document).ready(function(){
|
||||
$('form').submit (
|
||||
function(e){
|
||||
e.preventDefault();
|
||||
var jstxta = [];
|
||||
var action = $(this).data("ajax-action");
|
||||
$(this).children('input').each(function(i,elt){
|
||||
jstxta.push ('"'+elt.name+'":'+'"'+elt.value+'"') ;
|
||||
});
|
||||
var jstxt = "{"+jstxta.join(', ')+"}";
|
||||
var data = JSON.parse(jstxt);
|
||||
Yavsc.ajax(action,data,receiveCmdRef);
|
||||
});
|
||||
$("[data-type='user']").user({circles:<%=Ajax.JSonString(ViewData["Circles"])%>});
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ Prix unitaire : <%= Html.Encode(Model.UnitaryPrice.Quantity.ToString())%>
|
|||
<%= Html.CommandForm(Model,"Ajouter au panier") %>
|
||||
|
||||
<% if (Model.CommandValidityDates!=null) { %>
|
||||
Offre valable du <%= Model.CommandValidityDates.StartDate.ToString("dd/MM/yyyy") %> au
|
||||
<%= Model.CommandValidityDates.EndDate.ToString("dd/MM/yyyy") %>.
|
||||
Offre valable du <%= Model.CommandValidityDates.Start.ToString("dd/MM/yyyy") %> au
|
||||
<%= Model.CommandValidityDates.End.ToString("dd/MM/yyyy") %>.
|
||||
<% } %>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ Prix horaire de la prestation :
|
|||
<%= Html.CommandForm(Model,"Ajouter au panier") %>
|
||||
|
||||
<% if (Model.CommandValidityDates!=null) { %>
|
||||
Offre valable du <%= Model.CommandValidityDates.StartDate.ToString("dd/MM/yyyy") %> au
|
||||
<%= Model.CommandValidityDates.EndDate.ToString("dd/MM/yyyy") %>.
|
||||
Offre valable du <%= Model.CommandValidityDates.Start.ToString("dd/MM/yyyy") %> au
|
||||
<%= Model.CommandValidityDates.End.ToString("dd/MM/yyyy") %>.
|
||||
<% } %>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<%@ Page Title="Google error message" Language="C#" Inherits="System.Web.Mvc.ViewPage<OtherWebException>" MasterPageFile="~/Models/App.master" %>
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<h2><%= Html.Encode(Model.Title)%></h2>
|
||||
<pre>
|
||||
<code>
|
||||
<%= Html.Encode(Model.Content) %>
|
||||
</code></pre>
|
||||
</asp:Content>
|
||||
|
||||
|
|
@ -15,23 +15,22 @@ Activité Principalement Exercée (APE) : 5829C Édition de logiciels applicatif
|
|||
<fieldset style="width:100%">
|
||||
<legend>Message</legend>
|
||||
<p>
|
||||
<%= Html.Label("email") %>:
|
||||
<%= Html.Label("email",LocalizedText.email) %>:
|
||||
<%= Html.ValidationMessage("email") %><br/>
|
||||
<%= Html.TextBox("email") %>
|
||||
</p>
|
||||
<p>
|
||||
<%= Html.Label("reason") %>:
|
||||
<%= Html.Label("reason",LocalizedText.reason) %>:
|
||||
<%= Html.ValidationMessage("reason") %><br/>
|
||||
<%= Html.TextBox("reason") %>
|
||||
</p>
|
||||
<p>
|
||||
<%= Html.Label("body") %>:
|
||||
<%= Html.Label("body",LocalizedText.body) %>:
|
||||
<%= Html.ValidationMessage("body") %><br/>
|
||||
<%= Html.TextArea("body",new {@rows="25"}) %>
|
||||
</p>
|
||||
</fieldset>
|
||||
<input type="submit" value="<%=Html.Translate("Submit")%>">
|
||||
|
||||
<% } %>
|
||||
</div>
|
||||
</asp:Content>
|
||||
|
|
@ -268,16 +268,16 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
|
|||
<add name="yavsc" connectionString="[YOUR_CONNECTION_STRING]" providerName="Npgsql" />
|
||||
</connectionStrings>
|
||||
<appSettings>
|
||||
<!-- <add key="MonoServerDefaultIndexFiles" value="Index,index.html,Index.aspx" /> -->
|
||||
<add key="WorkflowContentProviderClass" value="yavsc.NpgsqlContentProvider" />
|
||||
<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="RegistrationMessage" value="/App_Data/RegistrationMail.txt" />
|
||||
<add key="LostPasswordMessage" value="/App_Data/ResetPassword.txt" />
|
||||
<add key="ClientValidationEnabled" value="false" />
|
||||
<add key="UnobtrusiveJavaScriptEnabled" value="false" />
|
||||
<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]" />
|
||||
|
|
|
|||
|
|
@ -285,7 +285,6 @@
|
|||
<Content Include="Views\Admin\Restore.aspx" />
|
||||
<Content Include="Views\Admin\Restored.aspx" />
|
||||
<Content Include="Catalog.xml" />
|
||||
<Content Include="RegistrationMail.txt" />
|
||||
<Content Include="Views\FrontOffice\Writting.ascx" />
|
||||
<Content Include="Scripts\jquery.metadata.js" />
|
||||
<Content Include="Views\Account\Unregister.aspx" />
|
||||
|
|
@ -479,7 +478,6 @@
|
|||
<Content Include="Views\Google\Auth.aspx" />
|
||||
<Content Include="Views\Google\ChooseCalendar.aspx" />
|
||||
<Content Include="Views\Google\ChooseADate.aspx" />
|
||||
<Content Include="Views\Google\OtherWebException.aspx" />
|
||||
<Content Include="Models\AppAdmin.master" />
|
||||
<Content Include="Views\Google\Index.aspx" />
|
||||
<Content Include="Views\Admin\RemoveRole.aspx" />
|
||||
|
|
@ -781,6 +779,11 @@
|
|||
<Content Include="Scripts\jquery.unobtrusive-ajax.js" />
|
||||
<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
|
||||
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
|
||||
<Content Include="App_Data\RegistrationMail.txt" />
|
||||
<Content Include="App_Data\ResetPassword.txt" />
|
||||
<Content Include="Views\Account\UpdatePassword.aspx" />
|
||||
<Content Include="App_Themes\base\style.css" />
|
||||
<Content Include="Views\FrontOffice\Contact.aspx" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
|
|
@ -819,10 +822,10 @@
|
|||
<None Include="Web.Lua.config" />
|
||||
<None Include="Web.Release.config" />
|
||||
<None Include="Web.TotemPre.config" />
|
||||
<None Include="Web.TotemProd.config" />
|
||||
<None Include="Scripts\jquery.mobile-1.4.5.min.map" />
|
||||
<None Include="App_Themes\images\GitHub.ico" />
|
||||
<None Include="Web.LuaDebug.config" />
|
||||
<None Include="Web.Totemprod.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NpgsqlMRPProviders\NpgsqlMRPProviders.csproj">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue