Skip to content

Commit 2869021

Browse files
committed
Converts elastic search to v5 design
1 parent 5caa520 commit 2869021

File tree

17 files changed

+100
-142
lines changed

17 files changed

+100
-142
lines changed

src/Puphpet/Extension/ElasticSearchBundle/Configure.php

-16
This file was deleted.

src/Puphpet/Extension/ElasticSearchBundle/Controller/FrontController.php

-26
This file was deleted.

src/Puphpet/Extension/ElasticSearchBundle/DependencyInjection/PuphpetExtensionElasticSearchExtension.php

-25
This file was deleted.

src/Puphpet/Extension/ElasticSearchBundle/PuphpetExtensionElasticSearchBundle.php

-9
This file was deleted.

src/Puphpet/Extension/ElasticSearchBundle/Resources/config/routing.yml

-3
This file was deleted.

src/Puphpet/Extension/ElasticSearchBundle/Resources/views/form.html.twig

-63
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
namespace Puphpet\MainBundle\Controller;
4+
5+
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
6+
use Symfony\Component\HttpFoundation\Request;
7+
8+
class ElasticSearchController extends Controller
9+
{
10+
public function indexAction(array $data)
11+
{
12+
return $this->render('PuphpetMainBundle:elastic-search:form.html.twig', [
13+
'elastic_search' => $data,
14+
]);
15+
}
16+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
puphpet.elastic_search.homepage:
2+
pattern: /
3+
defaults: { _controller: PuphpetMainBundle:ElasticSearch:index }

src/Puphpet/MainBundle/Resources/config/routing.yml

+5
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,8 @@ puphpet.beanstalkd:
116116
puphpet.rabbitmq:
117117
resource: "@PuphpetMainBundle/Resources/config/rabbitmq/routing.yml"
118118
prefix: /extension/rabbitmq
119+
120+
# search server
121+
puphpet.elastic_search:
122+
resource: "@PuphpetMainBundle/Resources/config/elastic-search/routing.yml"
123+
prefix: /extension/elastic-search

src/Puphpet/MainBundle/Resources/config/services.yml

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ services:
4848
# work queue
4949
- [ addExtension, [ 'beanstalkd' ] ]
5050
- [ addExtension, [ 'rabbitmq' ] ]
51+
# search server
52+
- [ addExtension, [ 'elastic-search' ] ]
5153

5254
puphpet.twig.base_extension:
5355
class: Puphpet\MainBundle\Twig\BaseExtension
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{% set selectedVersion = (elastic_search.settings.version is defined and elastic_search.settings.version)
2+
? elastic_search.settings.version
3+
: false %}
4+
{% set versions = selectedVersion
5+
? merge_unique([selectedVersion], elastic_search.available_versions)
6+
: elastic_search.available_versions %}
7+
8+
<div class="section-header hidden">
9+
<h1>Elastic Search</h1>
10+
<p class="lead">Install Elastic Search.</p>
11+
</div>
12+
13+
<div class="form-group">
14+
<div class="clearfix"><label>Install</label></div>
15+
16+
<label class="col-xs-12 radio-tile">
17+
<input type="checkbox" name="elastic_search[install]" value="1"
18+
class="invisible toggle-on-select"
19+
{% if elastic_search.install %}checked{% endif %}
20+
data-vis-toggle-target="#elastic_search-container" />
21+
<span class="content">
22+
<span class="header large">
23+
<i class="icon"></i>
24+
<span class="title">Install Elastic Search</span>
25+
</span>
26+
<span class="footer">
27+
A search server based on Lucene.
28+
</span>
29+
</span>
30+
</label>
31+
32+
<div class="clearfix"></div>
33+
</div>
34+
35+
<div class="clearfix"></div>
36+
37+
<div id="elastic_search-container" class="{% if not elastic_search.install %}hidden{% endif %}">
38+
<div class="form-group col-xs-12">
39+
<div class="clearfix"><label>Version</label></div>
40+
41+
{% for version in versions %}
42+
<label class="radio-tile mini set-width">
43+
<input type="radio" class="invisible"
44+
name="elastic_search[settings][version]"
45+
value="{{ version }}"
46+
{% if version == selectedVersion %}checked{% endif %} />
47+
<span class="content">
48+
<span class="header">
49+
<i class="icon"></i>
50+
<span class="title">{{ version }}</span>
51+
</span>
52+
</span>
53+
</label>
54+
{% endfor %}
55+
</div>
56+
57+
<div class="clearfix"></div>
58+
59+
<div class="help-block">
60+
<p>Elastic Search is a powerful open source search and analytics engine
61+
that makes data easy to explore.</p>
62+
<p><a href="http://www.elasticsearch.org/"
63+
target="_blank">Learn about Elastic Search</a>.</p>
64+
<p><a href="https://github.com/elasticsearch/elasticsearch-php"
65+
target="_blank">The official Elastic Search PHP library</a>.</p>
66+
<p>Elastic Search will be installed and the service will start automatically.
67+
Java will also be installed if not already present on the vagrant box.
68+
The default port is <code>9200</code>.</p>
69+
</div>
70+
</div>

src/Puphpet/MainBundle/Resources/views/front/index.html.twig

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
{% include 'PuphpetMainBundle:front:sections/database.html.twig' %}
3434
{% include 'PuphpetMainBundle:front:sections/mail.html.twig' %}
3535
{% include 'PuphpetMainBundle:front:sections/work-queue.html.twig' %}
36+
{% include 'PuphpetMainBundle:front:sections/search-server.html.twig' %}
3637
</div>
3738

3839
<div class="col-xs-3">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="tab-pane" id="elastic-search">
2+
{% include 'PuphpetMainBundle:elastic-search:form.html.twig' with { 'elastic_search': extensions.elastic_search.data } %}
3+
</div>

0 commit comments

Comments
 (0)