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.98
edited by Jip-jan Alunkel
on March 09, 20:37
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},
... ... @@ -51,10 +51,11 @@
51 51   'pmCounty': {'type': 'text', 'disabled': 1},
52 52   'pmState': {'type': 'text', 'disabled': 1},
53 53   'pmCountry': {'type': 'text', 'disabled': 1},
54 + 'nrOfHomeopaths': {'type': 'number'},
54 54   'certification': {'type': 'checkbox', 'opener': 1},
55 55   'certificationFrom': {'type': 'text', 'parent': 'certification'}
56 56   })
57 - #createAddress($theClass)
58 + #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>
103 + #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)
195 +#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>
208 + <div class="formElement">
209 + #if($withLabel)
210 + <label>$services.localization.render("homeopaths.classproperty.pmAddress")</label>
211 + #end
212 + <address>
213 + $doc.getTitle()<br />
214 + $x['pmStreet'] $x['pmHousenumber']<br />
215 + $x['pmPostcode'] $x['pmCity']<br />
216 + $x['pmCounty'] $x['pmState']<br />
217 + $x['pmCountry']
218 + </address>
219 + </div>
214 214  #end
215 215  
216 216  {{/html}}