--- a/.hgignore Thu Aug 18 10:58:55 2016 +0200
+++ b/.hgignore Thu Aug 18 17:20:22 2016 +0200
@@ -4,11 +4,14 @@
^__pychache__/
^src/iconolab/settings/dev\.py$
+
^src/iconolab/static/iconolab/js/node_modules/
^src/iconolab/static/iconolab/js/iconolab-bundle/node_modules/
^src/iconolab/static/iconolab/js/iconolab-bundle/dist/
\.orig$
+^src_js/*
+
^web/*
^\.pydevproject$
^\.project$
--- a/src/iconolab/settings/__init__.py Thu Aug 18 10:58:55 2016 +0200
+++ b/src/iconolab/settings/__init__.py Thu Aug 18 17:20:22 2016 +0200
@@ -15,8 +15,9 @@
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-STATIC_ROOT = os.path.join(BASE_DIR, '../../web/static/site')
-MEDIA_ROOT = os.path.join(BASE_DIR, '../../web/media')
+STATIC_ROOT = os.path.abspath(os.path.join(BASE_DIR, '../../web/static/site'))
+MEDIA_ROOT = os.path.abspath(os.path.join(BASE_DIR, '../../web/media'))
+
STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'static'),
os.path.join(BASE_DIR, 'media'),
--- a/src/iconolab/static/iconolab/js/iconolab-bundle/src/components/taglist/template.html Thu Aug 18 10:58:55 2016 +0200
+++ b/src/iconolab/static/iconolab/js/iconolab-bundle/src/components/taglist/template.html Thu Aug 18 17:20:22 2016 +0200
@@ -18,8 +18,8 @@
<ul class="list-inline" v-show="readOnly">
<li v-for="(tag, index) in tags">
<i class="fa fa-tag"></i> <span class="label label-info">{{ tag.tag_label }}</span>
- | précision <span class="badge">{{ tag.accuracy }}</span>
- | pertinence <span class="badge">{{ tag.relevancy }}</span>
+ | Fiabilité <span class="badge">{{ tag.accuracy }}</span>
+ | Pertinence <span class="badge">{{ tag.relevancy }}</span>
</li>
</ul>
</div>
--- a/src/iconolab/templates/search/indexes/iconolab/annotation_text.txt Thu Aug 18 10:58:55 2016 +0200
+++ b/src/iconolab/templates/search/indexes/iconolab/annotation_text.txt Thu Aug 18 17:20:22 2016 +0200
@@ -3,5 +3,3 @@
{{ object.current_revision.description }}
{{ object.tags }}
-
-samedi
\ No newline at end of file
--- a/src/iconolab/urls.py Thu Aug 18 10:58:55 2016 +0200
+++ b/src/iconolab/urls.py Thu Aug 18 17:20:22 2016 +0200
@@ -15,6 +15,7 @@
"""
from django.core.urlresolvers import reverse_lazy
from django.conf.urls import url, include
+
from django.contrib import admin
from django import views as django_views
from iconolab import views
@@ -62,3 +63,5 @@
urlpatterns += staticfiles_urlpatterns()
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+#static url
+urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)