Изменения документа homeopathsSheet
Редактировал(а) Jip-jan Alunkel марта 26, 17:31
От версии 3.5
отредактировано Jip-jan Alunkel
на марта 08, 22:06
на марта 08, 22:06
Изменить комментарий:
Rollback to version 1.38
К версии 3.1
отредактировано Jip-jan Alunkel
на марта 08, 19:11
на марта 08, 19:11
Изменить комментарий:
Rollback to version 1.38
Сводка
-
Свойства страницы (1 изменено, 0 добавлено, 0 удалено)
Подробности
- Свойства страницы
-
- Содержимое
-
... ... @@ -1,15 +1,14 @@ 1 1 {{include reference="assets.pagemaker.macros"/}} 2 2 3 3 {{velocity}} 4 -#set($discard = $services.localization.use('document', ' assets.global.translations'))4 +#set($discard = $services.localization.use('document', 'homeopaths.Code.translations')) 5 5 #set($discard = $services.localization.use('document', 'assets.pagemaker.translations')) 6 6 #set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false})) 7 7 #set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false, 'language': $context.language, 'myParameter': 'value'})) 8 8 #set($theDoc = $xwiki.getDocument("${doc.fullName}").getTranslatedDocument()) 9 9 #set($isInline = $xcontext.action == 'edit' && $request.get('editor') == 'inline') 10 -#set($theClass = "homeopaths.Code.homeopathsClass") 11 11 ## Create object (important for sheet binding, do not remove) 12 -#set($theDocObj = $doc.getObject( $theClass, true))11 +#set($theDocObj = $doc.getObject("homeopaths.Code.homeopathsClass", true)) 13 13 #set($hasRight = !$isGuest && ($theDocObj.getProperty('user').value == $context.getUser() || $hasAdmin)) 14 14 $theDoc.getContent() 15 15 {{html wiki="true" clean="false"}} ... ... @@ -32,29 +32,25 @@ 32 32 #if($xcontext.action == "view") 33 33 <div id="${spaceTitle}" class="box sheet_properties"> 34 34 <h2>Details</h2> 35 -## The classProperties Map has to be in the order of how you want the form elements to appear in the form. 36 36 #set($classProperties = { 37 - 'practiceName': {'type': 'text', 'disabled': 'disabled'}, 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'} 35 + 'practiceName': {'type': 'string', 'opener': 0}, 36 + 'pmStreet': {'type': 'string', 'opener': 0}, 37 + 'pmHousenumber': {'type': 'string', 'opener': 0}, 38 + 'pmPostcode': {'type': 'string', 'opener': 0}, 39 + 'pmCity': {'type': 'string', 'opener': 0}, 40 + 'pmCounty': {'type': 'string', 'opener': 0}, 41 + 'pmState': {'type': 'string', 'opener': 0}, 42 + 'pmCountry': {'type': 'string', 'opener': 0}, 43 + 'certification': {'type': 'bool', 'opener': 1}, 44 + 'certificationFrom': {'type': 'string', 'opener': 0, 'parent': 'certification'} 48 48 }) 49 49 #foreach($property in $classProperties.keySet()) 50 50 #if($theDocObj.getProperty($property)) 51 51 <p class="property"> 52 52 #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout. 53 - #if($property == "pmStreet") 50 + #if($property == "pmStreet") ## Difference with added housenumber because of the streetaddress layout. 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. 56 - <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.getTitle()</span> 57 - #else ## Normal situation. 52 + #else 58 58 <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.display($property)</span> 59 59 #end 60 60 </p> ... ... @@ -78,6 +78,63 @@ 78 78 "url": "", 79 79 "use_captcha": "false" 80 80 }) 76 + #set($thisObj = {}) 77 + #set($children = {}) 78 + #foreach($item in $classProperties.keySet()) 79 + #if($classProperties[$item].parent) 80 + #set($discard = $children[$classProperties[$item].parent].add($classProperties[$item])) 81 + #end 82 + #end 83 +$children 84 + #foreach($item in $classProperties.keySet()) 85 + #set($label = $services.localization.render("homeopaths.classproperty.${item}")) 86 + #if($theDocObj.getProperty($item)) 87 + #set($value = $theDocObj.getProperty($item).value) 88 + #if($classProperties[$item].type == "bool") 89 + #set($newElem = { 90 + "id" : "$item", 91 + "type" : "checkbox", 92 + "required" : "false", 93 + "label" : "$label", 94 + "value" : "$value", 95 + "data-opener" : "true" 96 + }) 97 + #else 98 +## #if($classProperties[$item].opener) 99 + #set($newElem = { 100 + "id": "$item", 101 + "type": "text", 102 + "required" : "false", 103 + "label" : "$label", 104 + "data-create-xobj" : "true", 105 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass", 106 + "data-xobj-fieldname" : "$item", 107 + "value": "$value" 108 + }) 109 + #end 110 + #set($thisObj["$item"] = $newElem) 111 + #end 112 + #end 113 + #set($practiceName = { 114 + "id": "practiceName", 115 + "type": "text", 116 + "required" : "false", 117 + "label" : "Practice name", 118 + "data-create-xobj" : "true", 119 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass", 120 + "data-xobj-fieldname" : "practiceName", 121 + "value": "$doc.getTitle()" 122 + }) 123 + #set($city = { 124 + "id": "city", 125 + "type": "text", 126 + "required" : "false", 127 + "label" : "City", 128 + "data-create-xobj" : "true", 129 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass", 130 + "data-xobj-fieldname" : "pmCity", 131 + "value": "$theDocObj.getProperty('pmCity').value" 132 + }) 81 81 #set($submit = { 82 82 "id" : "edit_details", 83 83 "button-text" : "Save changes", ... ... @@ -98,53 +98,11 @@ 98 98 </button> 99 99 </div> 100 100 <div class="modal-body"> 101 -#set($lastChild = "") 102 -#foreach($propertyName in $classProperties.keySet()) 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") 153 + #foreach($obj in $thisObj) 154 + #createFormElement($obj) 113 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])) 131 - #end 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 - #end 147 -#end 156 + #createFormElement($practiceName) 157 + #createFormElement($city) 148 148 </div> 149 149 <div class="modal-footer"> 150 150 <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> ... ... @@ -158,35 +158,5 @@ 158 158 #else 159 159 This page can not be viewed in inline mode. 160 160 #end 161 - 162 -#macro(createElementObjects $properties) 163 - #foreach($item in $properties.keySet()) 164 - #set($label = $services.localization.render("homeopaths.classproperty.${item}")) 165 - #if($theDocObj.getProperty($item)) 166 - #set($value = $theDocObj.getProperty($item).value) 167 - #set($newElem = { 168 - "id" : "$item", 169 - "type" : $classProperties[$item].type, 170 - "required" : "false", 171 - "label" : "$label", 172 - "data-create-xobj" : "true", 173 - "data-xobj-classname" : $theClass, 174 - "data-xobj-fieldname" : "$item", 175 - "value" : "$value" 176 - }) 177 - #if($classProperties[$item].opener == 1) 178 - #set($discard = $newElem.put("data-opener", "true")) 179 - #end 180 - #if($classProperties[$item].extraAttributes) 181 - #set($attrMap = $classProperties[$item].extraAttributes) 182 - #foreach($attr in $attrMap.keySet()) 183 - #set($discard = $newElem.put("$attr", $attrMap[$attr])) 184 - #end 185 - #end 186 - #set($thisObj["$item"] = $newElem) 187 - #end 188 - #end 189 -#end 190 - 191 191 {{/html}} 192 192 {{/velocity}}