* yavsc.js: factorize some javascript
* InputCircle.cs: this class is about to be removed * BlogsController.cs: removes Html used as text * App.master: removes the bsd css class script * Circles.aspx: fixes the Javascript circle selection * Index.aspx: * AssemblyInfo.aspx: `Indexe` is not a french word, sorry for the trouble * Web.csproj: includes yavsc Javascript in the project * LocalizedText.Designer.cs: alphabetic order in ressource names * LocalizedText.resx: * alphabetic order in ressource names * RegisterModel.cs: disposes a duplicated resource string "UserName" (uses now User_name) * style.css: panels float left
This commit is contained in:
parent
13a6753614
commit
17f57d5542
15 changed files with 230 additions and 223 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
2015-08-22 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
|
* InputCircle.cs: this class is about to be removed
|
||||||
|
|
||||||
2015-08-20 Paul Schneider <paul@pschneider.fr>
|
2015-08-20 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
* InputCircle.cs: fixes the new CircleManager interface usage
|
* InputCircle.cs: fixes the new CircleManager interface usage
|
||||||
|
|
|
||||||
|
|
@ -163,15 +163,6 @@ namespace Yavsc.WebControls
|
||||||
writer.AddAttribute ("value", ci.Id.ToString() );
|
writer.AddAttribute ("value", ci.Id.ToString() );
|
||||||
writer.RenderBeginTag ("option");
|
writer.RenderBeginTag ("option");
|
||||||
writer.Write (ci.Title);
|
writer.Write (ci.Title);
|
||||||
if (ci.Members.Length > 0) {
|
|
||||||
writer.RenderBeginTag ("br");
|
|
||||||
writer.RenderEndTag ();
|
|
||||||
writer.RenderBeginTag ("i");
|
|
||||||
writer.Write (ci.Members [0]);
|
|
||||||
for (int i=1; i<ci.Members.Length; i++)
|
|
||||||
writer.Write (", "+ci.Members [i]);
|
|
||||||
writer.RenderEndTag ();
|
|
||||||
}
|
|
||||||
writer.RenderEndTag ();
|
writer.RenderEndTag ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ main {
|
||||||
background-color: rgba(64,64,64,0.6);
|
background-color: rgba(64,64,64,0.6);
|
||||||
border-radius:10px;
|
border-radius:10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
fieldset {
|
fieldset {
|
||||||
background-color: rgba(32,16,16,0.8);
|
background-color: rgba(32,16,16,0.8);
|
||||||
border-radius:5px; border: solid 1px #000060;
|
border-radius:5px; border: solid 1px #000060;
|
||||||
|
|
@ -68,6 +69,7 @@ footer {
|
||||||
border-radius:5px;
|
border-radius:5px;
|
||||||
margin:.5em;
|
margin:.5em;
|
||||||
padding: .5em;
|
padding: .5em;
|
||||||
|
float:left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bsh { float: right; }
|
.bsh { float: right; }
|
||||||
|
|
@ -95,6 +97,7 @@ header {
|
||||||
margin:0em;
|
margin:0em;
|
||||||
padding:0em;
|
padding:0em;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1 img { vertical-align: text-top; }
|
h1 img { vertical-align: text-top; }
|
||||||
|
|
||||||
a {
|
a {
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,21 @@
|
||||||
|
2015-08-22 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
|
* yavsc.js: factorize some javascript
|
||||||
|
|
||||||
|
* BlogsController.cs: removes Html used as text
|
||||||
|
|
||||||
|
* App.master: removes the bsd css class script
|
||||||
|
|
||||||
|
* Circles.aspx: fixes the Javascript circle selection
|
||||||
|
|
||||||
|
* Index.aspx:
|
||||||
|
* AssemblyInfo.aspx: `Indexe` is not a french word, sorry for
|
||||||
|
the trouble
|
||||||
|
|
||||||
|
* Web.csproj: includes yavsc Javascript in the project
|
||||||
|
|
||||||
|
* style.css: panels float left
|
||||||
|
|
||||||
2015-08-20 Paul Schneider <paul@pschneider.fr>
|
2015-08-20 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
* CircleController.cs: * Authorize some Http methods
|
* CircleController.cs: * Authorize some Http methods
|
||||||
|
|
|
||||||
|
|
@ -303,7 +303,7 @@ namespace Yavsc.Controllers
|
||||||
|
|
||||||
ViewData ["AllowedCircles"] = CircleManager.DefaultProvider.List (Membership.GetUser ().UserName).Select (x => new SelectListItem {
|
ViewData ["AllowedCircles"] = CircleManager.DefaultProvider.List (Membership.GetUser ().UserName).Select (x => new SelectListItem {
|
||||||
Value = x.Id.ToString(),
|
Value = x.Id.ToString(),
|
||||||
Text = YavscHelpers.FormatCircle(x).ToHtmlString(),
|
Text = x.Title,
|
||||||
Selected = e.AllowedCircles.Contains (x.Id)
|
Selected = e.AllowedCircles.Contains (x.Id)
|
||||||
});
|
});
|
||||||
return View (e);
|
return View (e);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<asp:ContentPlaceHolder id="init" runat="server">
|
<asp:ContentPlaceHolder id="init" runat="server">
|
||||||
</asp:ContentPlaceHolder><%
|
</asp:ContentPlaceHolder><%
|
||||||
ViewState["orgtitle"] = T.GetString(Page.Title);
|
ViewState["orgtitle"] = Html.Translate(Page.Title);
|
||||||
Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName;
|
Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName;
|
||||||
%><head runat="server">
|
%><head runat="server">
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
|
|
@ -55,7 +55,8 @@ ViewState["orgtitle"] = T.GetString(Page.Title);
|
||||||
<%= Html.ActionLink( "Deconnexion", "Logout", "Account", new { returnUrl=Request.Url.PathAndQuery }, null) %>
|
<%= Html.ActionLink( "Deconnexion", "Logout", "Account", new { returnUrl=Request.Url.PathAndQuery }, null) %>
|
||||||
<% } %></div>
|
<% } %></div>
|
||||||
<footer>
|
<footer>
|
||||||
<script src="https://apis.google.com/js/platform.js" async defer>
|
<script src="/Scripts/yavsc.js" async defer>
|
||||||
|
<script src="https://apis.google.com/js/platform.js" defer>
|
||||||
{lang: 'fr'}
|
{lang: 'fr'}
|
||||||
</script>
|
</script>
|
||||||
<%= Html.ActionLink("Contact","Contact","Home",null, new { @class="thanks" }) %>
|
<%= Html.ActionLink("Contact","Contact","Home",null, new { @class="thanks" }) %>
|
||||||
|
|
@ -70,15 +71,6 @@ ViewState["orgtitle"] = T.GetString(Page.Title);
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
|
var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
|
||||||
</script>
|
</script>
|
||||||
<script>
|
|
||||||
$( ".bshd" ).on("click",function(e) {
|
|
||||||
if (e.target == "[object HTMLElement]") {
|
|
||||||
var panel = $(this).children(".bshpanel");
|
|
||||||
if (panel.hasClass("hidden")) panel.css("cursor","zoom-out");
|
|
||||||
else panel.css("cursor","zoom-in");
|
|
||||||
panel.toggleClass("hidden");
|
|
||||||
$(this).children(".bsh").toggleClass("hidden");
|
|
||||||
} });
|
|
||||||
</script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
23
web/Scripts/yavsc.js
Normal file
23
web/Scripts/yavsc.js
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
|
||||||
|
function showHide() {
|
||||||
|
var id = $(this).attr('did');
|
||||||
|
var target = $('#'+id);
|
||||||
|
if (target.hasClass('hidden')) {
|
||||||
|
target.removeClass('hidden');
|
||||||
|
if (typeof this.oldhtml == "undefined")
|
||||||
|
this.oldhtml = $(this).html();
|
||||||
|
$(this).html('['+this.oldhtml+']');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
target.addClass('hidden');
|
||||||
|
$(this).html(this.oldhtml);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function message(msg) {
|
||||||
|
if (msg) {
|
||||||
|
$("#msg").removeClass("hidden");
|
||||||
|
$("#msg").text(msg);
|
||||||
|
} else { $("#msg").addClass("hidden"); } }
|
||||||
|
|
||||||
|
|
@ -8,21 +8,25 @@
|
||||||
<table id="tbc">
|
<table id="tbc">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th data-sort="string"><%=Html.Translate("Title")%></th>
|
<th data-sort="string"><%=Html.Translate("Title")%>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="tbcb">
|
<tbody id="tbcb">
|
||||||
<% int lc=0;
|
<% int lc=0;
|
||||||
foreach (var ci in (IEnumerable<Circle>) ViewData["Circles"]) { lc++; %>
|
foreach (var ci in (IEnumerable<Circle>) ViewData["Circles"]) { lc++; %>
|
||||||
<tr class="<%= (lc%2==0)?"even ":"odd " %>row" id="c_<%=ci.Id%>">
|
<tr class="<%= (lc%2==0)?"even ":"odd " %>row" id="c_<%=ci.Id%>">
|
||||||
<td><%=Html.FormatCircle(ci)%></td>
|
<td cid="<%=ci.Id%>" style="cursor: pointer;" class="btnselcircle" ><%=Html.FormatCircle(ci)%></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="button" value="<%=Html.Translate("Remove")%>" class="btnremovecircle actionlink" cid="<%=ci.Id%>"/>
|
<input type="button" value="<%=Html.Translate("Remove")%>"
|
||||||
|
class="btnremovecircle actionlink" cid="<%=ci.Id%>"/>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% } %>
|
<% } %>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<div class="actionlink" id="btednvcirc" did="fncirc">Ajouter un cercle</div>
|
||||||
<script>
|
<script>
|
||||||
$(function(){
|
$(function(){
|
||||||
$("#tbc").stupidtable();
|
$("#tbc").stupidtable();
|
||||||
|
|
@ -30,19 +34,13 @@ $("#tbc").stupidtable();
|
||||||
</script>
|
</script>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||||
|
<div id="fncirc" class="hidden">
|
||||||
|
|
||||||
<div id="dfnuser" class="hidden panel">
|
|
||||||
<%= Html.Partial("~/Views/Account/Register.ascx",new RegisterClientModel(),new ViewDataDictionary(ViewData)
|
<div class="panel">
|
||||||
{
|
|
||||||
TemplateInfo = new System.Web.Mvc.TemplateInfo
|
|
||||||
{
|
|
||||||
HtmlFieldPrefix = ViewData.TemplateInfo.HtmlFieldPrefix==""?"ur":ViewData.TemplateInfo.HtmlFieldPrefix+"_ur"
|
|
||||||
}
|
|
||||||
}) %>
|
|
||||||
</div>
|
|
||||||
<form>
|
<form>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Nouveau cercle</legend>
|
<legend id="lgdnvcirc"></legend>
|
||||||
<span id="msg" class="field-validation-valid error"></span>
|
<span id="msg" class="field-validation-valid error"></span>
|
||||||
<label for="title"><b><%=Html.Translate("Title")%></b></label>
|
<label for="title"><b><%=Html.Translate("Title")%></b></label>
|
||||||
<input type="text" id="title" name="title" class="inputtext"/>
|
<input type="text" id="title" name="title" class="inputtext"/>
|
||||||
|
|
@ -55,37 +53,58 @@ $("#tbc").stupidtable();
|
||||||
<yavsc:InputUserName
|
<yavsc:InputUserName
|
||||||
id="users"
|
id="users"
|
||||||
name="users"
|
name="users"
|
||||||
emptyvalue="[nouvel utilisateur]"
|
emptyvalue="[aucun]"
|
||||||
onchange="onmembersChange(this.value);"
|
onchange="onmembersChange(this.value);"
|
||||||
multiple="true"
|
multiple="true"
|
||||||
runat="server" >
|
runat="server" >
|
||||||
</yavsc:InputUserName>
|
</yavsc:InputUserName>
|
||||||
|
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody id="tbmbrsb">
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<input type="button" id="btnnewcircle" value="<%=Html.Translate("Create")%>" class="actionlink rowbtnct" />
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function message(msg) {
|
|
||||||
if (msg) {
|
var cformhidden=true;
|
||||||
$("#msg").removeClass("hidden");
|
var errspanid="msg";
|
||||||
$("#msg").text(msg);
|
|
||||||
} else { $("#msg").addClass("hidden"); } }
|
function getCircle(id)
|
||||||
|
{
|
||||||
|
$.getJSON("<%=Url.Content("~/api/Circle/Get/")%>"+id,
|
||||||
|
function(json) { $("#title").val( json.Title); $("#users").val( json.Members ) ; });
|
||||||
|
}
|
||||||
|
|
||||||
|
function editNewCircle() {
|
||||||
|
if ($('#fncirc').hasClass('hidden')) $('#fncirc').removeClass('hidden')
|
||||||
|
$('#lgdnvcirc').html("Creation d'un cercle");
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectCircle() {
|
||||||
|
if ($('#fncirc').hasClass('hidden')) $('#fncirc').removeClass('hidden')
|
||||||
|
var id = $(this).attr('cid');
|
||||||
|
$('#lgdnvcirc').html("Edition du cercle");
|
||||||
|
// get it from the server
|
||||||
|
getCircle(id);
|
||||||
|
}
|
||||||
|
|
||||||
function onmembersChange(newval)
|
function onmembersChange(newval)
|
||||||
{
|
{
|
||||||
if (newval=='')
|
|
||||||
$("#dfnuser").removeClass("hidden");
|
|
||||||
else
|
|
||||||
$("#dfnuser").addClass("hidden");
|
|
||||||
}
|
}
|
||||||
function clearRegistrationValidation(){
|
|
||||||
$("#Err_ur_Name").text("");
|
|
||||||
$("#Err_ur_UserName").text("");
|
|
||||||
$("#Err_ur_Mobile").text("");
|
|
||||||
$("#Err_ur_Phone").text("");
|
|
||||||
$("#Err_ur_Email").text("");
|
|
||||||
$("#Err_ur_Address").text("");
|
|
||||||
$("#Err_ur_ZipCode").text("");
|
|
||||||
$("#Err_ur_CityAndState").text("");
|
|
||||||
$("#Err_ur_IsApprouved").text("");
|
|
||||||
}
|
|
||||||
function clearCircleValidation() {}
|
|
||||||
function removeCircle() {
|
function removeCircle() {
|
||||||
message(false);
|
message(false);
|
||||||
var id = $(this).attr('cid');
|
var id = $(this).attr('cid');
|
||||||
|
|
@ -93,8 +112,8 @@ $("#tbc").stupidtable();
|
||||||
url: "<%=Url.Content("~/api/Circle/Delete/")%>"+id,
|
url: "<%=Url.Content("~/api/Circle/Delete/")%>"+id,
|
||||||
type: "GET",
|
type: "GET",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
// Drops the detroyed circle row
|
// Drops the row
|
||||||
$("c_"+id).remove();
|
$("#c_"+id).remove();
|
||||||
},
|
},
|
||||||
statusCode: {
|
statusCode: {
|
||||||
400: function(data) {
|
400: function(data) {
|
||||||
|
|
@ -125,9 +144,18 @@ $("#tbc").stupidtable();
|
||||||
url: "<%=Url.Content("~/api/Circle/Create")%>",
|
url: "<%=Url.Content("~/api/Circle/Create")%>",
|
||||||
type: "POST",
|
type: "POST",
|
||||||
data: circle,
|
data: circle,
|
||||||
success: function (data) {
|
success: function (id) {
|
||||||
// Adds a node rendering the new circle
|
// Adds a node rendering the new circle
|
||||||
$("#tbcb").append("<tr><td>"+circle.title+" <br><i>"+circle.users+"</i></td></tr>");
|
$('<tr id="c_'+id+'"/>').addClass('selected row')
|
||||||
|
.appendTo('#tbcb');
|
||||||
|
|
||||||
|
$('<td>'+circle.title+'<br><i>'+
|
||||||
|
circle.users+
|
||||||
|
'</i></td></td>')
|
||||||
|
.appendTo('#c_'+id);
|
||||||
|
|
||||||
|
$('<td><input class="btnremovecircle actionlink" cid="'+id+'" type="button" value="Remove" onclick="removeCircle"></td>').appendTo('#c_'+id);
|
||||||
|
|
||||||
},
|
},
|
||||||
statusCode: {
|
statusCode: {
|
||||||
400: function(data) {
|
400: function(data) {
|
||||||
|
|
@ -147,64 +175,11 @@ $("#tbc").stupidtable();
|
||||||
else message(false);
|
else message(false);
|
||||||
}});
|
}});
|
||||||
}
|
}
|
||||||
|
|
||||||
function addUser()
|
|
||||||
{
|
|
||||||
message(false);
|
|
||||||
var user={
|
|
||||||
UserName: $("#ur_UserName").val(),
|
|
||||||
Name: $("#ur_Name").val(),
|
|
||||||
Password: $("#ur_Password").val(),
|
|
||||||
Email: $("#ur_Email").val(),
|
|
||||||
Address: $("#ur_Address").val(),
|
|
||||||
CityAndState: $("#ur_CityAndState").val(),
|
|
||||||
ZipCode: $("#ur_ZipCode").val(),
|
|
||||||
Phone: $("#ur_Phone").val(),
|
|
||||||
Mobile: $("#ur_Mobile").val(),
|
|
||||||
IsApprouved: true
|
|
||||||
};
|
|
||||||
clearRegistrationValidation();
|
|
||||||
$.ajax({
|
|
||||||
url: "<%=Url.Content("~/api/FrontOffice/Register")%>",
|
|
||||||
type: "POST",
|
|
||||||
data: user,
|
|
||||||
success: function (data) {
|
|
||||||
$("#users option:last").after($('<option>'+user.UserName+'</option>'));
|
|
||||||
},
|
|
||||||
statusCode: {
|
|
||||||
400: function(data) {
|
|
||||||
$.each(data.responseJSON, function (key, value) {
|
|
||||||
var errspanid = "Err_ur_" + value.key.replace("model.","");
|
|
||||||
var errspan = document.getElementById(errspanid);
|
|
||||||
if (errspan==null)
|
|
||||||
alert('enoent '+errspanid);
|
|
||||||
else
|
|
||||||
errspan.innerHTML=value.errors.join("<br/>");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
error: function (xhr, ajaxOptions, thrownError) {
|
|
||||||
if (xhr.status!=400)
|
|
||||||
message(xhr.status+" : "+xhr.responseText);
|
|
||||||
else message(false);
|
|
||||||
}});
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody id="tbmbrsb">
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
<input type="button" id="btnnewcircle" value="<%=Html.Translate("Create")%>" class="actionlink rowbtnct" />
|
|
||||||
</fieldset>
|
|
||||||
</form>
|
|
||||||
<script>
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$("#btnnewuser").click(addUser);
|
$('#btednvcirc').click(editNewCircle);
|
||||||
$("#btnnewcircle").click(addCircle);
|
$("#btnnewcircle").click(addCircle);
|
||||||
$(".btnremovecircle").click(removeCircle);
|
$(".btnremovecircle").click(removeCircle);
|
||||||
|
$(".btnselcircle").click(selectCircle);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<%@ Page Title="Blogs - Indexe" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master" EnableTheming="True" StylesheetTheme="dark" %>
|
<%@ Page Title="Blogs - Index" Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master" EnableTheming="True" StylesheetTheme="dark" %>
|
||||||
<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %>
|
<%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %>
|
||||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<%@ Page Title="Yavsc - indexe" Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<System.Reflection.AssemblyName>>" MasterPageFile="~/Models/App.master"%>
|
<%@ Page Title="Yavsc - index" Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<System.Reflection.AssemblyName>>" MasterPageFile="~/Models/App.master"%>
|
||||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||||
<p>
|
<p>
|
||||||
Running assembly :
|
Running assembly :
|
||||||
|
|
|
||||||
|
|
@ -336,6 +336,7 @@
|
||||||
<Content Include="App_Themes\mdd_styles.css" />
|
<Content Include="App_Themes\mdd_styles.css" />
|
||||||
<Content Include="Scripts\jquery-2.1.4.min.js" />
|
<Content Include="Scripts\jquery-2.1.4.min.js" />
|
||||||
<Content Include="Scripts\MarkdownDeepLib.min.js" />
|
<Content Include="Scripts\MarkdownDeepLib.min.js" />
|
||||||
|
<Content Include="Scripts\yavsc.js" />
|
||||||
</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" />
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,13 @@
|
||||||
|
2015-08-22 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
|
* LocalizedText.Designer.cs: alphabetic order in ressource
|
||||||
|
names
|
||||||
|
|
||||||
|
* LocalizedText.resx: * alphabetic order in ressource names
|
||||||
|
|
||||||
|
* RegisterModel.cs: disposes a duplicated resource string
|
||||||
|
"UserName" (uses now User_name)
|
||||||
|
|
||||||
2015-08-20 Paul Schneider <paul@pschneider.fr>
|
2015-08-20 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
* BlogEntryCollection.cs: cleans used code
|
* BlogEntryCollection.cs: cleans used code
|
||||||
|
|
|
||||||
106
yavscModel/LocalizedText.Designer.cs
generated
106
yavscModel/LocalizedText.Designer.cs
generated
|
|
@ -46,6 +46,12 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string was_added_to_the_empty_role {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static string Bill_edition {
|
public static string Bill_edition {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Bill_edition", resourceCulture);
|
return ResourceManager.GetString("Bill_edition", resourceCulture);
|
||||||
|
|
@ -70,9 +76,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string was_added_to_the_role {
|
public static string Create {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("was_added_to_the_role", resourceCulture);
|
return ResourceManager.GetString("Create", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -82,15 +88,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Create {
|
public static string Title {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Create", resourceCulture);
|
return ResourceManager.GetString("Title", resourceCulture);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string was_added_to_the_empty_role {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -112,9 +112,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string DocTemplateException {
|
public static string DuplicateEmail {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("DocTemplateException", resourceCulture);
|
return ResourceManager.GetString("DuplicateEmail", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -124,9 +124,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Title {
|
public static string Pdf_version {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Title", resourceCulture);
|
return ResourceManager.GetString("Pdf_version", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -184,9 +184,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Welcome {
|
public static string DuplicateUserName {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Welcome", resourceCulture);
|
return ResourceManager.GetString("DuplicateUserName", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -208,15 +208,15 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string UserName {
|
public static string Consultant {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("UserName", resourceCulture);
|
return ResourceManager.GetString("Consultant", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Remember_me {
|
public static string EventWebPage {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Remember_me", resourceCulture);
|
return ResourceManager.GetString("EventWebPage", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -226,15 +226,21 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Home {
|
public static string Not_Approuved {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Home", resourceCulture);
|
return ResourceManager.GetString("Not_Approuved", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Pdf_version {
|
public static string Remember_me {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Pdf_version", resourceCulture);
|
return ResourceManager.GetString("Remember_me", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string DocTemplateException {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("DocTemplateException", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -262,9 +268,15 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string DuplicateEmail {
|
public static string was_added_to_the_role {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("DuplicateEmail", resourceCulture);
|
return ResourceManager.GetString("was_added_to_the_role", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string User_List {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("User_List", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -280,15 +292,21 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string Welcome {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Welcome", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static string Online {
|
public static string Online {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Online", resourceCulture);
|
return ResourceManager.GetString("Online", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Not_Approuved {
|
public static string Home {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("Not Approuved", resourceCulture);
|
return ResourceManager.GetString("Home", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -310,21 +328,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string role_created {
|
public static string DisplayName {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("role_created", resourceCulture);
|
return ResourceManager.GetString("DisplayName", resourceCulture);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string User_List {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("User List", resourceCulture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string EventWebPage {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("EventWebPage", resourceCulture);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -334,15 +340,9 @@ namespace Yavsc.Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string DisplayName {
|
public static string role_created {
|
||||||
get {
|
get {
|
||||||
return ResourceManager.GetString("DisplayName", resourceCulture);
|
return ResourceManager.GetString("role_created", resourceCulture);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string Consultant {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("Consultant", resourceCulture);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -357,11 +357,5 @@ namespace Yavsc.Model {
|
||||||
return ResourceManager.GetString("entries", resourceCulture);
|
return ResourceManager.GetString("entries", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string DuplicateUserName {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("DuplicateUserName", resourceCulture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,61 +12,57 @@
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<data name="Count"><value>Count</value></data>
|
|
||||||
<data name="Ciffer"><value>Ciffer</value></data>
|
|
||||||
<data name="Title"><value>Title</value></data>
|
|
||||||
<data name="Description"><value>Description</value></data>
|
|
||||||
<data name="Product_reference"><value>Product_reference</value></data>
|
|
||||||
<data name="Unitary_cost"><value>Unitary_cost</value></data>
|
|
||||||
<data name="Count"><value>Count</value></data>
|
|
||||||
<data name="Preview"><value>Preview</value><comment>comment on preview</comment></data>
|
|
||||||
<data name="Welcome"><value>Welcome</value><comment></comment></data>
|
|
||||||
<data name="User List"><value>User List</value><comment></comment></data>
|
|
||||||
<data name="Register"><value>Register</value></data>
|
|
||||||
<data name="Online"><value>Online</value></data>
|
|
||||||
<data name="Offline"><value>Offline</value></data>
|
|
||||||
<data name="Not Approuved"><value>Not Approuved</value></data>
|
|
||||||
<data name="Remove"><value>Remove</value></data>
|
|
||||||
<data name="Pdf_version"><value>Pdf version</value></data>
|
|
||||||
<data name="Tex_version"><value>LaTeX version</value></data>
|
|
||||||
<data name="User_name"><value>User name</value></data>
|
|
||||||
<data name="Google_error"><value>Google error : {0}</value></data>
|
|
||||||
<data name="access_denied"><value>Access denied</value></data>
|
<data name="access_denied"><value>Access denied</value></data>
|
||||||
<data name="UserName"><value>User name</value></data>
|
|
||||||
<data name="Google_calendar"><value>Google calendar</value></data>
|
|
||||||
<data name="Consultant"><value>Consultant</value></data>
|
|
||||||
<data name="MinDate"><value>Minimal date for the rendez-vous</value></data>
|
|
||||||
<data name="MaxDate"><value>Maximal date for the rendez-vous</value></data>
|
|
||||||
<data name="Date_search"><value>Rendez-vous query</value></data>
|
|
||||||
<data name="Remember_me"><value>Remember me</value></data>
|
|
||||||
<data name="DocTemplateException"><value>Exception occured when rendering your document</value></data>
|
|
||||||
<data name="Message_sent"><value>Your message has been sent.</value></data>
|
|
||||||
<data name="was_added_to_the_role"><value>was added to the role</value></data>
|
|
||||||
<data name="was_added_to_the_empty_role"><value>There was no user in the '{1}' role. You ({0}) was just added as firt user in the '{1}' role.</value></data>
|
|
||||||
<data name="younotadmin"><value>You're not administrator</value></data>
|
|
||||||
<data name="role_created"><value>role created</value></data>
|
|
||||||
<data name="Item_added_to_basket"><value>Item added to basket</value></data>
|
|
||||||
<data name="Estimate_not_found"><value>Estimate not found</value></data>
|
|
||||||
<data name="DuplicateEmail"><value>This email adress is already used ({0}).</value></data>
|
|
||||||
<data name="DuplicateUserName"><value>This user name is already used ({0}).</value></data>
|
|
||||||
<data name="My_Estimates"><value>My estimates</value></data>
|
|
||||||
<data name="User_name"><value>User name</value></data>
|
|
||||||
<data name="Circles"><value>Circles</value></data>
|
|
||||||
<data name="Location"><value>Location</value></data>
|
|
||||||
<data name="StartDate"><value>Start date</value></data>
|
|
||||||
<data name="EndDate"><value>End date</value></data>
|
|
||||||
<data name="ProviderName"><value>Provider name</value></data>
|
|
||||||
<data name="ProviderId"><value>Provider identifier</value></data>
|
|
||||||
<data name="Comment"><value>Comment</value></data>
|
|
||||||
<data name="EventWebPage"><value>Event Web page</value></data>
|
|
||||||
<data name="ImgLocator"><value>Image URI</value></data>
|
|
||||||
<data name="Home"><value>Home</value></data>
|
|
||||||
<data name="Bill_edition"><value>Bill edition</value></data>
|
<data name="Bill_edition"><value>Bill edition</value></data>
|
||||||
<data name="Create"><value>Create</value></data>
|
<data name="Create"><value>Create</value></data>
|
||||||
<data name="Members"><value>Members</value></data>
|
<data name="Count"><value>Count</value></data>
|
||||||
<data name="UserName"><value>User Name</value></data>
|
<data name="Ciffer"><value>Ciffer</value></data>
|
||||||
|
<data name="Circles"><value>Circles</value></data>
|
||||||
|
<data name="Consultant"><value>Consultant</value></data>
|
||||||
|
<data name="Comment"><value>Comment</value></data>
|
||||||
|
<data name="Count"><value>Count</value></data>
|
||||||
|
<data name="Date_search"><value>Rendez-vous query</value></data>
|
||||||
|
<data name="Description"><value>Description</value></data>
|
||||||
<data name="DisplayName"><value>Display Name</value></data>
|
<data name="DisplayName"><value>Display Name</value></data>
|
||||||
|
<data name="DocTemplateException"><value>Exception occured when rendering your document</value></data>
|
||||||
|
<data name="DuplicateEmail"><value>This email adress is already used ({0}).</value></data>
|
||||||
|
<data name="DuplicateUserName"><value>This user name is already used ({0}).</value></data>
|
||||||
|
<data name="EndDate"><value>End date</value></data>
|
||||||
|
<data name="Estimate_not_found"><value>Estimate not found</value></data>
|
||||||
|
<data name="EventWebPage"><value>Event Web page</value></data>
|
||||||
|
<data name="Home"><value>Home</value></data>
|
||||||
<data name="entries"><value>entries</value></data>
|
<data name="entries"><value>entries</value></data>
|
||||||
|
<data name="Google_calendar"><value>Google calendar</value></data>
|
||||||
|
<data name="Google_error"><value>Google error : {0}</value></data>
|
||||||
<data name="InternalServerError"><value>Internal Server Error</value></data>
|
<data name="InternalServerError"><value>Internal Server Error</value></data>
|
||||||
|
<data name="ImgLocator"><value>Image URI</value></data>
|
||||||
|
<data name="Item_added_to_basket"><value>Item added to basket</value></data>
|
||||||
|
<data name="Location"><value>Location</value></data>
|
||||||
|
<data name="MaxDate"><value>Maximal date for the rendez-vous</value></data>
|
||||||
|
<data name="Members"><value>Members</value></data>
|
||||||
|
<data name="Message_sent"><value>Your message has been sent.</value></data>
|
||||||
|
<data name="MinDate"><value>Minimal date for the rendez-vous</value></data>
|
||||||
|
<data name="My_Estimates"><value>My estimates</value></data>
|
||||||
|
<data name="Not_Approuved"><value>Not Approuved</value></data>
|
||||||
|
<data name="Online"><value>Online</value></data>
|
||||||
|
<data name="Offline"><value>Offline</value></data>
|
||||||
|
<data name="Pdf_version"><value>Pdf version</value></data>
|
||||||
|
<data name="Preview"><value>Preview</value><comment>comment on preview</comment></data>
|
||||||
|
<data name="ProviderId"><value>Provider identifier</value></data>
|
||||||
|
<data name="ProviderName"><value>Provider name</value></data>
|
||||||
|
<data name="Product_reference"><value>Product_reference</value></data>
|
||||||
|
<data name="Register"><value>Register</value></data>
|
||||||
|
<data name="Remember_me"><value>Remember me</value></data>
|
||||||
|
<data name="Remove"><value>Remove</value></data>
|
||||||
|
<data name="role_created"><value>role created</value></data>
|
||||||
|
<data name="StartDate"><value>Start date</value></data>
|
||||||
|
<data name="Tex_version"><value>LaTeX version</value></data>
|
||||||
|
<data name="Title"><value>Title</value></data>
|
||||||
|
<data name="Unitary_cost"><value>Unitary_cost</value></data>
|
||||||
|
<data name="User_List"><value>User List</value><comment></comment></data>
|
||||||
|
<data name="User_name"><value>User name</value></data>
|
||||||
|
<data name="was_added_to_the_role"><value>was added to the role</value></data>
|
||||||
|
<data name="was_added_to_the_empty_role"><value>There was no user in the '{1}' role. You ({0}) was just added as firt user in the '{1}' role.</value></data>
|
||||||
|
<data name="Welcome"><value>Welcome</value><comment></comment></data>
|
||||||
|
<data name="younotadmin"><value>You're not administrator</value></data>
|
||||||
</root>
|
</root>
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ namespace Yavsc.Model.RolesAndMembers
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The name of the user.</value>
|
/// <value>The name of the user.</value>
|
||||||
[Localizable(true), Required(ErrorMessage = "S'il vous plait, entrez un nom d'utilisateur")
|
[Localizable(true), Required(ErrorMessage = "S'il vous plait, entrez un nom d'utilisateur")
|
||||||
,Display(ResourceType=typeof(LocalizedText),Name="UserName")]
|
,Display(ResourceType=typeof(LocalizedText),Name="User_name")]
|
||||||
public string UserName { get; set; }
|
public string UserName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue