Prive les anonymes de l'email prestataire
* 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 * 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
This commit is contained in:
parent
986b78be3c
commit
1b1a2ab557
11 changed files with 91 additions and 20 deletions
|
|
@ -1,3 +1,16 @@
|
||||||
|
2015-12-02 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
|
* 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 <paul@pschneider.fr>
|
2015-12-01 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
* Yavsc.csproj: references en plus ...
|
* Yavsc.csproj: references en plus ...
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@
|
||||||
options: {
|
options: {
|
||||||
webTarget: null,
|
webTarget: null,
|
||||||
jsTarget: null,
|
jsTarget: null,
|
||||||
disabled: false
|
disabled: false,
|
||||||
|
labels: [ 'médiocre','passable','moyen','bon', 'très bon' ,'excellent', 'parfait'],
|
||||||
},
|
},
|
||||||
sendRate: function (rating,callback) {
|
sendRate: function (rating,callback) {
|
||||||
if (this.options.webTarget)
|
if (this.options.webTarget)
|
||||||
|
|
@ -29,7 +30,7 @@
|
||||||
// depending on padding & mergin on the $ratectl node,
|
// depending on padding & mergin on the $ratectl node,
|
||||||
// when it's a span, and there is a line return within,
|
// when it's a span, and there is a line return within,
|
||||||
// the values on second star line are false.
|
// the values on second star line are false.
|
||||||
// time to sanitize
|
// Time to sanitize:
|
||||||
x = Math.ceil(x);
|
x = Math.ceil(x);
|
||||||
if (x<0) x = 0;
|
if (x<0) x = 0;
|
||||||
if (x>100) x = 100;
|
if (x>100) x = 100;
|
||||||
|
|
@ -39,7 +40,8 @@
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
updateRate: function (ctl,rate) {
|
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 HasHalf = (rounded % 2 == 1);
|
||||||
var NbFilled = Math.floor(rounded / 2);
|
var NbFilled = Math.floor(rounded / 2);
|
||||||
var NbEmpty = (5 - NbFilled) - ((HasHalf)?1:0) ;
|
var NbEmpty = (5 - NbFilled) - ((HasHalf)?1:0) ;
|
||||||
|
|
@ -51,6 +53,8 @@
|
||||||
ctl.append('<i class="fa fa-star-half-o"></i>');
|
ctl.append('<i class="fa fa-star-half-o"></i>');
|
||||||
for (var j=0; j<NbEmpty; j++, i++ )
|
for (var j=0; j<NbEmpty; j++, i++ )
|
||||||
ctl.append('<i class="fa fa-star-o"></i>');
|
ctl.append('<i class="fa fa-star-o"></i>');
|
||||||
|
|
||||||
|
ctl.append
|
||||||
},
|
},
|
||||||
})})(jQuery);
|
})})(jQuery);
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,20 @@
|
||||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PerformerProfile>" %>
|
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PerformerProfile>" %>
|
||||||
|
|
||||||
<img src="<%= Model.Avatar %>" alt="" class="bigavatar">
|
|
||||||
<div class="performer">
|
<div class="performer">
|
||||||
<h2><%=Html.Encode(Model.UserName)%></h2>
|
<h2>
|
||||||
|
<img src="<%= Model.Avatar %>" alt="" class="bigavatar">
|
||||||
|
<%=Html.Encode(Model.UserName)%>
|
||||||
<%=Html.Partial("RateUserSkillControl", Model) %>
|
<%=Html.Partial("RateUserSkillControl", Model) %>
|
||||||
</div><br>
|
</h2>
|
||||||
E-mail: <<%=Html.Encode(Model.EMail)%>>
|
<p>
|
||||||
|
<i class="fa fa-envelope">
|
||||||
|
<% if (Membership.GetUser()!=null) { %>
|
||||||
|
<<%=Html.Encode(Model.EMail)%>>
|
||||||
|
<% } else { %><%=Html.LabelFor(m => m.EMail)%>:
|
||||||
|
<i><%= Html.Translate("AuthenticatedOnly") %></i>
|
||||||
|
<% }%>
|
||||||
|
</i>
|
||||||
|
</p>
|
||||||
|
|
||||||
<% if (Model.Skills==null) { %>
|
<% if (Model.Skills==null) { %>
|
||||||
<%= Html.Translate("") %>
|
<%= Html.Translate("") %>
|
||||||
<% } else
|
<% } else
|
||||||
|
|
@ -21,8 +30,6 @@ foreach (var userskill in Model.Skills) { %>
|
||||||
<% } %>
|
<% } %>
|
||||||
<% if (BlogManager.GetPostCounter(Model.UserName)>0) { %>
|
<% if (BlogManager.GetPostCounter(Model.UserName)>0) { %>
|
||||||
<a href="<%=Url.RouteUrl("Blogs",new { user = Model.UserName } )%>">
|
<a href="<%=Url.RouteUrl("Blogs",new { user = Model.UserName } )%>">
|
||||||
<span class="fa-stack fa-lg">
|
<i class="fa fa-folder"><%=Model.BlogTitle %></i>
|
||||||
<i class="fa fa-square-o fa-stack-2x"></i>
|
</a></div>
|
||||||
<i class="fa fa-folder fa-stack-1x"></i>
|
|
||||||
</span></a>
|
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
@ -537,6 +537,7 @@
|
||||||
<Content Include="Views\Home\Activity.ascx" />
|
<Content Include="Views\Home\Activity.ascx" />
|
||||||
<Content Include="Views\FrontOffice\Performers.aspx" />
|
<Content Include="Views\FrontOffice\Performers.aspx" />
|
||||||
<Content Include="Scripts\yavsc.hidefieldset.js" />
|
<Content Include="Scripts\yavsc.hidefieldset.js" />
|
||||||
|
<Content Include="hangouts.xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
|
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||||
|
|
|
||||||
13
web/hangouts.xml
Normal file
13
web/hangouts.xml
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<Module>
|
||||||
|
<ModulePrefs title="Book an artist">
|
||||||
|
<Require feature="rpc"/>
|
||||||
|
<Require feature="views"/>
|
||||||
|
</ModulePrefs>
|
||||||
|
<Content type="html">
|
||||||
|
<![CDATA[
|
||||||
|
<script src="//plus.google.com/hangouts/_/api/v1/hangout.js"></script>
|
||||||
|
<!-- Your application code -->
|
||||||
|
]]>
|
||||||
|
</Content>
|
||||||
|
</Module>
|
||||||
|
|
@ -1,3 +1,13 @@
|
||||||
|
2015-12-02 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
|
* 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 <paul@pschneider.fr>
|
2015-12-01 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
* LocalizedText.resx:
|
* LocalizedText.resx:
|
||||||
|
|
|
||||||
|
|
@ -161,6 +161,15 @@ namespace Yavsc.Model.FrontOffice
|
||||||
p.PerformanceDate = date;
|
p.PerformanceDate = date;
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the blog title.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The blog title.</value>
|
||||||
|
public string BlogTitle {
|
||||||
|
get {
|
||||||
|
return YavscClientProfile.BlogTitle;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
14
yavscModel/LocalizedText.Designer.cs
generated
14
yavscModel/LocalizedText.Designer.cs
generated
|
|
@ -118,9 +118,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Remove {
|
public static string Product_reference {
|
||||||
get {
|
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 {
|
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 {
|
public static string Profile_edition {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Profile_edition", resourceCulture);
|
return ResourceManager.GetString("Profile_edition", resourceCulture);
|
||||||
|
|
|
||||||
14
yavscModel/LocalizedText.fr.Designer.cs
generated
14
yavscModel/LocalizedText.fr.Designer.cs
generated
|
|
@ -118,9 +118,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Remove {
|
public static string Product_reference {
|
||||||
get {
|
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 {
|
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 {
|
public static string Profile_edition {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Profile_edition", resourceCulture);
|
return ResourceManager.GetString("Profile_edition", resourceCulture);
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
<data name="AnIMessageHasbeenSent"><value>Un message instantané a été envoyé à {0},
|
<data name="AnIMessageHasbeenSent"><value>Un message instantané a été envoyé à {0},
|
||||||
lui présentant votre demande. Vous devriez être contacté très rapidement.</value></data>
|
lui présentant votre demande. Vous devriez être contacté très rapidement.</value></data>
|
||||||
<data name="available"><value>disponible</value></data>
|
<data name="available"><value>disponible</value></data>
|
||||||
|
<data name="AuthenticatedOnly"><value>Seules les utilisateurs authentifies peuvent accèder à cette information</value></data>
|
||||||
<data name="Bill_edition"><value>Édition d'un billet</value></data>
|
<data name="Bill_edition"><value>Édition d'un billet</value></data>
|
||||||
<data name="Bill_removal"><value>Suppression d'un billet</value></data>
|
<data name="Bill_removal"><value>Suppression d'un billet</value></data>
|
||||||
<data name="BillCreated"><value>Billet créé</value></data>
|
<data name="BillCreated"><value>Billet créé</value></data>
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
<data name="AnIMessageHasbeenSent"><value>An instant message has been sent to {0},
|
<data name="AnIMessageHasbeenSent"><value>An instant message has been sent to {0},
|
||||||
showing to him your query. You should be contacted very soon.</value></data>
|
showing to him your query. You should be contacted very soon.</value></data>
|
||||||
<data name="available"><value>available</value></data>
|
<data name="available"><value>available</value></data>
|
||||||
|
<data name="AuthenticatedOnly"><value>You must be authenticated in order to access this information</value></data>
|
||||||
<data name="Bill_edition"><value>Bill edition</value></data>
|
<data name="Bill_edition"><value>Bill edition</value></data>
|
||||||
<data name="Bill_removal"><value>Bill removal</value></data>
|
<data name="Bill_removal"><value>Bill removal</value></data>
|
||||||
<data name="BillCreated"><value>Bill created</value></data>
|
<data name="BillCreated"><value>Bill created</value></data>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue