Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.87
edited by Jip-jan Alunkel
on March 09, 19:02
Change comment: Rollback to version 1.38
To version 3.96
edited by Jip-jan Alunkel
on March 09, 20:03
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -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,7 +99,7 @@
99 99   </button>
100 100   </div>
101 101   <div class="modal-body">
102 - <p><label>$services.localization.render("homeopaths.classproperty.pmAddress")</label>#createAddress($theClass)</p>
102 + #createAddress($theClass 1)
103 103   #set($lastChild = "")
104 104   #foreach($propertyName in $classProperties.keySet())
105 105   #set($item = $classProperties["$propertyName"])
... ... @@ -191,7 +191,7 @@
191 191   This page can not be viewed in inline mode. [[Back>>$doc.fullName]]
192 192   </p>
193 193  #end
194 -#macro(createAddress $className)
194 +#macro(createAddress $className $withLabel)
195 195   #set($docObj = $doc.getObject($className))
196 196   #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
197 197   #set($x = {})
... ... @@ -204,13 +204,18 @@
204 204   #set($discard = $x.put("$datapart", $datapart4Publish))
205 205   #end
206 206   #end
207 - <address>
208 - $doc.getTitle()<br />
209 - $x['pmStreet'] $x['pmHousenumber']<br />
210 - $x['pmPostcode'] $x['pmCity']<br />
211 - $x['pmCounty'] $x['pmState']<br />
212 - $x['pmCountry']
213 - </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>
214 214  #end
215 215  
216 216  {{/html}}