Skip to content

Commit 94a39fa

Browse files
Forms refactoring (#707)
* restructure forms * sidebar formatting * configure forms overview page * remove best-practice, content to overview and project preparation * text * date and time * numbers * checkbox * qr code * value select * forms widget relations * forms refactoring - attributes form layout * form widgets - Photos, Info widgets (#696) * forms refactoring - use cases * html and text widgets link, possible duplicate content * first feedback round * forms refactoring - fix redirects --------- Co-authored-by: Tomas Mizera <[email protected]>
1 parent a3085fa commit 94a39fa

File tree

263 files changed

+1452
-1140
lines changed

Some content is hidden

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

263 files changed

+1452
-1140
lines changed

REDIRECTS

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ https://help.cloudmergin.com/plugin-installation https://merginmaps.com/docs/set
2828
https://help.cloudmergin.com/plugin-logs https://merginmaps.com/docs/misc/troubleshoot/
2929
https://help.cloudmergin.com/plugin-new-project https://merginmaps.com/docs/manage/create-project/
3030
https://help.cloudmergin.com/plugin-sync-project https://merginmaps.com/docs/manage/plugin/
31-
https://help.cloudmergin.com/plugin-variables https://merginmaps.com/docs/layer/plugin-variables/
31+
https://help.cloudmergin.com/plugin-variables https://merginmaps.com/docs/layer/variables/
3232
https://help.cloudmergin.com/project-advanced https://merginmaps.com/docs/manage/project-advanced/
3333
https://help.cloudmergin.com/project-details https://merginmaps.com/docs/manage/project-history/
3434
https://help.cloudmergin.com/quick-start https://merginmaps.com/docs/tutorials/capturing-first-data/
@@ -62,7 +62,7 @@ https://help.inputapp.io/howto/exif_metadata https://merginmaps.com/docs/layer/e
6262
https://help.inputapp.io/howto/external_gps https://merginmaps.com/docs/field/external_gps/
6363
https://help.inputapp.io/howto/gps_accuracy https://merginmaps.com/docs/field/gps_accuracy/
6464
https://help.inputapp.io/howto/package_qgis_project https://merginmaps.com/docs/manage/create-project/
65-
https://help.inputapp.io/howto/position_variables https://merginmaps.com/docs/layer/position_variables/
65+
https://help.inputapp.io/howto/position_variables https://merginmaps.com/docs/layer/variables/
6666
https://help.inputapp.io/howto/proj https://merginmaps.com/docs/gis/proj/
6767
https://help.inputapp.io/howto/project_config https://merginmaps.com/docs/gis/features/
6868
https://help.inputapp.io/howto/registration https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
@@ -75,11 +75,11 @@ https://help.inputapp.io/howto/settingup_background_map https://merginmaps.com/d
7575
https://help.inputapp.io/howto/settingup_background_map_rastertile https://merginmaps.com/docs/gis/settingup_background_map/
7676
https://help.inputapp.io/howto/settingup_background_map_vectortile https://merginmaps.com/docs/gis/settingup_background_map/
7777
https://help.inputapp.io/howto/settingup_forms https://merginmaps.com/docs/layer/form-widgets/
78-
https://help.inputapp.io/howto/settingup_forms_cascade https://merginmaps.com/docs/layer/form-configuration/
78+
https://help.inputapp.io/howto/settingup_forms_cascade https://merginmaps.com/docs/layer/value-select/
7979
https://help.inputapp.io/howto/settingup_forms_checkbox https://merginmaps.com/docs/layer/form-widgets/
80-
https://help.inputapp.io/howto/settingup_forms_constraints https://merginmaps.com/docs/layer/form-configuration/
80+
https://help.inputapp.io/howto/settingup_forms_constraints https://merginmaps.com/docs/layer//constraints/
8181
https://help.inputapp.io/howto/settingup_forms_datetime https://merginmaps.com/docs/layer/form-widgets/
82-
https://help.inputapp.io/howto/settingup_forms_defaults https://merginmaps.com/docs/layer/form-configuration/
82+
https://help.inputapp.io/howto/settingup_forms_defaults https://merginmaps.com/docs/layer/default-values/
8383
https://help.inputapp.io/howto/settingup_forms_layout https://merginmaps.com/docs/layer/form-layout/
8484
https://help.inputapp.io/howto/settingup_forms_number https://merginmaps.com/docs/layer/form-widgets/
8585
https://help.inputapp.io/howto/settingup_forms_one-to-many https://merginmaps.com/docs/layer/one-to-n-relations/
@@ -90,7 +90,7 @@ https://help.inputapp.io/howto/settingup_forms_text https://merginmaps.com/docs/
9090
https://help.inputapp.io/howto/settingup_forms_valuemap https://merginmaps.com/docs/layer/form-widgets/
9191
https://help.inputapp.io/howto/settingup_forms_valuerelation https://merginmaps.com/docs/layer/form-widgets/
9292
https://help.inputapp.io/howto/setup_themes https://merginmaps.com/docs/gis/setup_themes/
93-
https://help.inputapp.io/howto/working_with_nonspatial_data https://merginmaps.com/docs/layer/non-spatial-data/
93+
https://help.inputapp.io/howto/working_with_nonspatial_data https://merginmaps.com/docs/layer/overview/
9494
https://help.inputapp.io/input_ui https://merginmaps.com/docs/field/mobile-app-ui/
9595
https://help.inputapp.io/licensing https://merginmaps.com/docs/misc/licensing/
9696
https://help.inputapp.io/privacy N/A -- handled by https://merginmaps.com/privacy-policy/
@@ -120,7 +120,7 @@ https://merginmaps.com/docs/fieldwork/gps_accuracy/ https://merginmaps.com/docs/
120120
https://merginmaps.com/docs/field/input_features/ https://merginmaps.com/docs/field/mobile-features/
121121
https://merginmaps.com/docs/field/input_ui/ https://merginmaps.com/docs/field/mobile-app-ui/
122122
https://merginmaps.com/docs/gis/enable_browsing/ https://merginmaps.com/docs/gis/search_data/
123-
https://merginmaps.com/docs/howto/attach-multiple-photos-to-features/ https://merginmaps.com/docs/layer/attach-multiple-photos-to-features/
123+
https://merginmaps.com/docs/howto/attach-multiple-photos-to-features/ https://merginmaps.com/docs/layer/photos/#how-to-attach-multiple-photos-to-one-feature/
124124
https://merginmaps.com/docs/howto/contribute/ https://merginmaps.com/docs/misc/get-involved/
125125
https://merginmaps.com/docs/howto/create-an-organization/ https://merginmaps.com/docs/manage/workspaces/
126126
https://merginmaps.com/docs/howto/create-project/ https://merginmaps.com/docs/manage/create-project/
@@ -140,7 +140,7 @@ https://merginmaps.com/docs/howto/manage/plugin/install/ https://merginmaps.com/
140140
https://merginmaps.com/docs/howto/manage/plugin/plugin-delete-project/ https://merginmaps.com/docs/manage/project-advanced/
141141
https://merginmaps.com/docs/howto/manage/plugin/plugin-new-project/ https://merginmaps.com/docs/manage/create-project/
142142
https://merginmaps.com/docs/howto/manage/plugin/plugin-sync-project/ https://merginmaps.com/docs/manage/plugin/
143-
https://merginmaps.com/docs/howto/manage/plugin/plugin-variables/ https://merginmaps.com/docs/layer/plugin-variables/
143+
https://merginmaps.com/docs/howto/manage/plugin/plugin-variables/ https://merginmaps.com/docs/layer/variables/
144144
https://merginmaps.com/docs/howto/manage/troubleshoot/ https://merginmaps.com/docs/misc/troubleshoot/
145145
https://merginmaps.com/docs/howto/manage/web/dashboard/ https://merginmaps.com/docs/manage/dashboard/
146146
https://merginmaps.com/docs/howto/manage/web/project-advanced/ https://merginmaps.com/docs/manage/project-advanced/
@@ -151,7 +151,7 @@ https://merginmaps.com/docs/howto/manage/web/web-create-project/ https://merginm
151151
https://merginmaps.com/docs/howto/manage/web/working-with-organisations/ https://merginmaps.com/docs/manage/workspaces/
152152
https://merginmaps.com/docs/howto/mergince/ https://merginmaps.com/docs/server/
153153
https://merginmaps.com/docs/howto/mergin-tour/ https://merginmaps.com/docs/tutorials/creating-a-project-in-qgis/
154-
https://merginmaps.com/docs/howto/position_variables/ https://merginmaps.com/docs/layer/position_variables/
154+
https://merginmaps.com/docs/howto/position_variables/ https://merginmaps.com/docs/layer/variables/
155155
https://merginmaps.com/docs/howto/proj/ https://merginmaps.com/docs/gis/proj/
156156
https://merginmaps.com/docs/howto/project/enable_browsing/ https://merginmaps.com/docs/gis/search_data/
157157
https://merginmaps.com/docs/howto/project/enable_digitising/ https://merginmaps.com/docs/gis/enable_digitising/
@@ -162,17 +162,23 @@ https://merginmaps.com/docs/howto/project/selective_sync/ https://merginmaps.com
162162
https://merginmaps.com/docs/howto/project/settingup_background_map/ https://merginmaps.com/docs/gis/settingup_background_map/
163163
https://merginmaps.com/docs/howto/project/settingup_forms/ https://merginmaps.com/docs/layer/form-widgets/
164164
https://merginmaps.com/docs/howto/project/settingup_forms_photo/ https://merginmaps.com/docs/layer/photos/
165-
https://merginmaps.com/docs/howto/project/settingup_forms_settings/ https://merginmaps.com/docs/layer/form-configuration/
165+
https://merginmaps.com/docs/howto/project/settingup_forms_settings/ https://merginmaps.com/docs/layer/overview/
166166
https://merginmaps.com/docs/howto/project/setup_themes/ https://merginmaps.com/docs/gis/setup_themes/
167-
https://merginmaps.com/docs/howto/project/working_with_nonspatial_data/ https://merginmaps.com/docs/layer/non-spatial-data/
167+
https://merginmaps.com/docs/howto/project/working_with_nonspatial_data/ https://merginmaps.com/docs/layer/overview/
168168
https://merginmaps.com/docs/howto/quick-start/ https://merginmaps.com/docs/tutorials/capturing-first-data/
169169
https://merginmaps.com/docs/howto/reuse_last_values/ https://merginmaps.com/docs/field/reuse-last-values/
170170
https://merginmaps.com/docs/howto/sign-up-to-mergin-maps/ https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
171+
https://merginmaps.com/docs/layer/attach-multiple-photos-to-features/ https://merginmaps.com/docs/layer/photos/#how-to-attach-multiple-photos-to-one-feature/
172+
https://merginmaps.com/docs/layer/best-practice/ https://merginmaps.com/docs/layer/overview/
171173
https://merginmaps.com/docs/layer/exif_metadata/ https://merginmaps.com/docs/layer/exif/
172-
https://merginmaps.com/docs/layer/working_with_nonspatial_data/ https://merginmaps.com/docs/layer/non-spatial-data/
174+
https://merginmaps.com/docs/layer/form-configuration/ https://merginmaps.com/docs/layer/overview/
175+
https://merginmaps.com/docs/layer/non-spatial-data/ https://merginmaps.com/docs/layer/overview/
176+
https://merginmaps.com/docs/layer/position_variables/ https://merginmaps.com/docs/layer/variables/
177+
https://merginmaps.com/docs/layer/plugin-variables/ https://merginmaps.com/docs/layer/variables/
173178
https://merginmaps.com/docs/layer/settingup_forms/ https://merginmaps.com/docs/layer/form-widgets/
174179
https://merginmaps.com/docs/layer/settingup_forms_photo/ https://merginmaps.com/docs/layer/photos/
175-
https://merginmaps.com/docs/layer/settingup_forms_settings/ https://merginmaps.com/docs/layer/form-configuration/
180+
https://merginmaps.com/docs/layer/settingup_forms_settings/ https://merginmaps.com/docs/layer/overview/
181+
https://merginmaps.com/docs/layer/working_with_nonspatial_data/ https://merginmaps.com/docs/layer/overview/
176182
https://merginmaps.com/docs/manage/data_sync/ https://merginmaps.com/docs/manage/plugin/
177183
https://merginmaps.com/docs/manage/project-details/ https://merginmaps.com/docs/manage/project-history/
178184
https://merginmaps.com/docs/manage/plugin-multi-server-use/ https://merginmaps.com/docs/server/plugin-mobile-app/

scripts/wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Geomax
5353
GEOS
5454
GeoPackage
5555
GeoPackages
56+
Geotagging
5657
GeoTIFF
5758
GeoPDF
5859
Gimp

src/.vitepress/sidebar/en.js

Lines changed: 47 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ export default {
1010
{ text: 'Using Mergin Maps Mobile App', link: '/tutorials/mobile/' },
1111
{ text: 'Further Project Customisation', link: '/tutorials/further-project-customisation/' },
1212
{ text: 'Working Collaboratively', link: '/tutorials/working-collaboratively/' }
13-
]
14-
},
13+
] },
1514
{
1615
text: 'Install & Sign Up', // required
1716
collapsed: true,
@@ -20,8 +19,7 @@ export default {
2019
{ text: 'How to Sign Up to Mergin Maps', link: '/setup/sign-up-to-mergin-maps/' },
2120
{ text: 'How to Install QGIS', link: '/setup/install-qgis/' },
2221
{ text: 'How to Install Mergin Maps Plugin for QGIS', link: '/setup/install-mergin-maps-plugin-for-qgis/' }
23-
]
24-
},
22+
] },
2523
{
2624
text: 'Manage Account & Project', // required
2725
collapsed: true,
@@ -43,8 +41,7 @@ export default {
4341
{ text: 'Webmaps', link: '/manage/dashboard-maps/' },
4442
{ text: 'Project History and Versions', link: '/manage/project-history/' },
4543
{ text: 'Selective Synchronisation', link: '/manage/selective_sync/' }
46-
]
47-
},
44+
] },
4845
{
4946
text: 'Setup GIS Project', // required
5047
collapsed: true,
@@ -59,26 +56,47 @@ export default {
5956
{ text: 'How to Avoid Polygons Overlap', link: '/gis/avoid-overlap/' },
6057
{ text: 'Custom Projections', link: '/gis/proj/' },
6158
{ text: 'Supported Formats', link: '/gis/supported_formats/' }
62-
]
63-
},
59+
] },
6460
{
65-
text: 'Configure Survey Layer', // required
61+
text: 'Configure Forms', // required
6662
collapsed: true,
6763
items: [
68-
{ text: 'Best Practice Tips for Layers and Forms', link: '/layer/best-practice/' },
69-
{ text: 'Setting Up Widgets in Attributes Form', link: '/layer/form-widgets/' },
70-
{ text: 'Attributes Form Configuration', link: '/layer/form-configuration/' },
71-
{ text: 'Attributes Form Layout', link: '/layer/form-layout/' },
72-
{ text: 'Capturing Photos', link: '/layer/photos/' },
73-
{ text: 'How to Attach Multiple Photos to Features', link: '/layer/attach-multiple-photos-to-features/' },
74-
{ text: 'How to Link Multiple Records to One Feature (1-N Relations)', link: '/layer/one-to-n-relations/' },
75-
{ text: 'Exif Metadata', link: '/layer/exif/' },
76-
{ text: 'How to Use Hyperlinks', link: '/layer/external-link/' },
77-
{ text: 'Working with Non-Spatial Tables', link: '/layer/non-spatial-data/' },
78-
{ text: 'Extra Position Variables', link: '/layer/position_variables/' },
79-
{ text: 'Extra QGIS Variables', link: '/layer/plugin-variables/' }
80-
]
81-
},
64+
{ text: 'Overview', link: '/layer/overview/' },
65+
{ text: 'Widgets', link: '/layer/form-widgets/',
66+
items: [
67+
{ text: 'Text', link: '/layer/text/' },
68+
{ text: 'Date and Time', link: '/layer/date-time/' },
69+
{ text: 'Relations', link: '/layer/relations/' },
70+
{ text: 'Numbers', link: '/layer/numbers/' },
71+
{ text: 'Checkbox', link: '/layer/checkbox/' },
72+
{ text: 'QR Code', link: '/layer/qr-code/' },
73+
{ text: 'Selecting Single or Multiple Values', link: '/layer/value-select/' },
74+
{ text: 'Photos', link: '/layer/photos/' },
75+
{ text: 'Informational Widgets', link: '/layer/info-widgets/' },
76+
] },
77+
{ text: 'Default Values', link: '/layer/default-values/',
78+
collapsed: true,
79+
items: [
80+
{ text: 'Geotagging', link: '/layer/exif/' },
81+
{ text: 'Variables', link: '/layer/variables/' }
82+
] },
83+
{ text: 'Constraints', link: '/layer/constraints/' },
84+
{ text: 'Layout', link: '/layer/form-layout/',
85+
collapsed: true,
86+
items: [
87+
{ text: 'Tabs and Groups', link: '/layer/tabs-and-groups/' },
88+
{ text: 'Conditional Visibility', link: '/layer/conditional-visibility/' },
89+
] },
90+
{ text: 'Use Cases', link: '/layer/use-cases/',
91+
collapsed: true,
92+
items: [
93+
{ text: 'How to Open a File', link: '/layer/open-file/' },
94+
{ text: 'How to Use Hyperlinks', link: '/layer/external-link/' },
95+
{ text: 'How to Open a Link to a Navigation App', link: '/layer/link-to-navigation/' },
96+
{ text: 'How to Link Multiple Records to One Feature (1-N Relations)', link: '/layer/one-to-n-relations/' },
97+
{ text: 'How to Embed an Image', link: '/layer/embed-image/' },
98+
] },
99+
] },
82100
{
83101
text: 'Fieldwork Tips', // required
84102
collapsed: true,
@@ -97,8 +115,7 @@ export default {
97115
{ text: 'How to Reuse Last Entered Values', link: '/field/reuse-last-values/' },
98116
{ text: 'How to Stake Out Points', link: '/field/stake-out/' },
99117
{ text: 'How to Fix a Broken Project', link: '/field/broken-project/' }
100-
]
101-
},
118+
] },
102119
{
103120
text: 'For Developers', // required
104121
collapsed: true,
@@ -110,8 +127,7 @@ export default {
110127
{ text: 'Media Sync', link: '/dev/media-sync/' },
111128
{ text: 'Work Packages', link: '/dev/work-packages/' },
112129
{ text: 'Geodiff Library', link: '/dev/geodiff/' }
113-
]
114-
},
130+
] },
115131
{
116132
text: 'Custom Server', // required
117133
collapsed: true,
@@ -125,17 +141,15 @@ export default {
125141
{ text: 'Administration Panel', link: '/server/dashboard/' },
126142
{ text: 'Troubleshoot Custom Servers', link: '/server/troubleshoot/' },
127143
{ text: 'Using Mergin Maps Mobile App and QGIS Plugin with a Custom Server', link: '/server/plugin-mobile-app/' }
128-
]
129-
},
144+
] },
130145
{
131146
text: 'Migrate to Mergin Maps', // required
132147
collapsed: true,
133148
items: [
134149
{ text: 'Migrate from QField', link: '/migrate/qfield/' },
135150
{ text: 'Migrate from ArcGIS', link: '/migrate/arcgis/' },
136151
{ text: 'Migrate from FulcrumApp', link: '/migrate/fulcrumapp/' },
137-
]
138-
},
152+
] },
139153
{
140154
text: 'Support & Legal', // required
141155
collapsed: true,
@@ -145,9 +159,8 @@ export default {
145159
{ text: 'Troubleshoot', link: '/misc/troubleshoot/',
146160
collapsed:true,
147161
items: [
148-
{ text: 'Project fails to sync', link: '/misc/troubleshoot/not_syncing/' },
149-
]
150-
},
162+
{ text: 'Project fails to sync', link: '/misc/troubleshoot/not_syncing/' },
163+
] },
151164
{ text: 'Write Documentation', link: '/misc/write-docs/' }
152165
]
153166
}

src/field/external_gps/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: External GPS receivers can be connected to your mobile device via B
1010

1111
External GPS receivers can be connected to your mobile device via Bluetooth and used in <MobileAppName /> to achieve higher [GPS accuracy](../gps_accuracy/).
1212

13-
There are several [extra position variables](../../layer/position_variables/) that can be useful to record when doing the survey with external GPS, such as the GPS antenna height, GPS device name as well as metrics like horizontal, vertical or position dilution of precision (HDOP, VDOP, PDOP).
13+
There are several [extra position variables](../../layer/variables/#position-variables) that can be useful to record when doing the survey with external GPS, such as the GPS antenna height, GPS device name as well as metrics like horizontal, vertical or position dilution of precision (HDOP, VDOP, PDOP).
1414

1515
Note that external GPS devices usually return orthometric heights (ellipsoid with the geoid separation applied).
1616

@@ -33,7 +33,7 @@ If GPS antenna height is set to a non-zero value, it is also displayed next to t
3333
![GPS antenna height setup in Mergin Maps mobile app](./mobile-app-gps-antenna-height.jpg "GPS antenna height setup in Mergin Maps mobile app")
3434

3535
:::tip
36-
GPS antenna height can be recorded during the survey by using the [extra position variable](../../layer/position_variables/) `@position_gps_antenna_height` as a [default value](../../layer/form-configuration/#default-values).
36+
GPS antenna height can be recorded during the survey by using the [extra position variable](../../layer/variables/#position-variables) `@position_gps_antenna_height` as a [default value](../../layer/default-values/).
3737
:::
3838

3939
## External GPS on Android

src/field/gps_accuracy/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Tapping the GPS button opens the [GPS info panel](../mobile-app-ui/#current-posi
1919

2020
If you'd like to have higher accuracy, you can wait for your device to acquire a better GPS signal. For precise measurements, you may need to connect your device to an [external GPS](../external_gps/).
2121

22-
When assessing the overall quality of the survey, it may be beneficial to record some [extra position variables](../../layer/position_variables/), such as type and name of the used GPS device, the horizontal and vertical accuracy or the horizontal, vertical or position dilution of precision (HDOP, VDOP, PDOP).
22+
When assessing the overall quality of the survey, it may be beneficial to record some [position variables](../../layer/variables/#position-variables), such as type and name of the used GPS device, the horizontal and vertical accuracy or the horizontal, vertical or position dilution of precision (HDOP, VDOP, PDOP).
2323

2424

2525
:::tip

src/field/layers/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The **Layers** button is located in the bottom navigation panel.
99

1010
It provides the overview of layers and features in your <MainPlatformNameLink /> project in <MobileAppName />, as well as the option to turn the visibility of specific layers on/off or to see a layer's legend.
1111

12-
![Layers in Mergin Maps mobile app](../../layer/non-spatial-data/mobile-app-non-spatial-layers.jpg "Layers in Mergin Maps mobile app")
12+
![Layers in Mergin Maps mobile app](./mobile-app-non-spatial-layers.jpg "Layers in Mergin Maps mobile app")
1313

1414
## Layers visibility
1515

src/layer/non-spatial-data/mobile-app-non-spatial-layers.jpg renamed to src/field/layers/mobile-app-non-spatial-layers.jpg

File renamed without changes.

src/layer/non-spatial-data/mobile-app-non-spatial-layers.xcf renamed to src/field/layers/mobile-app-non-spatial-layers.xcf

File renamed without changes.

0 commit comments

Comments
 (0)