Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.42
edited by Jip-jan Alunkel
on March 09, 04:13
Change comment: Rollback to version 1.38
To version 3.54
edited by Jip-jan Alunkel
on March 09, 14:26
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -18,6 +18,10 @@
18 18   var pagemakerOffspring = "disable";
19 19  </script>
20 20  #end
21 +
22 +
23 +$theDoc
24 +$doc
21 21  #if($hasRight)
22 22   <p class="buttons text-align-right">
23 23   <a class="btn btn-primary" title="Edit" href="$doc.getURL("edit")?editor=wysiwyg" role="button" rel="nofollow">
... ... @@ -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>
37 +<h2 class="inline-data-summary">$services.localization.render("homeopaths.inlineDataSummary.sheet_properties")</h2>
38 +<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 -#set($discard = $cert.parseInt($certify))
55 -$cert
55 + #set($certify = $theDocObj.getProperty("certification").value) ## Dit kan beter ergens anders gebeuren
56 + #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.'}},
60 + '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,7 @@
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>
123 +#createAddress()
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)
170 + #if($propertyChecked == '1')
171 + #set($discard = $newElem.put("data-checked", "true"))
172 + #else
188 188   #set($discard = $newElem.put("data-checked", "false"))
189 189   #end
190 190   #if($propertyOpener)
... ... @@ -216,34 +216,25 @@
216 216   This page can not be viewed in inline mode.
217 217  #end
218 218  
219 -#macro(createElementObjects $properties)
220 - #foreach($item in $properties.keySet())
221 - #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
222 - #if($theDocObj.getProperty($item))
223 - #set($value = $theDocObj.getProperty($item).value)
224 - #set($newElem = {
225 - "id" : "$item",
226 - "type" : $classProperties[$item].type,
227 - "required" : "false",
228 - "label" : "$label",
229 - "data-create-xobj" : "true",
230 - "data-xobj-classname" : $theClass,
231 - "data-xobj-fieldname" : "$item",
232 - "value" : "$value"
233 - })
234 - #if($classProperties[$item].opener == 1)
235 - #set($discard = $newElem.put("data-opener", "true"))
204 +#macro(createAddress)
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($theDocObj.getProperty($datapart))
211 + #set($datapart4Publish = $theDocObj.getProperty($datapart).value)
212 + #if($datapart == 'pmCountry')
213 + #set($datapart4Publish = $datapart4Publish.toUpperCase())
236 236   #end
237 - #if($classProperties[$item].extraAttributes)
238 - #set($attrMap = $classProperties[$item].extraAttributes)
239 - #foreach($attr in $attrMap.keySet())
240 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
241 - #end
242 - #end
243 - #set($thisObj["$item"] = $newElem)
215 + #set($discard = $x.put("$datapart", $datapart4Publish))
244 244   #end
245 245   #end
218 + $x['pmStreet'] $x['pmHousenumber']<br />
219 + $x['pmPostcode'] $x['pmCity']<br />
220 + $x['pmCounty'] $x['pmState']<br />
221 + $x['pmCountry']
222 + </address>
246 246  #end
247 -
248 248  {{/html}}
249 249  {{/velocity}}