From: <li...@us...> - 2015-06-28 04:03:59
|
Revision: 55779 http://sourceforge.net/p/tikiwiki/code/55779 Author: lindonb Date: 2015-06-28 04:03:57 +0000 (Sun, 28 Jun 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 55769 to 55778 Modified Paths: -------------- trunk/lib/theme/iconsetlib.php trunk/templates/admin/admin_navbar.tpl trunk/templates/admin/include_category.tpl trunk/templates/categorize.tpl trunk/templates/modules/mod-quickadmin.tpl trunk/templates/prefs/shared-flags.tpl trunk/templates/sent_newsletters.tpl trunk/templates/tiki-browse_gallery.tpl trunk/templates/tiki-browse_image.tpl trunk/templates/tiki-edit_article.tpl trunk/templates/tiki-editpage.tpl trunk/templates/tiki-list_trackers.tpl trunk/templates/tracker_actions.tpl trunk/themes/base_files/iconsets/default.php trunk/themes/base_files/iconsets/glyphicons.php trunk/themes/base_files/iconsets/legacy.php Property Changed: ---------------- trunk/ trunk/templates/ Index: trunk =================================================================== --- trunk 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk 2015-06-28 04:03:57 UTC (rev 55779) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-55769 +/branches/14.x:54079-55778 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property Modified: trunk/lib/theme/iconsetlib.php =================================================================== --- trunk/lib/theme/iconsetlib.php 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/lib/theme/iconsetlib.php 2015-06-28 04:03:57 UTC (rev 55779) @@ -130,6 +130,18 @@ $this->icons[$name] = $icon; } } + + if (isset($iconset->defaults) && count($iconset->defaults > 0)) { + foreach ($iconset->defaults as $defname) { + if (! isset($this->icons[$defname]) || $over) { + $deficon['id'] = $defname; + $deficon['tag'] = $tag; + $deficon['prepend'] = $prepend; + $deficon['append'] = $append; + $this->icons[$defname] = $deficon; + } + } + } } function getIcon($name) { Index: trunk/templates =================================================================== --- trunk/templates 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates 2015-06-28 04:03:57 UTC (rev 55779) Property changes on: trunk/templates ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x/templates:45702-47762 /branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301 /branches/13.x/templates:51407-53060,53145,53192 -/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55769 +/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778 /branches/3.0/templates:16998-18916 /branches/4.x/templates:22817-23908 /branches/5.x/templates:26025-26523,26527-28378 \ No newline at end of property Modified: trunk/templates/admin/admin_navbar.tpl =================================================================== --- trunk/templates/admin/admin_navbar.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/admin/admin_navbar.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -135,9 +135,9 @@ {if $tikifeedback[n].st eq 0} {icon name="disable"} {elseif $tikifeedback[n].st eq 1} - {icon name="enable"} + {icon name="ok"} {elseif $tikifeedback[n].st eq 2} - {icon name="change"} + {icon name="edit"} {elseif $tikifeedback[n].st eq 4} {icon name="undo"} {else} Modified: trunk/templates/admin/include_category.tpl =================================================================== --- trunk/templates/admin/include_category.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/admin/include_category.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -14,7 +14,7 @@ {icon name="list"} {tr}Browse Categories{/tr} </a> <a role="button" class="btn btn-default btn-sm" href="tiki-admin_categories.php" title="{tr}Administration{/tr}"> - {icon name="administer"} {tr}Administer Categories{/tr} + {icon name="cog"} {tr}Administer Categories{/tr} </a> <a role="button" class="btn btn-default btn-sm" href="tiki-edit_categories.php" title="{tr}Organize Objects{/tr}"> {icon name="sort"} {tr}Organize Objects{/tr} Modified: trunk/templates/categorize.tpl =================================================================== --- trunk/templates/categorize.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/categorize.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -31,7 +31,7 @@ {if $tiki_p_admin_categories eq 'y'} <div class="pull-right"> <a class="btn btn-default btn-sm tips" href="tiki-admin_categories.php" title=":{tr}Admin Categories{/tr}"> - {icon name="administer"} {tr}Categories{/tr} + {icon name="cog"} {tr}Categories{/tr} </a> </div> {/if} @@ -44,7 +44,7 @@ {if $tiki_p_admin_categories eq 'y'} <div class="pull-right"> <a class="btn btn-default btn-sm tips" href="tiki-admin_categories.php" title=":{tr}Admin Categories{/tr}"> - {icon name="administer"} {tr}Categories{/tr} + {icon name="cog"} {tr}Categories{/tr} </a> </div> {/if} Modified: trunk/templates/modules/mod-quickadmin.tpl =================================================================== --- trunk/templates/modules/mod-quickadmin.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/modules/mod-quickadmin.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -45,12 +45,12 @@ </li> <li> <a href="tiki-admin.php"> - {icon name="administer"} {tr}Control panels{/tr} + {icon name="cog"} {tr}Control panels{/tr} </a> </li> <li> <a href="tiki-admin.php?page=look"> - {icon name="theme"} {tr}Themes{/tr} + {icon name="image"} {tr}Themes{/tr} </a> </li> <li> Modified: trunk/templates/prefs/shared-flags.tpl =================================================================== --- trunk/templates/prefs/shared-flags.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/prefs/shared-flags.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -18,7 +18,7 @@ <span class="pref-reset-wrapper"> <input class="pref-reset system" type="checkbox" name="lm_reset[]" value="{$p.preference|escape}" style="display:none" data-preference-default="{if is_array($p.default)}{$p.default|implode:$p.separator|escape}{else}{$p.default|escape}{/if}"> <a href="#" class="pref-reset-undo tips" title="{tr}Reset{/tr}|{tr}Reset to default value{/tr}">{icon name="undo"}</a> - <a href="#" class="pref-reset-redo tips" title="{tr}Restore{/tr}|{tr}Restore current value{/tr}" style="display:none">{icon name="redo"}</a> + <a href="#" class="pref-reset-redo tips" title="{tr}Restore{/tr}|{tr}Restore current value{/tr}" style="display:none">{icon name="repeat"}</a> </span> {/if} Modified: trunk/templates/sent_newsletters.tpl =================================================================== --- trunk/templates/sent_newsletters.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/sent_newsletters.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -65,7 +65,7 @@ {if ($channels[user].tiki_p_send_newsletters eq 'y') or ($channels[user].tiki_p_admin_newsletters eq 'y')} {if $view_editions eq 'y'} {$libeg}<a href="tiki-send_newsletters.php?nlId={$channels[user].nlId}&editionId={$channels[user].editionId}&resend=1"> - {icon name='redo' _menu_text='y' _menu_icon='y' alt="{tr}Resend newsletter{/tr}"} + {icon name='repeat' _menu_text='y' _menu_icon='y' alt="{tr}Resend newsletter{/tr}"} </a>{$liend} {else} {$libeg}<a class="tips" title="{tr}Send Newsletter{/tr}" href="tiki-send_newsletters.php?nlId={$channels[user].nlId}&editionId={$channels[user].editionId}"> Modified: trunk/templates/tiki-browse_gallery.tpl =================================================================== --- trunk/templates/tiki-browse_gallery.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/tiki-browse_gallery.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -200,7 +200,7 @@ {/if} {if $imagerotate} {$libeg}<a class="gallink" href="{$galleryId|sefurl:gallery:with_next}rotateright={$item.imageId}" title="{tr}rotate right{/tr}"> - {icon name='redo' _menu_text='y' _menu_icon='y' alt="{tr}Rotate{/tr}"} + {icon name='repeat' _menu_text='y' _menu_icon='y' alt="{tr}Rotate{/tr}"} </a>{$liend} {/if} {$libeg}<a class="gallink" href="tiki-edit_image.php?galleryId={$galleryId}&edit={$item.imageId}"> Modified: trunk/templates/tiki-browse_image.tpl =================================================================== --- trunk/templates/tiki-browse_image.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/tiki-browse_image.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -89,7 +89,7 @@ </a> {* --- toggle cyclic --- *} <a class="tips" title=":{tr}Repeat{/tr}" href="javascript:thepix.toggle('toTheEnd')"> - {icon name='redo'} + {icon name='repeat'} </a> {* --- toggle back/forward --- *} <a class="tips" title=":{tr}Direction{/tr}" href="javascript:thepix.toggle('backward')"> Modified: trunk/templates/tiki-edit_article.tpl =================================================================== --- trunk/templates/tiki-edit_article.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/tiki-edit_article.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -60,7 +60,7 @@ {if $tiki_p_admin_cms eq 'y'} <span class="col-sm-3"> <a href="tiki-admin_topics.php" class="btn btn-default"> - {icon name="administer"} {tr}Article Topics{/tr} + {icon name="cog"} {tr}Article Topics{/tr} </a> </span> {/if} @@ -77,7 +77,7 @@ {if $tiki_p_admin_cms eq 'y'} <span class="col-sm-3"> <a href="tiki-article_types.php" class="btn btn-default"> - {icon name="administer"} {tr}Article Types{/tr} + {icon name="cog"} {tr}Article Types{/tr} </a> </span> {/if} Modified: trunk/templates/tiki-editpage.tpl =================================================================== --- trunk/templates/tiki-editpage.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/tiki-editpage.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -291,7 +291,7 @@ </div> {if $tiki_p_edit_content_templates eq 'y'} <a href="tiki-admin_content_templates.php" class="btn btn-default" onclick="needToConfirm = true;"> - {icon name="administer"} {tr}Admin Content Templates{/tr} + {icon name="cog"} {tr}Admin Content Templates{/tr} </a> {/if} </div> @@ -487,7 +487,7 @@ {if $tiki_p_edit_structures eq 'y'} <a href="tiki-admin_structures.php" class="btn btn-default"> - {icon name="administer"} {tr}Manage structures{/tr} + {icon name="cog"} {tr}Manage structures{/tr} </a> {/if} </div> @@ -692,7 +692,7 @@ <label for="" class="col-sm-2 control-label">{tr}Wiki preferences{/tr}</label> <div class="col-sm-10"> <a href="tiki-admin.php?page=wiki" class="btn btn-default"> - {icon name="administer"} {tr}Admin Wiki Preferences{/tr} + {icon name="cog"} {tr}Admin Wiki Preferences{/tr} </a> </div> </div> Modified: trunk/templates/tiki-list_trackers.tpl =================================================================== --- trunk/templates/tiki-list_trackers.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/tiki-list_trackers.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -41,7 +41,7 @@ </div> {if $prefs.tracker_remote_sync eq 'y'} <a class="btn btn-default" href="{service controller=tracker_sync action=clone_remote}"> - {icon name="clone"} {tr}Clone remote{/tr} + {icon name="copy"} {tr}Clone remote{/tr} </a> {/if} </div> Modified: trunk/templates/tracker_actions.tpl =================================================================== --- trunk/templates/tracker_actions.tpl 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/templates/tracker_actions.tpl 2015-06-28 04:03:57 UTC (rev 55779) @@ -7,7 +7,7 @@ {icon name="settings"} {tr}Properties{/tr} </a> <a class="btn btn-default" href="tiki-admin_tracker_fields.php?trackerId={$trackerId|escape}"> - {icon name="trackerfields"} {tr}Fields{/tr} + {icon name="th-list"} {tr}Fields{/tr} </a> {/if} Modified: trunk/themes/base_files/iconsets/default.php =================================================================== --- trunk/themes/base_files/iconsets/default.php 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/themes/base_files/iconsets/default.php 2015-06-28 04:03:57 UTC (rev 55779) @@ -173,12 +173,7 @@ 'admin_wysiwyg' => array( 'id' => 'file-text', ), - 'administer' => array( - 'id' => 'cog', - ), - 'articles' => array( - 'id' => 'newspaper-o', - ), + //arrow-up in defaults 'attach' => array( 'id' => 'paperclip', ), @@ -191,30 +186,25 @@ 'backlink' => array( 'id' => 'reply', ), + //backward in defaults 'backward_step' => array( 'id' => 'step-backward', ), - 'cache' => array( - 'id' => 'trash-o', - ), - 'change' => array( - 'id' => 'edit', - ), + //ban in defaults + //caret-left & caret-right in defaults 'chart' => array( 'id' => 'area-chart', ), 'check' => array( 'id' => 'check-square-o', ), - 'clone' => array( - 'id' => 'clipboard', - ), 'code_file' => array( 'id' => 'file', ), 'collapsed' => array( 'id' => 'plus-square-o', ), + //columns in defaults 'comments' => array( 'id' => 'comments-o', ), @@ -224,6 +214,7 @@ 'contacts' => array( 'id' => 'group', ), + //copy in defaults 'create' => array( 'id' => 'plus', ), @@ -239,20 +230,15 @@ 'down' => array( 'id' => 'sort-desc', ), - 'ellipsis' => array( - 'id' => 'ellipsis-h', - ), - 'enable' => array( - 'id' => 'check-square', - ), + //edit in defaults 'envelope' => array( 'id' => 'envelope-o', ), 'error' => array( 'id' => 'exclamation-circle', ), - 'events' => array( - 'id' => 'clock-o', + 'excel' => array( + 'id' => 'file-excel-o', ), 'expanded' => array( 'id' => 'minus-square-o', @@ -260,27 +246,29 @@ 'export' => array( 'id' => 'download', ), - 'excel' => array( - 'id' => 'file-excel-o', - ), + //facebook in defaults 'file' => array( 'id' => 'file-o', ), - 'forward_step' => array( - 'id' => 'step-forward', - ), 'file-archive' => array( 'id' => 'folder', ), 'file-archive-open' => array( 'id' => 'folder-open', ), + //filter in defaults + //flag in defaults 'floppy' => array( 'id' => 'floppy-o', ), + //forward in defaults + 'forward_step' => array( + 'id' => 'step-forward', + ), 'help' => array( 'id' => 'question-circle', ), + //history in defaults 'image' => array( 'id' => 'file-image-o', ), @@ -293,9 +281,12 @@ 'information' => array( 'id' => 'info-circle', ), + //link in defaults 'link-external' => array( 'id' => 'external-link', ), + //list in defaults + //lock in defaults //same fa icon used for admin_security, but not the same in other icon sets 'log' => array( 'id' => 'history', @@ -318,12 +309,13 @@ 'merge' => array( 'id' => 'random', ), + //minus in defaults + 'module' => array( + 'id' => 'cogs', + ), 'more' => array( 'id' => 'ellipsis-h', ), - 'module' => array( - 'id' => 'cogs', - ), 'move' => array( 'id' => 'exchange', ), @@ -342,12 +334,14 @@ 'ok' => array( 'id' => 'check-circle', ), + //pause in defaults 'pdf' => array( 'id' => 'file-pdf-o', ), 'permission' => array( 'id' => 'key', ), + //play in defaults 'plugin' => array( 'id' => 'puzzle-piece', ), @@ -363,30 +357,36 @@ 'previous' => array( 'id' => 'arrow-left', ), + //print in defaults 'ranking' => array( 'id' => 'sort-numeric-asc', ), - 'redo' => array( - 'id' => 'repeat', - ), - 'remove' => array( - 'id' => 'times', - ), + //refresh in defaults + //remove in defaults + //repeat in defaults + //rss in defaults 'screencapture' => array( 'id' => 'camera', ), + //search in defaults + //send in defaults 'settings' => array( 'id' => 'wrench', ), + //share in defaults 'sharethis' => array( 'id' => 'share-alt', ), + //sort in defaults 'sort-down' => array( 'id' => 'sort-desc', ), 'sort-up' => array( 'id' => 'sort-asc', ), + //star in defaults + //star-half in defaults + //stop in defaults 'stop-watching' => array( 'id' => 'eye-slash', ), @@ -396,42 +396,37 @@ 'success' => array( 'id' => 'check', ), + //tag in defaults + //tags in defaults 'textfile' => array( 'id' => 'file-text-o', ), - 'theme' => array( - 'id' => 'image', - ), + //th-list in defaults 'themegenerator' => array( 'id' => 'paint-brush', ), 'three-d' => array( 'id' => 'cube', ), - 'toggle-down' => array( - 'id' => 'toggle-down', + //thumbs-up in defaults + 'toggle-off' => array( + 'id' => 'toggle-off', ), 'toggle-on' => array( 'id' => 'toggle-on', ), - 'toggle-off' => array( - 'id' => 'toggle-off', - ), - 'toggle-right' => array( - 'id' => 'toggle-right', - ), 'trackers' => array( 'id' => 'database', ), - 'trackerfields' => array( - 'id' => 'th-list', - ), 'translate' => array( 'id' => 'language', ), 'trash' => array( 'id' => 'trash-o', ), + //twitter in defaults + //undo in defaults + //unlock in defaults 'up' => array( 'id' => 'sort-asc', ), Modified: trunk/themes/base_files/iconsets/glyphicons.php =================================================================== --- trunk/themes/base_files/iconsets/glyphicons.php 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/themes/base_files/iconsets/glyphicons.php 2015-06-28 04:03:57 UTC (rev 55779) @@ -25,6 +25,7 @@ 'add' => array( 'id' => 'plus-sign', ), + //arrow-up in defaults 'attach' => array( 'id' => 'paperclip', ), @@ -34,12 +35,19 @@ 'back' => array( 'id' => 'arrow-left', ), + 'backlink' => array( + 'id' => 'new-window', + ), + //backward in defaults 'backward_step' => array( 'id' => 'step-backward', ), 'ban' => array( 'id' => 'ban-circle', ), + 'bug' => array( + 'id' => 'alert', + ), 'caret-left' => array( 'id' => 'triangle-left', ), @@ -70,6 +78,9 @@ 'contacts' => array( 'id' => 'user', ), + 'copy' => array( + 'id' => 'duplicate', + ), 'create' => array( 'id' => 'plus', ), @@ -85,12 +96,8 @@ 'down' => array( 'id' => 'arrow-down', ), - 'ellipsis' => array( - 'id' => 'option-horizontal', - ), - 'enable' => array( - 'id' => 'ok-sign', - ), + //edit in defaults + //envelope in defaults 'error' => array( 'id' => 'exclamation-sign', ), @@ -100,24 +107,29 @@ 'expanded' => array( 'id' => 'collapse-down', ), + //export in defaults 'facebook' => array( 'id' => 'thumbs-up', ), - 'file' => array( - 'id' => 'file', - ), - 'forward_step' => array( - 'id' => 'step-forward', - ), + //file in defaults 'file-archive' => array( 'id' => 'folder-close', ), 'file-archive-open' => array( 'id' => 'folder-open', ), + //filter in defaults + //flag in defaults 'floppy' => array( 'id' => 'floppy-save', ), + //forward in defaults + 'forward_step' => array( + 'id' => 'step-forward', + ), + 'group' => array( + 'id' => 'user', + ), 'help' => array( 'id' => 'question-sign', ), @@ -127,9 +139,19 @@ 'image' => array( 'id' => 'picture', ), + //import in defaults + 'index' => array( + 'id' => 'refresh', + ), 'information' => array( 'id' => 'info-sign', ), + //link in defaults + 'link-external' => array( + 'id' => 'share', + ), + //list in defaults + //lock in defaults 'log' => array( 'id' => 'list-alt', ), @@ -142,33 +164,47 @@ 'mailbox' => array( 'id' => 'inbox', ), + 'menu' => array( + 'id' => 'menu-hamburger', + ), 'menuitem' => array( 'id' => 'chevron-right', ), 'merge' => array( 'id' => 'random', ), - 'module' => array( + //minus in defaults + 'module' => array( 'id' => 'cog', ), 'more' => array( 'id' => 'option-horizontal', ), + //move in defaults 'next' => array( 'id' => 'arrow-right', ), + 'notepad' => array( + 'id' => 'file', + ), 'notification' => array( 'id' => 'bell', ), + //off in defaults 'ok' => array( 'id' => 'ok-sign', ), + //pause in defaults 'pdf' => array( 'id' => 'file', ), 'permission' => array( 'id' => 'lock', ), + //play in defaults + 'plugin' => array( + 'id' => 'briefcase', + ), 'popup' => array( 'id' => 'list-alt', ), @@ -181,48 +217,81 @@ 'previous' => array( 'id' => 'arrow-left', ), + //print in defaults 'ranking' => array( 'id' => 'sort-by-order', ), + //refresh in defaults + //remove in defaults + //repeat in defaults 'rss' => array( 'id' => 'bullhorn', ), 'screencapture' => array( 'id' => 'camera', ), + //search in defaults + //send in defaults 'settings' => array( 'id' => 'wrench', ), + //share in defaults 'sharethis' => array( 'id' => 'share-alt', ), + //sort in defaults + 'sort-down' => array( + 'id' => 'sort-by-alphabet-alt', + ), 'sort-up' => array( 'id' => 'sort-by-alphabet', ), - 'sort-down' => array( - 'id' => 'sort-by-alphabet-alt', - ), + //star in defaults 'star-half' => array( 'id' => 'star-empty', ), + //stop in defaults 'stop-watching' => array( 'id' => 'eye-close', ), + 'structure' => array( + 'id' => 'tree-conifer', + ), 'success' => array( 'id' => 'ok', ), + //tag in defaults + //tags in defaults 'textfile' => array( 'id' => 'file', ), + //th-list in defaults + 'themegenerator' => array( + 'id' => 'picture', + ), 'three-d' => array( 'id' => 'road', ), + //thumbs-up in defaults + 'toggle-off' => array( + 'id' => 'stop', + ), + 'toggle-on' => array( + 'id' => 'play', + ), + 'trackers' => array( + 'id' => 'tasks', + ), 'translate' => array( 'id' => 'globe', ), + //trash in defaults 'twitter' => array( 'id' => 'retweet', ), + 'undo' => array( + 'id' => 'arrow-left', + ), //use a better unlock icon when available 'unlock' => array( 'id' => 'folder-open', @@ -242,6 +311,12 @@ 'watch' => array( 'id' => 'eye-open', ), + 'watch-group' => array( + 'id' => 'eye-open', + ), + 'wizard' => array( + 'id' => 'flash', + ), 'word' => array( 'id' => 'file', ), Modified: trunk/themes/base_files/iconsets/legacy.php =================================================================== --- trunk/themes/base_files/iconsets/legacy.php 2015-06-28 04:03:19 UTC (rev 55778) +++ trunk/themes/base_files/iconsets/legacy.php 2015-06-28 04:03:57 UTC (rev 55779) @@ -188,15 +188,15 @@ 'admin_wysiwyg' => array( 'id' => 'large/wysiwyg', ), - 'administer' => array( - 'id' => 'wrench', - ), 'arrow-up' => array( 'id' => 'arrow-up', ), 'attach' => array( 'id' => 'attach', ), + 'audio' => array( + 'id' => 'bell', + ), 'back' => array( 'id' => 'arrow_left', ), @@ -212,24 +212,13 @@ 'ban' => array( 'id' => 'cancel', ), - 'bug' => array( - 'id' => 'bug', - ), - 'cache' => array( - 'id' => 'database_refresh', - ), - 'calendar' => array( - 'id' => 'calendar', - ), + //bug in defaults 'caret-left' => array( 'id' => 'resultset_previous', ), 'caret-right' => array( 'id' => 'resultset_next', ), - 'change' => array( - 'id' => 'pencil', - ), 'chart' => array( 'id' => 'chart_curve', ), @@ -237,18 +226,18 @@ 'id' => 'select', 'append' => '.gif' ), - 'code' => array( + 'code_file' => array( 'id' => 'page_white_code', ), 'cog' => array( 'id' => 'wrench', ), + 'collapsed' => array( + 'id' => 'bullet_toggle_plus', + ), 'columns' => array( 'id' => 'text_columns', ), - 'collapsed' => array( - 'id' => 'bullet_toggle_plus', - ), 'comments' => array( 'id' => 'comments', 'size' => 1, @@ -301,12 +290,6 @@ 'edit' => array( 'id' => 'page_edit', ), - 'ellipsis' => array( - 'id' => 'resultset_down', - ), - 'enable' => array( - 'id' => 'accept', - ), 'envelope' => array( 'id' => 'email', 'size' => 1, @@ -319,6 +302,9 @@ 'error' => array( 'id' => 'exclamation', ), + 'excel' => array( + 'id' => 'mime/xls', + ), 'expanded' => array( 'id' => 'bullet_toggle_minus', ), @@ -334,6 +320,9 @@ ) ) ), + 'file' => array( + 'id' => 'page', + ), 'file-archive' => array( 'id' => 'folder', ), @@ -355,21 +344,14 @@ 'forward_step' => array( 'id' => 'control_end', ), - 'group' => array( - 'id' => 'group', - ), - 'group-watch' => array( - 'id' => 'eye_group', - ), - 'help' => array( - 'id' => 'help', - ), + //help in defaults 'history' => array( 'id' => 'clock', ), 'home' => array( 'id' => 'house', ), + //image in defaults 'import' => array( 'id' => 'upload', ), @@ -442,6 +424,9 @@ 'notification' => array( 'id' => 'announce', ), + 'off' => array( + 'id' => 'delete', + ), 'ok' => array( 'id' => 'accept', ), @@ -457,15 +442,16 @@ 'play' => array( 'id' => 'control_play', ), - 'plugin' => array( - 'id' => 'plugin', - ), + //plugin in defaults 'popup' => array( 'id' => 'application_view_columns', ), 'post' => array( 'id' => 'pencil_add', ), + 'powerpoint' => array( + 'id' => 'mime/ppt', + ), 'previous' => array( 'id' => 'arrow_left', ), @@ -481,6 +467,9 @@ 'remove' => array( 'id' => 'cross', ), + 'repeat' => array( + 'id' => 'arrow_redo', + ), 'rss' => array( 'id' => 'feed', ), @@ -552,8 +541,8 @@ 'textfile' => array( 'id' => 'page', ), - 'theme' => array( - 'id' => 'image', + 'th-list' => array( + 'id' => 'text_list_bullets', ), 'themegenerator' => array( 'id' => 'palette', @@ -570,6 +559,9 @@ 'toggle-on' => array( 'id' => 'delete', ), + 'trackers' => array( + 'id' => 'database', + ), 'translate' => array( 'id' => 'world_edit', ), @@ -594,8 +586,8 @@ 'up' => array( 'id' => 'resultset_up', ), - 'user' => array( - 'id' => 'user', + 'video' => array( + 'id' => 'mime/mpg', ), 'view' => array( 'id' => 'magnifier', @@ -612,10 +604,22 @@ 'wizard' => array( 'id' => 'wizard16x16', ), - 'wizard_admin' => array( - 'id' => 'large/wizard48x48', - 'size' => 3 + 'word' => array( + 'id' => 'mime/doc', ), + 'zip' => array( + 'id' => 'mime/zip', + ), ), + 'defaults' => array( + 'bug', + 'calendar', + 'group', + 'help', + 'image', + 'plugin', + 'user', + 'wrench', + ) ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |