@@ -297,9 +297,9 @@ |
||
297 | 297 | } |
298 | 298 | |
299 | 299 | /** |
300 | - * @see \Core\Entity\FileInterface::getUri() |
|
301 | - * @since 0.27 |
|
302 | - */ |
|
303 | - public function getUri() |
|
304 | - {} |
|
300 | + * @see \Core\Entity\FileInterface::getUri() |
|
301 | + * @since 0.27 |
|
302 | + */ |
|
303 | + public function getUri() |
|
304 | + {} |
|
305 | 305 | } |
306 | 306 | \ No newline at end of file |
@@ -91,7 +91,7 @@ |
||
91 | 91 | * and which are not in draft mode |
92 | 92 | */ |
93 | 93 | $queryBuilder->field('permissions.view')->equals($userID) |
94 | - ->field('isDraft')->equals(false); |
|
94 | + ->field('isDraft')->equals(false); |
|
95 | 95 | |
96 | 96 | if (!isset($value['sort'])) { |
97 | 97 | $value['sort'] = '-date'; |
@@ -68,13 +68,13 @@ discard block |
||
68 | 68 | 'view_manager' => array( |
69 | 69 | // Map template to files. Speeds up the lookup through the template stack. |
70 | 70 | 'template_map' => array( |
71 | - 'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml', |
|
72 | - 'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml', |
|
73 | - 'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml', |
|
74 | - 'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml', |
|
75 | - 'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml', |
|
76 | - 'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml', |
|
77 | - 'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml', |
|
71 | + 'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml', |
|
72 | + 'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml', |
|
73 | + 'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml', |
|
74 | + 'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml', |
|
75 | + 'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml', |
|
76 | + 'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml', |
|
77 | + 'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml', |
|
78 | 78 | 'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml', |
79 | 79 | ), |
80 | 80 | // Where to look for view templates not mapped above |
@@ -84,20 +84,20 @@ discard block |
||
84 | 84 | ), |
85 | 85 | 'form_elements' => array( |
86 | 86 | 'invokables' => array( |
87 | - 'Organizations/form' => 'Organizations\Form\Organizations', |
|
88 | - 'Organizations/OrganizationsContactForm' => 'Organizations\Form\OrganizationsContactForm', |
|
89 | - 'Organizations/OrganizationsNameForm' => 'Organizations\Form\OrganizationsNameForm', |
|
90 | - 'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm', |
|
91 | - 'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset', |
|
92 | - 'Organizations/OrganizationsNameFieldset' => 'Organizations\Form\OrganizationsNameFieldset', |
|
93 | - 'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset', |
|
94 | - //'Organizations/OrganizationFieldset' => 'Organizations\Form\OrganizationFieldset', |
|
95 | - 'Organizations/EmployeesContainer' => 'Organizations\Form\EmployeesContainer', |
|
96 | - 'Organizations/Employees' => 'Organizations\Form\Employees', |
|
97 | - 'Organizations/InviteEmployeeBar' => 'Organizations\Form\Element\InviteEmployeeBar', |
|
98 | - 'Organizations/Employee' => 'Organizations\Form\Element\Employee', |
|
99 | - 'Organizations/WorkflowSettings' => 'Organizations\Form\WorkflowSettings', |
|
100 | - 'Organizations/WorkflowSettingsFieldset' => 'Organizations\Form\WorkflowSettingsFieldset', |
|
87 | + 'Organizations/form' => 'Organizations\Form\Organizations', |
|
88 | + 'Organizations/OrganizationsContactForm' => 'Organizations\Form\OrganizationsContactForm', |
|
89 | + 'Organizations/OrganizationsNameForm' => 'Organizations\Form\OrganizationsNameForm', |
|
90 | + 'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm', |
|
91 | + 'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset', |
|
92 | + 'Organizations/OrganizationsNameFieldset' => 'Organizations\Form\OrganizationsNameFieldset', |
|
93 | + 'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset', |
|
94 | + //'Organizations/OrganizationFieldset' => 'Organizations\Form\OrganizationFieldset', |
|
95 | + 'Organizations/EmployeesContainer' => 'Organizations\Form\EmployeesContainer', |
|
96 | + 'Organizations/Employees' => 'Organizations\Form\Employees', |
|
97 | + 'Organizations/InviteEmployeeBar' => 'Organizations\Form\Element\InviteEmployeeBar', |
|
98 | + 'Organizations/Employee' => 'Organizations\Form\Element\Employee', |
|
99 | + 'Organizations/WorkflowSettings' => 'Organizations\Form\WorkflowSettings', |
|
100 | + 'Organizations/WorkflowSettingsFieldset' => 'Organizations\Form\WorkflowSettingsFieldset', |
|
101 | 101 | |
102 | 102 | ), |
103 | 103 | 'factories' => array( |
@@ -187,13 +187,13 @@ discard block |
||
187 | 187 | ), |
188 | 188 | 'service_manager' => [ |
189 | 189 | 'invokables' => [ |
190 | - 'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener' |
|
190 | + 'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener' |
|
191 | 191 | ], |
192 | 192 | 'factories' => [ |
193 | - 'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory', |
|
194 | - 'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory', |
|
195 | - 'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory', |
|
196 | - 'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory' |
|
193 | + 'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory', |
|
194 | + 'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory', |
|
195 | + 'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory', |
|
196 | + 'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory' |
|
197 | 197 | ] |
198 | 198 | ], |
199 | 199 | 'event_manager' => [ |
@@ -123,10 +123,10 @@ |
||
123 | 123 | * @param $options |
124 | 124 | */ |
125 | 125 | public function setOptions($options){ |
126 | - foreach($options as $key=>$val) { |
|
126 | + foreach($options as $key=>$val) { |
|
127 | 127 | if (array_key_exists($this->options,$key)) { |
128 | 128 | $this->options[$key]=$val; |
129 | 129 | } |
130 | - } |
|
130 | + } |
|
131 | 131 | } |
132 | 132 | } |
@@ -102,10 +102,10 @@ |
||
102 | 102 | } |
103 | 103 | }else{ |
104 | 104 | $result = sprintf('<a href="%s" rel="%s" %s>%s</a>', |
105 | - $url, |
|
106 | - $options['rel'], |
|
107 | - $options['target']?"target=" . $options['target']:"", |
|
108 | - strip_tags($jobEntity->getTitle())); |
|
105 | + $url, |
|
106 | + $options['rel'], |
|
107 | + $options['target']?"target=" . $options['target']:"", |
|
108 | + strip_tags($jobEntity->getTitle())); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | return $result; |
@@ -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; |
@@ -81,7 +81,7 @@ |
||
81 | 81 | |
82 | 82 | $adapter->setParams($params); |
83 | 83 | $paginator->setCurrentPageNumber($params->get('page', 1)) |
84 | - ->setItemCountPerPage($params->get('count', 10)); |
|
84 | + ->setItemCountPerPage($params->get('count', 10)); |
|
85 | 85 | |
86 | 86 | return $paginator; |
87 | 87 | } |