Skip to content

Commit 4c7d417

Browse files
authored
Vitepress - list formatting + Windows download component update (#595)
* collapsed sidebar + fix download for win icon * tutorial formatting * update link to mm mobile for windows download
1 parent 717e217 commit 4c7d417

27 files changed

Lines changed: 143 additions & 97 deletions

File tree

src/.vitepress/components/AppDownload.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a href='https://play.google.com/store/apps/details?id=uk.co.lutraconsulting' target="_blank" rel="noopener noreferrer" @click="gtmEvent('google')" class="google-play-btn">
77
<img class="google_play" :src="withBase('/google-play-badge.png')" alt="Get it on Google Play">
88
</a>
9-
<a href='https://github.com/MerginMaps/input/releases/latest' target="_blank" rel="noopener noreferrer" @click="gtmEvent('windows')">
9+
<a href='https://github.com/MerginMaps/mobile/releases/latest' target="_blank" rel="noopener noreferrer" @click="gtmEvent('windows')">
1010
<img class="windows" :src="withBase('/app_download_windows.png')" alt="Available on Windows">
1111
</a>
1212
</div>
@@ -53,17 +53,17 @@ img {
5353
5454
img.app_store {
5555
padding: 11px;
56-
height: 48px;
56+
height: 60px;
5757
}
5858
5959
img.google_play {
6060
padding: 11px;
61-
height: 48px;
61+
height: 60px;
6262
}
6363
6464
img.windows {
6565
padding: 11px;
66-
height: 48px;
66+
height: 60px;
6767
}
6868
6969
</style>

src/.vitepress/sidebar/en.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export default {
22
'/': [
33
{
44
text: 'Get Started', // required
5-
collapsed: false,
5+
collapsed: true,
66
items: [
77
{ text: 'Capturing Your First Field Data', link: '/tutorials/capturing-first-data/' },
88
{ text: 'Opening Surveyed Data on Your Computer', link: '/tutorials/opening-surveyed-data-on-your-computer/' },
@@ -14,7 +14,7 @@ export default {
1414
},
1515
{
1616
text: 'Install & Sign Up', // required
17-
collapsed: false,
17+
collapsed: true,
1818
items: [
1919
{ text: 'How to Install Mergin Maps Mobile App', link: '/setup/install-mobile-app/' },
2020
{ text: 'How to Sign Up to Mergin Maps', link: '/setup/sign-up-to-mergin-maps/' },
@@ -24,7 +24,7 @@ export default {
2424
},
2525
{
2626
text: 'Manage Account & Project', // required
27-
collapsed: false,
27+
collapsed: true,
2828
items: [
2929
{ text: 'User Account', link: '/manage/account/' },
3030
{ text: 'Workspaces', link: '/manage/workspaces/' },
@@ -46,7 +46,7 @@ export default {
4646
},
4747
{
4848
text: 'Setup GIS Project', // required
49-
collapsed: false,
49+
collapsed: true,
5050
items: [
5151
{ text: 'QGIS Project Preparation', link: '/gis/features/' },
5252
{ text: 'Sorting and Search Setup', link: '/gis/search_data/' },
@@ -61,7 +61,7 @@ export default {
6161
},
6262
{
6363
text: 'Configure Survey Layer', // required
64-
collapsed: false,
64+
collapsed: true,
6565
items: [
6666
{ text: 'Best Practice Tips for Layers and Forms', link: '/layer/best-practice/' },
6767
{ text: 'Setting Up Widgets in Attributes Form', link: '/layer/form-widgets/' },
@@ -79,7 +79,7 @@ export default {
7979
},
8080
{
8181
text: 'Fieldwork Tips', // required
82-
collapsed: false,
82+
collapsed: true,
8383
items: [
8484
{ text: 'Mergin Maps Mobile App Interface', link: '/field/mobile-app-ui/' },
8585
{ text: 'Offline Use of Mergin Maps Mobile App', link: '/field/offline-use/' },
@@ -97,7 +97,7 @@ export default {
9797
},
9898
{
9999
text: 'For Developers', // required
100-
collapsed: false,
100+
collapsed: true,
101101
items: [
102102
{ text: 'Custom Mobile App', link: '/dev/customapp/' },
103103
{ text: 'Integrate Mergin Maps', link: '/dev/integration/' },
@@ -109,7 +109,7 @@ export default {
109109
},
110110
{
111111
text: 'Custom Server', // required
112-
collapsed: false,
112+
collapsed: true,
113113
items: [
114114
{ text: 'Overview', link: '/server/' },
115115
{ text: 'Install', link: '/server/install/' },
@@ -123,7 +123,7 @@ export default {
123123
},
124124
{
125125
text: 'Migrate', // required
126-
collapsed: false,
126+
collapsed: true,
127127
items: [
128128
{ text: 'Migrate from QField', link: '/migrate/qfield/' },
129129
{ text: 'Migrate from ArcGIS', link: '/migrate/arcgis/' },
@@ -132,7 +132,7 @@ export default {
132132
},
133133
{
134134
text: 'Support & Legal', // required
135-
collapsed: false,
135+
collapsed: true,
136136
items: [
137137
{ text: 'Licensing', link: '/misc/licensing/' },
138138
{ text: 'Troubleshoot', link: '/misc/troubleshoot/' },

src/manage/account/index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ It is not possible to change the username. If you wish to use a different userna
1111

1212
1. Log in to <AppDomainNameLink />.
1313

14-
In the upper right corner of the screen, click on your username and go to **Your profile**.
15-
14+
In the upper right corner of the screen, click on your username and go to **Your profile**.
1615
![Mergin Maps profile](../dashboard/mergin-maps-dashboard-profile.jpg "Mergin Maps profile")
1716

1817
2. Click on the **Edit account** button.
@@ -25,8 +24,7 @@ It is not possible to change the username. If you wish to use a different userna
2524

2625
1. Log in to <AppDomainNameLink />.
2726

28-
In the upper right corner of the screen, click on your username and go to **Your profile**.
29-
27+
In the upper right corner of the screen, click on your username and go to **Your profile**.
3028
![Mergin Maps profile](../dashboard/mergin-maps-dashboard-profile.jpg "Mergin Maps profile")
3129

3230
2. Click on the **Change password** button and set a new password.

src/manage/create-project/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ When creating a project, keep in mind that its name cannot be changed later.
2020
To work with <MainPlatformName /> projects in QGIS, you will need to [install the <QGISPluginName />](../../setup/install-mergin-maps-plugin-for-qgis/) first.
2121

2222
1. Open a blank or an existing project in QGIS.
23+
2324
2. Click on **Create Mergin Maps Project** from the toolbar.
2425
![Create project icon in Mergin Maps QGIS plugin](../../tutorials/creating-a-project-in-qgis/qgis-create-mergin-project.jpg "Create project icon in Mergin Maps QGIS plugin")
2526

@@ -36,7 +37,6 @@ To work with <MainPlatformName /> projects in QGIS, you will need to [install th
3637
4. Change the workspace (if needed), name the project and select a path where your project folder and associated files will be generated.
3738

3839
Keep in mind that the project name cannot be changed later.
39-
4040
![New Mergin Maps project name and folder](./mergin_plugin_project_wizard_4.jpg "New Mergin Maps project name and folder")
4141

4242
:::danger WARNING
@@ -49,10 +49,10 @@ The new <MainPlatformName /> project will be created locally on your computer an
4949
Using <QGISPluginName />, you can make a copy of projects you have access to.
5050

5151
1. Navigate to **Mergin Maps** in the **Browser panel**.
52+
5253
2. Find the project you want to clone. Right-click on it and select **Clone**.
5354

5455
You might need to [switch to another workspace](../workspaces/#switch-workspaces-in-qgis) to locate the project.
55-
5656
![Clone Mergin Maps project in QGIS](./plugin-clone.jpg "Clone Mergin Maps project in QGIS")
5757

5858
3. Select the **workspace** from the drop-down menu and enter your new **Project Name**. Click **OK**.
@@ -66,13 +66,13 @@ The project will be saved in the selected workspace.
6666
:::
6767

6868
1. Open the <MobileAppNameShort /> on your mobile device
69+
6970
2. Navigate to the **Home** tab and tap **Create project**
7071
![Create project in Mergin Maps mobile app](./mobile-app-create-project.jpg "Create project in Mergin Maps mobile app")
7172

7273
3. Give the project a name. Keep in mind that the name cannot be changed later.
7374

7475
Press **Create project**.
75-
7676
![Mergin Maps mobile app new project name](./mobile-app-create-project-name-fields.jpg "Mergin Maps mobile app new project name")
7777

7878
4. Your new project will be created locally on your mobile device
@@ -90,6 +90,7 @@ The preferred way of creating a project is to use the <QGISPluginNameShort />. T
9090
:::
9191

9292
1. Navigate to <AppDomainNameLink /> and sign in.
93+
9394
2. In the **Projects** tab, click on **Create project**
9495
![Create Mergin Maps project through dashboard](./dashboard-create-project.jpg "Create Mergin Maps project through dashboard")
9596

@@ -110,7 +111,6 @@ Projects you have access to and [public projects](../permissions/#public-and-pri
110111
1. In the **Projects** tab, find the project you want to clone, open it and click on **Clone**.
111112

112113
If needed, [switch to another workspace](../workspaces/#switch-workspaces-in-qgis) to locate the project.
113-
114114
![Mergin Maps dashboard Cloning project from your workspace](./dashboard-clone-project.jpg "Mergin Maps dashboard - Cloning project from your workspace")
115115

116116
2. Enter the name of the cloned project. If needed, change the target workspace.

src/manage/dashboard/index.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Use **Dashboard** in the left panel to go back to the homepage
1111

1212
## Projects
1313
The **Projects** tab in the left panel displays the overview of the projects that are available to you in this workspace.
14+
1415
![Mergin Maps dashboard projects tab](./mergin-maps-dashboard-projects.jpg "Mergin Maps dashboard projects tab")
1516

1617
Here, you can:
@@ -22,12 +23,14 @@ Here, you can:
2223
When you click on a project, you will see the overview of its content. Files can simply be **uploaded** to the project using drag and drop.
2324

2425
In the right upper corner, you will find buttons to **download** and [**clone**](../create-project/#clone-an-existing-project-through-mergin-maps-dashboard) the project.
26+
2527
![Mergin Maps dashboard project details](./mergin-maps-project-details.jpg "Mergin Maps dashboard project details")
2628

2729
### Project files
2830
In **Files**, you can see the list of all files associated with the project.
2931

3032
Click on a file to see when it was modified, its size, to download or delete it.
33+
3134
![Detail of a file in Mergin Maps project](./mergin-maps-dashboard-file-detail.jpg "Detail of a file in Mergin Maps project")
3235

3336
### Webmaps
@@ -39,9 +42,11 @@ More details about this functionality can be found in the [Webmaps](../dashboard
3942

4043
### History
4144
The **History** tab contains an overview of available project versions that can be also downloaded to your computer.
45+
4246
![Project history in Mergin Maps dashboard](./mergin-maps-dashboard-project-history.jpg "Project history in Mergin Maps dashboard")
4347

4448
You can click on a specific version to see more details.
49+
4550
![Project version details in Mergin Maps dashboard](./mergin-maps-dashboard-project-history-version.jpg "Project version details in Mergin Maps dashboard")
4651

4752
You can learn more about project history and how to revert to an older version in [Project History and Versions](../project-history/).
@@ -95,6 +100,7 @@ In the **Settings** tab, you will find information about the current workspace.
95100

96101
## User profile
97102
**Your profile** can be accessed by clicking on the user name in the upper right corner.
103+
98104
![Mergin Maps dashboard user profile](./mergin-maps-dashboard-profile.jpg "Mergin Maps dashboard user profile")
99105

100106
Here you can edit your account details (such as name or e-mail address), change password, manage notifications about workspace activity and close your account.
@@ -103,9 +109,10 @@ Here you can edit your account details (such as name or e-mail address), change
103109

104110
## Manage workspaces
105111
Click on the user name in the upper right corner and click on **Manage workspaces** to see the overview of workspaces to which you have access as a guest, member or owner.
112+
106113
![Mergin Maps dashboard manage workspaces](./mergin-maps-dashboard-manage-workspaces.jpg "Mergin Maps dashboard manage workspaces")
107114

108115
Here you can [**create a new workspace**](../workspaces/#how-to-create-a-new-workspace), leave a workspace and accept/decline invitations to other users' workspaces.
109-
![Mergin Maps web workspaces overview](./mergin-maps-dashboard-workspaces.jpg "Mergin Maps web workspaces overview")
110116

117+
![Mergin Maps web workspaces overview](./mergin-maps-dashboard-workspaces.jpg "Mergin Maps web workspaces overview")
111118

src/manage/delete-files/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Download and archive the data before deleting them if they may be needed in the
1313
Deleting files through <MainDomainName /> is simple. However, you can only delete one file at a time.
1414

1515
1. Log in to <AppDomainNameLink /> and navigate to your project.
16+
1617
2. In the **Files** tab you will see the list of files that are stored in the project's folder.
1718

1819
Select the file you would like to delete.
@@ -28,13 +29,14 @@ Deleting files through <MainDomainName /> is simple. However, you can only delet
2829
If you want to delete multiple files, the best way to do this is on your computer.
2930

3031
1. [Download the project](../plugin/#downloading-a-project-in-qgis) to your computer using <QGISPluginName />.
32+
3133
2. Navigate to the [project's folder](../project/#mergin-maps-project-folder) in your file browser and review the files inside the folder. There may be a [custom folder for photos](../../layer/photos/#how-to-set-up-a-custom-folder-for-storing-photos) if it was set up before.
3234

3335
Delete the files you do not want to keep anymore.
3436
![Mergin Maps project files in PC folder](./folder-files.jpg "Mergin Maps project files folder")
37+
3538
3. [Synchronise the changes](../synchronisation/#synchronising-changes-in-qgis) in QGIS using <QGISPluginName />.
3639

3740
**Local changes** in **Project status** will show the list of deleted files. After synchronisation, the files will be also deleted from the cloud.
38-
3941
![QGIS Mergin Maps project status synchronisation](./project-status.jpg "QGIS Mergin Maps project status")
4042

src/manage/missing-data/index.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,42 @@ This folder is accessible only from a computer, so you might not see it in your
4646
The <MobileAppNameShort /> supports iTunes file sharing. Note that iTunes doesn't allow you to browse or edit data from the app data folder, only allows you to delete or copy the data folder to another location.
4747

4848
You can access your data by following these steps:
49+
4950
1. Plug iOS device to a computer
51+
5052
2. Open `Finder` file browser
53+
5154
3. Go to Locations and select your `<device_name>`
52-
![Plugged iOS device Locations iTunes](./itunes.jpg "iTunes iOS device plugged to a computer")
55+
![Plugged iOS device Locations iTunes](./itunes.jpg "iTunes iOS device plugged to a computer")
56+
5357
4. Click on the tab named `files`
58+
5459
5. Select `Input` app from a list to see a data folder
55-
![Mergin Maps mobile app files accessed through iTunes](./itunes2.jpg "Mergin Maps mobile app files accessed through iTunes")
56-
6 Drag-and-drop the `INPUT` folder to another location to see the content
60+
![Mergin Maps mobile app files accessed through iTunes](./itunes2.jpg "Mergin Maps mobile app files accessed through iTunes")
61+
62+
6. Drag-and-drop the `INPUT` folder to another location to see the content
5763

5864
### Manual data transfer (between iOS and Windows)
5965
Here are the steps to transfer the data from iPhone/iPad to a Windows PC.
6066

6167
1. Make sure you have installed [iTunes](https://support.apple.com/en-us/HT210384)
68+
6269
2. Sign into iTunes
70+
6371
3. [Connect your iOS device to the PC](https://support.apple.com/en-gb/guide/iphone/iph42d9b3178/15.0/ios/15.0) and unlock the screen
72+
6473
4. In iTunes, click on the phone icon in the toolbar
65-
![iTunes phone icon](./ios_win_itunes.jpg "iTunes phone icon")
74+
![iTunes phone icon](./ios_win_itunes.jpg "iTunes phone icon")
75+
6676
5. From the left panel, select **File Sharing**
77+
6778
6. Select **Input** in Apps tab
79+
6880
7. Under Input Documents, select **INPUT** folder
81+
6982
8. Press **Save...**
70-
![iTunes save Mergin Maps mobile app files](./ios_win_itunes_input.jpg "iTunes save Mergin Maps mobile app files")
83+
![iTunes save Mergin Maps mobile app files](./ios_win_itunes_input.jpg "iTunes save Mergin Maps mobile app files")
84+
7185
9. Select a path to save the folder on your computer.
7286

7387
## Next steps

src/manage/permissions/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Editors can:
2727
- **Admin**: This role is only available for workspace members. In addition to the **Write** access, admins can [delete the project](../project-advanced/#delete-a-project) or [transfer](../project-advanced/#transfer-a-project) it to another workspace. They can also create new projects and manage workspace members.
2828
- **Owner**: In addition to the **Admin** access, owners can also access [invoicing and subscription](../subscriptions/) settings. **Owner** has full access to the project or workspace.
2929

30-
3130
:::tip
3231
Invoices can be made accessible also to a person that is not a workspace member, such as someone from your accounting department. They can [access the subscription management portal using a link](../subscriptions/#accessing-subscription-management-portal-directly-without-mergin-maps-account).
3332
:::
@@ -77,11 +76,13 @@ Although the roles of workspace members define the level of access to projects i
7776
Users can be [added to a workspace](../project-advanced/#add-users-to-a-workspace) as guests and members through the [Members](../dashboard/#members) tab on the <DashboardShortLink />.
7877

7978
Here, you can also manage the member roles:
79+
8080
![Mergin Maps dashboard members tab](../dashboard/mergin-maps-dashboard-members.jpg "Mergin Maps dashboard members tab")
8181

8282
Project permissions can be reviewed in the details of a project in the **Collaborators** tab where you can find the list of users who can access the project and their project permissions.
8383

8484
If needed, the project permissions can be changed here:
85+
8586
![Changing project permissions in Mergin Maps dashboard](./dashboard-project-permissions-change.jpg "Changing project permissions in Mergin Maps dashboard")
8687

8788
## How to transfer ownership of a workspace
@@ -98,7 +99,9 @@ When transferring ownership of a workspace, you might also need to [update billi
9899
To transfer the ownership of a workspace to a user that is not yet a member of your workspace, follow the steps in [How to add users to a workspace](../project-advanced/#add-users-to-a-workspace) and set the **member role** to **Owner**. The new owner has to accept the invitation.
99100

100101
To transfer the ownership of a workspace to a user that is already a member of your workspace, you have to change their member role to **Owner**:
102+
101103
1. Log in to <AppDomainNameLink />
104+
102105
2. Navigate to the **Members** tab. Here, you will see the list of current workspace members and their roles.
103106
![Mergin Maps dashboard members tab](../dashboard/mergin-maps-dashboard-members.jpg "Mergin Maps dashboard members tab")
104107

0 commit comments

Comments
 (0)