Gitlab CSE Unil
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
M. Chardon
ADIM
Commits
a0f148cc
Commit
a0f148cc
authored
May 26, 2015
by
Julien Furrer
Browse files
Changed sharing mode icon for TTP services
parent
8628233a
Changes
2
Hide whitespace changes
Inline
Side-by-side
adim_project/adim_app/views.py
View file @
a0f148cc
...
@@ -52,7 +52,6 @@ def handle_404(request):
...
@@ -52,7 +52,6 @@ def handle_404(request):
else
:
else
:
return
HttpResponseRedirect
(
reverse
(
'adim_app:home'
))
return
HttpResponseRedirect
(
reverse
(
'adim_app:home'
))
@
login_required
()
@
login_required
()
def
essai
(
request
):
def
essai
(
request
):
"""
"""
...
@@ -309,8 +308,6 @@ def upload_file(request, anobj_uuid=None):
...
@@ -309,8 +308,6 @@ def upload_file(request, anobj_uuid=None):
else
:
else
:
response_data
[
'error'
]
=
"invalid"
response_data
[
'error'
]
=
"invalid"
print
(
"#"
*
80
,
"
\n
"
,
request
.
META
.
get
(
'HTTP_ACCEPT'
,
''
),
"#"
*
80
)
if
'application/json'
in
request
.
META
.
get
(
'HTTP_ACCEPT'
,
''
):
if
'application/json'
in
request
.
META
.
get
(
'HTTP_ACCEPT'
,
''
):
return
HttpResponse
(
json
.
dumps
(
response_data
),
content_type
=
response_type
)
return
HttpResponse
(
json
.
dumps
(
response_data
),
content_type
=
response_type
)
else
:
else
:
...
...
adim_project/templates/adim/base_annotation.html
View file @
a0f148cc
...
@@ -220,7 +220,7 @@
...
@@ -220,7 +220,7 @@
{
#
<%
if
(
sharing_mode
>
15
)
{
%><
span
class
=
"
adim-icon-ttp-moodle text-success aom-item-sh-status
"
title
=
"
Partagé via moodle
"
><
/span><% } %>#
}
{
#
<%
if
(
sharing_mode
>
15
)
{
%><
span
class
=
"
adim-icon-ttp-moodle text-success aom-item-sh-status
"
title
=
"
Partagé via moodle
"
><
/span><% } %>#
}
<%
switch
(
true
)
{
case
0
<
sharing_mode
&&
sharing_mode
<
16
:
%><
span
class
=
"
icon-share-alt text-success aom-item-sh-status
"
title
=
"
Partagé
"
><
/span><% break %
>
<%
switch
(
true
)
{
case
0
<
sharing_mode
&&
sharing_mode
<
16
:
%><
span
class
=
"
icon-share-alt text-success aom-item-sh-status
"
title
=
"
Partagé
"
><
/span><% break %
>
<%
case
sharing_mode
==
16
:
%><
span
class
=
"
adim-icon-ttp-moodle text-success aom-item-sh-status
"
title
=
"
Partagé via moodle
"
><
/span><% break %
>
<%
case
sharing_mode
==
16
:
%><
span
class
=
"
adim-icon-ttp-moodle text-success aom-item-sh-status
"
title
=
"
Partagé via moodle
"
><
/span><% break %
>
<%
case
sharing_mode
==
32
:
%><
span
class
=
"
adim-icon-ttp-moodle
text-success aom-item-sh-status
"
title
=
"
Partagé via
moodle
"
><
/span><% break %
>
<%
case
sharing_mode
==
32
:
%><
span
class
=
"
icon-bowl
text-success aom-item-sh-status
"
title
=
"
Partagé via
yin-zhen
"
><
/span><% break %
>
<%
case
sharing_mode
>
0
:
%><
span
class
=
"
icon-cloudalt text-success aom-item-sh-status
"
title
=
"
Partagé via service externe
"
><
/span
>
<%
case
sharing_mode
>
0
:
%><
span
class
=
"
icon-cloudalt text-success aom-item-sh-status
"
title
=
"
Partagé via service externe
"
><
/span
>
<%
}
%>
<%
}
%>
...
...
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