From 1e6f40d3032ad333ad914762f9a08090c05d8446 Mon Sep 17 00:00:00 2001 From: vargenau Date: Thu, 18 Sep 2014 14:28:21 +0000 Subject: [PATCH] No tabs git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9094 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/WysiwygEdit/FCKeditor.php | 8 ++-- lib/plugin/WikicreoleTable.php | 10 ++-- locale/fr/pgsrc/Aide%2FPluginRessourcesRss | 2 +- locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki | 2 +- locale/it/pgsrc/PaginaDiProva | 54 +++++++++++----------- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lib/WysiwygEdit/FCKeditor.php b/lib/WysiwygEdit/FCKeditor.php index b7c7d92b8..0483c7778 100644 --- a/lib/WysiwygEdit/FCKeditor.php +++ b/lib/WysiwygEdit/FCKeditor.php @@ -26,9 +26,9 @@ class WysiwygEdit_FCKeditor extends WysiwygEdit $this->_htmltextid = "edit-content"; // FCKEditor1; $this->_wikitextid = "editareawiki"; $this->_jsdefault = " -oFCKeditor.BasePath = '$this->BasePath'; -oFCKeditor.Height = 300; -// oFCKeditor.ToolbarSet = 'Basic' ; +oFCKeditor.BasePath = '$this->BasePath'; +oFCKeditor.Height = 300; +// oFCKeditor.ToolbarSet = 'Basic' ; oFCKeditor.Config.DefaultLanguage = '$LANG'; oFCKeditor.Config.LinkBrowserURL = oFCKeditor.BasePath + 'editor/filemanager/browser/default/browser.html?Connector=connectors/php/connector.php'; oFCKeditor.Config.ImageBrowserURL = oFCKeditor.BasePath + 'editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/php/connector.php'; @@ -66,7 +66,7 @@ oFCKeditor.ReplaceTextarea(); $out = HTML( JavaScript(" var oFCKeditor = new FCKeditor( '$htmltextid' ) ; -oFCKeditor.Value = '" . $textarea->_content[0]->asXML() . "';" +oFCKeditor.Value = '" . $textarea->_content[0]->asXML() . "';" . $this->_jsdefault . " oFCKeditor.Create();"), HTML::div(array("id" => $this->_wikitextid, diff --git a/lib/plugin/WikicreoleTable.php b/lib/plugin/WikicreoleTable.php index 6eb131ee2..bc5b1ab77 100644 --- a/lib/plugin/WikicreoleTable.php +++ b/lib/plugin/WikicreoleTable.php @@ -158,11 +158,11 @@ class WikiPlugin_WikicreoleTable /** * Compute cell in spreadsheet table * @param array $table: two-dimensional table - * @param int $i: first index of cell to compute - * @param int $j: second index of cell to compute - * @param int $imax: first table dimension - * @param int $jmax: second table dimension - * @return int + * @param int $i: first index of cell to compute + * @param int $j: second index of cell to compute + * @param int $imax: first table dimension + * @param int $jmax: second table dimension + * @return int */ private function compute_table_cell($table, $i, $j, $imax, $jmax) { diff --git a/locale/fr/pgsrc/Aide%2FPluginRessourcesRss b/locale/fr/pgsrc/Aide%2FPluginRessourcesRss index 7793ea821..b6d40bfcf 100644 --- a/locale/fr/pgsrc/Aide%2FPluginRessourcesRss +++ b/locale/fr/pgsrc/Aide%2FPluginRessourcesRss @@ -52,7 +52,7 @@ maxitem| * sources ~PhpWikiRss pour PhpWiki:RecentChanges : {{{ <> + url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>> }}} * [PhpWikiDemo:sidebar/] _Exemple barre verticale_ diff --git a/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki b/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki index 46f30ea06..6dae510c4 100644 --- a/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki +++ b/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki @@ -7,4 +7,4 @@ Content-Type: application/x-phpwiki; Content-Transfer-Encoding: binary <> + url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>> diff --git a/locale/it/pgsrc/PaginaDiProva b/locale/it/pgsrc/PaginaDiProva index a176cb95c..a6f974c6d 100644 --- a/locale/it/pgsrc/PaginaDiProva +++ b/locale/it/pgsrc/PaginaDiProva @@ -37,39 +37,39 @@ Mixed: ** l2 ---- old lists - * level 1 - * l1 - *l2 - *l2 - *l3 - *l3 - *l4 - *l3 - *l5 - *l3 - #one - #two - #one - #two - *l1 - #three - #four - *l1 - *l2 - # one - # two + * level 1 + * l1 + *l2 + *l2 + *l3 + *l3 + *l4 + *l3 + *l5 + *l3 + #one + #two + #one + #two + *l1 + #three + #four + *l1 + *l2 + # one + # two preformatted text some more text - *l1 - *l4 - # number - # number + *l1 + *l4 + # number + # number this is a plain paragraph - * bullet + * bullet this is a plain paragraph again - # number + # number ---- **Link tests** # normal: FrontPage -- 2.45.0