Merge branch 'develop'

1 files changed, 141 insertions, 127 deletions

diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index fbd1d8d86..e76ef5dc7 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -13,242 +13,242 @@ msgstr ""
 msgid "Point"
 msgstr ""
 
-#: admin.py:51 models.py:410
+#: admin.py:51 models.py:427
 msgid "Multi polygon"
 msgstr ""
 
-#: forms.py:47 forms.py:53 models.py:352 wizards.py:81
+#: forms.py:48 forms.py:54 models.py:369 wizards.py:81
 msgid "Operation"
 msgstr ""
 
-#: forms.py:48
+#: forms.py:49
 msgid "Context record - 010 - Operation choice"
 msgstr ""
 
-#: forms.py:63
+#: forms.py:64
 msgid "Context record - 001 - Search"
 msgstr ""
 
-#: forms.py:66
+#: forms.py:67
 msgid "Full text search"
 msgstr ""
 
-#: forms.py:69 forms.py:155 models.py:357 models.py:737
+#: forms.py:70 forms.py:156 forms.py:386 models.py:374 models.py:754
 msgid "ID"
 msgstr ""
 
-#: forms.py:75
+#: forms.py:76
 msgid "Code PATRIARCHE"
 msgstr ""
 
-#: forms.py:76
+#: forms.py:77
 msgid "Operation's year"
 msgstr ""
 
-#: forms.py:78
+#: forms.py:79
 msgid "Operation's number (index by year)"
 msgstr ""
 
-#: forms.py:80 models.py:355
+#: forms.py:81 models.py:372
 msgid "Archaeological site"
 msgstr ""
 
-#: forms.py:86
+#: forms.py:87
 msgid "Search within related operations"
 msgstr ""
 
-#: forms.py:87 forms.py:288 models.py:66
+#: forms.py:88 forms.py:289 models.py:66
 msgid "Period"
 msgstr ""
 
-#: forms.py:88
+#: forms.py:89
 msgid "Unit type"
 msgstr ""
 
-#: forms.py:89 forms.py:148 models.py:231 models.py:232 models.py:347
-#: models.py:739
+#: forms.py:90 forms.py:149 models.py:248 models.py:249 models.py:364
+#: models.py:756
 msgid "Parcel"
 msgstr ""
 
-#: forms.py:91
+#: forms.py:92
 msgid "Search within relations"
 msgstr ""
 
-#: forms.py:115 views.py:95
+#: forms.py:116 views.py:99
 msgid "Context record search"
 msgstr ""
 
-#: forms.py:130
+#: forms.py:131
 msgid "You should at least select one context record."
 msgstr ""
 
-#: forms.py:136
+#: forms.py:137
 msgid "General"
 msgstr ""
 
-#: forms.py:137
+#: forms.py:138
 msgid "Context record - 020 - General"
 msgstr ""
 
-#: forms.py:149 models.py:228 models.py:229 models.py:350
+#: forms.py:150 forms.py:380 models.py:245 models.py:246 models.py:367
 msgid "Town"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:153 forms.py:383
 msgid "Only the items associated to the operation can be selected."
 msgstr ""
 
-#: forms.py:157 models.py:358 models.py:740
+#: forms.py:158 forms.py:388 models.py:396 models.py:755
+msgid "Context record type"
+msgstr ""
+
+#: forms.py:160 models.py:375 models.py:757
 #: templates/ishtar/sheet_contextrecord.html:45
 msgid "Description"
 msgstr ""
 
-#: forms.py:159 models.py:359
+#: forms.py:162 models.py:376
 msgid "General comment"
 msgstr ""
 
-#: forms.py:162 models.py:405
+#: forms.py:165 models.py:422
 msgid "Excavation technique"
 msgstr ""
 
-#: forms.py:163 models.py:363
+#: forms.py:166 models.py:380
 msgid "Length (m)"
 msgstr ""
 
-#: forms.py:164 models.py:364
+#: forms.py:167 models.py:381
 msgid "Width (m)"
 msgstr ""
 
-#: forms.py:165 models.py:365
+#: forms.py:168 models.py:382
 msgid "Thickness (m)"
 msgstr ""
 
-#: forms.py:166 models.py:367
+#: forms.py:169 models.py:384
 msgid "Diameter (m)"
 msgstr ""
 
-#: forms.py:167 models.py:368
+#: forms.py:170 models.py:385
 msgid "Depth (m)"
 msgstr ""
 
-#: forms.py:169 models.py:370
+#: forms.py:172 models.py:387
 msgid "Depth of appearance (m)"
 msgstr ""
 
-#: forms.py:170 models.py:379 models.py:738
-msgid "Context record type"
-msgstr ""
-
-#: forms.py:172 models.py:360
+#: forms.py:173 models.py:377
 msgid "Opening date"
 msgstr ""
 
-#: forms.py:174 models.py:362 templates/ishtar/sheet_contextrecord.html:140
+#: forms.py:175 models.py:379 templates/ishtar/sheet_contextrecord.html:140
 msgid "Closing date"
 msgstr ""
 
-#: forms.py:177
+#: forms.py:178
 msgid "Documentation"
 msgstr ""
 
-#: forms.py:180 models.py:372
+#: forms.py:181 models.py:389
 msgid "Location"
 msgstr ""
 
-#: forms.py:273
+#: forms.py:274
 msgid "This ID already exists for this operation."
 msgstr ""
 
-#: forms.py:277
+#: forms.py:278
 msgid "You have to choose a town or a parcel."
 msgstr ""
 
-#: forms.py:283 forms.py:304 models.py:77
+#: forms.py:284 forms.py:305 models.py:77
 msgid "Dating"
 msgstr ""
 
-#: forms.py:289 models.py:67
+#: forms.py:290 models.py:67
 msgid "Start date"
 msgstr ""
 
-#: forms.py:290 models.py:68
+#: forms.py:291 models.py:68
 msgid "End date"
 msgstr ""
 
-#: forms.py:291 models.py:71
+#: forms.py:292 models.py:71
 msgid "Quality"
 msgstr ""
 
-#: forms.py:292 models.py:45 models.py:69
+#: forms.py:293 models.py:45 models.py:69
 msgid "Dating type"
 msgstr ""
 
-#: forms.py:305
+#: forms.py:306
 msgid "Context record - 030 - Dating"
 msgstr ""
 
-#: forms.py:315 ishtar_menu.py:29 models.py:91
+#: forms.py:316 ishtar_menu.py:29 models.py:108 views.py:185
 msgid "Context record"
 msgstr ""
 
-#: forms.py:331
+#: forms.py:332
 msgid "Relations"
 msgstr ""
 
-#: forms.py:332
+#: forms.py:333
 msgid "Context record - 050 - Relations"
 msgstr ""
 
-#: forms.py:337 forms.py:348 models.py:382
+#: forms.py:338 forms.py:349 models.py:399
 #: templates/ishtar/sheet_contextrecord.html:64
 msgid "Interpretation"
 msgstr ""
 
-#: forms.py:338
+#: forms.py:339
 msgid "Context record - 040 - Interpretation"
 msgstr ""
 
-#: forms.py:344
+#: forms.py:345
 msgid "Comments on dating"
 msgstr ""
 
-#: forms.py:346 models.py:381
+#: forms.py:347 models.py:398
 msgid "Filling"
 msgstr ""
 
-#: forms.py:350 models.py:402
+#: forms.py:351 models.py:419
 msgid "Activity"
 msgstr ""
 
-#: forms.py:352 models.py:400
+#: forms.py:353 models.py:417
 msgid "Identification"
 msgstr ""
 
-#: forms.py:354 models.py:385
+#: forms.py:355 models.py:402
 msgid "TAQ"
 msgstr ""
 
-#: forms.py:355 models.py:389
+#: forms.py:356 models.py:406
 msgid "Estimated TAQ"
 msgstr ""
 
-#: forms.py:357 models.py:392
+#: forms.py:358 models.py:409
 msgid "TPQ"
 msgstr ""
 
-#: forms.py:358 models.py:396
+#: forms.py:359 models.py:413
 msgid "Estimated TPQ"
 msgstr ""
 
-#: forms.py:368
+#: forms.py:369
 msgid "Operation search"
 msgstr ""
 
-#: forms.py:370
+#: forms.py:371
 msgid "You should select an operation."
 msgstr ""
 
-#: forms.py:375
+#: forms.py:376
 msgid "Would you like to delete this context record?"
 msgstr ""
 
@@ -288,263 +288,273 @@ msgstr ""
 msgid "Datings"
 msgstr ""
 
-#: models.py:98
+#: models.py:115
 msgid "Find"
 msgstr ""
 
-#: models.py:117 models.py:136 models.py:152
+#: models.py:134 models.py:153 models.py:169
 msgid "Order"
 msgstr ""
 
-#: models.py:119
+#: models.py:136
 msgid "Parent context record type"
 msgstr ""
 
-#: models.py:123
+#: models.py:140
 msgid "Context record Type"
 msgstr ""
 
-#: models.py:124
+#: models.py:141
 msgid "Context record Types"
 msgstr ""
 
-#: models.py:139
+#: models.py:156
 msgid "Activity Type"
 msgstr ""
 
-#: models.py:140
+#: models.py:157
 msgid "Activity Types"
 msgstr ""
 
-#: models.py:155
+#: models.py:172
 msgid "Identification Type"
 msgstr ""
 
-#: models.py:156
+#: models.py:173
 msgid "Identification Types"
 msgstr ""
 
-#: models.py:169
+#: models.py:186
 msgid "Excavation technique type"
 msgstr ""
 
-#: models.py:170
+#: models.py:187
 msgid "Excavation technique types"
 msgstr ""
 
-#: models.py:180
+#: models.py:197
 msgid "Documentation type"
 msgstr ""
 
-#: models.py:181
+#: models.py:198
 msgid "Documentation types"
 msgstr ""
 
-#: models.py:222 models.py:741
+#: models.py:239 models.py:758
 msgid "Periods"
 msgstr ""
 
-#: models.py:223
+#: models.py:240
 msgid "Datings (period)"
 msgstr ""
 
-#: models.py:224
+#: models.py:241
 msgid "Related context records"
 msgstr ""
 
-#: models.py:225
+#: models.py:242
 msgid "Operation (Patriarche code)"
 msgstr ""
 
-#: models.py:226
+#: models.py:243
 msgid "Operation (name)"
 msgstr ""
 
-#: models.py:227
+#: models.py:244
 msgid "Parcel (external ID)"
 msgstr ""
 
-#: models.py:230
+#: models.py:247
 msgid "Parcel (year)"
 msgstr ""
 
-#: models.py:265
+#: models.py:282
 msgctxt "key for text search"
 msgid "id"
 msgstr ""
 
-#: models.py:269
+#: models.py:286
 msgctxt "key for text search"
 msgid "town"
 msgstr ""
 
-#: models.py:273
+#: models.py:290
 msgctxt "key for text search"
 msgid "operation-year"
 msgstr ""
 
-#: models.py:277
+#: models.py:294
 msgctxt "key for text search"
 msgid "patriarche"
 msgstr ""
 
-#: models.py:281
+#: models.py:298
 msgctxt "key for text search"
 msgid "operation-code"
 msgstr ""
 
-#: models.py:285 models.py:327
+#: models.py:302 models.py:344
 msgctxt "key for text search"
 msgid "operation"
 msgstr ""
 
-#: models.py:289 models.py:330
+#: models.py:306 models.py:347
 msgctxt "key for text search"
 msgid "site"
 msgstr ""
 
-#: models.py:293
+#: models.py:310
 msgctxt "key for text search"
 msgid "operation-relation-type"
 msgstr ""
 
-#: models.py:297
+#: models.py:314
 msgctxt "key for text search"
 msgid "period"
 msgstr ""
 
-#: models.py:301
+#: models.py:318
 msgctxt "key for text search"
 msgid "unit-type"
 msgstr ""
 
-#: models.py:305
+#: models.py:322
 msgctxt "key for text search"
 msgid "parcel"
 msgstr ""
 
-#: models.py:309
+#: models.py:326
 msgctxt "key for text search"
 msgid "record-relation-type"
 msgstr ""
 
-#: models.py:343
+#: models.py:360
 msgid "External ID"
 msgstr ""
 
-#: models.py:345
+#: models.py:362
 msgid "External ID is set automatically"
 msgstr ""
 
-#: models.py:373
+#: models.py:390
 msgid "A short description of the location of the context record"
 msgstr ""
 
-#: models.py:377
+#: models.py:394
 msgid "Comment on datings"
 msgstr ""
 
-#: models.py:386
+#: models.py:403
 msgid ""
 "\"Terminus Ante Quem\" the context record can't have been created after this "
 "date"
 msgstr ""
 
-#: models.py:390
+#: models.py:407
 msgid "Estimation of a \"Terminus Ante Quem\""
 msgstr ""
 
-#: models.py:393
+#: models.py:410
 msgid ""
 "\"Terminus Post Quem\" the context record can't have been created before "
 "this date"
 msgstr ""
 
-#: models.py:397
+#: models.py:414
 msgid "Estimation of a \"Terminus Post Quem\""
 msgstr ""
 
-#: models.py:408
+#: models.py:425
 msgid "Point (2D)"
 msgstr ""
 
-#: models.py:409
+#: models.py:426
 msgid "Point (3D)"
 msgstr ""
 
-#: models.py:413
+#: models.py:430
 msgid "Documents"
 msgstr ""
 
-#: models.py:415
+#: models.py:432
 msgid "Cached name"
 msgstr ""
 
-#: models.py:419 models.py:420 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:436 models.py:437 templates/ishtar/sheet_contextrecord.html:4
 msgid "Context Record"
 msgstr ""
 
-#: models.py:439
+#: models.py:456
 msgctxt "short"
 msgid "Context record"
 msgstr ""
 
-#: models.py:668 models.py:691 models.py:736
+#: models.py:685 models.py:708 models.py:753
 msgid "Relation type"
 msgstr ""
 
-#: models.py:669
+#: models.py:686
 msgid "Relation types"
 msgstr ""
 
-#: models.py:686
+#: models.py:703
 msgid "ID (left)"
 msgstr ""
 
-#: models.py:687
+#: models.py:704
 msgid "Context record type (left)"
 msgstr ""
 
-#: models.py:688
+#: models.py:705
 msgid "Parcel (left)"
 msgstr ""
 
-#: models.py:689
+#: models.py:706
 msgid "Description (left)"
 msgstr ""
 
-#: models.py:690
+#: models.py:707
 msgid "Periods (left)"
 msgstr ""
 
-#: models.py:692
+#: models.py:709
 msgid "ID (right)"
 msgstr ""
 
-#: models.py:693
+#: models.py:710
 msgid "Context record type (right)"
 msgstr ""
 
-#: models.py:694
+#: models.py:711
 msgid "Parcel (right)"
 msgstr ""
 
-#: models.py:695
+#: models.py:712
 msgid "Description (right)"
 msgstr ""
 
-#: models.py:696
+#: models.py:713
 msgid "Periods (right)"
 msgstr ""
 
-#: models.py:705
+#: models.py:722
 msgid "Record relation"
 msgstr ""
 
-#: models.py:706
+#: models.py:723
 msgid "Record relations"
 msgstr ""
 
+#: templates/ishtar/forms/qa_operation_contextrecord.html:11
+msgid "Quick add context record"
+msgstr ""
+
+#: templates/ishtar/forms/qa_operation_contextrecord.html:25
+msgid ""
+"To put more information to the context record use the full form on the top "
+"menu: \\"
+msgstr ""
+
 #: templates/ishtar/sheet_contextrecord.html:75
 msgid "Datations"
 msgstr ""
@@ -613,18 +623,22 @@ msgstr ""
 msgid "Documents from associated finds"
 msgstr ""
 
-#: views.py:109
+#: views.py:113
 msgid "New context record"
 msgstr ""
 
-#: views.py:125
+#: views.py:129
 msgid "Context record modification"
 msgstr ""
 
-#: views.py:136
+#: views.py:140
 msgid "You don't have sufficient permissions to do this action."
 msgstr ""
 
-#: views.py:149
+#: views.py:153
 msgid "Context record deletion"
 msgstr ""
+
+#: views.py:190
+msgid "Add context record"
+msgstr ""