Änderungen von Dokument Macros

Zuletzt geändert von Jip-jan Alunkel am April 15, 18:09
Von Version 2.28
bearbeitet von Jip-jan Alunkel
am März 26, 00:03
Änderungskommentar: Es gibt keinen Kommentar für diese Version
Auf Version 2.37
bearbeitet von Jip-jan Alunkel
am März 28, 15:18
Änderungskommentar: Es gibt keinen Kommentar für diese Version

Zusammenfassung

Details

Seiteneigenschaften
Inhalt
... ... @@ -1,10 +1,11 @@
1 1  {{velocity}}
2 2  #macro(createFormElement $elementDataObj)
3 3   #set($elementType = $elementDataObj.type)
4 - #set($elementGroupName = "")
4 + #set($elementTagName = '')
5 5   #set($requiredAttributes = 'aria-required="false"')
6 6   #set($requiredCSSClass = '')
7 7   #set($addedCSSClass = '')
8 + #set($hint = '')
8 8   #if($O_elementData.required == true)
9 9   #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
10 10   #set($requiredCSSClass = ' class="required"')
... ... @@ -11,27 +11,28 @@
11 11   #end
12 12   #if($elementType == "select")
13 13   #set($addedCSSClass = " select-wrap")
14 - #set($elementGroupName = "select")
15 + #set($elementTagName = "select")
15 15   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
16 - #set($elementGroupName = "input")
17 + #set($elementTagName = "input")
17 17   #elseif($elementType == "checkbox" || $elementType == "radio")
18 - #set($elementGroupName = "checkradio")
19 + #set($elementTagName = "checkradio")
19 19   #elseif($elementType == "textarea")
20 - #set($elementGroupName = "textarea")
21 + #set($elementTagName = "textarea")
21 21   #else
22 22   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
23 23   #end
24 - #if($elementGroupName == "select" || $elementGroupName == "input" || $elementGroupName == "textarea")
25 +{{html}}
26 + #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
25 25   <p${requiredCSSClass}>
26 - <label for="${elementDataObj.id}_${elementGroupName}">
28 + <label for="${elementDataObj.id}_${elementTagName}">
27 27   $elementDataObj.label
28 28   <span class="input-wrap${addedCSSClass}">
29 - #if($elementGroupName == "select")
30 - #createSelectElement($elementDataObj $elementGroupName $requiredAttributes)
31 - #elseif($elementGroupName == "textarea")
31 + #if($elementTagName == "select")
32 + #createSelectElement($elementDataObj $elementTagName $requiredAttributes)
33 + #elseif($elementTagName == "textarea")
32 32   #else
33 33   #if($elementType == "text")
34 - #createTextElement($elementDataObj $elementGroupName)
36 + #createTextElement($elementDataObj $elementTagName $requiredAttributes)
35 35   #elseif($elementType == "number")
36 36   #elseif($elementType == "email")
37 37   #elseif($elementType == "range")
... ... @@ -48,7 +48,7 @@
48 48   </label>
49 49   </p>
50 50   #end
51 - #if($elementGroupName == "checkradio")
53 + #if($elementTagName == "checkradio")
52 52   #if($elementType == "checkbox")
53 53   #elseif($elementType == "radio")
54 54   #end
... ... @@ -56,11 +56,11 @@
56 56   #if($hint != "")
57 57   <p class="box errormessage">${hint}</p>
58 58   #end
61 +{{/html}}
59 59  #end
60 60  
61 -#macro(createSelectElement $O_elementData $O_groupName $O_requiredAttributes)
62 -{{html}}
63 - <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" ${O_requiredAttributes}data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${groupName}" id="${O_elementData.id}_${groupName}">
64 +#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
65 + <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" ${O_requiredAttributes}data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
64 64   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
65 65   #set($query = $services.query.xwql("from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like :space and doc.space <> :spaceExclude order by met.dataSpaceName asc"))
66 66   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
... ... @@ -73,23 +73,24 @@
73 73   <option value="$document.space">$document.getTitle()</option>
74 74   #end
75 75   </select>
76 -{{/html}}
77 77  #end
78 -#macro(createTextElement $O_elementData $O_groupName $O_requiredAttributes)
79 +#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
80 +$O_elementData
79 79  #set($dataAttributes = '')
80 -#if($O_elementData.data-query-type) #set($dataAttributes = '${dataAttributes} data-query-type="${O_elementData.data-query-type}"')#end
81 -#if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
82 -#if($O_elementData.data-query-list-contents) #set($dataAttributes = '${dataAttributes} data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
83 -#if($O_elementData.data-create-page) #set($dataAttributes = '${dataAttributes} data-create-page="${O_elementData.data-create-page}"')#end
84 -#if($O_elementData.data-query-scope) #set($dataAttributes = '${dataAttributes} data-query-scope="${O_elementData.data-query-scope}"')#end
85 -#if($O_elementData.data-create-xobj) #set($dataAttributes = '${dataAttributes} data-create-xobj="${O_elementData.data-create-xobj}"')#end
86 -#if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
87 -#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
88 -#if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
89 -{{html}}
90 - <input type="text" class="form-control full" name="${O_elementData.id}_${O_groupName}" id="${O_elementData.id}_${O_groupName}" autocomplete="off" placeholder="$services.localization.render(${O_elementData.placeholder})" aria-describedby="${O_elementData.id}_helpBlock"${O_requiredAttributes} aria-label="${O_elementData.aria-label}"${dataAttributes}>
91 -{{/html}}
82 +#if($O_elementData.data-query-type) #set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')#end
83 +#if($O_elementData.data-query-list-type) #set($dataAttributes = $dataAttributes' data-query-list-type="${O_elementData.data-query-list-type}"')#end
84 +#if($O_elementData.data-query-list-contents) #set($dataAttributes = $dataAttributes' data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
85 +#if($O_elementData.data-create-page) #set($dataAttributes = $dataAttributes' data-create-page="${O_elementData.data-create-page}"')#end
86 +#if($O_elementData.data-query-scope) #set($dataAttributes = $dataAttributes' data-query-scope="${O_elementData.data-query-scope}"')#end
87 +#if($O_elementData.data-create-xobj) #set($dataAttributes = $dataAttributes' data-create-xobj="${O_elementData.data-create-xobj}"')#end
88 +#if($O_elementData.data-xobj-classname) #set($dataAttributes = $dataAttributes' data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
89 +#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = $dataAttributes' data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
90 +#if($O_elementData.data-query-list-editable) #set($dataAttributes = $dataAttributes' data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
91 +## <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" placeholder="$services.localization.render(${O_elementData.placeholder})" aria-describedby="${O_elementData.id}_helpBlock"${O_requiredAttributes} aria-label="${O_elementData.aria-label}"${dataAttributes}>
92 92  #end
93 93  
94 +id
95 +
96 +
94 94  {{/velocity}}
95 95