phuoc/cao_sunyata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Activities section into an admin page for easy editing

Browse Source
This commit is contained in:
Phuoc
2022-05-17 18:28:17 +02:00
parent 0e196b2e21
commit fa26947461
12 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cao_blogr/services/blog_record.py
View File

@@ -29,12 +29,19 @@ class BlogRecordService(object):
return query
@classmethod
def get_last_five(cls, request):
# gest the last 5 items modified
def get_last_created(cls, request):
# gest the last created posts
query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != 'ADM')
query = query.order_by(sa.desc(BlogRecord.created)).limit(5).all()
return query
@classmethod
def get_activities(cls, request):
# gest the Activities section
query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != 'ADM' and BlogRecord.tag != 'Activities')
query = query.order_by(sa.desc(BlogRecord.created)).first()
return query
@classmethod
def get_tags_byTopic(cls, request, topic):
# gest the last 5 items modified

0
cao_blogr/static/dao-trang.jpg → cao_blogr/static/img/dao-trang.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

0
cao_blogr/static/logo-zoom.jpg → cao_blogr/static/img/logo-zoom.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

3
cao_blogr/static/theme.css
View File

@@ -130,8 +130,9 @@ h5 {
background-color: red !important;
}
.menu-item {
font-size: 20px !important;
font-size: 16px !important;
letter-spacing: 5px;
margin-left: 3px;
}
footer {

2
cao_blogr/templates/blog_search.jinja2
View File

@@ -44,6 +44,8 @@
</tr>
{% endfor %}
</table>
{% else %}
{{ liste | safe }}
{% endif %}
</div>
<br />

48
cao_blogr/templates/home.jinja2
View File

@@ -87,7 +87,7 @@
<br /><b>Le Maître Fondateur</b>
</a>
</p>
<p><b>Le Vénérable Maître Thích Thông Triệt</b> a été ordonné par le Vénérable Maître Zen Thich Thanh Tu en 1974 et a eu sa réalisation spirituelle majeure en 1989 au Vietnam.
<p><b>Le Vénérable Maître Thích Thông Triệt</b> a été ordonné par le Vénérable Maître Zen Thích Thanh Từ en 1974 et a eu sa réalisation spirituelle majeure en 1989 au Vietnam.
Il s'est ensuite établi aux Etats Unis et a commencé à enseigner en 1995 dans l'Oregon. </p>
</div>
<div class="col-xs-4">
@@ -95,52 +95,16 @@
<img src="{{ request.static_url('cao_blogr:static/khong-noi.jpg') }}" class="img-circle person" alt="Khong Noi" width="255" height="255">
</a>
<p><b>La technique « PARLE PAS »</p></b>
<p>Depuis 2016, la technique <b>PARLE PAS</b> (ou KHONG NOI) est devenu la pierre angulaire de la pratique de la méditation SUNYATA. Cette technique conduit le méditant vers la maîtrise de ses pensées à travers un processus graduel d'extinction des murmures mentaux.</p>
<p>Depuis 2016, la technique <b>PARLE PAS</b> (ou KHÔNG NÓI) est devenu la pierre angulaire de la pratique de la méditation SUNYATA. Cette technique conduit le méditant vers la maîtrise de ses pensées à travers un processus graduel d'extinction des murmures mentaux.</p>
</div>
</div>
</div>
<!-- Container (ACTIVITES Section) -->
<br>
<br>
<div id="activities" class="bg-1">
<h5 class="text-center">NOS ACTIVITES</h5>
<div class="row text-center">
<div class="col-sm-4">
<div class="thumbnail">
<img src="{{ request.static_url('cao_blogr:static/logo-zoom.jpg') }}" alt="Zoom">
<p><strong>Dans la semaine</strong></p>
<p>
Lundi, Mercredi et Vendredi<br>
de 8h00 à 9h00<br>
sur Zoom
</p>
</div>
</div>
<div class="col-sm-4">
<div class="thumbnail">
<img src="{{ request.static_url('cao_blogr:static/dao-trang.jpg') }}" alt="Dao trang">
<p><strong>1er dimanche du mois</strong></p>
<p>
Dimanche 1er mai 2022<br>
de 09h00 à 13h30<br>
à Noisy le Grand
</p>
</div>
</div>
<div class="col-sm-4">
<div class="thumbnail">
<img src="{{ request.static_url('cao_blogr:static/logo-zoom.jpg') }}" alt="Zoom">
<p><strong>3ème dimanche du mois</strong></p>
<p>
Dimanche 15 mai 2022<br>
de 10h00 à 12h00<br>
sur Zoom
</p>
</div>
</div>
</div>
</div>
{{ activities | safe }}
{% if request.authenticated_userid %}
<div class="text-center"><a href="{{ request.route_url('settings') }}">Modifier les activités</a></div>
{% endif %}
<!-- Container (POSTS Section) -->
<div id="posts">

16
cao_blogr/templates/layout.jinja2
View File

@@ -60,12 +60,26 @@
<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;
<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>
<div align="center">
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='VN1') }}">TU HỌC</a>&nbsp;
</span>
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='VN2') }}">TU TẬP</a>&nbsp;
</span>
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='FR3') }}">KHÍ CÔNG</a>&nbsp;
</span>
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='VN4') }}">KHOA HỌC</a>&nbsp;
</span>
</div>
<!-- Display Page Title -->
{% if page_title %}

1
cao_blogr/templates/login.jinja2
View File

@@ -3,6 +3,7 @@
{% block content %}
<div class="row">
<br>
<div class="col-md-offset-4 col-md-5 well">
<form action="{{request.route_url('login')}}" method="post">

2
cao_blogr/templates/topics.jinja2
View File

@@ -8,7 +8,7 @@
<span class="glyphicon glyphicon-plus"></span> Nouvelle rubrique</a>
</p>
<table id="users_list" class="table table-striped table-bordered table-condensed">
<table id="users_list" class="table table-striped table-condensed">
<thead>
<tr>
<th>Rubrique</th>

2
cao_blogr/templates/users.jinja2
View File

@@ -8,7 +8,7 @@
<span class="glyphicon glyphicon-plus"></span> Nouvel utilisateur</a>
</p>
<table id="users_list" class="table table-striped table-bordered table-condensed">
<table id="users_list" class="table table-striped table-condensed">
<thead>
<tr>
<th>No Id</th>

19
cao_blogr/views/blog.py
View File

@@ -93,6 +93,24 @@ def blog_edit(request):
def blog_search(request):
criteria = ''
liste = ''
# generate a list of all tags of all topics
if request.authenticated_userid:
# get all topics
topics = BlogRecordService.get_topics(request)
for topic in topics:
liste += '<h4>' + topic.topic_name + '</h4>'
# get all the tags of the topic
tags = BlogRecordService.get_tags_byTopic(request, topic.topic)
if tags:
liste += '<ul>'
for tag in tags:
count = len(BlogRecordService.by_topic(request, tag.topic, tag.tag))
liste += '<button type="button" class="btn">{0} <span class="badge">{1}</span></button>&nbsp;'.format(
tag.tag_name, count)
liste += '</ul>'
form = BlogSearchForm(request.POST)
items = []
if 'form.submitted' in request.params and form.validate():
@@ -105,6 +123,7 @@ def blog_search(request):
'form': form,
'items': items,
'criteria': criteria,
'liste': liste,
}

9
cao_blogr/views/default.py
View File

@@ -30,8 +30,12 @@ def home(request):
dir + '/S21.jpg',
dir + '/S25.jpg']
# get the 5 last modified posts
last_five = BlogRecordService.get_last_five(request)
# get the Activities section
activ = BlogRecordService.get_activities(request)
# insèrer le path de static/img
activities = activ.body.replace('static/img/', "%s/static/img/" % request.application_url)
# get the last created posts
last_five = BlogRecordService.get_last_created(request)
name = ''
email = ''
comments = ''
@@ -71,6 +75,7 @@ Le site "meditation-sunyata.paris"
return {
'page_title': "",
'last_five': last_five,
'activities': activities,
'car_images': car_images,
'name': name,
'email': email,