From 3b560b82e1cbda9d391b087e7f39e1ccfcfdf707 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 9 Sep 2017 17:28:16 -0500 Subject: [PATCH 1/3] document new Site Target option --- admin_manual/configuration/server/external_sites.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration/server/external_sites.rst b/admin_manual/configuration/server/external_sites.rst index c3a7e6445..2838aebb2 100644 --- a/admin_manual/configuration/server/external_sites.rst +++ b/admin_manual/configuration/server/external_sites.rst @@ -55,5 +55,9 @@ On this page, X-Frame-Options prevents the embedding. .. figure:: ../../images/external-sites-5.png -There isn't much you can do about these issues, but if you're curious you can -see what is happening. +You may use the "Site Target" dropdown to select how the external site opens. +For sites that block iframing with `X-Frame-Options`, you need to select either +"New Window" or "Replace Current Window" as the target in order to open them. + +For sites that allow iframing, you may open them inside the OwnCloud UI by +selecting "Inside OwnCloud Frame' (the default). From 0bfac39193fd982032dff1dfb3dac848eb2285c6 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 9 Sep 2017 17:36:50 -0500 Subject: [PATCH 2/3] add option descriptions --- admin_manual/configuration/server/external_sites.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin_manual/configuration/server/external_sites.rst b/admin_manual/configuration/server/external_sites.rst index 2838aebb2..92cfd4709 100644 --- a/admin_manual/configuration/server/external_sites.rst +++ b/admin_manual/configuration/server/external_sites.rst @@ -61,3 +61,9 @@ For sites that block iframing with `X-Frame-Options`, you need to select either For sites that allow iframing, you may open them inside the OwnCloud UI by selecting "Inside OwnCloud Frame' (the default). + + - '_self': Opens link inside the ownCloud iframe (default) + - '_top': Replaces current ownCloud window with the link + - '_blank': Opens link in a new window' + + From 62426f2cf2cc03aa9187c5acfd2d3a43a455c133 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 9 Sep 2017 17:37:08 -0500 Subject: [PATCH 3/3] trailing apostraphe --- admin_manual/configuration/server/external_sites.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration/server/external_sites.rst b/admin_manual/configuration/server/external_sites.rst index 92cfd4709..c5386d3fb 100644 --- a/admin_manual/configuration/server/external_sites.rst +++ b/admin_manual/configuration/server/external_sites.rst @@ -64,6 +64,6 @@ selecting "Inside OwnCloud Frame' (the default). - '_self': Opens link inside the ownCloud iframe (default) - '_top': Replaces current ownCloud window with the link - - '_blank': Opens link in a new window' + - '_blank': Opens link in a new window