Author: Lars Michelsen <[email protected]> Date: Fri Sep 23 10:07:42 2011 +0200 Committer: Lars Michelsen <[email protected]> Commit-Date: Fri Sep 23 10:07:42 2011 +0200
Merged frontendEventlog.css into template css file --- ChangeLog | 1 + share/frontend/nagvis-js/css/frontendEventlog.css | 68 --------------------- share/userfiles/templates/default.css | 46 ++++++++++++++ share/userfiles/templates/default.index.html | 1 - 4 files changed, 47 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index c05202e..c4c7353 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ Frontend * Added [alias] macro to context menus * Header menu handles map parent/child relations correctly * Recoded the add/modify dialog to add/edit map objects + * Merged frontendEventlog.css into template css file Automap * Bugfix: Made the problem automap work again diff --git a/share/frontend/nagvis-js/css/frontendEventlog.css b/share/frontend/nagvis-js/css/frontendEventlog.css deleted file mode 100644 index 570becf..0000000 --- a/share/frontend/nagvis-js/css/frontendEventlog.css +++ /dev/null @@ -1,68 +0,0 @@ -/***************************************************************************** - * - * frontendEventlog.css - Stlyes for the eventlog in frontend - * - * Copyright (c) 2004-2011 NagVis Project (Contact: [email protected]) - * - * License: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - *****************************************************************************/ - -/** - * @author Lars Michelsen <[email protected]> - */ - -#eventlog { - position: fixed; - bottom: 0px; - right: 20px; - z-index: 1000; - - width: 400px; - height: 70px; - - background-color: #d0d0d0; - border: 1px solid #000000; - border-bottom: 0; - - opacity:0.4; - /*filter:alpha(opacity=40);*/ - - padding: 2px; - - font-size: 9px; -} - -#eventlogControl { - position: fixed; - bottom: 75px; - right: 20px; - z-index: 1001; - - width: 10px; - height: 10px; - - background-color: #d0d0d0; - border: 1px solid #000000; - border-bottom: 0; - - opacity:0.4; - /*filter:alpha(opacity=40);*/ - - padding: 2px; - - font-size: 9px; -} diff --git a/share/userfiles/templates/default.css b/share/userfiles/templates/default.css index 973f318..d1416c0 100644 --- a/share/userfiles/templates/default.css +++ b/share/userfiles/templates/default.css @@ -650,3 +650,49 @@ td#popupWindowContent a:hover {color:#779D2A;text-decoration:underline} #sidebar li.open a.title {background: url('../images/templates/default.folder_open.gif') no-repeat left #eaf0f2;} #sidebar li.closed a.title {background: url('../images/templates/default.folder_closed.gif') no-repeat left #eaf0f2;} #sidebar li a:hover {background-color:#d9e1e4;color:#779D2A} + +/* + * Frontend eventlog styling + */ + +#eventlog { + position: fixed; + bottom: 0px; + right: 20px; + z-index: 1000; + + width: 400px; + height: 70px; + + background-color: #d0d0d0; + border: 1px solid #000000; + border-bottom: 0; + + opacity:0.4; + /*filter:alpha(opacity=40);*/ + + padding: 2px; + + font-size: 9px; +} + +#eventlogControl { + position: fixed; + bottom: 75px; + right: 20px; + z-index: 1001; + + width: 10px; + height: 10px; + + background-color: #d0d0d0; + border: 1px solid #000000; + border-bottom: 0; + + opacity:0.4; + /*filter:alpha(opacity=40);*/ + + padding: 2px; + + font-size: 9px; +} diff --git a/share/userfiles/templates/default.index.html b/share/userfiles/templates/default.index.html index 0ce7498..9191da4 100644 --- a/share/userfiles/templates/default.index.html +++ b/share/userfiles/templates/default.index.html @@ -41,7 +41,6 @@ <script type="text/javascript" src="{$htmlJs}ExtGenericResize.js"></script> {/if} <link rel="stylesheet" type="text/css" href="{$htmlTemplates}default.css" /> - <link rel="stylesheet" type="text/css" href="{$htmlCss}frontendEventlog.css" /> {if $customStylesheet != ""} <link rel="stylesheet" type="text/css" href="{$customStylesheet}" /> {/if} ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2 _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
