[maven-fluido-skin] branch master updated: [MSKINS-207] Fix CSS class replacement with change caused in DOXIA-674

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git


The following commit(s) were added to refs/heads/master by this push:
     new 409735e  [MSKINS-207] Fix CSS class replacement with change caused in 
DOXIA-674
409735e is described below

commit 409735e13b5657071a789531596d018eaa61bf66
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Thu Jan 12 16:33:11 2023 +0100

    [MSKINS-207] Fix CSS class replacement with change caused in DOXIA-674
---
 src/main/resources/META-INF/maven/site.vm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/META-INF/maven/site.vm 
b/src/main/resources/META-INF/maven/site.vm
index 9f46dc8..3cfed38 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -239,17 +239,13 @@
 #*    *##set ( $bodyColumnClass = $decoration.getCustomValue( 
'fluidoSkin.bodyColumnClass', 'span10' ) )
 ##
         <main id="bodyColumn" #if ( $sideBarEnabled ) class="$bodyColumnClass" 
#end>
-#*      *##if ( $title && $title.endsWith( "Project License" ) )
-#*        *#$bodyContent
+#*      *##if ( $convert.toBoolean( $decoration.getCustomValue( 
'fluidoSkin.sourceLineNumbersEnabled', 'false' ) ) )
+#*        *##set ( $sourceStyle = "prettyprint linenums" )
 #*      *##else
-#*        *##if ( $convert.toBoolean( $decoration.getCustomValue( 
'fluidoSkin.sourceLineNumbersEnabled', 'false' ) ) )
-#*          *##set ( $sourceStyle = "prettyprint linenums" )
-#*        *##else
-#*          *##set ( $sourceStyle = "prettyprint" )
-#*        *##end
-##
-#*        *#$bodyContent.replaceAll( "<div 
class=${esc.q}source${esc.q}>(\r?\n)?<pre>", "<div 
class=${esc.q}source${esc.q}><pre class=${esc.q}$sourceStyle${esc.q}>" 
).replaceAll( "class=${esc.q}bodyTable${esc.q}", "class=${esc.q}table 
table-striped${esc.q}" )
+#*        *##set ( $sourceStyle = "prettyprint" )
 #*      *##end
+##
+#*      *#$bodyContent.replaceAll( "<div 
class=${esc.q}source${esc.q}>(\r?\n)?<pre>", "<div 
class=${esc.q}source${esc.q}><pre class=${esc.q}$sourceStyle${esc.q}>" 
).replaceAll( "class=${esc.q}bodyTable${esc.q}", "class=${esc.q}table 
table-striped${esc.q}" ).replaceAll( "class=${esc.q}bodyTable 
bodyTableBorder${esc.q}", "class=${esc.q}table table-bordered 
table-striped${esc.q}" )
         </main>
 #*    *##if ( $sideBarEnabled )
       </div>