Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.49
edited by Jip-jan Alunkel
on March 09, 04:38
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': '',
... ... @@ -48,7 +48,7 @@
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)
55 + #set($certify = $theDocObj.getProperty("certification").value) ## Dit kan beter ergens anders gebeuren
52 52   #set($cert=$numbertool.toNumber($certify).intValue())
53 53   #set($classProperties = {
54 54   'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 0},
... ... @@ -116,24 +116,7 @@
116 116   </div>
117 117   <div class="modal-body">
118 118   <fieldset class="fieldset">
119 - <address>
120 -$doc.getTitle()<br />
121 -#set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
122 -#set($x = {})
123 -#foreach($datapart in $addressArray)
124 - #if($theDocObj.getProperty($datapart))
125 - #set($datapart4Publish = $theDocObj.getProperty($datapart).value)
126 - #if($datapart == 'pmCountry')
127 - #set($datapart4Publish = $datapart4Publish.toUpperCase())
128 - #end
129 - #set($discard = $x.put("$datapart", $datapart4Publish))
130 - #end
131 -#end
132 -$x['pmStreet'] $x['pmHousenumber']<br />
133 -$x['pmPostcode'] $x['pmCity']<br />
134 -$x['pmCounty'] $x['pmState']<br />
135 -$x['pmCountry']
136 - </address>
123 +#createAddress()
137 137   </fieldset>
138 138  #set($lastChild = "")
139 139  #foreach($propertyName in $classProperties.keySet())
... ... @@ -214,34 +214,25 @@
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"))
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())
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}}