diff --git a/apps/member/static/member/js/alias.js b/apps/member/static/member/js/alias.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d652dde5ef232fb0282e912e8e519d595d866c8
--- /dev/null
+++ b/apps/member/static/member/js/alias.js
@@ -0,0 +1,43 @@
+/**
+ * On form submit, create a new alias
+ */
+function create_alias (e) {
+ // Do not submit HTML form
+ e.preventDefault();
+
+ // Get data and send to API
+ const formData = new FormData(e.target);
+ $.post("/api/note/alias/", {
+ "csrfmiddlewaretoken": formData.get("csrfmiddlewaretoken"),
+ "name": formData.get("name"),
+ "note": formData.get("note")
+ }).done(function () {
+ // Reload table
+ $("#alias_table").load(location.pathname + " #alias_table");
+ addMsg("Alias ajouté", "success");
+ }).fail(function (xhr, _textStatus, _error) {
+ errMsg(xhr.responseJSON);
+ });
+}
+
+/**
+ * On click of "delete", delete the alias
+ * @param Integer button_id Alias id to remove
+ */
+function delete_button (button_id) {
+ $.ajax({
+ url: "/api/note/alias/" + button_id + "/",
+ method: "DELETE",
+ headers: { "X-CSRFTOKEN": CSRF_TOKEN }
+ }).done(function () {
+ addMsg('Alias supprimé', 'success');
+ $("#alias_table").load(location.pathname + " #alias_table");
+ }).fail(function (xhr, _textStatus, _error) {
+ errMsg(xhr.responseJSON);
+ });
+}
+
+$(document).ready(function () {
+ // Attach event
+ document.getElementById("form_alias").addEventListener("submit", create_alias);
+})
\ No newline at end of file
diff --git a/apps/member/templates/member/alias_update.html b/apps/member/templates/member/alias_update.html
deleted file mode 100644
index d1f6115b8ddccecfa32a6ef70c0bfeb8782cde31..0000000000000000000000000000000000000000
--- a/apps/member/templates/member/alias_update.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% load django_tables2 crispy_forms_tags i18n %}
-<div class="d-flex justify-content-center">
- <input id="alias_input" type="text" value=""/>
- <button id="alias_submit" class="btn btn-primary mx-2" onclick="create_alias( {{ object.note.pk }} )" type="submit">
- {% trans "Add alias" %}
- </button>
-</div>
-<div class="card bg-light shadow">
- <div class="card-body">
- {% render_table aliases %}
- </div>
-</div>
diff --git a/apps/member/templates/member/club_alias.html b/apps/member/templates/member/club_alias.html
index 4b6f2882ccd827d0815b668eb1e05a7267226fe0..60e2bef043774cecbecd8471afbd7c0a7c9ab452 100644
--- a/apps/member/templates/member/club_alias.html
+++ b/apps/member/templates/member/club_alias.html
@@ -1,10 +1,25 @@
{% extends "member/club_detail.html" %}
-{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
+{% load static django_tables2 i18n %}
{% block profile_content %}
-{% include "member/alias_update.html" %}
+<div class="card bg-light">
+ <h3 class="card-header text-center">
+ {% trans "Note aliases" %}
+ </h3>
+ <div class="card-body">
+ <form class="input-group" method="POST" id="form_alias">
+ {% csrf_token %}
+ <input type="hidden" name="note" value="{{ object.note.pk }}">
+ <input type="text" name="name" class="form-control">
+ <div class="input-group-append">
+ <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
+ </div>
+ </form>
+ </div>
+ {% render_table aliases %}
+</div>
{% endblock %}
{% block extrajavascript %}
-<script src="/static/js/alias.js"></script>
-{% endblock%}
+<script src="{% static "member/js/alias.js" %}"></script>
+{% endblock%}
\ No newline at end of file
diff --git a/apps/member/templates/member/club_detail.html b/apps/member/templates/member/club_detail.html
index 451e4d76090bc41b746a0ca061a5f8719a6881a9..bd6e8399a254304a42c940bf47a6607dcd73ab6c 100644
--- a/apps/member/templates/member/club_detail.html
+++ b/apps/member/templates/member/club_detail.html
@@ -9,10 +9,10 @@
{% endblock %}
{% block extrajavascript %}
- <script>
- function refreshHistory() {
- $("#history_list").load("{% url 'member:club_detail' pk=object.pk %} #history_list");
- $("#profile_infos").load("{% url 'member:club_detail' pk=object.pk %} #profile_infos");
- }
- </script>
-{% endblock %}
+<script>
+ function refreshHistory() {
+ $("#history_list").load("{% url 'member:club_detail' pk=object.pk %} #history_list");
+ $("#profile_infos").load("{% url 'member:club_detail' pk=object.pk %} #profile_infos");
+ }
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/member/templates/member/noteowner_detail.html b/apps/member/templates/member/noteowner_detail.html
index d97f723a391b7d8aea238ff39ec32c9bf9fabdb1..4f5f7a1d17342ec130e35f2f619a46f3619ae86e 100644
--- a/apps/member/templates/member/noteowner_detail.html
+++ b/apps/member/templates/member/noteowner_detail.html
@@ -1,32 +1,32 @@
{% extends "base.html" %}
-{% load static %}
-{% load i18n %}
+{% load static i18n pretty_money %}
{% load render_table from django_tables2 %}
-{% load pretty_money %}
+
+{# Use a fluid-width container #}
+{% block containertype %}container-fluid{% endblock %}
{% block content %}
- <div class="row mt-4">
- <div class="col-xl-4">
- {% block profile_info %}
- {% endblock %}
- </div>
- <div class="col-xl-8">
- {% block profile_content %}
- {% endblock %}
- </div>
+<div class="row mt-4">
+ <div class="col-xl-4">
+ {% block profile_info %}
+ {% endblock %}
+ </div>
+ <div class="col-xl-8">
+ {% block profile_content %}
+ {% endblock %}
</div>
+</div>
- {% block extra_content %}
- {% endblock %}
+{% block extra_content %}{% endblock %}
{% endblock %}
{% block extrajavascript %}
- <script>
- {% if object %}
- function refreshHistory() {
- $("#history_list").load("{% url 'member:user_detail' pk=object.pk %} #history_list");
- $("#profile_infos").load("{% url 'member:user_detail' pk=object.pk %} #profile_infos");
- }
- {% endif %}
- </script>
-{% endblock %}
+<script>
+ {% if object %}
+ function refreshHistory() {
+ $("#history_list").load("{% url 'member:user_detail' pk=object.pk %} #history_list");
+ $("#profile_infos").load("{% url 'member:user_detail' pk=object.pk %} #profile_infos");
+ }
+ {% endif %}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/member/templates/member/profile_alias.html b/apps/member/templates/member/profile_alias.html
index eb6e499aac817fdaee6e9f5b19b49cca1d85915e..ee2369e4bcfa744e337a0508538f3b5f8d4922b8 100644
--- a/apps/member/templates/member/profile_alias.html
+++ b/apps/member/templates/member/profile_alias.html
@@ -1,10 +1,25 @@
{% extends "member/profile_detail.html" %}
-{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
+{% load static django_tables2 i18n %}
{% block profile_content %}
-{% include "member/alias_update.html"%}
+<div class="card bg-light">
+ <h3 class="card-header text-center">
+ {% trans "Note aliases" %}
+ </h3>
+ <div class="card-body">
+ <form class="input-group" method="POST" id="form_alias">
+ {% csrf_token %}
+ <input type="hidden" name="note" value="{{ object.note.pk }}">
+ <input type="text" name="name" class="form-control">
+ <div class="input-group-append">
+ <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
+ </div>
+ </form>
+ </div>
+ {% render_table aliases %}
+</div>
{% endblock %}
{% block extrajavascript %}
-<script src="/static/js/alias.js"></script>
-{% endblock%}
+<script src="{% static "member/js/alias.js" %}"></script>
+{% endblock%}
\ No newline at end of file
diff --git a/apps/member/templates/member/profile_detail.html b/apps/member/templates/member/profile_detail.html
index 3572819198d5a3625ab58709226ab26b02e35970..297af21ca4214fd7d1c08c59de98ad9d4aa0c983 100644
--- a/apps/member/templates/member/profile_detail.html
+++ b/apps/member/templates/member/profile_detail.html
@@ -1,8 +1,5 @@
{% extends "member/noteowner_detail.html" %}
-{# Use a fluid-width container #}
-{% block containertype %}container-fluid{% endblock %}
-
{% block profile_info %}
{% include "member/profile_info.html" %}
{% endblock %}
diff --git a/apps/registration/static/registration/login.css b/apps/registration/static/registration/css/login.css
similarity index 58%
rename from apps/registration/static/registration/login.css
rename to apps/registration/static/registration/css/login.css
index 77a2f0076191cf052efe2e5d8ed2fa111cfd790b..b789b2f730f5c39a5c5a45fd5b4785a6ba939b5a 100644
--- a/apps/registration/static/registration/login.css
+++ b/apps/registration/static/registration/css/login.css
@@ -4,15 +4,16 @@ Font-Awesome attribution is already done inside SVG files
*/
#login-form input[type="text"] {
- background: #fff right 1rem top 50% / 5% no-repeat url('fa-user.svg');
+ background: #fff right 1rem top 50% / 5% no-repeat url('../img/fa-user.svg');
padding-right: 3rem;
}
#login-form input[type="password"] {
- background: #fff right 1rem top 50% / 5% no-repeat url('fa-lock.svg');
+ background: #fff right 1rem top 50% / 5% no-repeat url('../img/fa-lock.svg');
padding-right: 3rem;
}
#login-form select {
-moz-appearance: none;
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/apps/registration/static/registration/fa-lock.svg b/apps/registration/static/registration/img/fa-lock.svg
similarity index 100%
rename from apps/registration/static/registration/fa-lock.svg
rename to apps/registration/static/registration/img/fa-lock.svg
diff --git a/apps/registration/static/registration/fa-user.svg b/apps/registration/static/registration/img/fa-user.svg
similarity index 100%
rename from apps/registration/static/registration/fa-user.svg
rename to apps/registration/static/registration/img/fa-user.svg
diff --git a/note_kfet/static/css/custom.css b/note_kfet/static/css/custom.css
index 6ad67d9beddf7d1f89a42c2be8ff1baf1a3fa868..cfd42a86879e0dad873e74e99a7168c3e1a167c0 100644
--- a/note_kfet/static/css/custom.css
+++ b/note_kfet/static/css/custom.css
@@ -41,6 +41,7 @@ select.language {
color: #6c757d;
-moz-appearance: none;
width: auto;
+ cursor: pointer;
}
/* Last BDE colors */
diff --git a/note_kfet/static/js/alias.js b/note_kfet/static/js/alias.js
deleted file mode 100644
index cdb21b2b9921cc638b15d4dd08a024a8780e681e..0000000000000000000000000000000000000000
--- a/note_kfet/static/js/alias.js
+++ /dev/null
@@ -1,37 +0,0 @@
-
- $("#alias_input").on('keypress',function(e) {
- if(e.which == 13) {
- $("#alias_submit").click();
- }
- });
-
- function create_alias(note_id){
- $.post("/api/note/alias/",
- {
- "csrfmiddlewaretoken": CSRF_TOKEN,
- "name": $("#alias_input").val(),
- "note": note_id
- }
- ).done(function(){
- $("#alias_table").load(location.pathname+ " #alias_table");
- addMsg("Alias ajouté","success");
- })
- .fail(function(xhr, textStatus, error){
- errMsg(xhr.responseJSON);
- });
-}
- // on click of button "delete" , call the API
- function delete_button(button_id){
- $.ajax({
- url:"/api/note/alias/"+button_id+"/",
- method:"DELETE",
- headers: {"X-CSRFTOKEN": CSRF_TOKEN}
- })
- .done(function(){
- addMsg('Alias supprimé','success');
- $("#alias_table").load(location.pathname + " #alias_table");
- })
- .fail(function(xhr,textStatus, error){
- errMsg(xhr.responseJSON);
- });
- }
diff --git a/note_kfet/templates/registration/login.html b/note_kfet/templates/registration/login.html
index 027c629de3b3eb6fc9475d203f89c321b35b8538..87ccbd3ca23945440d2882a585c441bc4dba3c41 100644
--- a/note_kfet/templates/registration/login.html
+++ b/note_kfet/templates/registration/login.html
@@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
{% block contenttitle %}{% endblock %}
{% block extracss %}
-<link rel="stylesheet" href="{% static "registration/login.css" %}">
+<link rel="stylesheet" href="{% static "registration/css/login.css" %}">
{% endblock %}
{% block content %}