From 886bb318826aa3754c78cc5a92d9d02d13b7a0ea Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 13 Oct 2014 12:21:55 +0200 Subject: [PATCH] * Yavsc.sln: * Web.csproj: * Edit.aspx: * MyClass.cs: * Restore.aspx: * SalesCatalog.csproj: * RemoveUserQuery.aspx: * RemoveRoleQuery.aspx: * AssemblyInfo.cs: * fortune.csproj: a test plugin * App.master: The site name as suffix in titles * AddRole.aspx: Form action fixed * CreateBackup.aspx: --- SalesCatalog/SalesCatalog.csproj | 4 +- Yavsc.sln | 11 ++++++ plugins/fortune/MyClass.cs | 13 +++++++ plugins/fortune/Properties/AssemblyInfo.cs | 27 +++++++++++++ plugins/fortune/fortune.csproj | 45 ++++++++++++++++++++++ web/Models/App.master | 6 ++- web/Views/Admin/AddRole.aspx | 2 +- web/Views/Admin/CreateBackup.aspx | 2 +- web/Views/Admin/RemoveRoleQuery.aspx | 2 +- web/Views/Admin/RemoveUserQuery.aspx | 2 +- web/Views/Admin/Restore.aspx | 2 +- web/Views/Blogs/Edit.aspx | 2 +- web/Web.csproj | 4 +- 13 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 plugins/fortune/MyClass.cs create mode 100644 plugins/fortune/Properties/AssemblyInfo.cs create mode 100644 plugins/fortune/fortune.csproj diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index 84c1e97f..ed2eb8bd 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -31,7 +31,9 @@ - + + nunit + diff --git a/Yavsc.sln b/Yavsc.sln index c39e2022..5b747509 100644 --- a/Yavsc.sln +++ b/Yavsc.sln @@ -23,6 +23,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ITContent", "ITContent\ITCo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ITContentProvider", "ITContentProvider\ITContentProvider.csproj", "{9D7D892E-9B77-4713-892D-C26E1E944119}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{ECEC9074-ACB5-4A74-BE22-FF7B40F25A1A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fortune", "plugins\fortune\fortune.csproj", "{B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,6 +65,10 @@ Global {9D7D892E-9B77-4713-892D-C26E1E944119}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Release|Any CPU.Build.0 = Release|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Release|Any CPU.Build.0 = Release|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,6 +82,9 @@ Global {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD} = {ECEC9074-ACB5-4A74-BE22-FF7B40F25A1A} + EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = web\Web.csproj EndGlobalSection diff --git a/plugins/fortune/MyClass.cs b/plugins/fortune/MyClass.cs new file mode 100644 index 00000000..d35a41e3 --- /dev/null +++ b/plugins/fortune/MyClass.cs @@ -0,0 +1,13 @@ +using System; +using Yavsc.Model; + +namespace fortune +{ + public class MyClass : IModule + { + public MyClass () + { + } + } +} + diff --git a/plugins/fortune/Properties/AssemblyInfo.cs b/plugins/fortune/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..82ffe701 --- /dev/null +++ b/plugins/fortune/Properties/AssemblyInfo.cs @@ -0,0 +1,27 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. + +[assembly: AssemblyTitle ("fortune")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("Paul Schneider")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] + +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. + +[assembly: AssemblyVersion ("1.0.*")] + +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. + +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/plugins/fortune/fortune.csproj b/plugins/fortune/fortune.csproj new file mode 100644 index 00000000..0ec5c31e --- /dev/null +++ b/plugins/fortune/fortune.csproj @@ -0,0 +1,45 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD} + Library + fortune + fortune + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + + + full + true + bin\Release + prompt + 4 + false + + + + + + + + + + + + {68F5B80A-616E-4C3C-91A0-828AA40000BD} + YavscModel + + + \ No newline at end of file diff --git a/web/Models/App.master b/web/Models/App.master index 27290821..d76e89db 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -1,6 +1,9 @@ <%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> + + <% Page.Title += " - "+YavscHelpers.SiteName; %> + @@ -8,8 +11,7 @@ - - +
diff --git a/web/Views/Admin/AddRole.aspx b/web/Views/Admin/AddRole.aspx index 116deaab..26f1c042 100644 --- a/web/Views/Admin/AddRole.aspx +++ b/web/Views/Admin/AddRole.aspx @@ -2,7 +2,7 @@ <%= Html.ValidationSummary() %> -<% using(Html.BeginForm("DoAddRole")) +<% using(Html.BeginForm("DoAddRole","Admin")) { %> Nom du rôle : <%= Html.TextBox( "RoleName" ) %> diff --git a/web/Views/Admin/CreateBackup.aspx b/web/Views/Admin/CreateBackup.aspx index 0f2f22c1..6a9397fd 100644 --- a/web/Views/Admin/CreateBackup.aspx +++ b/web/Views/Admin/CreateBackup.aspx @@ -1,6 +1,6 @@ <%@ Page Title="Backup creation" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> -<%= Html.ValidationSummary("CreateBackup") %> +<%= Html.ValidationSummary("CreateBackup","Admin") %> <% using (Html.BeginForm("CreateBackup")) { %> <%= Html.LabelFor(model => model.Host) %>: diff --git a/web/Views/Admin/RemoveRoleQuery.aspx b/web/Views/Admin/RemoveRoleQuery.aspx index e1b4f0b6..59d33f8e 100644 --- a/web/Views/Admin/RemoveRoleQuery.aspx +++ b/web/Views/Admin/RemoveRoleQuery.aspx @@ -2,7 +2,7 @@
<%= Html.ValidationSummary() %> -<% using ( Html.BeginForm("RemoveRole") ) { %> +<% using ( Html.BeginForm("RemoveRole","Admin") ) { %> Supprimer le rôle <%= Html.Encode( ViewData["roletoremove"] ) %> ?
diff --git a/web/Views/Admin/RemoveUserQuery.aspx b/web/Views/Admin/RemoveUserQuery.aspx index 235d212d..21ab25eb 100644 --- a/web/Views/Admin/RemoveUserQuery.aspx +++ b/web/Views/Admin/RemoveUserQuery.aspx @@ -7,7 +7,7 @@
<%= Html.ValidationSummary() %> -<% using ( Html.BeginForm("RemoveUser") ) { %> +<% using ( Html.BeginForm("RemoveUser","Admin") ) { %> Supprimer l'utilisateur <%= Html.Encode( ViewData["usertoremove"] ) %> ?
diff --git a/web/Views/Admin/Restore.aspx b/web/Views/Admin/Restore.aspx index b803425a..befb74d9 100644 --- a/web/Views/Admin/Restore.aspx +++ b/web/Views/Admin/Restore.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %> <%= Html.ValidationSummary("Restore a database backup") %> -<% using (Html.BeginForm("Restore")) { %> +<% using (Html.BeginForm("Restore","Admin")) { %> <% string [] bcfiles = (string[]) ViewData["Backups"]; %>