Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.77
edited by Jip-jan Alunkel
on March 31, 18:29
Change comment: Update document after refactoring.
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
Title
... ... @@ -1,1 +1,1 @@
1 -Macro's for formMaker
1 +form-elements
Content
... ... @@ -4,16 +4,6 @@
4 4  #end
5 5  
6 6  #macro(createFormEnd)
7 - <div role="alert" class="form-response-output form-validation-errors" style="display: none">
8 - <p>
9 -$services.localization.render('formMaker.line.global_error_msg')
10 - </p>
11 - </div>
12 - <div role="alert" class="form-response-output form-validation-ok" style="display: none">
13 - <p>
14 -$services.localization.render('formMaker.line.global_ok_msg')
15 - </p>
16 - </div>
17 17  </form>
18 18  #end
19 19  
... ... @@ -74,10 +74,11 @@
74 74   <label for="${elementDataObj.id}_${elementTagName}" class="strong">
75 75   #if($elementType == "checkbox")
76 76  
77 -#createCheckboxElement($elementDataObj)
78 -
67 +#createCheckboxElement()
68 +
79 79   #elseif($elementType == "radio")
80 80   #end
71 + <input type="checkbox" name="extra_info" id="extra_info" data-mod-display="extra_info_contents" value="yes" />$elementDataObj.label
81 81   </label>
82 82   </span>
83 83   </span>
... ... @@ -91,7 +91,7 @@
91 91  ##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
92 92  #macro(createSelectElement $O_elementData $O_tagName)
93 93   <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}">
94 - <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
85 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
95 95   #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"))
96 96   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
97 97   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -106,20 +106,11 @@
106 106  #end
107 107  
108 108  #macro(createTextElement $O_elementData $O_tagName)
109 - <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" placeholder="${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-suggest-list-header) data-suggest-list-header="${O_elementData.data-suggest-list-header}"')#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>
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>
110 110  #end
111 -
112 112  #macro(createCheckboxElement $O_elementData)
113 - <input type="checkbox" name="${O_elementData.id}" id="${O_elementData.id}" data-mod-display="${O_elementData.id}" value="${O_elementData.value}"#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>$O_elementData.label
103 + <input type="checkbox" name="${elementDataObj.id}" id="${elementDataObj.id}" data-mod-display="${elementDataObj.id}_contents" value="yes" />Extra information (optional)
114 114  #end
115 115  
116 -#macro(createExpandStart $id $value)
117 - <div id="${id}_section_${value}" class="togglee">
118 -#end
119 -
120 -#macro(createExpandEnd)
121 - </div>
122 -#end
123 -
124 124  {{/velocity}}
125 125