From 8dd71e818f0f4c7c6c596abcc20ae511263c97d1 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 29 Apr 2008 14:51:26 +0200 Subject: [PATCH] Added new kind of popup menu for use within the grid. The popup menu uses javascript and is shown on click. It seems to be the best option so far for later development. This state is kind of in the middle as I need to take care of a bug in the beta branch. --- src/css/defaults.css | 2 +- src/css/menu.css | 19 +++-- src/images/icons/bullet_ball_glass_blue.png | Bin 0 -> 661 bytes src/images/icons/bullet_ball_glass_green.png | Bin 0 -> 673 bytes src/images/icons/bullet_ball_glass_grey.png | Bin 0 -> 643 bytes src/images/icons/bullet_ball_glass_red.png | Bin 0 -> 649 bytes src/images/icons/bullet_ball_glass_yellow.png | Bin 0 -> 666 bytes src/include/constants_logstream.php | 2 +- src/include/functions_common.php | 7 +- src/index.php | 19 +++-- src/js/common.js | 79 +++++++++++++++++- src/lang/en/main.php | 1 + src/templates/index.html | 55 +++++++++--- src/themes/dark/main.css | 4 +- src/themes/default/main.css | 4 +- 15 files changed, 160 insertions(+), 32 deletions(-) create mode 100644 src/images/icons/bullet_ball_glass_blue.png create mode 100644 src/images/icons/bullet_ball_glass_green.png create mode 100644 src/images/icons/bullet_ball_glass_grey.png create mode 100644 src/images/icons/bullet_ball_glass_red.png create mode 100644 src/images/icons/bullet_ball_glass_yellow.png diff --git a/src/css/defaults.css b/src/css/defaults.css index 2ccf210..523489f 100644 --- a/src/css/defaults.css +++ b/src/css/defaults.css @@ -24,7 +24,7 @@ .SelectSavedFilter { - margin-top: 3px; + margin-top: 2px; border: 1px solid; border-color: #233B51 #124A7C #124A7C #233B51; } diff --git a/src/css/menu.css b/src/css/menu.css index f42df92..076c0ba 100644 --- a/src/css/menu.css +++ b/src/css/menu.css @@ -14,11 +14,11 @@ border-width: 1px; border-style: solid; margin: 0; - padding: 2px 3px; + padding: 1px 1px; } #menu h2 { - font: bold 11px/16px; + font: bold; text-align: center; } @@ -33,22 +33,27 @@ } #menu li { - z-index:10; /* make the list elements a containing block for the nested lists */ position: relative; } #menu ul ul { + z-index:10; + position: absolute; - top: 16px; - left: 0px; /* to position them to the right of their containing block */ + top: 12px; + left: 4px; /* to position them to the right of their containing block */ width: 300; /* width is based on the containing block */ } div#menu ul ul, div#menu ul li:hover ul ul -{display: none;} +{ + display: none; +} div#menu ul li:hover ul, div#menu ul ul li:hover ul -{display: block;} \ No newline at end of file +{ + display: block; +} \ No newline at end of file diff --git a/src/images/icons/bullet_ball_glass_blue.png b/src/images/icons/bullet_ball_glass_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..143f23ca2f8bb934e7d224d946c6d2479fcdcae9 GIT binary patch literal 661 zcmV;G0&4wWdKcYATcu_Piu4_GB7YRATTgGFf%$dIUp-AF)%Qy!D_((000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Heu zL_t(|+O<&id}1JAZqrG^hx7(%rO)f-6_#^ zS6;oTU}o|yS!S)sk-#`l&RbK%v9facybetdz!Dk^U7%I5#0R_c8uqj6__pxXcT%~M zawuSy9z>LVrKmMv)l~7Ns3JwA%>eRT3kyd<|Ii&Wdx)lkFzrylaT7Ti#B?TzsG-6L zRMWFtme|}=;dnpCq5GSIssC2T5r%0Ah{AxgfxNXMh#idtW%LWN9eyhC}fvH zZLNbHVIUR)BEf2ca%K7@%eCodZShlm(T;MES$*p6WMsPmbW)_J1?Y|d7dgMs%xZ3b zmv}Yynapj!5_JMk240p@$?@go4cRDM#Loa%Xts%UoL}6Kg%@Mbu|A(8bA|YETq9NQ zm$-iq9XE!zC3n%YM{EzVyz#E;KFHSj<00000NkvXXu0mjfxAhp} literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_green.png b/src/images/icons/bullet_ball_glass_green.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8a4b49115d3feef37e38c16be77bc04a9289e7 GIT binary patch literal 673 zcmV;S0$%-zP)WdKcYATcu_Piu4_GB7YRATTgGFfuwaGaxH4F)%PE99K2~000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00H?) zL_t(|+O?C8arlb*qA|3d!Z|D7(_hSb5&n5kXPW)AXtFN<# zxDnk6M3hgoa-h6vZHD(2Z(gf~w)SNAJ(&glLG}V%cyXf8+=&)WkDp_?%q*-!D!>G6&4wapq>8dW&pp0TFSWm> znRH8Hy#QXleOpmSnL>UIQH9GZs1r@$LQyy*&0%Bn+GR35Ntiu9r6+`f=XJG%wXldC zX%r?`=?Dp}*h95bgRF7LlPpK3GsGvNxi3J_iP?l? z7zPsAp@0s3OY7f6?P2Q+nO4$C?4N@7EGqkRf%!eC<#SV$($v^E98HJodw8_`N~}KE zejG0G#Q7z$nzU{3BK@xK5^i7)SFGdO3~43rW4nZ>C}IV>q+ceMh^^jT7`%x|PmU0$ zQjVtk+eDH0kjl}pw;-o;9_j0LQgf1lmkeg;TNt7fIEeKNaNW8?>e9ok00000NkvXX Hu0mjfm?I~W literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_grey.png b/src/images/icons/bullet_ball_glass_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae8681ca762a39718c590db802b6723526a6019 GIT binary patch literal 643 zcmV-}0(||6P)WdKHUATlx_N_A`?GB7YTATc*OGc`IfHXti7F)%Rco(Z)8000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00G-c zL_t(|+ND#=PQp+Sowl?`{XrV36C550dM#D``dS~v;>6w{(0oGj9Kh9=fLVR;;OAKsmi27s_MFE3kZX(s?f+oh`3L`v=yk!Y5npP!6@uCQVB!L(R zfPnDfp7>_A4UKyJ;rry41l@i=dsnU6B$4;~K|qM)i^;@ybA4@}ou4Zh+H)rHbqcjw ztsM#mnNG90yB&*BI7Se79=e?l6mvQIv{*b*6h+0*OT;5-&-aT&)X1@D^bnhs@=H>j zl%%O@{khdrG);R&^9pg{sIY&!iKM9^M9k@S*zxxfw+@I3^S8G^J9GB0beq)t{?k=n d`!TJ(J^=$7uj{Pt1QP%N002ovPDHLkV1h-Y4MYF{ literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_red.png b/src/images/icons/bullet_ball_glass_red.png new file mode 100644 index 0000000000000000000000000000000000000000..9c6e7a19035d43e9cab3292c2948a573bc58910e GIT binary patch literal 649 zcmV;40(Sk0P)WdKcYATcu_Piu4_GB7YRATTgGFfuwdHXti7F)%QH;c$&dO`;4Gl zBT&qu)`emY^Xn&qP6ZvZjVnPk)xW`qd1xe2c6ifJE};rpEM4bF zh~siHCM*e+Ulg=7hKdcNA~skZiz5ZPut)9~8iIJD>m!!^!oW5K8%GR&c*KYW- jtAe}hzp#tVn5R8yDSW`00000NkvXXu0mjf?(GsB literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_yellow.png b/src/images/icons/bullet_ball_glass_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0ef19069552df0aabf5065168535526e26b3e7 GIT binary patch literal 666 zcmV;L0%iS)P)WdKcYATcu_Piu4_GB7YRATTgGFf%$bG9W83F)%Q0sW-d;000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Htz zL_t(|+O<_$AUK#4g}^*TtUNmydx7CT#;SwcSSB#B^me%h%H?$9m6VXp-6Trlu=E`Z@29-sSEbRnQ$g_uVwtGa z?m?jMUO(>MOkwD1d!iFUi21BN|6&4jpR%A9d?Yf&*Jz;D^Dmqc^YA~;FBJ`%5|l|mB>(^b07*qoM6N<$f)AS@ A2><{9 literal 0 HcmV?d00001 diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php index 9287183..6c14185 100644 --- a/src/include/constants_logstream.php +++ b/src/include/constants_logstream.php @@ -95,7 +95,7 @@ $fields[SYSLOG_MESSAGETYPE]['FieldCaptionID'] = 'LN_FIELDS_MESSAGETYPE'; $fields[SYSLOG_MESSAGETYPE]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_MESSAGETYPE]['Sortable'] = true; $fields[SYSLOG_MESSAGETYPE]['DefaultWidth'] = "90"; -$fields[SYSLOG_MESSAGETYPE]['FieldAlign'] = "left"; +$fields[SYSLOG_MESSAGETYPE]['FieldAlign'] = "center"; // Syslog specific $fields[SYSLOG_FACILITY]['FieldID'] = SYSLOG_FACILITY; diff --git a/src/include/functions_common.php b/src/include/functions_common.php index f13d6f8..e49c35a 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -360,11 +360,16 @@ function InitFrontEndVariables() $content['MENU_NAV_RIGHT'] = $content['BASEPATH'] . "images/icons/navigate_right.png"; $content['MENU_NAV_CLOSE'] = $content['BASEPATH'] . "images/icons/navigate_close.png"; $content['MENU_NAV_OPEN'] = $content['BASEPATH'] . "images/icons/navigate_open.png"; - $content['MENU_PAGER_BEGIN_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_beginning.png"; $content['MENU_PAGER_PREVIOUS_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_rewind.png"; $content['MENU_PAGER_NEXT_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_fast_forward.png"; $content['MENU_PAGER_END_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_end.png"; + + $content['MENU_BULLET_BLUE'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_blue.png"; + $content['MENU_BULLET_GREEN'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_green.png"; + $content['MENU_BULLET_RED'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_red.png"; + $content['MENU_BULLET_YELLOW'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_yellow.png"; + $content['MENU_BULLET_GREY'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_grey.png"; } // Lang Helper for Strings with ONE variable diff --git a/src/index.php b/src/index.php index 404dfa0..01fd4c7 100644 --- a/src/index.php +++ b/src/index.php @@ -267,6 +267,8 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c if ( isset($logArray[$mycolkey]) ) { // Set defaults + $content['syslogmessages'][$counter]['values'][$mycolkey]['FieldColumn'] = $mycolkey; + $content['syslogmessages'][$counter]['values'][$mycolkey]['uid'] = $uID; $content['syslogmessages'][$counter]['values'][$mycolkey]['FieldAlign'] = $fields[$mycolkey]['FieldAlign']; $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldcssclass'] = $content['syslogmessages'][$counter]['cssclass']; $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = ""; @@ -408,15 +410,22 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c { // Append Syslogtag Search Button $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; + '&search=Search" target="_top">' . $logArray[$mycolkey]. ''; +// ' } else if ( $mycolkey == SYSLOG_HOST ) { + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?filter=source%3A' . $logArray[$mycolkey] . '&search=Search', + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'" + ); + // Append Syslogtag Search Button - $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; +// $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; + /* TODO ... $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '