diff options
| -rw-r--r-- | inc/parser/xhtml.php | 9 | ||||
| -rw-r--r-- | interwiki/doku.gif | bin | 959 -> 0 bytes | |||
| -rw-r--r-- | interwiki/doku.png | bin | 0 -> 694 bytes | |||
| -rw-r--r-- | tpl/default/design.css | 7 | ||||
| -rw-r--r-- | tpl/default/main.php | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 36bfb1e02..71282bd17 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -678,17 +678,14 @@ class Doku_Renderer_XHTML extends Doku_Renderer { list($ext,$mime) = mimetype($src); if(substr($mime,0,5) == 'image'){ //add image tag - $ret .= '<img class="media" src="'. - DOKU_BASE.'fetch.php?w='.$width.'&h='.$height. + $ret .= '<img src="'.DOKU_BASE.'fetch.php?w='.$width.'&h='.$height. '&cache='.$cache.'&media='.urlencode($src).'"'; + + $ret .= ' class="media'.$align.'"'; if (!is_null($title)) $ret .= ' title="'.$this->__xmlEntities($title).'"'; - - if (!is_null($align)) - $ret .= ' align="'.$align.'"'; #FIXME use class! - if ( !is_null($width) ) $ret .= ' width="'.$this->__xmlEntities($width).'"'; diff --git a/interwiki/doku.gif b/interwiki/doku.gif Binary files differdeleted file mode 100644 index 0f9fc06c2..000000000 --- a/interwiki/doku.gif +++ /dev/null diff --git a/interwiki/doku.png b/interwiki/doku.png Binary files differnew file mode 100644 index 000000000..8446559cc --- /dev/null +++ b/interwiki/doku.png diff --git a/tpl/default/design.css b/tpl/default/design.css index f25c88935..754222fb4 100644 --- a/tpl/default/design.css +++ b/tpl/default/design.css @@ -271,6 +271,13 @@ img.mediaright { margin: 0 0 0 1.5em; } +img.mediacenter { + border: 0; + display: block; + margin-left: auto; + margin-right: auto; +} + acronym { cursor: help; border-bottom: 1px dotted #000; diff --git a/tpl/default/main.php b/tpl/default/main.php index ce35a740a..13274154d 100644 --- a/tpl/default/main.php +++ b/tpl/default/main.php @@ -36,7 +36,7 @@ <style type="text/css"> /* that IE 5+ conditional comment makes this only visible in IE 5+ */ /* IE bugfix for transparent PNGs */ - img { behavior: url("<?=DOKU_BASE?>/pngbehavior.htc"); } + //DISABLED img { behavior: url("<?=DOKU_BASE?>/pngbehavior.htc"); } </style> <![endif]--> |
