From 2325ddd0224267041578ff989b1f8bebb38ec02f Mon Sep 17 00:00:00 2001 From: mmattel Date: Mon, 10 Jan 2022 11:27:52 +0100 Subject: [PATCH] [11.7] [PR 34] Fix the family directory structure Backport of PR #34 --- antora.yml | 2 +- bin/find-orphaned-adoc-files | 38 ++++++++---------- bin/find-orphaned-base | 6 ++- bin/find-orphaned-example-files | 2 + bin/find-orphaned-image-files | 3 +- bin/makepdf | 14 +++++-- .../images/accounts/02_basic_auth.png | Bin .../images/accounts/04_Account_1x.png | Bin .../images/accounts/07_Account_edit.png | Bin .../accounts/14_OAuth_Web_view_authorize.png | Bin ...-account-certificate-passed-validation.png | Bin .../accounts/confirm-account-deletion.png | Bin .../edit-oauth2-authenticated-account.png | Bin .../accounts/edit-or-delete-account.png | Bin .../ios-app-settings-logging.png | Bin .../troubleshooting/mitmproxy_screenshot.png | Bin .../owncloud-log-configuration.png | Bin .../all-available-offline-items.png | Bin .../available-offline-items.png | Bin .../available-offline-logo.png | Bin .../file-available-offline.png | Bin .../available-offline/folder-action.png | Bin .../make-available-offline.png | Bin .../make-unavailable-offline.png | Bin .../offline-storage-settings.png | Bin .../one-folder-available-offline.png | Bin .../images/available-offline/settings.png | Bin .../images/collaboration/31_Collab.png | Bin .../collaboration/delete-public-link.png | Bin .../manage-public-link-settings.png | Bin .../public-link-set-expiration-date.png | Bin .../public-link-set-password.png | Bin .../swipe-and-delete-public-link.png | Bin .../images/files/21_File_list_annotated.png | Bin .../images/files/21_File_list_parent.png | Bin .../images/files/24_Upload_Photo_multi.png | Bin .../images/files/26_Files_multidragdrop.png | Bin .../files/26_Files_multidragdrop_iPad.png | Bin .../ROOT/{assets => }/images/files/41_PDF.png | Bin .../{assets => }/images/files/42_PDF_toc.png | Bin .../images/files/43_PDF_thumbs.png | Bin .../images/files/44_PDF_search.png | Bin .../images/files/create-new-folder.png | Bin .../images/files/directory-actions.png | Bin .../file-actions-multiple-files-selected.png | Bin .../images/files/file-actions.jpg | Bin .../file-with-same-name-already-exists.png | Bin .../images/files/icon-download.png | Bin .../files/icon-not-available-locally.png | Bin .../images/files/index-bar-with-callout.png | Bin .../files/sort-files-landscape-mode.png | Bin .../images/files/sort-files-portrait-mode.png | Bin .../images/files/view-file-image.png | Bin .../images/files/view-file-odt.png | Bin .../images/files/view-file-pdf.png | Bin .../images/files/view-file-text-file.png | Bin .../images/files/view-file-video.png | Bin .../files_integration/enable-location.png | Bin .../share-files-from-other-apps-step-1.png | Bin .../share-files-from-other-apps-step-2.png | Bin .../owncloud-server-mobile-apps.png | Bin .../images/quick-access/quick-access-view.png | Bin .../images/security/04_cert_error.png | Bin .../images/security/masking-private-data.png | Bin .../images/settings/83_Settings_certs.png | Bin .../images/settings/84_Settings_themes.png | Bin ...access-with-passcode-or-biometric-data.png | Bin .../settings/lock-application-duration.png | Bin .../images/settings/media-upload.png | Bin .../settings/security-passcode-enabled.png | Bin .../images/settings/themes/classic.png | Bin .../images/settings/themes/dark.png | Bin .../images/settings/themes/light.png | Bin ...r-accounts-list-annotated-with-callout.png | Bin modules/ROOT/{ => partials}/nav.adoc | 0 75 files changed, 36 insertions(+), 29 deletions(-) rename modules/ROOT/{assets => }/images/accounts/02_basic_auth.png (100%) rename modules/ROOT/{assets => }/images/accounts/04_Account_1x.png (100%) rename modules/ROOT/{assets => }/images/accounts/07_Account_edit.png (100%) rename modules/ROOT/{assets => }/images/accounts/14_OAuth_Web_view_authorize.png (100%) rename modules/ROOT/{assets => }/images/accounts/add-account-certificate-passed-validation.png (100%) rename modules/ROOT/{assets => }/images/accounts/confirm-account-deletion.png (100%) rename modules/ROOT/{assets => }/images/accounts/edit-oauth2-authenticated-account.png (100%) rename modules/ROOT/{assets => }/images/accounts/edit-or-delete-account.png (100%) rename modules/ROOT/{assets => }/images/appendices/troubleshooting/ios-app-settings-logging.png (100%) rename modules/ROOT/{assets => }/images/appendices/troubleshooting/mitmproxy_screenshot.png (100%) rename modules/ROOT/{assets => }/images/appendices/troubleshooting/owncloud-log-configuration.png (100%) rename modules/ROOT/{assets => }/images/available-offline/all-available-offline-items.png (100%) rename modules/ROOT/{assets => }/images/available-offline/available-offline-items.png (100%) rename modules/ROOT/{assets => }/images/available-offline/available-offline-logo.png (100%) rename modules/ROOT/{assets => }/images/available-offline/file-available-offline.png (100%) rename modules/ROOT/{assets => }/images/available-offline/folder-action.png (100%) rename modules/ROOT/{assets => }/images/available-offline/make-available-offline.png (100%) rename modules/ROOT/{assets => }/images/available-offline/make-unavailable-offline.png (100%) rename modules/ROOT/{assets => }/images/available-offline/offline-storage-settings.png (100%) rename modules/ROOT/{assets => }/images/available-offline/one-folder-available-offline.png (100%) rename modules/ROOT/{assets => }/images/available-offline/settings.png (100%) rename modules/ROOT/{assets => }/images/collaboration/31_Collab.png (100%) rename modules/ROOT/{assets => }/images/collaboration/delete-public-link.png (100%) rename modules/ROOT/{assets => }/images/collaboration/manage-public-link-settings.png (100%) rename modules/ROOT/{assets => }/images/collaboration/public-link-set-expiration-date.png (100%) rename modules/ROOT/{assets => }/images/collaboration/public-link-set-password.png (100%) rename modules/ROOT/{assets => }/images/collaboration/swipe-and-delete-public-link.png (100%) rename modules/ROOT/{assets => }/images/files/21_File_list_annotated.png (100%) rename modules/ROOT/{assets => }/images/files/21_File_list_parent.png (100%) rename modules/ROOT/{assets => }/images/files/24_Upload_Photo_multi.png (100%) rename modules/ROOT/{assets => }/images/files/26_Files_multidragdrop.png (100%) rename modules/ROOT/{assets => }/images/files/26_Files_multidragdrop_iPad.png (100%) rename modules/ROOT/{assets => }/images/files/41_PDF.png (100%) rename modules/ROOT/{assets => }/images/files/42_PDF_toc.png (100%) rename modules/ROOT/{assets => }/images/files/43_PDF_thumbs.png (100%) rename modules/ROOT/{assets => }/images/files/44_PDF_search.png (100%) rename modules/ROOT/{assets => }/images/files/create-new-folder.png (100%) rename modules/ROOT/{assets => }/images/files/directory-actions.png (100%) rename modules/ROOT/{assets => }/images/files/file-actions-multiple-files-selected.png (100%) rename modules/ROOT/{assets => }/images/files/file-actions.jpg (100%) rename modules/ROOT/{assets => }/images/files/file-with-same-name-already-exists.png (100%) rename modules/ROOT/{assets => }/images/files/icon-download.png (100%) rename modules/ROOT/{assets => }/images/files/icon-not-available-locally.png (100%) rename modules/ROOT/{assets => }/images/files/index-bar-with-callout.png (100%) rename modules/ROOT/{assets => }/images/files/sort-files-landscape-mode.png (100%) rename modules/ROOT/{assets => }/images/files/sort-files-portrait-mode.png (100%) rename modules/ROOT/{assets => }/images/files/view-file-image.png (100%) rename modules/ROOT/{assets => }/images/files/view-file-odt.png (100%) rename modules/ROOT/{assets => }/images/files/view-file-pdf.png (100%) rename modules/ROOT/{assets => }/images/files/view-file-text-file.png (100%) rename modules/ROOT/{assets => }/images/files/view-file-video.png (100%) rename modules/ROOT/{assets => }/images/files_integration/enable-location.png (100%) rename modules/ROOT/{assets => }/images/files_integration/share-files-from-other-apps-step-1.png (100%) rename modules/ROOT/{assets => }/images/files_integration/share-files-from-other-apps-step-2.png (100%) rename modules/ROOT/{assets => }/images/installation/owncloud-server-mobile-apps.png (100%) rename modules/ROOT/{assets => }/images/quick-access/quick-access-view.png (100%) rename modules/ROOT/{assets => }/images/security/04_cert_error.png (100%) rename modules/ROOT/{assets => }/images/security/masking-private-data.png (100%) rename modules/ROOT/{assets => }/images/settings/83_Settings_certs.png (100%) rename modules/ROOT/{assets => }/images/settings/84_Settings_themes.png (100%) rename modules/ROOT/{assets => }/images/settings/authorise-access-with-passcode-or-biometric-data.png (100%) rename modules/ROOT/{assets => }/images/settings/lock-application-duration.png (100%) rename modules/ROOT/{assets => }/images/settings/media-upload.png (100%) rename modules/ROOT/{assets => }/images/settings/security-passcode-enabled.png (100%) rename modules/ROOT/{assets => }/images/settings/themes/classic.png (100%) rename modules/ROOT/{assets => }/images/settings/themes/dark.png (100%) rename modules/ROOT/{assets => }/images/settings/themes/light.png (100%) rename modules/ROOT/{assets => }/images/settings/user-accounts-list-annotated-with-callout.png (100%) rename modules/ROOT/{ => partials}/nav.adoc (100%) diff --git a/antora.yml b/antora.yml index 6f0ec38..0050789 100644 --- a/antora.yml +++ b/antora.yml @@ -3,7 +3,7 @@ title: Mobile App for iOS (iOS 11+) version: '11.7' start_page: ROOT:index.adoc nav: -- modules/ROOT/nav.adoc +- modules/ROOT/partials/nav.adoc asciidoc: attributes: diff --git a/bin/find-orphaned-adoc-files b/bin/find-orphaned-adoc-files index 51825c4..f38a680 100755 --- a/bin/find-orphaned-adoc-files +++ b/bin/find-orphaned-adoc-files @@ -1,16 +1,18 @@ #!/usr/bin/env bash # -# This script checks which .adoc files are possibly orphaned. +# This script checks which .adoc files are possibly orphaned # It can cover single and multi manual environments # # Note that filenames MUST NOT contain blanks AVAILABLE_MANUALS=( ROOT ) +# dependend of root or not, the manual name gets a postfix added, name see below ROOT_NAME="ROOT" +# all main nav files from the modules have the name nav.adoc NAV_FILENAME="nav.adoc" -NAV_ROOT_FILENAME="nav_root.adoc" -PARTIALS_NAME="_partials" +PARTIALS_NAME="partials" +# https://docs.antora.org/antora/2.3/page/resource-id/#id-coordinates FAMILY='{partialsdir}' #FAMILY="partial$" MANUAL_NAME= @@ -70,8 +72,13 @@ function usage() function find_orphans() { + local search_pattern= + validate_manual "$MANUAL_NAME" + # escape the dollar sign in the search pattern if exists + search_pattern="include::${FAMILY//$/\\$}" + # define the global variables # the base directory name depends if there is a single or are multiple manuals available if [[ ${MANUAL_NAME} = ${ROOT_NAME} ]]; then @@ -81,25 +88,12 @@ function find_orphans() fi # PAGES_DIR="${BASE_DIR}/pages" - # - # the nav file name and location depends if there are single or multiple manuals available - # and if the ROOT manual has been selected or not - # - # single manual - NAV_FILE="${BASE_DIR}/${NAV_FILENAME}" - # - # multi manual (overwrites the variable) - if [[ ${#AVAILABLE_MANUALS[@]} -gt 1 ]]; then - if [[ ${MANUAL_NAME} = ${ROOT_NAME} ]]; then - # ROOT selected - NAV_FILE="${BASE_DIR}/${NAV_ROOT_FILENAME}" - else - # another module selected - NAV_FILE="${PAGES_DIR}/${PARTIALS_NAME}/${NAV_FILENAME}" - fi - fi + + # define the navigation file + NAV_FILE="${BASE_DIR}/${PARTIALS_NAME}/${NAV_FILENAME}" + # --> important: the partials dir may change to base_dir/partials_name - PARTIALS_DIR="${PAGES_DIR}/${PARTIALS_NAME}" + PARTIALS_DIR="${BASE_DIR}/${PARTIALS_NAME}" # get content for all partials but exclude the nav file, however we call it # partials directory may not be present @@ -221,7 +215,7 @@ function find_orphans_for_manual() # now check if there are orphaned partials files # get all files which have an include + family statement - include_list=($(cat "${PAGES_FILES[@]/#/${PAGES_DIR}/}" | grep "include::${FAMILY}" | sort | uniq)) + include_list=($(cat "${PAGES_FILES[@]/#/${PAGES_DIR}/}" | grep "${search_pattern}" | sort | uniq)) #echo ${include_list[@]} | tr ' ' '\n' #exit diff --git a/bin/find-orphaned-base b/bin/find-orphaned-base index 61adbad..0eb6b80 100755 --- a/bin/find-orphaned-base +++ b/bin/find-orphaned-base @@ -13,6 +13,9 @@ exit fi +# escape the dollar sign in the search pattern if exists +SEARCH_PATTERN="${SEARCH_PATTERN//$/\\$}" + function start_scan() { local list @@ -92,8 +95,9 @@ function start_scan() fi # create an array diff and print to output + # the output contains the full relative path not_linked=($(echo ${found_find[@]} ${found_grep[@]} | tr ' ' '\n' | sort | uniq -u)) - echo ${not_linked[@]} | tr ' ' '\n' + echo "${not_linked[@]/#/${BASE_DIR}/${TARGET_DIR}/}" | tr ' ' '\n' # count the number of occurrences count_not_linked=$(( $count_not_linked + ${#not_linked[@]} )) diff --git a/bin/find-orphaned-example-files b/bin/find-orphaned-example-files index faea72e..a296fed 100755 --- a/bin/find-orphaned-example-files +++ b/bin/find-orphaned-example-files @@ -15,7 +15,9 @@ TASK="EXAMPLE" TARGET_DIR="examples" # depending on the target, there may be a trailing slash necessary or not # check how the file is included +# https://docs.antora.org/antora/2.3/page/resource-id/#id-coordinates SEARCH_PATTERN='include::{examplesdir}' +#SEARCH_PATTERN='include::example$' # get the full path the the directory the script runs DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" diff --git a/bin/find-orphaned-image-files b/bin/find-orphaned-image-files index 28bb63f..5431025 100755 --- a/bin/find-orphaned-image-files +++ b/bin/find-orphaned-image-files @@ -11,9 +11,10 @@ AVAILABLE_MANUALS=( ROOT ) ROOT_NAME="ROOT" BASE_DIR="" MANUAL_POSTFIX="_manual" -TARGET_DIR="assets/images" +TARGET_DIR="images" # depending on the target, there may be a trailing slash necessary or not # check how the file is included +# https://docs.antora.org/antora/2.3/page/resource-id/#id-coordinates SEARCH_PATTERN='image:' # get the full path the the directory the script runs diff --git a/bin/makepdf b/bin/makepdf index 467c297..f86ccc5 100755 --- a/bin/makepdf +++ b/bin/makepdf @@ -35,6 +35,9 @@ ACTUAL_BRANCH_NAME= DEFAULT_NAME="next" MASTER_BRANCH="master" +# the name of the partials directory +PARTIALS_NAME="partials" + DRY_RUN=false # get the todays date @@ -125,7 +128,7 @@ function clean_build_dir() # the nav file is handed over as parameter used as stream function convert_antora_nav_to_asciidoc_list() { - + local level_offset= local nav_filename="$1" # have a blank line between the template content end and the beginning of the inserts @@ -140,7 +143,10 @@ function convert_antora_nav_to_asciidoc_list() # on single manual repos, the level offset is corrected with 1 (NF-1) level_offset=$(echo "$line" | awk -F"*" '{print NF-1}') fi - revised_line=$(echo "$line" | sed 's/xref:/include::{module_base_path}/' | sed 's/\[.*\]//g' | sed -r 's/^\*{1,} //') + # when having multi manual repos, the last sed in the line below is to remove + # the manual component (:manual_name:) from the string + # this is because we have moved the nav.adoc file into partials and therefore need to add the module + revised_line=$(echo "$line" | sed 's/xref:/include::{module_base_path}/' | sed 's/\[.*\]//g' | sed -r 's/^\*{1,} //' | sed -e 's/\(module_base_path}\)\(.*:\)/\1/') echo "${revised_line}[leveloffset=+${level_offset}]" echo fi @@ -211,7 +217,7 @@ function build_pdf_manual() local book_file="${BOOKS_DIRECTORY}/ownCloud_${manual_infix}_Manual.adoc" # the navigation file for the manual to be built - local nav_file="modules/${source_root}/nav.adoc" + local nav_file="modules/${source_root}/${PARTIALS_NAME}/nav.adoc" # Get the dynamic list of attributes from yml files # The output after sed is a string like -a key=value -a key=value ... @@ -261,7 +267,7 @@ function build_pdf_manual() param+='-a format="pdf" ' # param+='-a experimental="" ' # experimental already set in site.yml param+='-a examplesdir='$(pwd)/modules/${source_root}/examples/' ' - param+='-a imagesdir='$(pwd)/modules/${source_root}/assets/images/' ' + param+='-a imagesdir='$(pwd)/modules/${source_root}/images/' ' param+='-a partialsdir='$(pwd)/modules/${source_root}/pages/_partials/' ' param+='-a revnumber='${branch}' ' param+='-a revdate="'${release_date}'" ' diff --git a/modules/ROOT/assets/images/accounts/02_basic_auth.png b/modules/ROOT/images/accounts/02_basic_auth.png similarity index 100% rename from modules/ROOT/assets/images/accounts/02_basic_auth.png rename to modules/ROOT/images/accounts/02_basic_auth.png diff --git a/modules/ROOT/assets/images/accounts/04_Account_1x.png b/modules/ROOT/images/accounts/04_Account_1x.png similarity index 100% rename from modules/ROOT/assets/images/accounts/04_Account_1x.png rename to modules/ROOT/images/accounts/04_Account_1x.png diff --git a/modules/ROOT/assets/images/accounts/07_Account_edit.png b/modules/ROOT/images/accounts/07_Account_edit.png similarity index 100% rename from modules/ROOT/assets/images/accounts/07_Account_edit.png rename to modules/ROOT/images/accounts/07_Account_edit.png diff --git a/modules/ROOT/assets/images/accounts/14_OAuth_Web_view_authorize.png b/modules/ROOT/images/accounts/14_OAuth_Web_view_authorize.png similarity index 100% rename from modules/ROOT/assets/images/accounts/14_OAuth_Web_view_authorize.png rename to modules/ROOT/images/accounts/14_OAuth_Web_view_authorize.png diff --git a/modules/ROOT/assets/images/accounts/add-account-certificate-passed-validation.png b/modules/ROOT/images/accounts/add-account-certificate-passed-validation.png similarity index 100% rename from modules/ROOT/assets/images/accounts/add-account-certificate-passed-validation.png rename to modules/ROOT/images/accounts/add-account-certificate-passed-validation.png diff --git a/modules/ROOT/assets/images/accounts/confirm-account-deletion.png b/modules/ROOT/images/accounts/confirm-account-deletion.png similarity index 100% rename from modules/ROOT/assets/images/accounts/confirm-account-deletion.png rename to modules/ROOT/images/accounts/confirm-account-deletion.png diff --git a/modules/ROOT/assets/images/accounts/edit-oauth2-authenticated-account.png b/modules/ROOT/images/accounts/edit-oauth2-authenticated-account.png similarity index 100% rename from modules/ROOT/assets/images/accounts/edit-oauth2-authenticated-account.png rename to modules/ROOT/images/accounts/edit-oauth2-authenticated-account.png diff --git a/modules/ROOT/assets/images/accounts/edit-or-delete-account.png b/modules/ROOT/images/accounts/edit-or-delete-account.png similarity index 100% rename from modules/ROOT/assets/images/accounts/edit-or-delete-account.png rename to modules/ROOT/images/accounts/edit-or-delete-account.png diff --git a/modules/ROOT/assets/images/appendices/troubleshooting/ios-app-settings-logging.png b/modules/ROOT/images/appendices/troubleshooting/ios-app-settings-logging.png similarity index 100% rename from modules/ROOT/assets/images/appendices/troubleshooting/ios-app-settings-logging.png rename to modules/ROOT/images/appendices/troubleshooting/ios-app-settings-logging.png diff --git a/modules/ROOT/assets/images/appendices/troubleshooting/mitmproxy_screenshot.png b/modules/ROOT/images/appendices/troubleshooting/mitmproxy_screenshot.png similarity index 100% rename from modules/ROOT/assets/images/appendices/troubleshooting/mitmproxy_screenshot.png rename to modules/ROOT/images/appendices/troubleshooting/mitmproxy_screenshot.png diff --git a/modules/ROOT/assets/images/appendices/troubleshooting/owncloud-log-configuration.png b/modules/ROOT/images/appendices/troubleshooting/owncloud-log-configuration.png similarity index 100% rename from modules/ROOT/assets/images/appendices/troubleshooting/owncloud-log-configuration.png rename to modules/ROOT/images/appendices/troubleshooting/owncloud-log-configuration.png diff --git a/modules/ROOT/assets/images/available-offline/all-available-offline-items.png b/modules/ROOT/images/available-offline/all-available-offline-items.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/all-available-offline-items.png rename to modules/ROOT/images/available-offline/all-available-offline-items.png diff --git a/modules/ROOT/assets/images/available-offline/available-offline-items.png b/modules/ROOT/images/available-offline/available-offline-items.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/available-offline-items.png rename to modules/ROOT/images/available-offline/available-offline-items.png diff --git a/modules/ROOT/assets/images/available-offline/available-offline-logo.png b/modules/ROOT/images/available-offline/available-offline-logo.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/available-offline-logo.png rename to modules/ROOT/images/available-offline/available-offline-logo.png diff --git a/modules/ROOT/assets/images/available-offline/file-available-offline.png b/modules/ROOT/images/available-offline/file-available-offline.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/file-available-offline.png rename to modules/ROOT/images/available-offline/file-available-offline.png diff --git a/modules/ROOT/assets/images/available-offline/folder-action.png b/modules/ROOT/images/available-offline/folder-action.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/folder-action.png rename to modules/ROOT/images/available-offline/folder-action.png diff --git a/modules/ROOT/assets/images/available-offline/make-available-offline.png b/modules/ROOT/images/available-offline/make-available-offline.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/make-available-offline.png rename to modules/ROOT/images/available-offline/make-available-offline.png diff --git a/modules/ROOT/assets/images/available-offline/make-unavailable-offline.png b/modules/ROOT/images/available-offline/make-unavailable-offline.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/make-unavailable-offline.png rename to modules/ROOT/images/available-offline/make-unavailable-offline.png diff --git a/modules/ROOT/assets/images/available-offline/offline-storage-settings.png b/modules/ROOT/images/available-offline/offline-storage-settings.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/offline-storage-settings.png rename to modules/ROOT/images/available-offline/offline-storage-settings.png diff --git a/modules/ROOT/assets/images/available-offline/one-folder-available-offline.png b/modules/ROOT/images/available-offline/one-folder-available-offline.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/one-folder-available-offline.png rename to modules/ROOT/images/available-offline/one-folder-available-offline.png diff --git a/modules/ROOT/assets/images/available-offline/settings.png b/modules/ROOT/images/available-offline/settings.png similarity index 100% rename from modules/ROOT/assets/images/available-offline/settings.png rename to modules/ROOT/images/available-offline/settings.png diff --git a/modules/ROOT/assets/images/collaboration/31_Collab.png b/modules/ROOT/images/collaboration/31_Collab.png similarity index 100% rename from modules/ROOT/assets/images/collaboration/31_Collab.png rename to modules/ROOT/images/collaboration/31_Collab.png diff --git a/modules/ROOT/assets/images/collaboration/delete-public-link.png b/modules/ROOT/images/collaboration/delete-public-link.png similarity index 100% rename from modules/ROOT/assets/images/collaboration/delete-public-link.png rename to modules/ROOT/images/collaboration/delete-public-link.png diff --git a/modules/ROOT/assets/images/collaboration/manage-public-link-settings.png b/modules/ROOT/images/collaboration/manage-public-link-settings.png similarity index 100% rename from modules/ROOT/assets/images/collaboration/manage-public-link-settings.png rename to modules/ROOT/images/collaboration/manage-public-link-settings.png diff --git a/modules/ROOT/assets/images/collaboration/public-link-set-expiration-date.png b/modules/ROOT/images/collaboration/public-link-set-expiration-date.png similarity index 100% rename from modules/ROOT/assets/images/collaboration/public-link-set-expiration-date.png rename to modules/ROOT/images/collaboration/public-link-set-expiration-date.png diff --git a/modules/ROOT/assets/images/collaboration/public-link-set-password.png b/modules/ROOT/images/collaboration/public-link-set-password.png similarity index 100% rename from modules/ROOT/assets/images/collaboration/public-link-set-password.png rename to modules/ROOT/images/collaboration/public-link-set-password.png diff --git a/modules/ROOT/assets/images/collaboration/swipe-and-delete-public-link.png b/modules/ROOT/images/collaboration/swipe-and-delete-public-link.png similarity index 100% rename from modules/ROOT/assets/images/collaboration/swipe-and-delete-public-link.png rename to modules/ROOT/images/collaboration/swipe-and-delete-public-link.png diff --git a/modules/ROOT/assets/images/files/21_File_list_annotated.png b/modules/ROOT/images/files/21_File_list_annotated.png similarity index 100% rename from modules/ROOT/assets/images/files/21_File_list_annotated.png rename to modules/ROOT/images/files/21_File_list_annotated.png diff --git a/modules/ROOT/assets/images/files/21_File_list_parent.png b/modules/ROOT/images/files/21_File_list_parent.png similarity index 100% rename from modules/ROOT/assets/images/files/21_File_list_parent.png rename to modules/ROOT/images/files/21_File_list_parent.png diff --git a/modules/ROOT/assets/images/files/24_Upload_Photo_multi.png b/modules/ROOT/images/files/24_Upload_Photo_multi.png similarity index 100% rename from modules/ROOT/assets/images/files/24_Upload_Photo_multi.png rename to modules/ROOT/images/files/24_Upload_Photo_multi.png diff --git a/modules/ROOT/assets/images/files/26_Files_multidragdrop.png b/modules/ROOT/images/files/26_Files_multidragdrop.png similarity index 100% rename from modules/ROOT/assets/images/files/26_Files_multidragdrop.png rename to modules/ROOT/images/files/26_Files_multidragdrop.png diff --git a/modules/ROOT/assets/images/files/26_Files_multidragdrop_iPad.png b/modules/ROOT/images/files/26_Files_multidragdrop_iPad.png similarity index 100% rename from modules/ROOT/assets/images/files/26_Files_multidragdrop_iPad.png rename to modules/ROOT/images/files/26_Files_multidragdrop_iPad.png diff --git a/modules/ROOT/assets/images/files/41_PDF.png b/modules/ROOT/images/files/41_PDF.png similarity index 100% rename from modules/ROOT/assets/images/files/41_PDF.png rename to modules/ROOT/images/files/41_PDF.png diff --git a/modules/ROOT/assets/images/files/42_PDF_toc.png b/modules/ROOT/images/files/42_PDF_toc.png similarity index 100% rename from modules/ROOT/assets/images/files/42_PDF_toc.png rename to modules/ROOT/images/files/42_PDF_toc.png diff --git a/modules/ROOT/assets/images/files/43_PDF_thumbs.png b/modules/ROOT/images/files/43_PDF_thumbs.png similarity index 100% rename from modules/ROOT/assets/images/files/43_PDF_thumbs.png rename to modules/ROOT/images/files/43_PDF_thumbs.png diff --git a/modules/ROOT/assets/images/files/44_PDF_search.png b/modules/ROOT/images/files/44_PDF_search.png similarity index 100% rename from modules/ROOT/assets/images/files/44_PDF_search.png rename to modules/ROOT/images/files/44_PDF_search.png diff --git a/modules/ROOT/assets/images/files/create-new-folder.png b/modules/ROOT/images/files/create-new-folder.png similarity index 100% rename from modules/ROOT/assets/images/files/create-new-folder.png rename to modules/ROOT/images/files/create-new-folder.png diff --git a/modules/ROOT/assets/images/files/directory-actions.png b/modules/ROOT/images/files/directory-actions.png similarity index 100% rename from modules/ROOT/assets/images/files/directory-actions.png rename to modules/ROOT/images/files/directory-actions.png diff --git a/modules/ROOT/assets/images/files/file-actions-multiple-files-selected.png b/modules/ROOT/images/files/file-actions-multiple-files-selected.png similarity index 100% rename from modules/ROOT/assets/images/files/file-actions-multiple-files-selected.png rename to modules/ROOT/images/files/file-actions-multiple-files-selected.png diff --git a/modules/ROOT/assets/images/files/file-actions.jpg b/modules/ROOT/images/files/file-actions.jpg similarity index 100% rename from modules/ROOT/assets/images/files/file-actions.jpg rename to modules/ROOT/images/files/file-actions.jpg diff --git a/modules/ROOT/assets/images/files/file-with-same-name-already-exists.png b/modules/ROOT/images/files/file-with-same-name-already-exists.png similarity index 100% rename from modules/ROOT/assets/images/files/file-with-same-name-already-exists.png rename to modules/ROOT/images/files/file-with-same-name-already-exists.png diff --git a/modules/ROOT/assets/images/files/icon-download.png b/modules/ROOT/images/files/icon-download.png similarity index 100% rename from modules/ROOT/assets/images/files/icon-download.png rename to modules/ROOT/images/files/icon-download.png diff --git a/modules/ROOT/assets/images/files/icon-not-available-locally.png b/modules/ROOT/images/files/icon-not-available-locally.png similarity index 100% rename from modules/ROOT/assets/images/files/icon-not-available-locally.png rename to modules/ROOT/images/files/icon-not-available-locally.png diff --git a/modules/ROOT/assets/images/files/index-bar-with-callout.png b/modules/ROOT/images/files/index-bar-with-callout.png similarity index 100% rename from modules/ROOT/assets/images/files/index-bar-with-callout.png rename to modules/ROOT/images/files/index-bar-with-callout.png diff --git a/modules/ROOT/assets/images/files/sort-files-landscape-mode.png b/modules/ROOT/images/files/sort-files-landscape-mode.png similarity index 100% rename from modules/ROOT/assets/images/files/sort-files-landscape-mode.png rename to modules/ROOT/images/files/sort-files-landscape-mode.png diff --git a/modules/ROOT/assets/images/files/sort-files-portrait-mode.png b/modules/ROOT/images/files/sort-files-portrait-mode.png similarity index 100% rename from modules/ROOT/assets/images/files/sort-files-portrait-mode.png rename to modules/ROOT/images/files/sort-files-portrait-mode.png diff --git a/modules/ROOT/assets/images/files/view-file-image.png b/modules/ROOT/images/files/view-file-image.png similarity index 100% rename from modules/ROOT/assets/images/files/view-file-image.png rename to modules/ROOT/images/files/view-file-image.png diff --git a/modules/ROOT/assets/images/files/view-file-odt.png b/modules/ROOT/images/files/view-file-odt.png similarity index 100% rename from modules/ROOT/assets/images/files/view-file-odt.png rename to modules/ROOT/images/files/view-file-odt.png diff --git a/modules/ROOT/assets/images/files/view-file-pdf.png b/modules/ROOT/images/files/view-file-pdf.png similarity index 100% rename from modules/ROOT/assets/images/files/view-file-pdf.png rename to modules/ROOT/images/files/view-file-pdf.png diff --git a/modules/ROOT/assets/images/files/view-file-text-file.png b/modules/ROOT/images/files/view-file-text-file.png similarity index 100% rename from modules/ROOT/assets/images/files/view-file-text-file.png rename to modules/ROOT/images/files/view-file-text-file.png diff --git a/modules/ROOT/assets/images/files/view-file-video.png b/modules/ROOT/images/files/view-file-video.png similarity index 100% rename from modules/ROOT/assets/images/files/view-file-video.png rename to modules/ROOT/images/files/view-file-video.png diff --git a/modules/ROOT/assets/images/files_integration/enable-location.png b/modules/ROOT/images/files_integration/enable-location.png similarity index 100% rename from modules/ROOT/assets/images/files_integration/enable-location.png rename to modules/ROOT/images/files_integration/enable-location.png diff --git a/modules/ROOT/assets/images/files_integration/share-files-from-other-apps-step-1.png b/modules/ROOT/images/files_integration/share-files-from-other-apps-step-1.png similarity index 100% rename from modules/ROOT/assets/images/files_integration/share-files-from-other-apps-step-1.png rename to modules/ROOT/images/files_integration/share-files-from-other-apps-step-1.png diff --git a/modules/ROOT/assets/images/files_integration/share-files-from-other-apps-step-2.png b/modules/ROOT/images/files_integration/share-files-from-other-apps-step-2.png similarity index 100% rename from modules/ROOT/assets/images/files_integration/share-files-from-other-apps-step-2.png rename to modules/ROOT/images/files_integration/share-files-from-other-apps-step-2.png diff --git a/modules/ROOT/assets/images/installation/owncloud-server-mobile-apps.png b/modules/ROOT/images/installation/owncloud-server-mobile-apps.png similarity index 100% rename from modules/ROOT/assets/images/installation/owncloud-server-mobile-apps.png rename to modules/ROOT/images/installation/owncloud-server-mobile-apps.png diff --git a/modules/ROOT/assets/images/quick-access/quick-access-view.png b/modules/ROOT/images/quick-access/quick-access-view.png similarity index 100% rename from modules/ROOT/assets/images/quick-access/quick-access-view.png rename to modules/ROOT/images/quick-access/quick-access-view.png diff --git a/modules/ROOT/assets/images/security/04_cert_error.png b/modules/ROOT/images/security/04_cert_error.png similarity index 100% rename from modules/ROOT/assets/images/security/04_cert_error.png rename to modules/ROOT/images/security/04_cert_error.png diff --git a/modules/ROOT/assets/images/security/masking-private-data.png b/modules/ROOT/images/security/masking-private-data.png similarity index 100% rename from modules/ROOT/assets/images/security/masking-private-data.png rename to modules/ROOT/images/security/masking-private-data.png diff --git a/modules/ROOT/assets/images/settings/83_Settings_certs.png b/modules/ROOT/images/settings/83_Settings_certs.png similarity index 100% rename from modules/ROOT/assets/images/settings/83_Settings_certs.png rename to modules/ROOT/images/settings/83_Settings_certs.png diff --git a/modules/ROOT/assets/images/settings/84_Settings_themes.png b/modules/ROOT/images/settings/84_Settings_themes.png similarity index 100% rename from modules/ROOT/assets/images/settings/84_Settings_themes.png rename to modules/ROOT/images/settings/84_Settings_themes.png diff --git a/modules/ROOT/assets/images/settings/authorise-access-with-passcode-or-biometric-data.png b/modules/ROOT/images/settings/authorise-access-with-passcode-or-biometric-data.png similarity index 100% rename from modules/ROOT/assets/images/settings/authorise-access-with-passcode-or-biometric-data.png rename to modules/ROOT/images/settings/authorise-access-with-passcode-or-biometric-data.png diff --git a/modules/ROOT/assets/images/settings/lock-application-duration.png b/modules/ROOT/images/settings/lock-application-duration.png similarity index 100% rename from modules/ROOT/assets/images/settings/lock-application-duration.png rename to modules/ROOT/images/settings/lock-application-duration.png diff --git a/modules/ROOT/assets/images/settings/media-upload.png b/modules/ROOT/images/settings/media-upload.png similarity index 100% rename from modules/ROOT/assets/images/settings/media-upload.png rename to modules/ROOT/images/settings/media-upload.png diff --git a/modules/ROOT/assets/images/settings/security-passcode-enabled.png b/modules/ROOT/images/settings/security-passcode-enabled.png similarity index 100% rename from modules/ROOT/assets/images/settings/security-passcode-enabled.png rename to modules/ROOT/images/settings/security-passcode-enabled.png diff --git a/modules/ROOT/assets/images/settings/themes/classic.png b/modules/ROOT/images/settings/themes/classic.png similarity index 100% rename from modules/ROOT/assets/images/settings/themes/classic.png rename to modules/ROOT/images/settings/themes/classic.png diff --git a/modules/ROOT/assets/images/settings/themes/dark.png b/modules/ROOT/images/settings/themes/dark.png similarity index 100% rename from modules/ROOT/assets/images/settings/themes/dark.png rename to modules/ROOT/images/settings/themes/dark.png diff --git a/modules/ROOT/assets/images/settings/themes/light.png b/modules/ROOT/images/settings/themes/light.png similarity index 100% rename from modules/ROOT/assets/images/settings/themes/light.png rename to modules/ROOT/images/settings/themes/light.png diff --git a/modules/ROOT/assets/images/settings/user-accounts-list-annotated-with-callout.png b/modules/ROOT/images/settings/user-accounts-list-annotated-with-callout.png similarity index 100% rename from modules/ROOT/assets/images/settings/user-accounts-list-annotated-with-callout.png rename to modules/ROOT/images/settings/user-accounts-list-annotated-with-callout.png diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/partials/nav.adoc similarity index 100% rename from modules/ROOT/nav.adoc rename to modules/ROOT/partials/nav.adoc