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
adae04de
Commit
adae04de
authored
Jun 11, 2018
by
M. Chardon
Browse files
maj lib javascript et Django
optimisation et debuggage ADIM avec sonar
parent
ed0da126
Changes
29
Hide whitespace changes
Inline
Side-by-side
adim_project/adim_project/settings/base.py
View file @
adae04de
...
...
@@ -36,9 +36,7 @@ except ImportError:
# ..... MANAGEMENT
DEBUG
=
False
ALLOWED_HOSTS
=
[]
ADMINS
=
(
(
"Admin Riset"
,
'riset-admin@unil.ch'
)
)
ADMINS
=
(
"Admin Riset"
,
'riset-admin@unil.ch'
)
MANAGERS
=
ADMINS
MIDDLEWARE_CLASSES
=
(
...
...
@@ -176,7 +174,6 @@ MIDDLEWARE_CLASSES.insert(
)
MIDDLEWARE_CLASSES
+=
(
'corsheaders.middleware.CorsMiddleware'
,
)
CORS_ORIGIN_ALLOW_ALL
=
True
# CORS_URLS_REGEX = r'^.*/api/.*$'
# ..... ADIM
...
...
adim_project/adim_project/settings/local.py
View file @
adae04de
...
...
@@ -32,4 +32,4 @@ SENDFILE_BACKEND = 'sendfile.backends.development'
ADIM_PROD
=
False
ADIM_DEBUG_JS
=
True
INTERNAL_IPS
=
(
'127.0.0.1'
,
'130.223.159.72'
)
INTERNAL_IPS
=
(
'127.0.0.1'
)
adim_project/templates/adim/annotation.html
View file @
adae04de
...
...
@@ -152,7 +152,6 @@ console.time("main app loading");
{% block main_container %}
{{ block.super }}
{#
<img
src=
'{{ anobj.image_url|default:"./image/" }}'
crossorigin=
"anonymous"
id=
"adim-src-image"
style=
"display:none;"
>
#}
<div
class=
"modal"
id=
"dlg-export-svg-info"
data-backdrop=
"static"
data-keyboard=
"false"
tabindex=
"-1"
role=
"dialog"
>
<div
class=
"modal-dialog modal-sm"
role=
"document"
>
...
...
adim_project/templates/adim/aom-modal.inc.html
View file @
adae04de
...
...
@@ -20,7 +20,7 @@
<h5>
Propriétés de l'image
</h5>
</div>
<div
class=
"aom-info-panel-body"
>
<img
class=
"aom-image-thumb"
<img
class=
"aom-image-thumb"
alt=
"aperçu"
src=
"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
>
...
...
adim_project/templates/adim/base_annotation.html
View file @
adae04de
...
...
@@ -6,8 +6,6 @@
{% block navbar_right_content %}
<div
class=
"navbar-text navbar-separator"
>
</div>
{% block navbar_image_mgmt %}
<li
class=
"nav-item"
>
<form
class=
"form-inline fileinput-button"
style=
"margin-top: 5px;margin-right: 5px;"
>
...
...
adim_project/templates/adim/home.html
View file @
adae04de
...
...
@@ -39,7 +39,7 @@
<div
class=
"row"
>
<div
class=
"col-sm-12"
>
<div
id=
"home-image"
>
<img
src=
"data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
>
<img
alt=
"ADIM"
src=
"data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
>
</div>
</div>
</div>
...
...
@@ -107,8 +107,6 @@
</div>
</div>
{#
<iframe
sandbox=
"allow-same-origin"
src=
"{% url "
shib-login
"
%}"
width=
"0"
height=
"0"
></iframe>
#}
{% include "adim/_about-modal.inc.html" %}
{% endblock main_content %}
...
...
adim_project/templates/base.html
View file @
adae04de
...
...
@@ -31,7 +31,8 @@
</button>
<div
class=
"collapse navbar-collapse"
id=
"collapsibleNavbar"
>
{% block navbar_content %}
<ul
class=
"nav navbar-nav ml-auto"
>
<div
class=
"navbar-text navbar-separator ml-auto"
>
</div>
<ul
class=
"nav navbar-nav"
>
{% block navbar_right_content %}
{% if user.is_authenticated %}
<li
class=
"nav-item dropdown"
>
...
...
requirements/base.txt
View file @
adae04de
Django==1.11.1
1
Django==1.11.1
3
django-autoslug==1.9.3
django-eav==0.9.4.post1
django-jsonfield==1.0.1
django-sendfile==0.3.11
djangorestframework==3.
7.7
djangorestframework==3.
8.2
drf-nested-routers==0.90.2
MySQL-python
Pillow==5.
0
.0
python-ldap==3.
0
.0
Pillow==5.
1
.0
python-ldap==3.
1
.0
python-memcached==1.59
django-cors-headers
\ No newline at end of file
requirements/dev.txt
View file @
adae04de
...
...
@@ -2,4 +2,4 @@
django-guardian==1.4.9
Pygments==2.2.0
Werkzeug==0.14.1
django-extensions==2.0.
6
django-extensions==2.0.
7
Prev
1
2
Next
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