Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31

From version 3.41
edited by Jip-jan Alunkel
on March 09, 04:13
Change comment: Rollback to version 1.38
To version 3.52
edited by Jip-jan Alunkel
on March 09, 14:21
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 -<div id="${spaceTitle}" class="box sheet_properties">
34 - <h2>Details</h2>
33 +<h2 class="inline-data-summary">$services.localization.render("homeopaths.inlineDataSummary.sheet_properties")</h2>
34 +<div id="${spaceTitle}" class="sheet_properties inline-data-summary">
35 35   #set($xa = {
36 36   'pmLatlong': '',
37 37   'pmCountry': '',
... ... @@ -47,16 +47,13 @@
47 47   #set($xa["$item"] = $theDocObj.getProperty("$item").value)
48 48   #end
49 49   #end
50 - $theDocObj.getProperty("certification").value
51 51  ## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
52 -#set($certify = $theDocObj.getProperty("certification").value)
53 -#set($cert = 0)
54 -$cert.parseInt($certify)
55 -$cert
51 + #set($certify = $theDocObj.getProperty("certification").value) ## Dit kan beter ergens anders gebeuren
52 + #set($cert=$numbertool.toNumber($certify).intValue())
56 56   #set($classProperties = {
57 - '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.'}},
58 58   'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 0},
59 59   '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 + '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.'}},
60 60   'pmStreet': {'type': 'text', 'disabled': 1},
61 61   'pmHousenumber': {'type': 'text', 'disabled': 1},
62 62   'pmPostcode': {'type': 'text', 'disabled': 1},
... ... @@ -82,7 +82,6 @@
82 82   #end
83 83   #end
84 84   #end
85 -
86 86   #if($hasRight)
87 87   <p class="buttons text-align-right">
88 88   <a class="btn btn-secondary" title="Edit" data-toggle="modal" data-target="#detailsModal" role="button" rel="nofollow">
... ... @@ -120,24 +120,6 @@
120 120   </div>
121 121   <div class="modal-body">
122 122   <fieldset class="fieldset">
123 - <address>
124 -$doc.getTitle()<br />
125 -#set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
126 -#set($x = {})
127 -#foreach($datapart in $addressArray)
128 - #if($theDocObj.getProperty($datapart))
129 - #set($datapart4Publish = $theDocObj.getProperty($datapart).value)
130 - #if($datapart == 'pmCountry')
131 - #set($datapart4Publish = $datapart4Publish.toUpperCase())
132 - #end
133 - #set($discard = $x.put("$datapart", $datapart4Publish))
134 - #end
135 -#end
136 -$x['pmStreet'] $x['pmHousenumber']<br />
137 -$x['pmPostcode'] $x['pmCity']<br />
138 -$x['pmCounty'] $x['pmState']<br />
139 -$x['pmCountry']
140 - </address>
141 141   </fieldset>
142 142  #set($lastChild = "")
143 143  #foreach($propertyName in $classProperties.keySet())
... ... @@ -184,7 +184,9 @@
184 184   #set($discard = $newElem.put("$attr", $attrMap[$attr]))
185 185   #end
186 186   #end
187 - #if($propertyChecked)
165 + #if($propertyChecked == '1')
166 + #set($discard = $newElem.put("data-checked", "true"))
167 + #else
188 188   #set($discard = $newElem.put("data-checked", "false"))
189 189   #end
190 190   #if($propertyOpener)
... ... @@ -244,6 +244,25 @@
244 244   #end
245 245   #end
246 246  #end
247 -
227 +#macro(createAddress)
228 + <address>
229 + $doc.getTitle()<br />
230 + #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
231 + #set($x = {})
232 + #foreach($datapart in $addressArray)
233 + #if($theDocObj.getProperty($datapart))
234 + #set($datapart4Publish = $theDocObj.getProperty($datapart).value)
235 + #if($datapart == 'pmCountry')
236 + #set($datapart4Publish = $datapart4Publish.toUpperCase())
237 + #end
238 + #set($discard = $x.put("$datapart", $datapart4Publish))
239 + #end
240 + #end
241 + $x['pmStreet'] $x['pmHousenumber']<br />
242 + $x['pmPostcode'] $x['pmCity']<br />
243 + $x['pmCounty'] $x['pmState']<br />
244 + $x['pmCountry']
245 + </address>
246 +#end
248 248  {{/html}}
249 249  {{/velocity}}