FS#744 (template developers, heed the changes)

darcs-hash:20070514222527-d5083-53ed619daf07d0a84c52161465d163abf1400529.gz

6 files changed, 12 insertions, 10 deletions

diff --git a/_test/cases/inc/html_hilight.test.php b/_test/cases/inc/html_hilight.test.php
index 634ef2585..e67b2cc1f 100644
--- a/_test/cases/inc/html_hilight.test.php
+++ b/_test/cases/inc/html_hilight.test.php
@@ -65,7 +65,7 @@ class html_hilight_test extends UnitTestCase{
   function testHighlightPHP() {
     $html = 'Foo $_GET[\'bar\'] Foo';
     $this->assertEqual(
-      'Foo <span class="search_hit">$_GET</span>[\'<span class="search_hit">bar</span>\'] Foo',
+      'Foo <strong class="search_hit">$_GET</strong>[\'<strong class="search_hit">bar</strong>\'] Foo',
       html_hilight($html,'$_GET[\'bar\']')
       );
   }
@@ -81,7 +81,7 @@ class html_hilight_test extends UnitTestCase{
   function testMatchAttributeWord() {
     $html = 'Foo <b class="x">bar</b> Foo';
     $this->assertEqual(
-      'Foo <b class="x"><span class="search_hit">bar</span></b> Foo',
+      'Foo <b class="x"><strong class="search_hit">bar</strong></b> Foo',
       html_hilight($html,'class="x">bar')
       );
   }
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php
index a885b1094..50bc0b79a 100644
--- a/inc/DifferenceEngine.php
+++ b/inc/DifferenceEngine.php
@@ -847,7 +847,7 @@ class _HWLDF_WordAccumulator {
   function _flushGroup ($new_tag) {
     if ($this->_group !== '') {
     if ($this->_tag == 'mark')
-      $this->_line .= '<span class="diffchange">'.$this->_group.'</span>';
+      $this->_line .= '<strong>'.$this->_group.'</strong>';
     else
     $this->_line .= $this->_group;
   }
diff --git a/inc/fulltext.php b/inc/fulltext.php
index 4049a753a..7cb1153fb 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -257,7 +257,7 @@ function ft_snippet($id,$poswords){
 
     $m = "\1";
     $snippets = preg_replace('#'.$re.'#iu',$m.'$1'.$m,$snippets);
-    $snippet = preg_replace('#'.$m.'([^'.$m.']*?)'.$m.'#iu','<span class="search_hit">$1</span>',hsc(join('... ',$snippets)));
+    $snippet = preg_replace('#'.$m.'([^'.$m.']*?)'.$m.'#iu','<strong class="search_hit">$1</strong>',hsc(join('... ',$snippets)));
 
     return $snippet;
 }
diff --git a/inc/html.php b/inc/html.php
index fa3e4c95d..3da238f5d 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -305,7 +305,7 @@ function html_hilight($html,$query){
 function html_hilight_callback($m) {
   $hlight = unslash($m[0]);
   if ( !isset($m[2])) {
-    $hlight = '<span class="search_hit">'.$hlight.'</span>';
+    $hlight = '<strong class="search_hit">'.$hlight.'</strong>';
   }
   return $hlight;
 }
@@ -654,9 +654,9 @@ function html_list_index($item){
   $base = ':'.$item['id'];
   $base = substr($base,strrpos($base,':')+1);
   if($item['type']=='d'){
-    $ret .= '<a href="'.wl($ID,'idx='.$item['id']).'" class="idx_dir">';
+    $ret .= '<a href="'.wl($ID,'idx='.$item['id']).'" class="idx_dir"><strong>';
     $ret .= $base;
-    $ret .= '</a>';
+    $ret .= '</strong></a>';
   }else{
     $ret .= html_wikilink(':'.$item['id']);
   }
diff --git a/inc/search.php b/inc/search.php
index eac70cd05..eea70f7e0 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -465,7 +465,7 @@ function search_regex(&$data,$base,$file,$reg,$words){
                htmlspecialchars(utf8_substr($text,$f,$l)).
                '<span class="search_sep"> ... </span>';
     $mark    = '('.join('|', $words).')';
-    $snippet = preg_replace('#'.$mark.'#si','<span class="search_hit">\\1</span>',$snippet);
+    $snippet = preg_replace('#'.$mark.'#si','<strong class="search_hit">\\1</strong>',$snippet);
 
     $data[] = array(
       'id'       => pathID($file),
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 88ceb3b84..7c8671e22 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -595,8 +595,9 @@ div.dokuwiki td.diff-deletedline {
 div.dokuwiki td.diff-context {
     background-color: __background_neu__;
 }
-div.dokuwiki span.diffchange {
-  color: red;
+div.dokuwiki table.diff td.diff-addedline strong,
+div.dokuwiki table.diff td.diff-deletedline strong {
+    color: red;
 }
 
 /* --------------------- footnotes -------------------------------- */
@@ -659,6 +660,7 @@ div.dokuwiki .search_sep {
 div.dokuwiki .search_hit {
   color: __text__;
   background-color: __highlight__;
+  font-weight: normal;
 }
 
 div.dokuwiki div.search_quickresult {