diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 3221775..e9ad1df 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,5 +1,20 @@ -{% spaceless %} + +{% spaceless %} @@ -16,7 +31,7 @@ - + {% endblock %} {{ get_var('CssBlock')|raw }} @@ -101,7 +116,7 @@ -
+
@@ -123,19 +138,16 @@
- - {% spaceless %} - {% if session_user.hasFlash('message') %} - {% set flash = session_user.flash('message') %} -
-
-
- {{ include(flash.template, {message: flash.message}) }} -
-
-
- {% endif %} - {% endspaceless %} + {% if session_user.hasFlash('message') %} + {% set flash = session_user.flash('message') %} +
+
+
+ {{ include(flash.template, {message: flash.message}) }} +
+
+
+ {% endif %} {% block body %}{% endblock %} @@ -146,8 +158,7 @@ {% set defaultFooter %} {% endset %} diff --git a/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php b/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php index d6b07fa..805dd0a 100644 --- a/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php +++ b/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php @@ -107,7 +107,9 @@ class DefaultController extends PageController ); if ($this->getRequest()->getUri() !== $trueUrl) { - return $this->redirect($trueUrl); + if ($this->getNode()->getRouteName() !== 'hosting') { + return $this->redirect($trueUrl); + } } $form = $this->createForm(new UserCommentType(), new Comment()); diff --git a/src/Deblan/Bundle/BlogBundle/Page/DefaultPage.php b/src/Deblan/Bundle/BlogBundle/Page/DefaultPage.php index 65bb827..c25d8fe 100644 --- a/src/Deblan/Bundle/BlogBundle/Page/DefaultPage.php +++ b/src/Deblan/Bundle/BlogBundle/Page/DefaultPage.php @@ -16,7 +16,7 @@ class DefaultPage extends Page return $this->configuration ->setBlock('title', 'Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType') ->setBlock('subtitle', 'Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType') - ->setBlock('content1', 'Deblan\Bundle\BlogBundle\Form\Type\MarkitupBlockType') + ->setBlock('content1', 'Trinity\Bundle\ContentManagerBundle\Form\Type\TinymceAdvancedBlockType') ; } diff --git a/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css b/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css index 39dbf20..f3264de 100644 --- a/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css +++ b/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css @@ -283,3 +283,7 @@ label { img { max-width: 100%; } + +.site-heading * { + text-shadow: 2px 2px 5px #333; +}