refonte des topics

cao_blogr/forms.py

@@ -10,7 +10,7 @@ class BlogCreateForm(Form):
                         filters=[strip_filter])
     body = TextAreaField('Corps du texte', validators=[InputRequired(), Length(min=1)],
                          filters=[strip_filter])
-    tag = SelectField('Sous-rubrique')
+    tag = SelectField('Tag')
     author = StringField('Auteur', validators=[InputRequired(), Length(min=1, max=50)],
                         filters=[strip_filter])
     status = SelectField('Statut', choices=[('brouillon','Brouillon'),('publié','Publié')])
@@ -29,7 +29,7 @@ class UserCreateForm(Form):
     password = PasswordField('Mot de passe', validators=[InputRequired(), Length(min=6)])
 
 class TopicForm(Form):
-    topic = StringField('Rubrique', validators=[InputRequired(), Length(min=1, max=25)],
+    topic = StringField('Topic', validators=[InputRequired(), Length(min=1, max=25)],
                         filters=[strip_filter])
     topic_name = StringField('Intitulé', validators=[InputRequired(), Length(min=1, max=25)],
                         filters=[strip_filter])
@@ -40,7 +40,7 @@ class TopicForm(Form):
 class TagForm(Form):
     id = IntegerField(widget=HiddenInput())
 
-    tag = StringField('Sous-rubrique', validators=[InputRequired(), Length(min=1, max=25)],
+    tag = StringField('Tag', validators=[InputRequired(), Length(min=1, max=25)],
                         filters=[strip_filter])
     tag_name = StringField('Intitulé', validators=[InputRequired(), Length(min=1, max=25)],
                         filters=[strip_filter])

cao_blogr/services/blog_record.py

@@ -39,7 +39,7 @@ class BlogRecordService(object):
     @classmethod
     def get_last_created(cls, request):
         # gest the last created posts
-        query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != 'ADM')
+        query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != '_admin')
         if request.authenticated_userid == None:
             # if user is anonym, display only published posts
             query = query.filter(BlogRecord.status == 'publié')
@@ -49,7 +49,7 @@ class BlogRecordService(object):
     @classmethod
     def get_activities(cls, request):
         # gest the Activities section
-        query = request.dbsession.query(BlogRecord).filter(and_(BlogRecord.topic_id == 'ADM', 
+        query = request.dbsession.query(BlogRecord).filter(and_(BlogRecord.topic_id == '_admin', 
                                                                 BlogRecord.tag == 'activities',
                                                                 BlogRecord.status == 'publié'))
         query = query.order_by(sa.desc(BlogRecord.created)).first()
@@ -77,7 +77,7 @@ class BlogRecordService(object):
     @classmethod
     def get_topics(cls, request):
         # get all topics
-        query = request.dbsession.query(Topics).order_by(Topics.topic).all()
+        query = request.dbsession.query(Topics).order_by(Topics.topic_name).all()
         return query
 
     @classmethod

cao_blogr/templates/blog.jinja2

@@ -21,7 +21,8 @@
         Auteur : <strong>{{ entry.author }}</strong><br>
         Publié le : <strong>{{ entry.created.strftime("%d-%m-%Y - %H:%M") }}</strong><br>
         {% if request.authenticated_userid %}
-            Topic - Tag : <strong>{{ entry.topic_id }}</strong> - <strong>{{ entry.tag }}</strong>
+            Topic - Tag : <strong>{{ entry.topic_id }}</strong> - <strong>{{ entry.tag }}</strong><br>
+            Statut : <strong>{{ entry.status }}</strong>
         {% endif %}
     </p>
     <script>

cao_blogr/templates/home.jinja2

@@ -145,8 +145,8 @@
           116 bd Maréchal Foch<br>
           93160 NOISY LE GRAND<br>
           <br>
-          station Bry sur Marne&nbsp;<span class="label label-danger">RER A</span><br>
+          <span class="label label-danger">RER A</span>&nbsp;station Bry sur Marne<br>
-          arrêt Verdun&nbsp;<span class="label label-primary">Bus 220</span><br>
+          <span class="label label-primary">Bus 220</span>&nbsp;arrêt Verdun<br>
           <br>
           <span class="glyphicon glyphicon-envelope"></span><br>
           contact@meditation-sunyata.paris

cao_blogr/templates/layout.jinja2

@@ -54,30 +54,30 @@
 <div class="container">
   <div align="center">
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='FR1') }}">ENSEIGNEMENT</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='enseignement') }}">ENSEIGNEMENT</a>&nbsp;
     </span>
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='FR2') }}">PRATIQUE</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='pratique') }}">PRATIQUE</a>&nbsp;
     </span>
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='FR3') }}">QI GONG</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='qigong') }}">QI GONG</a>&nbsp;
     </span>
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='FR4') }}">SCIENCES</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='sciences') }}">SCIENCES</a>&nbsp;
     </span>
   </div>
   <div align="center">
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='VN1') }}">TU HỌC</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='tu_hoc') }}">TU HỌC</a>&nbsp;
     </span>
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='VN2') }}">TU TẬP</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='tu_tap') }}">TU TẬP</a>&nbsp;
     </span>
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='FR3') }}">KHÍ CÔNG</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='qigong') }}">KHÍ CÔNG</a>&nbsp;
     </span>
     <span class="menu-item">
-      <a href="{{ request.route_url('topic', topic='VN4') }}">KHOA HỌC</a>&nbsp;
+      <a href="{{ request.route_url('topic', topic='sciences') }}">KHOA HỌC</a>&nbsp;
     </span>
   </div>
 
@@ -112,7 +112,7 @@
         <p class="text-center">
           &copy; 2022&nbsp;-&nbsp;Méditation SUNYATA Paris
           &nbsp;|&nbsp;<a href="{{ request.route_url('blog', id=1, slug='mentions-legales') }}">Mentions légales</a>
-          &nbsp;|&nbsp;<a href="{{ request.route_url('topic', topic='FR9') }}">A propos</a>
+          &nbsp;|&nbsp;<a href="{{ request.route_url('topic', topic='apropos') }}">A propos</a>
           &nbsp;|&nbsp;<a href="https://www.ovhcloud.com/fr/mail/" target="__blank">Contact</a>
         </p>
 			</div>

cao_blogr/templates/settings.jinja2

@@ -56,13 +56,13 @@
 		</table>
 	</div>
 	<div class="row">
-		<h2>Informations</h2>
+		<h2>Informations système</h2>
 		<ul>
-			<li>Client addr : {{ request.client_addr }}</li>
+			<li>Pyramid {{ pyramid_version }}</li>
-			<li>Remote addr : {{ request.remote_addr }}</li>
+			<li>WTForms {{ wtforms_version }}</li>
-			<li>Remote host : {{ request.remote_host }}</li>
+			<li>SQLAlchemy {{ sqlalchemy_version }}</li>
-			<li>Remote port : {{ request.remote_port }}</li>
+			<li>SQLite {{ sqlite_version }}</li>
-			<li>Server name : {{ request.server_name }}</li>
+			<li>Python {{ python_version }}</li>
 		</ul>
 	</div>
 

cao_blogr/templates/tag_edit.jinja2

@@ -42,11 +42,11 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title">Supprimer la sous-rubrique</h4>
+                    <h4 class="modal-title">Supprimer le Tag</h4>
                 </div>
                 <div class="modal-body">
                     <!-- The form is placed inside the body of modal -->
-                        <p>Etes-vous certain(e) de vouloir supprimer la sous-rubrique <b>{{ form.tag_name.data }}</b> ?</p>
+                        <p>Etes-vous certain(e) de vouloir supprimer le Tag <b>{{ form.tag_name.data }}</b> ?</p>
                 </div>
                 <div class="modal-footer">
                     <div class="form-group">

cao_blogr/templates/topic_edit.jinja2

@@ -44,7 +44,7 @@
 
     </form>
 
-    <h3>Sous-rubriques</h3>
+    <h3>Liste des Tags</h3>
 	<p><a href="{{ request.route_url('tag_edit', topic=form.topic.data, id='0') }}"  class="btn btn-success" role="button">
 		<span class="glyphicon glyphicon-plus"></span> Nouveau</a>
 	</p>
@@ -52,8 +52,8 @@
     <table id="users_list" class="table table-striped table-bordered table-condensed">
         <thead>
             <tr>
-                <th>Sous-rubrique</th>
+                <th>Tag</th>
-                <th>Intitulé</th>
+                <th>Nom du tag</th>
             </tr>
         </thead>
         {% for entry in tags %}
@@ -74,11 +74,11 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title">Supprimer la rubrique</h4>
+                    <h4 class="modal-title">Supprimer le Topic</h4>
                 </div>
                 <div class="modal-body">
                     <!-- The form is placed inside the body of modal -->
-                        <p>Etes-vous certain(e) de vouloir supprimer la rubrique <b>{{ form.topic_name.data }}</b> ?</p>
+                        <p>Etes-vous certain(e) de vouloir supprimer le Topic <b>{{ form.topic_name.data }}</b> ?</p>
                 </div>
                 <div class="modal-footer">
                     <div class="form-group">

cao_blogr/templates/topics.jinja2

@@ -5,14 +5,14 @@
         <a href="{{ request.route_url('settings') }}" class="btn btn-default" role="button">
             <span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
         <a href="{{ request.route_url('topic_edit', topic='0') }}" class="btn btn-success" role="button">
-            <span class="glyphicon glyphicon-plus"></span> Nouvelle rubrique</a>
+            <span class="glyphicon glyphicon-plus"></span> Nouveau Topic</a>
     </p>
 
     <table id="users_list" class="table table-striped table-condensed">
         <thead>
             <tr>
-                <th>Rubrique</th>
+                <th>Topic</th>
-                <th>Nom</th>
+                <th>Name</th>
             </tr>
         </thead>
         {% for entry in topics %}

cao_blogr/views/default.py

@@ -18,7 +18,9 @@ import shutil
 import magic
 import json
 from urllib import request, parse
-
+import pkg_resources
+import sys
+import sqlite3
 
 @view_config(route_name='home',
              renderer='cao_blogr:templates/home.jinja2')
@@ -113,13 +115,25 @@ def captcha_validate(response, remote_addr, secret):
 def settings(request):
 
     # lire toutes les docs du topic
-    topic = 'ADM'
+    topic = '_admin'
     items = BlogRecordService.by_topic(request, topic, '')
 
+    # informations sur les versions
+    pyramid_version = pkg_resources.get_distribution("pyramid").version
+    wtforms_version = pkg_resources.get_distribution("wtforms").version
+    sqlalchemy_version = pkg_resources.get_distribution("sqlalchemy").version
+    sqlite_version = sqlite3.sqlite_version
+    python_version = sys.version
+
     return {
         'page_title': "Paramètres",
         'topic': topic,
         'items': items,
+        'pyramid_version': pyramid_version,
+        'python_version' : python_version,
+        'sqlite_version' : sqlite_version,
+        'sqlalchemy_version': sqlalchemy_version,
+        'wtforms_version': wtforms_version,
         }
 
 
@@ -218,7 +232,7 @@ def topics(request):
     # get all topics
     topics = BlogRecordService.get_topics(request)
     return {
-        'page_title': "Liste des rubriques",
+        'page_title': "Liste des Topics",
         'topics': topics
         }
 
@@ -236,7 +250,7 @@ def topic_edit(request):
         # create a new topic
         entry = Topics()
         form = TopicForm(request.POST, entry)
-        page_title = "Nouvelle rubrique"
+        page_title = "Nouveau Topic"
 
     else:
         # modify post
@@ -282,7 +296,7 @@ def tag_edit(request):
         # create a new tag
         entry = Tags()
         form = TagForm(request.POST, entry)
-        page_title = "Nouvelle sous-rubrique"
+        page_title = "Nouveau Tag"
 
     else:
         # modify post