From 11cc8338d9243d8153afa3b0a10580abbdd31b34 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 26 Sep 2017 12:05:21 +0200 Subject: [PATCH 1/2] Combine mimetype pages into one Signed-off-by: Morris Jobke --- .../configuration_mimetypes/index.rst | 64 +++++++++++++++++-- .../mimetype_aliases.rst | 48 -------------- .../mimetype_mapping.rst | 13 ---- 3 files changed, 59 insertions(+), 66 deletions(-) delete mode 100644 admin_manual/configuration_mimetypes/mimetype_aliases.rst delete mode 100644 admin_manual/configuration_mimetypes/mimetype_mapping.rst diff --git a/admin_manual/configuration_mimetypes/index.rst b/admin_manual/configuration_mimetypes/index.rst index fbe509349..edeccebc1 100644 --- a/admin_manual/configuration_mimetypes/index.rst +++ b/admin_manual/configuration_mimetypes/index.rst @@ -2,12 +2,66 @@ Mimetypes Management ==================== +Mimetype Aliases +---------------- -.. toctree:: - :maxdepth: 2 - - mimetype_aliases - mimetype_mapping +Nextcloud allows you to create aliases for mimetypes, so that you can display +custom icons for files. For example, you might want a nice audio icon for audio +files instead of the default file icon. + +By default Nextcloud is distributed with +``nextcloud/resources/config/mimetypealiases.dist.json``. +Do not modify this file, as it will be replaced when Nextcloud is updated. +Instead, create your own ``nextcloud/config/mimetypealiases.json`` +file with your custom aliases. Use the same syntax as in +``nextcloud/resources/config/mimetypealiases.dist.json``. + +Once you have made changes to your ``mimetypealiases.json``, use the ``occ`` +command to propagate the changes through the system. This example is for +Ubuntu Linux:: + + $ sudo -u www-data php occ maintenance:mimetype:update-js + +See :doc:`../configuration_server/occ_command` to learn more about ``occ``. + +Some common mimetypes that may be useful in creating aliases are: + +image + Generic image + +image/vector + Vector image + +audio + Generic audio file + +x-office/document + Word processed document + +x-office/spreadsheet + Spreadsheet + +x-office/presentation + Presentation + +text + Generic text document + +text/code + Source code + +Mimetype mapping +---------------- + +Nextcloud allows administrators to specify the mapping of a file extension to a +mimetype. For example files ending in ``mp3`` map to ``audio/mpeg``. Which +then in turn allows Nextcloud to show the audio icon. + +By default Nextcloud comes with ``mimetypemapping.dist.json``. This is a +simple json array. +Administrators should not update this file as it will get replaced on upgrades +of Nextcloud. Instead the file ``mimetypemapping.json`` should be created and +modified, this file has precedence over the shipped file. Icon retrieval -------------- diff --git a/admin_manual/configuration_mimetypes/mimetype_aliases.rst b/admin_manual/configuration_mimetypes/mimetype_aliases.rst deleted file mode 100644 index ca02d5661..000000000 --- a/admin_manual/configuration_mimetypes/mimetype_aliases.rst +++ /dev/null @@ -1,48 +0,0 @@ -================ -Mimetype Aliases -================ - -Nextcloud allows you to create aliases for mimetypes, so that you can display -custom icons for files. For example, you might want a nice audio icon for audio -files instead of the default file icon. - -By default Nextcloud is distributed with -``nextcloud/resources/config/mimetypealiases.dist.json``. -Do not modify this file, as it will be replaced when Nextcloud is updated. -Instead, create your own ``nextcloud/config/mimetypealiases.json`` -file with your custom aliases. Use the same syntax as in -``nextcloud/resources/config/mimetypealiases.dist.json``. - -Once you have made changes to your ``mimetypealiases.json``, use the ``occ`` -command to propagate the changes through the system. This example is for -Ubuntu Linux:: - - $ sudo -u www-data php occ maintenance:mimetype:update-js - -See :doc:`../configuration_server/occ_command` to learn more about ``occ``. - -Some common mimetypes that may be useful in creating aliases are: - -image - Generic image - -image/vector - Vector image - -audio - Generic audio file - -x-office/document - Word processed document - -x-office/spreadsheet - Spreadsheet - -x-office/presentation - Presentation - -text - Generic text document - -text/code - Source code diff --git a/admin_manual/configuration_mimetypes/mimetype_mapping.rst b/admin_manual/configuration_mimetypes/mimetype_mapping.rst deleted file mode 100644 index e1e03a8f2..000000000 --- a/admin_manual/configuration_mimetypes/mimetype_mapping.rst +++ /dev/null @@ -1,13 +0,0 @@ -Mimetype mapping -================ - -Nextcloud allows administrators to specify the mapping of a file extension to a -mimetype. For example files ending in ``mp3`` map to ``audio/mpeg``. Which -then in turn allows Nextcloud to show the audio icon. - -By default Nextcloud comes with ``mimetypemapping.dist.json``. This is a -simple json array. -Administrators should not update this file as it will get replaced on upgrades -of Nextcloud. Instead the file ``mimetypemapping.json`` should be created and -modified, this file has precedence over the shipped file. - From 95510dd24486749fc62caed75babe18d20834450 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 26 Sep 2017 12:06:07 +0200 Subject: [PATCH 2/2] Fix styling of prev/next links Signed-off-by: Morris Jobke --- _shared_assets/themes/nextcloud_com/static/styles.css | 4 ++++ _shared_assets/themes/nextcloud_release/static/styles.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css index 1daa423f6..fc5434a98 100644 --- a/_shared_assets/themes/nextcloud_com/static/styles.css +++ b/_shared_assets/themes/nextcloud_com/static/styles.css @@ -1138,3 +1138,7 @@ a.headerlink { box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.3); border-radius: 2px; } + +li.next { + float: right; +} diff --git a/_shared_assets/themes/nextcloud_release/static/styles.css b/_shared_assets/themes/nextcloud_release/static/styles.css index 40015cd84..cd80fa378 100644 --- a/_shared_assets/themes/nextcloud_release/static/styles.css +++ b/_shared_assets/themes/nextcloud_release/static/styles.css @@ -479,3 +479,7 @@ li.next { box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.3); border-radius: 2px; } + +li.next { + float: right; +}