Item2464: add Silk Companions 2 by http://www.cagintranet.com/

git-svn-id: http://svn.foswiki.org/trunk@5725 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

FamFamFamContrib/data/System/FamFamFamContrib.txt

@@ -41,19 +41,22 @@ by setting =ICONTOPIC= on your %USERSWEB%.SitePreferences, and enabling the Docu
    * <img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamMintIcons/sound_grey.png" alt="sound_grey.ong" title="sound_grey.ong" /> (=&lt;img src="%<nop>PUBURLPATH%/%SYSTEMWEB%/FamFamFamMintIcons/sound_grey.png" /&gt;=)
 
 ---+++ Flags preview FamFamFamFlagIcons
-<img src="%ATTACHURLPATH%/flags-preview.jpg" alt="flags-preview.jpg" width='320' height='120' />
+<img src="%ATTACHURLPATH%/flags-preview.jpg" alt="flags-preview.jpg" />
 
 ---+++ Mini preview FamFamFamMiniIcons
-<img src="%ATTACHURLPATH%/mini-preview.jpg" alt="mini-preview.jpg" width='320' height='120' />
+<img src="%ATTACHURLPATH%/mini-preview.jpg" alt="mini-preview.jpg"  />
 
 ---+++ Mint preview FamFamFamMintIcons  
-<img src="%ATTACHURLPATH%/mint-preview.jpg" alt="mint-preview.jpg" width='320' height='120' />
+<img src="%ATTACHURLPATH%/mint-preview.jpg" alt="mint-preview.jpg"  />
 
 ---+++ Silk preview FamFamFamSilkIcons
-<img src="%ATTACHURLPATH%/silk-preview.jpg" alt="silk-preview.jpg" width='320' height='240' />
+<img src="%ATTACHURLPATH%/silk-preview.jpg" alt="silk-preview.jpg"  />
 
 ---+++ Silk preview FamFamFamSilkCompanion1Icons
-<img src="%PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion1Icons/SilkCompanion1Thumb.png" alt="SilkCompanion1Thumb.png" width='320' height='240' />
+<img src="%PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion1Icons/SilkCompanion1Thumb.png" alt="SilkCompanion1Thumb.png"  />
+
+---+++ Silk preview FamFamFamSilkCompanion2Icons
+<img src="%PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion2Icons/silk-companion-II.png" alt="silk-companion-II.png"  />
 
 ---++ Installation Instructions
 
@@ -64,10 +67,11 @@ by setting =ICONTOPIC= on your %USERSWEB%.SitePreferences, and enabling the Docu
 
 |  Icons Creator: | Icons by Mark James http://www.famfamfam.com |
 |  Contrib Author(s): | Foswiki packaging by Sven Dowideit - SvenDowideit@fosiki.com a [[http://WikiRing.com][WikiRing]] founding partner |
-|  Copyright: | &copy; Mark James http://www.famfamfam.com and Damien Guard http://damieng.com |
+|  Copyright: | &copy; Mark James http://www.famfamfam.com and Damien Guard http://damieng.com and Chris Cagle http://www.cagintranet.com/ |
 |  License: | [[http://creativecommons.org/licenses/by/2.5/][Creative Commons Attribution 2.5 License]] |
 |  Contrib Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  Dec 2009: | add FamFamFamGraphics topic to allow replacement of ICONTOPIC, and add Silk Companion 2 icons by Chris Cagle | 
 |  2 Aug 2009: | add a view template to allow us to use famfamfam icons for the top toolbar |
 |  21 Jan 2009: | added Silk Companion 1 icons by Damien Guard |
 |  26 Nov 2008: | compatibility Foswiki |

FamFamFamContrib/data/System/FamFamFamGraphics.txt

@@ -161,8 +161,8 @@ Other usage: [[%TOPIC%#Usage_extended][see below]].
 | choice-cancel | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/cancel.png | Cancel |  =%<nop>ICON{choice-cancel}%= |
 | choice-no | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/accept.png | No |  =%<nop>ICON{choice-no}%= |
 | choice-yes | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion1Icons/decline.png | Yes / Done | =%<nop>Y%=,  =%<nop>ICON{choice-yes}%= |
-| unchecked | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion1Icons/control_blank.png | Unchecked checkbox |  =%<nop>ICON{unchecked}%= |
-| checked | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion1Icons/control_record.png | Checked checkbox |  =%<nop>ICON{checked}%= |
+| unchecked | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion2Icons/check-unchecked.png | Unchecked checkbox |  =%<nop>ICON{unchecked}%= |
+| checked | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkCompanion2Icons/check-checked-green.png | Checked checkbox |  =%<nop>ICON{checked}%= |
 | flag | %PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/flag_blue.png | Flag |  =%<nop>ICON{flag}%= |
 | flag-gray | %PUBURL%/%SYSTEMWEB%/FamFamFamFoswikiExtras/flag_gray.png | Gray flag |  =%<nop>ICON{flag-gray}%= |
 | lag-gray-small | %PUBURL%/%SYSTEMWEB%/FamFamFamFoswikiExtras/flag_gray_small.png | Small gray flag, 13x13 | =&lt;img src="%<nop>ICONURL{flag-gray-small}%" width="13" height="13" alt="Flag" border="0" /&gt;= |

FamFamFamContrib/data/System/FamFamFamSilkCompanion2Icons.txt

@@ -0,0 +1,27 @@
+%META:TOPICINFO{author="ProjectContributor" date="1223909088" format="1.1" version="$Rev$"}%
+---+ %TOPIC%
+
+Mark James created a great set of 1,022 silky-smooth 16x16 true-colour 
+icons in PNG format, aptly named [[FamFamFamSilkIcons][Silk Icons]].
+
+Introducing the Silk Companion II Icon Pack. 
+While developing a new CKEditor skin for GetSimple, I had a need for some extra Silk icons developed by Mark James at FamFamFam. 
+Out came 64 new silk-inspired icons. These icons are released under the same Creative Commons Attribution 3.0 License as the originals. 
+
+---++ License
+This work is published under the
+ [[http://creativecommons.org/licenses/by/2.5/][Creative Commons Attribution 2.5 License]] by Damien Guard.
+
+---++ Source
+These Icons come from http://www.cagintranet.com/archive/download-famfamfam-silk-companion-2-icon-pack/
+
+[[%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkCompanion1Icons/readme_companion.txt][readme_companion (txt)]]
+
+---++ Icons
+<div style="overflow:auto;padding:5px;border:1px solid #ddd">
+<img src="%ATTACHURLPATH%/silk-companion-II.png" alt="index_abc.png" />
+</div>
+
+See also: FamFamFamContrib, FamFamFamSilkIcons, FamFamFamFlagIcons, FamFamFamMiniIcons, FamFamFamMintIcons
+
+%META:FILEATTACHMENT{name="silk-companion-II.png" attachment="silk-companion-II.png" attr="h"  user="ProjectContributor" version="1"}%

FamFamFamContrib/lib/Foswiki/Contrib/FamFamFamContrib/MANIFEST

@@ -10,6 +10,7 @@ data/System/FamFamFamSilkIcons.txt
 data/System/FamFamFamMintIcons.txt
 data/System/FamFamFamMiniIcons.txt
 data/System/FamFamFamSilkCompanion1Icons.txt
+data/System/FamFamFamSilkCompanion2Icons.txt
 
 data/System/FamFamFamGraphics.txt
 
@@ -1903,6 +1904,73 @@ pub/System/FamFamFamSilkCompanion1Icons/sound_high.png
 pub/System/FamFamFamSilkCompanion1Icons/border_draw.png
 pub/System/FamFamFamSilkCompanion1Icons/cake_out.png
 
+pub/System/FamFamFamSilkCompanion2Icons/select-multiple-add.png
+pub/System/FamFamFamSilkCompanion2Icons/check-checked-gray.png
+pub/System/FamFamFamSilkCompanion2Icons/chart-ltr-bar-delete.png
+pub/System/FamFamFamSilkCompanion2Icons/radio-checked_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/check-unchecked.png
+pub/System/FamFamFamSilkCompanion2Icons/check-checked-green_add.png
+pub/System/FamFamFamSilkCompanion2Icons/select-multiple.png
+pub/System/FamFamFamSilkCompanion2Icons/select-multiple-delete.png
+pub/System/FamFamFamSilkCompanion2Icons/add_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/select-delete.png
+pub/System/FamFamFamSilkCompanion2Icons/radio-checked.png
+pub/System/FamFamFamSilkCompanion2Icons/package_rename.png
+pub/System/FamFamFamSilkCompanion2Icons/table-row-add.png
+pub/System/FamFamFamSilkCompanion2Icons/check-checked-gray_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/font_green.png
+pub/System/FamFamFamSilkCompanion2Icons/border_delete_all.png
+pub/System/FamFamFamSilkCompanion2Icons/font_gray.png
+pub/System/FamFamFamSilkCompanion2Icons/text-replace.png
+pub/System/FamFamFamSilkCompanion2Icons/radio-unchecked_add.png
+pub/System/FamFamFamSilkCompanion2Icons/picture-measurement.png
+pub/System/FamFamFamSilkCompanion2Icons/check-checked-green.png
+pub/System/FamFamFamSilkCompanion2Icons/map-measurement.png
+pub/System/FamFamFamSilkCompanion2Icons/font_highlight_edit.png
+pub/System/FamFamFamSilkCompanion2Icons/application-font.png
+pub/System/FamFamFamSilkCompanion2Icons/page_white_edit.png
+pub/System/FamFamFamSilkCompanion2Icons/silk-companion-II.png
+pub/System/FamFamFamSilkCompanion2Icons/color-swatch-background.png
+pub/System/FamFamFamSilkCompanion2Icons/radio-unchecked.png
+pub/System/FamFamFamSilkCompanion2Icons/check-unchecked_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/chart-ltr-bar-add.png
+pub/System/FamFamFamSilkCompanion2Icons/image-button.png
+pub/System/FamFamFamSilkCompanion2Icons/selection-red.png
+pub/System/FamFamFamSilkCompanion2Icons/bullet-cog.png
+pub/System/FamFamFamSilkCompanion2Icons/plus_minus.png
+pub/System/FamFamFamSilkCompanion2Icons/page_white_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/font_red.png
+pub/System/FamFamFamSilkCompanion2Icons/select-edit.png
+pub/System/FamFamFamSilkCompanion2Icons/chart-ltr-bar.png
+pub/System/FamFamFamSilkCompanion2Icons/font_highlight_add.png
+pub/System/FamFamFamSilkCompanion2Icons/radio-unchecked_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/border_edit_all.png
+pub/System/FamFamFamSilkCompanion2Icons/selection-blue.png
+pub/System/FamFamFamSilkCompanion2Icons/clipboard_empty.png
+pub/System/FamFamFamSilkCompanion2Icons/table-lock.png
+pub/System/FamFamFamSilkCompanion2Icons/lightbox.png
+pub/System/FamFamFamSilkCompanion2Icons/clipboard_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/selection-green.png
+pub/System/FamFamFamSilkCompanion2Icons/page_white_error.png
+pub/System/FamFamFamSilkCompanion2Icons/table_edit_cell.png
+pub/System/FamFamFamSilkCompanion2Icons/font_highlight.png
+pub/System/FamFamFamSilkCompanion2Icons/layout-measurement.png
+pub/System/FamFamFamSilkCompanion2Icons/select-add.png
+pub/System/FamFamFamSilkCompanion2Icons/bullets_black.png
+pub/System/FamFamFamSilkCompanion2Icons/table-repair.png
+pub/System/FamFamFamSilkCompanion2Icons/arrows_up_down.png
+pub/System/FamFamFamSilkCompanion2Icons/check-checked-gray_add.png
+pub/System/FamFamFamSilkCompanion2Icons/check-unchecked_add.png
+pub/System/FamFamFamSilkCompanion2Icons/font_highlight_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/select.png
+pub/System/FamFamFamSilkCompanion2Icons/check-checked-green_delete.png
+pub/System/FamFamFamSilkCompanion2Icons/chart-ltr-bar-edit.png
+pub/System/FamFamFamSilkCompanion2Icons/picture_caption.png
+pub/System/FamFamFamSilkCompanion2Icons/photo-crop.png
+pub/System/FamFamFamSilkCompanion2Icons/radio-checked_add.png
+pub/System/FamFamFamSilkCompanion2Icons/select-multiple-edit.png
+
+
 pub/System/FamFamFamFoswikiExtras/bullet_find.png
 pub/System/FamFamFamFoswikiExtras/package_find.png
 pub/System/FamFamFamFoswikiExtras/tag_find.png