Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9062] trunk
|
From: <var...@us...> - 2014-09-04 16:17:37
|
Revision: 9062
http://sourceforge.net/p/phpwiki/code/9062
Author: vargenau
Date: 2014-09-04 16:17:25 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
remove FrameInclude plugin (frames are not supported in HTML 5)
Modified Paths:
--------------
trunk/admin/mkfuncs
trunk/lib/HtmlElement.php
trunk/lib/IniConfig.php
trunk/lib/WikiTheme.php
trunk/lib/display.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/WikiTranslation.php
trunk/locale/Makefile
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/pgsrc/Help%2FIncludePagePlugin
trunk/pgsrc/ReleaseNotes
Removed Paths:
-------------
trunk/lib/plugin/FrameInclude.php
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
trunk/pgsrc/Help%2FFrameIncludePlugin
trunk/themes/Sidebar/templates/frame-left.tmpl
trunk/themes/Sidebar/templates/frameset.tmpl
trunk/themes/default/templates/frameset.tmpl
Modified: trunk/admin/mkfuncs
===================================================================
--- trunk/admin/mkfuncs 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/admin/mkfuncs 2014-09-04 16:17:25 UTC (rev 9062)
@@ -40,6 +40,6 @@
echo "$d"
mkfuncs form input option select textarea label fieldset legend
echo "$d"
-mkfuncs area map frame frameset iframe nobody object embed param
+mkfuncs area map frame iframe nobody object embed param
echo "$d"
mkfuncs video
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/HtmlElement.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -518,18 +518,6 @@
return $el->_init2(func_get_args());
}
- public static function frame( /*...*/)
- {
- $el = new HtmlElement('frame');
- return $el->_init2(func_get_args());
- }
-
- public static function frameset( /*...*/)
- {
- $el = new HtmlElement('frameset');
- return $el->_init2(func_get_args());
- }
-
public static function iframe( /*...*/)
{
$el = new HtmlElement('iframe');
@@ -585,7 +573,7 @@
define('HTMLTAG_ACCEPTS_INLINE', 4);
HTML::_setTagProperty(HTMLTAG_EMPTY,
- 'area base basefont br col embed frame hr img input isindex link meta param');
+ 'area base basefont br col embed hr img input isindex link meta param');
HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
// %inline elements:
'b big i small tt ' // %fontstyle
@@ -597,7 +585,7 @@
// %block elements which contain inline content
. 'address h1 h2 h3 h4 h5 h6 p pre '
// %block elements which contain either block or inline content
- . 'div fieldset frameset'
+ . 'div fieldset '
// other with inline content
. 'caption dt label legend video '
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/IniConfig.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -708,7 +708,6 @@
$AllAllowedPlugins[] = 'CacheTest';
$AllAllowedPlugins[] = 'CategoryPage';
$AllAllowedPlugins[] = 'FoafViewer';
- $AllAllowedPlugins[] = 'FrameInclude';
$AllAllowedPlugins[] = 'GraphViz';
$AllAllowedPlugins[] = 'HtmlConverter';
$AllAllowedPlugins[] = 'JabberPresence';
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/WikiTheme.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -621,8 +621,6 @@
$link->pushContent($this->maybeSplitWikiWord($default_text));
$link->setAttr('class', 'wiki');
}
- if ($request->getArg('frame'))
- $link->setAttr('target', '_top');
return $link;
}
@@ -679,9 +677,6 @@
$gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword));
$link->pushContent($gbutton);
}
- if ($request->getArg('frame'))
- $link->setAttr('target', '_top');
-
return $link;
}
@@ -1693,8 +1688,6 @@
$this->_init('a', array('href' => $url));
if ($class)
$this->setAttr('class', $class);
- if ($request->getArg('frame'))
- $this->setAttr('target', '_top');
if (!empty($options) and is_array($options)) {
foreach ($options as $key => $val)
$this->setAttr($key, $val);
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/display.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -286,8 +286,6 @@
'class' => 'backlinks'),
$WikiTheme->maybeSplitWikiWord($pagename));
$pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
- if ($request->getArg('frame'))
- $pageheader->setAttr('target', '_top');
}
$pagetitle = SplitPagename($pagename);
Deleted: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/FrameInclude.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,153 +0,0 @@
-<?php
-
-/*
- * Copyright 2002 $ThePhpWikiProgrammingTeam
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * FrameInclude: Display a url or page in a separate frame inside our body.
- *
- * Usage:
- * <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >>
- * <<FrameInclude page=OtherPage >>
- * at the VERY BEGINNING in the content!
- *
- * Author: Reini Urban <ru...@x-...>, rewrite by Jeff Dairiki <da...@da...>
- *
- * KNOWN ISSUES:
- *
- * This is a dirty hack into the whole system. To display the page as
- * frameset we:
- *
- * 1. Discard any output buffered so far.
- * 2. Recursively call displayPage with magic arguments to generate
- * the frameset (or individual frame contents.)
- * 3. Exit early. (So this plugin is usually a no-return.)
- *
- * In any cases we can now serve only specific templates with the new
- * frame argument. The whole page is now ?frame=html (before it was
- * named "top") For the Sidebar theme (or derived from it) we provide
- * a left frame also, otherwise only top, content and bottom.
- */
-class WikiPlugin_FrameInclude
- extends WikiPlugin
-{
- function getDescription()
- {
- return _("Display a url in a separate frame inside our body. Only one frame allowed.");
- }
-
- function getDefaultArguments()
- {
- return array('src' => false, // the src url to include
- 'page' => false,
- 'name' => 'content', // name of our frame
- 'title' => false,
- 'rows' => '18%,*,15%', // names: top, $name, bottom
- 'cols' => '20%,*', // names: left, $name
- // only useful on WikiTheme "Sidebar"
- 'frameborder' => 1,
- 'marginwidth' => false,
- 'marginheight' => false,
- 'noresize' => false,
- 'scrolling' => 'auto', // '[ yes | no | auto ]'
- );
- }
-
- function run($dbi, $argstr, &$request, $basepage)
- {
-
- $args = ($this->getArgs($argstr, $request));
- extract($args);
-
- if ($request->getArg('action') != 'browse') {
- return $this->disabled(_("Plugin not run: not in browse mode"));
- }
- if (!$request->isGetOrHead()) {
- return $this->disabled("(method != 'GET')");
- }
-
- if (!$src and $page) {
- if ($page == $request->get('pagename')) {
- return $this->error(sprintf(_("Recursive inclusion of page %s"),
- $page));
- }
- $src = WikiURL($page);
- }
- if (!$src) {
- return $this->error(sprintf(_("%s or %s parameter missing"),
- 'src', 'page'));
- }
-
- // FIXME: How to normalize url's to compare against recursion?
- if ($src == $request->getURLtoSelf()) {
- return $this->error(sprintf(_("Recursive inclusion of url %s"),
- $src));
- }
-
- static $noframes = false;
- if ($noframes) {
- // Content for noframes version of page.
- return HTML::p(fmt("See %s",
- HTML::a(array('href' => $src), $src)));
- }
- $noframes = true;
-
- if (($which = $request->getArg('frame'))) {
- // Generate specialized frame output (header, footer, etc...)
- $request->discardOutput();
- displayPage($request, new Template("frame-$which", $request));
- $request->finish(); //noreturn
- }
-
- // Generate the outer frameset
- $frame = HTML::frame(array('name' => $name,
- 'src' => $src,
- 'title' => $title,
- 'frameborder' => (int)$frameborder,
- 'scrolling' => (string)$scrolling,
- 'noresize' => (bool)$noresize,
- ));
-
- if ($marginwidth)
- $frame->setArg('marginwidth', $marginwidth);
- if ($marginheight)
- $frame->setArg('marginheight', $marginheight);
-
- $tokens = array('CONTENT_FRAME' => $frame,
- 'ROWS' => $rows,
- 'COLS' => $cols,
- 'FRAMEARGS' => sprintf('frameborder="%d"', $frameborder),
- );
-
- // Produce the frameset.
- $request->discardOutput();
- displayPage($request, new Template('frameset', $request, $tokens));
- $request->finish(); //noreturn
- return '';
- }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/MediawikiTable.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -100,7 +100,7 @@
$attrs = parse_attributes($line);
foreach ($attrs as $key => $value) {
if (in_array($key, array("id", "class", "title", "style",
- "bgcolor", "frame", "rules", "border",
+ "bgcolor", "rules", "border",
"cellspacing", "cellpadding",
"align", "width"))
) {
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/RichTable.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -52,7 +52,7 @@
$attrs = parse_attributes($line);
foreach ($attrs as $key => $value) {
if (in_array($key, array("id", "class", "title", "style",
- "bgcolor", "frame", "rules", "border",
+ "bgcolor", "rules", "border",
"cellspacing", "cellpadding",
"align", "width"))
) {
Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/WikiTranslation.php 2014-09-04 16:17:25 UTC (rev 9062)
@@ -95,8 +95,6 @@
_("FindPage") . ',' .
_("FoafViewer") . ',' .
_("FoafViewerPlugin") . ',' .
- _("FrameInclude") . ',' .
- _("FrameIncludePlugin") . ',' .
_("FullRecentChanges") . ',' .
_("FullTextSearch") . ',' .
_("FuzzyPages") . ',' .
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/Makefile 2014-09-04 16:17:25 UTC (rev 9062)
@@ -160,7 +160,6 @@
${POT_FILE}: ../lib/plugin/FacebookLike.php
${POT_FILE}: ../lib/plugin/FileInfo.php
${POT_FILE}: ../lib/plugin/FoafViewer.php
-${POT_FILE}: ../lib/plugin/FrameInclude.php
${POT_FILE}: ../lib/plugin/FullTextSearch.php
${POT_FILE}: ../lib/plugin/FuzzyPages.php
${POT_FILE}: ../lib/plugin/GoogleMaps.php
@@ -405,7 +404,6 @@
${POT_FILE}: ../themes/default/templates/dialog.tmpl
${POT_FILE}: ../themes/default/templates/editpage.tmpl
${POT_FILE}: ../themes/default/templates/forumadd.tmpl
-${POT_FILE}: ../themes/default/templates/frameset.tmpl
${POT_FILE}: ../themes/default/templates/head.tmpl
${POT_FILE}: ../themes/default/templates/homepage.tmpl
${POT_FILE}: ../themes/default/templates/htmldump.tmpl
@@ -486,8 +484,6 @@
${POT_FILE}: ../themes/Sidebar/templates/content.tmpl
${POT_FILE}: ../themes/Sidebar/templates/debug.tmpl
${POT_FILE}: ../themes/Sidebar/templates/dump-footer.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/frame-left.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/frameset.tmpl
${POT_FILE}: ../themes/Sidebar/templates/htmldump.tmpl
${POT_FILE}: ../themes/Sidebar/templates/html.tmpl
${POT_FILE}: ../themes/Sidebar/templates/logo.tmpl
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Deleted: trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,36 +0,0 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
-Content-Type: application/x-phpwiki;
- pagename=Aide%2FPluginInclureUnCadre;
- flags="";
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-Ce plugin créera un cadre HTML qui remplira complètement la surface de la
-page (c'est-à-dire toute la surface que l'utilisateur peut éditer). Tout
-autre texte sera rejeté quand la page est affichée (tout ce qui est en
-dehors de l'appel du plugin). Dans le langage de l'hypertexte, ça s'appelle
-la <i>transclusion</i>.
-
-Vous pouvez être intéressé également par PluginInclureUnePage.
-
-Exemples: pour inclure une page depuis un autre site, utilisez l'argument <b>src</b> :
-
-{{{
-<<FrameInclude src="http://phpwiki.fr/">>
-}}}
-
-Pour inclure une page depuis ce wiki, utilisez l'argument <b>page</b> :
-
-{{{
-<<FrameInclude page=PageAccueil>>
-}}}
-
-Pour plus d'informations sur ce plugin, lisez s'il vous plaît, la source
-PHP dans le répertoire /lib/plugin.
-
-<noinclude>
-----
-[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
-</noinclude>
-
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/de.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1688,32 +1688,6 @@
msgid "Title"
msgstr "Titel"
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-"Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der "
-"Seite. Nur ein Frame ist erlaubt."
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr "Rekursiver Selbstaufruf der Seite %s"
-
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr "%s oder %s Argument fehlt"
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr "Rekursiver Selbstaufruf der URL %s"
-
-#, php-format
-msgid "See %s"
-msgstr "Siehe %s"
-
msgid "Search the content of all pages in this wiki."
msgstr "Den Text aller Seiten dieses Wikis durchsuchen."
@@ -2403,6 +2377,9 @@
"Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer "
"zufälliger ausgewählter Seite weiterleiten."
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr "ZufallsSeite"
@@ -2802,6 +2779,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr "Siehe %s"
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -3061,6 +3042,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Rekursiver Selbstaufruf der Seite %s"
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -3124,6 +3109,10 @@
msgstr "%s Argument fehlt"
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr "Rekursiver Selbstaufruf der URL %s"
+
+#, php-format
msgid "See: %s"
msgstr "Siehe: %s"
@@ -4052,16 +4041,6 @@
msgid "FoafViewerPlugin"
msgstr "FoafViewerPlugin"
-# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit
-# eingeschlossenem Rahmen)
-msgid "FrameInclude"
-msgstr "FrameEinbetten"
-
-# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit
-# eingeschlossenem Rahmen)
-msgid "FrameIncludePlugin"
-msgstr "FrameEinbettenPlugin"
-
# (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
# Änderungen"; in terms of newspapers or journalism it's traditionally
# "NeuesteNachrichten" or much more better "DasNeueste").
@@ -6083,6 +6062,10 @@
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
+# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
+#~ msgid "%s or %s parameter missing"
+#~ msgstr "%s oder %s Argument fehlt"
+
#~ msgid "Edit aborted."
#~ msgstr "Bearbeiten abgebrochen."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/es.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1657,29 +1657,6 @@
msgid "Title"
msgstr ""
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
msgid "Search the content of all pages in this wiki."
msgstr ""
@@ -2337,6 +2314,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr ""
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr "PáginaAlAzar"
@@ -2719,6 +2699,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -2972,6 +2956,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -3030,6 +3018,10 @@
msgstr ""
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
msgid "See: %s"
msgstr ""
@@ -3942,12 +3934,6 @@
msgid "FoafViewerPlugin"
msgstr ""
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
msgid "FullRecentChanges"
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/fr.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1659,30 +1659,6 @@
msgid "Title"
msgstr "Titre"
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-"Affiche une URL dans une cadre interne à la page. Un seul cadre autorisé."
-
-msgid "Plugin not run: not in browse mode"
-msgstr "Greffon non exécuté (hors navigation)"
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr "Insertion récursive de la page %s"
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr "%s ou %s paramètre manquant"
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr "Insertion récursive de l'URL %s"
-
-#, php-format
-msgid "See %s"
-msgstr "Voir %s"
-
msgid "Search the content of all pages in this wiki."
msgstr "Rechercher le contenu de toutes les pages de ce wiki."
@@ -2353,6 +2329,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr "Affiche une liste de pages prises au hasard sur ce wiki."
+msgid "Plugin not run: not in browse mode"
+msgstr "Greffon non exécuté (hors navigation)"
+
msgid "RandomPage"
msgstr "PageAléatoire"
@@ -2739,6 +2718,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr "Voir %s"
+
+#, php-format
msgid "Illegal operator: %s"
msgstr "Opérateur interdit : %s"
@@ -2996,6 +2979,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Insertion récursive de la page %s"
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -3060,6 +3047,10 @@
msgstr "%s paramètre manquant"
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr "Insertion récursive de l'URL %s"
+
+#, php-format
msgid "See: %s"
msgstr "Voir : %s"
@@ -3992,12 +3983,6 @@
msgid "FoafViewerPlugin"
msgstr "GreffonFoafViewer"
-msgid "FrameInclude"
-msgstr "InclureUnCadre"
-
-msgid "FrameIncludePlugin"
-msgstr "GreffonInclureUnCadre"
-
msgid "FullRecentChanges"
msgstr "DernièresModifs"
@@ -5976,6 +5961,9 @@
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid "%s or %s parameter missing"
+#~ msgstr "%s ou %s paramètre manquant"
+
#~ msgid "Edit aborted."
#~ msgstr "Modification annulée."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/it.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -1639,29 +1639,6 @@
msgid "Title"
msgstr ""
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
msgid "Search the content of all pages in this wiki."
msgstr ""
@@ -2315,6 +2292,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr ""
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr ""
@@ -2692,6 +2672,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -2945,6 +2929,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -3003,6 +2991,10 @@
msgstr ""
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
msgid "See: %s"
msgstr ""
@@ -3908,12 +3900,6 @@
msgid "FoafViewerPlugin"
msgstr ""
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
msgid "FullRecentChanges"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/ja.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1656,29 +1656,6 @@
msgid "Title"
msgstr "タイトル"
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr "%s を参照"
-
msgid "Search the content of all pages in this wiki."
msgstr ""
@@ -2339,6 +2316,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr ""
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr "ランダムページ"
@@ -2730,6 +2710,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr "%s を参照"
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -2985,6 +2969,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -3043,6 +3031,10 @@
msgstr ""
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
msgid "See: %s"
msgstr "参照: %s"
@@ -3993,14 +3985,6 @@
msgid "FoafViewerPlugin"
msgstr "カレンダー"
-#, fuzzy
-msgid "FrameInclude"
-msgstr "インライン画像一覧"
-
-#, fuzzy
-msgid "FrameIncludePlugin"
-msgstr "インライン画像一覧"
-
msgid "FullRecentChanges"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/nl.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -1630,29 +1630,6 @@
msgid "Title"
msgstr ""
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr "Zie %s"
-
msgid "Search the content of all pages in this wiki."
msgstr ""
@@ -2306,6 +2283,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr ""
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr ""
@@ -2683,6 +2663,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr "Zie %s"
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -2936,6 +2920,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -2994,6 +2982,10 @@
msgstr ""
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
msgid "See: %s"
msgstr ""
@@ -3899,12 +3891,6 @@
msgid "FoafViewerPlugin"
msgstr ""
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
msgid "FullRecentChanges"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/phpwiki.pot 2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1624,29 +1624,6 @@
msgid "Title"
msgstr ""
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
msgid "Search the content of all pages in this wiki."
msgstr ""
@@ -2300,6 +2277,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr ""
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr ""
@@ -2677,6 +2657,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -2930,6 +2914,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -2988,6 +2976,10 @@
msgstr ""
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
msgid "See: %s"
msgstr ""
@@ -3893,12 +3885,6 @@
msgid "FoafViewerPlugin"
msgstr ""
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
msgid "FullRecentChanges"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/sv.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1625,29 +1625,6 @@
msgid "Title"
msgstr ""
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
msgid "Search the content of all pages in this wiki."
msgstr ""
@@ -2301,6 +2278,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr ""
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr ""
@@ -2678,6 +2658,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -2931,6 +2915,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -2989,6 +2977,10 @@
msgstr ""
#, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
msgid "See: %s"
msgstr ""
@@ -3894,12 +3886,6 @@
msgid "FoafViewerPlugin"
msgstr ""
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
msgid "FullRecentChanges"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/zh.po 2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1698,29 +1698,6 @@
msgid "Title"
msgstr "標題搜索"
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr "在內容的分離框架中顯示 url. 只能放一個框架."
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, fuzzy, php-format
-msgid "Recursive inclusion of page %s"
-msgstr "遞迴含括頁面 %s"
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr "%s 或 %s 參數遺漏"
-
-#, fuzzy, php-format
-msgid "Recursive inclusion of url %s"
-msgstr "遞迴含括 url %s"
-
-#, php-format
-msgid "See %s"
-msgstr "參照 %s"
-
msgid "Search the content of all pages in this wiki."
msgstr "在此 wiki 所有頁面中搜尋內容."
@@ -2400,6 +2377,9 @@
msgid "Display a list of randomly chosen pages or redirects to a random page."
msgstr "顯示隨機選出的頁面列表或重導向到隨機選取的頁面."
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
msgid "RandomPage"
msgstr ""
@@ -2801,6 +2781,10 @@
msgstr ""
#, php-format
+msgid "See %s"
+msgstr "參照 %s"
+
+#, php-format
msgid "Illegal operator: %s"
msgstr ""
@@ -3060,6 +3044,10 @@
msgid "Parametrized page inclusion."
msgstr ""
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "遞迴含括頁面 %s"
+
msgid ""
"Convert Tex mathematicals expressions to cached PNG files. This is for small "
"text."
@@ -3118,6 +3106,10 @@
msgid "%s parameter missing"
msgstr "%s 參數遺漏"
+#, fuzzy, php-format
+msgid "Recursive inclusion of url %s"
+msgstr "遞迴含括 url %s"
+
#, php-format
msgid "See: %s"
msgstr "參閱: %s"
@@ -4080,14 +4072,6 @@
msgid "FoafViewerPlugin"
msgstr ""
-#, fuzzy
-msgid "FrameInclude"
-msgstr "含括頁面"
-
-#, fuzzy
-msgid "FrameIncludePlugin"
-msgstr "含括頁面"
-
msgid "FullRecentChanges"
msgstr ""
@@ -6135,6 +6119,9 @@
msgid "Edit this page"
msgstr "編輯此頁面"
+#~ msgid "%s or %s parameter missing"
+#~ msgstr "%s 或 %s 參數遺漏"
+
#~ msgid "Edit aborted."
#~ msgstr "編輯中止."
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Deleted: trunk/pgsrc/Help%2FFrameIncludePlugin
===================================================================
--- trunk/pgsrc/Help%2FFrameIncludePlugin 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/pgsrc/Help%2FFrameIncludePlugin 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,32 +0,0 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
-Content-Type: application/x-phpwiki;
- pagename=Help%2FFrameIncludePlugin;
- flags=PAGE_LOCKED;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-The **~FrameInclude** [[Help:WikiPlugin|plugin]] will create an HTML frame that will fill the entire display area of the page (that is, the whole area the user is allowed to edit). All other text will be discarded when the page is rendered (anything outside the call to plugin, that is). In the language of hypertext this is called //transclusion//.
-
-You might also be interested in the [[Help:IncludePagePlugin|IncludePage]] plugin.
-
-== Examples ==
-
-To include a page from another site, use the **src** attribute:
-
-{{{
-<<FrameInclude src="http://phpwiki.fr/">>
-}}}
-
-To include a page from within this wiki, use the **page** attribute:
-
-{{{
-<<FrameInclude page=HomePage>>
-}}}
-
-For more information on this plugin please read the PHP source code in the /lib/plugin directory.
-
-<noinclude>
-----
-[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
-</noinclude>
Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/pgsrc/Help%2FIncludePagePlugin 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,4 +1,4 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
+Date: Thu, 4 Sep 2014 18:14:45 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FIncludePagePlugin;
@@ -7,7 +7,7 @@
Content-Transfer-Encoding: binary
The **~IncludePage** [[Help:WikiPlugin|plugin]] will "include" other pages in this wiki. In the language of hypertext this is called //transclusion//.
-The pages will render in distinct tables. You can also load external pages in a more limited fashion with the [[Help:FrameIncludePlugin|FrameInclude]] plugin.
+The pages will render in distinct tables.
== Usage ==
@@ -95,7 +95,6 @@
* [[Help:IncludePagesPlugin]] (to include multiple pages)
* [[Help:TemplatePlugin]] (to include a page with parameters)
-* [[Help:FrameIncludePlugin]] (to include an external page)
<noinclude>
----
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/pgsrc/ReleaseNotes 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,4 +1,4 @@
-Date: Thu, 4 Sep 2014 17:37:27 +0000
+Date: Thu, 4 Sep 2014 18:14:45 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -11,6 +11,7 @@
== 1.5.1 2014-09-xx Marc-Etienne Vargenau ==
* fix Bug#456 'Optimizing Database' message sometimes printed on page
+* remove FrameInclude plugin (frames are not supported in HTML 5)
== 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
Deleted: trunk/themes/Sidebar/templates/frame-left.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-left.tmpl 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/themes/Sidebar/templates/frame-left.tmpl 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,14 +0,0 @@
-<?php
-/*
- * This template is responsible mainly for the outer level <html> stuff.
- */
-?>
-<!DOCTYPE html>
-<head>
-<meta charset="UTF-8" />
-<?php echo Template('head') ?>
-<body>
-<div class="toolbar"><?php echo Template('navbar') ?></div>
-<div class="toolbar"><?php echo Template('actionbar') ?></div>
-</body>
-</html>
Deleted: trunk/themes/Sidebar/templates/frameset.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frameset.tmpl 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/themes/Sidebar/templates/frameset.tmpl 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,26 +0,0 @@
-<?php
-/*
- * This template is used for the FrameInclude plugin.
- */
-
-$topurl = $request->getURLtoSelf(array('frame' => 'header'));
-$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
-$lefturl = $request->getURLtoSelf(array('frame' => 'left'));
-
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?php echo Template('head') ?>
-
-<frameset rows="<?php echo $ROWS?>">
- <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> />
- <frameset cols="<?php echo $COLS?>">
- <frame name="left" src="<?php echo $lefturl?>" <?php echo $FRAMEARGS ?> />
- <?php echo $CONTENT_FRAME ?>
- </frameset>
- <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> />
- <noframes><?php echo Template('body') ?></noframes>
-</frameset>
-</html>
Deleted: trunk/themes/default/templates/frameset.tmpl
===================================================================
--- trunk/themes/default/templates/frameset.tmpl 2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/themes/default/templates/frameset.tmpl 2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,22 +0,0 @@
-<?php
-/*
- * This template is used for the FrameInclude plugin.
- */
-
-$topurl = $request->getURLtoSelf(array('frame' => 'header'));
-$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
-
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?php echo Template('head') ?>
-
-<frameset rows="<?php echo $ROWS?>">
- <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> />
- <?php echo $CONTENT_FRAME ?>
- <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> />
- <noframes><?php echo Template('body') ?></noframes>
-</frameset>
-</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
