From 3a422572c6591f2fb66ca20d55c3f6ef3fc482d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Marchal?= Date: Thu, 27 May 2010 10:37:58 +0000 Subject: [PATCH] Apply patch from Maxim Britov to fix the css --- CMakeLists.txt | 4 ++-- ChangeLog | 3 ++- configure.in | 2 +- css.c | 4 ++-- css.tpl | 18 +++++++++--------- include/info.h | 2 +- sarg.conf | 15 ++++++++------- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 340e2e4..b744314 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.6) PROJECT(sarg C) SET(sarg_VERSION 2) -SET(sarg_REVISION "3-pre3") +SET(sarg_REVISION "3-pre4") SET(sarg_BUILD "") -SET(sarg_BUILDDATE "May-21-2010") +SET(sarg_BUILDDATE "May-27-2010") INCLUDE(AddFileDependencies) INCLUDE(CheckIncludeFile) diff --git a/ChangeLog b/ChangeLog index bae8552..434e0af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ SARG ChangeLog -May-21-2009 Version 2.3-pre3 +May-27-2009 Version 2.3-pre4 - LDAP usertab added. Now you can have your users in a LDAP Server. Use these tags in sarg.conf: LDAPHost, LDAPPort, LDAPBindDN, LDAPBindPW, @@ -41,6 +41,7 @@ May-21-2009 Version 2.3-pre3 - Sarg log file now stores the date in the format dd/mm/yyyy and doesn't change it depending on the current date representation selected in sarg.conf. It will break existing sarg log files. - Intermediary log files store the date as dd/mm/yyyy irrespective of the current date representation in sarg.conf. - Fix a regression to accept any directory name length in the index. + - Change the CSS template file and cleanup of the hardcoded styles (thanks to Maxim Britov). Feb-10-2010 Version 2.2.7.1 - Fixed compilation error reported by some compilers due to an sizeof in a fprintf (thanks to Maxim Britov and Renato Botelho). diff --git a/configure.in b/configure.in index 4b2c77a..e5043e4 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([sarg],[2.3-pre3]) +AC_INIT([sarg],[2.3-pre4]) AC_CONFIG_SRCDIR([log.c]) AC_CONFIG_AUX_DIR(cfgaux) diff --git a/css.c b/css.c index b59d6d6..a5507d0 100644 --- a/css.c +++ b/css.c @@ -61,8 +61,8 @@ void css(FILE *fp_css) fprintf(fp_css,".data {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:right;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor); fprintf(fp_css,".data a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;background-color:%s;text-align:right;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); - fprintf(fp_css,".data2 {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:left;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;text-align:left;}\n", FontFace, TxColor, FontSize, TxBgColor); - fprintf(fp_css,".data2 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); + fprintf(fp_css,".data2 {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:left;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor); + fprintf(fp_css,".data2 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;text-align:left;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); fprintf(fp_css,".data3 {font-family:%s;color:%s;font-size:%s;background-color:%s;text-align:center;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor); fprintf(fp_css,".data3 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;text-align:center;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor); diff --git a/css.tpl b/css.tpl index 2813bee..0857ea2 100644 --- a/css.tpl +++ b/css.tpl @@ -1,17 +1,17 @@ .body {font-family:Verdana,Tahoma,Arial;color:#000000;background-color:#ffffff;} .info {font-family:Verdana,Tahoma,Arial;font-size:9px;} .info a:link,a:visited {font-family:Verdana,Tahoma,Arial;color:#0000ff;font-size:9px;text-decoration:none;} -.title {font-family:Verdana,Tahoma,Arial;font-size:11px;color:darkblue;background-color:#ffffff;} -.title2 {font-family:Verdana,Tahoma,Arial;font-size:11px;color:darkblue;background-color:#ffffff;text-align:left;} -.title3 {font-family:Verdana,Tahoma,Arial;font-size:11px;color:darkblue;background-color:#ffffff;text-align:right;} -.header {font-family:Verdana,Tahoma,Arial;font-size:9px;color:darkblue;background-color:#dddddd;text-align:left;border-right:1px solid #666666;border-bottom:1px solid #666666;} -.header2 {font-family:Verdana,Tahoma,Arial;font-size:9px;color:darkblue;background-color:#dddddd;text-align:right;border-right:1px solid #666666;border-bottom:1px solid #666666;} -.header3 {font-family:Verdana,Tahoma,Arial;font-size:9px;color:darkblue;background-color:#dddddd;text-align:center;border-right:1px solid #666666;border-bottom:1px solid #666666;} -.text {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px;} +.title_c {font-family:Verdana,Tahoma,Arial;font-size:11px;color:darkblue;background-color:#ffffff;text-align:center;} +.title_l {font-family:Verdana,Tahoma,Arial;font-size:11px;color:darkblue;background-color:#ffffff;text-align:left;} +.title_r {font-family:Verdana,Tahoma,Arial;font-size:11px;color:darkblue;background-color:#ffffff;text-align:right;} +.header_c {font-family:Verdana,Tahoma,Arial;font-size:9px;color:darkblue;background-color:#dddddd;text-align:center;border-right:1px solid #666666;border-bottom:1px solid #666666;} +.header_l {font-family:Verdana,Tahoma,Arial;font-size:9px;color:darkblue;background-color:#dddddd;text-align:left;border-right:1px solid #666666;border-bottom:1px solid #666666;} +.header_r {font-family:Verdana,Tahoma,Arial;font-size:9px;color:darkblue;background-color:#dddddd;text-align:right;border-right:1px solid #666666;border-bottom:1px solid #666666;} +.text {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px;text-align:right;} .data {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px;background-color:lavender;text-align:right;border-right:1px solid #6a5acd;border-bottom:1px solid #6a5acd;} .data a:link,a:visited {font-family:Verdana,Tahoma,Arial;color:#0000ff;font-size:9px;background-color:lavender;text-align:right;text-decoration:none;} -.data2 {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px;background-color:lavender;border-right:1px solid #6a5acd;border-bottom:1px solid #6a5acd;} -.data2 a:link,a:visited {font-family:Verdana,Tahoma,Arial;color:#0000ff;font-size:9px;background-color:lavender;text-decoration:none;} +.data2 {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px;background-color:lavender;text-align:left;border-right:1px solid #6a5acd;border-bottom:1px solid #6a5acd;} +.data2 a:link,a:visited {font-family:Verdana,Tahoma,Arial;color:#0000ff;font-size:9px;text-align:left;background-color:lavender;text-decoration:none;text-decoration:none;} .data3 {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px,text-align:center;background-color:lavender;border-right:1px solid #6a5acd;border-bottom:1px solid #6a5acd;} .data3 a:link,a:visited {font-family:Verdana,Tahoma,Arial;color:#0000ff;font-size:9px;text-align:center;background-color:lavender;text-decoration:none;} .text {font-family:Verdana,Tahoma,Arial;color:#000000;font-size:9px;text-align:right;} diff --git a/include/info.h b/include/info.h index 47fc5b0..804e143 100755 --- a/include/info.h +++ b/include/info.h @@ -1,3 +1,3 @@ -#define VERSION PACKAGE_VERSION" May-21-2010" +#define VERSION PACKAGE_VERSION" May-27-2010" #define PGM PACKAGE_NAME #define URL "http://sarg.sourceforge.net" diff --git a/sarg.conf b/sarg.conf index 2319707..6ebb09f 100644 --- a/sarg.conf +++ b/sarg.conf @@ -593,15 +593,16 @@ # may find the css file. # # Sarg use theses style classes: -# .body body class +# .logo logo class # .info sarg information class, align=center -# .title title class, align=center -# .header header class, align:left -# .header2 header class, align:right -# .header3 header class, align:right -# .text text class, align:left +# .title_c title class, align=center +# .header_c header class, align:center +# .header_l header class, align:left +# .header_r header class, align:right +# .text text class, align:right # .data table text class, align:right -# .data2 table text class, align:right, border colors +# .data2 table text class, align:left +# .data3 table text class, align:center # .link link class # # There is a sample in /usr/local/sarg/etc/css.tpl -- 2.47.2