Skip to content

Commit

Permalink
MIR-1226 many major improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebhofmann
sebhofmann committed Oct 26, 2023
1 parent e65a9f1 commit c353ae9
Show file tree
Hide file tree
Showing 20 changed files with 880 additions and 357 deletions.
1 change: 1 addition & 0 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker
11 changes: 8 additions & 3 deletions mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/mir_metadata.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,15 @@
}
}

ol.topic-list {
ol.topic-list{
list-style: none;
display: inline;
padding: 0px;
display: block;
padding: 0;
margin-bottom: 0;
}

ol.topic-list:not(:last-child){
margin-bottom: 0.5em;
}

li.topic-element {
Expand Down
18 changes: 9 additions & 9 deletions mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic,Cartographic" data-admin="geographicPair" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic,Cartographic" data-search-filter-default="Geographic" data-admin="geographicPair" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
</div>
Expand All @@ -1755,7 +1755,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="" data-editor="Geographic" data-admin="false" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
</div>
Expand All @@ -1771,7 +1771,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-admin="false" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
</div>
Expand All @@ -1787,7 +1787,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="" data-editor="Cartographic" data-admin="false" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.cartographics.coordinates}" pmud="false"/>
</div>
Expand All @@ -1803,7 +1803,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="" data-editor="Cartographic" data-admin="false" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.cartographics.coordinates}" pmud="true"/>
</div>
Expand All @@ -1819,7 +1819,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="" data-editor="*" data-admin="false" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
</div>
Expand All @@ -1835,7 +1835,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="" data-editor="*" data-admin="false" data-required="true"> </div>
<div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="true"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
</div>
Expand All @@ -1851,7 +1851,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="*" data-editor="*" data-admin="true" data-required="true"> </div>
<div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="true"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.subject.topic.complex}" pmud="true"/>
</div>
Expand All @@ -1867,7 +1867,7 @@
</label>
<div class="col-md-6">
<input type="hidden" class="subjectXML"/>
<div class="editorToolsApp" data-searchable="*" data-editor="*" data-admin="true" data-required="false"> </div>
<div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="false"> </div>
</div>
<mir:help-pmud help-text="{i18n:mir.help.subject.topic.complex}" pmud="true"/>
</div>
Expand Down
50 changes: 32 additions & 18 deletions mir-module/src/main/resources/config/mir/messages_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,23 @@ mir.editor.person.link = Link
mir.editor.person.wikipedia = Wikipedia
mir.editor.addIdentifier = ID hinzuf\u00FCgen

mir.editor.subject.empty = Keine Schlagw\u00F6rter vorhanden.
mir.editor.subject.addCoordinates = Koordinaten hinzuf\u00FCgen
mir.editor.subject.search = Suchen
mir.editor.subject.search.placeholder = nach Schlagwort suchen \u2026
mir.editor.subject.search.leaving = Sie haben in der Schlagwortsuche einen Begriff eingegeben ohne diesen zu \u00FCbernehmen. Wenn Sie die Seite jetzt verlassen, gehen Ihre \u00C4nderungen verloren. Wenn Sie die Seite verlassen m\u00F6chten, klicken Sie auf Ok.
mir.editor.subject.search.modal.title = Suchergebnis
mir.editor.subject.search.modal.close = Schlie\u00DFen
mir.editor.subject.search.result.add = Hinzuf\u00FCgen
mir.editor.subject.search.options.persons = nach Personen Suchen
mir.editor.subject.search.options.institutions = nach Institutionen suchen
mir.editor.subject.search.options.families = nach Familien suchen
mir.editor.subject.search.options.conferences = nach Konferenzen suchen
mir.editor.subject.search.options.topics = nach Schlagw\u00F6rtern suchen
mir.editor.subject.search.options.places = nach Orten suchen
mir.editor.subject.search.options.titles = nach Titeln suchen
mir.editor.subject.search.result.addCustom = Freies Schlagwort hinzuf\u00FCgen
mir.editor.subject.search.result.empty = Keine Treffer
mir.editor.subject.search.options.persons = Personen
mir.editor.subject.search.options.institutions = Institutionen
mir.editor.subject.search.options.families = Familien
mir.editor.subject.search.options.conferences = Konferenzen
mir.editor.subject.search.options.topics = Schlagw\u00F6rter
mir.editor.subject.search.options.places = Orte
mir.editor.subject.search.options.titles = Titel
mir.editor.subject.custom.modal.title = Eigenes Schlagwort
mir.editor.subject.custom.modal.type = Schlagwort-Typ
mir.editor.subject.custom.modal.type.Topic = Schlagwort
Expand All @@ -131,35 +137,35 @@ mir.editor.subject.custom.modal.add = Hinzuf\u00FCgen
mir.editor.subject.editor.language = Sprache
mir.editor.subject.editor.language.choose = Sprache ausw\u00E4hlen
mir.editor.subject.topic.editor.topic = Schlagwort
mir.editor.subject.topic.editor.invalid.topic = Bitte geben Sie ein gültiges Schlagwort ein.
mir.editor.subject.topic.editor.invalid.topic = Bitte geben Sie ein g\u00FCltiges Schlagwort ein.
mir.editor.subject.name.editor.displayForm = Anzeigeform
mir.editor.subject.name.editor.invalid.displayForm = Bitte geben Sie eine gültige Anzeigeform ein.
mir.editor.subject.name.editor.invalid.displayForm = Bitte geben Sie eine g\u00FCltige Anzeigeform ein.
mir.editor.subject.name.editor.namePart = Namensbestandteil
mir.editor.subject.name.editor.invalid.namePart = Bitte geben Sie einen gültigen Namensbestandteil ein.
mir.editor.subject.name.editor.invalid.namePart = Bitte geben Sie einen g\u00FCltigen Namensbestandteil ein.
mir.editor.subject.name.editor.namePart.type.given = Vorname
mir.editor.subject.name.editor.namePart.type.family = Nachname
mir.editor.subject.name.editor.namePart.Type.date = Datum
mir.editor.subject.name.editor.namePart.Type.termsOfAddress = Anrede
mir.editor.subject.name.editor.identifier = Identifikator
mir.editor.subject.name.editor.invalid.identifier = Bitte geben Sie einen Identifikator ein.
mir.editor.subject.name.editor.affiliation = Zugeh\u00F6rigkeit
mir.editor.subject.name.editor.invalid.affiliation = Bitte geben Sie eine gültige Zugeh\u00F6rigkeit ein.
mir.editor.subject.name.editor.invalid.affiliation = Bitte geben Sie eine g\u00FCltige Zugeh\u00F6rigkeit ein.
mir.editor.subject.titleInfo.editor.title = Titel
mir.editor.subject.titleInfo.editor.invalid.title = Bitte geben Sie einen gültigen Titel ein.
mir.editor.subject.titleInfo.editor.invalid.title = Bitte geben Sie einen g\u00FCltigen Titel ein.
mir.editor.subject.titleInfo.editor.subtitle = Untertitel
mir.editor.subject.titleInfo.editor.invalid.subtitle = Bitte geben Sie einen gültigen Untertitel ein.
mir.editor.subject.titleInfo.editor.invalid.subtitle = Bitte geben Sie einen g\u00FCltigen Untertitel ein.
mir.editor.subject.titleInfo.editor.partNumber = Teilnummer
mir.editor.subject.titleInfo.editor.invalid.partNumber = Bitte geben Sie eine gültige Teilnummer ein.
mir.editor.subject.titleInfo.editor.invalid.partNumber = Bitte geben Sie eine g\u00FCltige Teilnummer ein.
mir.editor.subject.titleInfo.editor.partName = Teilname
mir.editor.subject.titleInfo.editor.invalid.partName = Bitte geben Sie einen gültigen Teilnamen ein.
mir.editor.subject.titleInfo.editor.invalid.partName = Bitte geben Sie einen g\u00FCltigen Teilnamen ein.
mir.editor.subject.cartographics.editor.scale = Ma\u00DFstab
mir.editor.subject.cartographics.editor.invalid.scale = Bitte geben Sie einen gültigen Ma\u00DFstab ein.
mir.editor.subject.cartographics.editor.invalid.scale = Bitte geben Sie einen g\u00FCltigen Ma\u00DFstab ein.
mir.editor.subject.cartographics.editor.coordinates = Koordinaten
mir.editor.subject.cartographics.editor.invalid.coordinates= Bitte geben Sie gültige Koordinaten ein.
mir.editor.subject.cartographics.editor.invalid.coordinates= Bitte geben Sie g\u00FCltige Koordinaten ein.
mir.editor.subject.cartographics.editor.add.point = Punkt hinzuf\u00FCgen
mir.editor.subject.cartographics.editor.add.polygon = Polygon hinzuf\u00FCgen
mir.editor.subject.geographic.editor.name = Geografikum
mir.editor.subject.geographic.editor.invalid.name = Bitte geben Sie ein gültiges Geografikum ein.
mir.editor.subject.geographic.editor.invalid.name = Bitte geben Sie ein g\u00FCltiges Geografikum ein.
mir.editor.subject.cartographics.display.coordinates = Koordinaten
mir.editor.subject.cartographics.display.scale = Ma\u00DFstab
mir.editor.subject.cartographics.display.showMap = Karte anzeigen
Expand Down Expand Up @@ -290,6 +296,14 @@ mir.derivate.type = Typ des Dateibereichs
mir.details.issue = Heft
mir.details.personpopover.title = Personendetails
mir.details.popover.title = Details
mir.details.popover.type = Typ
mir.details.popover.type.personal = Person
mir.details.popover.type.corporate = Institution
mir.details.popover.type.family = Familie
mir.details.popover.type.conference = Konferenz
mir.details.popover.type.titleInfo = Titel
mir.details.popover.type.topic = Schlagwort
mir.details.popover.type.geographic = Geografikum
mir.details.volume.journal = Jg.
mir.details.volume.series = Band
mir.dropdown.all = Alles
Expand Down
19 changes: 12 additions & 7 deletions mir-module/src/main/resources/config/mir/messages_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,22 @@ mir.editor.person.link = Link
mir.editor.person.wikipedia = Wikipedia
mir.editor.addIdentifier = Add Identifier

mir.editor.subject.empty = No subject
mir.editor.subject.addCoordinates = Add Coordinates
mir.editor.subject.search = Search
mir.editor.subject.search.placeholder = search for topic \u2026
mir.editor.subject.search.modal.title = Search Results
mir.editor.subject.search.modal.close = Close
mir.editor.subject.search.result.add = Add
mir.editor.subject.search.options.persons = search for persons
mir.editor.subject.search.options.institutions = search for institutions
mir.editor.subject.search.options.families = search for families
mir.editor.subject.search.options.conferences = search for conferences
mir.editor.subject.search.options.topics = search for topics
mir.editor.subject.search.options.places = search for places
mir.editor.subject.search.options.titles = search for titles
mir.editor.subject.search.result.addCustom = Add free subject
mir.editor.subject.search.result.empty = No results found
mir.editor.subject.search.options.persons = persons
mir.editor.subject.search.options.institutions = institutions
mir.editor.subject.search.options.families = families
mir.editor.subject.search.options.conferences = conferences
mir.editor.subject.search.options.topics = topics
mir.editor.subject.search.options.places = places
mir.editor.subject.search.options.titles = titles
mir.editor.subject.custom.modal.title = own subject
mir.editor.subject.custom.modal.type = Subject Type
mir.editor.subject.custom.modal.type.Topic = Topic
Expand Down
Loading

0 comments on commit c353ae9

Please sign in to comment.