diff options
| -rwxr-xr-x | LibertySystem.php | 3 | ||||
| -rw-r--r-- | icons/accept.png | bin | 635 -> 0 bytes | |||
| -rw-r--r-- | icons/administration.png | bin | 823 -> 0 bytes | |||
| -rw-r--r-- | icons/assign.gif | bin | 240 -> 0 bytes | |||
| -rw-r--r-- | icons/back.gif | bin | 182 -> 0 bytes | |||
| -rw-r--r-- | icons/bithelp.png | bin | 636 -> 0 bytes | |||
| -rwxr-xr-x | icons/cancel.png | bin | 820 -> 0 bytes | |||
| -rw-r--r-- | icons/close.png | bin | 820 -> 0 bytes | |||
| -rw-r--r-- | icons/collapsed.gif | bin | 59 -> 0 bytes | |||
| -rw-r--r-- | icons/config.gif | bin | 1062 -> 0 bytes | |||
| -rw-r--r-- | icons/copy.png | bin | 285 -> 0 bytes | |||
| -rw-r--r-- | icons/copy_folder.png | bin | 472 -> 0 bytes | |||
| -rw-r--r-- | icons/current.png | bin | 571 -> 0 bytes | |||
| -rw-r--r-- | icons/delete.png | bin | 778 -> 0 bytes | |||
| -rw-r--r-- | icons/delete_small.gif | bin | 839 -> 0 bytes | |||
| -rw-r--r-- | icons/detach.png | bin | 611 -> 0 bytes | |||
| -rwxr-xr-x | icons/download.png | bin | 455 -> 0 bytes | |||
| -rw-r--r-- | icons/edit.gif | bin | 612 -> 0 bytes | |||
| -rw-r--r-- | icons/edit_small.gif | bin | 170 -> 0 bytes | |||
| -rw-r--r-- | icons/error.png | bin | 784 -> 0 bytes | |||
| -rwxr-xr-x | icons/error_large.png | bin | 2320 -> 0 bytes | |||
| -rw-r--r-- | icons/expanded.gif | bin | 56 -> 0 bytes | |||
| -rw-r--r-- | icons/export.gif | bin | 624 -> 0 bytes | |||
| -rw-r--r-- | icons/find.png | bin | 665 -> 0 bytes | |||
| -rw-r--r-- | icons/folder.png | bin | 359 -> 0 bytes | |||
| -rw-r--r-- | icons/folder_open.png | bin | 448 -> 0 bytes | |||
| -rw-r--r-- | icons/help.png | bin | 665 -> 0 bytes | |||
| -rw-r--r-- | icons/history.png | bin | 1166 -> 0 bytes | |||
| -rw-r--r-- | icons/home.png | bin | 608 -> 0 bytes | |||
| -rwxr-xr-x | icons/import.gif | bin | 111 -> 0 bytes | |||
| -rw-r--r-- | icons/inactive.png | bin | 228 -> 0 bytes | |||
| -rw-r--r-- | icons/info.png | bin | 543 -> 0 bytes | |||
| -rw-r--r-- | icons/insert.png | bin | 567 -> 0 bytes | |||
| -rw-r--r-- | icons/list.png | bin | 428 -> 0 bytes | |||
| -rw-r--r-- | icons/mail_send.png | bin | 433 -> 0 bytes | |||
| -rw-r--r-- | icons/nav_down.gif | bin | 179 -> 0 bytes | |||
| -rw-r--r-- | icons/nav_first.gif | bin | 321 -> 0 bytes | |||
| -rw-r--r-- | icons/nav_last.gif | bin | 321 -> 0 bytes | |||
| -rw-r--r-- | icons/nav_next.gif | bin | 182 -> 0 bytes | |||
| -rw-r--r-- | icons/nav_prev.gif | bin | 182 -> 0 bytes | |||
| -rw-r--r-- | icons/nav_up.gif | bin | 178 -> 0 bytes | |||
| -rw-r--r-- | icons/new.png | bin | 483 -> 0 bytes | |||
| -rw-r--r-- | icons/note.png | bin | 543 -> 0 bytes | |||
| -rw-r--r-- | icons/pdf.gif | bin | 1015 -> 0 bytes | |||
| -rw-r--r-- | icons/permissions.gif | bin | 213 -> 0 bytes | |||
| -rw-r--r-- | icons/permissions_set.gif | bin | 319 -> 0 bytes | |||
| -rw-r--r-- | icons/plugin.png | bin | 444 -> 0 bytes | |||
| -rw-r--r-- | icons/post.gif | bin | 612 -> 0 bytes | |||
| -rw-r--r-- | icons/print.gif | bin | 603 -> 0 bytes | |||
| -rw-r--r-- | icons/refresh.png | bin | 626 -> 0 bytes | |||
| -rw-r--r-- | icons/reply.png | bin | 497 -> 0 bytes | |||
| -rw-r--r-- | icons/reply_quote.png | bin | 496 -> 0 bytes | |||
| -rw-r--r-- | icons/save.gif | bin | 599 -> 0 bytes | |||
| -rw-r--r-- | icons/security.png | bin | 729 -> 0 bytes | |||
| -rw-r--r-- | icons/settings.png | bin | 3254 -> 0 bytes | |||
| -rw-r--r-- | icons/sort.png | bin | 265 -> 0 bytes | |||
| -rw-r--r-- | icons/sort_asc.png | bin | 316 -> 0 bytes | |||
| -rw-r--r-- | icons/sort_desc.png | bin | 300 -> 0 bytes | |||
| -rw-r--r-- | icons/sort_none.png | bin | 310 -> 0 bytes | |||
| -rw-r--r-- | icons/success.png | bin | 652 -> 0 bytes | |||
| -rw-r--r-- | icons/tree.gif | bin | 105 -> 0 bytes | |||
| -rw-r--r-- | icons/upload.png | bin | 3471 -> 0 bytes | |||
| -rw-r--r-- | icons/view.gif | bin | 373 -> 0 bytes | |||
| -rw-r--r-- | icons/warning.png | bin | 809 -> 0 bytes | |||
| -rwxr-xr-x | icons/warning_large.png | bin | 2250 -> 0 bytes | |||
| -rw-r--r-- | templates/content_permissions_inc.tpl | 2 | ||||
| -rw-r--r-- | templates/display_comment.tpl | 6 | ||||
| -rw-r--r-- | templates/display_structure.tpl | 4 | ||||
| -rw-r--r-- | templates/edit_storage_list.tpl | 2 | ||||
| -rw-r--r-- | templates/edit_structure_inc.tpl | 10 |
70 files changed, 14 insertions, 13 deletions
diff --git a/LibertySystem.php b/LibertySystem.php index 7e057c8..ba2921c 100755 --- a/LibertySystem.php +++ b/LibertySystem.php @@ -3,7 +3,7 @@ * System class for handling the liberty package * * @package liberty -* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.41 2006/08/31 06:53:16 spiderr Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.42 2006/09/03 20:10:40 squareing Exp $ * @author spider <spider@steelsun.com> */ @@ -432,6 +432,7 @@ class LibertySystem extends LibertyBase { 'iexplain' => $ext, 'url' => 'only', ); + if( !$ret = smarty_function_biticon( $biticon,$gBitSmarty ) ) { $biticon['iname'] = $pExt; if( !$ret = smarty_function_biticon( $biticon,$gBitSmarty ) ) { diff --git a/icons/accept.png b/icons/accept.png Binary files differdeleted file mode 100644 index bca54b0..0000000 --- a/icons/accept.png +++ /dev/null diff --git a/icons/administration.png b/icons/administration.png Binary files differdeleted file mode 100644 index 785ec42..0000000 --- a/icons/administration.png +++ /dev/null diff --git a/icons/assign.gif b/icons/assign.gif Binary files differdeleted file mode 100644 index 3795953..0000000 --- a/icons/assign.gif +++ /dev/null diff --git a/icons/back.gif b/icons/back.gif Binary files differdeleted file mode 100644 index 7a11d89..0000000 --- a/icons/back.gif +++ /dev/null diff --git a/icons/bithelp.png b/icons/bithelp.png Binary files differdeleted file mode 100644 index 08e3da2..0000000 --- a/icons/bithelp.png +++ /dev/null diff --git a/icons/cancel.png b/icons/cancel.png Binary files differdeleted file mode 100755 index 667e10c..0000000 --- a/icons/cancel.png +++ /dev/null diff --git a/icons/close.png b/icons/close.png Binary files differdeleted file mode 100644 index 667e10c..0000000 --- a/icons/close.png +++ /dev/null diff --git a/icons/collapsed.gif b/icons/collapsed.gif Binary files differdeleted file mode 100644 index 10c64e7..0000000 --- a/icons/collapsed.gif +++ /dev/null diff --git a/icons/config.gif b/icons/config.gif Binary files differdeleted file mode 100644 index 1ac6aaa..0000000 --- a/icons/config.gif +++ /dev/null diff --git a/icons/copy.png b/icons/copy.png Binary files differdeleted file mode 100644 index f2f83e3..0000000 --- a/icons/copy.png +++ /dev/null diff --git a/icons/copy_folder.png b/icons/copy_folder.png Binary files differdeleted file mode 100644 index e67381a..0000000 --- a/icons/copy_folder.png +++ /dev/null diff --git a/icons/current.png b/icons/current.png Binary files differdeleted file mode 100644 index 43e0925..0000000 --- a/icons/current.png +++ /dev/null diff --git a/icons/delete.png b/icons/delete.png Binary files differdeleted file mode 100644 index af10be0..0000000 --- a/icons/delete.png +++ /dev/null diff --git a/icons/delete_small.gif b/icons/delete_small.gif Binary files differdeleted file mode 100644 index a63970d..0000000 --- a/icons/delete_small.gif +++ /dev/null diff --git a/icons/detach.png b/icons/detach.png Binary files differdeleted file mode 100644 index 58da6a4..0000000 --- a/icons/detach.png +++ /dev/null diff --git a/icons/download.png b/icons/download.png Binary files differdeleted file mode 100755 index 629f3cb..0000000 --- a/icons/download.png +++ /dev/null diff --git a/icons/edit.gif b/icons/edit.gif Binary files differdeleted file mode 100644 index 169003b..0000000 --- a/icons/edit.gif +++ /dev/null diff --git a/icons/edit_small.gif b/icons/edit_small.gif Binary files differdeleted file mode 100644 index c77db3e..0000000 --- a/icons/edit_small.gif +++ /dev/null diff --git a/icons/error.png b/icons/error.png Binary files differdeleted file mode 100644 index 4c485f7..0000000 --- a/icons/error.png +++ /dev/null diff --git a/icons/error_large.png b/icons/error_large.png Binary files differdeleted file mode 100755 index f9a6717..0000000 --- a/icons/error_large.png +++ /dev/null diff --git a/icons/expanded.gif b/icons/expanded.gif Binary files differdeleted file mode 100644 index 1a3aeff..0000000 --- a/icons/expanded.gif +++ /dev/null diff --git a/icons/export.gif b/icons/export.gif Binary files differdeleted file mode 100644 index 61f75c4..0000000 --- a/icons/export.gif +++ /dev/null diff --git a/icons/find.png b/icons/find.png Binary files differdeleted file mode 100644 index e2f48bc..0000000 --- a/icons/find.png +++ /dev/null diff --git a/icons/folder.png b/icons/folder.png Binary files differdeleted file mode 100644 index 77033a8..0000000 --- a/icons/folder.png +++ /dev/null diff --git a/icons/folder_open.png b/icons/folder_open.png Binary files differdeleted file mode 100644 index b1b22e5..0000000 --- a/icons/folder_open.png +++ /dev/null diff --git a/icons/help.png b/icons/help.png Binary files differdeleted file mode 100644 index 88e438e..0000000 --- a/icons/help.png +++ /dev/null diff --git a/icons/history.png b/icons/history.png Binary files differdeleted file mode 100644 index 8d658e0..0000000 --- a/icons/history.png +++ /dev/null diff --git a/icons/home.png b/icons/home.png Binary files differdeleted file mode 100644 index 26f9863..0000000 --- a/icons/home.png +++ /dev/null diff --git a/icons/import.gif b/icons/import.gif Binary files differdeleted file mode 100755 index 49e8ab9..0000000 --- a/icons/import.gif +++ /dev/null diff --git a/icons/inactive.png b/icons/inactive.png Binary files differdeleted file mode 100644 index 878a671..0000000 --- a/icons/inactive.png +++ /dev/null diff --git a/icons/info.png b/icons/info.png Binary files differdeleted file mode 100644 index bbd5dba..0000000 --- a/icons/info.png +++ /dev/null diff --git a/icons/insert.png b/icons/insert.png Binary files differdeleted file mode 100644 index 5f3311f..0000000 --- a/icons/insert.png +++ /dev/null diff --git a/icons/list.png b/icons/list.png Binary files differdeleted file mode 100644 index d2da45b..0000000 --- a/icons/list.png +++ /dev/null diff --git a/icons/mail_send.png b/icons/mail_send.png Binary files differdeleted file mode 100644 index 47a60f8..0000000 --- a/icons/mail_send.png +++ /dev/null diff --git a/icons/nav_down.gif b/icons/nav_down.gif Binary files differdeleted file mode 100644 index f2e6acd..0000000 --- a/icons/nav_down.gif +++ /dev/null diff --git a/icons/nav_first.gif b/icons/nav_first.gif Binary files differdeleted file mode 100644 index f8d70d6..0000000 --- a/icons/nav_first.gif +++ /dev/null diff --git a/icons/nav_last.gif b/icons/nav_last.gif Binary files differdeleted file mode 100644 index 189d3d0..0000000 --- a/icons/nav_last.gif +++ /dev/null diff --git a/icons/nav_next.gif b/icons/nav_next.gif Binary files differdeleted file mode 100644 index c3bb47f..0000000 --- a/icons/nav_next.gif +++ /dev/null diff --git a/icons/nav_prev.gif b/icons/nav_prev.gif Binary files differdeleted file mode 100644 index 7a11d89..0000000 --- a/icons/nav_prev.gif +++ /dev/null diff --git a/icons/nav_up.gif b/icons/nav_up.gif Binary files differdeleted file mode 100644 index a853e51..0000000 --- a/icons/nav_up.gif +++ /dev/null diff --git a/icons/new.png b/icons/new.png Binary files differdeleted file mode 100644 index eabd286..0000000 --- a/icons/new.png +++ /dev/null diff --git a/icons/note.png b/icons/note.png Binary files differdeleted file mode 100644 index bbd5dba..0000000 --- a/icons/note.png +++ /dev/null diff --git a/icons/pdf.gif b/icons/pdf.gif Binary files differdeleted file mode 100644 index ee61db3..0000000 --- a/icons/pdf.gif +++ /dev/null diff --git a/icons/permissions.gif b/icons/permissions.gif Binary files differdeleted file mode 100644 index 8ffa80a..0000000 --- a/icons/permissions.gif +++ /dev/null diff --git a/icons/permissions_set.gif b/icons/permissions_set.gif Binary files differdeleted file mode 100644 index c0da223..0000000 --- a/icons/permissions_set.gif +++ /dev/null diff --git a/icons/plugin.png b/icons/plugin.png Binary files differdeleted file mode 100644 index be7c3ae..0000000 --- a/icons/plugin.png +++ /dev/null diff --git a/icons/post.gif b/icons/post.gif Binary files differdeleted file mode 100644 index 169003b..0000000 --- a/icons/post.gif +++ /dev/null diff --git a/icons/print.gif b/icons/print.gif Binary files differdeleted file mode 100644 index 6a17792..0000000 --- a/icons/print.gif +++ /dev/null diff --git a/icons/refresh.png b/icons/refresh.png Binary files differdeleted file mode 100644 index fa77268..0000000 --- a/icons/refresh.png +++ /dev/null diff --git a/icons/reply.png b/icons/reply.png Binary files differdeleted file mode 100644 index 8aa26b0..0000000 --- a/icons/reply.png +++ /dev/null diff --git a/icons/reply_quote.png b/icons/reply_quote.png Binary files differdeleted file mode 100644 index 18eb2ae..0000000 --- a/icons/reply_quote.png +++ /dev/null diff --git a/icons/save.gif b/icons/save.gif Binary files differdeleted file mode 100644 index ba8d32e..0000000 --- a/icons/save.gif +++ /dev/null diff --git a/icons/security.png b/icons/security.png Binary files differdeleted file mode 100644 index 33091eb..0000000 --- a/icons/security.png +++ /dev/null diff --git a/icons/settings.png b/icons/settings.png Binary files differdeleted file mode 100644 index 2f8789d..0000000 --- a/icons/settings.png +++ /dev/null diff --git a/icons/sort.png b/icons/sort.png Binary files differdeleted file mode 100644 index 3378d99..0000000 --- a/icons/sort.png +++ /dev/null diff --git a/icons/sort_asc.png b/icons/sort_asc.png Binary files differdeleted file mode 100644 index 313b9e0..0000000 --- a/icons/sort_asc.png +++ /dev/null diff --git a/icons/sort_desc.png b/icons/sort_desc.png Binary files differdeleted file mode 100644 index 399ac9f..0000000 --- a/icons/sort_desc.png +++ /dev/null diff --git a/icons/sort_none.png b/icons/sort_none.png Binary files differdeleted file mode 100644 index 999c940..0000000 --- a/icons/sort_none.png +++ /dev/null diff --git a/icons/success.png b/icons/success.png Binary files differdeleted file mode 100644 index 5e0c2b5..0000000 --- a/icons/success.png +++ /dev/null diff --git a/icons/tree.gif b/icons/tree.gif Binary files differdeleted file mode 100644 index a063667..0000000 --- a/icons/tree.gif +++ /dev/null diff --git a/icons/upload.png b/icons/upload.png Binary files differdeleted file mode 100644 index 8c1e2ad..0000000 --- a/icons/upload.png +++ /dev/null diff --git a/icons/view.gif b/icons/view.gif Binary files differdeleted file mode 100644 index e830b6e..0000000 --- a/icons/view.gif +++ /dev/null diff --git a/icons/warning.png b/icons/warning.png Binary files differdeleted file mode 100644 index 9a8c5bb..0000000 --- a/icons/warning.png +++ /dev/null diff --git a/icons/warning_large.png b/icons/warning_large.png Binary files differdeleted file mode 100755 index dc8c8a4..0000000 --- a/icons/warning_large.png +++ /dev/null diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl index d977571..14b1ba9 100644 --- a/templates/content_permissions_inc.tpl +++ b/templates/content_permissions_inc.tpl @@ -51,7 +51,7 @@ {$perm.perm_desc} </td> <td align="right"> - {smartlink ititle="Remove Permission" ibiticon="liberty/delete" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id} + {smartlink ititle="Remove Permission" ibiticon="icons/edit-delete" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id} </td> </tr> {foreachelse} diff --git a/templates/display_comment.tpl b/templates/display_comment.tpl index 8defaaa..b3135ca 100644 --- a/templates/display_comment.tpl +++ b/templates/display_comment.tpl @@ -7,13 +7,13 @@ <div class="post"> <div class="floaticon"> {if $gBitUser->hasPermission( 'p_liberty_post_comments' )} - <a href="{$comments_return_url}&post_comment_reply_id={$comment.content_id}&post_comment_request=1#editcomments" rel="nofollow">{biticon ipackage="liberty" iname="reply" iexplain="Reply to this comment"}</a> + <a href="{$comments_return_url}&post_comment_reply_id={$comment.content_id}&post_comment_request=1#editcomments" rel="nofollow">{biticon ipackage="icons" iname="mail-reply-sender" iexplain="Reply to this comment"}</a> {/if} {if $comment.editable} - <a href="{$comments_return_url}&post_comment_id={$comment.comment_id}&post_comment_request=1#editcomments" rel="nofollow">{biticon ipackage="liberty" iname="edit" iexplain="Edit"}</a> + <a href="{$comments_return_url}&post_comment_id={$comment.comment_id}&post_comment_request=1#editcomments" rel="nofollow">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit"}</a> {/if} {if $gBitUser->isAdmin()} - <a href="{$comments_return_url}&delete_comment_id={$comment.comment_id}" rel="nofollow">{biticon ipackage="liberty" iname="delete" iexplain="Remove"}</a> + <a href="{$comments_return_url}&delete_comment_id={$comment.comment_id}" rel="nofollow">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove"}</a> {/if} </div> diff --git a/templates/display_structure.tpl b/templates/display_structure.tpl index 6b537fb..02ffc55 100644 --- a/templates/display_structure.tpl +++ b/templates/display_structure.tpl @@ -18,7 +18,7 @@ {if $structureInfo.prev and $structureInfo.prev.structure_id} <a href="index.php?structure_id={$structureInfo.prev.structure_id}"> {if $wikibook_use_icons eq 'y'} - {biticon ipackage=liberty iname=nav_prev iexplain=Previous} + {biticon ipackage="icons" iname="go-previous" iexplain=Previous} {else} « {$structureInfo.prev.title|escape} {/if} @@ -30,7 +30,7 @@ {if $structureInfo.next and $structureInfo.next.structure_id} <a href="index.php?structure_id={$structureInfo.next.structure_id}"> {if $wikibook_use_icons eq 'y'} - {biticon ipackage=liberty iname=nav_next iexplain=Next} + {biticon ipackage="icons" iname="go-next" iexplain=Next} {else} {$structureInfo.next.title|escape} » {/if} diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl index 606dda9..d0a895b 100644 --- a/templates/edit_storage_list.tpl +++ b/templates/edit_storage_list.tpl @@ -22,7 +22,7 @@ <a href="{$attachmentActionBaseURL}&detachAttachment={$attachmentId}">{biticon ipackage=liberty iname="detach" iexplain="detach"}</a> {/if} {if $gBitUser->isAdmin() || $storage.user_id == $gBitUser->mUserId} - <a href="{$attachmentActionBaseURL}&deleteAttachment={$attachmentId}">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a> + <a href="{$attachmentActionBaseURL}&deleteAttachment={$attachmentId}">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a> {/if} </td> </tr> diff --git a/templates/edit_structure_inc.tpl b/templates/edit_structure_inc.tpl index 2e9a0de..59faa9d 100644 --- a/templates/edit_structure_inc.tpl +++ b/templates/edit_structure_inc.tpl @@ -22,12 +22,12 @@ <div class="navbar"> <ul> - <li><a id="tree-moveUp" href="javascript:void(0)">{biticon ipackage=liberty iname=nav_up iexplain="Up"}</a></li> - <li><a id="tree-moveDown" href="javascript:void(0)">{biticon ipackage=liberty iname=nav_down iexplain="Down"}</a></li> - <li><a id="tree-moveLeft" href="javascript:void(0)">{biticon ipackage=liberty iname=nav_prev iexplain="Left"}</a></li> - <li><a id="tree-moveRight" href="javascript:void(0)">{biticon ipackage=liberty iname=nav_next iexplain="Right"}</a></li> + <li><a id="tree-moveUp" href="javascript:void(0)">{biticon ipackage="icons" iname="go-up" iexplain="Up"}</a></li> + <li><a id="tree-moveDown" href="javascript:void(0)">{biticon ipackage="icons" iname="go-down" iexplain="Down"}</a></li> + <li><a id="tree-moveLeft" href="javascript:void(0)">{biticon ipackage="icons" iname="go-previous" iexplain="Left"}</a></li> + <li><a id="tree-moveRight" href="javascript:void(0)">{biticon ipackage="icons" iname="go-next" iexplain="Right"}</a></li> {if !$no_delete} - <li><a id="tree-remove" href="javascript:void(0)">{biticon ipackage=liberty iname=delete iexplain="Remove"}</a></li> + <li><a id="tree-remove" href="javascript:void(0)">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove"}</a></li> {else} <input id="tree-remove" type="hidden" value="dummy"> {/if} |
