diff --git a/start/img/online_demo-001.png b/start/img/online_demo-001.png index 50618eeb..f6b44d4c 100644 Binary files a/start/img/online_demo-001.png and b/start/img/online_demo-001.png differ diff --git a/usage/accounts_user_profile/new_account/img/confirm_logout.png b/usage/accounts_user_profile/new_account/img/confirm_logout.png index 27a59b24..d01d8f95 100644 Binary files a/usage/accounts_user_profile/new_account/img/confirm_logout.png and b/usage/accounts_user_profile/new_account/img/confirm_logout.png differ diff --git a/usage/accounts_user_profile/new_account/img/logout_link.png b/usage/accounts_user_profile/new_account/img/logout_link.png index bb5e058c..369e0777 100644 Binary files a/usage/accounts_user_profile/new_account/img/logout_link.png and b/usage/accounts_user_profile/new_account/img/logout_link.png differ diff --git a/usage/accounts_user_profile/new_account/img/register_form.png b/usage/accounts_user_profile/new_account/img/register_form.png index 0414ad5e..2bc31e5a 100644 Binary files a/usage/accounts_user_profile/new_account/img/register_form.png and b/usage/accounts_user_profile/new_account/img/register_form.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/associate_email.png b/usage/accounts_user_profile/updating_profile/img/associate_email.png index 85ad487f..94e5b530 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/associate_email.png and b/usage/accounts_user_profile/updating_profile/img/associate_email.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/associate_new_email.png b/usage/accounts_user_profile/updating_profile/img/associate_new_email.png index 1ba7b9c7..1b2180a9 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/associate_new_email.png and b/usage/accounts_user_profile/updating_profile/img/associate_new_email.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/change_password.png b/usage/accounts_user_profile/updating_profile/img/change_password.png index 6b43f4f4..784f0f47 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/change_password.png and b/usage/accounts_user_profile/updating_profile/img/change_password.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/favorites_resources.png b/usage/accounts_user_profile/updating_profile/img/favorites_resources.png deleted file mode 100644 index 8f21a992..00000000 Binary files a/usage/accounts_user_profile/updating_profile/img/favorites_resources.png and /dev/null differ diff --git a/usage/accounts_user_profile/updating_profile/img/notifications_settings.png b/usage/accounts_user_profile/updating_profile/img/notifications_settings.png index 18c0846f..11c220ba 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/notifications_settings.png and b/usage/accounts_user_profile/updating_profile/img/notifications_settings.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/notifications_settings1.png b/usage/accounts_user_profile/updating_profile/img/notifications_settings1.png index 70b04549..5f495a3e 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/notifications_settings1.png and b/usage/accounts_user_profile/updating_profile/img/notifications_settings1.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/primary_email.png b/usage/accounts_user_profile/updating_profile/img/primary_email.png index c4902b98..ea00e835 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/primary_email.png and b/usage/accounts_user_profile/updating_profile/img/primary_email.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/profile_link.png b/usage/accounts_user_profile/updating_profile/img/profile_link.png index bc5246c1..68e69c88 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/profile_link.png and b/usage/accounts_user_profile/updating_profile/img/profile_link.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/user_activities.jpg b/usage/accounts_user_profile/updating_profile/img/user_activities.jpg deleted file mode 100644 index 9b06775b..00000000 Binary files a/usage/accounts_user_profile/updating_profile/img/user_activities.jpg and /dev/null differ diff --git a/usage/accounts_user_profile/updating_profile/img/user_activities.png b/usage/accounts_user_profile/updating_profile/img/user_activities.png new file mode 100644 index 00000000..c4b1e0bb Binary files /dev/null and b/usage/accounts_user_profile/updating_profile/img/user_activities.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/user_profile_page.jpg b/usage/accounts_user_profile/updating_profile/img/user_profile_page.jpg deleted file mode 100644 index e84d01f9..00000000 Binary files a/usage/accounts_user_profile/updating_profile/img/user_profile_page.jpg and /dev/null differ diff --git a/usage/accounts_user_profile/updating_profile/img/user_profile_page.png b/usage/accounts_user_profile/updating_profile/img/user_profile_page.png new file mode 100644 index 00000000..8827c2a4 Binary files /dev/null and b/usage/accounts_user_profile/updating_profile/img/user_profile_page.png differ diff --git a/usage/accounts_user_profile/updating_profile/img/user_profile_update_info.png b/usage/accounts_user_profile/updating_profile/img/user_profile_update_info.png index 91bd9025..a4af3e47 100644 Binary files a/usage/accounts_user_profile/updating_profile/img/user_profile_update_info.png and b/usage/accounts_user_profile/updating_profile/img/user_profile_update_info.png differ diff --git a/usage/accounts_user_profile/updating_profile/index.rst b/usage/accounts_user_profile/updating_profile/index.rst index 8293505c..29772bac 100644 --- a/usage/accounts_user_profile/updating_profile/index.rst +++ b/usage/accounts_user_profile/updating_profile/index.rst @@ -17,7 +17,7 @@ So, click on your profile picture in the top right of the screen. A drop-down li The *Profile* page looks like the one shown in the picture below. -.. figure:: img/user_profile_page.jpg +.. figure:: img/user_profile_page.png :align: center *User profile page* @@ -30,7 +30,7 @@ On the right side of the page there are many useful links to edit personal infor The :guilabel:`My Activities` link allows to see all your recent activities on GeoNode such as datasets uploading and maps creation. -.. figure:: img/user_activities.jpg +.. figure:: img/user_activities.png :align: center *Recent activities* diff --git a/usage/dashboard/img/create_dashboard.png b/usage/dashboard/img/create_dashboard.png index eb4cc2ef..f7796755 100644 Binary files a/usage/dashboard/img/create_dashboard.png and b/usage/dashboard/img/create_dashboard.png differ diff --git a/usage/dashboard/img/create_dashboard_link.png b/usage/dashboard/img/create_dashboard_link.png index 7fe75401..3b0d2a92 100644 Binary files a/usage/dashboard/img/create_dashboard_link.png and b/usage/dashboard/img/create_dashboard_link.png differ diff --git a/usage/dashboard/img/dashboard_1.png b/usage/dashboard/img/dashboard_1.png new file mode 100644 index 00000000..25c53091 Binary files /dev/null and b/usage/dashboard/img/dashboard_1.png differ diff --git a/usage/dashboard/img/new_dashboard.png b/usage/dashboard/img/new_dashboard.png deleted file mode 100644 index 0984bb12..00000000 Binary files a/usage/dashboard/img/new_dashboard.png and /dev/null differ diff --git a/usage/dashboard/index.rst b/usage/dashboard/index.rst index 7007ea21..6ca0cbfe 100644 --- a/usage/dashboard/index.rst +++ b/usage/dashboard/index.rst @@ -21,9 +21,9 @@ To build a new Dashboard go to :guilabel:`Add Resource` option on the *All Resou *Create dashboard from Dashboards page* -Now you landed on the Dashboard edition page that is composed of the following sections: +Now you landed on the Dashboard edition page that you can start to create a dashboard: -.. figure:: https://mapstore.readthedocs.io/en/latest/user-guide/img/exploring-dashboards/dashboard-1.jpg +.. figure:: img/dashboard_1.png :align: center *New Dashboard Apps option* diff --git a/usage/data/finding_data.rst b/usage/data/finding_data.rst index 3d76b117..a4263b19 100644 --- a/usage/data/finding_data.rst +++ b/usage/data/finding_data.rst @@ -32,9 +32,6 @@ Try to set some filter and see how the resulting data list changes accordingly. Data can be ordered by Most recent, Less recent, Name and Popularity. -.. figure:: img/ordering_link.png - :align: center - *Ordering Link* .. figure:: img/ordering_data.png :align: center diff --git a/usage/data/img/data_menu.png b/usage/data/img/data_menu.png index 0b3ea39c..cbbf4a23 100644 Binary files a/usage/data/img/data_menu.png and b/usage/data/img/data_menu.png differ diff --git a/usage/data/img/ordering_data.png b/usage/data/img/ordering_data.png index eb3e87c8..2acf4644 100644 Binary files a/usage/data/img/ordering_data.png and b/usage/data/img/ordering_data.png differ diff --git a/usage/data/img/ordering_link.png b/usage/data/img/ordering_link.png deleted file mode 100644 index 2a1ab971..00000000 Binary files a/usage/data/img/ordering_link.png and /dev/null differ diff --git a/usage/data/img/search_filter_by_extent.png b/usage/data/img/search_filter_by_extent.png index 72deaff6..7cedd849 100644 Binary files a/usage/data/img/search_filter_by_extent.png and b/usage/data/img/search_filter_by_extent.png differ diff --git a/usage/data/img/search_page.png b/usage/data/img/search_page.png index 08bfe5b9..7802d4f5 100644 Binary files a/usage/data/img/search_page.png and b/usage/data/img/search_page.png differ diff --git a/usage/data/img/search_tool.png b/usage/data/img/search_tool.png index a901f7f2..cb49a113 100644 Binary files a/usage/data/img/search_tool.png and b/usage/data/img/search_tool.png differ diff --git a/usage/geostory/img/add_media.png b/usage/geostory/img/add_media.png index aef53699..8c302d8f 100644 Binary files a/usage/geostory/img/add_media.png and b/usage/geostory/img/add_media.png differ diff --git a/usage/geostory/img/create_geostory.png b/usage/geostory/img/create_geostory.png index 2a5b5803..dfae8e8b 100644 Binary files a/usage/geostory/img/create_geostory.png and b/usage/geostory/img/create_geostory.png differ diff --git a/usage/geostory/img/create_geostory_link.png b/usage/geostory/img/create_geostory_link.png index 65e13bd1..cd3255ec 100644 Binary files a/usage/geostory/img/create_geostory_link.png and b/usage/geostory/img/create_geostory_link.png differ diff --git a/usage/geostory/img/new_geostory.png b/usage/geostory/img/new_geostory.png deleted file mode 100644 index cbc92b31..00000000 Binary files a/usage/geostory/img/new_geostory.png and /dev/null differ diff --git a/usage/geostory/img/save_geostory.png b/usage/geostory/img/save_geostory.png deleted file mode 100644 index 082565ef..00000000 Binary files a/usage/geostory/img/save_geostory.png and /dev/null differ diff --git a/usage/managing_datasets/dataset_download.rst b/usage/managing_datasets/dataset_download.rst index f62c1ad3..f46a658e 100644 --- a/usage/managing_datasets/dataset_download.rst +++ b/usage/managing_datasets/dataset_download.rst @@ -4,36 +4,29 @@ Downloading Datasets ================== -At the top of the *Dataset Menu* there is an :guilabel:`Download` link where it is possible to download: +At the top of the *Dataset Menu* there is an :guilabel:`Download` link where it is possible to perform the following actions: -* Dataset +* Download the Dataset -* ISO Metadata +* Export in another format -* Dublin Core Metadata +* Download the ISO Metadata -Clicking the :guilabel:`ISO Metadata` or the :guilabel:`Dublin Core Metadata` exports the layer metadata in `xml` format. - -.. figure:: img/export_metadata.png +.. figure:: img/download_dataset.png :align: center - *Downloading Metadata* + *Downloading dataset* -Open the :guilabel:`Dataset` option you will be able to select from a list of options of the supported export file formats. +By selecting on the :guilabel:`Export data` option you will be able to select from a list of options of the supported export file formats. -.. figure:: img/export_dataset_form.png +.. figure:: img/export_dataset.png :align: center - *Downloading Datasets* - -As shown in the image above, GeoNode allows you to download a subset of data. Click on :guilabel:`Download filtered dataset` to download filtered data. + *Export Dataset in a different format* -On clicking Export, the file is prepared and a notification is showed when file is ready - -.. figure:: img/export_notification.png - :align: center +As shown in the image above, GeoNode allows you to download a subset of data. Click on :guilabel:`Crop dataset to the current viewport` to download filtered data. - *Export Ready* +On clicking Export, the file is prepared and a notification is showed when file is ready. To download the file to your machine, click on the export dataset icon. This opens the prepared export files and you can save the files on your by clicking on the save icon on each item. @@ -50,7 +43,7 @@ Printing -------------- | The `MapStore `_ based map viewer of GeoNode allows you to print the current view with a customizable layout. -| Click the :guilabel:`Print` option from the *Menu*, the **Printing Window** will open. +| Click the :guilabel:`Print` button, located on the right of the screen and the **Printing Window** will open. .. figure:: img/printing_window.png :align: center @@ -88,7 +81,7 @@ To print the view click on :guilabel:`Print`. Performing Measurements ----------------------- -Click on the :guilabel:`Measure` option of the *Menu* to perform a measurement. +Click on the :guilabel:`Measure` located on the right of the screen to perform a measurement. As you can see in the picture below, this tool allows you to measure *Distances*, *Areas* and the *Bearing* of lines. .. figure:: img/measuring.png diff --git a/usage/managing_datasets/dataset_editing.rst b/usage/managing_datasets/dataset_editing.rst index 65f32128..a1ed54ff 100644 --- a/usage/managing_datasets/dataset_editing.rst +++ b/usage/managing_datasets/dataset_editing.rst @@ -13,10 +13,11 @@ The :guilabel:`Edit` link in the menu of the *Dataset Page* opens a list of opt In that options list, you can see three options listed as: 1. *Edit Data* -2. *Edit Styles* -3. *Edit Metadata* -4. *Upload Style* +2. *Edit Style* +3. *Map layer settings +4. *Edit Metadata* 5. *Upload Metadata* +6. *Update Dataset* In this section you will learn how to edit a *Dataset*, and its data. See :ref:`dataset-metadata` to learn how to explore the dataset *Metadata*, how to upload and edit them. The *Styles* will be covered in a dedicated section, see :ref:`dataset-style`. @@ -72,7 +73,7 @@ Now you can: .. note:: When your new feature has a multi-vertex shape you have to double-click the last vertex to finish the drawing. -.. figure:: img/create_new_feature.png +.. figure:: img/create_new_features.png :align: center *Create New Feature* diff --git a/usage/managing_datasets/dataset_info.rst b/usage/managing_datasets/dataset_info.rst index 3ba9d70c..cd2ae5ca 100644 --- a/usage/managing_datasets/dataset_info.rst +++ b/usage/managing_datasets/dataset_info.rst @@ -3,7 +3,7 @@ Dataset Information ================= -From the *Dataset Search Page* (see :ref:`finding-data`) you can select the dataset you are interested in and click on its name to see an overview about it. +From the *Dataset Search Page* (see :ref:`finding-data`) you can select the :guilabel:`Open properties` icon from the dataset you are interested in to see an overview about it. .. figure:: img/dataset_overview.png :align: center @@ -31,38 +31,52 @@ By clicking on the copy icons you have a copy of the current *Bounding Box* or t *Bounding Box and Center* -* The *Attributes* tab shows the data structure behind the dataset. All the attributes are listed and for each of them some statistics (e.g. the range of values) are estimated (if possible). +* The *Assets* tab presents the current dataset's download link. Moreover, the user is able to add additional assets that are related to this dataset. + +.. figure:: img/dataset_assets.png + :align: center + + *Dataset Attributes tab* + +* The *Data* tab shows the data structure behind the dataset. All the attributes are listed and for each of them some statistics (e.g. the range of values) are estimated (if possible). .. figure:: img/dataset_attributes_tab.png :align: center *Dataset Attributes tab* -* The *Linked Resources* tab shows the resources, that can be *Documents*, *Maps*, *GeoStories* and *Dashboards*, linked to the dataset. +* The *Share* tab allows to the owner of the dataset to edit its permissions. -.. figure:: img/dataset_linked_resources.png +.. figure:: img/dataset_share.png :align: center *Dataset Linked Resources tab* -.. note:: When a resource is `linked from` the dataset the link is shown under the *Linked by* list while when a resource is `linked to` the dataset the link is shown under the *Used by* list +* The *Settings* tab allows to the owner of the dataset to define a group, the publishing status, and more options (e.g Approved). -From the right toolbar on the **Info** panel it is possible: +.. figure:: img/dataset_settings.png + :align: center + + *Dataset Settings tab* + +From the upper left toolbar on the thumbnail part of the properties panel it is possible to: .. figure:: img/dataset_info_toolbar.png :align: center *Dataset Info toolbar* -* Add dataset in your *Favorites* (see :ref:`editing-profile`), clicking on star icon. - -* Directly *Download* the dataset oh `ShapeFile` format +* Upload a new thumbnail for this dataset +* Set a thumbnail by using the full extent of the dataset +* Remove the thumbnail -* *Share* the dataset url +While from the low right toolbar on the thumbnail part of the properties panel it is possible to: -* Copy the *WMS Capabilities url* +* Save the current changes of the dataset +* Download the dataset +* Copy the resource URL +* Copy the OGC resource web services URL -* Change the dataset *Title* by clicking on it You can access the dataset details page by clicking on *View dataset* in the overview panel. That page looks like the one shown in the picture below. diff --git a/usage/managing_datasets/dataset_metadata.rst b/usage/managing_datasets/dataset_metadata.rst index df857d55..e81b4ea4 100644 --- a/usage/managing_datasets/dataset_metadata.rst +++ b/usage/managing_datasets/dataset_metadata.rst @@ -13,132 +13,48 @@ Editing Metadata You can open the *Metadata* form of a *Dataset* by clicking the :guilabel:`Edit Metadata` link from the :guilabel:`Edit` options on the *Dataset Page*. -* **Basic Metadata** - The first two steps are mandatory (no datasets will be published if the required information are not provided) whereas the last two are optional. - - .. figure:: img/basic_dataset_metadata.png + .. figure:: img/dataset_metadata_1.png :align: center - *Basic Dataset Metadata* + *Dataset Metadata form* - In the first step the system asks you to insert the following metadata: + In the first fields the system asks you to insert metadata including: - * *Thumbnail* of the dataset (click :guilabel:`Edit` to change it); * *Title* of the dataset, which should be clear and understandable; - * *Abstract*; brief narrative summary of the content of the dataset - - .. note:: The *Abstract* panel allows you to insert HTML code through a *wysiwyg* text editor - - * *Creation/Publication/Revision Dates* which define the time period that is covered by the dataset; + * *Abstract*, brief narrative summary of the content of the dataset + * *Date / Date type* * *Keywords*, which should be chosen within the available list. The contributor search for available keywords by clicking on the searching bar, or on the folder logo representing, or by entering the first letters of the desired word; * *Category* which the dataset belongs to; - * *Group* which the dataset is linked to. + * *Keywords from Thesaurus* + * *Keywords* which are simple keywords for the dataset -* **Location and Licenses** + Subsequently, more specialized metadata fields are presented in the metadata form: - .. figure:: img/location_licenses_dataset_metadata.png + .. figure:: img/dataset_metadata_2.png :align: center - *Location and Licenses Metadata for Datasets* + .. figure:: img/dataset_metadata_3.png + :align: center - The following list shows what kinds of metadata you are required to enter (see also the picture below): + *Dataset Metadata form* * *Language* of the dataset; * *License* of the dataset; - * *DOI* of the dataset; if available, this represents the `Digital Object Identifier `_ of the resource * *Attribution* of the dataset; authority or function assigned, as to a ruler, legislative assembly, delegate, or the like * *Regions*, which informs on the spatial extent covered by the dataset. Proposed extents cover the following scales: global, continental, regional, national; * *Data Quality statement* (general explanation of the data producer's knowledge about the lineage of a dataset); - * Potential *Restrictions* on dataset sharing. - - .. note:: The *Data Quality statement* and *Restrictions* panels allow you to insert HTML code through a *wysiwyg* text editor - - -* **Optional Metadata** - - .. figure:: img/optional_dataset_metadata.png - :align: center - - *Optional Dtaset Metadata* - - Complementary information are: - + * *Restrictions* on dataset sharing. + * *Other constraints*; + * *Edition*; Version nof cited resource + * *DOI* of the dataset; if available, this represents the `Digital Object Identifier `_ of the resource * *Edition* to indicate the reference or the source of the dataset; * *Purpose* of the dataset and its objectives; * *Supplemental information* that can provide a better understanding of the uploaded dataset; + * *Temporal extent start / Temporal extent end; * *Maintenance frequency* of the dataset; - * users who are *Responsible* for the dataset, its *Owner*, and the *Author* of its metadata; * *Spatial representation type* used. * *Related resources* to link one or multiple resources to the document. These will be visible inside the :ref:`dataset-info` panel - - .. note:: The *Purpose* and *Supplemental information* panels allow you to insert HTML code through a *wysiwyg* text editor - - -* **Dataset Attributes** - - .. figure:: img/dataset_attributes_dataset_metadata.png - :align: center - - *Dataset Attributes Metadata for Dataset* - - At this step you can enrich the dataset attributes with useful information like the following: - - * The *Label* displayed - * A detailed *Description* - * The *Display Order* - * The *Display Type*; the default value is *Label*, which means that the value of the attribute will be rendered as a plain text. - There's the possibility to instruct GeoNode to threat the values as different media-types. As an instance, if the values of the - selected attribute will contain image urls, by selecting the ``IMAGE`` *Display Type* you will allow GeoNode to render the image - directly when querying the dataset from the maps. The same for ``VIDEO``, ``AUDIO`` or ``IFRAME`` mime types. - * The *Visibile* flag; allows you to instruct GeoNode wether or not hiding an attribute from the *Get Feature Type* outcomes - - - It is possible to define a completely custom ``HTML`` template for the *Get Feature Type* outcome. That is possible by enabling the *Use a custom template* flag as shown in the figure below. - - - .. figure:: img/dataset_attributes_dataset_metadata_custom_ft.png - :align: center - - *Use a custom template* - - By using the keywork ``${properties.``, you can tell to GeoNode to render the actual value of the attribute on the map. - - - As an instance, the example below - - .. figure:: img/dataset_attributes_dataset_metadata_custom_ft_html.png - :align: center - - *Use a custom template: HTML* - - - Will render an ``HTML Table`` along with values as shown here below - - .. figure:: img/dataset_attributes_dataset_metadata_custom_ft_outcome.png - :align: center - - *Use a custom template: Get Feature Info outcome* - -Use :guilabel:`next >>` or :guilabel:`<< back` to navigate through those steps. Once you have finished click on :guilabel:`Update`. - -Some metadata are mandatory, if you miss any of that metadata the *Completeness* bar shows you a red message like the one in the picture below. - -.. figure:: img/completeness_progress_bar.png - :align: center - :width: 200px - - *Completeness Progress Bar* - -Metadata Advanced Editing -------------------------- - -In the *Edit Metadata* page the :guilabel:`Advanced Metadata` button is also available. - -.. figure:: img/advanced_edit_button.png - :align: center - - *The Advanced Metadata button* - -Click on it to display the *Metadata Advanced Editing Page*. That page allows you to edit all the dataset metadata described in the previous paragraph. Once you have finished to edit them click on :guilabel:`Update` to save your changes. + * *Contacts; + \ No newline at end of file diff --git a/usage/managing_datasets/dataset_permissions.rst b/usage/managing_datasets/dataset_permissions.rst index 0d4dff3c..d24cc720 100644 --- a/usage/managing_datasets/dataset_permissions.rst +++ b/usage/managing_datasets/dataset_permissions.rst @@ -3,7 +3,7 @@ Share Options ============= -In order to modify the Dataset *Share options* settings, on the detail page of the dataset click the :guilabel:`Share` link in the :guilabel:`Resource` menu. By default only owners can edit and manage datasets, anyone can view them. +In order to modify the Dataset *Share options* settings, on the detail page of the dataset click the :guilabel:`Share` tab in the properties table. By default only owners can edit and manage datasets, anyone can view them. .. figure:: img/change_dataset_permissions.png :align: center @@ -26,4 +26,4 @@ You can set the following share options: .. warning:: When assigning options to a group, all the group members will have those options. Be careful in case of editing them. -Click on :guilabel:`Save` link in the menu to save these settings. +To save the new share settings, click on :guilabel:`Resource` tab (from the navigation bar above the map) and then click on :guilabel:`Save`. diff --git a/usage/managing_datasets/dataset_styling.rst b/usage/managing_datasets/dataset_styling.rst index 4afa0378..6e4e4b87 100644 --- a/usage/managing_datasets/dataset_styling.rst +++ b/usage/managing_datasets/dataset_styling.rst @@ -19,28 +19,32 @@ In order to edit a dataset style, open the *Dataset Page* (see :ref:`dataset-inf *Edit Styles button* -The *Dataset* will open in a new *Map*. The *Styles Panel* will show you all the default style for the dataset and some useful tools. By default, the style will be showm in a text editor form. +The *Dataset* will open in a new *Map*. The *Styles Panel* will show you all the default style for the dataset and some useful tools. By default, a sample style will be shown in the map panel. .. figure:: img/styles_map_panel.png :align: center *The Styles Panel in the Map* -You could continue to change the style with the text editor or switch to a visualized editor using the :guilabel:`Visual editor` above the text editor. +The user is able to edit the default style, create new styles (as shown in the figure below) or delete a style by using the buttons in the upper part of the map panel: -The visual editor looks like this +.. figure:: img/create_new_style.png + :align: center + + *Create a new style* + +After creating a new style, you can apply it to the dataset. -.. figure:: img/visual_styles_map_panel.png +.. figure:: img/new_style.png :align: center - *Visual Styles Panel in the Map* + *New style applied* -You can then edit the style by clicking on each attribute of the style. Creating Style Rules ------------------- -In order to create a new rule, Three options are provided. +In order to create a new rule, you should start editing the selected style. Three options are provided. 1. Mark rule 2. Icon rule @@ -60,20 +64,23 @@ The rule you have chosen is now added on the top with default attributes which y *New style* -If the rule has errors, the following will be shown. +If the rule has errors, a popup message will inform the user that the style is invalid. -.. figure:: img/edit_style_error.png - :align: center +You can switch the rule ordering by dragging it to the top or bottom depending on your preference. It would be nice to change the style in order to decrease the opacity of the filling color as well as to reduce the lines width. +The embedded `MapStore `_ makes available a powerful *Style Editor* to accomplish that tasks. In the next paragraph we will explain how. - *Rule Error* +To apply the changes of each rule, click the :guilabel:`tick` button on the upper part of the style panel while to save the dataset's style click on :guilabel:`Save` on the top to save your changes. -You can switch the rule ordering by dragging it to the top or bottom depending on your preference. +.. figure:: img/save_style.png + :align: center + *Save the style* -It would be nice to change the style in order to decrease the opacity of the filling color as well as to reduce the lines width. -The embedded `MapStore `_ makes available a powerful *Style Editor* to accomplish that tasks. In the next paragraph we will explain how. +You can further edit the style with the text editor by selecting the :guilabel:`General` and :guilabel:`Display` tabs. -Each rule has a delete icon on the top right which you can use to remove the rule on the style. -Click on :guilabel:`Save` on the top to save your changes. +.. figure:: img/styles_map_panel_display.png + :align: center + + *Display tab on the Styles Panel* diff --git a/usage/managing_datasets/img/add_style_buttons.png b/usage/managing_datasets/img/add_style_buttons.png index 16bbd8db..ce9dc3b1 100644 Binary files a/usage/managing_datasets/img/add_style_buttons.png and b/usage/managing_datasets/img/add_style_buttons.png differ diff --git a/usage/managing_datasets/img/advanced_edit_button.png b/usage/managing_datasets/img/advanced_edit_button.png deleted file mode 100644 index fd4b7fe3..00000000 Binary files a/usage/managing_datasets/img/advanced_edit_button.png and /dev/null differ diff --git a/usage/managing_datasets/img/basic_dataset_metadata.png b/usage/managing_datasets/img/basic_dataset_metadata.png deleted file mode 100644 index d97bbafb..00000000 Binary files a/usage/managing_datasets/img/basic_dataset_metadata.png and /dev/null differ diff --git a/usage/managing_datasets/img/change_dataset_permissions.png b/usage/managing_datasets/img/change_dataset_permissions.png index 2a44d9f2..c1e0d6f8 100644 Binary files a/usage/managing_datasets/img/change_dataset_permissions.png and b/usage/managing_datasets/img/change_dataset_permissions.png differ diff --git a/usage/managing_datasets/img/completeness_progress_bar.png b/usage/managing_datasets/img/completeness_progress_bar.png deleted file mode 100644 index 47ac3712..00000000 Binary files a/usage/managing_datasets/img/completeness_progress_bar.png and /dev/null differ diff --git a/usage/managing_datasets/img/copy_locations_dataset.png b/usage/managing_datasets/img/copy_locations_dataset.png index 79d2fea9..a1751ef1 100644 Binary files a/usage/managing_datasets/img/copy_locations_dataset.png and b/usage/managing_datasets/img/copy_locations_dataset.png differ diff --git a/usage/managing_datasets/img/create_dataset_form.png b/usage/managing_datasets/img/create_dataset_form.png new file mode 100644 index 00000000..a7098be4 Binary files /dev/null and b/usage/managing_datasets/img/create_dataset_form.png differ diff --git a/usage/managing_datasets/img/create_dataset_link.png b/usage/managing_datasets/img/create_dataset_link.png index c167654a..643b786e 100644 Binary files a/usage/managing_datasets/img/create_dataset_link.png and b/usage/managing_datasets/img/create_dataset_link.png differ diff --git a/usage/managing_datasets/img/create_new_feature.png b/usage/managing_datasets/img/create_new_feature.png deleted file mode 100644 index 5ae745ed..00000000 Binary files a/usage/managing_datasets/img/create_new_feature.png and /dev/null differ diff --git a/usage/managing_datasets/img/create_new_features.png b/usage/managing_datasets/img/create_new_features.png new file mode 100644 index 00000000..d2bc61a4 Binary files /dev/null and b/usage/managing_datasets/img/create_new_features.png differ diff --git a/usage/managing_datasets/img/create_new_style.png b/usage/managing_datasets/img/create_new_style.png new file mode 100644 index 00000000..7e35b321 Binary files /dev/null and b/usage/managing_datasets/img/create_new_style.png differ diff --git a/usage/managing_datasets/img/create_new_style_from_templates.png b/usage/managing_datasets/img/create_new_style_from_templates.png deleted file mode 100644 index 5dd93b83..00000000 Binary files a/usage/managing_datasets/img/create_new_style_from_templates.png and /dev/null differ diff --git a/usage/managing_datasets/img/dataset_assets.png b/usage/managing_datasets/img/dataset_assets.png new file mode 100644 index 00000000..06c60fc8 Binary files /dev/null and b/usage/managing_datasets/img/dataset_assets.png differ diff --git a/usage/managing_datasets/img/dataset_attributes_dataset_metadata.png b/usage/managing_datasets/img/dataset_attributes_dataset_metadata.png deleted file mode 100644 index f3ee4125..00000000 Binary files a/usage/managing_datasets/img/dataset_attributes_dataset_metadata.png and /dev/null differ diff --git a/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft.png b/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft.png deleted file mode 100644 index 463ba095..00000000 Binary files a/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft.png and /dev/null differ diff --git a/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft_html.png b/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft_html.png deleted file mode 100644 index 4cb1e721..00000000 Binary files a/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft_html.png and /dev/null differ diff --git a/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft_outcome.png b/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft_outcome.png deleted file mode 100644 index 9def6484..00000000 Binary files a/usage/managing_datasets/img/dataset_attributes_dataset_metadata_custom_ft_outcome.png and /dev/null differ diff --git a/usage/managing_datasets/img/dataset_attributes_tab.png b/usage/managing_datasets/img/dataset_attributes_tab.png index 9157ffa5..a906b013 100644 Binary files a/usage/managing_datasets/img/dataset_attributes_tab.png and b/usage/managing_datasets/img/dataset_attributes_tab.png differ diff --git a/usage/managing_datasets/img/dataset_detail.png b/usage/managing_datasets/img/dataset_detail.png index 67c720ce..2e237b4a 100644 Binary files a/usage/managing_datasets/img/dataset_detail.png and b/usage/managing_datasets/img/dataset_detail.png differ diff --git a/usage/managing_datasets/img/dataset_editing_link.png b/usage/managing_datasets/img/dataset_editing_link.png index 82d50aab..253bfc4e 100644 Binary files a/usage/managing_datasets/img/dataset_editing_link.png and b/usage/managing_datasets/img/dataset_editing_link.png differ diff --git a/usage/managing_datasets/img/dataset_info.png b/usage/managing_datasets/img/dataset_info.png index c8b9c537..3b804d2a 100644 Binary files a/usage/managing_datasets/img/dataset_info.png and b/usage/managing_datasets/img/dataset_info.png differ diff --git a/usage/managing_datasets/img/dataset_info_toolbar.png b/usage/managing_datasets/img/dataset_info_toolbar.png index 20976d66..e036ede9 100644 Binary files a/usage/managing_datasets/img/dataset_info_toolbar.png and b/usage/managing_datasets/img/dataset_info_toolbar.png differ diff --git a/usage/managing_datasets/img/dataset_linked_resources.png b/usage/managing_datasets/img/dataset_linked_resources.png deleted file mode 100644 index 8ee294fb..00000000 Binary files a/usage/managing_datasets/img/dataset_linked_resources.png and /dev/null differ diff --git a/usage/managing_datasets/img/dataset_location.png b/usage/managing_datasets/img/dataset_location.png index 880b5d88..ea728283 100644 Binary files a/usage/managing_datasets/img/dataset_location.png and b/usage/managing_datasets/img/dataset_location.png differ diff --git a/usage/managing_datasets/img/dataset_metadata_1.png b/usage/managing_datasets/img/dataset_metadata_1.png new file mode 100644 index 00000000..36c324ae Binary files /dev/null and b/usage/managing_datasets/img/dataset_metadata_1.png differ diff --git a/usage/managing_datasets/img/dataset_metadata_2.png b/usage/managing_datasets/img/dataset_metadata_2.png new file mode 100644 index 00000000..28459859 Binary files /dev/null and b/usage/managing_datasets/img/dataset_metadata_2.png differ diff --git a/usage/managing_datasets/img/dataset_metadata_3.png b/usage/managing_datasets/img/dataset_metadata_3.png new file mode 100644 index 00000000..b6ece32a Binary files /dev/null and b/usage/managing_datasets/img/dataset_metadata_3.png differ diff --git a/usage/managing_datasets/img/dataset_overview.png b/usage/managing_datasets/img/dataset_overview.png index 4fc58ba0..ebfac4eb 100644 Binary files a/usage/managing_datasets/img/dataset_overview.png and b/usage/managing_datasets/img/dataset_overview.png differ diff --git a/usage/managing_datasets/img/dataset_permissions_settings.png b/usage/managing_datasets/img/dataset_permissions_settings.png index 67d2b96c..dea49512 100644 Binary files a/usage/managing_datasets/img/dataset_permissions_settings.png and b/usage/managing_datasets/img/dataset_permissions_settings.png differ diff --git a/usage/managing_datasets/img/dataset_settings.png b/usage/managing_datasets/img/dataset_settings.png new file mode 100644 index 00000000..fe2be07b Binary files /dev/null and b/usage/managing_datasets/img/dataset_settings.png differ diff --git a/usage/managing_datasets/img/dataset_share.png b/usage/managing_datasets/img/dataset_share.png new file mode 100644 index 00000000..c009b10b Binary files /dev/null and b/usage/managing_datasets/img/dataset_share.png differ diff --git a/usage/managing_datasets/img/dataset_upload_confirm.png b/usage/managing_datasets/img/dataset_upload_confirm.png index 98b48435..4a39b19c 100644 Binary files a/usage/managing_datasets/img/dataset_upload_confirm.png and b/usage/managing_datasets/img/dataset_upload_confirm.png differ diff --git a/usage/managing_datasets/img/dataset_upload_process.png b/usage/managing_datasets/img/dataset_upload_process.png index 1d87009e..6a603c71 100644 Binary files a/usage/managing_datasets/img/dataset_upload_process.png and b/usage/managing_datasets/img/dataset_upload_process.png differ diff --git a/usage/managing_datasets/img/dataset_upload_view.png b/usage/managing_datasets/img/dataset_upload_view.png index 7edbd920..358837a1 100644 Binary files a/usage/managing_datasets/img/dataset_upload_view.png and b/usage/managing_datasets/img/dataset_upload_view.png differ diff --git a/usage/managing_datasets/img/download_dataset.png b/usage/managing_datasets/img/download_dataset.png new file mode 100644 index 00000000..9a35467d Binary files /dev/null and b/usage/managing_datasets/img/download_dataset.png differ diff --git a/usage/managing_datasets/img/edit_style_button.png b/usage/managing_datasets/img/edit_style_button.png index 8a97106e..3846ba63 100644 Binary files a/usage/managing_datasets/img/edit_style_button.png and b/usage/managing_datasets/img/edit_style_button.png differ diff --git a/usage/managing_datasets/img/editing_dataset_data.png b/usage/managing_datasets/img/editing_dataset_data.png index fef5802f..ff19336f 100644 Binary files a/usage/managing_datasets/img/editing_dataset_data.png and b/usage/managing_datasets/img/editing_dataset_data.png differ diff --git a/usage/managing_datasets/img/export_dataset.png b/usage/managing_datasets/img/export_dataset.png new file mode 100644 index 00000000..a61c9245 Binary files /dev/null and b/usage/managing_datasets/img/export_dataset.png differ diff --git a/usage/managing_datasets/img/export_dataset_form.png b/usage/managing_datasets/img/export_dataset_form.png deleted file mode 100644 index 8d2c75e5..00000000 Binary files a/usage/managing_datasets/img/export_dataset_form.png and /dev/null differ diff --git a/usage/managing_datasets/img/export_icon.png b/usage/managing_datasets/img/export_icon.png index 6f49b873..516487f3 100644 Binary files a/usage/managing_datasets/img/export_icon.png and b/usage/managing_datasets/img/export_icon.png differ diff --git a/usage/managing_datasets/img/export_list.png b/usage/managing_datasets/img/export_list.png index c74331d1..a1990b3b 100644 Binary files a/usage/managing_datasets/img/export_list.png and b/usage/managing_datasets/img/export_list.png differ diff --git a/usage/managing_datasets/img/export_metadata.png b/usage/managing_datasets/img/export_metadata.png deleted file mode 100644 index dc294088..00000000 Binary files a/usage/managing_datasets/img/export_metadata.png and /dev/null differ diff --git a/usage/managing_datasets/img/export_notification.png b/usage/managing_datasets/img/export_notification.png deleted file mode 100644 index cf3543a6..00000000 Binary files a/usage/managing_datasets/img/export_notification.png and /dev/null differ diff --git a/usage/managing_datasets/img/geometry_types.png b/usage/managing_datasets/img/geometry_types.png index a42a4682..deda2edb 100644 Binary files a/usage/managing_datasets/img/geometry_types.png and b/usage/managing_datasets/img/geometry_types.png differ diff --git a/usage/managing_datasets/img/import_remote_resources.png b/usage/managing_datasets/img/import_remote_resources.png new file mode 100644 index 00000000..e40f68c1 Binary files /dev/null and b/usage/managing_datasets/img/import_remote_resources.png differ diff --git a/usage/managing_datasets/img/location_licenses_dataset_metadata.png b/usage/managing_datasets/img/location_licenses_dataset_metadata.png deleted file mode 100644 index 6da74c4f..00000000 Binary files a/usage/managing_datasets/img/location_licenses_dataset_metadata.png and /dev/null differ diff --git a/usage/managing_datasets/img/manage_styles.png b/usage/managing_datasets/img/manage_styles.png deleted file mode 100644 index a97d03d7..00000000 Binary files a/usage/managing_datasets/img/manage_styles.png and /dev/null differ diff --git a/usage/managing_datasets/img/manage_styles_button.png b/usage/managing_datasets/img/manage_styles_button.png deleted file mode 100644 index 21c3328d..00000000 Binary files a/usage/managing_datasets/img/manage_styles_button.png and /dev/null differ diff --git a/usage/managing_datasets/img/measuring.png b/usage/managing_datasets/img/measuring.png index af5aab31..b5b4c91e 100644 Binary files a/usage/managing_datasets/img/measuring.png and b/usage/managing_datasets/img/measuring.png differ diff --git a/usage/managing_datasets/img/new_dataset_from_scratch.png b/usage/managing_datasets/img/new_dataset_from_scratch.png index 86fb09dc..51c7d750 100644 Binary files a/usage/managing_datasets/img/new_dataset_from_scratch.png and b/usage/managing_datasets/img/new_dataset_from_scratch.png differ diff --git a/usage/managing_datasets/img/new_rule.png b/usage/managing_datasets/img/new_rule.png index 82114ad2..e09b641d 100644 Binary files a/usage/managing_datasets/img/new_rule.png and b/usage/managing_datasets/img/new_rule.png differ diff --git a/usage/managing_datasets/img/new_service_form.png b/usage/managing_datasets/img/new_service_form.png new file mode 100644 index 00000000..2e063074 Binary files /dev/null and b/usage/managing_datasets/img/new_service_form.png differ diff --git a/usage/managing_datasets/img/new_style.png b/usage/managing_datasets/img/new_style.png new file mode 100644 index 00000000..2f3d47f7 Binary files /dev/null and b/usage/managing_datasets/img/new_style.png differ diff --git a/usage/managing_datasets/img/new_style_in_layer_page.png b/usage/managing_datasets/img/new_style_in_layer_page.png deleted file mode 100644 index 3bdc8633..00000000 Binary files a/usage/managing_datasets/img/new_style_in_layer_page.png and /dev/null differ diff --git a/usage/managing_datasets/img/new_style_in_list.png b/usage/managing_datasets/img/new_style_in_list.png deleted file mode 100644 index c3ef12a1..00000000 Binary files a/usage/managing_datasets/img/new_style_in_list.png and /dev/null differ diff --git a/usage/managing_datasets/img/printing_window.png b/usage/managing_datasets/img/printing_window.png index 343ac8e4..648d80f7 100644 Binary files a/usage/managing_datasets/img/printing_window.png and b/usage/managing_datasets/img/printing_window.png differ diff --git a/usage/managing_datasets/img/remote_service_info.png b/usage/managing_datasets/img/remote_service_info.png new file mode 100644 index 00000000..aa0b1745 Binary files /dev/null and b/usage/managing_datasets/img/remote_service_info.png differ diff --git a/usage/managing_datasets/img/remote_service_link.png b/usage/managing_datasets/img/remote_service_link.png new file mode 100644 index 00000000..643b786e Binary files /dev/null and b/usage/managing_datasets/img/remote_service_link.png differ diff --git a/usage/managing_datasets/img/remote_service_metadata.png b/usage/managing_datasets/img/remote_service_metadata.png deleted file mode 100644 index 97fd4370..00000000 Binary files a/usage/managing_datasets/img/remote_service_metadata.png and /dev/null differ diff --git a/usage/managing_datasets/img/remote_services.png b/usage/managing_datasets/img/remote_services.png index f5754046..6e3b22ff 100644 Binary files a/usage/managing_datasets/img/remote_services.png and b/usage/managing_datasets/img/remote_services.png differ diff --git a/usage/managing_datasets/img/remote_services_link.png b/usage/managing_datasets/img/remote_services_link.png deleted file mode 100644 index 40b14493..00000000 Binary files a/usage/managing_datasets/img/remote_services_link.png and /dev/null differ diff --git a/usage/managing_datasets/img/save_style.png b/usage/managing_datasets/img/save_style.png new file mode 100644 index 00000000..6d113765 Binary files /dev/null and b/usage/managing_datasets/img/save_style.png differ diff --git a/usage/managing_datasets/img/service_type.png b/usage/managing_datasets/img/service_type.png deleted file mode 100644 index cd3f44d4..00000000 Binary files a/usage/managing_datasets/img/service_type.png and /dev/null differ diff --git a/usage/managing_datasets/img/style_editor.gif b/usage/managing_datasets/img/style_editor.gif deleted file mode 100644 index eea0f32a..00000000 Binary files a/usage/managing_datasets/img/style_editor.gif and /dev/null differ diff --git a/usage/managing_datasets/img/style_editor_syntax_validator.png b/usage/managing_datasets/img/style_editor_syntax_validator.png deleted file mode 100644 index fe7a779e..00000000 Binary files a/usage/managing_datasets/img/style_editor_syntax_validator.png and /dev/null differ diff --git a/usage/managing_datasets/img/style_templates.png b/usage/managing_datasets/img/style_templates.png deleted file mode 100644 index 3fa62ba1..00000000 Binary files a/usage/managing_datasets/img/style_templates.png and /dev/null differ diff --git a/usage/managing_datasets/img/styles_map_panel.png b/usage/managing_datasets/img/styles_map_panel.png index 23225ffb..19127e1a 100644 Binary files a/usage/managing_datasets/img/styles_map_panel.png and b/usage/managing_datasets/img/styles_map_panel.png differ diff --git a/usage/managing_datasets/img/styles_map_panel_display.png b/usage/managing_datasets/img/styles_map_panel_display.png new file mode 100644 index 00000000..a65f1dc2 Binary files /dev/null and b/usage/managing_datasets/img/styles_map_panel_display.png differ diff --git a/usage/managing_datasets/img/upload_dataset.png b/usage/managing_datasets/img/upload_dataset.png index 48b985a5..643b786e 100644 Binary files a/usage/managing_datasets/img/upload_dataset.png and b/usage/managing_datasets/img/upload_dataset.png differ diff --git a/usage/managing_datasets/img/upload_dataset_link.png b/usage/managing_datasets/img/upload_dataset_link.png index 133a41b6..32d0dd73 100644 Binary files a/usage/managing_datasets/img/upload_dataset_link.png and b/usage/managing_datasets/img/upload_dataset_link.png differ diff --git a/usage/managing_datasets/img/upload_styles.png b/usage/managing_datasets/img/upload_styles.png deleted file mode 100644 index d2ffbe69..00000000 Binary files a/usage/managing_datasets/img/upload_styles.png and /dev/null differ diff --git a/usage/managing_datasets/img/visual_styles_map_panel.png b/usage/managing_datasets/img/visual_styles_map_panel.png deleted file mode 100644 index 4fed5643..00000000 Binary files a/usage/managing_datasets/img/visual_styles_map_panel.png and /dev/null differ diff --git a/usage/managing_datasets/new_dataset_from_scratch.rst b/usage/managing_datasets/new_dataset_from_scratch.rst index 397c2c4d..8a015aab 100644 --- a/usage/managing_datasets/new_dataset_from_scratch.rst +++ b/usage/managing_datasets/new_dataset_from_scratch.rst @@ -8,18 +8,27 @@ An interesting tool that GeoNode makes available to you is the *Create dataset*. *Create dataset link* +The corresponding form where the users are able to create a dataset from scratch is presented below: + +.. figure:: img/create_dataset_form.png + :align: center + + *Form for creating a datset + In order to create the new Dataset you have to fill out the required fields: -* *Name* -* *Title* +* *Dataset title* * *Geometry type* +* *Attributes* (name, geometry type, etc) + +At first, the user has to define a dataset title and the geometry type: .. figure:: img/geometry_types.png :align: center *Geometry types* -Usually the datasets features should have some *Attributes* that enrich the amount of information associated with each of them. Through the :guilabel:`Add Attribute` button you can add new attributes. +While then, through the :guilabel:`Add Attribute` button, the user can add new attributes. Usually the datasets features should have some *Attributes* that enrich the amount of information associated with each of them. .. figure:: img/new_dataset_from_scratch.png :align: center @@ -27,4 +36,4 @@ Usually the datasets features should have some *Attributes* that enrich the amou *New Dataset creation from scratch* -Once the form has been filled out, click on :guilabel:`Create`. You will be redirected to the *Dataset Page* (see :ref:`dataset-info`). Now your Dataset is created but is still empty, no features have been added yet. See the :ref:`dataset-editing` section to learn how to add new features. +Once the form has been filled out, click on :guilabel:`Create new dataset`. You will be redirected to the *Dataset Page* (see :ref:`dataset-info`). Now your Dataset is created but is still empty, no features have been added yet. See the :ref:`dataset-editing` section to learn how to add new features. diff --git a/usage/managing_datasets/uploading_datasets.rst b/usage/managing_datasets/uploading_datasets.rst index 4df9751f..de71ade8 100644 --- a/usage/managing_datasets/uploading_datasets.rst +++ b/usage/managing_datasets/uploading_datasets.rst @@ -31,7 +31,7 @@ The *Datasets Uploading* page looks like the one in the picture below. | Through the :guilabel:`Select files` button you can select files from your disk, make sure they are valid raster or vector spatial data, then you can click to :guilabel:`Upload` button. -A progress bar shows the operation made during the dataset upload and alerts you when the process is over. +A progress bar and a spinning icon show the operation made during the dataset upload and alert you when the process is over. .. figure:: img/dataset_upload_confirm.png :align: center @@ -39,7 +39,7 @@ A progress bar shows the operation made during the dataset upload and alerts you *Upload dataset* -In this example the ``ne_10m_airports2`` ESRI Shapefile, with all its mandatory files (`.shp`, `.shx`, `.dbf` and `.prj`), has been chosen. +In this example the ``states_test1`` ESRI Shapefile, with all its mandatory files (`.shp`, `.shx`, `.dbf` and `.prj`), has been chosen. When the process ends click on :guilabel:`View` button .. figure:: img/dataset_upload_view.png @@ -47,8 +47,6 @@ When the process ends click on :guilabel:`View` button *Dataset uploading finished* -.. note:: There are lot of free spatial dataset available in the Internet. In this example, an extract of the Berlin city center roads map from the `BBBike extracts OpenStreetMap `_ dataset has been used. - In the next paragraphs you will learn how to create a dataset from scratch, how to set share options, how to explore the dataset properties and how to edit them. .. note:: If you get the following error message: diff --git a/usage/managing_datasets/using_remote_services.rst b/usage/managing_datasets/using_remote_services.rst index 6448211e..857bdf2a 100644 --- a/usage/managing_datasets/using_remote_services.rst +++ b/usage/managing_datasets/using_remote_services.rst @@ -8,7 +8,7 @@ Let's try it! Click on the :guilabel:`Remote Services` link of the :guilabel:`New` menu in the navigation bar. -.. figure:: img/remote_services_link.png +.. figure:: img/remote_service_link.png :align: center *Remote Services link* @@ -25,11 +25,12 @@ To configure a new service: * click on :guilabel:`Add Remote Service` * type the *Service URL* * select the *Service Type* +* (Optional) define the credentials of the remote service, if it requires authentication - .. figure:: img/service_type.png + .. figure:: img/new_service_form.png :align: center - *Service Types* + *New Service form* * click on :guilabel:`Create` @@ -67,12 +68,15 @@ GeoNode supports four **types of remote services**: Once the service has been configured, you can load the resources you are interested in through the *Import Resources* page where you will be automatically redirected to. -| From the page where the services are listed, it is possible to click on the *Title* of a service. It opens the *Service Details* page. -| Each service has its own metadata such as the *Service Type*, the *URL*, an *Abstract*, some *Keywords* and the *Contact* user. +.. figure:: img/import_remote_resources.png + :align: center -You can edit those metadata through the form available from the :guilabel:`Edit Service Metadata` link of the *Service Details* page (see the picture below). + *Remote Service resources list* + +| From the page where the services are listed, it is possible to click on the *Title* of a service. It opens the *Service Details* page. +| If you want to import more resources from that service, you can click on :guilabel:`Import Service Resources` button. -.. figure:: img/remote_service_metadata.png +.. figure:: img/remote_service_info.png :align: center *Remote Service metadata* diff --git a/usage/managing_documents/document_editing.rst b/usage/managing_documents/document_editing.rst index da954f04..62aaa482 100644 --- a/usage/managing_documents/document_editing.rst +++ b/usage/managing_documents/document_editing.rst @@ -8,7 +8,7 @@ The :ref:`document-info` page makes available useful menu for document editing. Setting the Document Thumbnail ------------------------------ -From the *Metadata Form*, it is possible to *Set the Thumbnail* of the document. Click on :guilabel:`Choose file` to open the *Thumbnail Uploading* page and chose the image that will illustrate your document. Once this is done, click on the ok button and save. If the thumbnail has been successfully uploaded you can see it by coming back to the document list. +The thumbnail of the document can be uploaded or removed using the two buttons in the upper left corner of the properties table. .. figure:: img/document_uploading_thumbnail.png :align: center @@ -17,75 +17,7 @@ From the *Metadata Form*, it is possible to *Set the Thumbnail* of the document. If no errors occur, the new selected thumbnail will be shown. -.. figure:: img/document_uploading_thumbnail_success.png - :align: center - - *Uploading success* - Editing the Document Metadata ----------------------------- -You can edit the metadata of your document as described in the :ref:`document-metadata` section or by using THe *Advanced Metadata* option below. - -.. figure:: img/advanced_metadata_button.png - :align: center - -|The :guilabel:`Advanced Metadata` button takes you to a big form where all the available metadata of the document can be edited. -| Some information are mandatory such as the *Title* or the *Category* the document belongs to, some others are optional. - -.. figure:: img/document_metadata_editing.png - :align: center - - *Editing Metadata* - -In the example shown in the picture above, the information inside the red rectangles have been changed. To save the changes click on :guilabel:`Update`, you will be redirected to the document page. - -Editing the Document Info ------------------------------ - -You can edit the information of your document by clicking on the :guilabel:`Info` button. - -From the Info panel, it is possible to upload the **Thumbnail** of the document. - -.. figure:: img/upload_thumbnail.png - :align: center - - *Upload Thumbnail* - -If you want this document in your **Favorites** (see :ref:`editing-profile`), click on the start icon. - -.. figure:: img/favorite_document.png - :align: center - - *Favorite document* - -You can directly **Download** the document and **Share** the document url by clicking the buttons on the top-right of the panel. - -.. figure:: img/download_share_document.png - :align: center - - *Share and Download document* - -By clicking the document **Title**, you can change it. - -.. figure:: img/title_document.png - :align: center - - *Document Title* - -From the :guilabel:`Locations` tab, you can manage the spacial extent of the document. - -.. figure:: img/locations_document.png - :align: center - - *Document Title* - - -Here numerical fields and a map show the spatial extent (WGS 84) for the document and you can edit it by Shift+click and drag to draw the new extent on the map and change its location by clicking the marker and drag. - -.. figure:: img/edit-location.png - :align: center - - *Document Title* - -.. note:: The *Location* tab is also available for :ref:`dashboard` and :ref:`geostory` \ No newline at end of file +You can edit the metadata of your document as described in the :ref:`document-metadata` section. diff --git a/usage/managing_documents/document_info.rst b/usage/managing_documents/document_info.rst index 7647a070..645e0edf 100644 --- a/usage/managing_documents/document_info.rst +++ b/usage/managing_documents/document_info.rst @@ -3,7 +3,7 @@ Document Information ==================== -From the *Documents Search Page* (see :ref:`finding-data`) you can select the document you are interested in and click on its name to see an overview about it. +From the *Documents Search Page* (see :ref:`finding-data`) click on the **open properties** button on the document you are interested in to see an overview of it. .. figure:: img/document_overview.png :align: center @@ -33,36 +33,42 @@ By clicking on the copy icons you have a copy of the current *Bounding Box* or t .. warning:: From the :ref:`document-info` the *Location* tab is in read only mode, to edit it see the :ref:`document-editing` -* The *Linked Resources* tab shows the resources, that can be *Datasets*, *Maps*, *GeoStories* and *Dashboards*, linked to the document. +* The *Assets* tab presents the current document's download link. Moreover, the user is able to add additional assets that are related to this document. -.. figure:: img/document_linked_resources.png +.. figure:: img/document_assets.png :align: center - *Document Linked Resources tab* + *Document Assets tab* -.. note:: When a resource is `linked from` the document the link is under the *Linked by* list while when a resource is `linked to` the document the link is under the *Used by* list +* The *Share* tab allows to the owner of the document to edit its permissions. -.. warning:: From the :ref:`document_metadata` it is possible edit the document *Linked Resources* +.. figure:: img/document_share.png + :align: center + + *Document Share tab* -From the right toolbar on the **Info** panel it is possible: +* The *Settings* tab allows to the owner of the document to define a group, the publishing status, and more options (e.g Approved). -.. figure:: img/document_info_toolbar.png +.. figure:: img/document_settings.png :align: center - *Document Info toolbar* + *Document Settings tab* + +From the upper of the document's properties table, it is possible: + +.. figure:: img/document_thumbnail.png + :align: center -* Add document in your *Favorites* (see :ref:`editing-profile`), clicking on star icon. + *Document thumbnail's toolbar* -* Directly *Download* the document oh `ShapeFile` format +* Upload / set a new thumbnail for the document or remove the current thumbnail (upper left buttons). -* *Share* the document url +* Directly *Download* the document or copy the resource's URL (down right buttons). -* Change the document *Title* by clicking on it -You can access the document details page by clicking on *View document* in the overview panel. -That page looks like the one shown in the picture below. +You can access the document details page by clicking the document itself from the document list or the *View document* in the overview panel. -.. figure:: img/document_detail.png +.. figure:: img/document_view.png :align: center *Document page* @@ -74,12 +80,6 @@ Exploring the Document detail menu Sections As soon as a document is opened, the **Info** panel is shown. It reports the document metadata such as its title, abstract, date of publication etc. The metadata also indicates the user who is responsible for uploading and managing this content, as well as the group to which it is linked. -.. figure:: img/document_info.png - :align: center - *Document Info* - - - Selecting *View Metadata* from the :guilabel:`View` button it is possible to visualize the metadata of the document .. figure:: img/view_metadata.png @@ -87,14 +87,14 @@ Selecting *View Metadata* from the :guilabel:`View` button it is possible to vis *Document Metadata* -Under the :guilabel:`Resource` button, it is possible to select the *Share* option to provides the document link to share. +By selecting the :guilabel:`Share` tab, the corresponding :guilabel:`Share` tab from the properties table is opened. .. figure:: img/document_sharing.png :align: center *Document Sharing* -If you want to download the document, click on the :guilabel:`Download` button and the document will be downloaded automatically. +If you want to download the document, click on the :guilabel:`Download` tab and then from the dropdown menu click :guilabel:`Download`. .. figure:: img/document_download.png :align: center diff --git a/usage/managing_documents/document_metadata.rst b/usage/managing_documents/document_metadata.rst index ddbd87f2..c4cf171a 100644 --- a/usage/managing_documents/document_metadata.rst +++ b/usage/managing_documents/document_metadata.rst @@ -22,7 +22,7 @@ Editing a document's metadata is done in three steps (*Basic Metadata*, *Locatio * *Category* in which the document belongs; * *Group* to which the document is linked. - .. figure:: img/document_basic_metadata.png + .. figure:: img/document_metadata_1.png :align: center *Document Basic Metadata* @@ -36,7 +36,7 @@ Editing a document's metadata is done in three steps (*Basic Metadata*, *Locatio * *Data Quality statement* (general explanation of the data producer's knowledge about the lineage of a dataset); * Potential *Restrictions* to sharing the document should be provided in the Restrictions box. - .. figure:: img/document_location_licenses.png + .. figure:: img/document_metadata_2.png :align: center *Document Location and Licenses* @@ -54,7 +54,7 @@ Editing a document's metadata is done in three steps (*Basic Metadata*, *Locatio *Responsible Parties*, *Owner* and *Share options* are listed on the right side of the page, you can edit them. - .. figure:: img/document_optional_metadata.png + .. figure:: img/document_metadata_3.png :align: center *Document Optional Metadata* diff --git a/usage/managing_documents/document_permissions.rst b/usage/managing_documents/document_permissions.rst index 326a0b50..3cc2c004 100644 --- a/usage/managing_documents/document_permissions.rst +++ b/usage/managing_documents/document_permissions.rst @@ -5,7 +5,7 @@ Share Options GeoNode encourages to publicly, share and make available for download information uploaded on the platform. By default, anyone can see and download a document. However, the document responsible can choose to limit access to the document to some contributors and/or groups. -Through the *Share* Link shown in the menu it is possible to manage the document share options. it opens a form where set up who can: +Through the *Share* tab shown in the properties table, it is possible to manage the document share options. it opens a form where set up who can: * None (the document is not visible). * View Metadata (allows to view the document). @@ -20,9 +20,6 @@ Through the *Share* Link shown in the menu it is possible to manage the document See an example in the picture below. -.. note:: - After making changes, always save them with the *Save* Link in the menu - .. figure:: img/changing_document_permissions.png :align: center @@ -30,4 +27,4 @@ See an example in the picture below. Usually those with options of editing metadata and the management of a document are in charge and responsible of the document, i.e. the contributor who uploaded it has those options by default. -Once the share options are set, click :guilabel:`Save` link in the menu to save them. +Once the share options are set, click :guilabel:`Resource` tab and then, from the dropdown menu, select :guilabel:`Save`. diff --git a/usage/managing_documents/img/advanced_metadata_button.png b/usage/managing_documents/img/advanced_metadata_button.png deleted file mode 100644 index c34bc373..00000000 Binary files a/usage/managing_documents/img/advanced_metadata_button.png and /dev/null differ diff --git a/usage/managing_documents/img/changing_document_permissions.png b/usage/managing_documents/img/changing_document_permissions.png index 0ec02646..5f409cbd 100644 Binary files a/usage/managing_documents/img/changing_document_permissions.png and b/usage/managing_documents/img/changing_document_permissions.png differ diff --git a/usage/managing_documents/img/copy_locations.png b/usage/managing_documents/img/copy_locations.png index 0566cdd9..1e18f816 100644 Binary files a/usage/managing_documents/img/copy_locations.png and b/usage/managing_documents/img/copy_locations.png differ diff --git a/usage/managing_documents/img/document_assets.png b/usage/managing_documents/img/document_assets.png new file mode 100644 index 00000000..de73ca50 Binary files /dev/null and b/usage/managing_documents/img/document_assets.png differ diff --git a/usage/managing_documents/img/document_basic_metadata.png b/usage/managing_documents/img/document_basic_metadata.png deleted file mode 100644 index 7649e854..00000000 Binary files a/usage/managing_documents/img/document_basic_metadata.png and /dev/null differ diff --git a/usage/managing_documents/img/document_detail.png b/usage/managing_documents/img/document_detail.png deleted file mode 100644 index 590a37c8..00000000 Binary files a/usage/managing_documents/img/document_detail.png and /dev/null differ diff --git a/usage/managing_documents/img/document_download.png b/usage/managing_documents/img/document_download.png index a7be6acf..1ec04d5b 100644 Binary files a/usage/managing_documents/img/document_download.png and b/usage/managing_documents/img/document_download.png differ diff --git a/usage/managing_documents/img/document_info.png b/usage/managing_documents/img/document_info.png index 208b13d4..edbce13d 100644 Binary files a/usage/managing_documents/img/document_info.png and b/usage/managing_documents/img/document_info.png differ diff --git a/usage/managing_documents/img/document_info_toolbar.png b/usage/managing_documents/img/document_info_toolbar.png deleted file mode 100644 index 8850b669..00000000 Binary files a/usage/managing_documents/img/document_info_toolbar.png and /dev/null differ diff --git a/usage/managing_documents/img/document_linked_resources.png b/usage/managing_documents/img/document_linked_resources.png deleted file mode 100644 index 4817c0a7..00000000 Binary files a/usage/managing_documents/img/document_linked_resources.png and /dev/null differ diff --git a/usage/managing_documents/img/document_location.png b/usage/managing_documents/img/document_location.png index f6d9111b..3e511f13 100644 Binary files a/usage/managing_documents/img/document_location.png and b/usage/managing_documents/img/document_location.png differ diff --git a/usage/managing_documents/img/document_location_licenses.png b/usage/managing_documents/img/document_location_licenses.png deleted file mode 100644 index 8434524b..00000000 Binary files a/usage/managing_documents/img/document_location_licenses.png and /dev/null differ diff --git a/usage/managing_documents/img/document_metadata_1.png b/usage/managing_documents/img/document_metadata_1.png new file mode 100644 index 00000000..e5ecb9e5 Binary files /dev/null and b/usage/managing_documents/img/document_metadata_1.png differ diff --git a/usage/managing_documents/img/document_metadata_2.png b/usage/managing_documents/img/document_metadata_2.png new file mode 100644 index 00000000..e317cec1 Binary files /dev/null and b/usage/managing_documents/img/document_metadata_2.png differ diff --git a/usage/managing_documents/img/document_metadata_3.png b/usage/managing_documents/img/document_metadata_3.png new file mode 100644 index 00000000..a68db657 Binary files /dev/null and b/usage/managing_documents/img/document_metadata_3.png differ diff --git a/usage/managing_documents/img/document_metadata_editing.png b/usage/managing_documents/img/document_metadata_editing.png deleted file mode 100644 index 51814c82..00000000 Binary files a/usage/managing_documents/img/document_metadata_editing.png and /dev/null differ diff --git a/usage/managing_documents/img/document_optional_metadata.png b/usage/managing_documents/img/document_optional_metadata.png deleted file mode 100644 index 488278cb..00000000 Binary files a/usage/managing_documents/img/document_optional_metadata.png and /dev/null differ diff --git a/usage/managing_documents/img/document_overview.png b/usage/managing_documents/img/document_overview.png index fddf1b1e..1ae4657b 100644 Binary files a/usage/managing_documents/img/document_overview.png and b/usage/managing_documents/img/document_overview.png differ diff --git a/usage/managing_documents/img/document_settings.png b/usage/managing_documents/img/document_settings.png new file mode 100644 index 00000000..d4d5ed6f Binary files /dev/null and b/usage/managing_documents/img/document_settings.png differ diff --git a/usage/managing_documents/img/document_share.png b/usage/managing_documents/img/document_share.png new file mode 100644 index 00000000..32a15e54 Binary files /dev/null and b/usage/managing_documents/img/document_share.png differ diff --git a/usage/managing_documents/img/document_sharing.png b/usage/managing_documents/img/document_sharing.png index ca85cb87..82896d10 100644 Binary files a/usage/managing_documents/img/document_sharing.png and b/usage/managing_documents/img/document_sharing.png differ diff --git a/usage/managing_documents/img/document_thumbnail.png b/usage/managing_documents/img/document_thumbnail.png new file mode 100644 index 00000000..f70b8bf0 Binary files /dev/null and b/usage/managing_documents/img/document_thumbnail.png differ diff --git a/usage/managing_documents/img/document_upload_page.png b/usage/managing_documents/img/document_upload_page.png index 81a58e26..fa9c5f6c 100644 Binary files a/usage/managing_documents/img/document_upload_page.png and b/usage/managing_documents/img/document_upload_page.png differ diff --git a/usage/managing_documents/img/document_uploading_thumbnail.png b/usage/managing_documents/img/document_uploading_thumbnail.png index 0958ca2b..8e74df2e 100644 Binary files a/usage/managing_documents/img/document_uploading_thumbnail.png and b/usage/managing_documents/img/document_uploading_thumbnail.png differ diff --git a/usage/managing_documents/img/document_uploading_thumbnail_success.png b/usage/managing_documents/img/document_uploading_thumbnail_success.png deleted file mode 100644 index 23e52e6b..00000000 Binary files a/usage/managing_documents/img/document_uploading_thumbnail_success.png and /dev/null differ diff --git a/usage/managing_documents/img/document_view.png b/usage/managing_documents/img/document_view.png new file mode 100644 index 00000000..ed98190b Binary files /dev/null and b/usage/managing_documents/img/document_view.png differ diff --git a/usage/managing_documents/img/download_share_document.png b/usage/managing_documents/img/download_share_document.png deleted file mode 100644 index 1f6bef86..00000000 Binary files a/usage/managing_documents/img/download_share_document.png and /dev/null differ diff --git a/usage/managing_documents/img/edit-location.png b/usage/managing_documents/img/edit-location.png deleted file mode 100644 index e55fff59..00000000 Binary files a/usage/managing_documents/img/edit-location.png and /dev/null differ diff --git a/usage/managing_documents/img/edit_metadata_link.png b/usage/managing_documents/img/edit_metadata_link.png index 5634f659..c8d49aac 100644 Binary files a/usage/managing_documents/img/edit_metadata_link.png and b/usage/managing_documents/img/edit_metadata_link.png differ diff --git a/usage/managing_documents/img/favorite_document.png b/usage/managing_documents/img/favorite_document.png deleted file mode 100644 index d3c03586..00000000 Binary files a/usage/managing_documents/img/favorite_document.png and /dev/null differ diff --git a/usage/managing_documents/img/locations_document.png b/usage/managing_documents/img/locations_document.png deleted file mode 100644 index 831faa7e..00000000 Binary files a/usage/managing_documents/img/locations_document.png and /dev/null differ diff --git a/usage/managing_documents/img/permissions_form.png b/usage/managing_documents/img/permissions_form.png index 1e14bdfe..15b389b8 100644 Binary files a/usage/managing_documents/img/permissions_form.png and b/usage/managing_documents/img/permissions_form.png differ diff --git a/usage/managing_documents/img/title_document.png b/usage/managing_documents/img/title_document.png deleted file mode 100644 index ef04935f..00000000 Binary files a/usage/managing_documents/img/title_document.png and /dev/null differ diff --git a/usage/managing_documents/img/upload_document.png b/usage/managing_documents/img/upload_document.png index bb07ff8f..c002a9e3 100644 Binary files a/usage/managing_documents/img/upload_document.png and b/usage/managing_documents/img/upload_document.png differ diff --git a/usage/managing_documents/img/upload_document_link.png b/usage/managing_documents/img/upload_document_link.png index a1208f6c..5fa03df7 100644 Binary files a/usage/managing_documents/img/upload_document_link.png and b/usage/managing_documents/img/upload_document_link.png differ diff --git a/usage/managing_documents/img/upload_thumbnail.png b/usage/managing_documents/img/upload_thumbnail.png deleted file mode 100644 index 1b2bb46f..00000000 Binary files a/usage/managing_documents/img/upload_thumbnail.png and /dev/null differ diff --git a/usage/managing_documents/img/view_metadata.png b/usage/managing_documents/img/view_metadata.png index 10e61893..085f5683 100644 Binary files a/usage/managing_documents/img/view_metadata.png and b/usage/managing_documents/img/view_metadata.png differ diff --git a/usage/managing_maps/img/advanced_edit_button.png b/usage/managing_maps/img/advanced_edit_button.png deleted file mode 100644 index 63d0a71e..00000000 Binary files a/usage/managing_maps/img/advanced_edit_button.png and /dev/null differ diff --git a/usage/managing_maps/img/basic_map_metadata.png b/usage/managing_maps/img/basic_map_metadata.png deleted file mode 100644 index c2013d9a..00000000 Binary files a/usage/managing_maps/img/basic_map_metadata.png and /dev/null differ diff --git a/usage/managing_maps/img/change_map_permissions.png b/usage/managing_maps/img/change_map_permissions.png deleted file mode 100644 index 06891bfe..00000000 Binary files a/usage/managing_maps/img/change_map_permissions.png and /dev/null differ diff --git a/usage/managing_maps/img/copy_locations_map.png b/usage/managing_maps/img/copy_locations_map.png index f8e4e7db..36aea650 100644 Binary files a/usage/managing_maps/img/copy_locations_map.png and b/usage/managing_maps/img/copy_locations_map.png differ diff --git a/usage/managing_maps/img/create_map_button.png b/usage/managing_maps/img/create_map_button.png index 1a9d485a..0c6b88e2 100644 Binary files a/usage/managing_maps/img/create_map_button.png and b/usage/managing_maps/img/create_map_button.png differ diff --git a/usage/managing_maps/img/create_map_link.png b/usage/managing_maps/img/create_map_link.png index c635df37..5c2f61f2 100644 Binary files a/usage/managing_maps/img/create_map_link.png and b/usage/managing_maps/img/create_map_link.png differ diff --git a/usage/managing_maps/img/create_map_menu.png b/usage/managing_maps/img/create_map_menu.png deleted file mode 100644 index 6bd06973..00000000 Binary files a/usage/managing_maps/img/create_map_menu.png and /dev/null differ diff --git a/usage/managing_maps/img/create_new_map_button.png b/usage/managing_maps/img/create_new_map_button.png deleted file mode 100644 index 52066382..00000000 Binary files a/usage/managing_maps/img/create_new_map_button.png and /dev/null differ diff --git a/usage/managing_maps/img/location_licenses_map_metadata.png b/usage/managing_maps/img/location_licenses_map_metadata.png deleted file mode 100644 index 1cdd42dd..00000000 Binary files a/usage/managing_maps/img/location_licenses_map_metadata.png and /dev/null differ diff --git a/usage/managing_maps/img/map_assets.png b/usage/managing_maps/img/map_assets.png new file mode 100644 index 00000000..7b099dcf Binary files /dev/null and b/usage/managing_maps/img/map_assets.png differ diff --git a/usage/managing_maps/img/map_detail_page.png b/usage/managing_maps/img/map_detail_page.png index 6de1ba2a..a68e3212 100644 Binary files a/usage/managing_maps/img/map_detail_page.png and b/usage/managing_maps/img/map_detail_page.png differ diff --git a/usage/managing_maps/img/map_info.png b/usage/managing_maps/img/map_info.png index e7534ab0..6c0e95bb 100644 Binary files a/usage/managing_maps/img/map_info.png and b/usage/managing_maps/img/map_info.png differ diff --git a/usage/managing_maps/img/map_info_thumbnail.png b/usage/managing_maps/img/map_info_thumbnail.png new file mode 100644 index 00000000..23495c4e Binary files /dev/null and b/usage/managing_maps/img/map_info_thumbnail.png differ diff --git a/usage/managing_maps/img/map_info_toolbar.png b/usage/managing_maps/img/map_info_toolbar.png deleted file mode 100644 index 4f95a3ca..00000000 Binary files a/usage/managing_maps/img/map_info_toolbar.png and /dev/null differ diff --git a/usage/managing_maps/img/map_linked_resources.png b/usage/managing_maps/img/map_linked_resources.png deleted file mode 100644 index d856ba61..00000000 Binary files a/usage/managing_maps/img/map_linked_resources.png and /dev/null differ diff --git a/usage/managing_maps/img/map_location.png b/usage/managing_maps/img/map_location.png index 1f8dc890..751cfddc 100644 Binary files a/usage/managing_maps/img/map_location.png and b/usage/managing_maps/img/map_location.png differ diff --git a/usage/managing_maps/img/map_metadata_details_page.png b/usage/managing_maps/img/map_metadata_details_page.png deleted file mode 100644 index 7b7f6884..00000000 Binary files a/usage/managing_maps/img/map_metadata_details_page.png and /dev/null differ diff --git a/usage/managing_maps/img/map_overview.png b/usage/managing_maps/img/map_overview.png index a75108ee..338c9e4c 100644 Binary files a/usage/managing_maps/img/map_overview.png and b/usage/managing_maps/img/map_overview.png differ diff --git a/usage/managing_maps/img/map_permissions_settings.png b/usage/managing_maps/img/map_permissions_settings.png index 08c900a4..8f340d4a 100644 Binary files a/usage/managing_maps/img/map_permissions_settings.png and b/usage/managing_maps/img/map_permissions_settings.png differ diff --git a/usage/managing_maps/img/map_preview.gif b/usage/managing_maps/img/map_preview.gif deleted file mode 100644 index 0db925b9..00000000 Binary files a/usage/managing_maps/img/map_preview.gif and /dev/null differ diff --git a/usage/managing_maps/img/map_relations.png b/usage/managing_maps/img/map_relations.png new file mode 100644 index 00000000..6dddfe5e Binary files /dev/null and b/usage/managing_maps/img/map_relations.png differ diff --git a/usage/managing_maps/img/map_settings.png b/usage/managing_maps/img/map_settings.png new file mode 100644 index 00000000..031622f4 Binary files /dev/null and b/usage/managing_maps/img/map_settings.png differ diff --git a/usage/managing_maps/img/map_share.png b/usage/managing_maps/img/map_share.png new file mode 100644 index 00000000..8e52bb1a Binary files /dev/null and b/usage/managing_maps/img/map_share.png differ diff --git a/usage/managing_maps/img/map_viewer.png b/usage/managing_maps/img/map_viewer.png index 972fb7d6..af9b1996 100644 Binary files a/usage/managing_maps/img/map_viewer.png and b/usage/managing_maps/img/map_viewer.png differ diff --git a/usage/managing_maps/img/maps_add_layers_button.png b/usage/managing_maps/img/maps_add_layers_button.png deleted file mode 100644 index d3185e53..00000000 Binary files a/usage/managing_maps/img/maps_add_layers_button.png and /dev/null differ diff --git a/usage/managing_maps/img/maps_layers_add_to_map.png b/usage/managing_maps/img/maps_layers_add_to_map.png deleted file mode 100644 index 15e48d62..00000000 Binary files a/usage/managing_maps/img/maps_layers_add_to_map.png and /dev/null differ diff --git a/usage/managing_maps/img/maps_layers_button.png b/usage/managing_maps/img/maps_layers_button.png deleted file mode 100644 index 71c119cd..00000000 Binary files a/usage/managing_maps/img/maps_layers_button.png and /dev/null differ diff --git a/usage/managing_maps/img/maps_metadata_1.png b/usage/managing_maps/img/maps_metadata_1.png new file mode 100644 index 00000000..b0632961 Binary files /dev/null and b/usage/managing_maps/img/maps_metadata_1.png differ diff --git a/usage/managing_maps/img/maps_metadata_2.png b/usage/managing_maps/img/maps_metadata_2.png new file mode 100644 index 00000000..0ba57d25 Binary files /dev/null and b/usage/managing_maps/img/maps_metadata_2.png differ diff --git a/usage/managing_maps/img/maps_metadata_3.png b/usage/managing_maps/img/maps_metadata_3.png new file mode 100644 index 00000000..a7dc0264 Binary files /dev/null and b/usage/managing_maps/img/maps_metadata_3.png differ diff --git a/usage/managing_maps/img/new_map_creation.gif b/usage/managing_maps/img/new_map_creation.gif deleted file mode 100644 index a1f8ab9f..00000000 Binary files a/usage/managing_maps/img/new_map_creation.gif and /dev/null differ diff --git a/usage/managing_maps/img/new_map_link.png b/usage/managing_maps/img/new_map_link.png index c82b398e..3880b5f9 100644 Binary files a/usage/managing_maps/img/new_map_link.png and b/usage/managing_maps/img/new_map_link.png differ diff --git a/usage/managing_maps/img/optional_map_metadata.png b/usage/managing_maps/img/optional_map_metadata.png deleted file mode 100644 index de64ebd2..00000000 Binary files a/usage/managing_maps/img/optional_map_metadata.png and /dev/null differ diff --git a/usage/managing_maps/img/toc.png b/usage/managing_maps/img/toc.png deleted file mode 100644 index 9a98ba41..00000000 Binary files a/usage/managing_maps/img/toc.png and /dev/null differ diff --git a/usage/managing_maps/map_info.rst b/usage/managing_maps/map_info.rst index 4409a13c..a0b0f479 100644 --- a/usage/managing_maps/map_info.rst +++ b/usage/managing_maps/map_info.rst @@ -3,7 +3,7 @@ Map Information =============== -From the *Map Search Page* (see :ref:`finding-data`) you can select the map you are interested in and click on its name to see an overview about it. +From the Maps catalogue you can select the `Open Attributes table` in order to see an overview of the interested map. .. figure:: img/map_overview.png :align: center @@ -31,31 +31,46 @@ By clicking on the copy icons you have a copy of the current *Bounding Box* or t *Bounding Box and Center* -* The *Linked Resources* tab shows resources, that can be *Documents*, *Datasets*, *GeoStories* and *Dashboards*, linked to the map. +* The *Relations* tab shows resources, that can be *Documents*, *Datasets*, *GeoStories* and *Dashboards*, linked to the map. -.. figure:: img/map_linked_resources.png +.. figure:: img/map_relations.png :align: center - *Map Linked Resources tab* + *Map Relations tab* -.. note:: When a resource is `linked from` the map the link is shown under the *Linked by* list while when a resource is `linked to` the map the link is shown under the *Used by* list +* From the *Assets* tab, the user is able to add additional assets that are related to this map. +.. figure:: img/map_assets.png + :align: center + + *Map Assets tab* -From the right toolbar on the **Info** panel it is possible: +* The *Share* tab allows to the owner of the map to edit its permissions. -.. figure:: img/map_info_toolbar.png +.. figure:: img/map_share.png :align: center - *Map Info toolbar* + *Map Share tab* + +* The *Settings* tab allows to the owner of the map to define a group, the publishing status, and more options (e.g Approved). + +.. figure:: img/map_settings.png + :align: center -* Add map in your *Favorites* (see :ref:`editing-profile`), clicking on star icon. + *Map Settings tab* + +From the upper part of the `properties table` it is possible: + +.. figure:: img/map_info_thumbnail.png + :align: center + + *Map Info toolbar* -* *Share* the map url +* `Upload` a thumbnail, `define` a new one or `remove` the thumbnail (upper left toolbar) -* Change the map *Title* by clicking on it +* `Save` a change on the map, `copy` the map's URL or `view` the detail page of the map (down right toolbar) -You can access the map details page by clicking on *View map* in the overview panel. -That page looks like the one shown in the picture below. +The detail page looks like the one shown in the picture below. .. figure:: img/map_detail_page.png :align: center diff --git a/usage/managing_maps/map_metadata.rst b/usage/managing_maps/map_metadata.rst index cb0d8171..edd080c6 100644 --- a/usage/managing_maps/map_metadata.rst +++ b/usage/managing_maps/map_metadata.rst @@ -1,97 +1,59 @@ -.. _map-metadata: +.. _Maps-metadata: Maps Metadata -============= +=============== -*Maps Metadata* can be Edited by clicking the :guilabel:`Edit Metadata` link from the *Map Detail* page. +In GeoNode special importance is given to *Metadata* and their standard formats. -.. figure:: img/map_metadata_detail_button.png - :align: center +Editing Metadata +--------------- - *The Map Metadata Detail link* +| Metadata contains all the information related to the map. They provide essential information for its identification and its comprehension. Metadata also make the dataset more easily retrievable through search by other users. +| The *Metadata* of a map can be changed through a *Edit Metadata* form which involves four steps, one for each type of metadata considered: -The *Map Metadata* Edit form will open. -| Metadata provide essential information for the identification and the comprehension of the map. They also make the map more easily retrievable through the search tools. -| Those *Metadata* can be filled out through three-steps in which you have to provide all mandatory information to complete the process. Those three steps are described below. +You can open the *Metadata* form of a *Map* by clicking the :guilabel:`Edit Metadata` link from the :guilabel:`Edit` options on the *Map Page*. -* **Basic Metadata** - .. figure:: img/basic_map_metadata.png + .. figure:: img/maps_metadata_1.png :align: center - *Basic Map Metadata* + *Map Metadata form* - In the first step the system asks you to insert the following metadata (required fields are highlighted with red outlines): + In the first fields the system asks you to insert metadata including: - * *Thumbnail* of the map (click :guilabel:`Edit` to change it); - * *Title* of the map, which should be clear and understandable; - * *Abstract*; brief narrative summary of the content of the Map - - .. note:: The *Abstract* panel allows you to insert HTML code through a *wysiwyg* text editor - - * *Creation/Publication/Revision Dates* which define the time period that is covered by the map; - * *Keywords*, which should be chosen within the available list; + * *Title* of the Map, which should be clear and understandable; + * *Abstract*, brief narrative summary of the content of the map + * *Date / Date type* + * *Keywords*, which should be chosen within the available list. The contributor search for available keywords by clicking on the searching bar, or on the folder logo representing, or by entering the first letters of the desired word; * *Category* which the map belongs to; - * *Group* which the map is linked to. - - Click :guilabel:`Next >>` to go to the next step. + * *Keywords from Thesaurus* + * *Keywords* which are simple keywords for the map -* **Location and Licenses** + Subsequently, more specialized metadata fields are presented in the metadata form: - .. figure:: img/location_licenses_map_metadata.png + .. figure:: img/maps_metadata_2.png :align: center - *Location and Licenses Metadata for Maps* - - The following list shows what kinds of metadata you are required to enter (see also the picture below): - - * *Language* of the layer; - * *License* of the dataset; - * *Regions* covered by the layers extent. Proposed extents cover the following scales: global, continental, regional, national; - * *Data Quality statement* (general explanation of the data producer's knowledge about the lineage of a dataset); - * Potential *Restrictions* on layer sharing. - - No further mandatory metadata are required in the next step so, once the required fields have been filled out, a green :guilabel:`Done` button will be visible in the screen. - Click :guilabel:`Next >>` to go to the next step or :guilabel:`<< Back` to go back to the previous step. - - -* **Optional Metadata** - - .. figure:: img/optional_map_metadata.png + .. figure:: img/maps_metadata_3.png :align: center - *Optional Map Metadata* - - Complementary information are: - - * *Edition* of the map; + *Map Metadata form* + + * *Language* of the map; + * *License* of the map; + * *Attribution* of the map; authority or function assigned, as to a ruler, legislative assembly, delegate, or the like + * *Regions*, which informs on the spatial extent covered by the map. Proposed extents cover the following scales: global, continental, regional, national; + * *Data Quality statement* (general explanation of the data producer's knowledge about the lineage of a map); + * *Restrictions* on map sharing. + * *Other constraints*; + * *Edition*; Version nof cited resource + * *DOI* of the map; if available, this represents the `Digital Object Identifier `_ of the resource + * *Edition* to indicate the reference or the source of the map; * *Purpose* of the map and its objectives; - * *Supplemental information* that can provide a better understanding of the map; + * *Supplemental information* that can provide a better understanding of the created map; + * *Temporal extent start / Temporal extent end; * *Maintenance frequency* of the map; - * *Spatial representation type*, the method used to represent geographic information in the dataset; - * Users who are *Responsible* for the layer, its *Owner*, and the *Author* of its metadata; + * *Spatial representation type* used. * *Related resources* to link one or multiple resources to the document. These will be visible inside the :ref:`map-info` panel - -If you miss some mandatory metadata the *Completeness* bar shows you a red message like the one in the picture below. - -.. figure:: img/completeness_progress_bar.png - :align: center - :width: 200px - - *Completeness Progress Bar* - -Metadata Advanced Editing -------------------------- - -The :guilabel:`Advanced Metadata` editing button in the Metadata Edit form allows to change the map metadata. - -.. figure:: img/advanced_edit_button.png - :align: center - - *The Advanced Edit button* - -Click on it to display the *Metadata Advanced Editing Page*. -That page allows you to edit all the map metadata described in the previous paragraph. - -Once you have finished to edit them click on :guilabel:`Update` to save your changes. + * *Contacts; \ No newline at end of file diff --git a/usage/managing_maps/map_permissions.rst b/usage/managing_maps/map_permissions.rst index 8fa4f559..bd508344 100644 --- a/usage/managing_maps/map_permissions.rst +++ b/usage/managing_maps/map_permissions.rst @@ -3,8 +3,7 @@ Share Options ============= -In GeoNode the share options management system is indeed more complex. -Administrators can choose who can do what for each map. +In Share options, Administrators can choose who can do what for each map. Users can manage only the maps they own or the maps which they are authorize to manage. By default only owners can edit and manage maps, and anyone can view them. diff --git a/usage/managing_maps/maps_configuration/creating_widgets.rst b/usage/managing_maps/maps_configuration/creating_widgets.rst deleted file mode 100644 index 76d49ec2..00000000 --- a/usage/managing_maps/maps_configuration/creating_widgets.rst +++ /dev/null @@ -1,125 +0,0 @@ -.. _creating-widgets: - -Creating Widgets -================ - -.. |create_widgets_button| image:: img/create_widgets_button.png - :width: 30px - :height: 30px - :align: middle - -*Widgets* are graphical elements that describe the datasets data. They can be of different types such as *Charts*, *Texts*, *Tables* and *Counters*. -Through the |create_widgets_button| button of the :ref:`toc` you can open the *Widgets* panel. - -.. figure:: img/widgets_panel.png - :align: center - - *Creating Widgets* - -Chart Widgets -------------- - -*Chart Widgets* are graphical representations of the dataset data. They can be *Bar Chart*, *Pie Chart* or *Line Chart* as shown in the picture below. - -.. figure:: img/chart_widgets.png - :align: center - - *Chart Widgets* - -.. |advanced_search_button| image:: img/advanced_search_button.png - :width: 30px - :height: 30px - :align: middle - -.. |configure_widgets_options_button| image:: img/configure_widgets_options_button.png - :width: 30px - :height: 30px - :align: middle - -.. |save_button| image:: img/save_button.png - :width: 30px - :height: 30px - :align: middle - -.. |connect_to_viewport| image:: img/connect_to_viewport.png - :width: 30px - :height: 30px - :align: middle - -| Lets create a new **Bar Chart**. -| Click on *Bar Chart* then select the *X Attribute*, the *Y Attribute*, the *Operation* and the *Color* do you prefer. - You can also display the *Legend*, *Hide the Y axis*, *Hide the grid* and decide what *Label* display into the legend. -| Now you can filter the data to be considered for the chart by clicking on |advanced_search_button|. We don't need any filter so click |configure_widgets_options_button| to configure other widget options. - Insert a *Title* and a *Description* and click on *Save* |save_button|. - -.. figure:: img/bar_chart_widget.png - :align: center - - *Chart Widgets Creation* - -The green |connect_to_viewport| icon means that the chart is connected to the viewport. - -At the top of the bar chat, there is the options menu of the widget where you can *Download grapg as png*, *Zoom the wigets* and *Reset axes*. - -.. figure:: img/chart_widget_options.png - :align: center - :width: 500px - - *Chart Widgets Options* - -Text Widgets ------------- - -If you select *Text* on the *Widgets* panel you can create *Text Widgets*. Add a *Title* and the desired descriptive text, then click on |save_button|. - - -.. figure:: img/text_widgets_creation.png - :align: center - - *Text Widgets Creation* - -The resulting widget looks like the following. - -.. figure:: img/text_widget.png - :align: center - - *My Text Widget* - -Table Widgets -------------- - -| Through the *Table Widgets* you can add the :ref:`attributes-table` of the dataset to the map. You can decide to show a subset of the features, through filters, and you can select one or more columns/attributes. -You can also enter a *Title* for each column to be displayed as the table header in place of the Name of the layer field and enter a *Description* for each field to be displayed as a tooltip, visible moving the mouse on the column header. -| So, choose what attributes you are interested in and click on |configure_widgets_options_button|. - -.. figure:: img/table_widget_columns.png - :align: center - - *Table Widgets Columns* - -Insert *Title* and *Description* (optional) and click on |save_button|. The example below shows the *Table Widget* on the map. - -.. figure:: img/table_widget.png - :align: center - - *Table Widget* - -Counter Widgets ---------------- - -*Counter Widgets* are numeric representations of some attributes. For example you can represent the average speed limit on a road network. - -.. figure:: img/counter_widget_creation.png - :align: center - :width: 400px - - *Counter Widget Creation* - -Click on |configure_widgets_options_button|, insert *Title* and *Description* then click on |save_button|. - -.. figure:: img/counter_widget.png - :align: center - - *Counter Widget* - -The GeoNode map viewer is `MapStore `_ based, see the `MapStore Documentation `_ for further information. diff --git a/usage/managing_maps/maps_configuration/get_fetureinfo.rst b/usage/managing_maps/maps_configuration/get_fetureinfo.rst deleted file mode 100644 index 890913db..00000000 --- a/usage/managing_maps/maps_configuration/get_fetureinfo.rst +++ /dev/null @@ -1,115 +0,0 @@ -.. _getfetureinfo-templates: - -Customizing The Datasets' GetFeatureInfo Templates -================================================ -When “clicking” over a feature of a dataset into a GeoNode Map, an info window popups showing a formatted representation of the raw data identified by the coordinates (see Fig. 1) - -.. figure:: img/getfetureinfo_templates_001.png - :align: center - - *Fig. 1* - -The way how such information is presented to the user is defined by what we call “GetFeatureInfo Template”. The latter is basically an HTML snippet containing some placeholders and special inline codes that instruct GeoServer on how to generate the raw data output. - -The outcome is a rendered HTML snippet with the real values replacing the placeholders of the Template. - -Currently, GeoNode allows a very simple mechanism to customize the “GetFeatureInfo Template” of a dataset. - -It is possible, through the dataset Metadata Editor, to assign a name, a label and also set the attributes we want to display on the GetFeatureInfo output. - -As an instance, by using the example above, we can customize a bit the dataset Metadata as shown in Fig. 2 - -.. figure:: img/getfetureinfo_templates_002.png - :align: center - - *Fig. 2* - -The “GetFeatureInfo” output will change accordingly as shown in Fig. 3 - -.. figure:: img/getfetureinfo_templates_003.png - :align: center - - *Fig. 3* - -Simple Template: Assigning A Media-Type To Attribute Values -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The easiest way to render a different media-type (:guilabel:`image`, :guilabel:`audio`, :guilabel:`video` or :guilabel:`iframe`) to a property value, is to change it from the :guilabel:`Metadata Edit` attributes panel. - -By changing the :guilabel:`Display Type` of an attribute from this panel as shown in Fig. 4 - -.. figure:: img/getfetureinfo_templates_004.png - :align: center - - *Fig. 4* - -GeoNode will create automatically the HTML media type when rendering by using the **value** of the selected property. - -So, as an example, if, in the figure above, the attribute ``NAME`` contains values representing some ``links`` to other resources, GeoNode will create those links automatically for you when clicking over a geometry. - -.. figure:: img/getfetureinfo_templates_005.png - :align: center - - *Fig. 5* - -Selecting :guilabel:`image` as media-type (Fig. 6) - -.. figure:: img/getfetureinfo_templates_006.png - :align: center - - *Fig. 6* - -and editing the contents accordingly (Fig. 7) - -.. warning: Pay attention to the **length** of the values you put into the properties. They must respect you data schema. - -.. figure:: img/getfetureinfo_templates_007.png - :align: center - - *Fig. 7* - -you will get a nice effect as shown in Fig. 8 - -.. figure:: img/getfetureinfo_templates_008.png - :align: center - - *Fig. 8* - -Advanced Template: Use A Custom HTML Template -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -By selecting the option :guilabel:`Use a custom template?` as shown in Fig. 9 - -.. figure:: img/getfetureinfo_templates_009.png - :align: center - - *Fig. 9* - -You will be able to provide your own custom HTML Template for the Feature Info output. -Attributes from the dataset can be represented inside the template using ``${properties.ATTRIBUTE}``, where ``ATTRIBUTE`` is the name of an attribute (field) from your dataset. - -The example below uses the ``wikipedia`` and the ``name`` attributes to show the name of the airport as a link to the Wikipedia page: - -.. figure:: img/getfetureinfo_templates_010.png - :align: center - - *Fig. 10* - -.. figure:: img/getfetureinfo_templates_011.png - :align: center - - *Fig. 11* - -This is the result shown when you click on an airport - -.. figure:: img/getfetureinfo_templates_012.png - :align: center - - *Fig. 12* - -Optional: Customizing the HTML WYSIWYG Editor Menu Bar -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The :guilabel:`Menu Bar` and :guilabel:`Tool Bar` of the HTML Editor, can be easily customized by overriding the ``TINYMCE_DEFAULT_CONFIG`` variable on :guilabel:`settings.py` (see :ref:`tinyMCE Default Config Settings`) - -There are many plugins and options allowing you to easily customize the editor and also provides some predefined *templates* to speed up the editing. - -For more information about the Javascript tool, please refer to https://www.tiny.cloud/ \ No newline at end of file diff --git a/usage/managing_maps/maps_configuration/img/add-viewer-page.png b/usage/managing_maps/maps_configuration/img/add-viewer-page.png index 1090fa3e..1ea22dc7 100644 Binary files a/usage/managing_maps/maps_configuration/img/add-viewer-page.png and b/usage/managing_maps/maps_configuration/img/add-viewer-page.png differ diff --git a/usage/managing_maps/maps_configuration/img/basemap_switcher.png b/usage/managing_maps/maps_configuration/img/basemap_switcher.png index fadbccc3..63b1b459 100644 Binary files a/usage/managing_maps/maps_configuration/img/basemap_switcher.png and b/usage/managing_maps/maps_configuration/img/basemap_switcher.png differ diff --git a/usage/managing_maps/maps_configuration/img/basemap_switching.png b/usage/managing_maps/maps_configuration/img/basemap_switching.png index d053b9dd..333376bf 100644 Binary files a/usage/managing_maps/maps_configuration/img/basemap_switching.png and b/usage/managing_maps/maps_configuration/img/basemap_switching.png differ diff --git a/usage/managing_maps/maps_configuration/img/collapsed_timeline.png b/usage/managing_maps/maps_configuration/img/collapsed_timeline.png index 3abaa45a..6479d3f7 100644 Binary files a/usage/managing_maps/maps_configuration/img/collapsed_timeline.png and b/usage/managing_maps/maps_configuration/img/collapsed_timeline.png differ diff --git a/usage/managing_maps/maps_configuration/img/datasets_catalog.png b/usage/managing_maps/maps_configuration/img/datasets_catalog.png index fb4195ef..e35f1556 100644 Binary files a/usage/managing_maps/maps_configuration/img/datasets_catalog.png and b/usage/managing_maps/maps_configuration/img/datasets_catalog.png differ diff --git a/usage/managing_maps/maps_configuration/img/explore_map_viewer.png b/usage/managing_maps/maps_configuration/img/explore_map_viewer.png index a2c3758c..15bf2dd3 100644 Binary files a/usage/managing_maps/maps_configuration/img/explore_map_viewer.png and b/usage/managing_maps/maps_configuration/img/explore_map_viewer.png differ diff --git a/usage/managing_maps/maps_configuration/img/getfetureinfo_templates_001.png b/usage/managing_maps/maps_configuration/img/getfetureinfo_templates_001.png index f5b3d597..a953c854 100644 Binary files a/usage/managing_maps/maps_configuration/img/getfetureinfo_templates_001.png and b/usage/managing_maps/maps_configuration/img/getfetureinfo_templates_001.png differ diff --git a/usage/managing_maps/maps_configuration/img/querying_objects_on_map.png b/usage/managing_maps/maps_configuration/img/querying_objects_on_map.png index 54cfe781..89e9a971 100644 Binary files a/usage/managing_maps/maps_configuration/img/querying_objects_on_map.png and b/usage/managing_maps/maps_configuration/img/querying_objects_on_map.png differ diff --git a/usage/managing_maps/maps_configuration/img/scrolling_opacity.png b/usage/managing_maps/maps_configuration/img/scrolling_opacity.png index 83e7c150..8dc7bea1 100644 Binary files a/usage/managing_maps/maps_configuration/img/scrolling_opacity.png and b/usage/managing_maps/maps_configuration/img/scrolling_opacity.png differ diff --git a/usage/managing_maps/maps_configuration/img/search_bar_result.png b/usage/managing_maps/maps_configuration/img/search_bar_result.png index c4159906..bf633cd0 100644 Binary files a/usage/managing_maps/maps_configuration/img/search_bar_result.png and b/usage/managing_maps/maps_configuration/img/search_bar_result.png differ diff --git a/usage/managing_maps/maps_configuration/img/search_bar_typing_name.png b/usage/managing_maps/maps_configuration/img/search_bar_typing_name.png index d5ecca0f..72de339d 100644 Binary files a/usage/managing_maps/maps_configuration/img/search_bar_typing_name.png and b/usage/managing_maps/maps_configuration/img/search_bar_typing_name.png differ diff --git a/usage/managing_maps/maps_configuration/index.rst b/usage/managing_maps/maps_configuration/index.rst index 626d879e..6298b3c3 100644 --- a/usage/managing_maps/maps_configuration/index.rst +++ b/usage/managing_maps/maps_configuration/index.rst @@ -40,7 +40,7 @@ Search Bar ---------- | The *Search Bar* of the map viewer allows you to find point of interests (POIs), streets or locations by name. -| Lets type the name of some place then select the first record. +| Lets type the keyword airport (since one of the added layers is related to airports) and select one of the records. .. figure:: img/search_bar_typing_name.png :align: center diff --git a/usage/publishing_data/img/publishing_resource.png b/usage/publishing_data/img/publishing_resource.png deleted file mode 100644 index b80e3e8c..00000000 Binary files a/usage/publishing_data/img/publishing_resource.png and /dev/null differ diff --git a/usage/publishing_data/index.rst b/usage/publishing_data/index.rst deleted file mode 100644 index 97acebd0..00000000 --- a/usage/publishing_data/index.rst +++ /dev/null @@ -1,14 +0,0 @@ -Publishing Data -=============== - -In GeoNode, each resource can be published in order to share it with other people. - -In order to publish a map, document or dataset or any other Geonode resource, Go to the settings tab in the Metadata Edit form, The check for publishing and unpublishing is available. -See picture below. - -.. figure:: img/publishing_resource.png - :align: center - - *Resource publishing* - -Click :guilabel: `Update` to save the changes. diff --git a/usage/users_groups/contacting_users.rst b/usage/users_groups/contacting_users.rst deleted file mode 100644 index 54c4716d..00000000 --- a/usage/users_groups/contacting_users.rst +++ /dev/null @@ -1,60 +0,0 @@ -Contacting other users -====================== - -| GeoNode allows you to communicate by message with other registered users and groups. -| To send a message to some user and/or groups you can follow the link :guilabel:`Message User` from your *Profile* page (see :ref:`editing-profile`) or from the *Profile* details page (see the previous section :ref:`user-info`) of that user. - -.. figure:: img/write_message.png - :align: center - - *Send message to users and groups* - -| Insert your content, type a subject and click on :guilabel:`Send message` to send the message to the users and groups you have selected. -| You will be redirected to the *Conversation* details page related to the subject. - -.. figure:: img/sent_message.png - :align: center - - *Your message* - -The Inbox page --------------- - -You can view your conversations in your *Inbox* page, reachable through the :guilabel:`Back to inbox` button (see the picture above) or from the :guilabel:`Inbox` link of the user menu. - -.. figure:: img/inbox_link.png - :align: center - - *Inbox link* - -The picture below shows how your *Inbox* page should look like. - -.. figure:: img/inbox_page.png - :align: center - - *Inbox page* - -In *Inbox* all the unread messages are listed. You haven't received any message yet so your *Inbox* is empty. If you switch to the *All* tab you can see all the conversations you are involved in. - -.. figure:: img/all_your_conversations.png - :align: center - - *All your conversations* - -When some user send a reply to your message your *Inbox* shows it, see the picture below for an example. - -.. figure:: img/reply_inbox.png - :align: center - - *A reply to your message* - -You can open the *Conversation* details by clicking on the *Subject* link. - -.. figure:: img/conversation.png - :align: center - - *Conversation details* - -As you can see in the picture above, in the *Conversation* page you have the ability to write a quick reply. Type your message in the text box and click on :guilabel:`Send Reply` to do that. - -In the *Inbox* page there is also the :guilabel:`Create Message` button that provides you a quick link to the message creation form. diff --git a/usage/users_groups/img/all_your_conversations.png b/usage/users_groups/img/all_your_conversations.png deleted file mode 100644 index 2b2bd861..00000000 Binary files a/usage/users_groups/img/all_your_conversations.png and /dev/null differ diff --git a/usage/users_groups/img/conversation.png b/usage/users_groups/img/conversation.png deleted file mode 100644 index 825b8f38..00000000 Binary files a/usage/users_groups/img/conversation.png and /dev/null differ diff --git a/usage/users_groups/img/inbox_link.png b/usage/users_groups/img/inbox_link.png deleted file mode 100644 index e1668042..00000000 Binary files a/usage/users_groups/img/inbox_link.png and /dev/null differ diff --git a/usage/users_groups/img/inbox_page.png b/usage/users_groups/img/inbox_page.png deleted file mode 100644 index b06f066f..00000000 Binary files a/usage/users_groups/img/inbox_page.png and /dev/null differ diff --git a/usage/users_groups/img/invite_users.png b/usage/users_groups/img/invite_users.png index e4001063..7ff93108 100644 Binary files a/usage/users_groups/img/invite_users.png and b/usage/users_groups/img/invite_users.png differ diff --git a/usage/users_groups/img/people_link.png b/usage/users_groups/img/people_link.png index 5cf9978b..6d777aa5 100644 Binary files a/usage/users_groups/img/people_link.png and b/usage/users_groups/img/people_link.png differ diff --git a/usage/users_groups/img/recent_activities.png b/usage/users_groups/img/recent_activities.png index 062b0137..66736f99 100644 Binary files a/usage/users_groups/img/recent_activities.png and b/usage/users_groups/img/recent_activities.png differ diff --git a/usage/users_groups/img/recent_activities_link.png b/usage/users_groups/img/recent_activities_link.png index 36bc460d..92b0b76f 100644 Binary files a/usage/users_groups/img/recent_activities_link.png and b/usage/users_groups/img/recent_activities_link.png differ diff --git a/usage/users_groups/img/registered_users_list.png b/usage/users_groups/img/registered_users_list.png index cb862eca..ac7381e6 100644 Binary files a/usage/users_groups/img/registered_users_list.png and b/usage/users_groups/img/registered_users_list.png differ diff --git a/usage/users_groups/img/reply_inbox.png b/usage/users_groups/img/reply_inbox.png deleted file mode 100644 index 75994db7..00000000 Binary files a/usage/users_groups/img/reply_inbox.png and /dev/null differ diff --git a/usage/users_groups/img/sent_message.png b/usage/users_groups/img/sent_message.png deleted file mode 100644 index dc32a9f4..00000000 Binary files a/usage/users_groups/img/sent_message.png and /dev/null differ diff --git a/usage/users_groups/img/user_activities.png b/usage/users_groups/img/user_activities.png index f0f11285..f0fcaa00 100644 Binary files a/usage/users_groups/img/user_activities.png and b/usage/users_groups/img/user_activities.png differ diff --git a/usage/users_groups/img/user_details.png b/usage/users_groups/img/user_details.png index 48393cfc..d35f0bff 100644 Binary files a/usage/users_groups/img/user_details.png and b/usage/users_groups/img/user_details.png differ diff --git a/usage/users_groups/img/write_message.png b/usage/users_groups/img/write_message.png deleted file mode 100644 index 7b4b3cc3..00000000 Binary files a/usage/users_groups/img/write_message.png and /dev/null differ diff --git a/usage/users_groups/index.rst b/usage/users_groups/index.rst index bbf640da..1653d369 100644 --- a/usage/users_groups/index.rst +++ b/usage/users_groups/index.rst @@ -20,10 +20,9 @@ A message will confirm that invitations have been correctly sent. .. note:: You can invite more than one user at the same time by typing the email addresses inline with a semi-colon separator. -The next sections will show you how to view information about other users and how to contact them. +The next section will show you how to view information about other users. .. toctree:: :maxdepth: 1 users_info - contacting_users diff --git a/usage/users_groups/users_info.rst b/usage/users_groups/users_info.rst index 1cae9eff..f61a9b45 100644 --- a/usage/users_groups/users_info.rst +++ b/usage/users_groups/users_info.rst @@ -4,12 +4,12 @@ Viewing other users information =============================== | Once your account is created, you can view other accounts on the system. -| To see information about other users on the system, click the :guilabel:`People` link of the :guilabel:`About` menu in *Home* page. +| To see information about other users on the system, click the :guilabel:`People` link of the :guilabel:`User` menu. .. figure:: img/people_link.png :align: center - *About menu - People link* + *User menu - People link* You will see a list of users registered on the system. @@ -35,9 +35,8 @@ Through the :guilabel:`User Activities` link, in right side of the page, it is p *User activities* -The :guilabel:`Message User` link lets you to contact other users, see the next section to read more about that. -It is also possible, in GeoNode, to see the recent activities of all users through the :guilabel:`Recent Activities` link of the user menu. +It is also possible, in GeoNode, to see the recent activities of all users through the :guilabel:`Recent Activity` link of the user menu. .. figure:: img/recent_activities_link.png :align: center