rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 15:33:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'frontend_various_fixes' into 'dev'

Browse source 
Frontend various fixes

See merge request federez/re2o!395
This commit is contained in:
grizzly 2019-01-28 11:27:31 +01:00
commit 02dba09972
10 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
static/favicon/android-chrome-192x192.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
static/favicon/android-chrome-512x512.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
static/favicon/apple-touch-icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/favicon/favicon-16x16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 461 B

BIN
static/favicon/favicon-32x32.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 678 B

BIN
static/favicon/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

1
static/favicon/safari-pinned-tab.svg Normal file
View file

@ -0,0 +1 @@
<svg version="1" xmlns="http://www.w3.org/2000/svg" width="933.333" height="933.333" viewBox="0 0 700.000000 700.000000"><path d="M80.5 1.2c-40.7 7.3-72 38.4-79 78.5-1.6 9.4-1.4 27.9.5 35.8 4.7 19.7 12.8 34.3 26.5 48.1 25.9 26 63 34.6 98.5 22.8l7.4-2.5 55 55 54.9 55-3.1 6.8c-13.2 29.2-14.3 61.2-3.1 92.1 9.7 26.9 34.2 53.2 60.9 65.5 16.8 7.7 30 10.8 48.2 11.2 20.2.5 32.5-2.4 57.5-13.1.9-.4 80.5 78.3 107.7 106.4l3.8 4-2 5.4c-6.9 18.3-7.1 43.1-.5 62.8 10.1 30.3 36.9 54.6 69.3 62.5 7.6 1.9 27.7 2.6 36.5 1.3 23.4-3.4 49.1-19.7 63.1-39.8 7.7-11 14.2-27.2 16.2-40.4 1.3-8.5.7-28-1.2-35.6-9.1-37.7-38.6-66-75.9-73.1-16.8-3.2-41.7-.6-53.8 5.6-2.5 1.3-3.3.7-57.8-53.9l-55.3-55.3 2.5-5c10.3-20.1 13.7-49.7 8.7-74.3-5-24.3-15.6-43.8-33.7-61.7-17-16.8-36.6-27.1-61.3-32.1-10.7-2.2-31.7-2.3-42.7-.3-7.5 1.4-21.8 6-29.2 9.5l-5.5 2.5-54.8-55c-30.1-30.2-54.8-55.5-54.8-56.2.1-.7.8-3 1.6-5.2 8.7-23.2 7.3-51.3-3.6-73.5-3.9-8.1-5-9.9-10.4-17-13.9-18.3-32.1-30.2-55.1-35.6-8-1.9-28.4-2.6-36-1.2z"/><path d="M240.5 46.7c1.5 4 5.5 20.1 6 24.8 2.5 20.4 2.5 34.3 0 48.3-.9 4.8-1.9 10.2-2.2 11.9l-.6 3.3h138.4c76.1.1 140.2.3 142.4.6 17.9 2.3 33 15.2 39.1 33.4 1.7 5.2 1.8 12.3 1.9 146.2 0 77.5.3 140.8.7 140.8.4 0 3.9-.7 7.9-1.5 9.3-2 19-2.9 30.4-2.9 8.2.1 22.4 1.1 26.4 1.9 7.5 1.6 15.4 3.6 19.3 4.9 2.6.8 4.9 1.2 5.1.8.1-.4.2-84.9.1-187.7-.2-186.6-.2-187-2.2-193.5-3.7-11.5-11.5-21.1-21.7-27-11-6.3.2-6-204.9-6-177.7 0-186.8.1-186.1 1.7zM44.6 427.7c0 175.9.2 188.2 1.8 193.7 5.4 18.3 20.5 31.6 38.8 34.2 2.4.4 352.9.8 372.5.5l3.2-.1-1.5-4.3c-1.7-4.7-5-18.2-5.9-23.9-3.1-19.9-2.6-36.2 1.9-59.5.3-1.3.2-2.3-.2-2.4-.4 0-64.1-.2-141.7-.3-140-.2-141-.2-146.6-2.3-7.2-2.7-9.3-3.9-15.5-9-6.4-5.3-11.8-13.3-14.6-21.6-2.1-6.2-2.1-6.4-2.4-147.2-.1-77.6-.2-141.4-.3-141.8 0-.5-.5-.6-.9-.3-1 .6-4.3 1.3-14.7 3-14.2 2.4-43.7 1.5-56.6-1.9-1.4-.3-3.2-.7-4-.9-.8-.1-3.8-1-6.8-1.9-3-.9-5.7-1.7-6-1.7-.3 0-.6 84.5-.5 187.7z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

19
static/favicon/site.webmanifest Normal file
View file

@ -0,0 +1,19 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/static/favicon/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/static/favicon/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}

15
templates/base.html
View file

@ -33,7 +33,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<!DOCTYPE html>
<html lang="fr">
<head prefix="og: http://ogp.me/ns#">
<meta property="og:title" content="Re2o" />
{# Open Graph for social media #}
<meta property="og:title" content="{{ name_website }}" />
<meta property="og:type" content="website" />
<meta property="og:url" content="{{ request.scheme }}://{{ request.get_host }}/" />
<meta property="og:image" content="{% static 'images/logo_re2o.svg' %}"/>
@ -54,8 +55,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet">
<link href="{% static 'css/base.css' %}" rel="stylesheet">
{# Favicon with iOS, Android, touchbar support #}
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon/apple-touch-icon.png' %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'favicon/favicon-32x32.png' %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'favicon/favicon-16x16.png' %}">
<link rel="manifest" href="{% static 'favicon/site.webmanifest' %}">
<link rel="mask-icon" href="{% static 'favicon/safari-pinned-tab.svg' %}" color="#5bbad5">
<link rel="shortcut icon" href="{% static 'favicon/favicon.ico' %}">
<meta name="theme-color" content="#ffffff">
{# Do not allow zooming on devices #}
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" type="image/svg" href="{% static 'images/logo_re2o.svg' %}">
<title>{{ name_website }} : {% block title %}{% trans "Home" %}{% endblock %}</title>
</head>

11
users/templates/users/profil.html
View file

@ -308,17 +308,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</div>
{% if users.is_class_club %}
<div class="panel panel-default">
<div class="panel-heading clearfix" data-parent="#accordion" data-toggle="collapse" data-target="#club">
<div class="panel-heading clearfix profil" data-parent="#accordion" data-toggle="collapse" data-target="#club">
<h3 class="panel-title pull-left">
<i class="fa fa-users"></i>{% trans " Manage the club" %}
<i class="fa fa-users"></i>{% trans " Manage the club" %}
</h3>
</div>
<div class="panel-collapse collapse" id="club">
<div class="panel-body">
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-club-admin-members' users.club.id %}">
<a class="btn btn-primary btn-sm" role="button"
href="{% url 'users:edit-club-admin-members' users.club.id %}">
<i class="fa fa-lock"></i>
{% trans "Manage the admins and members" %}
</a>
{% trans "Manage the admins and members" %}
</a>
</div>
<div class="panel-body">
<h4>{% trans "Club admins" %}</h4>