fileicons for non image media #198

darcs-hash:20050816192301-283c4-764462bd6cef810b4385a228edda3951ff709468.gz

20 files changed, 43 insertions, 11 deletions

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 112acc91c..cde1468ac 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -715,9 +715,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= $this->_formatLink($link);
     }
     
-    /**
-     * @todo don't add link for flash
-     */
     function internalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
                             $height=NULL, $cache=NULL) {
         global $conf;
@@ -735,15 +732,30 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['title']  = $this->_xmlEntities($src);
         list($ext,$mime) = mimetype($src);
         if(substr($mime,0,5) == 'image'){
-            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),false);
-        }else{
-            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true);
-        }
-        $link['name']   = $this->_media ($src, $title, $align, $width, $height, $cache);
+             // link only jpeg images
+             // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = TRUE;
+             $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),false);
+         }elseif($mime == 'application/x-shockwave-flash'){
+             // don't link flash movies
+             $noLink = TRUE;
+         }else{
+             // add file icons
+             $link['class'] = 'urlextern';
+             if(@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.png')){
+                 $link['style']='background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.'.png)';
+             }elseif(@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.gif')){
+                 $link['style']='background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.'.gif)';
+             }else{
+                 $link['style']='background-image: url('.DOKU_BASE.'lib/images/fileicons/file.gif)';
+             }
+             $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true);
+         }
+         $link['name']   = $this->_media ($src, $title, $align, $width, $height, $cache);
 
 
-        //output formatted
-        $this->doc .= $this->_formatLink($link);
+         //output formatted
+         if ($noLink) $this->doc .= $link['name'];
+         else $this->doc .= $this->_formatLink($link);
     }
     
     /**
@@ -766,8 +778,28 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['name']   = $this->_media ($src, $title, $align, $width, $height, $cache);
 
 
+        list($ext,$mime) = mimetype($src);
+        if(substr($mime,0,5) == 'image'){
+             // link only jpeg images
+             // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = TRUE;
+        }elseif($mime == 'application/x-shockwave-flash'){
+             // don't link flash movies
+             $noLink = TRUE;
+        }else{
+             // add file icons
+             $link['class'] = 'urlextern';
+             if(@file_exists(DOKU_INC.'lib/images/fileicons/'. $ext.'.png')){
+                 $link['style']='background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.'.png)';
+             }elseif(@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.gif')){
+                 $link['style']='background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.'.gif)';
+             }else{
+                 $link['style']='background-image: url('.DOKU_BASE.'lib/images/fileicons/file.gif)';
+             }
+         }
+
         //output formatted
-        $this->doc .= $this->_formatLink($link);
+        if ($noLink) $this->doc .= $link['name'];
+        else $this->doc .= $this->_formatLink($link);
     }
 
     /**
diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png
new file mode 100644
index 000000000..7d9225ede
--- /dev/null
+++ b/lib/images/fileicons/conf.png
diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png
new file mode 100644
index 000000000..17cb31a0a
--- /dev/null
+++ b/lib/images/fileicons/deb.png
diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png
new file mode 100644
index 000000000..fbc3792d9
--- /dev/null
+++ b/lib/images/fileicons/doc.png
diff --git a/lib/images/fileicons/gz.png b/lib/images/fileicons/gz.png
new file mode 100644
index 000000000..1de1da3c8
--- /dev/null
+++ b/lib/images/fileicons/gz.png
diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png
new file mode 100644
index 000000000..8ecb4bc0d
--- /dev/null
+++ b/lib/images/fileicons/htm.png
diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png
new file mode 100644
index 000000000..f94c6e3ec
--- /dev/null
+++ b/lib/images/fileicons/html.png
diff --git a/lib/images/fileicons/pdf.png b/lib/images/fileicons/pdf.png
new file mode 100644
index 000000000..2bd4c4f85
--- /dev/null
+++ b/lib/images/fileicons/pdf.png
diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png
new file mode 100644
index 000000000..8215c8993
--- /dev/null
+++ b/lib/images/fileicons/ppt.png
diff --git a/lib/images/fileicons/ps.png b/lib/images/fileicons/ps.png
new file mode 100644
index 000000000..2e39a1000
--- /dev/null
+++ b/lib/images/fileicons/ps.png
diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png
new file mode 100644
index 000000000..c85bc5554
--- /dev/null
+++ b/lib/images/fileicons/rtf.png
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
new file mode 100644
index 000000000..3d6992708
--- /dev/null
+++ b/lib/images/fileicons/sxc.png
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
new file mode 100644
index 000000000..7d29896cd
--- /dev/null
+++ b/lib/images/fileicons/sxd.png
diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png
new file mode 100644
index 000000000..d8eeb9298
--- /dev/null
+++ b/lib/images/fileicons/sxi.png
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
new file mode 100644
index 000000000..655d4a63a
--- /dev/null
+++ b/lib/images/fileicons/sxw.png
diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png
new file mode 100644
index 000000000..3ab716414
--- /dev/null
+++ b/lib/images/fileicons/tgz.png
diff --git a/lib/images/fileicons/txt.png b/lib/images/fileicons/txt.png
new file mode 100644
index 000000000..1bc7f1c3a
--- /dev/null
+++ b/lib/images/fileicons/txt.png
diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png
new file mode 100644
index 000000000..31aa9b344
--- /dev/null
+++ b/lib/images/fileicons/xls.png
diff --git a/lib/images/fileicons/xml.png b/lib/images/fileicons/xml.png
new file mode 100644
index 000000000..1286a5b18
--- /dev/null
+++ b/lib/images/fileicons/xml.png
diff --git a/lib/images/fileicons/zip.png b/lib/images/fileicons/zip.png
new file mode 100644
index 000000000..0f60c038b
--- /dev/null
+++ b/lib/images/fileicons/zip.png