diff --git a/web/ChangeLog b/web/ChangeLog index 5ef10abb..488ca5f9 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,10 @@ +2015-12-02 Paul Schneider + + * Skills.aspx: Précise la fonction de la methode par un titre + plus révélateur + + * Index.aspx: Alimente l'index du front office + 2015-12-02 Paul Schneider * hangouts.xml: WIP Hangouts diff --git a/web/Views/FrontOffice/Index.aspx b/web/Views/FrontOffice/Index.aspx index c97b5b0a..597f15ad 100644 --- a/web/Views/FrontOffice/Index.aspx +++ b/web/Views/FrontOffice/Index.aspx @@ -1,9 +1,21 @@ <%@ Page Title="Front office" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> -
  • - <%= Html.ActionLink("Catalog","Catalog" ) %> -
  • - <%= Html.ActionLink("Estimates","Estimates" ) %> -
+
    +
  • <%= Html.ActionLink("Catalog","Catalog" ) %>
  • +
  • <%= Html.ActionLink("Basket","Basket" ) %>
  • +
  • <%= Html.ActionLink("Estimates","Estimates" ) %>
  • +
  • <%= Html.ActionLink("Estimate","Estimate" ) %>
  • + <% if (User.Identity.IsAuthenticated) { %> +
  • <%= Html.ActionLink("Activities","Activities" ) %>
  • +
  • <%= Html.ActionLink("ManagedSiteSkills", "Skills" ) %>
  • +
  • <%= Html.ActionLink("UserSkills","UserSkills" ) %>
  • + <% } else { %> +
  • <%= Html.Translate("Activities") %>, + <%= Html.Translate("ManagedSiteSkills") %>, + <%= Html.Translate("UserSkills") %>: + <%= Html.Translate("AuthenticatedOnly") %>
  • + <% }%> + +
diff --git a/web/Views/FrontOffice/Skills.aspx b/web/Views/FrontOffice/Skills.aspx index 7ee34dcd..6054cfe5 100644 --- a/web/Views/FrontOffice/Skills.aspx +++ b/web/Views/FrontOffice/Skills.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Skills" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage>" %> +<%@ Page Title="ManagedSiteSkills" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage>" %> diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 865aa0b3..5592c7d1 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,10 @@ +2015-12-02 Paul Schneider + + * LocalizedText.resx: + * LocalizedText.fr.resx: + * LocalizedText.Designer.cs: + * LocalizedText.fr.Designer.cs: traductions + 2015-12-02 Paul Schneider * PerformerProfile.cs: Ajoute la propriété "titre du blog" diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index 753a6f84..f5991a87 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -52,9 +52,9 @@ namespace Yavsc.Model { } } - public static string StartDateAfterEndDate { + public static string ProviderId { get { - return ResourceManager.GetString("StartDateAfterEndDate", resourceCulture); + return ResourceManager.GetString("ProviderId", resourceCulture); } } @@ -196,6 +196,12 @@ namespace Yavsc.Model { } } + public static string Activities { + get { + return ResourceManager.GetString("Activities", resourceCulture); + } + } + public static string Members { get { return ResourceManager.GetString("Members", resourceCulture); @@ -286,6 +292,12 @@ namespace Yavsc.Model { } } + public static string StartDateAfterEndDate { + get { + return ResourceManager.GetString("StartDateAfterEndDate", resourceCulture); + } + } + public static string Tag_name { get { return ResourceManager.GetString("Tag_name", resourceCulture); @@ -562,9 +574,9 @@ namespace Yavsc.Model { } } - public static string ProviderId { + public static string ManagedSiteSkills { get { - return ResourceManager.GetString("ProviderId", resourceCulture); + return ResourceManager.GetString("ManagedSiteSkills", resourceCulture); } } @@ -670,6 +682,12 @@ namespace Yavsc.Model { } } + public static string yourquerytransmitted { + get { + return ResourceManager.GetString("yourquerytransmitted", resourceCulture); + } + } + public static string no_content { get { return ResourceManager.GetString("no_content", resourceCulture); @@ -700,9 +718,9 @@ namespace Yavsc.Model { } } - public static string yourquerytransmitted { + public static string UserSkills { get { - return ResourceManager.GetString("yourquerytransmitted", resourceCulture); + return ResourceManager.GetString("UserSkills", resourceCulture); } } diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index 020bff9c..9a85e029 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -154,6 +154,12 @@ namespace Yavsc.Model { } } + public static string ProviderId { + get { + return ResourceManager.GetString("ProviderId", resourceCulture); + } + } + public static string Create { get { return ResourceManager.GetString("Create", resourceCulture); @@ -178,15 +184,21 @@ namespace Yavsc.Model { } } + public static string Performers { + get { + return ResourceManager.GetString("Performers", resourceCulture); + } + } + public static string DoComment { get { return ResourceManager.GetString("DoComment", resourceCulture); } } - public static string Performers { + public static string Activities { get { - return ResourceManager.GetString("Performers", resourceCulture); + return ResourceManager.GetString("Activities", resourceCulture); } } @@ -544,9 +556,9 @@ namespace Yavsc.Model { } } - public static string ProviderId { + public static string ManagedSiteSkills { get { - return ResourceManager.GetString("ProviderId", resourceCulture); + return ResourceManager.GetString("ManagedSiteSkills", resourceCulture); } } @@ -652,6 +664,12 @@ namespace Yavsc.Model { } } + public static string yourquerytransmitted { + get { + return ResourceManager.GetString("yourquerytransmitted", resourceCulture); + } + } + public static string no_content { get { return ResourceManager.GetString("no_content", resourceCulture); @@ -682,9 +700,9 @@ namespace Yavsc.Model { } } - public static string yourquerytransmitted { + public static string UserSkills { get { - return ResourceManager.GetString("yourquerytransmitted", resourceCulture); + return ResourceManager.GetString("UserSkills", resourceCulture); } } diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index c573669a..18fa0854 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -15,6 +15,7 @@ de plus Accès refusé + Activités Un message instantané a été envoyé à {0}, lui présentant votre demande. Vous devriez être contacté très rapidement. disponible @@ -65,6 +66,7 @@ Article ajouté au panier Lieu Déconnection + Compétences gérée sur ce site Date maximale du rendez-vous Code d'Activité Principalement Exercée Membres @@ -119,6 +121,7 @@ Liste des utilisateurs Nom d'utilisateur Liste des utilisateurs assumant le rôle "{0}" + Talents/compétences/spécialités utilisateur Le rôle demandé n'est pas assumé par ce préstataire Voir le texte source du billet a été ajouté au rôle diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index 6a2e248e..ba934fe5 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -15,6 +15,7 @@ additionally Access denied + Activities An instant message has been sent to {0}, showing to him your query. You should be contacted very soon. available @@ -69,6 +70,7 @@ Item added to basket Location Logout + Site skills Maximal date for the rendez-vous Mainly Exerted Activity code Name @@ -126,6 +128,7 @@ User name List of users assuming the role "{0}" This user is not in this role + User skills View source was added to the role There was no user in the "{1}" role. You ({0}) was just added as firt user in the "{1}" role.