Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.55
edited by Jip-jan Alunkel
on March 09, 14:31
Change comment: Rollback to version 1.38
To version 3.48
edited by Jip-jan Alunkel
on March 09, 04:37
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -30,8 +30,8 @@
30 30  #set($spaceTitle = $spaceReference.getName())
31 31  <div class="clearfix"></div>
32 32  #if($xcontext.action == "view")
33 -<h2 class="inline-data-summary">$services.localization.render("homeopaths.inlineDataSummary.sheet_properties")</h2>
34 -<div id="${spaceTitle}" class="sheet_properties inline-data-summary">
33 +<div id="${spaceTitle}" class="box sheet_properties">
34 + <h2>Details</h2>
35 35   #set($xa = {
36 36   'pmLatlong': '',
37 37   'pmCountry': '',
... ... @@ -48,12 +48,12 @@
48 48   #end
49 49   #end
50 50  ## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
51 - #set($certify = $theDocObj.getProperty("certification").value) ## Dit kan beter ergens anders gebeuren
51 + #set($certify = $theDocObj.getProperty("certification").value)
52 52   #set($cert=$numbertool.toNumber($certify).intValue())
53 53   #set($classProperties = {
54 54   'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 0},
55 - 'pmAddress': {'type': 'address', 'parent': 'editAddress', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "pmLatlong": "$xa['pmLatlong']", "pmCountry": "$xa['pmCountry']", "pmState": "$xa['pmState']", "pmCounty": "$xa['pmCounty']", "pmPostcode": "$xa['pmPostcode']", "pmCity": "$xa['pmCity']", "pmStreet": "$xa['pmStreet']", "pmHousenumber": "$xa['pmHousenumber']", "data-auto-first-capital": "true", "data-query-type": "address", "data-query-reference": "", "data-query-list-type": "suggest-select", "data-query-list-header": "$services.localization.render('pagemaker.line.suggest_select_list')", "data-query-list-contents": "value/key", "data-query-list-editable": "false", "data-create-xobj": "true", "data-xobj-classname": "homeopaths.Code.homeopathsClass", "help-block" : 'Input street and number, then select the address of your practice.'}},
56 56   'practiceName': {'type': 'text', 'extraAttributes': {"disabled": "disabled", "help-block" : 'The name of your practice is the title of this page. If you want to change it, you should edit the content of this page.'}},
56 + 'pmAddress': {'type': 'address', 'parent': 'editAddress', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "pmLatlong": "$xa['pmLatlong']", "pmCountry": "$xa['pmCountry']", "pmState": "$xa['pmState']", "pmCounty": "$xa['pmCounty']", "pmPostcode": "$xa['pmPostcode']", "pmCity": "$xa['pmCity']", "pmStreet": "$xa['pmStreet']", "pmHousenumber": "$xa['pmHousenumber']", "data-auto-first-capital": "true", "data-query-type": "address", "data-query-reference": "", "data-query-list-type": "suggest-select", "data-query-list-header": "$services.localization.render('pagemaker.line.suggest_select_list')", "data-query-list-contents": "value/key", "data-query-list-editable": "false", "data-create-xobj": "true", "data-xobj-classname": "homeopaths.Code.homeopathsClass", "help-block" : 'Input street and number, then select the address of your practice.'}},
57 57   'pmStreet': {'type': 'text', 'disabled': 1},
58 58   'pmHousenumber': {'type': 'text', 'disabled': 1},
59 59   'pmPostcode': {'type': 'text', 'disabled': 1},
... ... @@ -116,7 +116,24 @@
116 116   </div>
117 117   <div class="modal-body">
118 118   <fieldset class="fieldset">
119 -#createAddress($theClass)
119 + <address>
120 +$doc.getTitle()<br />
121 +#set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
122 +#set($x = {})
123 +#foreach($datapart in $addressArray)
124 + #if($theDocObj.getProperty($datapart))
125 + #set($datapart4Publish = $theDocObj.getProperty($datapart).value)
126 + #if($datapart == 'pmCountry')
127 + #set($datapart4Publish = $datapart4Publish.toUpperCase())
128 + #end
129 + #set($discard = $x.put("$datapart", $datapart4Publish))
130 + #end
131 +#end
132 +$x['pmStreet'] $x['pmHousenumber']<br />
133 +$x['pmPostcode'] $x['pmCity']<br />
134 +$x['pmCounty'] $x['pmState']<br />
135 +$x['pmCountry']
136 + </address>
120 120   </fieldset>
121 121  #set($lastChild = "")
122 122  #foreach($propertyName in $classProperties.keySet())
... ... @@ -197,26 +197,34 @@
197 197   This page can not be viewed in inline mode.
198 198  #end
199 199  
200 -#macro(createAddress $className)
201 - #set($docObj = $doc.getObject($className))
202 - <address>
203 - $doc.getTitle()<br />
204 - #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
205 - #set($x = {})
206 - #foreach($datapart in $addressArray)
207 - #if($docObj.getProperty($datapart))
208 - #set($datapart4Publish = $docObj.getProperty($datapart).value)
209 - #if($datapart == 'pmCountry')
210 - #set($datapart4Publish = $datapart4Publish.toUpperCase())
217 +#macro(createElementObjects $properties)
218 + #foreach($item in $properties.keySet())
219 + #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
220 + #if($theDocObj.getProperty($item))
221 + #set($value = $theDocObj.getProperty($item).value)
222 + #set($newElem = {
223 + "id" : "$item",
224 + "type" : $classProperties[$item].type,
225 + "required" : "false",
226 + "label" : "$label",
227 + "data-create-xobj" : "true",
228 + "data-xobj-classname" : $theClass,
229 + "data-xobj-fieldname" : "$item",
230 + "value" : "$value"
231 + })
232 + #if($classProperties[$item].opener == 1)
233 + #set($discard = $newElem.put("data-opener", "true"))
211 211   #end
212 - #set($discard = $x.put("$datapart", $datapart4Publish))
235 + #if($classProperties[$item].extraAttributes)
236 + #set($attrMap = $classProperties[$item].extraAttributes)
237 + #foreach($attr in $attrMap.keySet())
238 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
239 + #end
240 + #end
241 + #set($thisObj["$item"] = $newElem)
213 213   #end
214 214   #end
215 - $x['pmStreet'] $x['pmHousenumber']<br />
216 - $x['pmPostcode'] $x['pmCity']<br />
217 - $x['pmCounty'] $x['pmState']<br />
218 - $x['pmCountry']
219 - </address>
220 220  #end
245 +
221 221  {{/html}}
222 222  {{/velocity}}