Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
Note Kfet 2015 django
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
BDE
Note Kfet 2015 django
Commits
1ba32132
Commit
1ba32132
authored
Jun 23, 2017
by
Praibait
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.crans.org/bde/note-kfet-2015-django
parents
c50fac35
401910e5
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
28 deletions
+27
-28
note/templates/note/activite_gestion.html
note/templates/note/activite_gestion.html
+2
-2
note/templates/note/activite_modifier.html
note/templates/note/activite_modifier.html
+2
-2
note/templates/note/activites.html
note/templates/note/activites.html
+2
-2
static/js/custom/consos_base.js
static/js/custom/consos_base.js
+6
-6
static/js/custom/liste_dynamique_quick.js
static/js/custom/liste_dynamique_quick.js
+4
-4
static/js/custom/tabs.js
static/js/custom/tabs.js
+1
-1
static/js/custom/toggle_transactions.js
static/js/custom/toggle_transactions.js
+10
-11
No files found.
note/templates/note/activite_gestion.html
View file @
1ba32132
...
...
@@ -7,8 +7,8 @@
<li
role=
"presentation"
{%
if
not
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/"
>
{% trans "Activités" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}mes_activites/"
>
{% trans "Mes activités" %}
</a></h5></li>
{% if hasadmin %}
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></h5></li>
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités passées" %}
</a></li>
<li
role=
"presentation"
{%
if
isadmin
and
not
isold
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></h5></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>
{% endif %}
{% endblock %}
...
...
note/templates/note/activite_modifier.html
View file @
1ba32132
...
...
@@ -6,8 +6,8 @@
<li
role=
"presentation"
{%
if
not
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/"
>
{% trans "Activités" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}mes_activites/"
>
{% trans "Mes activités" %}
</a></li>
{% if hasadmin %}
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></li>
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités Passées" %}
</a></li>
<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>
{% endif %}
{% endblock %}
...
...
note/templates/note/activites.html
View file @
1ba32132
...
...
@@ -7,8 +7,8 @@
<li
role=
"presentation"
{%
if
not
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/"
>
{% trans "Activités" %}
</a></li>
<li
role=
"presentation"
><a
href=
"{{ NOTE_ROOT_URL }}mes_activites/"
>
{% trans "Mes activités" %}
</a></li>
{% if hasadmin %}
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/"
>
{% trans "Administration" %}
</a></li>
<li
role=
"presentation"
{%
if
isadmin
%}
class=
"active"
{%
endif
%}
><a
href=
"{{ NOTE_ROOT_URL }}activites/admin/old"
>
{% trans "Activités Passées" %}
</a></li>
<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>
{% endif %}
{% endblock %}
...
...
static/js/custom/consos_base.js
View file @
1ba32132
static/js/custom/liste_dynamique_quick.js
View file @
1ba32132
static/js/custom/tabs.js
View file @
1ba32132
static/js/custom/toggle_transactions.js
View file @
1ba32132
...
...
@@ -32,8 +32,7 @@ function validedevalide(button) {
xhr
.
onreadystatechange
=
(
function
()
{
if
(
xhr
.
readyState
==
XMLHttpRequest
.
DONE
)
{
// Quand la requête est terminée
if
(
xhr
.
status
==
200
||
xhr
.
status
==
0
)
{
// Si tout s'est bien passé
var
rep
=
JSON
.
parse
(
xhr
.
responseText
);
// On parse le retour
rep
=
JSON
.
parse
(
xhr
.
responseText
);
// On parse le retour
var
msg
=
rep
[
"
msg
"
],
retcode
=
rep
[
"
retcode
"
],
errmsg
=
rep
[
"
errmsg
"
];
// On récupère les données
if
(
retcode
==
0
)
{
// Si le serveur a réussi à (dé)valider la transation
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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