diff --git a/web/ChangeLog b/web/ChangeLog index 94f6095a..5ef10abb 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,16 @@ +2015-12-02 Paul Schneider + + * hangouts.xml: WIP Hangouts + + * yavsc.rate.js: Fixe l'usage de la souris pour positionner + les étoiles de 0 à 5. + WIP labels + + * Performer.ascx: Prive les utilisateur anonymes de l'e-mail + des préstataires + + * Yavsc.csproj: ajoute l'Xml Hangouts + 2015-12-01 Paul Schneider * Yavsc.csproj: references en plus ... diff --git a/web/Scripts/yavsc.rate.js b/web/Scripts/yavsc.rate.js index 49fdb3c1..8c531a16 100644 --- a/web/Scripts/yavsc.rate.js +++ b/web/Scripts/yavsc.rate.js @@ -4,7 +4,8 @@ options: { webTarget: null, jsTarget: null, - disabled: false + disabled: false, + labels: [ 'médiocre','passable','moyen','bon', 'très bon' ,'excellent', 'parfait'], }, sendRate: function (rating,callback) { if (this.options.webTarget) @@ -29,7 +30,7 @@ // depending on padding & mergin on the $ratectl node, // when it's a span, and there is a line return within, // the values on second star line are false. - // time to sanitize + // Time to sanitize: x = Math.ceil(x); if (x<0) x = 0; if (x>100) x = 100; @@ -39,7 +40,8 @@ }); }, updateRate: function (ctl,rate) { - var rounded = Math.round(rate / 10); + // Using 10 half stars, it makes 11 choices (from 0 to 10) + var rounded = Math.round(rate / 11); var HasHalf = (rounded % 2 == 1); var NbFilled = Math.floor(rounded / 2); var NbEmpty = (5 - NbFilled) - ((HasHalf)?1:0) ; @@ -51,6 +53,8 @@ ctl.append(''); for (var j=0; j'); + + ctl.append }, })})(jQuery); }).call(this); diff --git a/web/Views/FrontOffice/Performer.ascx b/web/Views/FrontOffice/Performer.ascx index a2ae6289..608d03ec 100644 --- a/web/Views/FrontOffice/Performer.ascx +++ b/web/Views/FrontOffice/Performer.ascx @@ -1,11 +1,20 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> - -
-

<%=Html.Encode(Model.UserName)%>

+

+ +<%=Html.Encode(Model.UserName)%> <%=Html.Partial("RateUserSkillControl", Model) %> -


-E-mail: <<%=Html.Encode(Model.EMail)%>> + +

+ + <% if (Membership.GetUser()!=null) { %> +<<%=Html.Encode(Model.EMail)%>> + <% } else { %><%=Html.LabelFor(m => m.EMail)%>: + <%= Html.Translate("AuthenticatedOnly") %> + <% }%> + +

+ <% if (Model.Skills==null) { %> <%= Html.Translate("") %> <% } else @@ -21,8 +30,6 @@ foreach (var userskill in Model.Skills) { %> <% } %> <% if (BlogManager.GetPostCounter(Model.UserName)>0) { %> "> - - - - + <%=Model.BlogTitle %> + <% } %> \ No newline at end of file diff --git a/web/Yavsc.csproj b/web/Yavsc.csproj index 5662a767..26e96c02 100644 --- a/web/Yavsc.csproj +++ b/web/Yavsc.csproj @@ -537,6 +537,7 @@ + diff --git a/web/hangouts.xml b/web/hangouts.xml new file mode 100644 index 00000000..11437a78 --- /dev/null +++ b/web/hangouts.xml @@ -0,0 +1,13 @@ + + + + + + + + + + ]]> + + diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index b4c7770b..865aa0b3 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,13 @@ +2015-12-02 Paul Schneider + + * PerformerProfile.cs: Ajoute la propriété "titre du blog" + `BlogTitle` du profile préstataire + + * LocalizedText.resx: + * LocalizedText.fr.resx: + * LocalizedText.Designer.cs: + * LocalizedText.fr.Designer.cs: internationalisation + 2015-12-01 Paul Schneider * LocalizedText.resx: diff --git a/yavscModel/FrontOffice/PerformerProfile.cs b/yavscModel/FrontOffice/PerformerProfile.cs index 7aba4008..b112abbd 100644 --- a/yavscModel/FrontOffice/PerformerProfile.cs +++ b/yavscModel/FrontOffice/PerformerProfile.cs @@ -161,6 +161,15 @@ namespace Yavsc.Model.FrontOffice p.PerformanceDate = date; return p; } + /// + /// Gets the blog title. + /// + /// The blog title. + public string BlogTitle { + get { + return YavscClientProfile.BlogTitle; + } + } } } diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index a53b2b80..753a6f84 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -118,9 +118,9 @@ namespace Yavsc.Model { } } - public static string Remove { + public static string Product_reference { get { - return ResourceManager.GetString("Remove", resourceCulture); + return ResourceManager.GetString("Product_reference", resourceCulture); } } @@ -352,9 +352,9 @@ namespace Yavsc.Model { } } - public static string Product_reference { + public static string AuthenticatedOnly { get { - return ResourceManager.GetString("Product_reference", resourceCulture); + return ResourceManager.GetString("AuthenticatedOnly", resourceCulture); } } @@ -742,6 +742,12 @@ namespace Yavsc.Model { } } + public static string Remove { + get { + return ResourceManager.GetString("Remove", resourceCulture); + } + } + public static string Profile_edition { get { return ResourceManager.GetString("Profile_edition", resourceCulture); diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index 1236e13c..020bff9c 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -118,9 +118,9 @@ namespace Yavsc.Model { } } - public static string Remove { + public static string Product_reference { get { - return ResourceManager.GetString("Remove", resourceCulture); + return ResourceManager.GetString("Product_reference", resourceCulture); } } @@ -346,9 +346,9 @@ namespace Yavsc.Model { } } - public static string Product_reference { + public static string AuthenticatedOnly { get { - return ResourceManager.GetString("Product_reference", resourceCulture); + return ResourceManager.GetString("AuthenticatedOnly", resourceCulture); } } @@ -724,6 +724,12 @@ namespace Yavsc.Model { } } + public static string Remove { + get { + return ResourceManager.GetString("Remove", resourceCulture); + } + } + public static string Profile_edition { get { return ResourceManager.GetString("Profile_edition", resourceCulture); diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index a3d03380..c573669a 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -18,6 +18,7 @@ Un message instantané a été envoyé à {0}, lui présentant votre demande. Vous devriez être contacté très rapidement. disponible + Seules les utilisateurs authentifies peuvent accèder à cette information Édition d'un billet Suppression d'un billet Billet créé diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index 76b97943..6a2e248e 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -18,6 +18,7 @@ An instant message has been sent to {0}, showing to him your query. You should be contacted very soon. available + You must be authenticated in order to access this information Bill edition Bill removal Bill created