Changes for page homeopathsSheet
Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.50
edited by Jip-jan Alunkel
on March 09, 13:56
on March 09, 13:56
Change comment:
Rollback to version 1.38
To version 3.53
edited by Jip-jan Alunkel
on March 09, 14:22
on March 09, 14:22
Change comment:
Rollback to version 1.38
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -31,7 +31,7 @@ 31 31 <div class="clearfix"></div> 32 32 #if($xcontext.action == "view") 33 33 <h2 class="inline-data-summary">$services.localization.render("homeopaths.inlineDataSummary.sheet_properties")</h2> 34 -<div id="${spaceTitle}" class=" boxsheet_properties inline-data-summary">34 +<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) 51 + #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> 119 +#createAddress() 137 137 </fieldset> 138 138 #set($lastChild = "") 139 139 #foreach($propertyName in $classProperties.keySet()) ... ... @@ -242,6 +242,25 @@ 242 242 #end 243 243 #end 244 244 #end 245 - 228 +#macro(createAddress) 229 + <address> 230 + $doc.getTitle()<br /> 231 + #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry']) 232 + #set($x = {}) 233 + #foreach($datapart in $addressArray) 234 + #if($theDocObj.getProperty($datapart)) 235 + #set($datapart4Publish = $theDocObj.getProperty($datapart).value) 236 + #if($datapart == 'pmCountry') 237 + #set($datapart4Publish = $datapart4Publish.toUpperCase()) 238 + #end 239 + #set($discard = $x.put("$datapart", $datapart4Publish)) 240 + #end 241 + #end 242 + $x['pmStreet'] $x['pmHousenumber']<br /> 243 + $x['pmPostcode'] $x['pmCity']<br /> 244 + $x['pmCounty'] $x['pmState']<br /> 245 + $x['pmCountry'] 246 + </address> 247 +#end 246 246 {{/html}} 247 247 {{/velocity}}