Skip to content

Commit e4581e3

Browse files
maphousemaphouse
committed
Merge branch 'main' into main_public
 Conflicts: data/countries.geojson
2 parents 4d5b658 + ad35e74 commit e4581e3

16 files changed

Lines changed: 4271 additions & 16 deletions

‎data/countries.geojson‎

Lines changed: 3741 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/schema.atlascine_media/brief.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
<span class="atlascine_media_brief">
22
<span class="n2s_localize atlascine_media_brief_decoration">Media (</span>
33
{{#atlascine_media}}
4-
{{#if name}}
5-
<span class="atlascine_media_name">{{name}}</span>
4+
{{#if mediaType}}
5+
<span class="n2s_select atlascine_media_mediaType" n2-choice="{{mediaType}}">
6+
<span class="n2s_choice n2s_localize" n2-choice="image">Image</span>
7+
<span class="n2s_choice n2s_localize" n2-choice="video">Video</span>
8+
<span class="n2s_choice n2s_localize" n2-choice="audio">Audio</span>
9+
</span>
610
{{/if}}
711
{{/atlascine_media}}
812
{{#atlascine_media}}
9-
{{#if credit}}
10-
<span class="atlascine_media_credit"> {{credit}}</span>
13+
{{#if name}}
14+
<span class="atlascine_media_name"> {{name}}</span>
1115
{{/if}}
1216
{{/atlascine_media}}
1317
<span class="atlascine_media_brief_decoration">)</span>

‎docs/schema.atlascine_media/create.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"atlascine_media": {
88
"name": "",
99
"caption": "",
10+
"mediaType": "",
1011
"credit": ""
1112
}
1213
}

‎docs/schema.atlascine_media/csvExport.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
[
2+
{
3+
"select": "atlascine_media.mediaType",
4+
"label": "mediaType",
5+
"type": "json"
6+
},
27
{
38
"select": "atlascine_media.name",
49
"label": "name",

‎docs/schema.atlascine_media/definition.json‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
"type": "title",
99
"label": "Media"
1010
},
11+
{
12+
"type": "selection",
13+
"id": "mediaType",
14+
"label": "Type",
15+
"includedInBrief": true,
16+
"options": [
17+
{
18+
"label": "Image",
19+
"value": "image"
20+
},
21+
{
22+
"label": "Video",
23+
"value": "video"
24+
},
25+
{
26+
"label": "Audio",
27+
"value": "audio"
28+
}
29+
]
30+
},
1131
{
1232
"id": "name",
1333
"label": "Name",
@@ -31,9 +51,8 @@
3151
},
3252
{
3353
"type": "file",
34-
"label": "Audio/Video File",
54+
"label": "Audio/Video/Image File",
3555
"uploadOptional": false
3656
}
3757
]
38-
}
39-
58+
}

‎docs/schema.atlascine_media/display.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@
55
<div class="value n2s_localize">Media</div>
66
<div class="end"></div>
77
</div>
8+
{{#atlascine_media}}
9+
{{#if mediaType}}
10+
<div class="atlascine_media_mediaType">
11+
<div class="label n2s_localize mdc-typography--subtitle2">Type</div>
12+
<div class="value n2s_select" n2-choice="{{mediaType}}">
13+
<span class="n2s_choice n2s_localize" n2-choice="image">Image</span>
14+
<span class="n2s_choice n2s_localize" n2-choice="video">Video</span>
15+
<span class="n2s_choice n2s_localize" n2-choice="audio">Audio</span>
16+
<span class="n2s_choiceDefault">{{mediaType}}</span>
17+
</div>
18+
<div class="end"></div>
19+
</div>
20+
{{/if}}
21+
{{/atlascine_media}}
822
{{#atlascine_media}}
923
{{#if name}}
1024
<div class="atlascine_media_name">

‎docs/schema.atlascine_media/export.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
[
2+
{
3+
"select": "atlascine_media.mediaType",
4+
"label": "mediaType",
5+
"type": "json"
6+
},
27
{
38
"select": "atlascine_media.name",
49
"label": "name",

‎docs/schema.atlascine_media/form.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,32 @@
55
<div class="value mdc-typography--headline6 n2s_localize">Media</div>
66
<div class="end"></div>
77
</div>
8+
{{#atlascine_media}}
9+
<div class="atlascine_media_mediaType">
10+
<div class="value">
11+
<div class="mdc-select mdc-select--outlined n2s_attachMDCSelect">
12+
<div class="mdc-select__anchor">
13+
<i class="mdc-select__dropdown-icon"></i>
14+
<div class="mdc-select__selected-text"></div>
15+
<div class="mdc-notched-outline">
16+
<div class="mdc-notched-outline__leading"></div>
17+
<div class="mdc-notched-outline__notch">
18+
<label class="mdc-floating-label n2s_localize">Type</label>
19+
</div>
20+
<div class="mdc-notched-outline__trailing"></div>
21+
</div>
22+
</div>
23+
<div class="{{#:input}}mediaType,select{{/:input}} mdc-select__menu mdc-menu mdc-menu-surface">
24+
<ul class="mdc-list">
25+
<li class="n2s_localize mdc-list-item" role="option" data-value="image">Image</li>
26+
<li class="n2s_localize mdc-list-item" role="option" data-value="video">Video</li>
27+
<li class="n2s_localize mdc-list-item" role="option" data-value="audio">Audio</li>
28+
</ul>
29+
</div>
30+
</div>
31+
</div>
32+
</div>
33+
{{/atlascine_media}}
834
{{#atlascine_media}}
935
<div class="atlascine_media_name">
1036
<div class="value">

‎htdocs/ab-repeat.min.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎htdocs/css/atlas.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,3 +443,15 @@ section.mdc-top-app-bar__section.mdc-top-app-bar__section--align-end {
443443
.mdc-chip__text {
444444
white-space: normal;
445445
}
446+
447+
/* Hide Stories Module editing buttons when not logged in */
448+
.nunaliit_logged_out .n2AnnotationEditorView .n2widget_drawer_container > div > button,
449+
.nunaliit_logged_out .n2AnnotationEditorView .n2widget_drawer_container > div > div > div.n2WidgetAnnotation_formfieldSection > button,
450+
.nunaliit_logged_out .n2AnnotationEditorView .n2widget_drawer_container > div > div > div.n2WidgetAnnotation_formfieldSection > div.n2WidgetAnnotationEditorTaggingImages > div > button, /* Annotations */
451+
.nunaliit_logged_out .n2AnnotationEditorView .n2widget_drawer_container > div > div > div.n2WidgetAnnotation_tagGroup_formfieldSection > div.formfieldSection_footer,
452+
.nunaliit_logged_out .n2AnnotationEditorView .n2widget_drawer_container > div > div > button.n2WidgetAnnotation_tagGroup_addNewGroupBtn, /* Themes */
453+
.nunaliit_logged_out div#notesButtonContainer,
454+
.nunaliit_logged_out div#exportGeoJSONButtonContainer /* Settings */
455+
{
456+
display: none;
457+
}

0 commit comments

Comments
 (0)