[phpwiki-checkins] SF.net SVN: phpwiki:[10012] trunk

[<var...@us...>]

Revision: 10012
          http://sourceforge.net/p/phpwiki/code/10012
Author:   vargenau
Date:     2017-05-25 08:09:20 +0000 (Thu, 25 May 2017)
Log Message:
-----------
We assume a browser that supports <iframe>

Modified Paths:
--------------
    trunk/lib/plugin/Transclude.php
    trunk/pgsrc/Help%2FTranscludePlugin

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2017-05-24 18:19:28 UTC (rev 10011)
+++ trunk/lib/plugin/Transclude.php	2017-05-25 08:09:20 UTC (rev 10012)
@@ -104,17 +104,8 @@
             'marginheight' => 0,
             'class' => 'autoHeight transclude');
 
-        $noframe_msg[] = fmt("See: %s", HTML::a(array('href' => $src), $src));
+        $iframe = HTML::iframe($params);
 
-        $noframe_msg = HTML::div(array('class' => 'transclusion'),
-            HTML::p(array(), $noframe_msg));
-
-        $iframe = HTML::iframe($params, $noframe_msg);
-
-        /* This doesn't work very well...  maybe because CSS screws up NS4 anyway...
-        $iframe = new HtmlElement('ilayer', array('src' => $src), $iframe);
-        */
-
         if ($quiet) {
             return $iframe;
         } else {

Modified: trunk/pgsrc/Help%2FTranscludePlugin
===================================================================
--- trunk/pgsrc/Help%2FTranscludePlugin	2017-05-24 18:19:28 UTC (rev 10011)
+++ trunk/pgsrc/Help%2FTranscludePlugin	2017-05-25 08:09:20 UTC (rev 10012)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 25 Oct 2016 10:01:28 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTranscludePlugin;
@@ -8,6 +8,8 @@
 
 The **Transclude** [[Help:WikiPlugin|plugin]] can be used to embed include whole (external) web pages within a wiki page.
 
+Pages are transcluded using ##<iframe>## tags.
+
 == Arguments ==
 
 {| class="bordered"
@@ -35,7 +37,6 @@
 
 == Bugs / Caveats ==
 
-* Pages are transcluded using ##<iframe>## tags.  Older browsers do not support //iframe//s.  In that case the user will be presented with a link to the transcluded material.
 * When possible, Javascript code is used to adjust the height of the //iframe// so that it fits the entire transcluded page.  Unfortunately, this seems possible only when the transcluded page comes from the same server as the wiki page.  (This restriction is due to security checks built in to the Javascript language.)
 * The recursion detection code does not currently work.  Be careful to avoid recursive transclusions, or you'll be sorry (or at least amused.)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.