Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.65
edited by Jip-jan Alunkel
on March 28, 17:34
Change comment: There is no comment for this version
To version 2.77
edited by Jip-jan Alunkel
on March 31, 18:29
Change comment: Update document after refactoring.

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -form-elements
1 +Macro's for formMaker
Content
... ... @@ -4,6 +4,16 @@
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>
7 7  </form>
8 8  #end
9 9  
... ... @@ -23,6 +23,7 @@
23 23   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
24 24   #set($elementTagName = "input")
25 25   #elseif($elementType == "checkbox" || $elementType == "radio")
36 + #set($addedCSSClass = " checkradio")
26 26   #set($elementTagName = "checkradio")
27 27   #elseif($elementType == "textarea")
28 28   #set($elementTagName = "textarea")
... ... @@ -43,8 +43,6 @@
43 43   #elseif($elementType == "number")
44 44   #elseif($elementType == "email")
45 45   #elseif($elementType == "range")
46 - #elseif($elementType == "checkbox")
47 - #elseif($elementType == "radio")
48 48   #end
49 49   #end
50 50   #if($elementDataObj.help-block != "")
... ... @@ -59,9 +59,20 @@
59 59   </p>
60 60   #end
61 61   #if($elementTagName == "checkradio")
71 + <p${requiredCSSClass}>
72 + <span class="input-wrap${addedCSSClass}">
73 + <span class="fieldset no-fieldset-border">
74 + <label for="${elementDataObj.id}_${elementTagName}" class="strong">
62 62   #if($elementType == "checkbox")
76 +
77 +#createCheckboxElement($elementDataObj)
78 +
63 63   #elseif($elementType == "radio")
64 64   #end
81 + </label>
82 + </span>
83 + </span>
84 + </p>
65 65   #end
66 66   #if($hint != "")
67 67   <p class="box errormessage">${hint}</p>
... ... @@ -71,7 +71,7 @@
71 71  ##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
72 72  #macro(createSelectElement $O_elementData $O_tagName)
73 73   <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}">
74 - <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
94 + <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
75 75   #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"))
76 76   #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
77 77   #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
... ... @@ -84,9 +84,22 @@
84 84   #end
85 85   </select>
86 86  #end
107 +
87 87  #macro(createTextElement $O_elementData $O_tagName)
88 - <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>
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>
89 89  #end
90 90  
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
114 +#end
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 +
91 91  {{/velocity}}
92 92