Zum Inhalt springen

Änderungen von Dokument Button

Zuletzt geändert von Daniel Herrmann am 2026/02/04 20:25
Von Version 1.1 Icon
bearbeitet von Daniel Herrmann
am 2025/06/22 18:48
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.26.20]
Auf Version Icon 7.1
bearbeitet von Daniel Herrmann
am 2026/02/04 20:25
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.29.1]

Zusammenfassung

Details

Icon Seiteneigenschaften
Inhalt
... ... @@ -7,6 +7,7 @@
7 7  |label|$services.localization.render('rendering.macro.button.parameter.label.description')|-
8 8  |url|$services.localization.render('rendering.macro.button.parameter.url.description')|-
9 9  |color|$services.localization.render('rendering.macro.button.parameter.color.description')|White
10 +|title|$services.localization.render('rendering.macro.button.parameter.title.description')|-
10 10  |width|$services.localization.render('rendering.macro.button.parameter.width.description')|-
11 11  |newTab|$services.localization.render('rendering.macro.button.parameter.newTab.description')|false
12 12  |icon|$services.localization.render('rendering.macro.button.parameter.icon.description')|-
Icon XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -27,6 +27,7 @@
27 27  #macro (executeMacro)
28 28   ## Retrieve macro parameters
29 29   #set ($label = $escapetool.xml($wikimacro.parameters.label))
30 + #set ($title = $escapetool.xml($wikimacro.parameters.title))
30 30   #set ($url = $escapetool.xml($wikimacro.parameters.url))
31 31   #set ($color = $wikimacro.parameters.color)
32 32   #set ($width = $escapetool.xml($wikimacro.parameters.width))
... ... @@ -67,6 +67,9 @@
67 67   #if ("$!macro.id" != '')
68 68   id="$escapetool.xml($macro.id)"
69 69   #end
71 + #if ("$!title" != "")
72 + title="$escapetool.xml($title)"
73 + #end
70 70   style="
71 71   #if ("$!color" != '')
72 72   background-color: #toCssRGB($colors);
... ... @@ -76,7 +76,14 @@
76 76   width: $!width;
77 77   "
78 78   class="btn $escapetool.xml($macro.additionalClass)">
79 - $!services.icon.renderHTML($!icon)
83 + #if ("$!icon" != "")
84 + #set ($iconHTML = "$!services.icon.renderHTML($icon)")
85 + #if ($iconHTML == "")
86 + <span class="fa fa-$escapetool.xml($icon)"></span>
87 + #else
88 + $iconHTML
89 + #end
90 + #end
80 80   $label
81 81   </button>
82 82   </a>
... ... @@ -89,7 +89,7 @@
89 89  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
90 90  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
91 91  ## don't have view right on those pages.
92 -#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
103 +#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
93 93   #executeMacro
94 94  #else
95 95   {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
Icon XWiki.WikiMacroParameterClass[9]
Parameter verpflichtend
... ... @@ -1,0 +1,1 @@
1 +Nein
Parameter-Name
... ... @@ -1,0 +1,1 @@
1 +title
Parameter-Typ
... ... @@ -1,0 +1,1 @@
1 +java.lang.String