From 7514a6c758c7a9c2faaa3a78b695a6f037bb1dd8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 21 May 2011 13:23:25 +0000 Subject: [PATCH] Support stack bars for flot graphs --- htdocs/adherents/index.php | 2 +- htdocs/main.inc.php | 3 ++- htdocs/theme/auguria/graph-color.php | 2 +- htdocs/theme/eldy/graph-color.php | 4 ++-- htdocs/theme/freelug/graph-color.php | 2 +- htdocs/theme/yellow/graph-color.php | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 5995dadbe80..6ba56ae0129 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -136,7 +136,7 @@ print $langs->trans("Other").':"; - +print '
'; print ''; print ''; print '
'.$langs->trans("Statistics").'
'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index d2da3d94dec..59feae3dd42 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -964,7 +964,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; print ''."\n"; - // CKEditor + print ''."\n"; + // CKEditor if (!empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') { print ''."\n"; diff --git a/htdocs/theme/auguria/graph-color.php b/htdocs/theme/auguria/graph-color.php index 856f92e106f..19476d82813 100755 --- a/htdocs/theme/auguria/graph-color.php +++ b/htdocs/theme/auguria/graph-color.php @@ -26,7 +26,7 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; $theme_bordercolor = array(235,235,224); -$theme_datacolor = array(array(120,130,150), array(200,160,180), array(190,190,220)); +$theme_datacolor = array(array(120,130,150), array(200,160,180), array(190,190,220), array(140,170,150)); $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php index 01a40022b37..126cab37a0a 100755 --- a/htdocs/theme/eldy/graph-color.php +++ b/htdocs/theme/eldy/graph-color.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; $theme_bordercolor = array(235,235,224); -$theme_datacolor = array(array(120,130,150), array(200,160,180), array(190,190,220)); +$theme_datacolor = array(array(120,130,150), array(200,160,180), array(190,190,220), array(140,170,150)); $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); diff --git a/htdocs/theme/freelug/graph-color.php b/htdocs/theme/freelug/graph-color.php index ba4eb1d75be..69e2fc92d46 100755 --- a/htdocs/theme/freelug/graph-color.php +++ b/htdocs/theme/freelug/graph-color.php @@ -26,7 +26,7 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; $theme_bordercolor = array(235,235,224); -$theme_datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220)); +$theme_datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220), array(140,170,150)); $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); $theme_bgcoloronglet = array(hexdec('DC'),hexdec('DC'),hexdec('D0')); diff --git a/htdocs/theme/yellow/graph-color.php b/htdocs/theme/yellow/graph-color.php index e6e7483ccab..2b72a2a2761 100755 --- a/htdocs/theme/yellow/graph-color.php +++ b/htdocs/theme/yellow/graph-color.php @@ -26,7 +26,7 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; $theme_bordercolor = array(235,235,224); -$theme_datacolor = array(array(160,140,120), array(140,160,130), array(190,190,220)); +$theme_datacolor = array(array(160,140,120), array(140,160,130), array(190,190,220), array(140,170,150)); $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); $theme_bgcoloronglet = array(hexdec('DC'),hexdec('DC'),hexdec('D3'));