Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.43
edited by Jip-jan Alunkel
on March 09, 04:14
Change comment: Rollback to version 1.38
To version 3.55
edited by Jip-jan Alunkel
on March 09, 14:31
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': '',
... ... @@ -48,14 +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)
52 -#set($cert = 0)
53 -#set($discard = $cert.parseInt($certify))
54 -$cert
51 + #set($certify = $theDocObj.getProperty("certification").value) ## Dit kan beter ergens anders gebeuren
52 + #set($cert=$numbertool.toNumber($certify).intValue())
55 55   #set($classProperties = {
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.'}},
57 57   'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 0},
58 58   '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.'}},
59 59   'pmStreet': {'type': 'text', 'disabled': 1},
60 60   'pmHousenumber': {'type': 'text', 'disabled': 1},
61 61   'pmPostcode': {'type': 'text', 'disabled': 1},
... ... @@ -81,7 +81,6 @@
81 81   #end
82 82   #end
83 83   #end
84 -
85 85   #if($hasRight)
86 86   <p class="buttons text-align-right">
87 87   <a class="btn btn-secondary" title="Edit" data-toggle="modal" data-target="#detailsModal" role="button" rel="nofollow">
... ... @@ -119,24 +119,7 @@
119 119   </div>
120 120   <div class="modal-body">
121 121   <fieldset class="fieldset">
122 - <address>
123 -$doc.getTitle()<br />
124 -#set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
125 -#set($x = {})
126 -#foreach($datapart in $addressArray)
127 - #if($theDocObj.getProperty($datapart))
128 - #set($datapart4Publish = $theDocObj.getProperty($datapart).value)
129 - #if($datapart == 'pmCountry')
130 - #set($datapart4Publish = $datapart4Publish.toUpperCase())
131 - #end
132 - #set($discard = $x.put("$datapart", $datapart4Publish))
133 - #end
134 -#end
135 -$x['pmStreet'] $x['pmHousenumber']<br />
136 -$x['pmPostcode'] $x['pmCity']<br />
137 -$x['pmCounty'] $x['pmState']<br />
138 -$x['pmCountry']
139 - </address>
119 +#createAddress($theClass)
140 140   </fieldset>
141 141  #set($lastChild = "")
142 142  #foreach($propertyName in $classProperties.keySet())
... ... @@ -183,7 +183,9 @@
183 183   #set($discard = $newElem.put("$attr", $attrMap[$attr]))
184 184   #end
185 185   #end
186 - #if($propertyChecked)
166 + #if($propertyChecked == '1')
167 + #set($discard = $newElem.put("data-checked", "true"))
168 + #else
187 187   #set($discard = $newElem.put("data-checked", "false"))
188 188   #end
189 189   #if($propertyOpener)
... ... @@ -215,34 +215,26 @@
215 215   This page can not be viewed in inline mode.
216 216  #end
217 217  
218 -#macro(createElementObjects $properties)
219 - #foreach($item in $properties.keySet())
220 - #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
221 - #if($theDocObj.getProperty($item))
222 - #set($value = $theDocObj.getProperty($item).value)
223 - #set($newElem = {
224 - "id" : "$item",
225 - "type" : $classProperties[$item].type,
226 - "required" : "false",
227 - "label" : "$label",
228 - "data-create-xobj" : "true",
229 - "data-xobj-classname" : $theClass,
230 - "data-xobj-fieldname" : "$item",
231 - "value" : "$value"
232 - })
233 - #if($classProperties[$item].opener == 1)
234 - #set($discard = $newElem.put("data-opener", "true"))
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())
235 235   #end
236 - #if($classProperties[$item].extraAttributes)
237 - #set($attrMap = $classProperties[$item].extraAttributes)
238 - #foreach($attr in $attrMap.keySet())
239 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
240 - #end
241 - #end
242 - #set($thisObj["$item"] = $newElem)
212 + #set($discard = $x.put("$datapart", $datapart4Publish))
243 243   #end
244 244   #end
215 + $x['pmStreet'] $x['pmHousenumber']<br />
216 + $x['pmPostcode'] $x['pmCity']<br />
217 + $x['pmCounty'] $x['pmState']<br />
218 + $x['pmCountry']
219 + </address>
245 245  #end
246 -
247 247  {{/html}}
248 248  {{/velocity}}