Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Maxime Bombar
Note Kfet 2015 django
Commits
4cf44a95
Commit
4cf44a95
authored
Apr 11, 2018
by
Praibait
Browse files
On affiche le pseudo avec aka et non plus entre parenthèses.
parent
287ace29
Changes
5
Hide whitespace changes
Inline
Side-by-side
note/templates/note/activite_gestion.html
View file @
4cf44a95
...
...
@@ -9,6 +9,7 @@
{% if hasadmin %}
<li
role=
"presentation"
{%
if
hasadmin
and
not
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></h5></li>
<li
role=
"presentation"
{%
if
hasadmin
and
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités passées" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}pot_gestion/"
>
{% trans "Gestion des pots" %}
</a></li>
{% endif %}
{% endblock %}
...
...
note/templates/note/activite_modifier.html
View file @
4cf44a95
...
...
@@ -8,6 +8,7 @@
{% if hasadmin %}
<li
role=
"presentation"
{%
if
hasadmin
and
not
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></li>
<li
role=
"presentation"
{%
if
hasadmin
and
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités Passées" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}pot_gestion/"
>
{% trans "Gestion des pots" %}
</a></li>
{% endif %}
{% endblock %}
...
...
note/templates/note/activites.html
View file @
4cf44a95
...
...
@@ -10,7 +10,7 @@
<li
role=
"presentation"
{%
if
isadmin
and
not
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></li>
<li
role=
"presentation"
{%
if
isadmin
and
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités Passées" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}pot_gestion/"
>
{% trans "Gestion des pots" %}
</a></li>
{% endif %}
{% endif %}
{% endblock %}
{% block content %}
...
...
note/templates/note/invitation.html
View file @
4cf44a95
...
...
@@ -48,6 +48,7 @@ function put_note(itself, affiche, idbde, _, __, ___) {
{% if hasadmin %}
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités passées" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}pot_gestion/"
>
{% trans "Gestion des pots" %}
</a></li>
{% endif %}
{% endblock %}
...
...
static/js/custom/liste_dynamique_pot.js
View file @
4cf44a95
...
...
@@ -77,7 +77,7 @@ function createField(table_line, content, type, highlight, colonne, classNeg) {
content
=
""
;
}
if
((
highlight
==
null
)
||
(
highlight_fields
.
indexOf
(
colonne
)
==
-
1
))
{
caze
.
appendChild
(
document
.
createTextNode
(
content
))
;
caze
.
innerHTML
=
content
;
}
else
{
var
r
=
new
RegExp
(
escapeRegExp
(
highlight
),
"
ig
"
);
...
...
@@ -164,7 +164,7 @@ function readDataPot(oData, asked) {
profil
[
"
solde
"
]
=
(
profil
[
"
solde
"
]
/
100
)
+
"
€
"
;
if
(
profil
[
"
was
"
]
&&
profil
[
"
was
"
]
!=
"
pseudo
"
)
{
profil
[
"
pseudo
"
]
=
profil
[
"
terme
"
]
+
"
(
"
+
profil
[
"
pseudo
"
]
+
"
)
"
;
profil
[
"
pseudo
"
]
=
profil
[
"
terme
"
]
+
"
<i>aka</i>
"
+
profil
[
"
pseudo
"
]
;
}
profil
[
"
type
"
]
=
{
"
personne
"
:
"
Adhérent
"
,
"
club
"
:
"
Club
"
,
"
invite
"
:
"
Invité
"
}[
profil
[
"
type
"
]];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment