@@ -90,24 +90,24 @@ |
||
| 90 | 90 | $tabId = $containerId . '-' . strtolower($tabElement->getName()); |
| 91 | 91 | $tabsNav .= '<li><a data-toggle="tab" href="#' . $tabId . '">' . $translate($tabElement->getLabel()) . '</a></li>'; |
| 92 | 92 | $tabsContent .= '<div class="tab-pane" id="' . $tabId . '">' |
| 93 | - . $formContainer($tabElement, $layout, $parameter) |
|
| 94 | - . '</div>'; |
|
| 93 | + . $formContainer($tabElement, $layout, $parameter) |
|
| 94 | + . '</div>'; |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="' . $containerId . '">' |
| 98 | - . '<ul>' . $tabsNav . '</ul>' |
|
| 99 | - . '<div class="tab-content">' . $tabsContent . '</div>'; |
|
| 98 | + . '<ul>' . $tabsNav . '</ul>' |
|
| 99 | + . '<div class="tab-content">' . $tabsContent . '</div>'; |
|
| 100 | 100 | if ($containerParams['pager']) { |
| 101 | 101 | $content .='<ul class="pager wizard">' |
| 102 | - . '<li class="previous"><a href="javascript:;">← ' . $translate('previous') . '</a></li>' |
|
| 103 | - . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' →</a></li>' |
|
| 104 | - . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">' |
|
| 105 | - . (false !== $containerParams['finish_label'] |
|
| 102 | + . '<li class="previous"><a href="javascript:;">← ' . $translate('previous') . '</a></li>' |
|
| 103 | + . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' →</a></li>' |
|
| 104 | + . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">' |
|
| 105 | + . (false !== $containerParams['finish_label'] |
|
| 106 | 106 | ? '<a class="pull-right" href="' . $containerParams['finish_href'] . '">' |
| 107 | - . $translate($containerParams['finish_label']) . ' •</a>' |
|
| 107 | + . $translate($containerParams['finish_label']) . ' •</a>' |
|
| 108 | 108 | : '' |
| 109 | 109 | ) |
| 110 | - . '</li></ul>'; |
|
| 110 | + . '</li></ul>'; |
|
| 111 | 111 | } |
| 112 | 112 | $content .= '</div>'; |
| 113 | 113 | |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | $content = $this->renderElements($form, $colMap, $buttonsSpan); |
| 67 | 67 | |
| 68 | 68 | return $this->openTag($form) |
| 69 | - . '<div class="row" style="padding: 0 15px;">' |
|
| 70 | - . $content . '</div>' . $this->closeTag(); |
|
| 69 | + . '<div class="row" style="padding: 0 15px;">' |
|
| 70 | + . $content . '</div>' . $this->closeTag(); |
|
| 71 | 71 | |
| 72 | 72 | } |
| 73 | 73 | |
@@ -109,15 +109,15 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | if ($element->getName() == $form->getButtonElement()) { |
| 111 | 111 | $content.='<div class="input-group col-md-' . $cols . '">' |
| 112 | - . $formElement($element) |
|
| 113 | - . '<div class="input-group-btn search-form-buttons" style="width: 0px;">' |
|
| 114 | - . $this->renderButtons($form->getButtons()) . '</div>' |
|
| 115 | - . '</div>'; |
|
| 112 | + . $formElement($element) |
|
| 113 | + . '<div class="input-group-btn search-form-buttons" style="width: 0px;">' |
|
| 114 | + . $this->renderButtons($form->getButtons()) . '</div>' |
|
| 115 | + . '</div>'; |
|
| 116 | 116 | $buttonsRendered = true; |
| 117 | 117 | } else { |
| 118 | 118 | $content .= '<div class="input-group col-md-' . $cols . '">' |
| 119 | - . $formElement($element) |
|
| 120 | - . '</div>'; |
|
| 119 | + . $formElement($element) |
|
| 120 | + . '</div>'; |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $i += 1; |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $buttonsSpan = $form->getOption('buttons_span') ?: 12; |
| 129 | 129 | } |
| 130 | 130 | $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">' |
| 131 | - . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
| 131 | + . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | return $content; |
@@ -62,16 +62,16 @@ |
||
| 62 | 62 | $r=[]; |
| 63 | 63 | foreach ($result as $key => $val) { |
| 64 | 64 | $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''), |
| 65 | - 'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
| 66 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
| 67 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
| 68 | - 'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
| 69 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
| 70 | - 'coordinates' => $val->geometry->coordinates, |
|
| 71 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
| 72 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
| 73 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
| 74 | - 'data' => json_encode($val), |
|
| 65 | + 'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
| 66 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
| 67 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
| 68 | + 'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
| 69 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
| 70 | + 'coordinates' => $val->geometry->coordinates, |
|
| 71 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
| 72 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
| 73 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
| 74 | + 'data' => json_encode($val), |
|
| 75 | 75 | ]; |
| 76 | 76 | $row['id'] = 'c:' . (float) $row['coordinates'][0] . ':' . (float) $row['coordinates'][1]; |
| 77 | 77 | $r[]=$row; |