Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.86
edited by Jip-jan Alunkel
on March 09, 19:00
Change comment: Rollback to version 1.38
To version 3.97
edited by Jip-jan Alunkel
on March 09, 20:08
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -43,7 +43,7 @@
43 43   #set($classProperties = {
44 44   'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 0},
45 45   '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.'}},
46 - '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.'}},
46 + 'practiceName': {'type': 'text', 'disabled': 1, '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.'}},
47 47   'pmStreet': {'type': 'text', 'disabled': 1},
48 48   'pmHousenumber': {'type': 'text', 'disabled': 1},
49 49   'pmPostcode': {'type': 'text', 'disabled': 1},
... ... @@ -54,7 +54,7 @@
54 54   'certification': {'type': 'checkbox', 'opener': 1},
55 55   'certificationFrom': {'type': 'text', 'parent': 'certification'}
56 56   })
57 - #createAddress($theClass)
57 + #createAddress($theClass 1)
58 58   #set($properties = ['certification','certificationFrom'])
59 59   #foreach($property in $properties)
60 60   #if($theDocObj.getProperty($property))
... ... @@ -99,10 +99,7 @@
99 99   </button>
100 100   </div>
101 101   <div class="modal-body">
102 - <p>
103 - <label>$services.localization.render("homeopaths.classproperty.pmAddress")</label>
104 -#createAddress($theClass)
105 - </p>
102 + #createAddress($theClass 1)
106 106   #set($lastChild = "")
107 107   #foreach($propertyName in $classProperties.keySet())
108 108   #set($item = $classProperties["$propertyName"])
... ... @@ -194,7 +194,7 @@
194 194   This page can not be viewed in inline mode. [[Back>>$doc.fullName]]
195 195   </p>
196 196  #end
197 -#macro(createAddress $className)
194 +#macro(createAddress $className $withLabel)
198 198   #set($docObj = $doc.getObject($className))
199 199   #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
200 200   #set($x = {})
... ... @@ -207,13 +207,19 @@
207 207   #set($discard = $x.put("$datapart", $datapart4Publish))
208 208   #end
209 209   #end
210 - <address>
211 - $doc.getTitle()<br />
212 - $x['pmStreet'] $x['pmHousenumber']<br />
213 - $x['pmPostcode'] $x['pmCity']<br />
214 - $x['pmCounty'] $x['pmState']<br />
215 - $x['pmCountry']
216 - </address>
207 + <div class="formElement">
208 + #if($withLabel)
209 + <label>$services.localization.render("homeopaths.classproperty.pmAddress")</label>
210 + #end
211 + <address>
212 + $doc.getTitle()<br />
213 + $x['pmStreet'] $x['pmHousenumber']<br />
214 + $x['pmPostcode'] $x['pmCity']<br />
215 + $x['pmCounty'] $x['pmState']<br />
216 + $x['pmCountry']
217 + </address>
218 + </div>
217 217  #end
220 +
218 218  {{/html}}
219 219  {{/velocity}}