From db90027206bbdefdbd6560ccb9cf8d8a06389a13 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sat, 17 Jul 2010 23:26:42 +0000
Subject: [PATCH] clean up last duplicate icons

git-svn-id: http://www.observium.org/svn/observer/trunk@1394 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/os/asa.png                   | Bin 850 -> 0 bytes
 html/images/os/cat1900.png               |   1 -
 html/images/os/{jetdirect.png => hp.png} | Bin
 html/images/os/procurve.png              | Bin 1634 -> 0 bytes
 includes/static-config.php               |   8 ++++++++
 5 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 html/images/os/asa.png
 delete mode 120000 html/images/os/cat1900.png
 rename html/images/os/{jetdirect.png => hp.png} (100%)
 delete mode 100755 html/images/os/procurve.png

diff --git a/html/images/os/asa.png b/html/images/os/asa.png
deleted file mode 100644
index 19a35e0c07128afbb3760e50b825ea50068e3ba5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 850
zcmV-Y1FigtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@Gd8K`;w1n80>eo}K~z{r?UXxcQ&AYl?;}Y~)YJ#4wTky9
zX`?N4tcsvFsZV_LCJx$4afqOxbP*hVY~r9$ba!y<<YMhoLB)fMgNsyfk)ooa4nDBh
z`nxBmY2G9e)ZqsH`M&c#|K~ejqG|repMXDs|9Jv|bT+D|GTBx+8mUYML|e_*G{?<=
zd9b9}B4#?<rgDdx&0UQD0|JtCp8Sc13BY;<2@{NMy-X@2z;hhd9rtF<f{r_e|A@*h
zAwbOzd=vCoU7L{OCKT)bY6S3I0@HN}Ov{)&`O*nEZojJCSCS8_Dd4E2<_I|MMRG3}
z3VP%kB)~LxfrlQ`uOQbVfpK!jTOlBOdOO0`bC?|PiXhi;o<YWI>_CniPcAeh?mFii
zMd$nEpQ`o*#Kwr7VHY}8ul>ZnsK20&>#BEaYj~4YAdS4A;T$;DY;GYwIB+yVp@CKl
zaO)I^w3`2K@`Mp<7n-#f>;$IA0=WZhSYRX!JIVQw(5;?gmgII}KPYs2^I~kw;Jgj{
zKJwb@-in~z;4_$4kbg+%-@yf`>((&(FYpFT6&h*Q80R^a_gKc#kn@wGdY{m%KdA^O
z4V<sRGZ=3{CXwL^0-ALj-#dJpkb0h!omNe*(X@keugbfM{Rg%|Y(0>Fs(Kg|lfbc7
z6&WpemP|miwsU?fZ>!sPM7Uc=KQD95_^Og8(X2`A4~nLgQ$5yI5-?){oFBch3NyBx
z_l%$i%O@bup+tz=T#?0eI}Qf(x-}}Iy*f8usq$`N|3bY!Y)jGafe#{>2vpq#3XKpj
z3w|nDxdWQz6&2t;cnLxx5I2!`)$P6^AE|xmM1Q61Ufo%G3@dU`^zO<@7`C^`r@=|4
zApd~Sj{~{!$gSWk7@<I6tGS`h1omJ*hfEd5uG`D74S_SnbQL{Ei257r{wjQ@KLLLN
ce`5l_0e-1WP2*UJJ^%m!07*qoM6N<$f;wq`AOHXW

diff --git a/html/images/os/cat1900.png b/html/images/os/cat1900.png
deleted file mode 120000
index 9585b8f3d4..0000000000
--- a/html/images/os/cat1900.png
+++ /dev/null
@@ -1 +0,0 @@
-catos.png
\ No newline at end of file
diff --git a/html/images/os/jetdirect.png b/html/images/os/hp.png
similarity index 100%
rename from html/images/os/jetdirect.png
rename to html/images/os/hp.png
diff --git a/html/images/os/procurve.png b/html/images/os/procurve.png
deleted file mode 100755
index 600dc4e55ecdab395985ed0b94e0d2e46cab3ac3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1634
zcmd^8`9IqS0R58LP)ZR;k4?36ANf>Et?ML_h`5g^Mdv6rN2z11tGd=pv?CFTG>Op0
zHKk}>ElN=uM0IsjXNfDWh$NDj{vCUtcYNLt@5h(n>Wos9KPnFZfFjxs;eL?XUnL7V
za0CPU?jXJig*m|h;CZ*D40h?DYsDkI<2|CU#U}>Fh5)eO=%5g7^!32d5ciP4;F~e;
zLw*JTX^yKS2C3;l&~hXgcvB6%DQ12YQy;2^Jwel+VCGBZ@r7!3IeQ|pIywhzcR)NC
zouiH>D8jQf?Q@h7IDt@P=6kTBs-bd5XI4yosUuU1kSjFHKzep@m(gX4sx4j>g+K0;
zYv4uU3q(hdI0ZP4R?SjD;>2Q!sx5A7XLpvpej)hDCYOIUpfH8pdONS}LMY=07t+$&
zHhXm|x4eh&4-+0<3=e0V_Q><PRrynJfx#tm@9-DTn-x}93!)#s#Fuo<vNynXgh$0)
zS&Yu7bsyt!ul-W0HP8f)gp%-#y1LGhsE4%?*gE&bXKsm=N=UqGLd9uJ-kaVrWaQHy
zG34aD7Lizdub`u{c}VXPrL?i{tUs-=rk7g9+T7-GHn}HUh$oy$2Hq51PqIbO6J%7$
zefnEtZ}Kt6Ts0KlJ)s=pN89BK+gYF2H@6$RCw2v**4{BxR4Hp@fmqhz5??+rIyXGE
z{NnB49GkPm**a{4d(l4D#+p__;5NCtroI$xVY@1dU>9AghQeJ8Epmt{z4T|Lz86&k
zojbF@(f4|6;zNzV)+Z60Zj+jsgYzH9+4^1-WMq+5aG^3HJGY#vjKtAvSiQpw(6GXw
zJGGoG9$z3-fMvJzj7DYF2c%WcFKsBo@kbC@C*6pyzdut(;8hUWD#+|#LK$nDJL9vf
zU^Jm`gl!o__fM@#d)%_a6L==o3{A2%(75Hb&Ay>I`x~WViG=ig0F1(!`O)&L`?TGN
zCO$NXUp_RvSS%J#EpARPaGH9iblmeAI)_~27(2UyH$CHAo`780C;Q9acF|?+A7)0U
zmv(lAM;!<fiR9D7LRH)7rwKNXzo&~KxAo6_?@T=9K{oNFg<)Tv3n<vy;V0mm$7fe)
z)xB0%^J_cDbupyy2QP9f`W9E#eUnN@rk1jb+k?`cudH*!GU^pzSpwl6t%^B0w~|xV
ztzwH;vBhaQ5cc=?`Mc6ze<X}|clJ1_|4#s)1CXZxK#Ge-z%YM|1@X}UL_tob=wCvf
zc7T2TSoP~HXKOz3xZ-?K>YZ1?*UY=C#HoOVBr(E2nLG2)aC`R1eXMx;a(gyYHpC}i
z)HuEY)%o!0lzZlvK*M>>ypswp$I9r|dWZJl#zPPG537N~z%oWaO#?i27MFe~Fv^^g
zEb|N}6D~~xxo)hsEuNczt}&5J>qbz`j676V4g-K4@fsfutb`u^W)+jm3->&`b*nDY
zlrRAW?%>K-DVYOXNqb~V1ShRoPtmP)Pg;N96@9kfCa&vxTc0lam{khvi_IBWfQ~Cn
zoL)a>Qj+{xqs1bkXr-T?9BC&{)dRpu$}L>PIa?zmqWOcw@qW5k+D@KtDHfI83OZaO
z;H8JA*IX2-L;K^?D}Z~TZq?P;N7gH>lwa$)JN*^Qp^rgtBqA%byc6Nl=S#t+lKA&!
zrhaase3-t+fN-#%-ZcoDRe;DeN$9DS4Z`gbUz>NNE;;KIEMr>?wV1ijw7MaSdTH1s
zWzI7OVa?Czs6k#{`7XoZ#@*Pzeybh)FcKNWzH4jwx_A#yw|0t{gEE_LY8D6?TFlNA
zNNTH6LJaaUuKm`d>!BlZG1WFQ!-)_KhnX8JBZVG<ph|2qP5m3<%CkVS9UbR8cute=
fA;z)l&{Qda|LuC&JAX^k!3zL1(iu?+4@mzHFXzHC

diff --git a/includes/static-config.php b/includes/static-config.php
index 977d97846d..00b189e23f 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -49,6 +49,11 @@ $config['os']['ios']['text']		= "Cisco IOS";
 $config['os']['ios']['type']		= "network";
 $config['os']['ios']['ifXmcbc']         = 1;
 
+$config['os']['cat1900']['group']	= "cat1900";
+$config['os']['cat1900']['text']	= "Cisco Catalyst 1900";
+$config['os']['cat1900']['type']        = "network";
+$config['os']['cat1900']['icon']        = "catos";
+
 $config['os']['iosxe']['group']		= "ios";
 $config['os']['iosxe']['text']		= "Cisco IOS-XE";
 $config['os']['iosxe']['type']		= "network";
@@ -65,6 +70,7 @@ $config['os']['asa']['group']		= "ios";
 $config['os']['asa']['text']		= "Cisco ASA";
 $config['os']['asa']['ifname']		= 1;
 $config['os']['asa']['type']		= "firewall";
+$config['os']['asa']['icon']		= "ios";
 
 $config['os']['pix']['group'] 		= "ios";
 $config['os']['pix']['text']		= "Cisco PIX-OS";
@@ -146,6 +152,7 @@ $config['os']['windows']['ifname']	= 1;
 
 $config['os']['procurve']['text']       = "HP ProCurve";
 $config['os']['procurve']['type']       = "network";
+$config['os']['procurve']['icon']       = "hp";
 
 $config['os']['speedtouch']['text']     = "Thomson Speedtouch";
 $config['os']['speedtouch']['ifname']	= 1;
@@ -240,6 +247,7 @@ $config['os']['jetdirect']['overgraph'][]  = "device_toner";
 $config['os']['jetdirect']['overtext']     = "Toner";
 $config['os']['jetdirect']['ifname']	   = 1;
 $config['os']['jetdirect']['type']         = "printer";
+$config['os']['jetdirect']['icon']         = "hp";
 
 $config['os']['ricoh']['group'] 	   = "printer";
 $config['os']['ricoh']['text']  	   = "Ricoh Printer";