M #~: fix paths of FireEdge views

source/installation_and_configuration/configuration_management/appendix.rst

@@ -33,7 +33,7 @@ Name                                                               Type
 ``/etc/one/fireedge/provision/provision-server.conf``              YAML
 ``/etc/one/fireedge/sunstone/*/*.yaml``                            YAML
 ``/etc/one/fireedge/sunstone/sunstone-server.conf``                YAML
-``/etc/one/fireedge/sunstone/sunstone-views.yaml``                 YAML
+``/etc/one/fireedge/sunstone/views/sunstone-views.yaml``           YAML
 ``/etc/one/guacd``                                                 Shell
 ``/etc/one/monitord.conf``                                         oned.conf-like
 ``/etc/one/oned.conf``                                             oned.conf-like

source/installation_and_configuration/configuration_management/conflicts.rst

@@ -92,9 +92,9 @@ Example of multiple patch modes for multiple files:
         --patch-modes skip,replace:/etc/one/oned.conf:5.10.0 \
         --patch-modes force:/etc/one/fireedge/sunstone-views.yaml:5.6.0 \
         --patch-modes replace:/etc/one/fireedge-server.conf \
-        --patch-modes skip:/etc/one/fireedge/sunstone/admin/acl-tab.yaml:5.4.1 \
-        --patch-modes skip:/etc/one/fireedge/sunstone/admin/vm-tab.yaml:5.4.2 \
-        --patch-modes skip:/etc/one/fireedge/sunstone/admin/vm-template-tab.yaml
+        --patch-modes skip:/etc/one/fireedge/sunstone/views/admin/acl-tab.yaml:5.4.1 \
+        --patch-modes skip:/etc/one/fireedge/sunstone/views/admin/vm-tab.yaml:5.4.2 \
+        --patch-modes skip:/etc/one/fireedge/sunstone/views/admin/vm-template-tab.yaml
 
 Restore from Backup
 ===================

source/installation_and_configuration/opennebula_services/fireedge.rst

@@ -182,7 +182,7 @@ Branding FireEdge
 
 You can add your logo to the login, main, favicon and loading screens by updating the ``logo:`` attribute as follows:
 
-- The logo configuration is done in the ``/etc/one/fireedge/sunstone/sunstone-views.yaml`` file.
+- The logo configuration is done in the ``/etc/one/fireedge/sunstone/views/sunstone-views.yaml`` file.
 - The logo of the main UI screen is defined for each view.
 
 The logo image must be copied to ``/usr/lib/one/fireedge/dist/client/assets/images/logos``.
@@ -191,7 +191,7 @@ The following example shows how you can change the logo to a generic linux one (
 
 .. code-block:: yaml
 
-    # /etc/one/fireedge/sunstone/sunstone-views.yaml
+    # /etc/one/fireedge/sunstone/views/sunstone-views.yaml
     ---
     logo: linux.png
 

source/integration_and_development/references/sunstone_dev.rst

@@ -462,7 +462,7 @@ In order to develop a new tab, you need to make sure it has the correct webpack
 
     .. prompt:: bash
 
-        cp /etc/one/fireedge/sunstone/admin/user-tab.yaml /etc/one/fireedge/sunstone/admin/usersgroups-tab.yaml
+        cp /etc/one/fireedge/sunstone/views/admin/user-tab.yaml /etc/one/fireedge/sunstone/views/admin/usersgroups-tab.yaml
 
 
     And then we update the resource name inside the new ``usersandgroups-tab.yaml`` view file to match the path of our component

source/management_and_operations/end-user_web_interfaces/fireedge_sunstone.rst

@@ -132,7 +132,7 @@ Default Views
 Admin View
 --------------------------------------------------------------------------------
 
-This view provides complete control of the Virtual Machines, Templates, and Marketplace apps. Details can be configured in the ``/etc/one/fireedge/sunstone/admin/`` directory.
+This view provides complete control of the Virtual Machines, Templates, and Marketplace apps. Details can be configured in the ``/etc/one/fireedge/sunstone/views/admin/`` directory.
 
 |fireedge_sunstone_admin_view|
 
@@ -141,7 +141,7 @@ This view provides complete control of the Virtual Machines, Templates, and Mark
 User View
 --------------------------------------------------------------------------------
 
-Based on the Admin View. It is an advanced user view intended for users with fewer privileges than an admin user, allowing them to manage Virtual Machines and Templates. Users will not be able to manage or retrieve the hosts and clusters of the cloud. Details can be configured in the ``/etc/one/fireedge/sunstone/user/`` directory.
+Based on the Admin View. It is an advanced user view intended for users with fewer privileges than an admin user, allowing them to manage Virtual Machines and Templates. Users will not be able to manage or retrieve the hosts and clusters of the cloud. Details can be configured in the ``/etc/one/fireedge/sunstone/views/user/`` directory.
 
 |fireedge_sunstone_user_view|
 
@@ -150,25 +150,25 @@ Based on the Admin View. It is an advanced user view intended for users with few
 Groupadmin View
 --------------------------------------------------------------------------------
 
-This view it's like a limited version of the cloud administrator view to be used by the administrators of a group. Details can be configured in the ``/etc/one/fireedge/sunstone/groupadmin/`` directory. More details on :ref:`Group admin view <group_admin_view>`
+This view it's like a limited version of the cloud administrator view to be used by the administrators of a group. Details can be configured in the ``/etc/one/fireedge/sunstone/views/groupadmin/`` directory. More details on :ref:`Group admin view <group_admin_view>`
 
 .. _fireedge_sunstone_cloud_view:
 
 Cloud View
 --------------------------------------------------------------------------------
 
-This is a simplified view intended for cloud consumers that just require a portal where they can provision new VMs easily. Details can be configured in the ``/etc/one/fireedge/sunstone/cloud/`` directory. More details on :ref:`Cloud view <cloud_view>`
+This is a simplified view intended for cloud consumers that just require a portal where they can provision new VMs easily. Details can be configured in the ``/etc/one/fireedge/sunstone/views/cloud/`` directory. More details on :ref:`Cloud view <cloud_view>`
 
 .. _fireedge_sunstone_new_view:
 
 Defining a New View
 --------------------------------------------------------------------------------
 
-The views definitions are placed in the ``/etc/one/fireedge/sunstone/`` directory. Each view is defined by a folder (named as the view) with the needed configuration files inside.
+The views definitions are placed in the ``/etc/one/fireedge/sunstone/views`` directory. Each view is defined by a folder (named as the view) with the needed configuration files inside.
 
 .. code::
 
-    /etc/one/fireedge/sunstone/
+    /etc/one/fireedge/sunstone/views
     ...
     |-- admin/
     |   |-- backup-tab.yaml           <--- the Backup tab configuration file
@@ -194,7 +194,7 @@ The views definitions are placed in the ``/etc/one/fireedge/sunstone/`` director
         `-- vm-template-tab.yaml      <--- the VM Template tab configuration file
     ...
 
-The easiest way to create a custom view is to copy the ``admin`` or ``user`` folder and modify its content as needed. After that, add the new view into ``/etc/one/fireedge/sunstone/sunstone-views.yaml``.
+The easiest way to create a custom view is to copy the ``admin`` or ``user`` folder and modify its content as needed. After that, add the new view into ``/etc/one/fireedge/sunstone/views/sunstone-views.yaml``.
 
 View Customization
 --------------------------------------------------------------------------------

source/management_and_operations/users_groups_management/fireedge_sunstone_views.rst

@@ -11,7 +11,7 @@ Using the OpenNebula FireEdge Sunstone Views you will be able to provide a simpl
 - :ref:`Group Admin View <fireedge_groupadmin_view>`.
 - :ref:`Cloud View <fireedge_cloud_view>`.
 
-Each of these views is defined on a folder in ``/etc/one/fireedge/sunstone`` that contains many yaml as tabs are enabled in this view. On this path, there is also a file ``/etc/one/fireedge/sunstone/sunstone-views.yaml`` where is defined the default configuration (see :ref:`Defining a New OpenNebula Sunstone View or Customizing an Existing one <fireedge_sunstone_views_define_new>` to more information about configure or create a view).
+Each of these views is defined on a folder in ``/etc/one/fireedge/sunstone`` that contains many yaml as tabs are enabled in this view. On this path, there is also a file ``/etc/one/fireedge/sunstone/views/sunstone-views.yaml`` where is defined the default configuration (see :ref:`Defining a New OpenNebula Sunstone View or Customizing an Existing one <fireedge_sunstone_views_define_new>` to more information about configure or create a view).
 
 .. _fireedge_suns_views_default_views:
 
@@ -23,7 +23,7 @@ Default Views
 Admin View
 --------------------------------------------------------------------------------
 
-This view provides full control of the cloud. Details can be configured in the ``/etc/one/fireedge/sunstone/admin/*.yaml`` files.
+This view provides full control of the cloud. Details can be configured in the ``/etc/one/fireedge/sunstone/views/admin/*.yaml`` files.
 
 |fireedge_sunstone_admin_dashboard|
 
@@ -32,7 +32,7 @@ This view provides full control of the cloud. Details can be configured in the `
 User View
 --------------------------------------------------------------------------------
 
-Based on the Admin View; it is an advanced user view. It is intended for users that need access to more actions than the limited set available in the cloud view. Users will not be able to manage nor retrieve the hosts and clusters of the cloud. They will be able to see Datastores and Virtual Networks in order to use them when creating a new Image or Virtual Machine, but they will not be able to create new ones. Details can be configured in the ``/etc/one/fireedge/sunstone/user/*.yaml`` file.
+Based on the Admin View; it is an advanced user view. It is intended for users that need access to more actions than the limited set available in the cloud view. Users will not be able to manage nor retrieve the hosts and clusters of the cloud. They will be able to see Datastores and Virtual Networks in order to use them when creating a new Image or Virtual Machine, but they will not be able to create new ones. Details can be configured in the ``/etc/one/fireedge/sunstone/views/user/*.yaml`` file.
 
 |fireedge_sunstone_view_dashboard|
 
@@ -41,7 +41,7 @@ Based on the Admin View; it is an advanced user view. It is intended for users t
 Group Admin View
 --------------------------------------------------------------------------------
 
-Based on Users View; this view has the same tabs as the User View plus the Groups and Users tabs to manage the group and the users of the groups that this user is administrator. Details can be configured in the ``/etc/one/fireedge/sunstone/groupadmin/*.yaml`` files.
+Based on Users View; this view has the same tabs as the User View plus the Groups and Users tabs to manage the group and the users of the groups that this user is administrator. Details can be configured in the ``/etc/one/fireedge/sunstone/views/groupadmin/*.yaml`` files.
 
 |fireedge_sunstone_groupadmin_dashboard|
 
@@ -50,7 +50,7 @@ Based on Users View; this view has the same tabs as the User View plus the Group
 Cloud View
 --------------------------------------------------------------------------------
 
-This is a simplified view, mainly intended for end-users that just require a portal where they can provision new virtual machines easily from pre-defined Templates. For more information about this view, please check the ``/etc/one/fireedge/sunstone/cloud/*.yaml`` files.
+This is a simplified view, mainly intended for end-users that just require a portal where they can provision new virtual machines easily from pre-defined Templates. For more information about this view, please check the ``/etc/one/fireedge/sunstone/views/cloud/*.yaml`` files.
 
 |fireedge_sunstone_cloud_dashboard|
 
@@ -72,7 +72,7 @@ FireEdge Sunstone users can change their current view from the top-right drop-do
 
 |fireedge_sunstone_views_change|
 
-These options are saved in the group template, as well as other hidden settings. If not defined, defaults views from ``/etc/one/fireedge/sunstone/sunstone-views.yaml`` are taken.
+These options are saved in the group template, as well as other hidden settings. If not defined, defaults views from ``/etc/one/fireedge/sunstone/views/sunstone-views.yaml`` are taken.
 
 .. _fireedge_sunstone_views_define_new: