* Makefile: creates two targets "xmldoc" and

"htmldoc" to generate the documentation * Web.csproj: * YavscModel.csproj: * WebControls.csproj: * YavscClient.csproj: * SalesCatalog.csproj: * NpgsqlWorkflow.csproj: * NpgsqlMRPProviders.csproj: * NpgsqlBlogProvider.csproj: ITContentProvider/ITContentProvider.csproj * AssemblyInfo.cs: makes "en" the assembly culture, and normalize my name * HomeController.cs: modifies the xmldoc * Web.config: Modifies the owner email * ITContentProvider.csproj: Activates the documentation generation * App.master: adds a <meta charset=> in the head section
10 years ago · 1b7b3595e2
parent ae38718dd9
commit 1b7b3595e2
14 changed files with 28 additions and 10 deletions
--- a/ITContentProvider/ITContentProvider.csproj
+++ b/ITContentProvider/ITContentProvider.csproj
@ -20,6 +20,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\ITContentProvider.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>full</DebugType>
--- a/11
+++ b/11
@ -18,10 +18,11 @@ deploy: ddir build
 	xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(DESTDIR) /t:Deploy web/Web.csproj
 	rm -rf $(DESTDIR)/obj
 	mv $(DESTDIR)/Web.config $(DESTDIR)/Web.config.new
+	 

 rsync: rsync-preprod

-build:
+build: 
 	xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln

 clean:
@ -48,9 +49,13 @@ sourcepkg:
 debug: build
 	(cd web; export MONO_OPTIONS=--debug; xsp4 --port 8080)

-xmldoc: build
-	(cd web/bin; monodocer -pretty -o ../xmldoc $(DOCASSBS))
+xmldoc: $(patsubst %,web/bin/%,$(DOCASSBS))
+	mdoc-update $^ $(patsubst %.dll,-i%.xml,$^) --out web/xmldoc

 htmldoc: xmldoc
 	(cd web; monodocs2html -o htmldoc xmldoc)

+docdeploy-prod: htmldoc
+	rsync -ravu web/htmldoc root@$(PRODHOSTDIR)
+
+
--- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj
+++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj
@ -20,6 +20,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\NpgsqlBlogProvider.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>none</DebugType>
--- a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj
+++ b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj
@ -19,6 +19,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\NpgsqlMRPProviders.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>none</DebugType>
--- a/SalesCatalog/SalesCatalog.csproj
+++ b/SalesCatalog/SalesCatalog.csproj
@ -19,6 +19,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\SalesCatalog.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>none</DebugType>
--- a/WebControls/WebControls.csproj
+++ b/WebControls/WebControls.csproj
@ -20,6 +20,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\Yavsc.WebControls.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>full</DebugType>
--- a/WorkFlowProvider/NpgsqlWorkflow.csproj
+++ b/WorkFlowProvider/NpgsqlWorkflow.csproj
@ -20,6 +20,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\WorkFlowProvider.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>full</DebugType>
--- a/web/AssemblyInfo.cs
+++ b/web/AssemblyInfo.cs
@ -10,9 +10,9 @@ using System.Resources;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("paul schneider")]
+[assembly: AssemblyCopyright("Paul Schneider")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("en")]



--- a/web/Controllers/HomeController.cs
+++ b/web/Controllers/HomeController.cs
@ -47,7 +47,7 @@ namespace Yavsc.Controllers
 			}
 		}
 		/// <summary>
-		/// Assemblies the info.
+		/// Lists the referenced assemblies.
 		/// </summary>
 		/// <returns>The info.</returns>
 		public ActionResult AssemblyInfo()
@ -113,7 +113,8 @@ namespace Yavsc.Controllers
 				{
 					sc.Send (msg);
 					ViewData ["Message"] = LocalizedText.Message_sent;
-					return View (new { reason="", body="" });
+
+					return View (new { email=email, reason="", body="" });
 				}
 			}
 		}
--- a/web/Models/App.master
+++ b/web/Models/App.master
@ -7,8 +7,10 @@
  <% ViewState["orgtitle"] = T.GetString(Page.Title); %> 
 <% Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %>
 <head runat="server">
- <meta name="viewport" content="width=device-width" />
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+  <meta charset="utf-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="/Theme/style.css"/>
 <link rel="icon" type="image/png" href="/favicon.png" />
 <asp:ContentPlaceHolder id="head" runat="server">
@ -67,6 +69,7 @@
 	</div>
 	</aside>
   <footer>
+   <%= Html.ActionLink("Contact","Contact","Home",null, new { @class="footerlink" }) %>    <br/>
   <% foreach ( string link in Yavsc.ThanksHelper.Links()) { %>
     <%= link %>
   <% } %>
--- a/web/Web.config
+++ b/web/Web.config
@ -303,7 +303,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
    <add key="WorkflowContentProviderClass" value="yavsc.NpgsqlContentProvider" />
    <add key="SmtpServer" value="smtp.free.fr" />
    <add key="AdminEMail" value="paulschneider@free.fr" />
-    <add key="OwnerEMail" value="paul@127.0.0.1" />
+    <add key="OwnerEMail" value="paulschneider@free.fr" />
    <add key="Name" value="Psc" />
    <!-- do not point "/Home/index" with the value for the "StartPage", 
    it would result in a redirection infinite loop -->
--- a/web/Web.csproj
+++ b/web/Web.csproj
@ -30,6 +30,7 @@
        <Command type="BeforeExecute" />
      </CustomCommands>
    </CustomCommands>
+    <DocumentationFile>bin\Yavsc.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>none</DebugType>
--- a/yavscModel/YavscModel.csproj
+++ b/yavscModel/YavscModel.csproj
@ -20,6 +20,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
+    <DocumentationFile>bin\Debug\YavscModel.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>full</DebugType>
--- a/yavscclient/YavscClient.csproj
+++ b/yavscclient/YavscClient.csproj
@ -21,6 +21,7 @@
    <WarningLevel>4</WarningLevel>
    <ConsolePause>false</ConsolePause>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Debug\yavscclient.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>full</DebugType>