Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.54
edited by Jip-jan Alunkel
on March 28, 16:10
Change comment: There is no comment for this version
To version 2.67
edited by Jip-jan Alunkel
on March 28, 19:55
Change comment: There is no comment for this version

Summary

Details

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