maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [maven-fluido-skin] branch master updated: [MSKIN-139] put the edit button after doc title with a "Edit" hover
Date Wed, 20 Dec 2017 11:33:23 GMT
This is an automated email from the ASF dual-hosted git repository.

hboutemy 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 f16f8e9  [MSKIN-139] put the edit button after doc title with a "Edit" hover
f16f8e9 is described below

commit f16f8e9c7ca2d6511e256aee3fab75e73ba79d36
Author: Hervé Boutemy <hboutemy@apache.org>
AuthorDate: Wed Dec 20 12:33:21 2017 +0100

    [MSKIN-139] put the edit button after doc title with a "Edit" hover
---
 src/main/resources/META-INF/maven/site-macros.vm | 9 +++++++--
 src/main/resources/META-INF/maven/site.vm        | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index 84a03bd..bf7a33a 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -241,10 +241,15 @@
 #*  *#<span class="divider">$breadcrumbDivider</span>##
 #*  *#</li>
 #**##end
+#**### add Edit button if content is editable
+#**##set ( $edit = '' )
+#**##if( $decoration.edit && $docRenderingContext.editable )
+#*  *##set ( $edit = ' <a href="' + $docRenderingContext.getDoxiaSourcePath( $decoration.edit
) + '"><img src="' + $relativePath + '/images/accessories-text-editor.png" title="Edit"
/></a>' )
+#**##end
 #**##if ( $shortTitle )
-    <li class="active $cssClass">$shortTitle</li>
+    <li class="active $cssClass">$shortTitle$edit</li>
 #**##else
-    <li class="active $cssClass">$title</li>
+    <li class="active $cssClass">$title$edit</li>
 #**##end
 #end
 ##
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 31e316e..aab5710 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -222,9 +222,6 @@
         <ul class="breadcrumb">
 #*      *##publishDate( "left" $decoration.publishDate $decoration.version )
 #*      *##publishDate( "right" $decoration.publishDate $decoration.version )
-#if( $decoration.edit && $docRenderingContext.editable )
-        <li class="pull-right"><a href="$docRenderingContext.getDoxiaSourcePath(
$decoration.edit )"><img src="$relativePath/images/accessories-text-editor.png" alt="edit"
/></a></li>
-#end
 ##
 #*      *### MSITE-44
 #*      *##if ( !$topBarEnabled

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <commits@maven.apache.org>'].

Mime
View raw message