From 664c242bc8aa1bbb91fa9c1c608a59da723b78db Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 12 Jun 2010 12:07:16 +0000 Subject: [PATCH] add some new icons (better/works, bleh). add graphs/nographs display type to health. git-svn-id: http://www.observium.org/svn/observer/trunk@1145 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/css/styles.css | 4 +++ html/images/icons/cpuload.png | Bin 611 -> 0 bytes html/images/icons/{fans.png => fanspeeds.png} | Bin html/images/icons/graphs.png | Bin 0 -> 496 bytes html/images/icons/memory.png | Bin 0 -> 759 bytes html/images/icons/mempool.png | Bin 544 -> 0 bytes html/images/icons/nographs.png | Bin 0 -> 480 bytes html/images/icons/processors.png | Bin 0 -> 877 bytes .../{temperature.png => temperatures.png} | Bin html/includes/functions.inc.php | 2 +- html/includes/print-menubar.php | 4 +-- html/pages/health.php | 27 ++++++++++++++---- 12 files changed, 28 insertions(+), 9 deletions(-) delete mode 100644 html/images/icons/cpuload.png rename html/images/icons/{fans.png => fanspeeds.png} (100%) create mode 100644 html/images/icons/graphs.png create mode 100644 html/images/icons/memory.png delete mode 100644 html/images/icons/mempool.png create mode 100644 html/images/icons/nographs.png create mode 100644 html/images/icons/processors.png rename html/images/icons/{temperature.png => temperatures.png} (100%) diff --git a/html/css/styles.css b/html/css/styles.css index 4192a7b28..9400c62b3 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -828,3 +828,7 @@ color: #cc0000; float: left; } +.optionicon { + vertical-align:middle; + margin-top: -4px +} diff --git a/html/images/icons/cpuload.png b/html/images/icons/cpuload.png deleted file mode 100644 index 8734e777a1799c9a9d0293d692b3549f2506f418..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmV-p0-XJcP){lZ-v(r|Lj~5OgyaOZ2LJfeicB?^@C`JZr?Az7B z%cTZg`BR8Uk|Z%vq7ZR}iq)SDP7c%v1Bu8L;M*)gFoKYRtH+LS+(amWlo3J-J~!s*-9O61 z*EP)dJ6L0}#{PPO-3oZ}uA3-Ts8|uj3L!smu=5$dStASro-Xy${E-2R?G0dc-WEsb z9nLu}J?g;u9cXRPR%3Ci1{(odXN(OGaBuF_CfwpYz>BthSnKb xD?=NN)@$d68cm~7Ux!IxdUEo{_J8C5<|lAN08`nh^nm~X002ovPDHLkV1lX$`TPI? diff --git a/html/images/icons/fans.png b/html/images/icons/fanspeeds.png similarity index 100% rename from html/images/icons/fans.png rename to html/images/icons/fanspeeds.png diff --git a/html/images/icons/graphs.png b/html/images/icons/graphs.png new file mode 100644 index 0000000000000000000000000000000000000000..85bc6238ad0c789474a907ddafb3122d91491f36 GIT binary patch literal 496 zcmVe+j_j~XA z{rn#9y{`gLsZ`ufr^B$rFbqX8P18*z62xM$q0E+LQLont0KR4+1e&Iysw$eMA%wtj z9J<}E^xW|4AcWxU>ow}{Hc-_Ox@Uh_H1ar(Lpq(7x_}>`SS<4L#Ren2?_B);NZ@>r zXDg2=l}a9+Jb|jJeUO`z_h{`e%Q_MsrO{{%1^|3p(s53jvYse!F*d!-W@&-ByHlLn z=fvZ2e}Hq+l^^_4#MA*{o+j@V}=j6bkGd{sbUb_`<`-IWn2d z)d1yYoBQ)m_|dY_^Xo*TQFLAJ)A<5^J$TB&aSMR)Ta(mkHLBHWpU!g!6Xh*A-(Jn} z=EJ_M_53=?WRiBfJs5B~3!zYm+cQ&F`qC2Mx~^QbZF``&*Xscg31t?NkKg;GdDLeSzRHxBsDWHwMa*SE2E^O zz)D{qBB7UCTAZ1jk(iUCmt4igm0XmXSOPS-JhLQ2p(G%IsSK(YwDA=D*1dNvr$N5Vy0tv*qN2T8Lz5dTRPRxdkWjky8UZE+Q?38Hk{OR z@54jh`G;SBuBo$O@O1c}titPXf3C#h5WS7kH>aI_D_uT;VQEq4&o4IbyXVXv2A-A`=hePyxf)!#%4K0|(Q)~yQ+Df=NggVPUR|n8p#>Zdy-TPbysb~(F7bp*8La51~c6?y3&UY zE<~9#?~yZ~+WX#m*VfFB79Y2)ba<@$cW?W@Q}w5B@Chdr7Ix07y;~Ez`pt{_prq;c e1wH>)#!q>8?q#g0ST-;{GI+ZBxvXMLSiXEYn2wB$ z#E@IGXc58yb93|mDJdxoTeofn*$P+W=;#Qh_wV12qS?d4gJI5`ISeOHo@8WPv}V_T zZ%0#x8~2|w^tIQcDE#~PFPKI)6aQEC^H*&B?_y)b z@bKv?hK}ZH6osOqqG0;<>(?ma6}7Dl^3q}qdybrgxIj-&?|)WS7Q==O8&DMT@bG}? zFJHc(hzA4&Fie{^jp5RzON@+j7H{}(ZK})g`rSu{#@bS%yiniV%^)ho&v5kgWrz!u zl$8D#6%{e8TD6KO1H!_>82bA981CJ>$H+Ki-m3q`dKwI0zW-pTEX^azfcEZ53_P41 z3}-LhfVeO7UMFqo>B}-5g0>cJO1O1939upJ8(9zMs@bcwLM#iZ#m;Tq*P-gi1 z|35=vUOI|GV`F15efI2G6!HE^GZ~nHY4GZeyAT%uL;HV2Lj%LSdGm#aB2s+9&ZYSvc2m%@+<$E;12J zT*N@{8E#>t-BEKRqj?)mgr4b+`hs)DZ4Q_yRCK z91g)+8?3b<&-2KOq6kG%1m|3E&IRv%@ZN|0ejk95fMBiVcswF0a%0SgSf|sW$;BkG zTCJ*B64U9F<#HKe0JGVwiUou`&pDk=pH?ot-EPMnj7L8zW+Vpv9&hRPs&+~Jety9i z0}vAok{(D1A^pXM4+*Fo0mQYNh`<=bTe_=c1SI_)=_aj|OY-iwyO^MyX^`Ak%8~)W zaF|reGUi=g|BmpQZqX$M=-+>5v)xt7<+<+HyLb!EInL*EtqmAsXti3`5gLsKi^byI zjf=@-!g{@qFiFhk^SA@=J=WS?*Zu%W We3ZEfDCkfC00002?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4d2&C9Kzo4=xGd-h(!P!~Cv81FZGpV#BGe1u^I0NVo$DGXUR0XI> z$wjG&C7ETZ$@#gt`FX`4XX)o;Ca2~VrxxocRq7Te>Kp4B=*Klj?O|YGviEdx46*24 zI{Ci$Rxgj`q%J_d)IpW;cD>ee+RMq~ zv}@z)1rMi*2deE_8NL3jr2b3qeV>o5d}|Y%vu$meux-IPaXy>*&wtxImx(SHcxZo! zv*7)|yPKTX=61}y*`6x(_Xh*R#6N0G{qnYFnHhqzFWzTZe_LT{-=k9LHEZ0sq+Gc= zl`fPl+WjKI{+_>e$JyHt%4VcL_S+%+?B@>d-(@o{7K(2zy&!+^l`pQB&YPVn?ZxRe^^8Nd^r6>g1u2JXB0VSkoAxg|f|r+f z%UsLj57sj3WHVpx5@Wn9@8+@2WoAX;jE1s>kG8mSa@rnzZC-fiovcmoKP80=hCZha zo3%vMR;p_;O$qwp_iM*Z`9qt`e*9AoV%alWQgNYsg=wJg^`qZTF$hjNsWLg(-=fH* z`*`f51>w@i-kYu{Y>D(bqP<;#E55t`U_i&&v!y(nj~u*x!hqBE(38_yR=3Uvg-5q5 zv{s+jU)u7cNalA)&#zyyHuLr{SMReI5d5=tcTHS};0sP8Yk75v7s-0tT;e|%6>oI? zRwTL2OjPr(r`c?6s~hVd*zaxLZ`z$Xi|5XXgjs6WoyC@A7UdpDsy%!DcKVZN!Ws?U*H&-sqjLk`{n`RN< +
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 6010549eb..b564a3cfa 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -177,8 +177,8 @@ echo('
  • Processors
    • -
  • Memory
    • +
  • Processors
    • +
  • Memory
  • Storage
  • Temperatures
    • diff --git a/html/pages/health.php b/html/pages/health.php index 32787a06f..794f81e56 100644 --- a/html/pages/health.php +++ b/html/pages/health.php @@ -1,27 +1,42 @@ "); } - echo(" " . $texttype ."\n"); + echo(''); + echo(" " . $texttype ."\n"); if ($_GET['opta'] == $type) { echo(""); } $sep = ' | '; } unset ($sep); +echo('
    '); + +if($_GET['optb'] == "graphs") { echo(''); } +echo(''); +echo(' Graphs'); +if($_GET['optb'] == "graphs") { echo(''); } +echo(' | '); +if($_GET['optb'] == "nographs") { echo(''); } +echo(''); +echo(' No Graphs'); +if($_GET['optb'] == "nographs") { echo(''); } + + +echo('
    '); + print_optionbar_end(); - - switch ($_GET['opta']) { case 'processors':