From cd5651ac62b7bdcd1b085f81bf54a046ae39db2b Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Mon, 9 May 2022 18:10:21 +0200
Subject: [PATCH] moved topcs menu to header

---
 cao_blogr.sqlite                  | Bin 245760 -> 245760 bytes
 cao_blogr/static/theme.css        |   5 +++++
 cao_blogr/templates/layout.jinja2 |  24 ++++++++++++++++--------
 cao_blogr/templates/login.jinja2  |   1 +
 cao_blogr/views/blog.py           |   5 +++--
 cao_blogr/views/default.py        |   9 +++++++--
 6 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/cao_blogr.sqlite b/cao_blogr.sqlite
index 3c5cfba6d01f638fe438e349e9d0de72ccade01a..523635b3f17e645a4850a013244a3b8bf8d8b97d 100644
GIT binary patch
delta 49
zcmZo@;BRQ)pCHXRd7_Ln<K&GA{q=&D3Wlau2F6xK=6c4)=4KX#O$}`gjBO1}%Nm#+
E0De0T^#A|>

delta 49
zcmZo@;BRQ)pCHXRVWNyP<AjX~{q=$t3I-NdhGtfV7J4QYmS#pqO$}`gjBO1}%Nm#+
E0DcS(_W%F@

diff --git a/cao_blogr/static/theme.css b/cao_blogr/static/theme.css
index fea7a27..3f619fb 100644
--- a/cao_blogr/static/theme.css
+++ b/cao_blogr/static/theme.css
@@ -129,6 +129,11 @@ h5 {
 .dropdown-menu li a:hover {
   background-color: red !important;
 }
+.menu-item {
+  font-size: 20px !important;
+letter-spacing: 5px;
+}
+
 footer {
   background-color: #2d2d30;
   color: #f5f5f5;
diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2
index d9c12ec..1fab712 100644
--- a/cao_blogr/templates/layout.jinja2
+++ b/cao_blogr/templates/layout.jinja2
@@ -52,6 +52,21 @@
 
 <!-- Container (Above content Section) -->
 <div class="container">
+  <div align="center">
+    <span class="menu-item">
+      <a href="{{ request.route_url('topic', topic='FR1') }}">Enseignement</a>&nbsp;
+    </span>
+    <span class="menu-item">
+      <a href="{{ request.route_url('topic', topic='FR2') }}">Pratique</a>&nbsp;
+    </span>
+    <span class="menu-item">
+      <a href="{{ request.route_url('topic', topic='FR3') }}">Qi Gong</a>&nbsp;
+    </span>
+    <span class="menu-item">
+      <a href="{{ request.route_url('topic', topic='FR4') }}">Sciences</a>&nbsp;
+    </span>
+</div>
+
   <!-- Display Page Title -->
 	{% if page_title %}
 		<h1>{{ page_title }}</h1>
@@ -80,17 +95,10 @@
 	<!-- Footer -->
 	<footer class="text-center">
 			<div class="row">
-        <p class="text-center"><big>
-          |&nbsp;<a href="{{ request.route_url('topic', topic='FR1') }}">Enseignements</a>&nbsp;
-          |&nbsp;<a href="{{ request.route_url('topic', topic='FR2') }}">Pratique</a>&nbsp;
-          |&nbsp;<a href="{{ request.route_url('topic', topic='FR3') }}">Qi Gong</a>&nbsp;
-          |&nbsp;<a href="{{ request.route_url('topic', topic='FR4') }}">Sciences</a>&nbsp;
-          |&nbsp;<a href="{{ request.route_url('topic', topic='FR9') }}">A propos</a>&nbsp;
-          |</big>
-        </p>
         <p class="text-center">
           &copy; 2022&nbsp;-&nbsp;Méditation SUNYATA Paris
           &nbsp;|&nbsp;<a href="{{ request.route_url('blog', id=1, slug='mentions-l%25C3%25A9gales') }}">Mentions légales</a>
+          &nbsp;|&nbsp;<a href="{{ request.route_url('topic', topic='FR9') }}">A propos</a>
               
         </p>
 			</div>
diff --git a/cao_blogr/templates/login.jinja2 b/cao_blogr/templates/login.jinja2
index 316c523..d8dd36d 100644
--- a/cao_blogr/templates/login.jinja2
+++ b/cao_blogr/templates/login.jinja2
@@ -7,6 +7,7 @@
 
     <form action="{{request.route_url('login')}}" method="post">
         <h2>Se connecter</h2>
+
         <div class="form-group">
             <input type="text" name="username" class="form-control" placeholder="Identifiant">
         </div>
diff --git a/cao_blogr/views/blog.py b/cao_blogr/views/blog.py
index ed07acf..cf3f445 100644
--- a/cao_blogr/views/blog.py
+++ b/cao_blogr/views/blog.py
@@ -126,8 +126,9 @@ def topic(request):
         if items:
             liste += '<ul>'
             for item in items:
-                liste += '<li>{0}  <a href="{1}"><span class="glyphicon glyphicon-menu-right"></span>  {2}</a></li>'.format(
-                    item.edited.strftime("%d-%m-%Y"), request.route_url('blog', id=item.id, slug=item.slug), item.title)
+                liste += '<li><a href="{0}">{1}</a> — {2}</li>'.format(
+                    request.route_url('blog', id=item.id, slug=item.slug), item.title,
+                    item.edited.strftime("%d-%m-%Y"))
             liste += '</ul>'
         else:
             liste += '<ul><li> </li></ul>'
diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py
index 83dcc62..c5ef42d 100644
--- a/cao_blogr/views/default.py
+++ b/cao_blogr/views/default.py
@@ -1,4 +1,8 @@
-from pyramid.view import view_config
+from pyramid.view import (
+        forbidden_view_config,
+        view_config,
+)
+
 from pyramid.httpexceptions import HTTPFound
 from pyramid.security import remember, forget
 from pyramid_mailer.message import Message
@@ -73,7 +77,7 @@ Le site "meditation-sunyata.paris"
         }
 
 
-@view_config(route_name='settings', renderer='cao_blogr:templates/settings.jinja2')
+@view_config(route_name='settings', renderer='cao_blogr:templates/settings.jinja2', permission='manage')
 def settings(request):
 
     # lire toutes les docs du topic
@@ -98,6 +102,7 @@ def apropos(request):
 
 @view_config(route_name='login',
              renderer='cao_blogr:templates/login.jinja2')
+@forbidden_view_config(renderer='cao_blogr:templates/login.jinja2')
 def login(request):
     username = request.POST.get('username')