Merge branch 'master' into develop

Conflicts:
	version.py

4 files changed, 79 insertions, 47 deletions

diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 002f724cf..26a06d0b8 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -6,6 +6,7 @@
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
 # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
+# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
 msgid ""
 msgstr ""
 
@@ -274,7 +275,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: forms_common.py:222 views.py:149
+#: forms_common.py:222 views.py:157
 msgid "Organization search"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Surname"
 msgstr ""
 
-#: forms_common.py:341 forms_common.py:436 views.py:114
+#: forms_common.py:341 forms_common.py:436 views.py:122
 msgid "Person search"
 msgstr ""
 
@@ -526,7 +527,7 @@ msgstr ""
 msgid "Deletion"
 msgstr ""
 
-#: ishtar_menu.py:39 models.py:1338 views.py:1640
+#: ishtar_menu.py:39 models.py:1338 views.py:1648
 msgid "Global variables"
 msgstr ""
 
@@ -558,15 +559,15 @@ msgstr ""
 msgid "Imports"
 msgstr ""
 
-#: ishtar_menu.py:112 views.py:1648
+#: ishtar_menu.py:112 views.py:1656
 msgid "New import"
 msgstr ""
 
-#: ishtar_menu.py:116 views.py:1662
+#: ishtar_menu.py:116 views.py:1670
 msgid "Current imports"
 msgstr ""
 
-#: ishtar_menu.py:120 views.py:1701
+#: ishtar_menu.py:120 views.py:1709
 msgid "Old imports"
 msgstr ""
 
@@ -634,11 +635,11 @@ msgstr ""
 msgid "US dollar"
 msgstr ""
 
-#: models.py:1153 views.py:1438 views.py:1500
+#: models.py:1153 views.py:1446 views.py:1508
 msgid "Operations"
 msgstr ""
 
-#: models.py:1154 views.py:1440 views.py:1504
+#: models.py:1154 views.py:1448 views.py:1512
 msgid "Context records"
 msgstr ""
 
@@ -1037,11 +1038,11 @@ msgstr ""
 msgid "Importer - Targets"
 msgstr ""
 
-#: models.py:2133 views.py:570
+#: models.py:2133 views.py:578
 msgid "True"
 msgstr ""
 
-#: models.py:2134 views.py:572
+#: models.py:2134 views.py:580
 msgid "False"
 msgstr ""
 
@@ -1299,7 +1300,7 @@ msgstr ""
 msgid "Unarchive"
 msgstr ""
 
-#: models.py:2428 widgets.py:184 templates/ishtar/form_delete.html:11
+#: models.py:2428 widgets.py:198 templates/ishtar/form_delete.html:11
 msgid "Delete"
 msgstr ""
 
@@ -1519,128 +1520,140 @@ msgstr ""
 msgid "Load another random image?"
 msgstr ""
 
-#: views.py:121
-msgid "New person"
+#: views.py:96
+msgid ""
+"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask "
+"your admin to do it)."
+msgstr ""
+
+#: views.py:101
+msgid ""
+"The slug of your current profile is set to \"default\" change it on the "
+"administration page (or ask your admin to do it)."
 msgstr ""
 
 #: views.py:129
+msgid "New person"
+msgstr ""
+
+#: views.py:137
 msgid "Person modification"
 msgstr ""
 
-#: views.py:144
+#: views.py:152
 msgid "Person deletion"
 msgstr ""
 
-#: views.py:155
+#: views.py:163
 msgid "New organization"
 msgstr ""
 
-#: views.py:162
+#: views.py:170
 msgid "Organization modification"
 msgstr ""
 
-#: views.py:178
+#: views.py:186
 msgid "Organization deletion"
 msgstr ""
 
-#: views.py:185
+#: views.py:193
 msgid "Account management"
 msgstr ""
 
-#: views.py:191
+#: views.py:199
 msgid "Account deletion"
 msgstr ""
 
-#: views.py:253
+#: views.py:261
 msgid "Archaeological file"
 msgstr ""
 
-#: views.py:254
+#: views.py:262
 msgid "Operation"
 msgstr ""
 
-#: views.py:256
+#: views.py:264
 msgid "Context record"
 msgstr ""
 
-#: views.py:258
+#: views.py:266
 msgid "Find"
 msgstr ""
 
-#: views.py:260
+#: views.py:268
 msgid "Treatment request"
 msgstr ""
 
-#: views.py:261
+#: views.py:269
 msgid "Treatment"
 msgstr ""
 
-#: views.py:1376 views.py:1419
+#: views.py:1384 views.py:1427
 msgid "Operation not permitted."
 msgstr ""
 
-#: views.py:1378
+#: views.py:1386
 #, python-format
 msgid "New %s"
 msgstr ""
 
-#: views.py:1437 views.py:1496
+#: views.py:1445 views.py:1504
 msgid "Archaeological files"
 msgstr ""
 
-#: views.py:1442 views.py:1507
+#: views.py:1450 views.py:1515
 msgid "Finds"
 msgstr ""
 
-#: views.py:1444 views.py:1512
+#: views.py:1452 views.py:1520
 msgid "Treatment requests"
 msgstr ""
 
-#: views.py:1445 views.py:1518
+#: views.py:1453 views.py:1526
 msgid "Treatments"
 msgstr ""
 
-#: views.py:1715 templates/ishtar/import_list.html:47
+#: views.py:1723 templates/ishtar/import_list.html:47
 msgid "Link unmatched items"
 msgstr ""
 
-#: views.py:1730
+#: views.py:1738
 msgid "Delete import"
 msgstr ""
 
-#: views.py:1769
+#: views.py:1777
 msgid "Merge persons"
 msgstr ""
 
-#: views.py:1793
+#: views.py:1801
 msgid "Select the main person"
 msgstr ""
 
-#: views.py:1802
+#: views.py:1810
 msgid "Merge organization"
 msgstr ""
 
-#: views.py:1812
+#: views.py:1820
 msgid "Select the main organization"
 msgstr ""
 
-#: views.py:1852 views.py:1868
+#: views.py:1860 views.py:1876
 msgid "Corporation manager"
 msgstr ""
 
-#: widgets.py:313 widgets.py:420 widgets.py:535
+#: widgets.py:327 widgets.py:434 widgets.py:549
 msgid "Search..."
 msgstr ""
 
-#: widgets.py:724 templatetags/window_tables.py:96
+#: widgets.py:738 templatetags/window_tables.py:96
 msgid "No results"
 msgstr ""
 
-#: widgets.py:725 templatetags/window_tables.py:97
+#: widgets.py:739 templatetags/window_tables.py:97
 msgid "Loading..."
 msgstr ""
 
-#: widgets.py:726
+#: widgets.py:740
 msgid "Remove"
 msgstr ""
 
@@ -1727,19 +1740,19 @@ msgstr ""
 msgid ":"
 msgstr ""
 
-#: templates/base.html:123
+#: templates/base.html:128
 msgid "Processing..."
 msgstr ""
 
-#: templates/base.html:124
+#: templates/base.html:129
 msgid "This can be long."
 msgstr ""
 
-#: templates/base.html:125
+#: templates/base.html:130
 msgid "Time to take a coffee?"
 msgstr ""
 
-#: templates/base.html:126
+#: templates/base.html:131
 msgid "Time to take another coffee?"
 msgstr ""
 
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 0016ca0e5..468b6557e 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -1323,6 +1323,12 @@ p.alert{
     color:#D14;
 }
 
+ul.alert{
+    background-color: #FF9999;
+    padding: 0.5em 2em;
+    text-align: left;
+}
+
 p.info-box{
     color: #1c94c4;
 }
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 6b4b715af..75e0e3740 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -109,6 +109,11 @@
     </ul>
     </div>
     <div id="content">
+        {% if warnings %}
+        <ul class="alert">{% for warning in warnings %}
+            <li>{{warning}}</li>{% endfor %}
+        </ul>
+        {% endif %}
         {% block content %}{% endblock %}
     </div>
 
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 7a7c99953..be7c7b8e0 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -94,8 +94,16 @@ def index(request):
     """
     Main page
     """
-    dct = {}
+    dct = {'warnings': []}
+    if settings.PROJECT_SLUG == 'default':
+        dct['warnings'].append(_(
+            u"PROJECT_SLUG is set to \"default\" change it in your "
+            u"local_settings (or ask your admin to do it)."))
     profile = get_current_profile()
+    if profile.slug == 'default':
+        dct['warnings'].append(_(
+            u"The slug of your current profile is set to \"default\" change it "
+            u"on the administration page (or ask your admin to do it)."))
     image = get_random_item_image_link(request)
     if hasattr(profile, 'homepage') and profile.homepage:
         dct['homepage'] = markdown(profile.homepage)