From eb1158a80dbf48fe1bcfcbb67e8d20f7df8c66ef Mon Sep 17 00:00:00 2001 From: rurban Date: Fri, 7 Jan 2005 14:23:31 +0000 Subject: [PATCH] PhpWiki 1.2.7 backport cvs release-1_2-branch enhancements never released with 1.2.3-1.2.6: * full xhtml conformity * split_pagename in title and header to help google * "INSTALL.Mac OS X" added from cvs * lib/zipfile.php: Content-Disposition: attachment * lib/config.php, lib/stdlib.php: support new USE_LINK_ICONS and AUTOSPLIT_WIKIWORDS, better i18n $!WikiNameRegexp * re-added images/* LINK_ICONS, pre-calculate DATA_PATH * locale/*: fix and update strings and templates esp. for german, * index.php: urlparser extended to omit &start_debug=1 and other args * added minor_edit checkbox * print more meta tags: robots, favicon, language and PHPWIKI_VERSION * dbalib: dba default detection for dba/dbm and take best handler, fix timeout logic, improve error diagnostics: print errors after the first failing attempts git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/branches/release-1_2-branch@4365 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- admin.php | 2 +- index.php | 2 +- lib/backlinks.php | 4 +- lib/db_filesystem.php | 2 +- lib/dbmlib.php | 2 +- lib/diff.php | 14 ++--- lib/display.php | 8 ++- lib/editlinks.php | 2 +- lib/editpage.php | 6 +- lib/fullsearch.php | 8 +-- lib/msql.php | 2 +- lib/mssql.php | 4 +- lib/mysql.php | 2 +- lib/pgsql.php | 2 +- lib/search.php | 10 ++-- lib/setupwiki.php | 6 +- lib/transform.php | 4 +- locale/de/templates/editlinks.html | 48 ++++++++-------- locale/de/templates/editpage.html | 47 ++++++++------- locale/de/templates/message.html | 16 +++--- locale/es/templates/editlinks.html | 77 +++++++++++++------------ locale/es/templates/editpage.html | 92 ++++++++++++++++-------------- locale/es/templates/message.html | 34 ++++++----- locale/it/templates/editlinks.html | 48 +++++++++------- locale/it/templates/editpage.html | 43 ++++++++------ locale/it/templates/message.html | 12 ++-- locale/nl/templates/editlinks.html | 42 ++++++++------ locale/nl/templates/editpage.html | 42 ++++++++------ locale/nl/templates/message.html | 12 ++-- locale/sv/templates/browse.html | 18 +++--- locale/sv/templates/editlinks.html | 42 ++++++++------ locale/sv/templates/message.html | 12 ++-- templates/editlinks.html | 44 +++++++------- templates/editpage.html | 41 +++++++------ templates/message.html | 14 +++-- 35 files changed, 428 insertions(+), 336 deletions(-) diff --git a/admin.php b/admin.php index 75d1ae626..cf881d548 100644 --- a/admin.php +++ b/admin.php @@ -1,4 +1,4 @@ - - + " . LinkExistingWikiWord($page) . "
\n"; + $html .= "
  • " . LinkExistingWikiWord($page) . "
    \n"; } $html .= "\n
    \n" diff --git a/lib/db_filesystem.php b/lib/db_filesystem.php index 2d42cdcb3..abbfd3554 100644 --- a/lib/db_filesystem.php +++ b/lib/db_filesystem.php @@ -1,4 +1,4 @@ - + \n"; + "cellspacing=\"2\" cellpadding=\"2\" border=\"0\">\n"; $html .= $this->_format($diff->edits, $from_lines); $html .= "\n"; @@ -936,11 +936,11 @@ class WikiDiffFormatter function _emit_diff ($xbeg,$xlen,$ybeg,$ylen,$hunks) { $html = '\n" + . " cellspacing=\"0\" border=\"0\" cellpadding=\"4\">\n" . '\n
    ' . $this->_diff_header($xbeg, $xlen, $ybeg, $ylen) . "
    \n" - . "\n"; + . "
    \n"; $prefix = array('c' => $this->context_prefix, 'a' => $this->adds_prefix, @@ -1035,7 +1035,7 @@ if ($diff) $html .= sprintf (gettext ("by %s"), $wiki['author']); $html .= ""; } else { - $html .= ""; } @@ -1053,11 +1053,11 @@ if ($diff) $html .= sprintf(gettext ("by %s"), $archive['author']); $html .= ""; } else { - $html .= ""; } - $html .= "
    "; + $html .= ""; $html .= gettext ("None"); $html .= ""; + $html .= ""; $html .= gettext ("None"); $html .= "

    \n"; + $html .= "

    \n"; if (is_array($wiki) && is_array($archive)) { diff --git a/lib/display.php b/lib/display.php index 2b46af16e..4b2d68f0e 100644 --- a/lib/display.php +++ b/lib/display.php @@ -1,7 +1,7 @@ ?"); + "$pagename?"); } GeneratePage('BROWSE', $html, $pagename, $pagehash); diff --git a/lib/editlinks.php b/lib/editlinks.php index 5fc54e018..8d34d9eec 100644 --- a/lib/editlinks.php +++ b/lib/editlinks.php @@ -1,4 +1,4 @@ - + for this code. // This allows an arbitrary number of reference links. diff --git a/lib/editpage.php b/lib/editpage.php index d77062dbf..abc1266a8 100644 --- a/lib/editpage.php +++ b/lib/editpage.php @@ -1,4 +1,4 @@ - + "; $html .= gettext ("This page has been locked by the administrator and cannot be edited."); - $html .= "\n

    "; + $html .= "

    \n

    "; $html .= gettext ("Sorry for the inconvenience."); - $html .= "\n"; + $html .= "

    \n"; GeneratePage('MESSAGE', $html, sprintf (gettext ("Problem while editing %s"), $pagename), 0); ExitWiki (""); } diff --git a/lib/fullsearch.php b/lib/fullsearch.php index 92ea5ba1a..bcd9cac33 100644 --- a/lib/fullsearch.php +++ b/lib/fullsearch.php @@ -1,15 +1,15 @@ " + $html = "

    " . sprintf(gettext ("Searching for \"%s\" ....."), htmlspecialchars($full)) - . "

    \n
    \n"; + . "

    \n
    \n"; $found = 0; $count = 0; @@ -21,7 +21,7 @@ $full = preg_replace("/\s+/", "|", preg_quote($full)); while ($pagehash = FullSearchNextMatch($dbi, $query)) { - $html .= "
    " . LinkExistingWikiWord($pagehash["pagename"]) . "\n"; + $html .= "
    " . LinkExistingWikiWord($pagehash["pagename"]) . "\n"; $count++; // print out all matching lines, highlighting the match diff --git a/lib/msql.php b/lib/msql.php index 6181772dc..e291a046a 100644 --- a/lib/msql.php +++ b/lib/msql.php @@ -1,4 +1,4 @@ -\n"), mssql_get_last_message()); + printf(gettext ("Insert/Update failed: %s"), mssql_get_last_message() . "
    \n"); } } diff --git a/lib/mysql.php b/lib/mysql.php index 10e6036b6..b4c626385 100644 --- a/lib/mysql.php +++ b/lib/mysql.php @@ -1,4 +1,4 @@ -" + $html = "

    " . sprintf(gettext ("Searching for \"%s\" ....."), htmlspecialchars($search)) - . "

    \n"; + . "

    \n"; // quote regexp chars (backends should do this...) //$search = preg_quote($search); @@ -19,11 +19,11 @@ $query = InitTitleSearch($dbi, $search); while ($page = TitleSearchNextMatch($dbi, $query)) { $found++; - $html .= LinkExistingWikiWord($page) . "
    \n"; + $html .= LinkExistingWikiWord($page) . "
    \n"; } } else { - $html .= gettext("(You entered an empty search string)") . "
    \n"; + $html .= gettext("(You entered an empty search string)") . "
    \n"; } $html .= "
    \n" diff --git a/lib/setupwiki.php b/lib/setupwiki.php index 530258563..9deff4887 100644 --- a/lib/setupwiki.php +++ b/lib/setupwiki.php @@ -1,4 +1,4 @@ - + " . htmlspecialchars ($pagename) . "", $version, $source); - print ("
    \n"); + print ("
    \n"); flush(); InsertPage($dbi, $pagename, $page); @@ -62,7 +62,7 @@ function LoadFile ($dbi, $filename, $text, $mtime) if ($page['pagename'] != rawurldecode($filename)) printf("Warning: " . "pagename (%s) doesn't match filename (%s)" - . " (using pagename)
    \n", + . " (using pagename)
    \n", htmlspecialchars($page['pagename']), htmlspecialchars(rawurldecode($filename))); diff --git a/lib/transform.php b/lib/transform.php index eb5267da0..c25d68613 100644 --- a/lib/transform.php +++ b/lib/transform.php @@ -1,4 +1,4 @@ -', $tmpline); + $tmpline = str_replace('%%%', '
    ', $tmpline); // bold italics (old way) $tmpline = preg_replace("|(''''')(.*?)(''''')|", diff --git a/locale/de/templates/editlinks.html b/locale/de/templates/editlinks.html index 9be12d630..f071039bc 100644 --- a/locale/de/templates/editlinks.html +++ b/locale/de/templates/editlinks.html @@ -1,39 +1,41 @@ - + + + + + ###PAGE### - + -
    + - - -
    [phpwiki]

    Verweise von ###PAGE### editieren +

    [phpwiki] +Verweise von ###PAGE### editieren

    -
    -

    -[1]
    -[2]
    -[3]
    -[4]
    -[5]
    -[6]
    -[7]
    -[8]
    -[9]
    -[10]
    -[11]
    -[12]
    +

    +[1]
    +[2]
    +[3]
    +[4]
    +[5]
    +[6]
    +[7]
    +[8]
    +[9]
    +[10]
    +[11]
    +[12]
    -

    +

    Bitte gib die vollständige URL (http:// ...) für jeden Verweis im Text ein. -
    Erlaubte Protokolle: ###ALLOWEDPROTOCOLS### +
    Erlaubte Protokolle: ###ALLOWEDPROTOCOLS### - +

    diff --git a/locale/de/templates/editpage.html b/locale/de/templates/editpage.html index b9295c925..a9be3d4d8 100644 --- a/locale/de/templates/editpage.html +++ b/locale/de/templates/editpage.html @@ -1,6 +1,10 @@ - + + + + + ###PAGE### @@ -8,39 +12,42 @@
    - - -
    [phpwiki]

    ###PAGE### editieren +

    [phpwiki] +###PAGE### editieren

    -
    - - -
    + +
    + +Das ist eine geringfügige Änderung, archiviere die alte Version nicht. +
    Ich kann keine Tabulatoren verwenden. Bitte KonvertiereLeerzeichenZuTabs für mich, wenn ich speichere. -

    GuterStil: Tips fürs Editieren. +

    GuterStil: Tips fürs Editieren. -
    +
    EditiereVerweise zu anderen Webseiten. -###IF COPY###
    EditiereArchivSeite vom vorhergenden Autor. +###IF COPY###
    EditiereArchivSeite vom vorhergenden Autor.

    -Emphasis: '' for italics, ''' for bold, ''''' for both -
    Lists: tab-* for bullet lists, tab-# for numbered lists, tab-Term:-tab for definition lists -
    References: JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/]. -
    References: Use [1],[2],[3],... and EditLinks. Avoid linking with "!": !DoNotHyperlink, name links like [text | URL] -
    Misc:"!", "!!", "!!!" make headings, -"%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[[" -
    more on -TextFormattingRules +Hervorhebung: '' für Kursiv, ''' für Fett, ''''' für Fett+Kursiv. +
    Listen: tab-* für normale Listen, tab-# für numerierte Listen, tab-Term:-tab für Definitionslisten. +
    Verweise: GroßbuchstabenZusammenschreiben oder in eckigen Klammern für eine [Seiten Link] oder URL [http://cool.wiki.int/]. +
    Verweise: Verwende [1],[2],[3],... und EditLinks. Vermeide Links mit "!": !NichtVerlinken, Benenne Links so [text | URL] +
    Misc:"!", "!!", "!!!" für Überschriften, +"%%%" für Zeilenvorschubzeichen, "- - - -" für eine Linie, das einfache "[" Zeichen als "[[" +
    Weiters siehe +TextFormatierungsRegeln     - + +
    diff --git a/locale/de/templates/message.html b/locale/de/templates/message.html index 0bec16985..d265df504 100644 --- a/locale/de/templates/message.html +++ b/locale/de/templates/message.html @@ -1,15 +1,17 @@ - -###PAGE### + + + + + +###SPLIT_PAGE### - + - - -
    [phpwiki]

    ###PAGE###

    -
    +

    [phpwiki] +###SPLIT_PAGE###

    ###CONTENT### diff --git a/locale/es/templates/editlinks.html b/locale/es/templates/editlinks.html index 146c03da9..b6cb8cb53 100644 --- a/locale/es/templates/editlinks.html +++ b/locale/es/templates/editlinks.html @@ -1,36 +1,41 @@ - - - -###PAGE### - - - - -
    - -

    [phpwiki] - Editar enlaces de ###PAGE### - -

    - -

    -[1]
    -[2]
    -[3]
    -[4]
    -[5]
    -[6]
    -[7]
    -[8]
    -[9]
    -[10]
    -[11]
    -[12]
    - -

    Escriba la URL completa (http:// ...) para cada referencia citada en el texto. -
    - Protocolos permitidos son: ###ALLOWEDPROTOCOLS### - -

    - - + + + + + + + +###PAGE### + + + + +
    + +

    [phpwiki] +Editar enlaces de ###PAGE### + +

    + +

    +[1]
    +[2]
    +[3]
    +[4]
    +[5]
    +[6]
    +[7]
    +[8]
    +[9]
    +[10]
    +[11]
    +[12]
    + +

    +Escriba la URL completa (http:// ...) para cada referencia citada en el texto. +
    Protocolos permitidos son: ###ALLOWEDPROTOCOLS### + + +

    + + diff --git a/locale/es/templates/editpage.html b/locale/es/templates/editpage.html index 42dc86f50..6f9f2abd7 100644 --- a/locale/es/templates/editpage.html +++ b/locale/es/templates/editpage.html @@ -1,42 +1,50 @@ - - - -###PAGE### - - - - -
    - -

    [phpwiki] - Editar ###PAGE### -

    - - -
    - - - No puedo escribir tabulaciones. Por favor ConvierteEspaciosEnTabs - al guardar. -

    BuenEstilo tips para editar.
    - EditarEnlaces a otros servidores. - ###IF COPY###
    - EditarCopia De un autor previo -

    - Énfasis: '' para itálicas, ''' para bold, ''''' - para ambos
    - Listas: tab-* para listas de balazos, tab-# para listas numeradas, tab-Term:-tab - para listas de definiciones
    - Referencias: UnirPalabrasEnMayúsculas o usar corchetes para una - [enlace hacia una página] o URL [http://cool.wiki.int/].
    - Referencias: Use [1],[2],[3],... y EditarEnlacess. Evite hacer enlaces - con "!": !NoHiperEnlaces. Enlaces con nombres como [text | URL]
    - Varios:"!", "!!", "!!!" para hacer títulos, "%%%" hace un salto - de línea, "- - - -" Hace una linea horizontal, escapar "[" con "[["
    - Más en ReglasDeFormatoDeTexto -     - - -
    - - + + + + + + + +###PAGE### + + + + +
    + +

    [phpwiki] +Editar ###PAGE### +

    + + +
    + +Esto es un cambio de menor importancia, no archiva la vieja versión. +
    + +No puedo escribir tabulaciones. Por favor ConvierteEspaciosEnTabs +al guardar. +

    BuenEstilo tips para editar.
    + EditarEnlaces a otros servidores. + +###IF COPY###
    EditarCopia De un autor previo + +

    + +Énfasis: '' para itálicas, ''' para bold, ''''' para ambos +
    Listas: tab-* para listas de balazos, tab-# para listas numeradas, tab-Term:-tab para listas de definiciones +
    Referencias: UnirPalabrasEnMayúsculas o usar corchetes para una [enlace hacia una página] o URL [http://cool.wiki.int/]. +
    Referencias: Use [1],[2],[3],... y EditarEnlacess. Evite hacer enlaces con "!": !NoHiperEnlaces. Enlaces con nombres como [text | URL] +
    Varios:"!", "!!", "!!!" para hacer títulos, "%%%" hace un salto de línea, "- - - -" Hace una linea horizontal, escapar "[" con "[[" +
    Más en +ReglasDeFormatoDeTexto +     + + + + +
    + + diff --git a/locale/es/templates/message.html b/locale/es/templates/message.html index 48c27064e..18bb97f17 100644 --- a/locale/es/templates/message.html +++ b/locale/es/templates/message.html @@ -1,15 +1,19 @@ - - - -###PAGE### - - - - -

    [phpwiki] -###PAGE###

    - -###CONTENT### - - - + + + + + + + +###SPLIT_PAGE### + + + + +

    [phpwiki] +###SPLIT_PAGE###

    + +###CONTENT### + + + diff --git a/locale/it/templates/editlinks.html b/locale/it/templates/editlinks.html index 641ad81a6..faf1e95ba 100644 --- a/locale/it/templates/editlinks.html +++ b/locale/it/templates/editlinks.html @@ -1,37 +1,41 @@ - + + + + + ###PAGE### - + -
    + -

    [phpwiki] +

    [phpwiki] Modifica ###PAGE### Collegamenti - -

    + + -

    -[1]
    -[2]
    -[3]
    -[4]
    -[5]
    -[6]
    -[7]
    -[8]
    -[9]
    -[10]
    -[11]
    -[12]
    +

    +[1]
    +[2]
    +[3]
    +[4]
    +[5]
    +[6]
    +[7]
    +[8]
    +[9]
    +[10]
    +[11]
    +[12]
    -

    +

    Scrivi l'URL completo (http:// ...) per ogni collegamento presente nel testo -
    I protocolli permessi sono: ###ALLOWEDPROTOCOLS### +
    I protocolli permessi sono: ###ALLOWEDPROTOCOLS### - +

    diff --git a/locale/it/templates/editpage.html b/locale/it/templates/editpage.html index ac5f34719..9c90373a1 100644 --- a/locale/it/templates/editpage.html +++ b/locale/it/templates/editpage.html @@ -1,46 +1,55 @@ - + + + + + ###PAGE### -
    + -

    [phpwiki] +

    [phpwiki] Modifica ###PAGE### -

    - - -
    - + + + +
    + +Ciò è un cambiamento secondario, non archivia la vecchia versione. +
    Non posso scrivere le tabulazioni. Per favore ConvertiGliSpaziInTab per me quando salvo. -

    BuonStile consigli per le modifiche. +

    BuonStile consigli per le modifiche. -
    +
    ModificaCollegamenti agli altri webservers. -###IF COPY###
    ModificaCopia dell'autore precedente +###IF COPY###
    ModificaCopia dell'autore precedente

    Enfasi: '' per corsivo, ''' per grassetto, ''''' per entrambi -
    Liste: tab-* per liste puntate, tab-# per liste numerate, tab-Term:-tab per liste di definizioni -
    Collegamenti: UnisciParoleConInizialiInMaiuscolo o usa le parentesi quadre per un [collegamento ad una pagina] o un URL [http://cool.wiki.int/]. -
    Collegamenti: Usa [1],[2],[3],... e ModificaCollegamenti. Evita di collegare con "!": !NonCollegare, nomi di collegamenti come [text | URL] -
    Varie:"!", "!!", "!!!" definisce le intestazioni, +
    Liste: tab-* per liste puntate, tab-# per liste numerate, tab-Term:-tab per liste di definizioni +
    Collegamenti: UnisciParoleConInizialiInMaiuscolo o usa le parentesi quadre per un [collegamento ad una pagina] o un URL [http://cool.wiki.int/]. +
    Collegamenti: Usa [1],[2],[3],... e ModificaCollegamenti. Evita di collegare con "!": !NonCollegare, nomi di collegamenti come [text | URL] +
    Varie:"!", "!!", "!!!" definisce le intestazioni, "%%%" va a capo, "- - - -" crea una linea orizzontale, usa "[" con "[[" per le sequenze di escape -
    altre informazioni su +
    altre informazioni su RegoleDiFormattazioneDelTestoTextFormattingRules     - + +
    diff --git a/locale/it/templates/message.html b/locale/it/templates/message.html index 3a50aaaed..0ce24afb1 100644 --- a/locale/it/templates/message.html +++ b/locale/it/templates/message.html @@ -1,12 +1,16 @@ - -###PAGE### + + + + + +###SPLIT_PAGE### - + -

    [phpwiki] +

    [phpwiki] ###PAGE###

    ###CONTENT### diff --git a/locale/nl/templates/editlinks.html b/locale/nl/templates/editlinks.html index b34ab6bb8..1b16881fd 100644 --- a/locale/nl/templates/editlinks.html +++ b/locale/nl/templates/editlinks.html @@ -1,37 +1,41 @@ - + + + + + ###PAGE### - + -
    + -

    [phpwiki] +

    [phpwiki] Verander ###PAGE### Koppelingen

    -

    -[1]
    -[2]
    -[3]
    -[4]
    -[5]
    -[6]
    -[7]
    -[8]
    -[9]
    -[10]
    -[11]
    -[12]
    +

    +[1]
    +[2]
    +[3]
    +[4]
    +[5]
    +[6]
    +[7]
    +[8]
    +[9]
    +[10]
    +[11]
    +[12]

    Tiep de volledige URL (http:// ...) voor elke referentie in de tekst. -
    Toegestane protokollen: ###ALLOWEDPROTOCOLS### +
    Toegestane protokollen: ###ALLOWEDPROTOCOLS### - +

    diff --git a/locale/nl/templates/editpage.html b/locale/nl/templates/editpage.html index 2e9032565..02e500a11 100644 --- a/locale/nl/templates/editpage.html +++ b/locale/nl/templates/editpage.html @@ -1,47 +1,55 @@ - + + + + + ###PAGE### -
    + -

    [phpwiki] +

    [phpwiki] Verander ###PAGE###

    - -
    - + +
    + +This is a minor change, don't archive old version. +
    Ik kan geen tabs tiepen. VertaalSpatiesNaarTabs voor mij als ik bewaar. -

    GoedeStijl tips for +

    GoedeStijl tips for veranderen. -
    +
    VeranderKoppelingen naar andere webservers. -###IF COPY###
    VeranderKopie van vorige auteur. +###IF COPY###
    VeranderKopie van vorige auteur.

    Nadruk: '' voor schuin, ''' voor vet, ''''' voor beide. -
    Lijsten: tab-* voor punt lijsten, tab-# voor genummerde lijsten, tab-Term:-tab voor definitie lijsten. -
    Verwijzingen: KapitaliseerEnSchrijfAanElkaar of gebruik vierkante haken [pagina koppeling] of URL [http://koel.wiki.int/]. -
    Verwijzingen: Gebruik [1],[2],[3],... en VeranderKoppelingen. Vermijdt kopplingen met "!": !KoppelNiet, noem koppelingen met [naam | URL]. -
    Allerlei:"!", "!!", "!!!" maak koppen, +
    Lijsten: tab-* voor punt lijsten, tab-# voor genummerde lijsten, tab-Term:-tab voor definitie lijsten. +
    Verwijzingen: KapitaliseerEnSchrijfAanElkaar of gebruik vierkante haken [pagina koppeling] of URL [http://koel.wiki.int/]. +
    Verwijzingen: Gebruik [1],[2],[3],... en VeranderKoppelingen. Vermijdt kopplingen met "!": !KoppelNiet, noem koppelingen met [naam | URL]. +
    Allerlei:"!", "!!", "!!!" maak koppen, "%%%" maak regelbreuk, "- - - -" maak horizontale lijn, ontsnap "[" met "[[". -
    meer op - -TekstFormatteringsRegels. +
    meer op +TekstFormatteringsRegels.     - + +
    diff --git a/locale/nl/templates/message.html b/locale/nl/templates/message.html index 3a50aaaed..47d9396f5 100644 --- a/locale/nl/templates/message.html +++ b/locale/nl/templates/message.html @@ -1,12 +1,16 @@ - -###PAGE### + + + + + +###SPLIT_PAGE### - + -

    [phpwiki] +

    [phpwiki] ###PAGE###

    ###CONTENT### diff --git a/locale/sv/templates/browse.html b/locale/sv/templates/browse.html index 1d3830a4d..b57cbfa94 100644 --- a/locale/sv/templates/browse.html +++ b/locale/sv/templates/browse.html @@ -1,12 +1,16 @@ - -###PAGE### + + + + + +###SPLIT_PAGE### - -

    [phpwiki] -###PAGE###

    + +

    [phpwiki] +###SPLIT_PAGE###

    ###IF:ADMIN### ###IF LOCK###[Lås upp sida] ###IF !LOCK###[Lås sida] @@ -14,7 +18,7 @@ [Ta bort sida]
    ###ENDIF:ADMIN### -

    +

    ###CONTENT###

    ###IF ADMIN###RedigeraText på den här sidan @@ -25,7 +29,7 @@ (senast ändrad ###LASTMODIFIED###) [info] [diff]) -
    +
    SökEfterSida
    ###RELATEDPAGES### diff --git a/locale/sv/templates/editlinks.html b/locale/sv/templates/editlinks.html index ddbe7afa0..0d784242e 100644 --- a/locale/sv/templates/editlinks.html +++ b/locale/sv/templates/editlinks.html @@ -1,37 +1,41 @@ - + + + + + ###PAGE### - + -
    +

    [phpwiki] Redigera länkar för ###PAGE###

    -

    -[1]
    -[2]
    -[3]
    -[4]
    -[5]
    -[6]
    -[7]
    -[8]
    -[9]
    -[10]
    -[11]
    -[12]
    +

    +[1]
    +[2]
    +[3]
    +[4]
    +[5]
    +[6]
    +[7]
    +[8]
    +[9]
    +[10]
    +[11]
    +[12]
    -

    +

    Skriv fullständig URL (http:// ...) för varje referens i texten. -
    Tillåtna protokoll är: ###ALLOWEDPROTOCOLS### +
    Tillåtna protokoll är: ###ALLOWEDPROTOCOLS### - +

    diff --git a/locale/sv/templates/message.html b/locale/sv/templates/message.html index 3a50aaaed..fafe75f90 100644 --- a/locale/sv/templates/message.html +++ b/locale/sv/templates/message.html @@ -1,12 +1,16 @@ - -###PAGE### + + + + + +###SPLIT_PAGE### - + -

    [phpwiki] +

    [phpwiki] ###PAGE###

    ###CONTENT### diff --git a/templates/editlinks.html b/templates/editlinks.html index b999940a9..b51af8df3 100644 --- a/templates/editlinks.html +++ b/templates/editlinks.html @@ -1,37 +1,41 @@ - + + + + + ###PAGE### - + -
    + -

    [phpwiki] +

    [phpwiki] Edit ###PAGE### Links

    -

    -[1]
    -[2]
    -[3]
    -[4]
    -[5]
    -[6]
    -[7]
    -[8]
    -[9]
    -[10]
    -[11]
    -[12]
    +

    +[1]
    +[2]
    +[3]
    +[4]
    +[5]
    +[6]
    +[7]
    +[8]
    +[9]
    +[10]
    +[11]
    +[12]
    -

    +

    Type the full URL (http:// ...) for each reference cited in the text. -
    Protocols allowed are: ###ALLOWEDPROTOCOLS### +
    Protocols allowed are: ###ALLOWEDPROTOCOLS### - +

    diff --git a/templates/editpage.html b/templates/editpage.html index ecb55b7ee..de4568366 100644 --- a/templates/editpage.html +++ b/templates/editpage.html @@ -1,45 +1,54 @@ - + + + + + ###PAGE### -
    + -

    [phpwiki] +

    [phpwiki] Edit ###PAGE###

    - -
    - + +
    + +This is a minor change, don't archive old version. +
    I can't type tabs. Please ConvertSpacesToTabs for me when I save. -

    GoodStyle tips for editing. +

    GoodStyle tips for editing. -
    +
    EditLinks to other web servers. -###IF COPY###
    EditCopy from previous author +###IF COPY###
    EditCopy from previous author

    Emphasis: '' for italics, ''' for bold, ''''' for both -
    Lists: tab-* for bullet lists, tab-# for numbered lists, tab-Term:-tab for definition lists -
    References: JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/]. -
    References: Use [1],[2],[3],... and EditLinks. Avoid linking with "!": !DoNotHyperlink, name links like [text | URL] -
    Misc:"!", "!!", "!!!" make headings, +
    Lists: tab-* for bullet lists, tab-# for numbered lists, tab-Term:-tab for definition lists +
    References: JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/]. +
    References: Use [1],[2],[3],... and EditLinks. Avoid linking with "!": !DoNotHyperlink, name links like [text | URL] +
    Misc:"!", "!!", "!!!" make headings, "%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[[" -
    more on +
    more on TextFormattingRules     - - + + +
    diff --git a/templates/message.html b/templates/message.html index 3a50aaaed..c1f5a5b11 100644 --- a/templates/message.html +++ b/templates/message.html @@ -1,13 +1,17 @@ - -###PAGE### + + + + + +###SPLIT_PAGE### - + -

    [phpwiki] -###PAGE###

    +

    [phpwiki] +###SPLIT_PAGE###

    ###CONTENT### -- 2.45.0