summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2006-01-21 13:14:35 +0100
committerAndreas Gohr <andi@splitbrain.org>2006-01-21 13:14:35 +0100
commit0c6b58a847e74cc5f51616e9a6f71935806dece0 (patch)
tree7da6bc2f997b11787b9b6f81f1b753aeadbf4361
parent247c1c5d1105cce361fd81b965640bc8e25aa09e (diff)
downloadrpg-0c6b58a847e74cc5f51616e9a6f71935806dece0.tar.gz
rpg-0c6b58a847e74cc5f51616e9a6f71935806dece0.tar.bz2
removed graphical list bullet
Unordered lists used a graphic for the list bullet. Using the same technique as in the ordered lists we don't need an image just to have the color. This has two advantages: 1. The list bullets still have the correct color when colors are adjusted in style.ini 2. List bullets grow and shrink correctly with the fontsize It has a disadvantage as well: All list items need to be marked up like this: <li><div class darcs-hash:20060121121435-7ad00-c6455f9b58c6e78b630c1121499e2052525fb556.gz
-rw-r--r--inc/html.php22
-rw-r--r--inc/template.php4
-rw-r--r--lib/plugins/info/syntax.php4
-rw-r--r--lib/plugins/plugin/admin.php4
-rw-r--r--lib/tpl/default/design.css12
-rw-r--r--lib/tpl/default/layout.css1
6 files changed, 26 insertions, 21 deletions
diff --git a/inc/html.php b/inc/html.php
index dc50b1a45..f6950879b 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -394,8 +394,8 @@ function html_locked(){
print p_locale_xhtml('locked');
print '<ul>';
- print '<li><strong>'.$lang['lockedby'].':</strong> '.$INFO['locked'].'</li>';
- print '<li><strong>'.$lang['lockexpire'].':</strong> '.$expire.' ('.$min.' min)</li>';
+ print '<li><div class="li"><strong>'.$lang['lockedby'].':</strong> '.$INFO['locked'].'</li>';
+ print '<li><div class="li"><strong>'.$lang['lockexpire'].':</strong> '.$expire.' ('.$min.' min)</div></li>';
print '</ul>';
}
@@ -416,6 +416,7 @@ function html_revisions(){
print '<ul>';
if($INFO['exists']){
print ($INFO['minor']) ? '<li class="minor">' : '<li>';
+ print '<div class="li">';
print $date;
@@ -429,6 +430,7 @@ function html_revisions(){
print '</span> ';
print '('.$lang['current'].')';
+ print '</div>';
print '</li>';
}
@@ -437,6 +439,7 @@ function html_revisions(){
$info = getRevisionInfo($ID,$rev);
print ($info['minor']) ? '<li class="minor">' : '<li>';
+ print '<div class="li">';
print $date;
print ' <a href="'.wl($ID,"rev=$rev,do=diff").'">';
@@ -462,6 +465,7 @@ function html_revisions(){
}
print '</span>';
+ print '</div>';
print '</li>';
}
print '</ul>';
@@ -494,6 +498,7 @@ function html_recent($first=0){
foreach($recents as $recent){
$date = date($conf['dformat'],$recent['date']);
print ($recent['minor']) ? '<li class="minor">' : '<li>';
+ print '<div class="li">';
print $date.' ';
@@ -532,6 +537,7 @@ function html_recent($first=0){
}
print '</span>';
+ print '</div>';
print '</li>';
}
print '</ul>';
@@ -669,9 +675,9 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
//print item
$ret .= $lifunc($item); //user function
- $ret .= '<span class="li">';
+ $ret .= '<div class="li">';
$ret .= $func($item); //user function
- $ret .= '</span>';
+ $ret .= '</div>';
}
//close remaining items and lists
@@ -698,9 +704,9 @@ function html_backlinks(){
print '<ul class="idx">';
foreach($data as $blink){
- print '<li>';
+ print '<li><div class="li">';
print html_wikilink(':'.$blink,$conf['useheading']?NULL:$blink);
- print '</li>';
+ print '</div></li>';
}
print '</ul>';
}
@@ -1144,12 +1150,12 @@ function html_admin(){
foreach ($menu as $item) {
if (!$item['prompt']) continue;
- ptln(' <li><a href="'.wl($ID, 'do=admin&amp;page='.$item['plugin']).'">'.$item['prompt'].'</a></li>');
+ ptln(' <li><div class="li"><a href="'.wl($ID, 'do=admin&amp;page='.$item['plugin']).'">'.$item['prompt'].'</a></div></li>');
}
// add in non-plugin functions
if (!$conf['openregister']){
- ptln('<li><a href="'.wl($ID,'do=register').'">'.$lang['admin_register'].'</a></li>');
+ ptln('<li><div class="li"><a href="'.wl($ID,'do=register').'">'.$lang['admin_register'].'</a></div></li>');
}
ptln('</ul>');
diff --git a/inc/template.php b/inc/template.php
index 636fcfca3..315373e21 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -678,7 +678,7 @@ function tpl_mediafilelist(){
$class .= ' class="mediafile mf_'.$class.'"';
}
- ptln('<li>',4);
+ ptln('<li><div class="li">',4);
ptln('<a href="javascript:mediaSelect(\':'.$item['id'].'\')"'.$class.'>'.
utf8_decodeFN($item['file']).
'</a>',6);
@@ -749,7 +749,7 @@ function tpl_mediafilelist(){
ptln ('('.filesize_h($item['size']).')',6);
ptln($del,6);
}
- ptln('</li>',4);
+ ptln('</div></li>',4);
}
ptln('</ul>',2);
}
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 25b2fff45..d5209397f 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -110,7 +110,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
if (!$po =& plugin_load('syntax',$p)) continue;
$info = $po->getInfo();
- $renderer->doc .= '<li>';
+ $renderer->doc .= '<li><div class="li">';
$renderer->externallink($info['url'],$info['name']);
$renderer->doc .= ' ';
$renderer->doc .= '<em>'.$info['date'].'</em>';
@@ -120,7 +120,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
$renderer->emaillink($info['email'],$info['author']);
$renderer->doc .= '<br />';
$renderer->doc .= strtr(htmlspecialchars($info['desc']),array("\n"=>"<br />"));
- $renderer->doc .= '</li>';
+ $renderer->doc .= '</div></li>';
unset($po);
}
diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php
index cffcf8057..0f25cbc85 100644
--- a/lib/plugins/plugin/admin.php
+++ b/lib/plugins/plugin/admin.php
@@ -388,7 +388,7 @@ class ap_manage {
ptln('<p>'.$this->lang['downloads'].'</p>');
ptln('<ul>');
foreach ($this->downloaded as $plugin) {
- ptln('<li>'.$plugin.'</li>',2);
+ ptln('<li><div class="li">'.$plugin.'</div></li>',2);
}
ptln('</ul>');
} else { // none found in download
@@ -546,7 +546,7 @@ class ap_manage {
ptln('<p>'.$this->lang['updates'].'</p>');
ptln('<ul>');
foreach ($this->downloaded as $plugin) {
- ptln('<li>'.$plugin.'</li>',2);
+ ptln('<li><div class="li">'.$plugin.'</div></li>',2);
}
ptln('</ul>');
} else { // none found in download
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index d9f0a2307..f7055ddf9 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -369,7 +369,8 @@ ul {
list-style-type: square;
margin: 0 0 0.5em 1.5em;
padding: 0;
- list-style-image: url(images/bullet.gif);
+ color: __darker__;
+ list-style-image: none;
}
/* ordered lists */
@@ -379,10 +380,10 @@ ol {
padding: 0;
color: __darker__;
font-weight: bold;
- list-style-image: none;
+ list-style-image: none;
}
-/* the list items overriding the ol definition */
+/* the list items overriding the ul/ol definition */
.li {
color: __black__;
font-weight: normal;
@@ -395,10 +396,12 @@ ol ol ol ol {list-style-type: lower-greek}
li.open {
list-style-image: url(images/open.gif);
+ /*list-style-type: circle;*/
}
li.closed {
list-style-image: url(images/closed.gif);
+ /*list-style-type: disc;*/
}
blockquote {
@@ -493,9 +496,6 @@ div.tocheader {
margin-bottom: 2px;
}
-div.toctoggle {
-}
-
div.tocheader img {
width:0.8em;
height:0.8em;
diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css
index 2f1386256..d541fa2f9 100644
--- a/lib/tpl/default/layout.css
+++ b/lib/tpl/default/layout.css
@@ -5,7 +5,6 @@
* @author moraes <moraes@tipos.com.br>
*/
-
/* -------------- top row --------------- */
.header {
height:35px;