Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.255
edited by Jip-jan Alunkel
on July 18, 17:42
Change comment: Update document after refactoring.
To version 2.275
edited by Jip-jan Alunkel
on July 30, 14:07
Change comment: Update document after refactoring.

Summary

Details

Page properties
Content
... ... @@ -1,8 +1,20 @@
1 1  {{velocity}}
2 -#macro(createFormStart $id $product)
3 -<form action="" id="${id}" method="post" class="pagemaker" data-form-product="${product}" novalidate="novalidate">
2 +#macro(createFormStart $elementDataObj)
3 + #if($elementDataObj.use_captcha == "true")
4 +<script>
5 + var fav = {
6 + "id": "${elementDataObj.id}",
7 + "action": "${elementDataObj.url}",
8 + "method": "${elementDataObj.method}",
9 + "product": "${elementDataObj.product}"
10 + }
11 +</script>
12 +<div class="pagemaker">
13 + #else
14 +<form action="${elementDataObj.url}" id="${elementDataObj.id}" method="${elementDataObj.method}" class="pagemaker" data-form-product="${elementDataObj.product}" novalidate="novalidate">
15 + #end
4 4  #end
5 -#macro(createFormEnd)
17 +#macro(createFormEnd $elementDataObj)
6 6   <div role="alert" class="form-response-output form-validation-errors" style="display: none">
7 7   <p>
8 8  $services.localization.render('pagemaker.line.global_error_msg')
... ... @@ -13,42 +13,55 @@
13 13  $services.localization.render('pagemaker.line.global_ok_msg')
14 14   </p>
15 15   </div>
28 + #if($elementDataObj.use_captcha == "true")
29 +</div>
30 + #else
16 16  </form>
32 + #end
17 17  #end
18 18  #macro(createFormElement $elementDataObj)
19 19   #set($elementType = $elementDataObj.type)
20 20   #set($elementTagName = '')
21 - #set($requiredCSSClass = '')
37 + #set($paragraphCSSClass = '')
22 22   #set($makeFocusable = '')
23 - #set($addedCSSClass = '')
39 + #set($spanCSSClass = '')
24 24   #set($hint = '')
25 25   #set($placeholder = '')
26 26   #if($elementDataObj.required == 'true')
27 - #set($requiredCSSClass = ' class="required"')
43 + #if($elementType == 'captcha')
44 + #set($paragraphCSSClass = ' class="required slideCaptcha-box"')
45 + #else
46 + #set($paragraphCSSClass = ' class="required"')
47 + #end
48 + #elseif($elementDataObj.type == 'captcha')
49 + #set($paragraphCSSClass = ' class="slideCaptcha-box"')
28 28   #end
29 29   #if($elementDataObj.data-query-type)
30 30   #set($makeFocusable = ' tabindex="-1"')
31 31   #end
54 + #if($elementDataObj.type == 'captcha')
55 + #set($captchaClass = ' class="slideCaptcha-box"')
56 + #end
32 32   #if($elementType == "select")
33 - #set($addedCSSClass = " select-wrap")
58 + #set($spanCSSClass = " select-wrap")
34 34   #set($elementTagName = "select")
35 35   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email" || $elementType == "password" || $elementType == "date" || $elementType == "tel" || $elementType == "url" || $elementType == "color")
36 36   #set($elementTagName = "input")
37 37   #elseif($elementType == "checkbox" || $elementType == "radio")
38 - #set($addedCSSClass = " checkradio")
63 + #set($spanCSSClass = " checkradio")
39 39   #set($elementTagName = "checkradio")
40 40   #elseif($elementType == "textarea")
41 41   #set($elementTagName = "textarea")
42 42   #elseif($elementType == "captcha")
43 - #createCaptcha($elementDataObj)
68 + #set($elementTagName = "captcha")
44 44   #else
45 45   #set($hint = "This type of element does not exist, read the manual for more information about element types.")
46 46   #end
47 - #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
48 - <p${requiredCSSClass}${makeFocusable}>
72 + #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea" || $elementTagName == "captcha")
73 + <p${paragraphCSSClass}${makeFocusable}>
49 49   <label for="${elementDataObj.id}">
50 50   $elementDataObj.label
51 - <span class="input-wrap${addedCSSClass}">
76 + <span class="input-wrap${spanCSSClass}">
52 52   #if($elementTagName == "select")
53 53   #createSelectElement($elementDataObj $elementTagName)
54 54   #elseif($elementTagName == "textarea")
... ... @@ -84,6 +84,8 @@
84 84   #createTelElement($elementDataObj $elementType)
85 85   #elseif($elementType == "url")
86 86   #createUrlElement($elementDataObj $elementType)
112 + #elseif($elementType == "captcha")
113 + #createCaptcha($elementDataObj)
87 87   #end
88 88   #end
89 89   #if($elementDataObj.help-block && $elementDataObj.help-block != "")
... ... @@ -98,10 +98,10 @@
98 98   </p>
99 99   #end
100 100   #if($elementTagName == "checkradio")
101 - <p${requiredCSSClass}>
102 - <span class="input-wrap${addedCSSClass}">
128 + <p${paragraphCSSClass}>
129 + <span class="input-wrap${spanCSSClass}">
103 103   <span class="fieldset no-fieldset-border">
104 - <label for="${elementDataObj.id}"#* class="strong"*#>
131 + <label for="${elementDataObj.id}">
105 105   #if($elementType == "checkbox")
106 106  #createCheckboxElement($elementDataObj)
107 107   #elseif($elementType == "radio")
... ... @@ -245,15 +245,10 @@
245 245   <textarea class="form-control full" name="${O_elementData.id}" id="${O_elementData.id}"#if($O_elementData.value) value="$O_elementData.value"#end#if($O_elementData.placeholder) placeholder="${O_elementData.placeholder}"#end#if($O_elementData.textarea-rows) rows="$O_elementData.textarea-rows"#end aria-describedby="${O_elementData.id}_helpBlock"#if($O_elementData.required == "true") aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"#else aria-required="false"#end#if($O_elementData.aria-label) aria-label="${O_elementData.aria-label}"#end></textarea>
246 246  #end
247 247  #macro(createCaptcha $O_elementData)
248 - <p class="slideCaptcha-box">
249 - <label>Are you human?
250 - <span class="input-wrap">
251 - <span class="slideCaptcha-track" id="slideCaptcha_track">
252 - <span class="slideCaptcha-slider" id="slideCaptcha_slider"></span>
253 - </span>
254 - </span></label>
255 - <input type="hidden" id="slideCaptcha_answer" value="droid">
256 - </p>
275 + <span class="slideCaptcha-track" id="slideCaptcha_track" data-rgb="${O_elementData.data-rgb-track}">
276 + <span class="slideCaptcha-slider" id="slideCaptcha_slider" data-target-size="${O_elementData.data-target-size}" data-rgb="${O_elementData.data-rgb-slider}"></span>
277 + </span>
278 + <input type="hidden" id="slideCaptcha_answer" value="">
257 257  #end
258 258  #macro(createExpandStart $opener $value)
259 259   <div id="${opener.id}_section_#if($value)${value}#else${opener.value}#end" class="togglee">