From 04a4d7fef891293096e042748911d12e19ac4915 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 16 Feb 2015 21:05:02 +0000
Subject: [PATCH 1/2] Added telnet/ssh/https links to device pages

---
 html/images/16/http.png            | Bin 0 -> 980 bytes
 html/images/16/ssh.png             | Bin 0 -> 880 bytes
 html/images/16/telnet.png          | Bin 0 -> 727 bytes
 html/includes/hostbox-menu.inc.php |  21 ++++++++++++++++++++-
 html/pages/device.inc.php          |   4 ++++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 html/images/16/http.png
 create mode 100644 html/images/16/ssh.png
 create mode 100644 html/images/16/telnet.png

diff --git a/html/images/16/http.png b/html/images/16/http.png
new file mode 100644
index 0000000000000000000000000000000000000000..58781b355b11ea0dcd6a555ab10136821ccb8476
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ<N=ZaPRCwBA{Qv(y12VXH@d2s;8aQ+2I>X|Z?u_SW
z+c0oRXfOZ-5DPX%`uYlR_OD<68UFnF$MEILHwGpqCa5Vp{~x%2j8VcYh5;aen2<Hj
zm^M}P+xJflHy%D>xbo-`!{gU)89sgf!obYT1jaC6Zm!KRckcH8jEw&n00M{+=7qwX
zTxq}P=yL+b%3?nl{xke#6JYrH=Lf^L=QkMSe+V(iiAsZAvT@@f6xRX-5Znta0^FTv
z1mB2p|Kwv}<yK+%|KmHu*H>p4KL2>Zu<ZU5h8m_=2629V1}`rwhFiDpFtD+4GF-d%
zkO3fo!0yslR_D5}&*wSw(=~>ZKP4H?|6pS{|MnTfg?HB(j=Xrru<_|thHVed0KLHo
z42$m!H*Q>EP*juvTMQ6DU>7iPu=3t#l4rmB`8UJMM{gN~xCI%QUhQM}_HF~i+xLGM
z{yr08IP&!uL!$nFhTp&cGDu6yGQ5BP1#AF70D)b=%*4pd^UIon;pJzBFL(199z8hC
z@ZfV0!>ccD4FBFUGBCW-Wng^E%kcH<4+eI2R)$B9?lXvp@PQ2g2q3TlfB${|sLSy6
zGsAN^28Q?VfCk-UV0b4CWScQCyZ}b&6AlI|WgZ4rR%Qkk7G|Ie#2I*bxxfYh1Q6JO
z^H=YDm3ez)qd5yN1H*j>2Byc#3`}<~F)-c#$ngKZ7K1tuKZC2O5;!VBhA=R&GQ55J
z32XpB0D;5cL+O(>!JiD|ynqVty$fSt_{Yw`$nuwg;kyFEzrT_U(j06Iyt6(rFjew0
z{QLJG82T3&{Qcd*1^@&Q*Z?*L7Js>avMg*G91MDrtPBiCfC2O!m_8hU&b<DU;n%6}
z4F7=eW%wlq_GQ`(rluAQuU>rs8vqbMkU;zkG(wG=fq|2Q;s1r-41a(I{rm<@Oh7Y!
z{RPqg8JO5u82-I_57u<*)F}pTZVoUTAb`LwxNvauCdS|YxtV_bW%#Tn;jZ>emf;sC
zP~-8}4F8!J8UCv?GW_}Zok4V=Juo%?Ww5j~1IGpk00a;tw%n+rqrmX}`!6sb<mZ3?
z{(+M*NbTRhf5BoP{_fo;82|!^1zUCnVPXM5fB^tm(L$2HQ_J@N0000<MNUMnLSTZj
C2)sxD

literal 0
HcmV?d00001

diff --git a/html/images/16/ssh.png b/html/images/16/ssh.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fbd369c5362822969f7f09215b1a450a9cfaeba
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0009gNkl<ZIE{^yO-L(O07k!ilT0RKm`O$>Dn`VhF=DZS7(zCUrEgK}qPu{C
zBBBs@`!2dDuHA|7B&%+^D74f~u?UuQF;on(W}~Sjp~mL<qD1q|@64S$=~if=@9fW6
zeILOKwzszjB}p3VbUJ^f)9EHY0NV?h$g=$9>gwuOilT&kJ|7E*!}sUs=j?+5@pwG2
zyu7?NJ3Fh)%*;$jqtRE7kB^^DOicWk%jNq28(3Lc`DAi(GRQf<eRz22yWMUk%kqF}
znxj)wQ${wMefwVl0svcETO<;Ryiry4xmvBVr>CcRS(e>HLqpc|^fb5GY|cuhQtS14
zTDe^Qty-;?)9G{z07xVffzRjrIFU%ak!4wEHk&Ay%aX3^W-u7^cDr51Ie+i>`x`Eo
zt4|2wl+x?d)6?&CT|cvP&Ofi!YTsU8Uk?ut52IKtqE@RR8jYgSXh7361cO0jG8q_#
zfp9q7r<BgdVzFmU(=I3>BrHjiFO^C`6h%-<v9z>=L?Qvk7(`LT`uaLlRfQ;u*xcMC
z)oOL5R4O$HA)FFI1j8^$y<W${!U6<Az}?*)6h%QG5P%>Epp+t+Ok!<q4U|$?mPP!2
zf0GcxDFATJvAesAi;D|vY;2%VC}3}I4|8*KSX^8L0BD+qOeO;WV2qjheEz3{g9B!_
z*=&!Tb0d{X34$Qt<m3eN^Ycg~5@@&E$mjF$`~4`DN@%rOxV*gVGsgbh-`{@=03;rd
zPxX4e*Q%<1<aWD5q9_h1iXw8(pIfb#qu1-%L{WsU>z2de(49`FUMLj4&StaU17P-K
zGHKQ8b@S%t=3TSdy!LoJGb1A-@nA6M@_M}`##pb_YS|6L=!QZedUSO3`{Ci?&j2U@
zVgvBLR;&Hta=E%Lm+P~^!NG(iNkXMkX%vga%)r0^QB_q51OjHe-S!?IAMfUJxxWE0
z02X;UOG+t?#bOJiqoZGpjg7tPbUKo0nws5iFO83n%MORbxwEtL4P(su*B1bw-|zQt
zZ*SjSU0rFGW&NV-`mY|3#~_4w9S+Cw{r&w9XJ=>TOXnZ7%4;`UueOZ<0000<MNUMn
GLSTZYf~O(?

literal 0
HcmV?d00001

diff --git a/html/images/16/telnet.png b/html/images/16/telnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..e654b5e2454db1312e411e1b1a67101d9a8f25a6
GIT binary patch
literal 727
zcmV;|0x127P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$SX-PyuR5*>5
zlD&>2MHGd<s=C!}_m4ehObBC-M1+JkVYC|{?VBtwuqiKrNO%$u0fZz3>}cT)){`Nv
z?HNyZ+uiM|t|FKp&9V_!I=c59-E(w<tG@X1nd{nCtQEvstXRYfiM5Cb)(XyfoOgHK
zIlS|D=a@`Sywr6q7cZWpmFEA{FburCycAJNVU18X%?Ar*QGBEoMNZS~KhPw`NC=)Z
zvD{WQA%^>a>`{v`5{Z;WMq-6sRXql1fcNV)-aGPa^myK`s?l08J(-}5CWgqas)0b6
zXLN0Q7odQqZrEPm5JF%!ouZVY?|Z6dj{;^VQ<PS;hnAaN&F$@uwyDrsBg$xo7|~jz
zwFU)71Qckk@!k=JK+`nz#~!T|<HRC1#h4B;+EC;<<1D4?dzzaaN-4^+WRwb^*tZ?y
zJYzPSLW~@pWA}cI5kZVGB-Y@4;OISBo{^?0^V1VTRJ481EKTvwlaCVihXecV4Oy1c
z?e~Zg!w?lAM#{;A@i=3YjmXLgLyY8;DIo-$J3<JwM^9OnXsvPm@$Q1I@5qY+5g{EV
zjK^cdTCz077{f3O^j*i{a3D!joOjrxB}ptYN=N^cU*(@ns=Pm&e>TkLbLOX~%s-uz
zrOD*;voo%*udDTD%X+h6v)QuQY*}x%NQm9tlRN=11-`w<;g7d}yZiYSP<*uiAF}~|
z1L6aI|MN0F;XecVsYl%#0l2vM`bXgP0}mk}B7_j0zW?`c-duk7Kpq30fAjK1jPZx%
zViC`m3(l7d&KC=o%LTjJiq+K>?^Y{Tt1I5Eu3rE8%TIp+{0rS5Oqv{{dbI!m002ov
JPDHLkV1n57Qz-xd

literal 0
HcmV?d00001

diff --git a/html/includes/hostbox-menu.inc.php b/html/includes/hostbox-menu.inc.php
index a053421e78..aa1e3025e1 100644
--- a/html/includes/hostbox-menu.inc.php
+++ b/html/includes/hostbox-menu.inc.php
@@ -14,11 +14,30 @@
 
 echo('<td>');
     if (device_permitted($device['device_id'])) {
+        echo ('<div class="row">
+                   <div class="col-xs-1">');
         echo '<a href="'.generate_device_url($device).'"> <img src="images/16/server.png" border="0" align="absmiddle" alt="View device" /></a> ';
+        echo ('</div>
+               <div class="col-xs-1">');
         echo '<a href="'.generate_device_url($device, array('tab' => 'alerts')).'"> <img src="images/16/bell.png" border="0" align="absmiddle" alt="View alerts"  /></a> ';
+        echo '</div>';
         if ($_SESSION['userlevel'] >= "7") {
-            echo '<a href="'.generate_device_url($device, array('tab' => 'edit')).'"> <img src="images/16/wrench.png" border="0" align="absmiddle" alt="Edit device" /></a> ';
+            echo ('<div class="col-xs-1">
+                       <a href="'.generate_device_url($device, array('tab' => 'edit')).'"> <img src="images/16/wrench.png" border="0" align="absmiddle" alt="Edit device" /></a>
+                   </div>');
         }
+        echo ('</div>
+               <div class="row">
+                   <div class="col-xs-1">
+                       <a href="telnet://' . $device['hostname']  . '"><img src="images/16/telnet.png" alt="telnet" border="0" width="16" height="16"></a>
+                   </div>
+                   <div class="col-xs-1">
+                       <a href="ssh://' . $device['hostname']  . '"><img src="images/16/ssh.png" alt="ssh" border="0" width="16" height="16"></a>
+                   </div>
+                   <div class="col-xs-1">
+                       <a href="https://' . $device['hostname']  . '"><img src="images/16/http.png" alt="https" border="0" width="16" height="16" target="_blank"></a>
+                   </div>
+               </div>');
     }
 echo('</td>');
 
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 3ab398d49f..361eb3e714 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -368,6 +368,10 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
+    echo ('<li style="float: right;"><a href="https://' . $device['hostname']  . '"><img src="images/16/http.png" alt="https" border="0" width="16" height="16" target="_blank"></a></li>
+           <li style="float: right;"><a href="ssh://' . $device['hostname']  . '"><img src="images/16/ssh.png" alt="ssh" border="0" width="16" height="16"></a></li>
+           <li style="float: right;"><a href="telnet://' . $device['hostname']  . '"><img src="images/16/telnet.png" alt="telnet" border="0" width="16" height="16"></a></li>');
+
     if ($_SESSION['userlevel'] >= "7")
     {
       echo('<li class="' . $select['edit'] . '" style="float: right;">

From 7fb3a50241998488b6775f41d09ec0f6d6d52479 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 16 Feb 2015 22:48:52 +0000
Subject: [PATCH 2/2] Images for this PR are from the following (with
 compatiable licenses): http://www.mricons.com/icon/113632/16/ssh-icon,
 http://www.mricons.com/icon/38518/16/www-icon,
 http://www.mricons.com/icon/67510/16/telnet-icon

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 60da75abfd..1ff0ba1643 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -14,3 +14,4 @@ Contributors to LibreNMS:
 
 [1]: http://observium.org/ "Observium web site"
 
+