Änderungen von Dokument Button
Zuletzt geändert von xwikiadmin am 2024/06/24 15:04
Von Version 5.1
bearbeitet von xwikiadmin
am 2024/06/24 15:04
am 2024/06/24 15:04
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.19.4]
Auf Version 2.1
bearbeitet von xwikiadmin
am 2023/04/25 11:27
am 2023/04/25 11:27
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros/1.7.1]
Zusammenfassung
-
Seiteneigenschaften (2 geändert, 0 hinzugefügt, 0 gelöscht)
-
Objekte (1 geändert, 0 hinzugefügt, 0 gelöscht)
Details
- Seiteneigenschaften
-
- Übergeordnete Seite
-
... ... @@ -1,1 +1,1 @@ 1 -WebHome 1 +xwiki:XWiki.Macros.WebHome - Versteckt
-
... ... @@ -1,1 +1,1 @@ 1 - true1 +false
- XWiki.WikiMacroClass[0]
-
- Makro-Code
-
... ... @@ -46,12 +46,6 @@ 46 46 #set ($darkenedColors = []) 47 47 #darken($colors, $darkenedColors) 48 48 {{html clean=false}} 49 - ## #124: The Button macro deletes followup content when inserted from wysiwyg 50 - ## Wrap the macro output inside a block element if the context where the macro is inserted is not inline, e.g. if the 51 - ## macro is inserted between paragraphs rather than between the text of a paragraph. Otherwise the generated HTML is 52 - ## invalid which breaks the WYSIWYG editing because the browser tries to fix the invalid HTML and messes up the macro 53 - ## output markers that protect the macro output. 54 - #if (!$wikimacro.context.isInline())<p>#end 55 55 <a href="$url" #if($newTab == 'true')target="_blank"#end> 56 56 <button 57 57 style=" ... ... @@ -65,18 +65,21 @@ 65 65 $label 66 66 </button> 67 67 </a> 68 - #if (!$wikimacro.context.isInline())</p>#end 69 69 {{/html}} 70 70 #end 71 71 {{/velocity}} 72 72 66 +{{include reference="Licenses.Code.VelocityMacros"/}} 67 + 73 73 {{velocity}} 74 74 ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right 75 75 ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that 76 76 ## don't have view right on those pages. 77 -#if ($services. promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))72 +#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference)) 78 78 #executeMacro 79 79 #else 80 - {{missingLicenseMessage extensionName="proMacros.extension.name"/}} 75 + {{error}} 76 + #getMissingLicenseMessage('proMacros.extension.name') 77 + {{/error}} 81 81 #end 82 82 {{/velocity}}