Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on May 08, 19:25
From version 3.89
edited by Jip-jan Alunkel
on March 09, 19:07
Change comment: Rollback to version 1.38
To version 3.76
edited by Jip-jan Alunkel
on March 09, 17:26
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -32,7 +32,6 @@
32 32  #if($xcontext.action == "view")
33 33  <h2 class="inline-data-summary">$services.localization.render("homeopaths.inlineDataSummary.sheet_properties")</h2>
34 34  <div id="${spaceTitle}" class="sheet_properties inline-data-summary">
35 - ## ADDRESS: Prepare object to provide hidden values to the address input
36 36   #set($xa = {'pmLatlong': '','pmCountry': '','pmState': '','pmCounty': '','pmPostcode': '','pmCity': '','pmStreet': '','pmHousenumber': ''})
37 37   #foreach($item in $xa.keySet())
38 38   #if($theDocObj.getProperty("$item"))
... ... @@ -99,88 +99,90 @@
99 99   </button>
100 100   </div>
101 101   <div class="modal-body">
102 - <p><address>bla</address></p>
103 - #createAddress($theClass 1)
104 - #set($lastChild = "")
105 - #foreach($propertyName in $classProperties.keySet())
106 - #set($item = $classProperties["$propertyName"])
107 - #set($propertyType = $item.type)
108 - #if($item.containsKey("disabled"))
109 - #else
110 - #if($propertyType == "checkbox")
111 - #set($value = "1")
112 - #if($item.containsKey("classless"))
113 - #if(!$item.containsKey("checked"))
114 - #set($item["checked"] = '0')
115 - #end
116 - #else
117 - #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
118 - #set($item["checked"] = "$checkboxPropVal")
119 - #end
101 + <fieldset class="fieldset">
102 +#createAddress($theClass)
103 + </fieldset>
104 +#set($lastChild = "")
105 +#foreach($propertyName in $classProperties.keySet())
106 + #set($item = $classProperties["$propertyName"])
107 + #set($propertyType = $item.type)
108 + #if($item.containsKey("disabled"))
109 + #else
110 + #if($propertyType == "checkbox")
111 + #set($value = "1")
112 + #if($item.containsKey("classless"))
113 + #if(!$item.containsKey("checked"))
114 + #set($item["checked"] = '0')
120 120   #end
121 - #if($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
122 - #if($propertyType != "checkbox")
123 - #set($value = $theDocObj.getProperty($propertyName).value)
124 - #end
125 - #end
126 - #set($propertyChecked = $item.checked)
127 - #set($propertyOpener = $item.opener)
128 - #set($propertyParent = $item.parent)
129 - #set($extraAttributes = $item.extraAttributes)
130 - #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
131 - #if(!$value)
132 - #set($value = "")
133 - #end
134 - #if($item.containsKey("classless"))
135 - #set($newElem = {
136 - "id" : "$propertyName",
137 - "type" : $propertyType,
138 - "required" : "false",
139 - "label" : "$label",
140 - "value" : "$value"
141 - })
142 - #else
143 - #set($newElem = {
144 - "id" : "$propertyName",
145 - "type" : $propertyType,
146 - "required" : "false",
147 - "label" : "$label",
148 - "data-create-xobj" : "true",
149 - "data-xobj-classname" : $theClass,
150 - "data-xobj-fieldname" : "$propertyName",
151 - "value" : "$value"
152 - })
153 - #end
154 - #if($extraAttributes.keySet().size() > 0)
155 - #set($attrMap = $extraAttributes)
156 - #foreach($attr in $attrMap.keySet())
157 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
158 - #end
159 - #end
160 - #if($propertyChecked == '1')
161 - #set($discard = $newElem.put("data-checked", "true"))
162 - #else
163 - #set($discard = $newElem.put("data-checked", "false"))
164 - #end
165 - #if($propertyOpener)
166 - #set($discard = $newElem.put("data-opener", "true"))
167 - #end
168 - #if($propertyParent)
169 - #set($lastChild = "$key")
170 - #elseif($lastChild != "")
171 - #set($lastChild = "")
172 - #createExpandEnd()
173 - #end
174 - #createFormElement($newElem)
175 - #if($propertyOpener)
176 - #createExpandStart($newElem $value)
177 - #end
116 + #else
117 + #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
118 + #set($item["checked"] = "${checkboxPropVal}")
178 178   #end
179 179   #end
121 + #if($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
122 + #if($propertyType != "checkbox")
123 + #set($value = $theDocObj.getProperty($propertyName).value)
124 + #end
125 + #end
126 + #set($propertyChecked = $item.checked)
127 + #set($propertyOpener = $item.opener)
128 + #set($propertyParent = $item.parent)
129 + #set($extraAttributes = $item.extraAttributes)
130 + #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
131 + #if(!$value)
132 + #set($value = "")
133 + #end
134 +$propertyChecked
135 + #if($item.containsKey("classless"))
136 + #set($newElem = {
137 + "id" : "$propertyName",
138 + "type" : $propertyType,
139 + "required" : "false",
140 + "label" : "$label",
141 + "value" : "$value"
142 + })
143 + #else
144 + #set($newElem = {
145 + "id" : "$propertyName",
146 + "type" : $propertyType,
147 + "required" : "false",
148 + "label" : "$label",
149 + "data-create-xobj" : "true",
150 + "data-xobj-classname" : $theClass,
151 + "data-xobj-fieldname" : "$propertyName",
152 + "value" : "$value"
153 + })
154 + #end
155 + #if($extraAttributes.keySet().size() > 0)
156 + #set($attrMap = $extraAttributes)
157 + #foreach($attr in $attrMap.keySet())
158 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
159 + #end
160 + #end
161 + #if($propertyChecked == '1')
162 + #set($discard = $newElem.put("data-checked", "true"))
163 + #else
164 + #set($discard = $newElem.put("data-checked", "false"))
165 + #end
166 + #if($propertyOpener)
167 + #set($discard = $newElem.put("data-opener", "true"))
168 + #end
169 + #if($propertyParent)
170 + #set($lastChild = "$key")
171 + #elseif($lastChild != "")
172 + #set($lastChild = "")
173 + #createExpandEnd()
174 + #end
175 + #createFormElement($newElem)
176 + #if($propertyOpener)
177 + #createExpandStart($newElem $value)
178 + #end
179 + #end
180 +#end
180 180   </div>
181 181   <div class="modal-footer">
182 182   <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
183 - #createSubmit($submit)
184 + #createSubmit($submit)
184 184   </div>
185 185   #createFormEnd($form_end)
186 186   </div>
... ... @@ -189,11 +189,14 @@
189 189   #end
190 190  #else
191 191   <p>
192 - This page can not be viewed in inline mode. [[Back>>$doc.fullName]]
193 + This page can not be viewed in inline mode.
193 193   </p>
194 194  #end
195 -#macro(createAddress $className $withLabel)
196 +
197 +#macro(createAddress $className)
196 196   #set($docObj = $doc.getObject($className))
199 + <address>
200 + $doc.getTitle()<br />
197 197   #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
198 198   #set($x = {})
199 199   #foreach($datapart in $addressArray)
... ... @@ -205,18 +205,11 @@
205 205   #set($discard = $x.put("$datapart", $datapart4Publish))
206 206   #end
207 207   #end
208 - <p>
209 - #if($withLabel)
210 - <label>$services.localization.render("homeopaths.classproperty.pmAddress")</label>
211 - #end
212 - <address>
213 - $doc.getTitle()<br />
214 - $x['pmStreet'] $x['pmHousenumber']<br />
215 - $x['pmPostcode'] $x['pmCity']<br />
216 - $x['pmCounty'] $x['pmState']<br />
217 - $x['pmCountry']
218 - </address>
219 - </p>
212 + $x['pmStreet'] $x['pmHousenumber']<br />
213 + $x['pmPostcode'] $x['pmCity']<br />
214 + $x['pmCounty'] $x['pmState']<br />
215 + $x['pmCountry']
216 + </address>
220 220  #end
221 221  {{/html}}
222 222  {{/velocity}}