maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1484664 - in /maven/skins/trunk/maven-fluido-skin/src: main/resources/META-INF/maven/site.vm site/apt/index.apt.vm
Date Tue, 21 May 2013 05:43:50 GMT
Author: michaelo
Date: Tue May 21 05:43:50 2013
New Revision: 1484664

URL: http://svn.apache.org/r1484664
Log:
REOPENED - issue MSKINS-72: Add copyright notice position option

Modified:
    maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
    maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm

Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1484664&r1=1484663&r2=1484664&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Tue May
21 05:43:50 2013
@@ -260,13 +260,13 @@
       #set ( $collapseClass = "icon-chevron-down" )
     #end
   #end
-  
+
   #if ( $alignedFileName == $currentItemHref )
     <li class="active">
   #else
     <li>
   #end
-  
+
   #if ( $item.img )
     #if ( $item.position == "left" )
       #if ( $alignedFileName == $currentItemHref )
@@ -551,7 +551,7 @@
         && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'piwik' ).getChild(
'idsite' ) )
     #set ( $piwikUrl =  $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'piwik' ).getChild(
'piwikUrl' ).getValue() )
     #set ( $idsite =  $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'piwik' ).getChild(
'idsite' ).getValue() )
-    
+
     <!-- Piwik -->
     <script type="text/javascript">
     var pkBaseURL = (("https:" == document.location.protocol) ? "https://$piwikUrl/" : "http://$piwikUrl/");
@@ -789,7 +789,7 @@
 #macro ( flattrHead )
   #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' )
     && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild(
'thing' )
-    && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild(
'url' ) 
+    && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild(
'url' )
           || $project.url ) )
     <script type="text/javascript">
     /* <![CDATA[ */
@@ -807,7 +807,7 @@
 #macro ( flattrBody $sideBarEnabled )
   #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' )
     && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild(
'thing' )
-    && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild(
'url' ) 
+    && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild(
'url' )
           || $project.url ) )
     #set ( $flattrThing = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'thing' ).getValue() )
     #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' ).getChild( 'url'
) )
@@ -1141,8 +1141,8 @@
       <div class="container">
       #end
         <div class="row">
-          #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild(
'fluidoSkin' ).getChild('copyrightStyle') )
-            <p class="$decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightStyle').getValue()">Copyright
&copy;#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version
)</p>
+          #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild(
'fluidoSkin' ).getChild('footerStyle') )
+            <p class="$decoration.custom.getChild( 'fluidoSkin' ).getChild('footerStyle').getValue()">Copyright
&copy;#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version
)</p>
           #else
             <p class="span12">Copyright &copy;#copyright()All Rights Reserved.#publishDate(
"bottom" $decoration.publishDate $decoration.version )</p>
           #end

Modified: maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1484664&r1=1484663&r2=1484664&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm Tue May 21 05:43:50 2013
@@ -220,16 +220,16 @@ Welcome to ${project.name}!
 </project>
 +-----+
 
-** Copyright Style
+** Footer Style
 
-  Since 1.3.1, you can configure Copyright class. (default is span-12)
+  Since 1.3.1, you can configure footer class. (default is span-12)
 
 +-----+
 <project name="xxx">
   [...]
   <custom>
     <fluidoSkin>
-      <copyrightStyle>pull-right</copyrightStyle>
+      <footerStyle>pull-right</footerStyle>
     </fluidoSkin>
   </custom>
   [...]
@@ -424,10 +424,10 @@ Welcome to ${project.name}!
 
  Since version <<1.3.1>>, fluido-skin supports inserting {{{http://piwik.org/}Piwik
web analytics}}
  {{{http://piwik.org/docs/javascript-tracking/#toc-where-can-i-find-the-piwik-tracking-code}tracking
code}} into the generated pages.
- Users have to declare: 
+ Users have to declare:
 
  * <<<custom.fluidoSkin.piwik.piwikUrl>>>: URL of the Piwik installation
without protocol, leading and trailing slashes (i. e. without <<http://>>).
- 
+
  * <<<custom.fluidoSkin.piwik.idsite>>>: ID in the Piwik installation of
the site which is tracked.
 
 +-----+
@@ -451,7 +451,7 @@ Welcome to ${project.name}!
  Users have to declare:
 
  * <<<custom.fluidoSkin.flattr.thing>>>: <<required>>, ID of
the Flattr thing. This is the part after the <<<flattr.com/thing/>>> part
of the URL of the Flattr button.
- 
+
  * <<<custom.fluidoSkin.flattr.url>>>: <<optional>>, URL of
the Flattr thing. Either this or the <<<$\{project.url\}>>> must be set
for the button to appear. (<<<$\{project.url\}>>> by default.)
 
  * <<<custom.fluidoSkin.flattr.style>>>: <<optional>>, style
of the Flattr button. <<<large>>> and <<<compact>>> are
supported. (<<<large>>> by default.)
@@ -471,7 +471,7 @@ Welcome to ${project.name}!
   [...]
 </project>
 +-----+
- 
+
  By default, it is rendered in the sidebar, if the topbar only is available it will be rendered
there.
 
 ** Skip Generation Date



Mime
View raw message