almet/copanier
1
0
Fork 0
mirror of https://github.com/almet/copanier.git synced 2025-04-28 11:32:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Specify the version in copanier/__init__.py. (#129)

Browse source 
And use it when loading the css files in order to not have the css files
cached by the browsers after an update.

Fix #124
This commit is contained in:
Alexis Metaireau 2022-10-25 23:56:26 +02:00 committed by GitHub
parent c5fcdad2d1
commit 2b0459e94a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
copanier/__init__.py
View file

@ -5,6 +5,7 @@ from roll.extensions import simple_server, static
from .models import Product, Person, Order, Delivery from .models import Product, Person, Order, Delivery
from .views.core import app from .views.core import app
__version__ = "0.0.5"
@minicli.cli() @minicli.cli()
def shell(): def shell():

66
copanier/templates/base.html
View file

@ -1,13 +1,13 @@
{% import "includes/macros.html" as macros %} {% import "includes/macros.html" as macros %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>{% if title %}{{ title }} - {% endif %}{{ config.SITE_NAME }}</title> <title>{% if title %}{{ title }} - {% endif %}{{ config.SITE_NAME }}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="{{ url_for('/static/app.css') }}"> <link rel="stylesheet" type="text/css" href="{{ url_for('/static/app.css') }}?v={{ version }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('/static/icomoon.css') }}"> <link rel="stylesheet" type="text/css" href="{{ url_for('/static/icomoon.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('/static/purecss.css') }}"> <link rel="stylesheet" type="text/css" href="{{ url_for('/static/purecss.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('/static/side-menu.css') }}"> <link rel="stylesheet" type="text/css" href="{{ url_for('/static/side-menu.css') }}">
@ -18,11 +18,13 @@
{% endblock head %} {% endblock head %}
</head> </head>
<body> <body>
{% if config.DEMO_MODE %} {% if config.DEMO_MODE %}
<div class="header"> <div class="header">
<div class="home-menu pure-menu pure-menu-horizontal pure-menu-fixed demo-mode"> <div class="home-menu pure-menu pure-menu-horizontal pure-menu-fixed demo-mode">
<p class="pure-menu-heading">Le site est en mode démo. <a href="{{ url_for('desactivate_demo') }}">désactiver</a></p> <p class="pure-menu-heading">Le site est en mode démo. <a
href="{{ url_for('desactivate_demo') }}">désactiver</a></p>
</div> </div>
</div> </div>
{% endif %} {% endif %}
@ -35,23 +37,27 @@
<div id="menu"> <div id="menu">
<div class="pure-menu"> <div class="pure-menu">
<h1 id="sitename"><a href="{{ url_for('home') }}">{{ config.SITE_NAME }}</a></h1> <h1 id="sitename"><a href="{{ url_for('home') }}">{{ config.SITE_NAME }}</a></h1>
{% block additional_menu %}{% endblock %} {% block additional_menu %}{% endblock %}
<ul class="pure-menu-list"> <ul class="pure-menu-list">
<li class="pure-menu-item"> <li class="pure-menu-item">
<a class="pure-menu-link" href="{{ url_for('archives') }}"><i class="icon-happy"></i>&nbsp;Voir les archives</a> <a class="pure-menu-link" href="{{ url_for('archives') }}"><i class="icon-happy"></i>&nbsp;Voir
les archives</a>
</li> </li>
{% if request.user and request.user.is_staff %} {% if request.user and request.user.is_staff %}
<li class="pure-menu-item"> <li class="pure-menu-item">
<a class="pure-menu-link" href="{{ url_for('new_delivery') }}"><i class="icon-hotairballoon"></i>&nbsp;Nouvelle distribution</a> <a class="pure-menu-link" href="{{ url_for('new_delivery') }}"><i
class="icon-hotairballoon"></i>&nbsp;Nouvelle distribution</a>
</li> </li>
{% endif %} {% endif %}
{% if request.user and (request.user.is_staff or not config.HIDE_GROUPS_LINK) %} {% if request.user and (request.user.is_staff or not config.HIDE_GROUPS_LINK) %}
<li class="pure-menu-item"> <li class="pure-menu-item">
<a class="pure-menu-link" class="pure-menu-link" href="{{ url_for('groups') }}"><i class="icon-globe"></i>&nbsp;Gérer les groupes</a> <a class="pure-menu-link" class="pure-menu-link" href="{{ url_for('groups') }}"><i
class="icon-globe"></i>&nbsp;Gérer les groupes</a>
</li> </li>
{% endif %} {% endif %}
<li class="pure-menu-item"> <li class="pure-menu-item">
<a class="pure-menu-link" href="{{ url_for('logout') }}"><i class="icon-lock"></i>&nbsp;Se déconnecter</a> <a class="pure-menu-link" href="{{ url_for('logout') }}"><i class="icon-lock"></i>&nbsp;Se
déconnecter</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -60,7 +66,7 @@
<h1 id="sitename">{{ config.SITE_NAME }}</h1> <h1 id="sitename">{{ config.SITE_NAME }}</h1>
{% endif %} {% endif %}
<div class="toplink"> <div class="toplink">
{% block toplink %}{% endblock %} {% block toplink %}{% endblock %}
</div> </div>
<div id="main"> <div id="main">
<div class="content {% block is_wide %}narrow{% endblock %}"> <div class="content {% block is_wide %}narrow{% endblock %}">
@ -68,30 +74,32 @@
{% endblock body %} {% endblock body %}
</div> </div>
</div> </div>
<footer>Copanier est un logiciel libre. <a href="https://github.com/spiral-project/copanier">Vous pouvez y contribuer et l'améliorer ! ❤️</a></footer> <footer>Copanier est un logiciel libre. <a href="https://github.com/spiral-project/copanier">Vous pouvez y
contribuer et l'améliorer ! ❤️</a></footer>
</div> </div>
<script src="{{ url_for('/static/js/flash.min.js') }}"></script> <script src="{{ url_for('/static/js/flash.min.js') }}"></script>
<script src="{{ url_for('/static/js/app.js') }}"></script> <script src="{{ url_for('/static/js/app.js') }}"></script>
<script src="{{ url_for('/static/js/menus.js') }}"></script> <script src="{{ url_for('/static/js/menus.js') }}"></script>
<script> <script>
{% if message %} {% if message %}
new window.FlashMessage("{{ message[0] }}", "{{ message[1] }}", { new window.FlashMessage("{{ message[0] }}", "{{ message[1] }}", {
progress: true, progress: true,
interactive: true, interactive: true,
timeout: 8000, timeout: 8000,
theme: "dark" theme: "dark"
}); });
{% endif %} {% endif %}
// Disable scrolling on inputs, as it make users do weird things. // Disable scrolling on inputs, as it make users do weird things.
// Taken from https://stackoverflow.com/a/38589039/147077 // Taken from https://stackoverflow.com/a/38589039/147077
document.addEventListener("wheel", function(event){ document.addEventListener("wheel", function (event) {
if(document.activeElement.type === "number"){ if (document.activeElement.type === "number") {
document.activeElement.blur(); document.activeElement.blur();
} }
}); });
</script> </script>
</body> </body>
</html>
</html>

2
copanier/views/core.py
View file

@ -20,6 +20,8 @@ class Response(RollResponse):
context["config"] = config context["config"] = config
context["request"] = self.request context["request"] = self.request
context["url_for"] = app.url_for context["url_for"] = app.url_for
from .. import __version__
context["version"] = __version__
if self.request.cookies.get("message"): if self.request.cookies.get("message"):
try: try:
message = json.loads(self.request.cookies["message"]) message = json.loads(self.request.cookies["message"])

2
setup.cfg
View file

@ -1,6 +1,6 @@
[metadata] [metadata]
name = copanier name = copanier
version = 0.0.4 version-from-file = copanier/__init__.py
[options] [options]
packages = find: packages = find: