Skip to content

Commit ab22c40

Browse files
bkisbkis
committed
Redesign content comment/notes semantics and integration
Closes #837
1 parent 03cfae4 commit ab22c40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1738
-1487
lines changed

‎Tekst-API/demo/contents.json

+3-56
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@
194194
"resource_id": { "$oid": "6641ce24affa6cb96bc85a55" },
195195
"resource_type": "images",
196196
"location_id": { "$oid": "664321104aa6341acd83fb05" },
197-
"comment": null,
198-
"notes": null,
199197
"files": [
200198
{
201199
"url": "https://upload.wikimedia.org/wikipedia/commons/c/c7/Fuchs%2C_du_hast_die_Gans_gestohlen_%281824%29.jpg",
@@ -223,8 +221,6 @@
223221
"resource_id": { "$oid": "6641d2bfaffa6cb96bc85a58" },
224222
"resource_type": "externalReferences",
225223
"location_id": { "$oid": "664321104aa6341acd83fb05" },
226-
"comment": null,
227-
"notes": null,
228224
"links": [
229225
{
230226
"url": "https://upload.wikimedia.org/score/o/k/oki67jic10ff1lnlz2s8fve28mcf0q6/oki67jic.midi",
@@ -249,8 +245,6 @@
249245
"resource_id": { "$oid": "6641d510affa6cb96bc85a5b" },
250246
"resource_type": "audio",
251247
"location_id": { "$oid": "664321104aa6341acd83fb05" },
252-
"comment": null,
253-
"notes": null,
254248
"files": [
255249
{
256250
"url": "https://archive.org/download/78_fuchs-du-hast-die-gans-gestohlen_gbia0534511a/Fuchs%20du%20hast%20die%20Gans%20gestohlen.mp3",
@@ -275,8 +269,6 @@
275269
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
276270
"resource_type": "plainText",
277271
"location_id": { "$oid": "654b825533ee5737b297f8e5" },
278-
"comment": null,
279-
"notes": null,
280272
"text": "Fox, you stole the goose,"
281273
},
282274
{
@@ -285,8 +277,6 @@
285277
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
286278
"resource_type": "plainText",
287279
"location_id": { "$oid": "654b825533ee5737b297f8e6" },
288-
"comment": null,
289-
"notes": null,
290280
"text": "|: Give it back! :|"
291281
},
292282
{
@@ -295,8 +285,6 @@
295285
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
296286
"resource_type": "plainText",
297287
"location_id": { "$oid": "654b825533ee5737b297f8e7" },
298-
"comment": null,
299-
"notes": null,
300288
"text": "|: Otherwise the hunter will get it,"
301289
},
302290
{
@@ -305,8 +293,6 @@
305293
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
306294
"resource_type": "plainText",
307295
"location_id": { "$oid": "654b825533ee5737b297f8e8" },
308-
"comment": null,
309-
"notes": null,
310296
"text": "with the rifle. :|"
311297
},
312298
{
@@ -315,8 +301,6 @@
315301
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
316302
"resource_type": "plainText",
317303
"location_id": { "$oid": "654b825533ee5737b297f8eb" },
318-
"comment": null,
319-
"notes": null,
320304
"text": "|: shoots the buckshot at you, :|"
321305
},
322306
{
@@ -325,8 +309,6 @@
325309
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
326310
"resource_type": "plainText",
327311
"location_id": { "$oid": "654b825533ee5737b297f8ec" },
328-
"comment": null,
329-
"notes": null,
330312
"text": "|: so that the ink will stain you red"
331313
},
332314
{
@@ -335,8 +317,6 @@
335317
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
336318
"resource_type": "plainText",
337319
"location_id": { "$oid": "654b825533ee5737b297f8ed" },
338-
"comment": null,
339-
"notes": null,
340320
"text": "and then you are dead. :|"
341321
},
342322
{
@@ -345,8 +325,6 @@
345325
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
346326
"resource_type": "plainText",
347327
"location_id": { "$oid": "654b825533ee5737b297f8ef" },
348-
"comment": null,
349-
"notes": null,
350328
"text": "Dear little vixen, take it from me,"
351329
},
352330
{
@@ -355,8 +333,6 @@
355333
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
356334
"resource_type": "plainText",
357335
"location_id": { "$oid": "654b825533ee5737b297f8f0" },
358-
"comment": null,
359-
"notes": null,
360336
"text": "|: Don't be a thief; :|"
361337
},
362338
{
@@ -365,8 +341,6 @@
365341
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
366342
"resource_type": "plainText",
367343
"location_id": { "$oid": "654b825533ee5737b297f8f1" },
368-
"comment": null,
369-
"notes": null,
370344
"text": "|: You don't need roast goose,"
371345
},
372346
{
@@ -375,8 +349,6 @@
375349
"resource_id": { "$oid": "664717b0ba9e65342c8e4941" },
376350
"resource_type": "plainText",
377351
"location_id": { "$oid": "654b825533ee5737b297f8f2" },
378-
"comment": null,
379-
"notes": null,
380352
"text": "make do with the mouse. :|"
381353
},
382354
{
@@ -385,8 +357,6 @@
385357
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
386358
"resource_type": "plainText",
387359
"location_id": { "$oid": "654b825533ee5737b297f8e5" },
388-
"comment": null,
389-
"notes": null,
390360
"text": "Fuchs, du hast die Gans gestohlen,"
391361
},
392362
{
@@ -395,8 +365,6 @@
395365
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
396366
"resource_type": "plainText",
397367
"location_id": { "$oid": "654b825533ee5737b297f8e6" },
398-
"comment": null,
399-
"notes": null,
400368
"text": "|: gib sie wieder her! :|"
401369
},
402370
{
@@ -405,8 +373,7 @@
405373
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
406374
"resource_type": "plainText",
407375
"location_id": { "$oid": "654b825533ee5737b297f8e7" },
408-
"comment": "In the original version (\"Warnung\" by Ernst Anschütz) it is \"sie\" instead of \"dich\".",
409-
"notes": null,
376+
"editors_comment": "In the original version (\"Warnung\" by Ernst Anschütz) it is \"sie\" instead of \"dich\".",
410377
"text": "|: Sonst wird dich der Jäger holen,"
411378
},
412379
{
@@ -415,8 +382,6 @@
415382
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
416383
"resource_type": "plainText",
417384
"location_id": { "$oid": "654b825533ee5737b297f8e8" },
418-
"comment": null,
419-
"notes": null,
420385
"text": "mit dem Schießgewehr. :|"
421386
},
422387
{
@@ -425,8 +390,6 @@
425390
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
426391
"resource_type": "plainText",
427392
"location_id": { "$oid": "654b825533ee5737b297f8ea" },
428-
"comment": null,
429-
"notes": null,
430393
"text": "Seine große, lange Flinte"
431394
},
432395
{
@@ -435,8 +398,6 @@
435398
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
436399
"resource_type": "plainText",
437400
"location_id": { "$oid": "654b825533ee5737b297f8eb" },
438-
"comment": null,
439-
"notes": null,
440401
"text": "|: schießt auf dich den Schrot, :|"
441402
},
442403
{
@@ -445,8 +406,6 @@
445406
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
446407
"resource_type": "plainText",
447408
"location_id": { "$oid": "654b825533ee5737b297f8ec" },
448-
"comment": null,
449-
"notes": null,
450409
"text": "|: dass dich färbt die rote Tinte"
451410
},
452411
{
@@ -455,8 +414,6 @@
455414
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
456415
"resource_type": "plainText",
457416
"location_id": { "$oid": "654b825533ee5737b297f8ed" },
458-
"comment": null,
459-
"notes": null,
460417
"text": "und dann bist du tot. :|"
461418
},
462419
{
@@ -465,8 +422,6 @@
465422
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
466423
"resource_type": "plainText",
467424
"location_id": { "$oid": "654b825533ee5737b297f8ef" },
468-
"comment": null,
469-
"notes": null,
470425
"text": "Liebes Füchslein, lass dir raten,"
471426
},
472427
{
@@ -475,8 +430,6 @@
475430
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
476431
"resource_type": "plainText",
477432
"location_id": { "$oid": "654b825533ee5737b297f8f0" },
478-
"comment": null,
479-
"notes": null,
480433
"text": "|: sei doch nur kein Dieb; :|"
481434
},
482435
{
@@ -485,8 +438,6 @@
485438
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
486439
"resource_type": "plainText",
487440
"location_id": { "$oid": "654b825533ee5737b297f8f1" },
488-
"comment": null,
489-
"notes": null,
490441
"text": "|: nimm, du brauchst nicht Gänsebraten,"
491442
},
492443
{
@@ -495,8 +446,6 @@
495446
"resource_id": { "$oid": "66471b68ba9e65342c8e495b" },
496447
"resource_type": "plainText",
497448
"location_id": { "$oid": "654b825533ee5737b297f8f2" },
498-
"comment": null,
499-
"notes": null,
500449
"text": "mit der Maus vorlieb. :|"
501450
},
502451
{
@@ -505,8 +454,6 @@
505454
"resource_id": { "$oid": "66471de0ba9e65342c8e4995" },
506455
"resource_type": "externalReferences",
507456
"location_id": { "$oid": "664321104aa6341acd83fb05" },
508-
"comment": null,
509-
"notes": null,
510457
"links": [
511458
{
512459
"url": "https://diglib.hab.de/drucke/un-17-1b/start.htm?image=00048",
@@ -953,7 +900,7 @@
953900
"resource_id": { "$oid": "6656cc7b81a66322c1bffb24" },
954901
"resource_type": "textAnnotation",
955902
"location_id": { "$oid": "654b825533ee5737b297f8f2" },
956-
"comment": "This is the only occurrence of the entity \"Mouse\"!",
903+
"editors_comment": "This is the only occurrence of the entity \"Mouse\"!",
957904
"tokens": [
958905
{
959906
"token": "mit",
@@ -987,7 +934,7 @@
987934
"resource_id": { "$oid": "67472c393d0d7622956981c9" },
988935
"resource_type": "richText",
989936
"location_id": { "$oid": "664321104aa6341acd83fb05" },
990-
"html": "<pre><code>\nG G\nFuchs, du hast die Gans gestohlen\n\nC G C G\nGib sie wieder her! Gib sie wieder her!\n\nD7 G D7 G\nSonst wird dich der Jäger holen mit dem Schießgewehr\n\nD7 G D7 G\nSonst wird dich der Jäger holen mit dem Schießgewehr\n\n \nG G\nSeine große, lange Flinte\n\nC G C G\nSchießt auf dich den Schrot, schießt auf dich den Schrot\n\nD7 G D7 G\nDass dich färbt die rote Tinte und dann bist du tot\n\nD7 G D7 G\nDass dich färbt die rote Tinte und dann bist du tot\n\n \nG G\nLiebes Füchslein, lass dir raten\n\nC G C G\nSei doch nur kein Dieb! Sei doch nur kein Dieb!\n\nD7 G D7 G\nNimm, du brauchst nicht Gänsebraten, mit der Maus vorlieb\n\nD7 G D7 G\nNimm, du brauchst nicht Gänsebraten, mit der Maus vorlieb\n</code></pre>",
937+
"html": "<pre><code>G G\nFuchs, du hast die Gans gestohlen\n\nC G C G\nGib sie wieder her! Gib sie wieder her!\n\nD7 G D7 G\nSonst wird dich der Jäger holen mit dem Schießgewehr\n\nD7 G D7 G\nSonst wird dich der Jäger holen mit dem Schießgewehr\n\n \nG G\nSeine große, lange Flinte\n\nC G C G\nSchießt auf dich den Schrot, schießt auf dich den Schrot\n\nD7 G D7 G\nDass dich färbt die rote Tinte und dann bist du tot\n\nD7 G D7 G\nDass dich färbt die rote Tinte und dann bist du tot\n\n \nG G\nLiebes Füchslein, lass dir raten\n\nC G C G\nSei doch nur kein Dieb! Sei doch nur kein Dieb!\n\nD7 G D7 G\nNimm, du brauchst nicht Gänsebraten, mit der Maus vorlieb\n\nD7 G D7 G\nNimm, du brauchst nicht Gänsebraten, mit der Maus vorlieb\n</code></pre>",
991938
"editor_mode": "html"
992939
},
993940
{

‎Tekst-API/demo/resources.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@
470470
"sort_order": 10,
471471
"default_active": true,
472472
"enable_content_context": true,
473+
"show_comments": true,
473474
"searchable_quick": true,
474475
"searchable_adv": true,
475476
"rtl": false
@@ -534,7 +535,10 @@
534535
},
535536
{
536537
"key": "comment",
537-
"translations": [{ "locale": "*", "translation": "comment" }],
538+
"translations": [
539+
{ "locale": "enUS", "translation": "Comment" },
540+
{ "locale": "deDE", "translation": "Kommentar" }
541+
],
538542
"group": "misc"
539543
}
540544
]

0 commit comments

Comments
 (0)