You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/08 13:21:26 UTC
[maven-fluido-skin] branch clean-up-banner-handling updated (ec3ea2e -> adc3774)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch clean-up-banner-handling
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
discard ec3ea2e Use <h1/> and rely on Doxia Sitetools to provide a left banner by default
new adc3774 [MSKINS-185] Don't fall back anymore if bannerLeft ist not provided
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ec3ea2e)
\
N -- N -- N refs/heads/clean-up-banner-handling (adc3774)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven-fluido-skin] 01/01: [MSKINS-185] Don't fall back anymore if bannerLeft ist not provided
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch clean-up-banner-handling
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit adc377438bbe22ef846d2672eb41b806da33e93c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 7 22:46:53 2022 +0200
[MSKINS-185] Don't fall back anymore if bannerLeft ist not provided
This closes #27
---
src/main/resources/META-INF/maven/site-macros.vm | 2 +-
src/main/resources/META-INF/maven/site.vm | 15 +--------------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index eb371c2..dea3975 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -179,7 +179,7 @@
#* *##end
#* *#<img src="$src" $alt$bannerTitle style="$imgBorder$imgWidth$imgHeight" />##
#* *##else
-#* *#<h2>$banner.name</h2>
+#* *#<h1>$banner.name</h1>
#* *##end
##
#* *##if( $banner.href )
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 5a0516d..53d4e23 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -184,20 +184,7 @@
#**##end
<header>
<div id="banner">
- <div class="pull-left">##
-#* *##if( $decoration.bannerLeft )
-#* *##banner( $decoration.bannerLeft "bannerLeft" )
-#* *##else
-#* *### MSKINS-32
- <h1>##
-#* *##if( $project.name && $project.name != '' )
-#* *#$project.name
-#* *##else
-#* *#$project.artifactId
-#* *##end
-#* *#</h1>##
-#* *##end
-#* *#</div>
+ <div class="pull-left">#banner( $decoration.bannerLeft "bannerLeft" )</div>
<div class="pull-right">#banner( $decoration.bannerRight "bannerRight" )</div>
<div class="clear"><hr/></div>
</div>