Skip to content

Commit 3024209

Browse files
committed
bug #430 Display missing "about" section in admin blog show page (yceruto)
This PR was squashed before being merged into the master branch (closes #430). Discussion ---------- Display missing "about" section in admin blog show page Also I've added in this PR some minor simplifications ;) Commits ------- 6d35acb Display missing "about" section in admin blog show page
2 parents a5bec08 + 6d35acb commit 3024209

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

app/Resources/views/admin/blog/show.html.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,7 @@
4646
}, with_context = false) }}
4747
</div>
4848

49+
{{ parent() }}
50+
4951
{{ show_source_code(_self) }}
5052
{% endblock %}

app/Resources/views/form/fields.html.twig

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
#}
99

1010
{% block date_time_picker_widget %}
11-
{% spaceless %}
12-
<div class="input-group date" data-toggle="datetimepicker">
13-
{{ block('datetime_widget') }}
14-
<span class="input-group-addon">
15-
<span class="fa fa-calendar" aria-hidden="true"></span>
16-
</span>
17-
</div>
18-
{% endspaceless %}
11+
<div class="input-group date" data-toggle="datetimepicker">
12+
{{ block('datetime_widget') }}
13+
<span class="input-group-addon">
14+
<span class="fa fa-calendar" aria-hidden="true"></span>
15+
</span>
16+
</div>
1917
{% endblock %}

app/Resources/views/security/login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
</div>
8181
</div>
8282
{% endblock %}
83-
{% block sidebar %}
8483

84+
{% block sidebar %}
8585
{{ parent() }}
8686

8787
{{ show_source_code(_self) }}

src/AppBundle/DataFixtures/ORM/LoadFixtures.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Doctrine\Common\DataFixtures\FixtureInterface;
1818
use Doctrine\Common\Persistence\ObjectManager;
1919
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
20-
use Symfony\Component\DependencyInjection\ContainerInterface;
20+
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
2121

2222
/**
2323
* Defines the sample data to load in the database when running the unit and
@@ -34,8 +34,7 @@
3434
*/
3535
class LoadFixtures implements FixtureInterface, ContainerAwareInterface
3636
{
37-
/** @var ContainerInterface */
38-
private $container;
37+
use ContainerAwareTrait;
3938

4039
/**
4140
* {@inheritdoc}
@@ -98,14 +97,6 @@ private function loadPosts(ObjectManager $manager)
9897
$manager->flush();
9998
}
10099

101-
/**
102-
* {@inheritdoc}
103-
*/
104-
public function setContainer(ContainerInterface $container = null)
105-
{
106-
$this->container = $container;
107-
}
108-
109100
private function getPostContent()
110101
{
111102
return <<<'MARKDOWN'

0 commit comments

Comments
 (0)