Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.47
edited by Jip-jan Alunkel
on March 28, 15:42
Change comment: There is no comment for this version
To version 2.66
edited by Jip-jan Alunkel
on March 28, 19:52
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,12 @@
1 1  {{velocity}}
2 +#macro(createFormStart $id $product)
3 +<form action="" id="${id}" method="post" class="formMaker" data-form-product="${product}" novalidate="novalidate">
4 +#end
5 +
6 +#macro(createFormEnd)
7 +</form>
8 +#end
9 +
2 2  #macro(createFormElement $elementDataObj)
3 3   #set($elementType = $elementDataObj.type)
4 4   #set($elementTagName = '')
... ... @@ -6,8 +6,7 @@
6 6   #set($requiredCSSClass = '')
7 7   #set($addedCSSClass = '')
8 8   #set($hint = '')
9 - #if($O_elementData.required == true)
10 - #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
17 + #if($elementDataObj.required == "yes")
11 11   #set($requiredCSSClass = ' class="required"')
12 12   #end
13 13   #if($elementType == "select")
... ... @@ -16,6 +16,7 @@
16 16   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
17 17   #set($elementTagName = "input")
18 18   #elseif($elementType == "checkbox" || $elementType == "radio")
26 + #set($addedCSSClass = " checkradio")
19 19   #set($elementTagName = "checkradio")
20 20   #elseif($elementType == "textarea")
21 21   #set($elementTagName = "textarea")
... ... @@ -22,7 +22,6 @@
22 22   #else
23 23   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
24 24   #end
25 -{{html}}
26 26   #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
27 27   <p${requiredCSSClass}>
28 28   <label for="${elementDataObj.id}_${elementTagName}">
... ... @@ -33,7 +33,7 @@
33 33   #elseif($elementTagName == "textarea")
34 34   #else
35 35   #if($elementType == "text")
36 - #createTextElement($elementDataObj $elementTagName $requiredAttributes)
43 + #createTextElement($elementDataObj $elementType $requiredAttributes)
37 37   #elseif($elementType == "number")
38 38   #elseif($elementType == "email")
39 39   #elseif($elementType == "range")
... ... @@ -42,7 +42,7 @@
42 42   #if($elementDataObj.help-block != "")
43 43   <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
44 44   #end
45 - #if($elementDataObj.required == true)
52 + #if($elementDataObj.required == "yes")
46 46   <span class="required-input-field" title="Required input"></span>
47 47   <span role="alert" class="form-not-valid-tip"></span>
48 48   #end
... ... @@ -51,18 +51,30 @@
51 51   </p>
52 52   #end
53 53   #if($elementTagName == "checkradio")
61 + <p${requiredCSSClass}>
62 + <span class="input-wrap${addedCSSClass}">
63 + <span class="fieldset no-fieldset-border">
64 + <label for="${elementDataObj.id}_${elementTagName}" class="strong">
54 54   #if($elementType == "checkbox")
66 +
67 +#createCheckboxElement()
68 +
55 55   #elseif($elementType == "radio")
56 56   #end
71 + <input type="checkbox" name="extra_info" id="extra_info" data-mod-display="extra_info_contents" value="yes" />$elementDataObj.label
72 + </label>
73 + </span>
74 + </span>
75 + </p>
57 57   #end
58 58   #if($hint != "")
59 59   <p class="box errormessage">${hint}</p>
60 60   #end
61 -{{/html}}
62 62  #end
63 63  
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}">
82 +##if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end
83 +#macro(createSelectElement $O_elementData $O_tagName)
84 + <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
66 66   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
67 67   #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"))
68 68   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
... ... @@ -76,21 +76,13 @@
76 76   #end
77 77   </select>
78 78  #end
79 -#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
80 -#set($dataAttributes = '')
81 -#set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')
82 -$dataAttributes
83 -#if($O_elementData.data-query-type) #set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')#end
84 -#if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
85 -#if($O_elementData.data-query-list-contents) #set($dataAttributes = '${dataAttributes} data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
86 -#if($O_elementData.data-create-page) #set($dataAttributes = '${dataAttributes} data-create-page="${O_elementData.data-create-page}"')#end
87 -#if($O_elementData.data-query-scope) #set($dataAttributes = '${dataAttributes} data-query-scope="${O_elementData.data-query-scope}"')#end
88 -#if($O_elementData.data-create-xobj) #set($dataAttributes = '${dataAttributes} data-create-xobj="${O_elementData.data-create-xobj}"')#end
89 -#if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
90 -#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
91 -#if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
92 - <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}>
98 +
99 +#macro(createTextElement $O_elementData $O_tagName)
100 + <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"#if($O_elementData.required == "yes") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end aria-label="${O_elementData.aria-label}"#if($O_elementData.data-query-type) data-query-type="${O_elementData.data-query-type}"#end#if($O_elementData.data-query-list-type) data-query-list-type="${O_elementData.data-query-list-type}"')#end#if($O_elementData.data-query-list-contents) data-query-list-contents="${O_elementData.data-query-list-contents}"')#end#if($O_elementData.data-create-page) data-create-page="${O_elementData.data-create-page}"')#end#if($O_elementData.data-query-scope) data-query-scope="${O_elementData.data-query-scope}"')#end#if($O_elementData.data-create-xobj) data-create-xobj="${O_elementData.data-create-xobj}"')#end#if($O_elementData.data-xobj-classname) data-xobj-classname="${O_elementData.data-xobj-classname}"')#end#if($O_elementData.data-xobj-fieldname) data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end#if($O_elementData.data-query-list-editable) data-query-list-editable="${O_elementData.data-query-list-editable}"')#end>
93 93  #end
102 +#macro(createCheckboxElement $O_elementData)
103 + <input type="checkbox" name="${elementDataObj.id}" id="${elementDataObj.id}" data-mod-display="${elementDataObj.id}_contents" value="yes" />Extra information (optional)
104 +#end
94 94  
95 95  {{/velocity}}
96 96