deblan/deblan.tv
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

features

Browse source
This commit is contained in:
Simon Vieille 2015-09-14 14:54:14 +02:00
parent d0df86e4f1
commit e35a3333ad
4 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
app/Resources/views/base.html.twig
View file

@ -1,5 +1,20 @@
{% spaceless %}
<!DOCTYPE html> <!DOCTYPE html>
<!--
_==/ i i \==_
/XX/ |\___/| \XX\
/XXXX\ |XXXXX| /XXXX\
|XXXXXX\_ _XXXXXXX_ _/XXXXXX|
XXXXXXXXXXXxxxxxxxXXXXXXXXXXXxxxxxxxXXXXXXXXXXX
|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX|
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX|
XXXXXX/^^^^"\XXXXXXXXXXXXXXXXXXXXX/^^^^^\XXXXXX
|XXX| \XXX/^^\XXXXX/^^\XXX/ |XXX|
\XX\ \X/ \XXX/ \X/ /XX/
"\ " \X/ " /"
-->
{% spaceless %}
<html> <html>
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
@ -16,7 +31,7 @@
<link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/bootstrap.css') }}" /> <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/bootstrap.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/clean-blog.css') }}" /> <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/clean-blog.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/deblanblog/syntaxhighlighter/styles/shThemeEclipse.css') }}" /> <link rel="stylesheet" href="{{ asset('bundles/deblanblog/syntaxhighlighter/styles/shThemeEclipse.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/main.css') }}?v=17" /> <link rel="stylesheet" href="{{ asset('bundles/deblanblog/css/cleanblog/main.css') }}?v=18" />
{% endblock %} {% endblock %}
{{ get_var('CssBlock')|raw }} {{ get_var('CssBlock')|raw }}
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -101,7 +116,7 @@
</div> </div>
</nav> </nav>
<header class="intro-header" style="background-image: url('{{ asset('bundles/deblanblog/img/home-bg2.jpg') }}')"> <header class="intro-header" style="background-image: url('{{ get_var('HeaderImageUrl', 'https://www.deblan.io/bundles/deblanblog/img/home-bg2.jpg') }}')">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
@ -123,19 +138,16 @@
</div> </div>
</header> </header>
{% if session_user.hasFlash('message') %}
{% spaceless %} {% set flash = session_user.flash('message') %}
{% if session_user.hasFlash('message') %} <div class="container">
{% set flash = session_user.flash('message') %} <div class="row">
<div class="container"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="row"> {{ include(flash.template, {message: flash.message}) }}
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> </div>
{{ include(flash.template, {message: flash.message}) }} </div>
</div> </div>
</div> {% endif %}
</div>
{% endif %}
{% endspaceless %}
{% block body %}{% endblock %} {% block body %}{% endblock %}
@ -146,8 +158,7 @@
{% set defaultFooter %} {% set defaultFooter %}
<p class="copyright text-muted"> <p class="copyright text-muted">
Simon Vieille / Hébergement personnel / Textes libres sauf indication(s) contraire(s) / Simon Vieille / Hébergement personnel / Textes libres sauf indication(s) contraire(s) /
<a href="{{ path('private_life') }}">Vie privée</a> / <a href="{{ path('private_life') }}">Vie privée</a>
<a href="https://lab.deblan.org/client/projects/deblan-trinity/repository">Sources</a>
</p> </p>
{% endset %} {% endset %}

4
src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php
View file

@ -107,7 +107,9 @@ class DefaultController extends PageController
); );
if ($this->getRequest()->getUri() !== $trueUrl) { 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()); $form = $this->createForm(new UserCommentType(), new Comment());

2
src/Deblan/Bundle/BlogBundle/Page/DefaultPage.php
View file

@ -16,7 +16,7 @@ class DefaultPage extends Page
return $this->configuration return $this->configuration
->setBlock('title', 'Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType') ->setBlock('title', 'Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType')
->setBlock('subtitle', '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')
; ;
} }

4
src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css
View file

@ -283,3 +283,7 @@ label {
img { img {
max-width: 100%; max-width: 100%;
} }
.site-heading * {
text-shadow: 2px 2px 5px #333;
}