diff --git a/cao_blogr/static/theme.css b/cao_blogr/static/theme.css index 6ecf29d..76544f5 100644 --- a/cao_blogr/static/theme.css +++ b/cao_blogr/static/theme.css @@ -5,7 +5,10 @@ body { font: 200 16px/1.8 Georgia, serif; color: rgb(90, 89, 89); } -h3, h4 { +.container h2, h3{ + color: #df4937 !important; +} +h5 { margin: 10px 0 30px 0; letter-spacing: 10px; font-size: 20px; diff --git a/cao_blogr/templates/home.jinja2 b/cao_blogr/templates/home.jinja2 index 990f383..62143b0 100644 --- a/cao_blogr/templates/home.jinja2 +++ b/cao_blogr/templates/home.jinja2 @@ -2,8 +2,19 @@ {% block content %} +
+

{{ cartoon_title }}

+

+ +

+
+ +
{% if request.authenticated_userid %} -

[ Nouveau ] +

+ [ Nouveau ] + [ Sélectionner un autre le dessin ]

{% endif%} diff --git a/cao_blogr/templates/portfolio/portfolio.jinja2 b/cao_blogr/templates/portfolio/portfolio.jinja2 index 5119f32..b59a15f 100644 --- a/cao_blogr/templates/portfolio/portfolio.jinja2 +++ b/cao_blogr/templates/portfolio/portfolio.jinja2 @@ -128,10 +128,10 @@ {{ ligne.Actifs.nombre }} {{ '{0:0,.2f} €'.format(ligne.Actifs.valeur).replace(',',' ') }} {% if ligne.Actifs.plus_value >= 0 %} - {{ '{0:0.2f} €'.format(ligne.Actifs.plus_value) }} + {{ '{0:0,.2f} €'.format(ligne.Actifs.plus_value).replace(',',' ') }} {{ '{0:0.1f}'.format(ligne.Actifs.pc_plusvalue) }} {% else %} - {{ '{0:0.2f} €'.format(ligne.Actifs.plus_value) }} + {{ '{0:0,.2f} €'.format(ligne.Actifs.plus_value).replace(',',' ') }} {{ '{0:0.1f}'.format(ligne.Actifs.pc_plusvalue) }} {% endif %} {{ '{0:0.1f}'.format(ligne.Actifs.ter) }} @@ -143,10 +143,10 @@ Total au {{ maj_pf_le.strftime('%d/%m/%Y') }} {{ '{0:0,.2f} €'.format(total_valeur).replace(',',' ') }} {% if total_pv >= 0 %} - {{ '{0:0.2f} €'.format(total_pv) }} + {{ '{0:0,.2f} €'.format(total_pv).replace(',',' ') }} {{ '{0:0.1f}'.format(total_pc_value) }} {% else %} - {{ '{0:0.2f} €'.format(total_pv) }} + {{ '{0:0,.2f} €'.format(total_pv).replace(',',' ') }} {{ '{0:0.1f}'.format(total_pc_value) }} {% endif %} diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py index ed2f22a..102123f 100644 --- a/cao_blogr/views/default.py +++ b/cao_blogr/views/default.py @@ -14,10 +14,14 @@ from ..models.user import User def home(request): # get the last created posts last_ten = BlogRecordService.get_last_created(request) + # get Chappatte cartoon + entry = BlogRecordService.by_id(request, 95) return { 'page_title': "Evaṃ me sutaṃ", 'last_ten': last_ten, + 'cartoon_title': entry.title, + 'cartoon_url': entry.body, }