* 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,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>
|
||||
|
||||
* 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 {
|
||||
get {
|
||||
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 {
|
||||
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 {
|
||||
return ResourceManager.GetString("Create", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string was_added_to_the_empty_role {
|
||||
get {
|
||||
return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture);
|
||||
return ResourceManager.GetString("Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -112,9 +112,9 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string DocTemplateException {
|
||||
public static string DuplicateEmail {
|
||||
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 {
|
||||
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 {
|
||||
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 {
|
||||
return ResourceManager.GetString("UserName", resourceCulture);
|
||||
return ResourceManager.GetString("Consultant", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Remember_me {
|
||||
public static string EventWebPage {
|
||||
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 {
|
||||
return ResourceManager.GetString("Home", resourceCulture);
|
||||
return ResourceManager.GetString("Not_Approuved", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Pdf_version {
|
||||
public static string Remember_me {
|
||||
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 {
|
||||
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 {
|
||||
get {
|
||||
return ResourceManager.GetString("Online", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Not_Approuved {
|
||||
public static string Home {
|
||||
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 {
|
||||
return ResourceManager.GetString("role_created", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string User_List {
|
||||
get {
|
||||
return ResourceManager.GetString("User List", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string EventWebPage {
|
||||
get {
|
||||
return ResourceManager.GetString("EventWebPage", resourceCulture);
|
||||
return ResourceManager.GetString("DisplayName", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -334,15 +340,9 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string DisplayName {
|
||||
public static string role_created {
|
||||
get {
|
||||
return ResourceManager.GetString("DisplayName", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Consultant {
|
||||
get {
|
||||
return ResourceManager.GetString("Consultant", resourceCulture);
|
||||
return ResourceManager.GetString("role_created", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -357,11 +357,5 @@ namespace Yavsc.Model {
|
|||
return ResourceManager.GetString("entries", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string DuplicateUserName {
|
||||
get {
|
||||
return ResourceManager.GetString("DuplicateUserName", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,61 +12,57 @@
|
|||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</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="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="Create"><value>Create</value></data>
|
||||
<data name="Members"><value>Members</value></data>
|
||||
<data name="UserName"><value>User Name</value></data>
|
||||
<data name="Count"><value>Count</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="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="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="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>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ namespace Yavsc.Model.RolesAndMembers
|
|||
/// </summary>
|
||||
/// <value>The name of the user.</value>
|
||||
[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; }
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue