diff options
| -rw-r--r-- | inc/html.php | 3 | ||||
| -rw-r--r-- | lib/images/fileicons/bz2.png | bin | 0 -> 769 bytes | |||
| -rw-r--r-- | lib/images/fileicons/conf.png | bin | 688 -> 694 bytes | |||
| -rw-r--r-- | lib/images/fileicons/deb.png | bin | 698 -> 715 bytes | |||
| -rw-r--r-- | lib/images/fileicons/file.png | bin | 440 -> 453 bytes | |||
| -rw-r--r-- | lib/scripts/edit.js | 3 |
6 files changed, 5 insertions, 1 deletions
diff --git a/inc/html.php b/inc/html.php index 5dbfcd921..66648ae0e 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1047,7 +1047,8 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed? <div class="toolbar"> <div id="draft__status"><?php if($INFO['draft']) echo $lang['draftdate'].' '.date($conf['dformat']);?></div> - <div id="tool__bar"></div> + <div id="tool__bar"><a href="<?php echo DOKU_BASE?>/lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>" + target="_blank"><?php echo $lang['mediaselect'] ?></a></div> <?php if($wr){?> <script type="text/javascript" charset="utf-8"> diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png Binary files differnew file mode 100644 index 000000000..fad9098a2 --- /dev/null +++ b/lib/images/fileicons/bz2.png diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png Binary files differindex 2ac2cf0cc..64b0b23c6 100644 --- a/lib/images/fileicons/conf.png +++ b/lib/images/fileicons/conf.png diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png Binary files differindex 53a4c0f0c..4ab359e9b 100644 --- a/lib/images/fileicons/deb.png +++ b/lib/images/fileicons/deb.png diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png Binary files differindex 644831951..ff12b7306 100644 --- a/lib/images/fileicons/file.png +++ b/lib/images/fileicons/file.png diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 48464017e..ada70194d 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -128,6 +128,9 @@ function initToolbar(tbid,edid,tb){ var toolbar = $(tbid); if(!toolbar) return; + //empty the toolbar area: + toolbar.innerHTML=''; + var cnt = tb.length; for(var i=0; i<cnt; i++){ // create new button |
