Changes for page homeopathsSheet

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