Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -23,7 +23,6 @@
23 23   #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
24 24   #set($elementTagName = "input")
25 25   #elseif($elementType == "checkbox" || $elementType == "radio")
26 - #set($addedCSSClass = " checkradio")
27 27   #set($elementTagName = "checkradio")
28 28   #elseif($elementType == "textarea")
29 29   #set($elementTagName = "textarea")
... ... @@ -44,6 +44,8 @@
44 44   #elseif($elementType == "number")
45 45   #elseif($elementType == "email")
46 46   #elseif($elementType == "range")
46 + #elseif($elementType == "checkbox")
47 + #elseif($elementType == "radio")
47 47   #end
48 48   #end
49 49   #if($elementDataObj.help-block != "")
... ... @@ -58,21 +58,9 @@
58 58   </p>
59 59   #end
60 60   #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()
68 -
69 69   #elseif($elementType == "radio")
70 70   #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>
76 76   #end
77 77   #if($hint != "")
78 78   <p class="box errormessage">${hint}</p>
... ... @@ -95,13 +95,9 @@
95 95   #end
96 96   </select>
97 97  #end
98 -
99 99  #macro(createTextElement $O_elementData $O_tagName)
100 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>
101 101  #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
105 105  
106 106  {{/velocity}}
107 107