[docs] Schema additions, and monodoc template updates.

- Expanded monodoc-ecma schema to support the 'preserve-mono' attribute, and the attribution tag.
- Added preserve-mono to several pieces of documentation that we would like to preserve across future automated documentation imports: CipherSuitesCallback, ServicePointManager, CultureInfo, Environment+SpecialFolder.xml
- XSL template changes for monodoc HTML generation to support <attribution>

6 files changed, 47 insertions, 14 deletions

diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
index 795cae98daf..6d4baf6ca46 100644
--- a/mcs/class/monodoc/Makefile
+++ b/mcs/class/monodoc/Makefile
@@ -65,6 +65,7 @@ RESOURCE_FILES = \
 	Resources/home.html               \
 	Resources/Lminus.gif              \
 	Resources/Lplus.gif               \
+	Resources/creativecommons.png     \
 	Resources/mdoc-html-format.xsl    \
 	Resources/mdoc-html-utils.xsl     \
 	Resources/mdoc-sections-css.xsl   \
@@ -99,6 +100,7 @@ LIB_MCS_FLAGS = \
 	/resource:Resources/home.html,home.html                           \
 	/resource:Resources/Lminus.gif,Lminus.gif                         \
 	/resource:Resources/Lplus.gif,Lplus.gif                           \
+	/resource:Resources/creativecommons.png,creativecommons.png       \
 	/resource:Resources/mdoc-html-format.xsl,mdoc-html-format.xsl     \
 	/resource:Resources/mdoc-html-utils.xsl,mdoc-html-utils.xsl       \
 	/resource:Resources/mdoc-sections-css.xsl,mdoc-sections-css.xsl   \
diff --git a/mcs/class/monodoc/Resources/base.css b/mcs/class/monodoc/Resources/base.css
index d264419b3cc..20175b43ae3 100644
--- a/mcs/class/monodoc/Resources/base.css
+++ b/mcs/class/monodoc/Resources/base.css
@@ -34,3 +34,12 @@ div.title {
 	font-style: italic;
 }
 
+.attributionlogo { 
+	display:none; 
+	float:right;
+}
+
+div:hover > .attributionlogo,p:hover > .attributionlogo,td:hover > .attributionlogo { 
+	display:inline; 
+	float:right;
+}
diff --git a/mcs/class/monodoc/Resources/creativecommons.png b/mcs/class/monodoc/Resources/creativecommons.png
new file mode 100644
index 00000000000..c558cbbe898
--- /dev/null
+++ b/mcs/class/monodoc/Resources/creativecommons.png
diff --git a/mcs/class/monodoc/Resources/mdoc-html-utils.xsl b/mcs/class/monodoc/Resources/mdoc-html-utils.xsl
index c8a84a84634..bc90f7b344c 100644
--- a/mcs/class/monodoc/Resources/mdoc-html-utils.xsl
+++ b/mcs/class/monodoc/Resources/mdoc-html-utils.xsl
@@ -1468,6 +1468,18 @@
 		</p>
 	</xsl:template>
 
+	<xsl:template match="attribution">
+		<a href="http://creativecommons.org/licenses/by/4.0/" class="attributionlogo">
+			<xsl:attribute name="title">
+				<xsl:choose>
+					<xsl:when test="@modified='false'"><xsl:value-of select="concat('This content is licensed Creative Commons By ', @from)" /></xsl:when>
+					<xsl:otherwise><xsl:value-of select="concat('This content has been modified under a Creative Commons license from ', @from)" /></xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		<img src="mdocimages/creativecommons.png" /> 
+		</a>
+	</xsl:template>
+
 	<xsl:template match="paramref">
 		<i><xsl:value-of select="@name"/>
 				<xsl:apply-templates/>
diff --git a/mcs/class/monodoc/monodoc-net_4_0.csproj b/mcs/class/monodoc/monodoc-net_4_0.csproj
index d12b00b1372..7e4b6cb96ce 100644
--- a/mcs/class/monodoc/monodoc-net_4_0.csproj
+++ b/mcs/class/monodoc/monodoc-net_4_0.csproj
@@ -516,7 +516,8 @@
     <Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />

     <Compile Include="Monodoc\storage\ZipStorage.cs" />

     <Compile Include="Monodoc\Tree.cs" />

-    <Compile Include="Monodoc\TypeUtils.cs" />
  </ItemGroup>

+    <Compile Include="Monodoc\TypeUtils.cs" />

+  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -528,11 +529,11 @@
     <PreBuildEvent>

 

     </PreBuildEvent>

-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">

+

+    </PostBuildEvent>

+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">

+

     </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

@@ -590,6 +591,9 @@
     <EmbeddedResource Include="Resources/home.html">

       <LogicalName>home.html</LogicalName>

     </EmbeddedResource>

+    <EmbeddedResource Include="Resources/creativecommons.png">

+      <LogicalName>creativecommons.png</LogicalName>

+    </EmbeddedResource>

     <EmbeddedResource Include="Resources/Lminus.gif">

       <LogicalName>Lminus.gif</LogicalName>

     </EmbeddedResource>

@@ -748,4 +752,5 @@
     </EmbeddedResource>

   </ItemGroup>

 </Project>

-
+</Project>

+

diff --git a/mcs/class/monodoc/monodoc-net_4_5.csproj b/mcs/class/monodoc/monodoc-net_4_5.csproj
index a0e9c948d1d..bf466b83b22 100644
--- a/mcs/class/monodoc/monodoc-net_4_5.csproj
+++ b/mcs/class/monodoc/monodoc-net_4_5.csproj
@@ -516,7 +516,8 @@
     <Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />

     <Compile Include="Monodoc\storage\ZipStorage.cs" />

     <Compile Include="Monodoc\Tree.cs" />

-    <Compile Include="Monodoc\TypeUtils.cs" />
  </ItemGroup>

+    <Compile Include="Monodoc\TypeUtils.cs" />

+  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -528,11 +529,11 @@
     <PreBuildEvent>

 

     </PreBuildEvent>

-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">

+

+    </PostBuildEvent>

+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">

+

     </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

@@ -590,6 +591,9 @@
     <EmbeddedResource Include="Resources/home.html">

       <LogicalName>home.html</LogicalName>

     </EmbeddedResource>

+    <EmbeddedResource Include="Resources/creativecommons.png">

+      <LogicalName>creativecommons.png</LogicalName>

+    </EmbeddedResource>

     <EmbeddedResource Include="Resources/Lminus.gif">

       <LogicalName>Lminus.gif</LogicalName>

     </EmbeddedResource>

@@ -748,4 +752,5 @@
     </EmbeddedResource>

   </ItemGroup>

 </Project>

-
+</Project>

+