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

changed cao_sunyata version to 1.1

Browse Source
This commit is contained in:
Phuoc
2024-12-27 07:48:01 +01:00
parent d2aa732f2b
commit cf1724c7f4
5 changed files with 9 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cao_sunyata/templates/layout.jinja2
View File

@@ -4,6 +4,9 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Association de méditation Sunyata Paris, Hội Thiền Tánh Không Paris">
<meta name="keywords" content="méditation paris sunyata formation pratique zen Thien Tanh Khong Paris France">
<meta name="author" content="Cao Thien Phuoc">
<title>{{page_title}}</title>
<link rel="shortcut icon" href="{{request.static_url('cao_sunyata:static/zazen.png')}}">
<link rel="stylesheet" href="{{request.static_url('cao_sunyata:static/css/styles.min.css')}}" />
@@ -230,7 +233,7 @@
<!-- Footer -->
<div class="py-6 px-6 text-center">
<p class="mb-0 fs-4">© 2022 - Méditation SUNYATA Paris - Hội Thiền Tánh Không Paris</p>
<p class="mb-0 fs-4">© 2022-2024 - Méditation SUNYATA Paris - Hội Thiền Tánh Không Paris</p>
</div>
</div>
</div>

202
cao_sunyata/templates/old_layout.jinja2
View File

@@ -1,202 +0,0 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Association de méditation Sunyata Paris, Hội Thiền Tánh Không Paris">
<meta name="keywords" content="méditation paris sunyata formation pratique zen Thien Tanh Khong Paris France">
<meta name="author" content="Cao Thien Phuoc">
<link rel="shortcut icon" href="{{request.static_url('cao_sunyata:static/zazen.png')}}">
<title>{{page_title}}</title>
<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<link href="https://fonts.googleapis.com/css?family=Source Serif Pro" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Roboto Condensed" rel="stylesheet" type="text/css">
<!-- Custom styles for this scaffold -->
<link href="{{request.static_url('cao_sunyata:static/theme.css')}}" rel="stylesheet">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
</head>
<body>
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" class="text-center" href="{{ request.route_url('home') }}" alt="Accueil">
<img src="{{ request.static_url('cao_sunyata:static/logo-msp.png') }}" class="logo" /></a>
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ request.route_url('blog_search') }}" title="Recherche"><span class="glyphicon glyphicon-search"></span></a></li>
{% if request.authenticated_userid %}
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{request.authenticated_userid}}
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
{% if request.authenticated_userid == 'admin' %}
<li><a href="{{request.route_url('users')}}">
<span class="glyphicon glyphicon-user"></span></span>&nbsp;&nbsp;Utilisateurs</a></li>
{% else %}
<li><a href="{{request.route_url('user_edit', name=request.authenticated_userid)}}">
<span class="glyphicon glyphicon-user"></span>&nbsp;&nbsp;Modifier le mot de passe</a></li>
{% endif %}
<li><a href="{{request.route_url('settings')}}" title="Paramères">
<span class="glyphicon glyphicon-cog"></span></span>&nbsp;&nbsp;Paramètres</a></li>
<li><a href="{{ request.route_url('logout') }}"><span class="glyphicon glyphicon-log-out"></span>&nbsp;&nbsp;Se déconnecter</a></li>
</ul>
</li>
{% else %}
<!-- si anonyme, lien pour se connecter -->
<li><a href="{{request.route_url('login')}}" title="Connexion"><span class="glyphicon glyphicon-log-in"></span></a></li>
{% endif %}
</ul>
</div>
</div>
</nav>
<!-- Container (Above content Section) -->
<div class="container">
<div align="center">
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='enseignement') }}">ENSEIGNEMENT</a>&nbsp;
</span>
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='pratique') }}">PRATIQUE</a>&nbsp;
</span>
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='qigong') }}">QI GONG</a>&nbsp;
</span>
</div>
<div align="center">
<span class="menu-item">
<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='tu_tap') }}">TU TẬP</a>&nbsp;
</span>
<span class="menu-item">
<a href="{{ request.route_url('topic', topic='qigong') }}">KHÍ CÔNG</a>&nbsp;
</span>
</div>
<!-- Display Page Title -->
{% if page_title %}
<h1>{{ page_title }}</h1>
<br />
{% endif %}
<div id="messages">
{% for queue in ['', 'info', 'success', 'warning', 'danger'] %}
{% for message in request.session.pop_flash(queue) %}
<div class="alert alert-{{queue}}">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{{ message }}
</div>
{% endfor %}
{% endfor %}
</div>
<!-- display page content-->
{% block content %}
<p>No content</p>
{% endblock content %}
<br />
<br />
</div>
<!-- Footer -->
<div class="footer-dark">
<footer>
<div class="row">
<div class="col-sm-2 item">
<h3><a href="{{ request.route_url('topic', topic='enseignement') }}">ENSEIGNEMENT</a></h3>
<h3><a href="{{ request.route_url('topic', topic='pratique') }}">PRATIQUE</a></h3>
<h3><a href="{{ request.route_url('topic', topic='qigong') }}">QI GONG</a></h3>
<hr>
<h3><a href="{{ request.route_url('topic', topic='tu_hoc') }}">TU HỌC</a></h3>
<h3><a href="{{ request.route_url('topic', topic='tu_tap') }}">TU TẬP</a></h3>
<h3><a href="{{ request.route_url('topic', topic='qigong') }}">KHÍ CÔNG</a></h3>
</div>
<div class="col-sm-4 item">
<h3>Les sites SUNYATA dans le monde</h3>
<ul>
<li><a href="https://ttkadelaide.wordpress.com/" target="_blank">Sunyata Adelaide, Australie</a></li>
<li><a href="http://hoithientanhkhongontario.org/" target="_blank">Sunyata Ontario, Canada</a></li>
<!--
<li><a href="http://www.meditationsunyatatoulouse.fr/" target="_blank">Sunyata Toulouse, France</a> (fr)</li>
-->
<li><a href="https://www.sunyata-bw.de/" target="_blank">Sunyata Stuttgart, Allemagne</a> (de)</li>
<li><a href="http://www.sunyata-meditation-ch.org/" target="_blank">Sunyata Suisse</a> (fr)</li>
<li><a href="https://www.facebook.com/Sacramento.Tanhkhong" target="_blank">Sunyata Sacramento, CA, USA</a></li>
<li><a href="https://tanhkhong.org/" target="_blank">Monastère central, Perris, CA, USA</a></li>
<li><a href="http://www.sunyatameditation.org/" target="_blank">Monastère central, Perris, CA, USA</a> (en)</li>
<li><a href="https://thientanhkhong.org/" target="_blank">Sunyata Houston, TX, USA</a></li>
</ul>
</div>
<div class="col-sm-2 item">
<h3>A propos</h3>
<ul>
<li><a href="{{ request.route_url('topic', topic='apropos') }}">Qui sommes nous</a></li>
<li><a href="{{ request.route_url('blog', id=1, slug='mentions-legales') }}">Mentions légales</a></li>
{% if request.authenticated_userid %}
<li><a href="https://www.ovhcloud.com/fr/mail/" target="__blank">Contact</a></li>
{% endif %}
</ul>
</div>
<div class="col-sm-4 item text">
<h3>Méditation Sunyata Paris</h3>
<p>
116 bd Maréchal Foch<br>
93160 NOISY LE GRAND<br>
<span class="label label-danger">RER A</span>&nbsp;station Bry sur Marne<br>
<span class="label label-primary">Bus 220</span>&nbsp;arrêt Verdun<br>
<span class="glyphicon glyphicon-envelope"></span> contact@meditation-sunyata.paris<br>
<br>
&copy; 2022&nbsp;-&nbsp;Méditation SUNYATA Paris<br>
Hội Thiền Tánh Không Paris<br>
</p>
</div>
</div>
</footer>
</div>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-NBVRNJ9C0Y"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-NBVRNJ9C0Y');
</script>
<script type="text/javascript" id="cookieinfo"
src="//cookieinfoscript.com/js/cookieinfo.min.js"
data-bg="#645862"
data-fg="#FFFFFF"
data-link="#F1D600"
data-divlink="#FFFFFF"
data-divlinkbg="#5CB85C"
data-cookie="CookieInfoScript"
data-text-align="left"
data-close-text="J'ai compris!"
data-linkmsg = "Mentions légales"
data-moreinfo = "https://meditation-sunyata.paris/blog/1/mentions-legales"
data-message="Les cookies que nous utilisons sont nécessaires au bon fonctionnement du site. En continuant la visite, vous déclarez accepter leur utilisation.">
</script>
</body>
</html>

3
cao_sunyata/templates/settings.jinja2
View File

@@ -49,8 +49,9 @@
</nav>
</div>
<div class="pt-4">
<h4>Informations système</h4>
<h4>Versions des packages</h4>
<ul>
<li>cao_sunyata {{ app_version }}</li>
<li>Pyramid {{ pyramid_version }}</li>
<li>Markdown {{ markdown_version }}</li>
<li>SQLAlchemy {{ sqlalchemy_version }}</li>

2
cao_sunyata/views/default.py
View File

@@ -92,6 +92,7 @@ def settings(request):
sqlalchemy_version = pkg_resources.get_distribution("sqlalchemy").version
sqlite_version = sqlite3.sqlite_version
python_version = sys.version
app_version = pkg_resources.require("cao_sunyata")[0].version
return {
'page_title': "Paramètres",
@@ -102,6 +103,7 @@ def settings(request):
'sqlite_version' : sqlite_version,
'sqlalchemy_version': sqlalchemy_version,
'python_version' : python_version,
'app_version' : app_version,
}

2
setup.py
View File

@@ -38,7 +38,7 @@ tests_require = [
setup(
name='cao_sunyata',
version='1.1',
description='cao_sunyata',
description='Sunyata meditation Paris website',
long_description=README + '\n\n' + CHANGES,
classifiers=[
'Programming Language :: Python',