summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/dokuwiki.php1
-rw-r--r--inc/lang/de/lang.php2
-rw-r--r--inc/lang/en/lang.php1
-rw-r--r--inc/lang/fr/lang.php1
-rw-r--r--inc/lang/pt-br/lang.php1
-rw-r--r--inc/lang/pt/lang.php1
-rw-r--r--inc/parser/xhtml.php81
-rw-r--r--lib/plugins/config/lang/de/lang.php4
-rw-r--r--lib/plugins/config/lang/en/lang.php6
-rw-r--r--lib/plugins/config/lang/fr/lang.php4
-rw-r--r--lib/plugins/config/lang/pt-br/lang.php4
-rw-r--r--lib/plugins/config/lang/pt/lang.php4
-rw-r--r--lib/plugins/config/settings/config.metadata.php1
-rw-r--r--lib/styles/style.css4
-rw-r--r--lib/tpl/default/design.css31
15 files changed, 12 insertions, 134 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 4c4912909..e3d19fb71 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -32,7 +32,6 @@ $conf['recent'] = 20; //how many entries to show in recent
$conf['breadcrumbs'] = 10; //how many recent visited pages to show
$conf['youarehere'] = 0; //show "You are here" navigation? 0|1
$conf['typography'] = 1; //smartquote conversion 0=off, 1=doublequotes, 2=all quotes
-$conf['purplenumbers']= 0; //show purple numbers? 0=off, 1=create IDs unique per page, 2=create IDs unique per site
$conf['htmlok'] = 0; //may raw HTML be embedded? This may break layout and XHTML validity 0|1
$conf['phpok'] = 0; //may PHP code be embedded? Never do this on the internet! 0|1
$conf['dformat'] = '%Y/%m/%d %H:%M'; //dateformat accepted by PHPs strftime() function
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 80f75fa13..163367dde 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -72,7 +72,7 @@ $lang['minoredit'] = 'kleine Änderung';
$lang['draftdate'] = 'Entwurf gespeichert am';
$lang['nosecedit'] = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
$lang['sectionlink'] = 'Link zu diesem Abschnitt';
-$lang['regmissing'] = 'Alle Felder müssen ausgefüllt werden.';
+$lang['regmissing'] = 'Alle Felder müssen ausgefüllt werden';
$lang['reguexists'] = 'Der Nutzername existiert leider schon.';
$lang['regsuccess'] = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
$lang['regsuccess2'] = 'Der neue Nutzer wurde angelegt.';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 76e4b7a85..d62579fb1 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -65,7 +65,6 @@ $lang['badlogin'] = 'Sorry, username or password was wrong.';
$lang['minoredit'] = 'Minor Changes';
$lang['draftdate'] = 'Draft autosaved on'; // full dformat date will be added
$lang['nosecedit'] = 'The page was changed in the meantime, section info was out of date loaded full page instead.';
-$lang['sectionlink']= 'link to this section';
$lang['regmissing'] = 'Sorry, you must fill in all fields.';
$lang['reguexists'] = 'Sorry, a user with this login already exists.';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index cd12ebdb3..4435b5df4 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -72,7 +72,6 @@ $lang['badlogin'] = 'L\'utilisateur ou le mot de passe est incorrec
$lang['minoredit'] = 'Mineur';
$lang['draftdate'] = 'Brouillon auto-enregistré le';
$lang['nosecedit'] = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
-$lang['sectionlink'] = 'lien à cette section';
$lang['regmissing'] = 'Désolé, vous devez remplir tous les champs.';
$lang['reguexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris';
$lang['regsuccess'] = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 299cff82d..1b28b76df 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -72,7 +72,6 @@ $lang['badlogin'] = 'Desculpe, mas o nome de usuário ou a senha es
$lang['minoredit'] = 'Alterações mínimas';
$lang['draftdate'] = 'O rascunho foi salvo automaticamente em';
$lang['nosecedit'] = 'A página foi modificada nesse intervalo de tempo. Como a informação da seção estava desatualizada, foi carregada a página inteira.';
-$lang['sectionlink'] = 'Link para esta sessão';
$lang['regmissing'] = 'Desculpe, mas você precisa preencher todos os campos.';
$lang['reguexists'] = 'Desculpe, mas já existe um usuário com esse nome.';
$lang['regsuccess'] = 'O usuário foi criado e a senha enviada para seu e-mail.';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 0d46a16e4..2994d4c78 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -64,7 +64,6 @@ $lang['badlogin'] = 'O utilizador inválido ou senha inválida.';
$lang['minoredit'] = 'Alterações Menores';
$lang['draftdate'] = 'Rascunho automaticamente gravado em';
$lang['nosecedit'] = 'A página foi modificada entretanto. Como a informação da secção estava desactualizada, foi carregada a página inteira.';
-$lang['sectionlink'] = 'link para esta secção';
$lang['regmissing'] = 'Por favor, preencha todos os campos.';
$lang['reguexists'] = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
$lang['regsuccess'] = 'O utilizador foi criado e a senha foi enviada para o endereço de correio electrónico usado na inscrição.';
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index de7893061..d9e3e784e 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -32,7 +32,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
var $headers = array();
var $footnotes = array();
- var $pnid = 0;
var $lastlevel = 0;
var $node = array(0,0,0,0,0);
var $store = '';
@@ -94,10 +93,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
// make sure there are no empty paragraphs
$this->doc = preg_replace('#<p>\s*</p>#','',$this->doc);
- if ($conf['purplenumbers']) {
- $this->doc = preg_replace('#<p[^>]*>\s*<!--PN-->.*?(?:</p>)#','',$this->doc);
- $this->doc = preg_replace('/<!--PN-->/','',$this->doc);
- }
}
function toc_additem($id, $text, $level) {
@@ -110,8 +105,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function header($text, $level, $pos) {
- global $conf;
- global $lang;
if(!$text) return; //skip empty headlines
$hid = $this->_headerToLink($text,true);
@@ -126,15 +119,12 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
$this->node[$this->lastlevel-$i-1] = 0;
}
}
- $this->pnid = 0;
$this->lastlevel = $level;
// write the header
$this->doc .= DOKU_LF.'<h'.$level.'><a name="'.$hid.'" id="'.$hid.'">';
$this->doc .= $this->_xmlEntities($text);
- $this->doc .= "</a>";
- if ($conf['purplenumbers']) $this->doc .= " <a href='#$hid' class='pn' title='".$lang['sectionlink']."'>§</a>";
- $this->doc .= "</h$level>".DOKU_LF;
+ $this->doc .= "</a></h$level>".DOKU_LF;
}
/**
@@ -166,11 +156,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function p_open() {
- $this->doc .= DOKU_LF.'<p'.$this->_getPurpleNumberID().'>'.DOKU_LF;
+ $this->doc .= DOKU_LF.'<p>'.DOKU_LF;
}
function p_close() {
- $this->doc .= DOKU_LF.$this->_getPurpleNumberLink().'</p>'.DOKU_LF;
+ $this->doc .= DOKU_LF.'</p>'.DOKU_LF;
}
function linebreak() {
@@ -303,7 +293,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function listitem_open($level) {
- $this->doc .= '<li class="level'.$level.'"'.$this->_getPurpleNumberID().'>';
+ $this->doc .= '<li class="level'.$level.'">';
}
function listitem_close() {
@@ -315,7 +305,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function listcontent_close() {
- $this->doc .= $this->_getPurpleNumberLink().'</div>'.DOKU_LF;
+ $this->doc .= '</div>'.DOKU_LF;
}
function unformatted($text) {
@@ -368,11 +358,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function preformatted($text) {
- $this->doc .= '<pre class="code"'.$this->_getPurpleNumberID().'>' . trim($this->_xmlEntities($text)) . $this->_getPurpleNumberLink(). '</pre>'. DOKU_LF;
+ $this->doc .= '<pre class="code">' . trim($this->_xmlEntities($text)) . '</pre>'. DOKU_LF;
}
function file($text) {
- $this->doc .= '<pre class="file"'.$this->_getPurpleNumberID().'>' . trim($this->_xmlEntities($text)). $this->_getPurpleNumberLink(). '</pre>'. DOKU_LF;
+ $this->doc .= '<pre class="file">' . trim($this->_xmlEntities($text)). '</pre>'. DOKU_LF;
}
function quote_open() {
@@ -832,11 +822,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
function table_open($maxcols = NULL, $numrows = NULL){
// initialize the row counter used for classes
$this->_counter['row_counter'] = 0;
- $this->doc .= '<table class="inline"'.$this->_getPurpleNumberID().'>'.DOKU_LF;
+ $this->doc .= '<table class="inline">'.DOKU_LF;
}
function table_close(){
- $this->doc .= '</table>'.$this->_getPurpleNumberLink(1).DOKU_LF;
+ $this->doc .= '</table>'.DOKU_LF;
}
function tablerow_open(){
@@ -1105,59 +1095,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
return $link;
}
- /**
- * Builds unique Hierarchical ID:
- * If $conf['purplenumbers'] is 2, it is unique per site,
- * otherwise it is unique per page.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
- function _getHID($noprefix=0) {
- global $conf;
- if ($noprefix) {
- $prefix = '';
- } else if ($conf['purplenumbers']==2) {
- global $ID;
- $prefix = $ID.'.';
- } else {
- $prefix = 'HID';
- }
- return $prefix.preg_replace('/(\.0)*$/','',join('.',$this->node)).str_replace(':0','',':'.$this->pnid);
- }
-
- /**
- * Equips each designated element with a Purple Number (Hierarchical ID).
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
- function _getPurpleNumberID() {
- global $conf;
- $this->pnid++;
- if ($conf['purplenumbers']) {
- return ' id="'.$this->_getHID().'"';
- }
- return '';
- }
-
- /**
- * Creates a link to the current Purple Number (Hierarchical ID).
- * If the link cannot be inside its corresponding element (e.g. tables),
- * $outside is set and p.pnlink is added around the link.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
- function _getPurpleNumberLink($outside=0) {
- global $conf;
- if ($conf['purplenumbers']) {
- global $lang;
- $pnlink = '<a href="#'.$this->_getHID().'" class="pn" title="'.$lang['sectionlink'].'">¶</a>';
- if ($outside) {
- return '<p class="pnlink">'.$pnlink.'</p>';
- }
- return ' <!--PN-->'.$pnlink;
- }
- return '';
- }
}
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index b151c8771..454f24d5b 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -55,7 +55,6 @@ $lang['recent'] = 'Anzahl der Einträge in der Änderungsliste';
$lang['breadcrumbs'] = 'Anzahl der Einträge im "Krümelpfad"';
$lang['youarehere'] = 'Hierarchische Pfadnavigation verwenden';
$lang['typography'] = 'Typographische Ersetzungen';
-$lang['purplenumbers'] = 'Zeige "Purple Numbers"';
$lang['htmlok'] = 'HTML erlauben';
$lang['phpok'] = 'PHP erlauben';
$lang['dformat'] = 'Datumsformat (Siehe PHP <a href="http://www.php.net/strftime">strftime</a> Funktion)';
@@ -150,9 +149,6 @@ $lang['license_o_'] = 'Keine gewählt';
$lang['typography_o_0'] = 'keine';
$lang['typography_o_1'] = 'ohne einfache Anführungszeichen';
$lang['typography_o_2'] = 'mit einfachen Anführungszeichen (funktioniert nicht immer)';
-$lang['purplenumbers_o_0'] = 'aus';
-$lang['purplenumbers_o_1'] = 'erzeuge IDs, die pro Seite eindeutig sind';
-$lang['purplenumbers_o_2'] = 'erzeuge IDs, die im gesamten Wiki eindeutig sind';
$lang['userewrite_o_0'] = 'keines';
$lang['userewrite_o_1'] = '.htaccess';
$lang['userewrite_o_2'] = 'DokuWiki';
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 4eefbaad3..842e419ce 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -67,7 +67,6 @@ $lang['recent'] = 'Recent changes';
$lang['breadcrumbs'] = 'Number of breadcrumbs';
$lang['youarehere'] = 'Hierarchical breadcrumbs';
$lang['typography'] = 'Do typographical replacements';
-$lang['purplenumbers']= 'Show Purple Numbers';
$lang['htmlok'] = 'Allow embedded HTML';
$lang['phpok'] = 'Allow embedded PHP';
$lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)';
@@ -178,11 +177,6 @@ $lang['typography_o_0'] = 'none';
$lang['typography_o_1'] = 'excluding single quotes';
$lang['typography_o_2'] = 'including single quotes (might not always work)';
-/* purplenumbers options */
-$lang['purplenumbers_o_0'] = 'off';
-$lang['purplenumbers_o_1'] = 'create IDs unique per page';
-$lang['purplenumbers_o_2'] = 'create IDs completely unique per site';
-
/* userewrite options */
$lang['userewrite_o_0'] = 'none';
$lang['userewrite_o_1'] = '.htaccess';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 58bb36965..ea3e7dfe6 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -52,7 +52,6 @@ $lang['recent'] = 'Nombre de derniers changements à afficher';
$lang['breadcrumbs'] = 'Nombre de traces à afficher';
$lang['youarehere'] = 'Traces hiérarchiques';
$lang['typography'] = 'Effectuer des améliorations typographiques';
-$lang['purplenumbers'] = 'Montrer les numéros pourpres';
$lang['htmlok'] = 'Permettre html dans les pages';
$lang['phpok'] = 'Permettre php dans les pages';
$lang['dformat'] = 'Format de date (cf. fonction <a href="http://www.php.net/strftime">strftime</a> de PHP)';
@@ -147,9 +146,6 @@ $lang['license_o_'] = 'Aucune choisie';
$lang['typography_o_0'] = 'aucun';
$lang['typography_o_1'] = 'guillemets uniquement';
$lang['typography_o_2'] = 'tout signe typographique (peut ne pas fonctionner)';
-$lang['purplenumbers_o_0'] = 'désactivé';
-$lang['purplenumbers_o_1'] = 'créer des IDs unique par page';
-$lang['purplenumbers_o_2'] = 'créer des IDs complètement uniques par site';
$lang['userewrite_o_0'] = 'aucun';
$lang['userewrite_o_1'] = '.htaccess';
$lang['userewrite_o_2'] = 'DokuWiki';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index ebe41daee..51db5c3fb 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -57,7 +57,6 @@ $lang['recent'] = 'Modificações recentes';
$lang['breadcrumbs'] = 'Número de elementos na trilha de páginas visitadas';
$lang['youarehere'] = 'Trilha hierárquica';
$lang['typography'] = 'Efetuar modificações tipográficas';
-$lang['purplenumbers'] = 'Mostrar Purple Numbers';
$lang['htmlok'] = 'Permitir incorporação de HTML';
$lang['phpok'] = 'Permitir incorporação de PHP';
$lang['dformat'] = 'Formato da data (veja a função <a href="http://www.php.net/strftime">strftime</a> do PHP)';
@@ -151,9 +150,6 @@ $lang['license_o_'] = 'Nenhuma escolha';
$lang['typography_o_0'] = 'nenhuma';
$lang['typography_o_1'] = 'excluir aspas simples';
$lang['typography_o_2'] = 'incluir aspas simples (nem sempre funciona)';
-$lang['purplenumbers_o_0'] = 'Desligado';
-$lang['purplenumbers_o_1'] = 'Criar IDs unicos por página';
-$lang['purplenumbers_o_2'] = 'Criar IDs completamente unicos por site';
$lang['userewrite_o_0'] = 'não';
$lang['userewrite_o_1'] = '.htaccess';
$lang['userewrite_o_2'] = 'interno do DokuWiki';
diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php
index b13debc3e..7fdc85ef3 100644
--- a/lib/plugins/config/lang/pt/lang.php
+++ b/lib/plugins/config/lang/pt/lang.php
@@ -49,7 +49,6 @@ $lang['recent'] = 'Alterações recentes';
$lang['breadcrumbs'] = 'Número máximo de breadcrumbs';
$lang['youarehere'] = 'Breadcrumbs hierárquicas';
$lang['typography'] = 'Executar substituições tipográficas';
-$lang['purplenumbers'] = 'Mostrar Números Violeta';
$lang['htmlok'] = 'Permitir embeber HTML';
$lang['phpok'] = 'Permitir embeber PHP';
$lang['dformat'] = 'Formato de Data (ver função PHP\'s <a href="http://www.php.net/strftime">strftime</a>)';
@@ -144,9 +143,6 @@ $lang['license_o_'] = 'Nenhuma escolha';
$lang['typography_o_0'] = 'nenhum';
$lang['typography_o_1'] = 'Apenas entre aspas';
$lang['typography_o_2'] = 'Entre aspas e apóstrofes';
-$lang['purplenumbers_o_0'] = 'desligado';
-$lang['purplenumbers_o_1'] = 'criar IDs únicos por página';
-$lang['purplenumbers_o_2'] = 'criar IDs completamente únicos por página web';
$lang['userewrite_o_0'] = 'nenhum';
$lang['userewrite_o_1'] = '.htaccess';
$lang['userewrite_o_2'] = 'interno (DokuWiki)';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 8593e6033..f78715de5 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -102,7 +102,6 @@ $meta['breadcrumbs'] = array('numeric');
$meta['youarehere'] = array('onoff');
$meta['fullpath'] = array('onoff');
$meta['typography'] = array('multichoice','_choices' => array(0,1,2));
-$meta['purplenumbers']= array('multichoice','_choices' => array(0,1,2));
$meta['dformat'] = array('string');
$meta['signature'] = array('string');
$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','email','email_link'));
diff --git a/lib/styles/style.css b/lib/styles/style.css
index 5464034ca..4311c3cca 100644
--- a/lib/styles/style.css
+++ b/lib/styles/style.css
@@ -5,7 +5,7 @@
div.clearer {
clear: both;
- line-height: 0px;
+ line-height: 0;
height: 0;
overflow:hidden;
}
@@ -105,7 +105,7 @@ em em.u {
.code .re0 { color: #0000ff; }
.code .re1 { color: #0000ff; }
.code .re2 { color: #0000ff; }
-.code .re3 { color:#ff3333; font-weight:bold; }
+.code .re3 { color: #ff3333; font-weight:bold; }
.code .re4 { color: #009999; }
.code .st0 { color: #ff0000; }
.code .sy0 { color: #66cc66; }
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 1e946207e..0d84d94ab 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -799,34 +799,3 @@ div.dokuwiki div.imagemeta img.thumb {
float:left;
margin-right: 0.1em;
}
-
-/* --------------- Purple Numbers ----------------- */
-
-/* show only on hover */
-.dokuwiki a.pn {
- visibility: hidden;
- color: __text_other__ !important;
-}
-.dokuwiki h1:hover a.pn,
-.dokuwiki h2:hover a.pn,
-.dokuwiki h3:hover a.pn,
-.dokuwiki h4:hover a.pn,
-.dokuwiki h5:hover a.pn,
-.dokuwiki p:hover a.pn,
-.dokuwiki li:hover a.pn,
-.dokuwiki pre:hover a.pn,
-.dokuwiki table.inline:hover + .pnlink a.pn {
- visibility: visible !important;
-}
-/* nested lists */
-.dokuwiki li:hover li a.pn {
- visibility: hidden !important;
-}
-.dokuwiki li li:hover a.pn {
- visibility: visible !important;
-}
-
-/* if PN needs to be outside of its section */
-.dokuwiki .pnlink {
- margin: -1.0em 0 0 0;
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 07:23:12 +0000