diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css index bd2dd81de..ab127dad9 100644 --- a/_shared_assets/themes/nextcloud_com/static/styles.css +++ b/_shared_assets/themes/nextcloud_com/static/styles.css @@ -536,6 +536,7 @@ nav a { padding-left: 0; animation: fadeInRight .5s ease forwards; pointer-events: none; } } +} @keyframes fadeInRight { 0% { opacity: 0; @@ -549,9 +550,6 @@ nav a { .nav { padding-bottom: 70px; transition: all .2s ease-in; } - @media (max-width: 992px) { - .nav { - padding-bottom: 20px; } } .nav.no-shadow { box-shadow: none !important; } .nav.scrolled { diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index c105888d2..ae371f351 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -92,17 +92,17 @@ during installation and update, so you shouldn't need to change it. :: - 'dbtype' => 'sqlite', + 'dbtype' => 'sqlite3', Identifies the database used with this installation. See also config option ``supportedDatabases`` Available: - - sqlite (SQLite3) + - sqlite3 (SQLite3) - mysql (MySQL/MariaDB) - pgsql (PostgreSQL) -Defaults to ``sqlite`` +Defaults to ``sqlite3`` :: @@ -910,6 +910,8 @@ Some of the Nextcloud code may be stored in alternate locations. 'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'customclient_ios' => 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', + 'customclient_ios_appid' => + '1125420102', This section is for configuring the download links for Nextcloud clients, as seen in the first-run wizard and on Personal pages. @@ -917,7 +919,8 @@ seen in the first-run wizard and on Personal pages. Defaults to * Desktop client: ``https://nextcloud.com/install/#install-clients`` * Android client: ``https://play.google.com/store/apps/details?id=com.nextcloud.client`` -* iOS client : ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` +* iOS client: ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` + *iOS client app id: ``1125420102`` Apps ---- @@ -1378,6 +1381,29 @@ to be fetched in addition to any requested file. One way to test is applying for a trystack account at http://trystack.org/ +:: + + 'objectstore' => [ + 'class' => 'OC\\Files\\ObjectStore\\Swift', + 'arguments' => [ + 'autocreate' => true, + 'user' => [ + 'name' => 'swift', + 'password' => 'swift', + 'domain' => [ + 'name' => 'default', + ], + ], + 'tenantName' => 'service', + 'serviceName' => 'swift', + 'region' => 'regionOne', + 'url' => "http://yourswifthost:5000/v3", + 'bucket' => 'nextcloud', + ], + ], + +To use swift V3 + Sharing ------- diff --git a/admin_manual/configuration_server/occ_command.rst b/admin_manual/configuration_server/occ_command.rst index 798ca0e0f..9721ad66b 100644 --- a/admin_manual/configuration_server/occ_command.rst +++ b/admin_manual/configuration_server/occ_command.rst @@ -519,7 +519,6 @@ Encryption disable it again. encryption:encrypt-all Encrypt all files for all users encryption:list-modules List all available encryption modules - encryption:migrate initial migration to encryption 2.0 encryption:set-default-module Set the encryption default module encryption:show-key-storage-root Show current key storage root encryption:status Lists the current status of encryption @@ -574,9 +573,6 @@ single-sign on. Use this only on fresh installations with no existing data, or on systems where encryption has not already been enabled. It is not possible to disable it. -``encryption:migrate`` migrates encryption keys after a major Nextcloud version -upgrade. You may optionally specify individual users in a space-delimited list. - See :doc:`../configuration_files/encryption_configuration` to learn more. .. _federation_sync_label: diff --git a/admin_manual/file_workflows/access_control.rst b/admin_manual/file_workflows/access_control.rst index 26f38db85..f288ce429 100644 --- a/admin_manual/file_workflows/access_control.rst +++ b/admin_manual/file_workflows/access_control.rst @@ -21,6 +21,9 @@ If access to a file has been denied for a user, the user can not: Examples -------- +After installing the File Access Control app as described in +:doc:`../installation/apps_management_installation` +navigate to the configuration and locate the File Access Control settings. .. figure:: images/files_access_control_sample_rules.png :alt: Sample rules to block on user group, time and IP base. diff --git a/admin_manual/file_workflows/automated_tagging.rst b/admin_manual/file_workflows/automated_tagging.rst index 295444b53..2d5e56d68 100644 --- a/admin_manual/file_workflows/automated_tagging.rst +++ b/admin_manual/file_workflows/automated_tagging.rst @@ -15,11 +15,17 @@ This is especially useful for retention and :doc:`access_control`, so people that got the files shared can not remove the tag to stop the retention or allow access against the owners will. +Example +------- + +After installing the Files automated tagging app as described in +:doc:`../installation/apps_management_installation` +navigate to the configuration and locate the Workflow settings. .. figure:: images/automated_tagging_sample_rule.png - :alt: Sample rule to assign a restricted tag. + :alt: Example rule to assign a restricted tag. -In the sample you can see a simple rule with only one condition. +In the example you can see a simple rule with only one condition. It will tag all files with the restricted tag ``Protected file`` that are uploaded into a folder that is tagged with ``Protect content``. No user can remove the tag ``Protected file`` and therefor access control and retention @@ -29,3 +35,10 @@ Available rules --------------- The available rules can be seen in the access control section: :ref:`available-rules-label`. + +Executing actions +----------------- + +It is possible to execute actions like ```convert to PDF``` based on assigned tags. Nextcloud +GmbH assists customers in this with hands-on help and documentation on our +`customer portal `_. diff --git a/admin_manual/file_workflows/retention.rst b/admin_manual/file_workflows/retention.rst index 2ee332c53..8a942285d 100644 --- a/admin_manual/file_workflows/retention.rst +++ b/admin_manual/file_workflows/retention.rst @@ -5,13 +5,17 @@ Retention of files Nextcloud's Files Retention app allows to automatically delete files that are tagged with a collaborative tag and have a certain age. -Sample ------- +Example +------- + +After installing the Retention app as described in +:doc:`../installation/apps_management_installation` +navigate to the configuration and locate the Workflow settings. .. figure:: images/retention_sample.png :alt: Sample rule to delete files after 14 days. -The rule from the sample will delete all files tagged with ``Temporary file`` after 14 days. +The rule from the example will delete all files tagged with ``Temporary file`` after 14 days. Common misconfigurations ------------------------ diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index d40a7b8ae..83f999386 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -451,6 +451,14 @@ confirm your paths, for example:: If any of your system environment variables are not present in the file then you must add them. +Alternatively it is possible to use the environemt variables of your system by modifying + + /etc/php/7.0/fpm/pool.d/www.conf + +and uncommenting the line + + clear_env = no + When you are using shared hosting or a control panel to manage your `Nextcloud VM `_ or server, the configuration files are almost certain to be located somewhere else, for security and flexibility reasons, so diff --git a/developer_manual/app/controllers.rst b/developer_manual/app/controllers.rst index 5a11a44c2..cd16135e9 100644 --- a/developer_manual/app/controllers.rst +++ b/developer_manual/app/controllers.rst @@ -491,6 +491,49 @@ A :doc:`template ` can be rendered by returning a TemplateResponse. A } +Public page templates +^^^^^^^^^^^^^^^^^^^^^ + +For public pages, that are rendered to users who are not logged in to the +Nextcloud instance, a :any:`PublicTemplateResponse ` should be used, to load the +correct base template. It also allows adding an optional set of actions that +will be shown in the top right corner of the public page. + + +.. code-block:: php + + appName, 'main', []); + $template->setHeaderTitle('Public page'); + $template->setHeaderDetails('some details'); + $response->setHeaderActions([ + new SimpleMenuAction('download', 'Label 1', 'icon-css-class1', 'link-url', 0), + new SimpleMenuAction('share', 'Label 2', 'icon-css-class2', 'link-url', 10), + ]); + return $template; + } + + } + +The header title and subtitle will be rendered in the header, next to the logo. +The action with the highest priority (lowest number) will be used as the +primary action, others will shown in the popover menu on demand. + +A :any:`SimpleMenuAction ` will be a link with an icon added to the menu. App +developers can implement their own types of menu renderings by adding a custom +class implementing the :any:`IMenuAction ` interface. + + + Redirects ^^^^^^^^^ diff --git a/developer_manual/design/index.rst b/developer_manual/design/index.rst index 89829bf81..38262d68f 100644 --- a/developer_manual/design/index.rst +++ b/developer_manual/design/index.rst @@ -6,7 +6,6 @@ Design guidelines :maxdepth: 2 navigation - settings content list popovermenu diff --git a/developer_manual/design/navigation.rst b/developer_manual/design/navigation.rst index 2d45a952a..42f910713 100644 --- a/developer_manual/design/navigation.rst +++ b/developer_manual/design/navigation.rst @@ -2,10 +2,67 @@ .. codeauthor:: John Molakvoæ .. _navigation: +.. _newbutton: + =============== -App navigation +Introduction =============== +The navigation section of any Nextcloud app is the left sidebar. +It is basically composed of + +* a primary action button +* a menu +* a settings area + +The primary action button and the settings area are optional. + + +=============== +New button +=============== + +Introduction +------------- + +A primary action button is just a stylised button located above the navigation part of your app. +The goal is to have an homogeneity of design across all apps using this button. + +Basic layout +------------- + +.. figure:: ../images/newbutton.png + :alt: Navigation with a new button + :figclass: figure-with-code + +.. code-block:: html + +
+
+ +
+ + + + +
+ +Rules +------ + +* Stay simple, don't use overcomplicated text in this button. +* Avoid using sentences longer than one line. +* Do not edit the styling of this button. +* Only **one** button is allowed here. + +.. _appnavigation: + +===================== +App navigation menu +===================== + Introduction ------------ @@ -31,6 +88,9 @@ Basic layout .. code-block:: html
+ + + + + +
@@ -387,3 +450,45 @@ Various information * You can add the ``icon-loading-small`` class to any ``li`` element to set it in a `loading` state. * Every element as a ``min-height`` of 44px as that is the minimum recommended touch target. It also helps with clickability and separation on desktop environments. + +.. _settings: + +========= +Settings +========= + +Introduction +------------- + +To create a settings area create a div with the id ``app-settings`` inside the ``app-navigation`` div. + +* The data attribute ``data-apps-slide-toggle`` slides up a target area using a jQuery selector and hides the area if the user clicks outside of it. +* Max height of the settings area is 300px. Do **not** change that. +* Keep it clear, organized and simple. + +Basic layout +------------- + +.. figure:: ../images/settings.* + :alt: Settings + :figclass: figure-with-code + +.. code-block:: html + +
+ + + + +
+
+ +
+
+ +
+
+
diff --git a/developer_manual/design/popovermenu.rst b/developer_manual/design/popovermenu.rst index 6ec8658be..02b58b151 100644 --- a/developer_manual/design/popovermenu.rst +++ b/developer_manual/design/popovermenu.rst @@ -58,6 +58,24 @@ Basic layout +
  • + + +
    + + +
    +     +
    • +
  • + + +
    + + +
    +     +
      • @@ -74,6 +92,8 @@ Technical details * The required **right** distance to the border (or padding, whatever you want to use) of the three-dot icon should be 14px (5 for menu margin and 6 for arrow position) * The ``span`` element **must** have the ``menuitem`` class. * The checkbox/radio must use the :ref:`nextcloud custom ` +* The form element is optionnal if you're using inputs. +* Supported inputs are all text based ones and buttons type ones .. image:: ../images/popover-position.png diff --git a/developer_manual/design/settings.rst b/developer_manual/design/settings.rst deleted file mode 100644 index 9d712f1b5..000000000 --- a/developer_manual/design/settings.rst +++ /dev/null @@ -1,35 +0,0 @@ -.. sectionauthor:: John Molakvoæ -.. codeauthor:: John Molakvoæ -.. _settings: - -======== -Settings -======== - -To create a settings area create a div with the id ``app-settings`` inside the ``app-navigation`` div. - -* The data attribute ``data-apps-slide-toggle`` slides up a target area using a jQuery selector and hides the area if the user clicks outside of it. -* Max height of the settings area is 300px. Do **not** change that. -* Keep it clear, organized and simple. - -.. figure:: ../images/settings.* - :alt: Settings - :figclass: figure-with-code - -.. code-block:: html - -
      - - - -
      -
      - -
      -
      - -
      -
      -
      diff --git a/developer_manual/images/newbutton.png b/developer_manual/images/newbutton.png new file mode 100644 index 000000000..76105424a Binary files /dev/null and b/developer_manual/images/newbutton.png differ diff --git a/developer_manual/images/popovermenu.png b/developer_manual/images/popovermenu.png index bcdb1511b..265e31263 100644 Binary files a/developer_manual/images/popovermenu.png and b/developer_manual/images/popovermenu.png differ diff --git a/user_manual/external_storage/external_storage.rst b/user_manual/external_storage/external_storage.rst index a9931eebb..aedf52e5f 100644 --- a/user_manual/external_storage/external_storage.rst +++ b/user_manual/external_storage/external_storage.rst @@ -6,7 +6,7 @@ The External Storage application allows you to mount external storage services, such as Google Drive, Dropbox, Amazon S3, SMB/CIFS fileservers, and FTP servers in Nextcloud. Your Nextcloud server administrator controls which of these are available to you. Please see `Configuring External Storage (GUI) -`_ in the Nextcloud Administrator's manual for configuration howtos and examples. diff --git a/user_manual/files/desktop_mobile_sync.rst b/user_manual/files/desktop_mobile_sync.rst index e44f044e9..6d52a5154 100644 --- a/user_manual/files/desktop_mobile_sync.rst +++ b/user_manual/files/desktop_mobile_sync.rst @@ -25,6 +25,3 @@ Mobile clients Visit your Personal page in your Nextcloud Web interface to find download links for Android and iOS mobile sync clients. Or, visit the `Nextcloud download page `_. - -Visit the `Nextcloud documentation page `_ to read -the user manuals.