Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31

From version 3.9
edited by Jip-jan Alunkel
on March 08, 23:23
Change comment: Rollback to version 1.38
To version 3.10
edited by Jip-jan Alunkel
on March 09, 00:18
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -33,34 +33,34 @@
33 33  <div id="${spaceTitle}" class="box sheet_properties">
34 34   <h2>Details</h2>
35 35  ## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
36 -#set($classProperties = {
37 - '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.'}},
38 - 'pmAddress': {'type': 'address', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "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.'}},
39 - 'pmStreet': {'type': 'text'},
40 - 'pmHousenumber': {'type': 'text'},
41 - 'pmPostcode': {'type': 'text'},
42 - 'pmCity': {'type': 'text'},
43 - 'pmCounty': {'type': 'text'},
44 - 'pmState': {'type': 'text'},
45 - 'pmCountry': {'type': 'text'},
46 - 'certification': {'type': 'checkbox', 'opener': 1},
47 - 'certificationFrom': {'type': 'text', 'parent': 'certification'}
48 -})
49 -#foreach($property in $classProperties.keySet())
50 - #if($theDocObj.getProperty($property))
36 + #set($classProperties = {
37 + '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.'}},
38 + 'pmAddress': {'type': 'address', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "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.'}},
39 + 'pmStreet': {'type': 'text'},
40 + 'pmHousenumber': {'type': 'text'},
41 + 'pmPostcode': {'type': 'text'},
42 + 'pmCity': {'type': 'text'},
43 + 'pmCounty': {'type': 'text'},
44 + 'pmState': {'type': 'text'},
45 + 'pmCountry': {'type': 'text'},
46 + 'certification': {'type': 'checkbox', 'opener': 1},
47 + 'certificationFrom': {'type': 'text', 'parent': 'certification'}
48 + })
49 + #foreach($property in $classProperties.keySet())
50 + #if($theDocObj.getProperty($property))
51 51   <p class="property">
52 - #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout.
53 - #if($property == "pmStreet")
52 + #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout.
53 + #if($property == "pmStreet")
54 54   <span class="property-name">$services.localization.render("homeopaths.classproperty.address")</span> <span class="property-value">$doc.display($property) $doc.display("pmHousenumber")</span>
55 - #elseif($property == "practiceName") ## Difference, should receive the title from the page.
55 + #elseif($property == "practiceName") ## Difference, should receive the title from the page.
56 56   <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.getTitle()</span>
57 - #else ## Normal situation.
57 + #else ## Normal situation.
58 58   <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.display($property)</span>
59 - #end
59 + #end
60 60   </p>
61 + #end
61 61   #end
62 62   #end
63 -#end
64 64  
65 65   #if($hasRight)
66 66   <p class="buttons text-align-right">
... ... @@ -98,51 +98,63 @@
98 98   </button>
99 99   </div>
100 100   <div class="modal-body">
101 + <fieldset class="fieldset">
102 + <address>
103 +$doc.getTitle()<br />
104 +$classProperties.pmStreet $classProperties.pmHousenumber<br /><br />
105 +$classProperties.pmPostcode $classProperties.pmCity<br />
106 +$classProperties.pmCounty, $classProperties.pmState<br />
107 +$classProperties.pmCountry.toUpperCase()
108 + </address>
109 + </fieldset>
101 101  #set($lastChild = "")
102 102  #foreach($propertyName in $classProperties.keySet())
103 103   #set($item = $classProperties["$propertyName"])
104 - #set($propertyType = $item.type)
105 - #set($propertyOpener = $item.opener)
106 - #set($propertyParent = $item.parent)
107 - #set($extraAttributes = $item.extraAttributes)
108 - #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
109 - #if($theDocObj.getProperty($propertyName) || $propertyType == "address")
110 - #set($value = $theDocObj.getProperty($propertyName).value)
111 - #if($propertyType == "checkbox" || $propertyType == "radio")
112 - #set($value = "1")
113 - #end
114 - #if(!$value)
115 - #set($value = "")
116 - #end
117 - #set($newElem = {
118 - "id" : "$propertyName",
119 - "type" : $propertyType,
120 - "required" : "false",
121 - "label" : "$label",
122 - "data-create-xobj" : "true",
123 - "data-xobj-classname" : $theClass,
124 - "data-xobj-fieldname" : "$propertyName",
125 - "value" : "$value"
126 - })
127 - #if($extraAttributes.keySet().size() > 0)
128 - #set($attrMap = $extraAttributes)
129 - #foreach($attr in $attrMap.keySet())
130 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
113 + #if($item.containsKey("disabled"))
114 + #else
115 + #set($propertyType = $item.type)
116 + #set($propertyOpener = $item.opener)
117 + #set($propertyParent = $item.parent)
118 + #set($extraAttributes = $item.extraAttributes)
119 + #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
120 + #if($theDocObj.getProperty($propertyName) || $propertyType == "address")
121 + #set($value = $theDocObj.getProperty($propertyName).value)
122 + #if($propertyType == "checkbox" || $propertyType == "radio")
123 + #set($value = "1")
131 131   #end
125 + #if(!$value)
126 + #set($value = "")
127 + #end
128 + #set($newElem = {
129 + "id" : "$propertyName",
130 + "type" : $propertyType,
131 + "required" : "false",
132 + "label" : "$label",
133 + "data-create-xobj" : "true",
134 + "data-xobj-classname" : $theClass,
135 + "data-xobj-fieldname" : "$propertyName",
136 + "value" : "$value"
137 + })
138 + #if($extraAttributes.keySet().size() > 0)
139 + #set($attrMap = $extraAttributes)
140 + #foreach($attr in $attrMap.keySet())
141 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
142 + #end
143 + #end
144 + #if($propertyOpener)
145 + #set($discard = $newElem.put("data-opener", "true"))
146 + #end
147 + #if($propertyParent)
148 + #set($lastChild = "$key")
149 + #elseif($lastChild != "")
150 + #set($lastChild = "")
151 + #createExpandEnd()
152 + #end
153 + #createFormElement($newElem)
154 + #if($propertyOpener)
155 + #createExpandStart($newElem $value)
156 + #end
132 132   #end
133 - #if($propertyOpener)
134 - #set($discard = $newElem.put("data-opener", "true"))
135 - #end
136 - #if($propertyParent)
137 - #set($lastChild = "$key")
138 - #elseif($lastChild != "")
139 - #set($lastChild = "")
140 - #createExpandEnd()
141 - #end
142 - #createFormElement($newElem)
143 - #if($propertyOpener)
144 - #createExpandStart($newElem $value)
145 - #end
146 146   #end
147 147  #end
148 148   </div>