Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'

Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4191
This commit is contained in:
Daniel Rodriguez 2021-06-10 08:19:12 +00:00
commit 168e191734
156 changed files with 33971 additions and 9712 deletions

2
.gitignore vendored
View File

@ -9,3 +9,5 @@ MYMETA.yml
**/PandoraFMS-Enterprise/pm_to_blib **/PandoraFMS-Enterprise/pm_to_blib
**/pandora_console/attachment/cache **/pandora_console/attachment/cache
**/pandora_console/attachment/agents **/pandora_console/attachment/agents
pandora_console/.DS_Store
.DS_Store

View File

@ -1,12 +1,7 @@
* {
font-family: "Open Sans", "Noto Sans", sans-serif
}
body { body {
min-width: 425px; min-width: 425px;
min-height: 540px; min-height: 540px;
margin: 5px; margin: 5px;
font-family: Tahoma, Geneva, Arial;
font-size: 10pt; font-size: 10pt;
} }
h1 { h1 {
@ -15,7 +10,7 @@ h1 {
margin: 2px 0px 2px 0px; margin: 2px 0px 2px 0px;
} }
h2 { h2 {
color : #333; color: #333;
} }
p { p {
font-size: 20px; font-size: 20px;
@ -28,7 +23,8 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
a:visited { a:visited {
color: #254533; text-decoration:none; color: #254533;
text-decoration: none;
} }
a:visited:hover { a:visited:hover {
text-decoration: underline; text-decoration: underline;
@ -51,15 +47,15 @@ div.main {
width: 400px; width: 400px;
} }
div.textarea { div.textarea {
background-color: #D5DED5; background-color: #d5ded5;
width: 100% width: 100%;
} }
div.e { div.e {
text-align: right; text-align: right;
font-size:8pt; font-size: 8pt;
} }
div.b { div.b {
background-color:white; background-color: white;
display: none; display: none;
} }
div.b p a { div.b p a {
@ -85,7 +81,7 @@ div.options_divider {
margin-top: 30px; margin-top: 30px;
} }
div.options_divider h2{ div.options_divider h2 {
margin: 20px 20px 0; margin: 20px 20px 0;
padding: 5px; padding: 5px;
font-weight: 500; font-weight: 500;
@ -233,25 +229,25 @@ button h3 {
} }
.sev-Warning { .sev-Warning {
background: #FDDD30; background: #fddd30;
color: #333; color: #333;
} }
.sev-Critical { .sev-Critical {
background: #F84348; background: #f84348;
} }
.sev-Informational { .sev-Informational {
background: #4CA8E0; background: #4ca8e0;
} }
.sev-Normal { .sev-Normal {
background: #84B839; background: #84b839;
} }
.sev-Maintenance { .sev-Maintenance {
background: #A8A8A8; background: #a8a8a8;
} }
.sev-Minor { .sev-Minor {
background: #F099A2; background: #f099a2;
color: #333; color: #333;
} }
.sev-Major { .sev-Major {
background: #C97A4A; background: #c97a4a;
} }

View File

@ -1,21 +1,42 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<title>Wicket Alert</title> <title>Wicket Alert</title>
<style type="text/css"> <style type="text/css">
body { margin:0; font-family:arial; font-size:10pt } body {
h1 { font-weight:bold; font-size:16px; margin:2px 0 2px 4px; color:#237948; font-family:arial; } margin: 0;
font-size: 10pt;
}
h1 {
font-weight: bold;
font-size: 16px;
margin: 2px 0 2px 4px;
color: #237948;
}
a { color: #237948; text-decoration:none; } a {
a:hover { text-decoration:underline; } color: #237948;
a:visited { color: #237948; text-decoration:none; } text-decoration: none;
a:visited:hover { text-decoration:underline; } }
a:hover {
text-decoration: underline;
}
a:visited {
color: #237948;
text-decoration: none;
}
a:visited:hover {
text-decoration: underline;
}
</style> </style>
</head> </head>
<body> <body>
<h1>Event Alert</h1> <h1>Event Alert</h1>
<div id="e" style="background:url('images/icon.png') no-repeat 0% 50%; margin:0 4px; padding-left:50px; min-height:48px;"> <div
id="e"
style="background:url('images/icon.png') no-repeat 0% 50%; margin:0 4px; padding-left:50px; min-height:48px;"
>
<script src="js/notification.js"></script> <script src="js/notification.js"></script>
</div> </div>
</body> </body>

View File

@ -1,58 +1,105 @@
body { body {
min-width:425px; min-width: 425px;
min-height:540px; min-height: 540px;
margin:5px; margin: 5px;
font-family:Tahoma, Geneva, Arial; font-size: 10pt;
font-size:10pt;
} }
h1 { font-weight: bold; font-size:16px; margin:2px 0px 2px 0px; color:#237948; font-family:arial } h1 {
h2{ font-weight: bold;
color : blue; font-size: 16px;
margin: 2px 0px 2px 0px;
color: #237948;
}
h2 {
color: blue;
} }
label { color: #254533; text-decoration:none; } label {
label:hover { text-decoration:underline; } color: #254533;
label:visited { color: #254533; text-decoration:none; } text-decoration: none;
label:visited:hover { text-decoration:underline; } }
label:hover {
text-decoration: underline;
}
label:visited {
color: #254533;
text-decoration: none;
}
label:visited:hover {
text-decoration: underline;
}
label.text-link {
color: #254533;
text-decoration: none;
}
label.text-link :hover {
text-decoration: underline;
}
label.text-link :visited {
color: #254533;
text-decoration: none;
}
label.text-link :visited:hover {
text-decoration: underline;
}
label.text-link { color: #254533; text-decoration:none; } span.res {
label.text-link :hover { text-decoration:underline; } font-size: 80%;
label.text-link :visited { color: #254533; text-decoration:none; } color: #555;
label.text-link :visited:hover { text-decoration:underline; } }
image.pm {
span.res { font-size:80%; color:#555; } margin-right: 3px;
cursor: pointer;
image.pm { margin-right:3px;cursor:pointer; margin-top:0px; } margin-top: 0px;
.main{ }
background-color : white; .main {
background-color: white;
height: 500px; height: 500px;
width: 400px; width: 400px;
} }
.textarea{ .textarea {
background-color : #D5DED5; background-color: #d5ded5;
width :100% width: 100%;
}
vbox.e {
text-align: right;
font-size: 8pt;
}
vbox.b {
background-color: white;
border: 1px solid #bababa;
margin: 5px;
padding: 4px;
}
vbox.b description label {
font-size: 10pt;
}
vbox.b description {
margin: 2px 0px 4px 0px;
color: #333;
font-size: 9pt;
} }
vbox.e{ text-align:right; font-size:8pt; }
vbox.b { background-color:white; border:1px solid #BABABA; margin:5px; padding:4px; }
vbox.b description label { font-size: 10pt; }
vbox.b description { margin:2px 0px 4px 0px; color:#333; font-size:9pt; }
vbox.b vbox.items description { vbox.b vbox.items description {
margin:2px 0px 8px 0px; color:#333; width:355px;float:left; display:block; margin: 2px 0px 8px 0px;
color: #333;
width: 355px;
float: left;
display: block;
} }
vbox.b vbox.items description image { vbox.b vbox.items description image {
float:left;margin:0px 3px 0px 0px; float: left;
margin: 0px 3px 0px 0px;
} }
.tooltip { .tooltip {
display:none; display: none;
font-size:12px; font-size: 12px;
height:70px; height: 70px;
width:160px; width: 160px;
padding:25px; padding: 25px;
color:#eee; color: #eee;
} }
.spinner { .spinner {
@ -61,11 +108,9 @@ vbox.b vbox.items description image {
left: 50%; left: 50%;
margin-left: -50px; /* half width of the spinner gif */ margin-left: -50px; /* half width of the spinner gif */
margin-top: -50px; /* half height of the spinner gif */ margin-top: -50px; /* half height of the spinner gif */
text-align:center; text-align: center;
z-index:1234; z-index: 1234;
overflow: auto; overflow: auto;
width: 100px; /* width of the spinner gif */ width: 100px; /* width of the spinner gif */
height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */ height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */
} }

View File

@ -103,7 +103,7 @@ function load_matrix_console()
context.fillRect(0, 0, width, height); context.fillRect(0, 0, width, height);
context.fillStyle = "#0F0"; // Green text context.fillStyle = "#0F0"; // Green text
context.font = font_size + "px arial"; context.font = font_size + "px lato";
// Looping over drops // Looping over drops
for (var i = 0; i < drops.length; i++) { for (var i = 0; i < drops.length; i++) {
if (drops[i] == -1) { if (drops[i] == -1) {

View File

@ -21,4 +21,7 @@ PREPARE pr_oum755 FROM @st_oum755;
EXECUTE pr_oum755; EXECUTE pr_oum755;
DEALLOCATE PREPARE pr_oum755; DEALLOCATE PREPARE pr_oum755;
UPDATE `tconfig` set value = 'lato.ttf' WHERE token LIKE 'custom_report_front_font';
UPDATE `tconfig` set value = 'lato.ttf' WHERE token LIKE 'fontpath';
COMMIT; COMMIT;

View File

@ -31,7 +31,7 @@ if (!$config['MR']) {
$config['MR'] = 0; $config['MR'] = 0;
} }
echo '<a class="footer" target="_blank" href="'.$config['homeurl'].$license_file.'">'; echo '<a class="footer"target="_blank" href="'.$config['homeurl'].$license_file.'">';
require_once $config['homedir'].'/include/functions_update_manager.php'; require_once $config['homedir'].'/include/functions_update_manager.php';
@ -49,9 +49,7 @@ echo __(
$pandora_version, $pandora_version,
$build_package_version, $build_package_version,
$config['MR'] $config['MR']
); ).'</a><br><span>'.__('Page generated on %s', date('Y-m-d H:i:s')).'</span><br>';
echo '</a><br />';
echo '<small><span>'.__('Page generated on %s', date('Y-m-d H:i:s')).'</span></small>';

View File

@ -28,7 +28,6 @@
.modalheadertex{ .modalheadertex{
color:white; color:white;
position:relative; position:relative;
font-family:Nunito;
font-size:13pt; font-size:13pt;
top:8px; top:8px;
} }
@ -70,7 +69,6 @@
} }
.modalwikibuttontex{ .modalwikibuttontex{
color:#ffffff; color:#ffffff;
font-family:Nunito;
font-size:10pt; font-size:10pt;
position:relative; position:relative;
top:6px; top:6px;

View File

@ -29,7 +29,6 @@
} }
.modalheadertex{ .modalheadertex{
color:#000; color:#000;
font-family:Nunito;
line-height: 40px; line-height: 40px;
font-size: 23pt; font-size: 23pt;
margin-bottom:30px; margin-bottom:30px;
@ -66,7 +65,6 @@
} }
.modalokbuttontex{ .modalokbuttontex{
color:#82b92e; color:#82b92e;
font-family:Nunito;
font-size:13pt; font-size:13pt;
} }
.modalgobutto{ .modalgobutto{
@ -80,7 +78,6 @@
} }
.modalgobuttontex{ .modalgobuttontex{
color:#82b92e; color:#82b92e;
font-family:Nunito;
font-size:10pt; font-size:10pt;
} }

View File

@ -29,7 +29,6 @@
} }
.modalheadertex{ .modalheadertex{
color:#000; color:#000;
font-family:Nunito;
line-height: 40px; line-height: 40px;
font-size: 23pt; font-size: 23pt;
margin-bottom:30px; margin-bottom:30px;
@ -66,7 +65,6 @@
} }
.modalokbuttontex{ .modalokbuttontex{
color:#82b92e; color:#82b92e;
font-family:Nunito;
font-size:13pt; font-size:13pt;
} }
.modalgobutto{ .modalgobutto{
@ -80,7 +78,6 @@
} }
.modalgobuttontex{ .modalgobuttontex{
color:#82b92e; color:#82b92e;
font-family:Nunito;
font-size:10pt; font-size:10pt;
} }

View File

@ -211,26 +211,6 @@ $fonts = [
'196pt' => '196pt', '196pt' => '196pt',
]; ];
/*
$fontf = array('andale mono,times' => 'Andale Mono',
'arial,helvetica,sans-serif' => 'Arial',
'arial black,avant garde' => 'Arial Black',
'comic sans ms,sans-serif' => 'Comic Sans MS',
'courier new,courier' => 'Courier New',
'georgia,palatino' => 'Georgia',
'helvetica,impact' => 'Helvetica',
'impact,chicago' => 'Impact',
'symbol' => 'Symbol',
'tahoma,arial,helvetica,sans-serif' => 'Tahoma',
'terminal,monaco' => 'Terminal',
'times new roman,times' => 'Times New Roman',
'trebuchet ms,geneva' => 'Trebuchet MS',
'verdana,geneva' => 'Verdana',
'Webdings' => 'Webdings',
'Wingdings' => 'Wingdings'
);
*/
$table->rowstyle['all_9'] = 'display: none;'; $table->rowstyle['all_9'] = 'display: none;';
$table->data['all_9'][0] = __('Font'); $table->data['all_9'][0] = __('Font');
$table->colspan['all_9'][1] = '3'; $table->colspan['all_9'][1] = '3';

View File

@ -616,36 +616,6 @@ $table_font->style[0] = 'font-weight: bold;';
$table_font->size[0] = '50%'; $table_font->size[0] = '50%';
$table_font->data = []; $table_font->data = [];
$table_font->data[$row][0] = __('Graphs font family');
// Load font families.
$fonts = [];
$dirFonts = scandir(_MPDF_TTFONTPATH);
foreach ($dirFonts as $entryDir) {
if (strstr($entryDir, '.ttf') !== false) {
$explode = explode('-', $entryDir);
if (count($explode) === 1) {
$fonts[$entryDir] = substr($entryDir, 0, (strlen($entryDir) - 4));
}
if ($explode[1] === 'Regular.ttf') {
$fonts[$explode[0].'.ttf'] = $explode[0];
}
}
}
$table_font->data[$row][1] = html_print_select(
$fonts,
'fontpath',
io_safe_output($config['fontpath']),
'',
'',
0,
true
);
$row++;
$table_font->data[$row][0] = __('Graphs font size'); $table_font->data[$row][0] = __('Graphs font size');
$font_size_array = [ $font_size_array = [
@ -1150,20 +1120,6 @@ $table_report->data[$row][1] = "<input type ='number' value=".$config['font_size
$row++; $row++;
$table_report->data[$row][0] = __('PDF font family');
$table_report->data[$row][1] = html_print_select(
$fonts,
'custom_report_front_font',
$config['custom_report_front_font'],
false,
__('Default'),
'',
true
);
$row++;
$table_report->data[$row][0] = __('Graph image height for HTML reports'); $table_report->data[$row][0] = __('Graph image height for HTML reports');
$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true); $table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);

View File

@ -2,7 +2,6 @@
background-color: #373a3d; background-color: #373a3d;
background-image: -moz-linear-gradient(center top, #373a3d, #313437); background-image: -moz-linear-gradient(center top, #373a3d, #313437);
border-radius: 3px; border-radius: 3px;
font-family: "PT Sans Narrow", sans-serif;
margin: 0px; margin: 0px;
padding: 30px; padding: 30px;
} }
@ -24,7 +23,6 @@
#drop_file table td, #drop_file table td,
#drop_file table label { #drop_file table label {
color: #707070; color: #707070;
font-family: "PT Sans Narrow", sans-serif;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
margin-top: 0; margin-top: 0;
@ -153,7 +151,7 @@
div#box_online * { div#box_online * {
font-size: 16pt; font-size: 16pt;
font-family: "Open Sans", sans-serif; margin-bottom: 50px;
} }
#box_online .content { #box_online .content {
@ -200,7 +198,6 @@ a.update_manager_button {
font-size: 16px; font-size: 16px;
border-radius: 4px; border-radius: 4px;
text-decoration: none; text-decoration: none;
font-family: "Open Sans", sans-serif;
} }
a.update_manager_button:after { a.update_manager_button:after {
@ -221,6 +218,7 @@ a.update_manager_button:after {
color: #82b92e; color: #82b92e;
font-size: 75pt; font-size: 75pt;
font-weight: bold; font-weight: bold;
margin-bottom: 50px;
} }
/* METACONSOLE */ /* METACONSOLE */

View File

@ -6,6 +6,6 @@
C0,3.19,3.188,0,7.087,0h14.826C25.809,0,29,3.188,29,7.088V21.915z"/> C0,3.19,3.188,0,7.087,0h14.826C25.809,0,29,3.188,29,7.088V21.915z"/>
</g> </g>
</g> </g>
<text transform="matrix(1 0 0 1 8.0737 21.2432)" fill="#FFFFFF" font-family="'Arial-BoldMT'" font-size="19">D</text> <text transform="matrix(1 0 0 1 8.0737 21.2432)" fill="#FFFFFF" font-size="19">D</text>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 350 B

View File

@ -233,7 +233,7 @@ if (check_login()) {
false false
); );
$formtable->data[0][2] = ''; $formtable->data[0][2] = '';
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0' ]).'</a>'; $formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'invert_filter' ]).'</a>';
$formtable->rowspan[0][3] = 2; $formtable->rowspan[0][3] = 2;
$formtable->cellstyle[0][3] = 'vertical-align: middle;'; $formtable->cellstyle[0][3] = 'vertical-align: middle;';
@ -1051,7 +1051,7 @@ if (check_login()) {
if ($module['flag'] == 0) { if ($module['flag'] == 0) {
$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;flag=1&amp;refr=60">'.html_print_image('images/target.png', true, ['border' => '0', 'title' => __('Force'), 'class' => 'invert_filter' ]).'</a>'; $data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;flag=1&amp;refr=60">'.html_print_image('images/target.png', true, ['border' => '0', 'title' => __('Force'), 'class' => 'invert_filter' ]).'</a>';
} else { } else {
$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60">'.html_print_image('images/refresh.png', true, ['border' => '0', 'title' => __('Refresh')]).'</a>'; $data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60">'.html_print_image('images/refresh.png', true, ['border' => '0', 'title' => __('Refresh'), 'class' => 'invert_filter']).'</a>';
} }
} }
} else { } else {
@ -1140,7 +1140,7 @@ if (check_login()) {
// Adds tag context information. // Adds tag context information.
if (tags_get_modules_tag_count($module['id_agente_modulo']) > 0) { if (tags_get_modules_tag_count($module['id_agente_modulo']) > 0) {
$data[3] .= ' <a class="tag_details" href="ajax.php?page=operation/agentes/estado_monitores&get_tag_tooltip=1&id_agente_modulo='.$module['id_agente_modulo'].'">'.html_print_image('images/tag_red.png', true, ['id' => 'tag-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).'</a> '; $data[3] .= ' <a class="tag_details" href="ajax.php?page=operation/agentes/estado_monitores&get_tag_tooltip=1&id_agente_modulo='.$module['id_agente_modulo'].'">'.html_print_image('images/tag_red.png', true, ['id' => 'tag-details-'.$module['id_agente_modulo'], 'class' => 'img_help invert_filter']).'</a> ';
} }
// Adds relations context information. // Adds relations context information.

File diff suppressed because it is too large Load Diff

View File

@ -176,6 +176,7 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
$params['only_image'] = false; $params['only_image'] = false;
$params['menu'] = false; $params['menu'] = false;
$params['disable_black'] = true;
$params_combined = json_decode($data_combined, true); $params_combined = json_decode($data_combined, true);
$module_list = json_decode($data_module_list, true); $module_list = json_decode($data_module_list, true);
@ -219,6 +220,7 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
break; break;
case 'pie_chart': case 'pie_chart':
$params['pdf'] = true;
echo flot_pie_chart( echo flot_pie_chart(
$params['values'], $params['values'],
$params['keys'], $params['keys'],
@ -234,10 +236,12 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
break; break;
case 'vbar': case 'vbar':
$params['pdf'] = true;
echo flot_vcolumn_chart($params); echo flot_vcolumn_chart($params);
break; break;
case 'hbar': case 'hbar':
$params['pdf'] = true;
echo flot_hcolumn_chart( echo flot_hcolumn_chart(
$params['chart_data'], $params['chart_data'],
$params['width'], $params['width'],
@ -248,11 +252,13 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
$params['backgroundColor'], $params['backgroundColor'],
$params['tick_color'], $params['tick_color'],
$params['val_min'], $params['val_min'],
$params['val_max'] $params['val_max'],
$params['pdf']
); );
break; break;
case 'ring_graph': case 'ring_graph':
$params['pdf'] = true;
echo flot_custom_pie_chart( echo flot_custom_pie_chart(
$params['chart_data'], $params['chart_data'],
$params['width'], $params['width'],
@ -271,7 +277,8 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
$params['homeurl'], $params['homeurl'],
$params['background_color'], $params['background_color'],
$params['legend_position'], $params['legend_position'],
$params['background_color'] $params['background_color'],
$params['pdf']
); );
break; break;

View File

@ -872,7 +872,7 @@ class ModuleTemplates extends HTML
ui_pagination($countModuleTemplates, $this->baseUrl, $this->offset); ui_pagination($countModuleTemplates, $this->baseUrl, $this->offset);
// Create the table with Module Block list. // Create the table with Module Block list.
$table = new StdClasS(); $table = new StdClasS();
$table->class = 'databox data'; $table->class = 'databox data ';
$table->width = '75%'; $table->width = '75%';
$table->styleTable = 'margin: 2em auto 0;border: 1px solid #ddd;'; $table->styleTable = 'margin: 2em auto 0;border: 1px solid #ddd;';
$table->rowid = []; $table->rowid = [];
@ -881,7 +881,7 @@ class ModuleTemplates extends HTML
$table->cellpadding = 0; $table->cellpadding = 0;
$table->cellspacing = 0; $table->cellspacing = 0;
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table'; $table->class = 'info_table border_bt';
$table->head = []; $table->head = [];
$table->head[0] = html_print_checkbox('all_delete', 0, false, true, false); $table->head[0] = html_print_checkbox('all_delete', 0, false, true, false);
@ -1189,7 +1189,7 @@ class ModuleTemplates extends HTML
$blockTitle .= '</div></div>'; $blockTitle .= '</div></div>';
$table = new StdClasS(); $table = new StdClasS();
$table->class = 'databox data'; $table->class = 'databox data border_bt';
$table->width = '75%'; $table->width = '75%';
$table->styleTable = 'margin: 2em auto 0;border: 1px solid #ddd;'; $table->styleTable = 'margin: 2em auto 0;border: 1px solid #ddd;';
$table->rowid = []; $table->rowid = [];
@ -1198,7 +1198,7 @@ class ModuleTemplates extends HTML
$table->cellpadding = 0; $table->cellpadding = 0;
$table->cellspacing = 0; $table->cellspacing = 0;
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table'; $table->class = 'info_table border_bt';
$table->head = []; $table->head = [];
$table->head[0] = __('Module Name'); $table->head[0] = __('Module Name');

View File

@ -421,7 +421,7 @@ class WelcomeWindow extends Wizard
[ [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_configure_mail', 'block_id' => 'div_configure_mail',
'class' => 'hole flex-row w100p '.$li_configure_mail_class, 'class' => 'hole flex-row w98p '.$li_configure_mail_class,
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
[ [
@ -455,7 +455,7 @@ class WelcomeWindow extends Wizard
[ [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_create_agent', 'block_id' => 'div_create_agent',
'class' => 'learn_content_indented flex-row w100p '.$li_create_agent_class, 'class' => 'learn_content_indented flex-row w98p '.$li_create_agent_class,
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
[ [
@ -480,7 +480,7 @@ class WelcomeWindow extends Wizard
[ [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_monitor_actions', 'block_id' => 'div_monitor_actions',
'class' => 'learn_content_indented flex-row w100p '.$li_create_module_class, 'class' => 'learn_content_indented flex-row w98p '.$li_create_module_class,
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
[ [
@ -505,7 +505,7 @@ class WelcomeWindow extends Wizard
[ [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_monitor_actions', 'block_id' => 'div_monitor_actions',
'class' => 'hole learn_content_indented flex-row w100p '.$li_create_alert_class, 'class' => 'hole learn_content_indented flex-row w98p '.$li_create_alert_class,
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
[ [
@ -530,7 +530,7 @@ class WelcomeWindow extends Wizard
[ [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_discover', 'block_id' => 'div_discover',
'class' => 'hole flex-row w100p '.$li_create_discovery_class, 'class' => 'hole flex-row w98p '.$li_create_discovery_class,
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
[ [
@ -558,7 +558,7 @@ class WelcomeWindow extends Wizard
$inputs[] = [ $inputs[] = [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_not_working', 'block_id' => 'div_not_working',
'class' => 'hole flex-row w100p', 'class' => 'hole flex-row w98p',
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
[ [

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -38,7 +38,6 @@
.terminal { .terminal {
background-color: #000; background-color: #000;
color: #fff; color: #fff;
font-family: courier-new, courier, monospace;
font-feature-settings: "liga" 0; font-feature-settings: "liga" 0;
position: relative; position: relative;
} }
@ -86,7 +85,8 @@
text-decoration: none; text-decoration: none;
} }
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor { .terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar)
.terminal-cursor {
background-color: #fff; background-color: #fff;
color: #000; color: #000;
} }
@ -97,7 +97,8 @@
background-color: transparent; background-color: transparent;
} }
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink-on .terminal-cursor { .terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink-on
.terminal-cursor {
background-color: transparent; background-color: transparent;
color: inherit; color: inherit;
} }
@ -125,18 +126,22 @@
right: 0; right: 0;
height: 1px; height: 1px;
} }
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before, .terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink.xterm-cursor-blink-on
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before { .terminal-cursor::before,
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink.xterm-cursor-blink-on
.terminal-cursor::before {
background-color: transparent; background-color: transparent;
} }
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before, .terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before { .terminal-cursor::before,
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink
.terminal-cursor::before {
background-color: #fff; background-color: #fff;
} }
.terminal .composition-view { .terminal .composition-view {
background: #000; background: #000;
color: #FFF; color: #fff;
display: none; display: none;
position: absolute; position: absolute;
white-space: nowrap; white-space: nowrap;

View File

@ -1 +0,0 @@
Copyright 2011 Google Inc. All Rights Reserved.

View File

@ -1,202 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2247,7 +2247,7 @@ function config_process_config()
if (!isset($config['fontpath'])) { if (!isset($config['fontpath'])) {
config_update_value( config_update_value(
'fontpath', 'fontpath',
'opensans.ttf' 'lato.ttf'
); );
} }
@ -3130,7 +3130,7 @@ function config_process_config()
} }
if (!isset($config['custom_report_front_font'])) { if (!isset($config['custom_report_front_font'])) {
config_update_value('custom_report_front_font', 'opensans.ttf'); config_update_value('custom_report_front_font', 'lato.ttf');
} }
if (!isset($config['custom_report_front_logo'])) { if (!isset($config['custom_report_front_logo'])) {

View File

@ -735,6 +735,10 @@ function grafico_modulo_sparse($params)
$params['backgroundColor'] = 'white'; $params['backgroundColor'] = 'white';
} }
if (isset($params['only_image']) === true) {
$params['backgroundColor'] = 'transparent';
}
if (isset($params['percentil']) === false) { if (isset($params['percentil']) === false) {
$params['percentil'] = null; $params['percentil'] = null;
} }
@ -825,10 +829,17 @@ function grafico_modulo_sparse($params)
$params['stacked'] = 0; $params['stacked'] = 0;
} }
$font_size = $config['font_size'];
// If is metaconsole set 10pt size value.
if (is_metaconsole()) {
$font_size = '10';
}
$params['grid_color'] = '#C1C1C1'; $params['grid_color'] = '#C1C1C1';
$params['legend_color'] = '#636363'; $params['legend_color'] = '#636363';
$params['font'] = $config['fontpath']; $params['font'] = 'lato';
$params['font_size'] = $config['font_size']; $params['font_size'] = $font_size;
$params['short_data'] = $config['short_module_graph_data']; $params['short_data'] = $config['short_module_graph_data'];
if ($params['only_image']) { if ($params['only_image']) {
@ -1330,7 +1341,7 @@ function graphic_combined_module(
$params['grid_color'] = '#C1C1C1'; $params['grid_color'] = '#C1C1C1';
$params['legend_color'] = '#636363'; $params['legend_color'] = '#636363';
$params['font'] = $config['fontpath']; $params['font'] = 'lato';
$params['font_size'] = $config['font_size']; $params['font_size'] = $config['font_size'];
$params['short_data'] = $config['short_module_graph_data']; $params['short_data'] = $config['short_module_graph_data'];
@ -1530,9 +1541,13 @@ function graphic_combined_module(
} }
$long_index = ''; $long_index = '';
if ($config['style'] === 'pandora_black') {
if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null )
) {
$background_color = '#222'; $background_color = '#222';
$params['legend_color'] = '#fff'; $params['legend_color'] = '#fff';
} else if ($params['pdf']) {
$params['legend_color'] = '#000';
} }
switch ($params_combined['stacked']) { switch ($params_combined['stacked']) {
@ -2262,7 +2277,11 @@ function graphic_combined_module(
$ttl, $ttl,
$homeurl, $homeurl,
$background_color, $background_color,
'#c1c1c1' '#c1c1c1',
null,
null,
false,
$params['pdf']
); );
} }
@ -2282,10 +2301,10 @@ function graphic_combined_module(
$options['generals']['forceTicks'] = true; $options['generals']['forceTicks'] = true;
$options['x']['labelWidth'] = ($params['pdf'] === true) ? 30 : $sizeLabelTickWidth; $options['x']['labelWidth'] = ($params['pdf'] === true) ? 30 : $sizeLabelTickWidth;
$options['generals']['arrayColors'] = $color; $options['generals']['arrayColors'] = $color;
$options['grid']['backgroundColor'] = 'transparent';
$options['grid']['backgroundColor'] = $background_color; $options['grid']['backgroundColor'] = $background_color;
$options['y']['color'] = $background_color; $options['y']['color'] = $background_color;
$options['x']['color'] = $background_color; $options['x']['color'] = $background_color;
$options['pdf'] = $params['pdf'];
$output = vbar_graph($graph_values, $options, $ttl); $output = vbar_graph($graph_values, $options, $ttl);
} }
@ -2382,7 +2401,8 @@ function graphic_combined_module(
false, false,
$color, $color,
false, false,
$background_color $background_color,
$params['pdf']
); );
break; break;
} }
@ -3816,6 +3836,7 @@ function graph_custom_sql_graph(
$options['generals']['forceTicks'] = true; $options['generals']['forceTicks'] = true;
$options['generals']['arrayColors'] = $color; $options['generals']['arrayColors'] = $color;
$options['x']['labelWidth'] = 75; $options['x']['labelWidth'] = 75;
$options['pdf'] = $only_image;
if ($ttl === 2) { if ($ttl === 2) {
$options['x']['labelWidth'] = 35; $options['x']['labelWidth'] = 35;
$options['backgroundColor'] = 'transparent'; $options['backgroundColor'] = 'transparent';
@ -3824,7 +3845,6 @@ function graph_custom_sql_graph(
$options['x']['color'] = 'transparent'; $options['x']['color'] = 'transparent';
$options['generals']['pdf']['width'] = $width; $options['generals']['pdf']['width'] = $width;
$options['generals']['pdf']['height'] = $height; $options['generals']['pdf']['height'] = $height;
$output .= '<img src="data:image/jpg;base64,'; $output .= '<img src="data:image/jpg;base64,';
$output .= vbar_graph($data, $options, $ttl); $output .= vbar_graph($data, $options, $ttl);
$output .= '" />'; $output .= '" />';

View File

@ -5086,7 +5086,7 @@ function reporting_sql_graph(
$width, $width,
$height, $height,
$content['type'], $content['type'],
true, $only_image,
ui_get_full_url(false, false, false, false), ui_get_full_url(false, false, false, false),
$ttl, $ttl,
$content['top_n_value'] $content['top_n_value']
@ -10607,11 +10607,11 @@ function reporting_get_stats_modules_status($data, $graph_width=250, $graph_heig
$tdata = []; $tdata = [];
$tdata[0] = html_print_image('images/module_critical.png', true, ['title' => __('Monitor critical')], false, false, false, true); $tdata[0] = html_print_image('images/module_critical.png', true, ['title' => __('Monitor critical')], false, false, false, true);
$tdata[1] = $data['monitor_critical'] <= 0 ? '-' : $data['monitor_critical']; $tdata[1] = $data['monitor_critical'] <= 0 ? '-' : $data['monitor_critical'];
$tdata[1] = '<a style="color: '.COL_CRITICAL.';" class="big_data" href="'.$urls['monitor_critical'].'">'.$tdata[1].'</a>'; $tdata[1] = '<a style="color: '.COL_CRITICAL.';" class="big_data line_heigth_initial" href="'.$urls['monitor_critical'].'">'.$tdata[1].'</a>';
$tdata[2] = html_print_image('images/module_warning.png', true, ['title' => __('Monitor warning')], false, false, false, true); $tdata[2] = html_print_image('images/module_warning.png', true, ['title' => __('Monitor warning')], false, false, false, true);
$tdata[3] = $data['monitor_warning'] <= 0 ? '-' : $data['monitor_warning']; $tdata[3] = $data['monitor_warning'] <= 0 ? '-' : $data['monitor_warning'];
$tdata[3] = '<a style="color: '.COL_WARNING_DARK.';" class="big_data" href="'.$urls['monitor_warning'].'">'.$tdata[3].'</a>'; $tdata[3] = '<a style="color: '.COL_WARNING_DARK.';" class="big_data line_heigth_initial" href="'.$urls['monitor_warning'].'">'.$tdata[3].'</a>';
$table_mbs->rowclass[] = ''; $table_mbs->rowclass[] = '';
$table_mbs->data[] = $tdata; $table_mbs->data[] = $tdata;
@ -10622,14 +10622,14 @@ function reporting_get_stats_modules_status($data, $graph_width=250, $graph_heig
$tdata[2] = html_print_image('images/module_unknown.png', true, ['title' => __('Monitor unknown')], false, false, false, true); $tdata[2] = html_print_image('images/module_unknown.png', true, ['title' => __('Monitor unknown')], false, false, false, true);
$tdata[3] = $data['monitor_unknown'] <= 0 ? '-' : $data['monitor_unknown']; $tdata[3] = $data['monitor_unknown'] <= 0 ? '-' : $data['monitor_unknown'];
$tdata[3] = '<a style="color: '.COL_UNKNOWN.';" class="big_data" href="'.$urls['monitor_unknown'].'">'.$tdata[3].'</a>'; $tdata[3] = '<a style="color: '.COL_UNKNOWN.';" class="big_data line_heigth_initial" href="'.$urls['monitor_unknown'].'">'.$tdata[3].'</a>';
$table_mbs->rowclass[] = ''; $table_mbs->rowclass[] = '';
$table_mbs->data[] = $tdata; $table_mbs->data[] = $tdata;
$tdata = []; $tdata = [];
$tdata[0] = html_print_image('images/module_notinit.png', true, ['title' => __('Monitor not init')], false, false, false, true); $tdata[0] = html_print_image('images/module_notinit.png', true, ['title' => __('Monitor not init')], false, false, false, true);
$tdata[1] = $data['monitor_not_init'] <= 0 ? '-' : $data['monitor_not_init']; $tdata[1] = $data['monitor_not_init'] <= 0 ? '-' : $data['monitor_not_init'];
$tdata[1] = '<a style="color: '.COL_NOTINIT.';" class="big_data" href="'.$urls['monitor_not_init'].'">'.$tdata[1].'</a>'; $tdata[1] = '<a style="color: '.COL_NOTINIT.';" class="big_data line_heigth_initial" href="'.$urls['monitor_not_init'].'">'.$tdata[1].'</a>';
$tdata[2] = $tdata[3] = ''; $tdata[2] = $tdata[3] = '';
$table_mbs->rowclass[] = ''; $table_mbs->rowclass[] = '';
@ -13079,7 +13079,7 @@ function reporting_get_stats_servers()
if (isset($server_performance['total_web_modules'])) { if (isset($server_performance['total_web_modules'])) {
$tdata = []; $tdata = [];
$tdata[0] = html_print_image('images/world.png', true, ['title' => __('Web modules')]); $tdata[0] = html_print_image('images/world.png', true, ['title' => __('Web modules'), 'class' => 'invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_web_modules']).'</span>'; $tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_web_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['web_modules_rate'], 2).'</span>'; $tdata[2] = '<span class="med_data">'.format_numeric($server_performance['web_modules_rate'], 2).'</span>';

View File

@ -2409,7 +2409,7 @@ function reporting_html_historical_data($table, $item, $pdf=0)
} else { } else {
// Command line snapshot. // Command line snapshot.
if (is_text_to_black_string($data[__('Data')])) { if (is_text_to_black_string($data[__('Data')])) {
$table1->style[1] = 'text-align: left; font-family: monospace, mono'; $table1->style[1] = 'text-align: left;';
$row = [ $row = [
$data[__('Date')], $data[__('Date')],
'<pre>'.$data[__('Data')].'</pre>', '<pre>'.$data[__('Data')].'</pre>',
@ -2494,7 +2494,6 @@ function reporting_html_database_serialized($table, $item, $pdf=0)
} }
} else if (is_text_to_black_string($data_unserialized[$key])) { } else if (is_text_to_black_string($data_unserialized[$key])) {
$table1->style[1] = 'white-space: pre-wrap;'; $table1->style[1] = 'white-space: pre-wrap;';
$table1->style[1] .= 'font-family: monospace, mono; ';
$table1->style[1] .= 'text-align: left'; $table1->style[1] .= 'text-align: left';
$data_unserialized[$key] = '<pre>'.$data_value.'</pre>'; $data_unserialized[$key] = '<pre>'.$data_value.'</pre>';
} }

View File

@ -2666,7 +2666,7 @@ function visual_map_process_wizard_add_modules(
$id_server=0, $id_server=0,
$kind_relationship=VISUAL_MAP_WIZARD_PARENTS_NONE, $kind_relationship=VISUAL_MAP_WIZARD_PARENTS_NONE,
$item_in_the_map=0, $item_in_the_map=0,
$fontf='arial', $fontf='lato',
$fonts='12pt' $fonts='12pt'
) { ) {
if (empty($id_modules)) { if (empty($id_modules)) {
@ -2943,7 +2943,7 @@ function visual_map_process_wizard_add_agents(
$id_server=0, $id_server=0,
$kind_relationship=VISUAL_MAP_WIZARD_PARENTS_NONE, $kind_relationship=VISUAL_MAP_WIZARD_PARENTS_NONE,
$item_in_the_map=0, $item_in_the_map=0,
$fontf='arial', $fontf='lato',
$fonts='12pt' $fonts='12pt'
) { ) {
global $config; global $config;

View File

@ -178,7 +178,7 @@ function vbar_graph(
if (isset($options['x']['title']['fontFamily']) === false) { if (isset($options['x']['title']['fontFamily']) === false) {
$options['x']['title']['fontFamily'] = preg_replace( $options['x']['title']['fontFamily'] = preg_replace(
'/.ttf/', '/.ttf/',
'Font, Arial', 'Font, lato',
$config['fontpath'] $config['fontpath']
); );
} }
@ -218,7 +218,9 @@ function vbar_graph(
if (isset($options['x']['font']['color']) === false) { if (isset($options['x']['font']['color']) === false) {
$options['x']['font']['color'] = '#545454'; $options['x']['font']['color'] = '#545454';
if ($config['style'] === 'pandora_black') { if ($options['pdf'] === true) {
$options['x']['font']['color'] = '#000';
} else if ($config['style'] === 'pandora_black') {
$options['x']['font']['color'] = '#fff'; $options['x']['font']['color'] = '#fff';
} }
} }
@ -261,7 +263,7 @@ function vbar_graph(
if (isset($options['y']['title']['fontFamily']) === false) { if (isset($options['y']['title']['fontFamily']) === false) {
$options['y']['title']['fontFamily'] = preg_replace( $options['y']['title']['fontFamily'] = preg_replace(
'/.ttf/', '/.ttf/',
'Font, Arial', 'Font',
$config['fontpath'] $config['fontpath']
); );
} }
@ -301,9 +303,10 @@ function vbar_graph(
if (isset($options['y']['font']['color']) === false) { if (isset($options['y']['font']['color']) === false) {
$options['y']['font']['color'] = '#545454'; $options['y']['font']['color'] = '#545454';
if ($options['pdf'] === true) {
if ($config['style'] === 'pandora_black') { $options['y']['font']['color'] = '#000';
$options['y']['font']['color'] = '#222'; } else if ($config['style'] === 'pandora_black') {
$options['y']['font']['color'] = '#fff';
} }
} }
@ -359,7 +362,7 @@ function vbar_graph(
if (isset($options['grid']['color']) === false) { if (isset($options['grid']['color']) === false) {
$options['grid']['color'] = '#ffffff'; $options['grid']['color'] = '#ffffff';
if ($config['style'] === 'pandora_black') { if ($config['style'] === 'pandora_black') {
$options['grid']['color'] = '#222'; $options['grid']['color'] = '#111';
} }
} }
@ -370,7 +373,7 @@ function vbar_graph(
'#ffffff', '#ffffff',
], ],
]; ];
if ($config['style'] === 'pandora_black') { if ($config['style'] === 'pandora_black' && $ttl === 1) {
$options['grid']['backgroundColor'] = [ $options['grid']['backgroundColor'] = [
'colors' => [ 'colors' => [
'#222', '#222',
@ -714,7 +717,8 @@ function hbar_graph(
$tick_color='white', $tick_color='white',
$val_min=null, $val_min=null,
$val_max=null, $val_max=null,
$base64=false $base64=false,
$pdf=false
) { ) {
global $config; global $config;
if ($water_mark !== false) { if ($water_mark !== false) {
@ -742,7 +746,11 @@ function hbar_graph(
return generator_chart_to_pdf('hbar', $params); return generator_chart_to_pdf('hbar', $params);
} }
if ($config['style'] === 'pandora_black') { if ($config['style'] === 'pandora_black' && $ttl === 1) {
$backgroundColor = '#222';
}
if ($config['style'] === 'pandora_black' && $ttl === 1) {
$tick_color = '#fff'; $tick_color = '#fff';
} }
@ -756,7 +764,8 @@ function hbar_graph(
$backgroundColor, $backgroundColor,
$tick_color, $tick_color,
$val_min, $val_min,
$val_max $val_max,
$pdf
); );
} }
@ -859,7 +868,8 @@ function ring_graph(
$legend_position=false, $legend_position=false,
$colors='', $colors='',
$hide_labels=false, $hide_labels=false,
$background_color='white' $background_color='white',
$pdf=false
) { ) {
if (empty($chart_data)) { if (empty($chart_data)) {
return graph_nodata_image($width, $height, 'pie'); return graph_nodata_image($width, $height, 'pie');
@ -887,7 +897,7 @@ function ring_graph(
'homeurl' => $homeurl, 'homeurl' => $homeurl,
'background_color' => $background_color, 'background_color' => $background_color,
'legend_position' => $legend_position, 'legend_position' => $legend_position,
'background_color' => $background_color, 'pdf' => $pdf,
]; ];
return generator_chart_to_pdf('ring_graph', $params); return generator_chart_to_pdf('ring_graph', $params);
@ -911,6 +921,7 @@ function ring_graph(
$homeurl, $homeurl,
$background_color, $background_color,
$legend_position, $legend_position,
$background_color $background_color,
$pdf
); );
} }

View File

@ -35,7 +35,7 @@
// Only add this code if we do not already have a canvas implementation // Only add this code if we do not already have a canvas implementation
if (!document.createElement('canvas').getContext) { if (!document.createElement('canvas').getContext) {
(function() { (function () {
// alias some functions to make (compiled) code shorter // alias some functions to make (compiled) code shorter
var m = Math; var m = Math;
@ -81,7 +81,7 @@ if (!document.createElement('canvas').getContext) {
*/ */
function bind(f, obj, var_args) { function bind(f, obj, var_args) {
var a = slice.call(arguments, 2); var a = slice.call(arguments, 2);
return function() { return function () {
return f.apply(obj, a.concat(slice.call(arguments))); return f.apply(obj, a.concat(slice.call(arguments)));
}; };
} }
@ -114,7 +114,7 @@ if (!document.createElement('canvas').getContext) {
addNamespacesAndStylesheet(document); addNamespacesAndStylesheet(document);
var G_vmlCanvasManager_ = { var G_vmlCanvasManager_ = {
init: function(opt_doc) { init: function (opt_doc) {
var doc = opt_doc || document; var doc = opt_doc || document;
// Create a dummy element so that IE will allow canvas elements to be // Create a dummy element so that IE will allow canvas elements to be
// recognized. // recognized.
@ -122,7 +122,7 @@ if (!document.createElement('canvas').getContext) {
doc.attachEvent('onreadystatechange', bind(this.init_, this, doc)); doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
}, },
init_: function(doc) { init_: function (doc) {
// find all canvas elements // find all canvas elements
var els = doc.getElementsByTagName('canvas'); var els = doc.getElementsByTagName('canvas');
for (var i = 0; i < els.length; i++) { for (var i = 0; i < els.length; i++) {
@ -138,7 +138,7 @@ if (!document.createElement('canvas').getContext) {
* @param {HTMLElement} el The canvas element to initialize. * @param {HTMLElement} el The canvas element to initialize.
* @return {HTMLElement} the element that was created. * @return {HTMLElement} the element that was created.
*/ */
initElement: function(el) { initElement: function (el) {
if (!el.getContext) { if (!el.getContext) {
el.getContext = getContext; el.getContext = getContext;
@ -410,7 +410,7 @@ if (!document.createElement('canvas').getContext) {
return Math.min(max, Math.max(min, v)); return Math.min(max, Math.max(min, v));
} }
function hslToRgb(parts){ function hslToRgb(parts) {
var r, g, b, h, s, l; var r, g, b, h, s, l;
h = parseFloat(parts[0]) / 360 % 360; h = parseFloat(parts[0]) / 360 % 360;
if (h < 0) if (h < 0)
@ -479,15 +479,14 @@ if (!document.createElement('canvas').getContext) {
} else { } else {
str = colorData[styleString] || styleString; str = colorData[styleString] || styleString;
} }
return processStyleCache[styleString] = {color: str, alpha: alpha}; return processStyleCache[styleString] = { color: str, alpha: alpha };
} }
var DEFAULT_STYLE = { var DEFAULT_STYLE = {
style: 'normal', style: 'normal',
variant: 'normal', variant: 'normal',
weight: 'normal', weight: 'normal',
size: 10, size: 10
family: 'sans-serif'
}; };
// Internal text style cache // Internal text style cache
@ -532,7 +531,7 @@ if (!document.createElement('canvas').getContext) {
computedStyle.size = fontSize; computedStyle.size = fontSize;
} else if (style.size.indexOf('em') != -1) { } else if (style.size.indexOf('em') != -1) {
computedStyle.size = canvasFontSize * fontSize; computedStyle.size = canvasFontSize * fontSize;
} else if(style.size.indexOf('%') != -1) { } else if (style.size.indexOf('%') != -1) {
computedStyle.size = (canvasFontSize / 100) * fontSize; computedStyle.size = (canvasFontSize / 100) * fontSize;
} else if (style.size.indexOf('pt') != -1) { } else if (style.size.indexOf('pt') != -1) {
computedStyle.size = fontSize / .75; computedStyle.size = fontSize / .75;
@ -607,7 +606,7 @@ if (!document.createElement('canvas').getContext) {
} }
var contextPrototype = CanvasRenderingContext2D_.prototype; var contextPrototype = CanvasRenderingContext2D_.prototype;
contextPrototype.clearRect = function() { contextPrototype.clearRect = function () {
if (this.textMeasureEl_) { if (this.textMeasureEl_) {
this.textMeasureEl_.removeNode(true); this.textMeasureEl_.removeNode(true);
this.textMeasureEl_ = null; this.textMeasureEl_ = null;
@ -615,28 +614,28 @@ if (!document.createElement('canvas').getContext) {
this.element_.innerHTML = ''; this.element_.innerHTML = '';
}; };
contextPrototype.beginPath = function() { contextPrototype.beginPath = function () {
// TODO: Branch current matrix so that save/restore has no effect // TODO: Branch current matrix so that save/restore has no effect
// as per safari docs. // as per safari docs.
this.currentPath_ = []; this.currentPath_ = [];
}; };
contextPrototype.moveTo = function(aX, aY) { contextPrototype.moveTo = function (aX, aY) {
var p = getCoords(this, aX, aY); var p = getCoords(this, aX, aY);
this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y}); this.currentPath_.push({ type: 'moveTo', x: p.x, y: p.y });
this.currentX_ = p.x; this.currentX_ = p.x;
this.currentY_ = p.y; this.currentY_ = p.y;
}; };
contextPrototype.lineTo = function(aX, aY) { contextPrototype.lineTo = function (aX, aY) {
var p = getCoords(this, aX, aY); var p = getCoords(this, aX, aY);
this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y}); this.currentPath_.push({ type: 'lineTo', x: p.x, y: p.y });
this.currentX_ = p.x; this.currentX_ = p.x;
this.currentY_ = p.y; this.currentY_ = p.y;
}; };
contextPrototype.bezierCurveTo = function(aCP1x, aCP1y, contextPrototype.bezierCurveTo = function (aCP1x, aCP1y,
aCP2x, aCP2y, aCP2x, aCP2y,
aX, aY) { aX, aY) {
var p = getCoords(this, aX, aY); var p = getCoords(this, aX, aY);
@ -660,7 +659,7 @@ if (!document.createElement('canvas').getContext) {
self.currentY_ = p.y; self.currentY_ = p.y;
} }
contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) { contextPrototype.quadraticCurveTo = function (aCPx, aCPy, aX, aY) {
// the following is lifted almost directly from // the following is lifted almost directly from
// http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes
@ -679,7 +678,7 @@ if (!document.createElement('canvas').getContext) {
bezierCurveTo(this, cp1, cp2, p); bezierCurveTo(this, cp1, cp2, p);
}; };
contextPrototype.arc = function(aX, aY, aRadius, contextPrototype.arc = function (aX, aY, aRadius,
aStartAngle, aEndAngle, aClockwise) { aStartAngle, aEndAngle, aClockwise) {
aRadius *= Z; aRadius *= Z;
var arcType = aClockwise ? 'at' : 'wa'; var arcType = aClockwise ? 'at' : 'wa';
@ -700,18 +699,20 @@ if (!document.createElement('canvas').getContext) {
var pStart = getCoords(this, xStart, yStart); var pStart = getCoords(this, xStart, yStart);
var pEnd = getCoords(this, xEnd, yEnd); var pEnd = getCoords(this, xEnd, yEnd);
this.currentPath_.push({type: arcType, this.currentPath_.push({
type: arcType,
x: p.x, x: p.x,
y: p.y, y: p.y,
radius: aRadius, radius: aRadius,
xStart: pStart.x, xStart: pStart.x,
yStart: pStart.y, yStart: pStart.y,
xEnd: pEnd.x, xEnd: pEnd.x,
yEnd: pEnd.y}); yEnd: pEnd.y
});
}; };
contextPrototype.rect = function(aX, aY, aWidth, aHeight) { contextPrototype.rect = function (aX, aY, aWidth, aHeight) {
this.moveTo(aX, aY); this.moveTo(aX, aY);
this.lineTo(aX + aWidth, aY); this.lineTo(aX + aWidth, aY);
this.lineTo(aX + aWidth, aY + aHeight); this.lineTo(aX + aWidth, aY + aHeight);
@ -719,7 +720,7 @@ if (!document.createElement('canvas').getContext) {
this.closePath(); this.closePath();
}; };
contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) { contextPrototype.strokeRect = function (aX, aY, aWidth, aHeight) {
var oldPath = this.currentPath_; var oldPath = this.currentPath_;
this.beginPath(); this.beginPath();
@ -733,7 +734,7 @@ if (!document.createElement('canvas').getContext) {
this.currentPath_ = oldPath; this.currentPath_ = oldPath;
}; };
contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) { contextPrototype.fillRect = function (aX, aY, aWidth, aHeight) {
var oldPath = this.currentPath_; var oldPath = this.currentPath_;
this.beginPath(); this.beginPath();
@ -747,7 +748,7 @@ if (!document.createElement('canvas').getContext) {
this.currentPath_ = oldPath; this.currentPath_ = oldPath;
}; };
contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) { contextPrototype.createLinearGradient = function (aX0, aY0, aX1, aY1) {
var gradient = new CanvasGradient_('gradient'); var gradient = new CanvasGradient_('gradient');
gradient.x0_ = aX0; gradient.x0_ = aX0;
gradient.y0_ = aY0; gradient.y0_ = aY0;
@ -756,7 +757,7 @@ if (!document.createElement('canvas').getContext) {
return gradient; return gradient;
}; };
contextPrototype.createRadialGradient = function(aX0, aY0, aR0, contextPrototype.createRadialGradient = function (aX0, aY0, aR0,
aX1, aY1, aR1) { aX1, aY1, aR1) {
var gradient = new CanvasGradient_('gradientradial'); var gradient = new CanvasGradient_('gradientradial');
gradient.x0_ = aX0; gradient.x0_ = aX0;
@ -768,7 +769,7 @@ if (!document.createElement('canvas').getContext) {
return gradient; return gradient;
}; };
contextPrototype.drawImage = function(image, var_args) { contextPrototype.drawImage = function (image, var_args) {
var dx, dy, dw, dh, sx, sy, sw, sh; var dx, dy, dw, dh, sx, sy, sw, sh;
// to find the original width we overide the width and height // to find the original width we overide the width and height
@ -825,7 +826,7 @@ if (!document.createElement('canvas').getContext) {
// For some reason that I've now forgotten, using divs didn't work // For some reason that I've now forgotten, using divs didn't work
vmlStr.push(' <g_vml_:group', vmlStr.push(' <g_vml_:group',
' coordsize="', Z * W, ',', Z * H, '"', ' coordsize="', Z * W, ',', Z * H, '"',
' coordorigin="0,0"' , ' coordorigin="0,0"',
' style="width:', W, 'px;height:', H, 'px;position:absolute;'); ' style="width:', W, 'px;height:', H, 'px;position:absolute;');
// If filters are necessary (rotation exists), create them // If filters are necessary (rotation exists), create them
@ -863,7 +864,7 @@ if (!document.createElement('canvas').getContext) {
vmlStr.push('top:', mr(d.y / Z), 'px;left:', mr(d.x / Z), 'px;'); vmlStr.push('top:', mr(d.y / Z), 'px;left:', mr(d.x / Z), 'px;');
} }
vmlStr.push(' ">' , vmlStr.push(' ">',
'<g_vml_:image src="', image.src, '"', '<g_vml_:image src="', image.src, '"',
' style="width:', Z * dw, 'px;', ' style="width:', Z * dw, 'px;',
' height:', Z * dh, 'px"', ' height:', Z * dh, 'px"',
@ -877,7 +878,7 @@ if (!document.createElement('canvas').getContext) {
this.element_.insertAdjacentHTML('BeforeEnd', vmlStr.join('')); this.element_.insertAdjacentHTML('BeforeEnd', vmlStr.join(''));
}; };
contextPrototype.stroke = function(aFill) { contextPrototype.stroke = function (aFill) {
var W = 10; var W = 10;
var H = 10; var H = 10;
// Divide the shape into chunks if it's too long because IE has a limit // Divide the shape into chunks if it's too long because IE has a limit
@ -885,8 +886,8 @@ if (!document.createElement('canvas').getContext) {
// not work with fills, only strokes, unfortunately. // not work with fills, only strokes, unfortunately.
var chunkSize = 5000; var chunkSize = 5000;
var min = {x: null, y: null}; var min = { x: null, y: null };
var max = {x: null, y: null}; var max = { x: null, y: null };
for (var j = 0; j < this.currentPath_.length; j += chunkSize) { for (var j = 0; j < this.currentPath_.length; j += chunkSize) {
var lineStr = []; var lineStr = [];
@ -904,7 +905,7 @@ if (!document.createElement('canvas').getContext) {
for (var i = j; i < Math.min(j + chunkSize, this.currentPath_.length); i++) { for (var i = j; i < Math.min(j + chunkSize, this.currentPath_.length); i++) {
if (i % chunkSize == 0 && i > 0) { // move into position for next chunk if (i % chunkSize == 0 && i > 0) { // move into position for next chunk
lineStr.push(' m ', mr(this.currentPath_[i-1].x), ',', mr(this.currentPath_[i-1].y)); lineStr.push(' m ', mr(this.currentPath_[i - 1].x), ',', mr(this.currentPath_[i - 1].y));
} }
var p = this.currentPath_[i]; var p = this.currentPath_[i];
@ -1007,7 +1008,7 @@ if (!document.createElement('canvas').getContext) {
if (fillStyle instanceof CanvasGradient_) { if (fillStyle instanceof CanvasGradient_) {
// TODO: Gradients transformed with the transformation matrix. // TODO: Gradients transformed with the transformation matrix.
var angle = 0; var angle = 0;
var focus = {x: 0, y: 0}; var focus = { x: 0, y: 0 };
// additional offset // additional offset
var shift = 0; var shift = 0;
@ -1052,7 +1053,7 @@ if (!document.createElement('canvas').getContext) {
// We need to sort the color stops in ascending order by offset, // We need to sort the color stops in ascending order by offset,
// otherwise IE won't interpret it correctly. // otherwise IE won't interpret it correctly.
var stops = fillStyle.colors_; var stops = fillStyle.colors_;
stops.sort(function(cs1, cs2) { stops.sort(function (cs1, cs2) {
return cs1.offset - cs2.offset; return cs1.offset - cs2.offset;
}); });
@ -1101,12 +1102,12 @@ if (!document.createElement('canvas').getContext) {
} }
} }
contextPrototype.fill = function() { contextPrototype.fill = function () {
this.stroke(true); this.stroke(true);
}; };
contextPrototype.closePath = function() { contextPrototype.closePath = function () {
this.currentPath_.push({type: 'close'}); this.currentPath_.push({ type: 'close' });
}; };
function getCoords(ctx, aX, aY) { function getCoords(ctx, aX, aY) {
@ -1117,7 +1118,7 @@ if (!document.createElement('canvas').getContext) {
}; };
}; };
contextPrototype.save = function() { contextPrototype.save = function () {
var o = {}; var o = {};
copyState(this, o); copyState(this, o);
this.aStack_.push(o); this.aStack_.push(o);
@ -1125,7 +1126,7 @@ if (!document.createElement('canvas').getContext) {
this.m_ = matrixMultiply(createMatrixIdentity(), this.m_); this.m_ = matrixMultiply(createMatrixIdentity(), this.m_);
}; };
contextPrototype.restore = function() { contextPrototype.restore = function () {
if (this.aStack_.length) { if (this.aStack_.length) {
copyState(this.aStack_.pop(), this); copyState(this.aStack_.pop(), this);
this.m_ = this.mStack_.pop(); this.m_ = this.mStack_.pop();
@ -1154,7 +1155,7 @@ if (!document.createElement('canvas').getContext) {
} }
} }
contextPrototype.translate = function(aX, aY) { contextPrototype.translate = function (aX, aY) {
var m1 = [ var m1 = [
[1, 0, 0], [1, 0, 0],
[0, 1, 0], [0, 1, 0],
@ -1164,7 +1165,7 @@ if (!document.createElement('canvas').getContext) {
setM(this, matrixMultiply(m1, this.m_), false); setM(this, matrixMultiply(m1, this.m_), false);
}; };
contextPrototype.rotate = function(aRot) { contextPrototype.rotate = function (aRot) {
var c = mc(aRot); var c = mc(aRot);
var s = ms(aRot); var s = ms(aRot);
@ -1177,7 +1178,7 @@ if (!document.createElement('canvas').getContext) {
setM(this, matrixMultiply(m1, this.m_), false); setM(this, matrixMultiply(m1, this.m_), false);
}; };
contextPrototype.scale = function(aX, aY) { contextPrototype.scale = function (aX, aY) {
this.arcScaleX_ *= aX; this.arcScaleX_ *= aX;
this.arcScaleY_ *= aY; this.arcScaleY_ *= aY;
var m1 = [ var m1 = [
@ -1189,7 +1190,7 @@ if (!document.createElement('canvas').getContext) {
setM(this, matrixMultiply(m1, this.m_), true); setM(this, matrixMultiply(m1, this.m_), true);
}; };
contextPrototype.transform = function(m11, m12, m21, m22, dx, dy) { contextPrototype.transform = function (m11, m12, m21, m22, dx, dy) {
var m1 = [ var m1 = [
[m11, m12, 0], [m11, m12, 0],
[m21, m22, 0], [m21, m22, 0],
@ -1199,7 +1200,7 @@ if (!document.createElement('canvas').getContext) {
setM(this, matrixMultiply(m1, this.m_), true); setM(this, matrixMultiply(m1, this.m_), true);
}; };
contextPrototype.setTransform = function(m11, m12, m21, m22, dx, dy) { contextPrototype.setTransform = function (m11, m12, m21, m22, dx, dy) {
var m = [ var m = [
[m11, m12, 0], [m11, m12, 0],
[m21, m22, 0], [m21, m22, 0],
@ -1214,12 +1215,12 @@ if (!document.createElement('canvas').getContext) {
* The maxWidth argument isn't taken in account, since no browser supports * The maxWidth argument isn't taken in account, since no browser supports
* it yet. * it yet.
*/ */
contextPrototype.drawText_ = function(text, x, y, maxWidth, stroke) { contextPrototype.drawText_ = function (text, x, y, maxWidth, stroke) {
var m = this.m_, var m = this.m_,
delta = 1000, delta = 1000,
left = 0, left = 0,
right = delta, right = delta,
offset = {x: 0, y: 0}, offset = { x: 0, y: 0 },
lineStr = []; lineStr = [];
var fontStyle = getComputedStyle(processFontStyle(this.font), var fontStyle = getComputedStyle(processFontStyle(this.font),
@ -1261,7 +1262,7 @@ if (!document.createElement('canvas').getContext) {
break; break;
} }
switch(textAlign) { switch (textAlign) {
case 'right': case 'right':
left = delta; left = delta;
right = 0.05; right = 0.05;
@ -1273,7 +1274,7 @@ if (!document.createElement('canvas').getContext) {
var d = getCoords(this, x + offset.x, y + offset.y); var d = getCoords(this, x + offset.x, y + offset.y);
lineStr.push('<g_vml_:line from="', -left ,' 0" to="', right ,' 0.05" ', lineStr.push('<g_vml_:line from="', -left, ' 0" to="', right, ' 0.05" ',
' coordsize="100 100" coordorigin="0 0"', ' coordsize="100 100" coordorigin="0 0"',
' filled="', !stroke, '" stroked="', !!stroke, ' filled="', !stroke, '" stroked="', !!stroke,
'" style="position:absolute;width:1px;height:1px;">'); '" style="position:absolute;width:1px;height:1px;">');
@ -1282,8 +1283,8 @@ if (!document.createElement('canvas').getContext) {
appendStroke(this, lineStr); appendStroke(this, lineStr);
} else { } else {
// TODO: Fix the min and max params. // TODO: Fix the min and max params.
appendFill(this, lineStr, {x: -left, y: 0}, appendFill(this, lineStr, { x: -left, y: 0 },
{x: right, y: fontStyle.size}); { x: right, y: fontStyle.size });
} }
var skewM = m[0][0].toFixed(3) + ',' + m[1][0].toFixed(3) + ',' + var skewM = m[0][0].toFixed(3) + ',' + m[1][0].toFixed(3) + ',' +
@ -1291,8 +1292,8 @@ if (!document.createElement('canvas').getContext) {
var skewOffset = mr(d.x / Z) + ',' + mr(d.y / Z); var skewOffset = mr(d.x / Z) + ',' + mr(d.y / Z);
lineStr.push('<g_vml_:skew on="t" matrix="', skewM ,'" ', lineStr.push('<g_vml_:skew on="t" matrix="', skewM, '" ',
' offset="', skewOffset, '" origin="', left ,' 0" />', ' offset="', skewOffset, '" origin="', left, ' 0" />',
'<g_vml_:path textpathok="true" />', '<g_vml_:path textpathok="true" />',
'<g_vml_:textpath on="true" string="', '<g_vml_:textpath on="true" string="',
encodeHtmlAttribute(text), encodeHtmlAttribute(text),
@ -1303,15 +1304,15 @@ if (!document.createElement('canvas').getContext) {
this.element_.insertAdjacentHTML('beforeEnd', lineStr.join('')); this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
}; };
contextPrototype.fillText = function(text, x, y, maxWidth) { contextPrototype.fillText = function (text, x, y, maxWidth) {
this.drawText_(text, x, y, maxWidth, false); this.drawText_(text, x, y, maxWidth, false);
}; };
contextPrototype.strokeText = function(text, x, y, maxWidth) { contextPrototype.strokeText = function (text, x, y, maxWidth) {
this.drawText_(text, x, y, maxWidth, true); this.drawText_(text, x, y, maxWidth, true);
}; };
contextPrototype.measureText = function(text) { contextPrototype.measureText = function (text) {
if (!this.textMeasureEl_) { if (!this.textMeasureEl_) {
var s = '<span style="position:absolute;' + var s = '<span style="position:absolute;' +
'top:-20000px;left:0;padding:0;margin:0;border:none;' + 'top:-20000px;left:0;padding:0;margin:0;border:none;' +
@ -1324,19 +1325,19 @@ if (!document.createElement('canvas').getContext) {
this.textMeasureEl_.style.font = this.font; this.textMeasureEl_.style.font = this.font;
// Don't use innerHTML or innerText because they allow markup/whitespace. // Don't use innerHTML or innerText because they allow markup/whitespace.
this.textMeasureEl_.appendChild(doc.createTextNode(text)); this.textMeasureEl_.appendChild(doc.createTextNode(text));
return {width: this.textMeasureEl_.offsetWidth}; return { width: this.textMeasureEl_.offsetWidth };
}; };
/******** STUBS ********/ /******** STUBS ********/
contextPrototype.clip = function() { contextPrototype.clip = function () {
// TODO: Implement // TODO: Implement
}; };
contextPrototype.arcTo = function() { contextPrototype.arcTo = function () {
// TODO: Implement // TODO: Implement
}; };
contextPrototype.createPattern = function(image, repetition) { contextPrototype.createPattern = function (image, repetition) {
return new CanvasPattern_(image, repetition); return new CanvasPattern_(image, repetition);
}; };
@ -1352,11 +1353,13 @@ if (!document.createElement('canvas').getContext) {
this.colors_ = []; this.colors_ = [];
} }
CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) { CanvasGradient_.prototype.addColorStop = function (aOffset, aColor) {
aColor = processStyle(aColor); aColor = processStyle(aColor);
this.colors_.push({offset: aOffset, this.colors_.push({
offset: aOffset,
color: aColor.color, color: aColor.color,
alpha: aColor.alpha}); alpha: aColor.alpha
});
}; };
function CanvasPattern_(image, repetition) { function CanvasPattern_(image, repetition) {
@ -1396,7 +1399,7 @@ if (!document.createElement('canvas').getContext) {
function DOMException_(s) { function DOMException_(s) {
this.code = this[s]; this.code = this[s];
this.message = s +': DOM Exception ' + this.code; this.message = s + ': DOM Exception ' + this.code;
} }
var p = DOMException_.prototype = new Error; var p = DOMException_.prototype = new Error;
p.INDEX_SIZE_ERR = 1; p.INDEX_SIZE_ERR = 1;
@ -1423,6 +1426,6 @@ if (!document.createElement('canvas').getContext) {
CanvasGradient = CanvasGradient_; CanvasGradient = CanvasGradient_;
CanvasPattern = CanvasPattern_; CanvasPattern = CanvasPattern_;
DOMException = DOMException_; DOMException = DOMException_;
})(); })();
} // if } // if

View File

@ -27,7 +27,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
*/ */
(function($) { (function ($) {
var options = { var options = {
canvas: true canvas: true
@ -55,7 +55,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
// Finishes rendering the canvas, including overlaid text // Finishes rendering the canvas, including overlaid text
Canvas.prototype.render = function() { Canvas.prototype.render = function () {
if (!plot.getOptions().canvas) { if (!plot.getOptions().canvas) {
return render.call(this); return render.call(this);
@ -144,7 +144,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
// y: Y coordinate at which to draw the text. // y: Y coordinate at which to draw the text.
// } // }
Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) { Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) {
if (!plot.getOptions().canvas) { if (!plot.getOptions().canvas) {
return getTextInfo.call(this, layer, text, font, angle, width); return getTextInfo.call(this, layer, text, font, angle, width);
@ -263,7 +263,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
// Adds a text string to the canvas text overlay. // Adds a text string to the canvas text overlay.
Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) { Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) {
if (!plot.getOptions().canvas) { if (!plot.getOptions().canvas) {
return addText.call(this, layer, x, y, text, font, angle, width, halign, valign); return addText.call(this, layer, x, y, text, font, angle, width, halign, valign);

View File

@ -4,4 +4,4 @@ Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license. Licensed under the MIT license.
*/ */
(function($){var options={canvas:true};var render,getTextInfo,addText;var hasOwnProperty=Object.prototype.hasOwnProperty;function init(plot,classes){var Canvas=classes.Canvas;if(render==null){getTextInfo=Canvas.prototype.getTextInfo,addText=Canvas.prototype.addText,render=Canvas.prototype.render}Canvas.prototype.render=function(){if(!plot.getOptions().canvas){return render.call(this)}var context=this.context,cache=this._textCache;context.save();context.textBaseline="middle";for(var layerKey in cache){if(hasOwnProperty.call(cache,layerKey)){var layerCache=cache[layerKey];for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey],updateStyles=true;for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var info=styleCache[key],positions=info.positions,lines=info.lines;if(updateStyles){context.fillStyle=info.font.color;context.font=info.font.definition;updateStyles=false}for(var i=0,position;position=positions[i];i++){if(position.active){for(var j=0,line;line=position.lines[j];j++){context.fillText(lines[j].text,line[0],line[1])}}else{positions.splice(i--,1)}}if(positions.length==0){delete styleCache[key]}}}}}}}context.restore()};Canvas.prototype.getTextInfo=function(layer,text,font,angle,width){if(!plot.getOptions().canvas){return getTextInfo.call(this,layer,text,font,angle,width)}var textStyle,layerCache,styleCache,info;text=""+text;if(typeof font==="object"){textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px "+font.family}else{textStyle=font}layerCache=this._textCache[layer];if(layerCache==null){layerCache=this._textCache[layer]={}}styleCache=layerCache[textStyle];if(styleCache==null){styleCache=layerCache[textStyle]={}}info=styleCache[text];if(info==null){var context=this.context;if(typeof font!=="object"){var element=$("<div>&nbsp;</div>").css("position","absolute").addClass(typeof font==="string"?font:null).appendTo(this.getTextLayer(layer));font={lineHeight:element.height(),style:element.css("font-style"),variant:element.css("font-variant"),weight:element.css("font-weight"),family:element.css("font-family"),color:element.css("color")};font.size=element.css("line-height",1).height();element.remove()}textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px "+font.family;info=styleCache[text]={width:0,height:0,positions:[],lines:[],font:{definition:textStyle,color:font.color}};context.save();context.font=textStyle;var lines=(text+"").replace(/<br ?\/?>|\r\n|\r/g,"\n").split("\n");for(var i=0;i<lines.length;++i){var lineText=lines[i],measured=context.measureText(lineText);info.width=Math.max(measured.width,info.width);info.height+=font.lineHeight;info.lines.push({text:lineText,width:measured.width,height:font.lineHeight})}context.restore()}return info};Canvas.prototype.addText=function(layer,x,y,text,font,angle,width,halign,valign){if(!plot.getOptions().canvas){return addText.call(this,layer,x,y,text,font,angle,width,halign,valign)}var info=this.getTextInfo(layer,text,font,angle,width),positions=info.positions,lines=info.lines;y+=info.height/lines.length/2;if(valign=="middle"){y=Math.round(y-info.height/2)}else if(valign=="bottom"){y=Math.round(y-info.height)}else{y=Math.round(y)}if(!!(window.opera&&window.opera.version().split(".")[0]<12)){y-=2}for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=true;return}}position={active:true,lines:[],x:x,y:y};positions.push(position);for(var i=0,line;line=lines[i];i++){if(halign=="center"){position.lines.push([Math.round(x-line.width/2),y])}else if(halign=="right"){position.lines.push([Math.round(x-line.width),y])}else{position.lines.push([Math.round(x),y])}y+=line.height}}}$.plot.plugins.push({init:init,options:options,name:"canvas",version:"1.0"})})(jQuery); (function ($) { var options = { canvas: true }; var render, getTextInfo, addText; var hasOwnProperty = Object.prototype.hasOwnProperty; function init(plot, classes) { var Canvas = classes.Canvas; if (render == null) { getTextInfo = Canvas.prototype.getTextInfo, addText = Canvas.prototype.addText, render = Canvas.prototype.render } Canvas.prototype.render = function () { if (!plot.getOptions().canvas) { return render.call(this) } var context = this.context, cache = this._textCache; context.save(); context.textBaseline = "middle"; for (var layerKey in cache) { if (hasOwnProperty.call(cache, layerKey)) { var layerCache = cache[layerKey]; for (var styleKey in layerCache) { if (hasOwnProperty.call(layerCache, styleKey)) { var styleCache = layerCache[styleKey], updateStyles = true; for (var key in styleCache) { if (hasOwnProperty.call(styleCache, key)) { var info = styleCache[key], positions = info.positions, lines = info.lines; if (updateStyles) { context.fillStyle = info.font.color; context.font = info.font.definition; updateStyles = false } for (var i = 0, position; position = positions[i]; i++) { if (position.active) { for (var j = 0, line; line = position.lines[j]; j++) { context.fillText(lines[j].text, line[0], line[1]) } } else { positions.splice(i--, 1) } } if (positions.length == 0) { delete styleCache[key] } } } } } } } context.restore() }; Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) { if (!plot.getOptions().canvas) { return getTextInfo.call(this, layer, text, font, angle, width) } var textStyle, layerCache, styleCache, info; text = "" + text; if (typeof font === "object") { textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family } else { textStyle = font } layerCache = this._textCache[layer]; if (layerCache == null) { layerCache = this._textCache[layer] = {} } styleCache = layerCache[textStyle]; if (styleCache == null) { styleCache = layerCache[textStyle] = {} } info = styleCache[text]; if (info == null) { var context = this.context; if (typeof font !== "object") { var element = $("<div>&nbsp;</div>").css("position", "absolute").addClass(typeof font === "string" ? font : null).appendTo(this.getTextLayer(layer)); console.log("entra"); font = { lineHeight: element.height(), style: element.css("font-style"), variant: element.css("font-variant"), weight: element.css("font-weight"), family: element.css("font-family"), color: element.css("color") }; font.size = element.css("line-height", 1).height(); element.remove() } textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family; info = styleCache[text] = { width: 0, height: 0, positions: [], lines: [], font: { definition: textStyle, color: font.color } }; context.save(); context.font = textStyle; var lines = (text + "").replace(/<br ?\/?>|\r\n|\r/g, "\n").split("\n"); for (var i = 0; i < lines.length; ++i) { var lineText = lines[i], measured = context.measureText(lineText); info.width = Math.max(measured.width, info.width); info.height += font.lineHeight; info.lines.push({ text: lineText, width: measured.width, height: font.lineHeight }) } context.restore() } return info }; Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) { if (!plot.getOptions().canvas) { return addText.call(this, layer, x, y, text, font, angle, width, halign, valign) } var info = this.getTextInfo(layer, text, font, angle, width), positions = info.positions, lines = info.lines; y += info.height / lines.length / 2; if (valign == "middle") { y = Math.round(y - info.height / 2) } else if (valign == "bottom") { y = Math.round(y - info.height) } else { y = Math.round(y) } if (!!(window.opera && window.opera.version().split(".")[0] < 12)) { y -= 2 } for (var i = 0, position; position = positions[i]; i++) { if (position.x == x && position.y == y) { position.active = true; return } } position = { active: true, lines: [], x: x, y: y }; positions.push(position); for (var i = 0, line; line = lines[i]; i++) { if (halign == "center") { position.lines.push([Math.round(x - line.width / 2), y]) } else if (halign == "right") { position.lines.push([Math.round(x - line.width), y]) } else { position.lines.push([Math.round(x), y]) } y += line.height } } } $.plot.plugins.push({ init: init, options: options, name: "canvas", version: "1.0" }) })(jQuery);

View File

@ -531,7 +531,7 @@ Licensed under the MIT license.
show: null, // null = auto-detect, true = always, false = never show: null, // null = auto-detect, true = always, false = never
position: "bottom", // or "top" position: "bottom", // or "top"
mode: null, // null or "time" mode: null, // null or "time"
font: null, // null (derived from CSS in placeholder) or object like { size: 11, lineHeight: 13, style: "italic", weight: "bold", family: "sans-serif", variant: "small-caps" } font: null, // null (derived from CSS in placeholder) or object like { size: 11, lineHeight: 13, style: "italic", weight: "bold", family: "lato", variant: "small-caps" }
color: null, // base color, labels, ticks color: null, // base color, labels, ticks
tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)" tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)"
transform: null, // null or f: number -> number to transform axis transform: null, // null or f: number -> number to transform axis

View File

@ -235,7 +235,7 @@ function pandoraFlotPieCustom(
if (background_color == "transparent") { if (background_color == "transparent") {
$(".legend>table").css("background-color", ""); $(".legend>table").css("background-color", "");
$(".legend>div").css("background-color", ""); $(".legend>div").css("background-color", "");
$(".legend>table").css("color", "#aaa"); $(".legend>table").css("color", "#000");
} else if (background_color == "white") { } else if (background_color == "white") {
$(".legend>table").css("background-color", "white"); $(".legend>table").css("background-color", "white");
$(".legend>table").css("color", "black"); $(".legend>table").css("color", "black");
@ -385,14 +385,14 @@ function pandoraFlotHBars(
color: tick_color, color: tick_color,
axisLabelUseCanvas: true, axisLabelUseCanvas: true,
axisLabelFontSizePixels: font_size, axisLabelFontSizePixels: font_size,
axisLabelFontFamily: font + "Font", axisLabelFontFamily: "lato",
tickFormatter: xFormatter tickFormatter: xFormatter
}, },
yaxis: { yaxis: {
font: { font: {
size: font_size + 2, size: font_size + 2,
color: ycolor, color: ycolor,
family: font + "Font" family: "lato"
}, },
ticks: yFormatter ticks: yFormatter
}, },
@ -578,7 +578,6 @@ function showTooltip(x, y, color, contents) {
"border-radius": "5px", "border-radius": "5px",
"background-color": "#fff", "background-color": "#fff",
color: "#111", color: "#111",
"font-family": "Verdana, Arial, Helvetica, Tahoma, sans-serif",
opacity: 0.9 opacity: 0.9
}) })
.appendTo("body") .appendTo("body")
@ -628,7 +627,9 @@ function pandoraFlotVBars(settings) {
return ticksformatter[Math.round(v)]; return ticksformatter[Math.round(v)];
}; };
} }
settings.x.font.family = "lato";
settings.y.font.family = "lato";
settings.y.title.fontFamily = "lato";
var options = { var options = {
series: { series: {
bars: { bars: {
@ -752,12 +753,12 @@ function pandoraFlotSlicebar(
} }
font_size = parseInt(font_size); font_size = parseInt(font_size);
if (font != undefined)
font = font font = font
.split("/") .split("/")
.pop() .pop()
.split(".") .split(".")
.shift(); .shift();
// Check possible adapt_keys on classes // Check possible adapt_keys on classes
check_adaptions(graph_id); check_adaptions(graph_id);
@ -808,7 +809,7 @@ function pandoraFlotSlicebar(
tickLength: 0, tickLength: 0,
font: { font: {
size: font_size + 2, size: font_size + 2,
family: font + "Font" family: font
} }
} }
], ],
@ -2021,7 +2022,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
xaxes: [ xaxes: [
@ -2036,7 +2037,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font", family: "lato",
variant: "small-caps" variant: "small-caps"
} }
}, },
@ -2110,7 +2111,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
xaxes: [ xaxes: [
@ -2125,7 +2126,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
yaxes: [ yaxes: [
@ -2209,7 +2210,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
xaxes: [ xaxes: [
@ -2226,7 +2227,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
yaxes: [ yaxes: [
@ -2256,7 +2257,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
xaxes: [ xaxes: [
@ -2273,7 +2274,7 @@ function pandoraFlotArea(
font: { font: {
size: font_size + 2, size: font_size + 2,
color: legend_color, color: legend_color,
family: font + "Font" family: "lato"
} }
}, },
yaxes: [ yaxes: [
@ -2380,7 +2381,7 @@ function pandoraFlotArea(
$("#timestamp_" + graph_id).css("color", "#000"); $("#timestamp_" + graph_id).css("color", "#000");
$("#timestamp_" + graph_id).css("font-size", font_size + 2 + "px"); $("#timestamp_" + graph_id).css("font-size", font_size + 2 + "px");
$("#timestamp_" + graph_id).css("font-family", font + "Font"); $("#timestamp_" + graph_id).css("font-family", font);
if (timesize + timenewpos > canvaslimit) { if (timesize + timenewpos > canvaslimit) {
$("#timestamp_" + graph_id).css("left", timenewpos - timesize); $("#timestamp_" + graph_id).css("left", timenewpos - timesize);
@ -2463,7 +2464,7 @@ function pandoraFlotArea(
.css("font-size", font_size + 2 + "px"); .css("font-size", font_size + 2 + "px");
$("#legend_" + graph_id + " .legendLabel") $("#legend_" + graph_id + " .legendLabel")
.eq(i) .eq(i)
.css("font-family", font + "Font"); .css("font-family", font);
i++; i++;
} }
@ -2638,10 +2639,7 @@ function pandoraFlotArea(
"font-size", "font-size",
font_size + 2 + "px" font_size + 2 + "px"
); );
$("#legend_" + graph_id + " .legendLabel").css( $("#legend_" + graph_id + " .legendLabel").css("font-family", font);
"font-family",
font + "Font"
);
plot.clearCrosshair(); plot.clearCrosshair();
overview.clearCrosshair(); overview.clearCrosshair();
@ -2670,12 +2668,12 @@ function pandoraFlotArea(
var style = var style =
"color:" + "color:" +
legend_color + legend_color +
"; font-family:" + "; font-family: " +
font + "lato" +
"Font; font-size:" + "Font; font-size:" +
(parseInt(font_size) + 2) + (parseInt(font_size) + 2) +
"px;"; "px;";
return '<span style="' + style + '">' + legend[v] + "</span>"; return '<span style="' + style + '" class="lato">' + legend[v] + "</span>";
} }
$("#overview_" + graph_id).css("display", "none"); $("#overview_" + graph_id).css("display", "none");

View File

@ -209,14 +209,13 @@ function d3_bullet_chart(
$output .= '<div id="bullet_graph_'.$id_bullet.'" class="bullet" style="overflow: hidden; width: '.$width.'px; margin-left: auto; margin-right: auto;"></div> $output .= '<div id="bullet_graph_'.$id_bullet.'" class="bullet" style="overflow: hidden; width: '.$width.'px; margin-left: auto; margin-right: auto;"></div>
<style> <style>
.bullet_graph { .bullet_graph {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
margin: auto; margin: auto;
padding-top: 40px; padding-top: 40px;
position: relative; position: relative;
width: 100%; width: 100%;
} }
.bullet { font: 7px sans-serif; } .bullet { font: 7px lato; }
.bullet .marker.s0 { stroke: #e63c52; stroke-width: 2px; } .bullet .marker.s0 { stroke: #e63c52; stroke-width: 2px; }
.bullet .marker.s1 { stroke: #f3b200; stroke-width: 2px; } .bullet .marker.s1 { stroke: #f3b200; stroke-width: 2px; }
.bullet .marker.s2 { stroke: steelblue; stroke-width: 2px; } .bullet .marker.s2 { stroke: steelblue; stroke-width: 2px; }

View File

@ -145,11 +145,14 @@ function flot_area_graph(
break; break;
} }
if ($config['style'] === 'pandora_black') { if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null )
) {
$background_style = '#222'; $background_style = '#222';
$params['grid_color'] = '#fff'; $params['grid_color'] = '#fff';
$params['backgroundColor'] = '#222'; $params['backgroundColor'] = '#222';
$params['legend_color'] = '#fff'; $params['legend_color'] = '#fff';
} else if ($params['pdf']) {
$params['legend_color'] = '#000';
} }
// Parent layer. // Parent layer.
@ -482,15 +485,13 @@ function flot_custom_pie_chart(
$ttl, $ttl,
$homeurl, $homeurl,
$background_color, $background_color,
$legend_position $legend_position,
$pdf
) { ) {
global $config; global $config;
if ($config['style'] === 'pandora_black') {
$background_color = 'black_theme';
}
// TODO // TODO
// include_javascript_dependencies_flot_graph(); // include_javascript_dependencies_flot_graph();.
$total_modules = $graph_values['total_modules']; $total_modules = $graph_values['total_modules'];
unset($graph_values['total_modules']); unset($graph_values['total_modules']);
@ -546,18 +547,23 @@ function flot_custom_pie_chart(
} }
// Returns a 3D column chart // Returns a 3D column chart.
function flot_hcolumn_chart($graph_data, $width, $height, $water_mark, $font='', $font_size=7, $background_color='white', $tick_color='white', $val_min=null, $val_max=null) function flot_hcolumn_chart($graph_data, $width, $height, $water_mark, $font='', $font_size=7, $background_color='white', $tick_color='white', $val_min=null, $val_max=null, $pdf=false)
{ {
global $config; global $config;
// include_javascript_dependencies_flot_graph(); if ($pdf === true) {
$background_color = 'white';
$tick_color = '#000';
}
// Include_javascript_dependencies_flot_graph().
$return = ''; $return = '';
$stacked_str = ''; $stacked_str = '';
$multicolor = true; $multicolor = true;
// Get a unique identifier to graph // Get a unique identifier to graph.
$graph_id = uniqid('graph_'); $graph_id = uniqid('graph_');
$graph_id2 = uniqid('graph_'); $graph_id2 = uniqid('graph_');
@ -573,11 +579,11 @@ function flot_hcolumn_chart($graph_data, $width, $height, $water_mark, $font='',
} }
// Set a weird separator to serialize and unserialize passing data // Set a weird separator to serialize and unserialize passing data
// from php to javascript // from php to javascript.
$separator = ';;::;;'; $separator = ';;::;;';
$separator2 = ':,:,,,:,:'; $separator2 = ':,:,,,:,:';
// Transform data from our format to library format // Transform data from our format to library format.
$labels = []; $labels = [];
$a = []; $a = [];
$vars = []; $vars = [];
@ -614,10 +620,10 @@ function flot_hcolumn_chart($graph_data, $width, $height, $water_mark, $font='',
$val_max = $max; $val_max = $max;
} }
// Store serialized data to use it from javascript // Store serialized data to use it from javascript.
$labels = implode($separator, $labels); $labels = implode($separator, $labels);
// Store data series in javascript format // Store data series in javascript format.
$jsvars = ''; $jsvars = '';
$jsseries = []; $jsseries = [];
@ -633,7 +639,7 @@ function flot_hcolumn_chart($graph_data, $width, $height, $water_mark, $font='',
$jsseries = implode(',', $jsseries); $jsseries = implode(',', $jsseries);
// Javascript code // Javascript code.
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "pandoraFlotHBars('$graph_id', '$values', '$labels', $max, '$water_mark', '$separator', '$separator2', '$font', $font_size, '$background_color', '$tick_color', $val_min, $val_max)"; $return .= "pandoraFlotHBars('$graph_id', '$values', '$labels', $max, '$water_mark', '$separator', '$separator2', '$font', $font_size, '$background_color', '$tick_color', $val_min, $val_max)";
$return .= '</script>'; $return .= '</script>';
@ -683,14 +689,6 @@ function flot_vcolumn_chart(array $options)
$options['graphId'] = $graphId; $options['graphId'] = $graphId;
// If pandora_black theme its enabled then change grid colors. // If pandora_black theme its enabled then change grid colors.
/*
if ($config['style'] === 'pandora_black') {
$options['grid']['backgroundColor']['colors'][0] = 'transparent';
$options['grid']['backgroundColor']['colors'][1] = 'transparent';
$options['y']['color'] = 'transparent';
$options['x']['color'] = 'transparent';
}*/
$settings = base64_encode(json_encode($options)); $settings = base64_encode(json_encode($options));
// Javascript code. // Javascript code.

View File

@ -1651,7 +1651,6 @@ function print_phases_donut(recipient, phases, width, height) {
.text(function(d) { .text(function(d) {
return d.data.label; return d.data.label;
}) })
.style("font-family", "Verdana")
.style("font-size", "15px") .style("font-size", "15px")
.append("tspan") .append("tspan")
.attr("dy", "1.2em") .attr("dy", "1.2em")
@ -1659,7 +1658,6 @@ function print_phases_donut(recipient, phases, width, height) {
.text(function(d) { .text(function(d) {
return d.data.label2 + "ms"; return d.data.label2 + "ms";
}) })
.style("font-family", "Verdana")
.style("font-size", "15px"); .style("font-size", "15px");
function midAngle(d) { function midAngle(d) {
@ -1816,7 +1814,6 @@ function progress_bar_d3(
.append("text") .append("text")
.attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")") .attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", 20) .style("font-size", 20)
.html(label) .html(label)
@ -1827,7 +1824,6 @@ function progress_bar_d3(
.append("text") .append("text")
.attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")") .attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")")
.attr("fill", "#FFFFFF") .attr("fill", "#FFFFFF")
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", 14) .style("font-size", 14)
.attr("text-anchor", "middle") .attr("text-anchor", "middle")
@ -1938,7 +1934,6 @@ function progress_bubble_d3(
.append("text") .append("text")
.attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")") .attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", textSize) .style("font-size", textSize)
.html(label) .html(label)
@ -1949,7 +1944,6 @@ function progress_bubble_d3(
.append("text") .append("text")
.attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")") .attr("transform", "translate(" + width / 2 + ", " + height / 2 + ")")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", numberSize) .style("font-size", numberSize)
.attr("text-anchor", "middle") .attr("text-anchor", "middle")
@ -2080,7 +2074,6 @@ function print_circular_progress_bar(
var labelText = circle var labelText = circle
.append("text") .append("text")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", textSize) .style("font-size", textSize)
.html(label) .html(label)
@ -2090,7 +2083,6 @@ function print_circular_progress_bar(
var numberText = circle var numberText = circle
.append("text") .append("text")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", numberSize) .style("font-size", numberSize)
.attr("text-anchor", "middle") .attr("text-anchor", "middle")
@ -2099,7 +2091,6 @@ function print_circular_progress_bar(
var percentText = circle var percentText = circle
.append("text") .append("text")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", unitSize) .style("font-size", unitSize)
.text(unit) .text(unit)
@ -2249,7 +2240,6 @@ function print_interior_circular_progress_bar(
var labelText = circle var labelText = circle
.append("text") .append("text")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", textSize) .style("font-size", textSize)
.html(label) .html(label)
@ -2259,7 +2249,6 @@ function print_interior_circular_progress_bar(
var numberText = circle var numberText = circle
.append("text") .append("text")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", numberSize) .style("font-size", numberSize)
.attr("text-anchor", "middle") .attr("text-anchor", "middle")
@ -2268,7 +2257,6 @@ function print_interior_circular_progress_bar(
var percentText = circle var percentText = circle
.append("text") .append("text")
.attr("fill", label_color) .attr("fill", label_color)
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", unitSize) .style("font-size", unitSize)
.text(unit) .text(unit)
@ -2355,7 +2343,6 @@ function print_donut_graph(
.attr("x", 15) .attr("x", 15)
.attr("y", 10) .attr("y", 10)
.text(m_d.tag_name) .text(m_d.tag_name)
.style("font-family", "smallfontFont")
.style("font-size", "7pt"); .style("font-size", "7pt");
}); });

View File

@ -8,7 +8,6 @@
<style type="text/css"> <style type="text/css">
* { * {
font-family: 'lato-bolder';
font-size: 1em; font-size: 1em;
} }
@ -24,9 +23,6 @@ ul.clean {
list-style-type: none; list-style-type: none;
} }
p,u,i,b {
font-family: 'lato-bolder';
}
b { b {
font-size: 0.90em!important; font-size: 0.90em!important;
} }

View File

@ -8,7 +8,6 @@
<style type="text/css"> <style type="text/css">
* { * {
font-family: 'lato-bolder';
font-size: 1em; font-size: 1em;
} }
@ -24,9 +23,6 @@ ul.clean {
list-style-type: none; list-style-type: none;
} }
p,u,i,b {
font-family: 'lato-bolder';
}
b { b {
font-size: 0.90em!important; font-size: 0.90em!important;
} }

View File

@ -8,7 +8,6 @@
<style type="text/css"> <style type="text/css">
* { * {
font-family: 'lato-bolder';
font-size: 1em; font-size: 1em;
} }
@ -24,9 +23,6 @@ ul.clean {
list-style-type: none; list-style-type: none;
} }
p,u,i,b {
font-family: 'lato-bolder';
}
b { b {
font-size: 0.90em!important; font-size: 0.90em!important;
} }

View File

@ -1,7 +1,7 @@
div.olMap { div.olMap {
z-index: 0; z-index: 0;
padding: 0px!important; padding: 0px !important;
margin: 0px!important; margin: 0px !important;
cursor: default; cursor: default;
position: relative !important; position: relative !important;
} }
@ -44,7 +44,7 @@ div.olLayerDiv {
.olControlScaleLineBottom { .olControlScaleLineBottom {
border: solid 2px black; border: solid 2px black;
border-bottom: none; border-bottom: none;
margin-top:-2px; margin-top: -2px;
text-align: center; text-align: center;
} }
.olControlScaleLineTop { .olControlScaleLineTop {
@ -66,7 +66,6 @@ div.olControlMousePosition {
right: 3px; right: 3px;
display: block; display: block;
position: absolute; position: absolute;
font-family: Arial;
font-size: smaller; font-size: smaller;
} }
@ -78,7 +77,7 @@ div.olControlMousePosition {
.olControlOverviewMapElement { .olControlOverviewMapElement {
padding: 10px 18px 10px 10px; padding: 10px 18px 10px 10px;
background-color: #00008B; background-color: #00008b;
-moz-border-radius: 1em 0 0 0; -moz-border-radius: 1em 0 0 0;
} }
@ -107,32 +106,32 @@ div.olControlMousePosition {
} }
.olLayerGeoRSSDescription { .olLayerGeoRSSDescription {
float:left; float: left;
width:100%; width: 100%;
overflow:auto; overflow: auto;
font-size:1.0em; font-size: 1em;
} }
.olLayerGeoRSSClose { .olLayerGeoRSSClose {
float:right; float: right;
color:gray; color: gray;
font-size:1.2em; font-size: 1.2em;
margin-right:6px; margin-right: 6px;
font-family:sans-serif;
} }
.olLayerGeoRSSTitle { .olLayerGeoRSSTitle {
float:left;font-size:1.2em; float: left;
font-size: 1.2em;
} }
.olPopupContent { .olPopupContent {
padding:5px; padding: 5px;
overflow: auto; overflow: auto;
} }
.olControlNavToolbar { .olControlNavToolbar {
width:0px; width: 0px;
height:0px; height: 0px;
} }
.olControlNavToolbar div { .olControlNavToolbar div {
display:block; display: block;
width: 28px; width: 28px;
height: 28px; height: 28px;
top: 300px; top: 300px;
@ -145,7 +144,6 @@ div.olControlMousePosition {
background-repeat: no-repeat; background-repeat: no-repeat;
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
.olControlNavigationHistoryPreviousItemActive { .olControlNavigationHistoryPreviousItemActive {
background-position: 0px 0px; background-position: 0px 0px;
@ -178,7 +176,7 @@ div.olControlMousePosition {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.olControlEditingToolbar { .olControlEditingToolbar {
float:right; float: right;
right: 0px; right: 0px;
height: 30px; height: 30px;
width: 200px; width: 200px;
@ -186,7 +184,7 @@ div.olControlMousePosition {
.olControlEditingToolbar div { .olControlEditingToolbar div {
background-image: url("img/editing_tool_bar.png"); background-image: url("img/editing_tool_bar.png");
background-repeat: no-repeat; background-repeat: no-repeat;
float:right; float: right;
width: 24px; width: 24px;
height: 24px; height: 24px;
margin: 5px; margin: 5px;
@ -213,7 +211,7 @@ div.olControlMousePosition {
background-position: -26px 0px; background-position: -26px 0px;
} }
.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { .olControlEditingToolbar .olControlDrawFeaturePolygonItemActive {
background-position: -26px -23px ; background-position: -26px -23px;
} }
.olControlSaveFeaturesItemActive { .olControlSaveFeaturesItemActive {
background-image: url(img/save_features_on.png); background-image: url(img/save_features_on.png);
@ -230,7 +228,7 @@ div.olControlMousePosition {
border: 2px solid red; border: 2px solid red;
position: absolute; position: absolute;
background-color: white; background-color: white;
opacity: 0.50; opacity: 0.5;
font-size: 1px; font-size: 1px;
filter: alpha(opacity=50); filter: alpha(opacity=50);
} }
@ -238,7 +236,7 @@ div.olControlMousePosition {
border: 2px solid blue; border: 2px solid blue;
position: absolute; position: absolute;
background-color: white; background-color: white;
opacity: 0.50; opacity: 0.5;
font-size: 1px; font-size: 1px;
filter: alpha(opacity=50); filter: alpha(opacity=50);
} }

View File

@ -20906,9 +20906,6 @@ ace.define(
text-align: left;\ text-align: left;\
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);\ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\
}\ }\
.ace_editor div {\
font-family: monospace !important;\
}\
.ace_scroller {\ .ace_scroller {\
position: absolute;\ position: absolute;\
overflow: hidden;\ overflow: hidden;\

File diff suppressed because it is too large Load Diff

View File

@ -2562,12 +2562,12 @@ function restart_map() {
"<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>"; "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
dialog_confirm_text = dialog_confirm_text =
dialog_confirm_text + dialog_confirm_text +
"<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" + "<div style='width:75%; float:left;'><h3><strong style='font-size:13pt;'>" +
warning_message + warning_message +
"</strong></h3>"; "</strong></h3>";
dialog_confirm_text = dialog_confirm_text =
dialog_confirm_text + dialog_confirm_text +
"<p style='font-family:Verdana; font-size:12pt;'>" + "<p style='font-size:12pt;'>" +
message_to_confirm + message_to_confirm +
"</p></div>"; "</p></div>";
dialog_confirm_text = dialog_confirm_text + "</div>"; dialog_confirm_text = dialog_confirm_text + "</div>";
@ -3404,8 +3404,7 @@ function init_graph(parameter_object) {
"text-anchor: start; " + "text-anchor: start; " +
"fill: #000000; " + "fill: #000000; " +
"fill-opacity: 1; " + "fill-opacity: 1; " +
"stroke: none; " + "stroke: none; "
"font-family: Verdana"
) )
.attr("class", "fill_fff") .attr("class", "fill_fff")
.attr( .attr(
@ -4091,7 +4090,7 @@ function draw_elements_graph() {
"style", "style",
"font-size: " + "font-size: " +
font_size + font_size +
"px !important; font-family:Verdana; text-align:center; text-anchor:middle; fill:#000000" "px !important; text-align:center; text-anchor:middle; fill:#000000"
) )
.text(function(d) { .text(function(d) {
return ellipsize(get_node_name_ov(d), 30); return ellipsize(get_node_name_ov(d), 30);

View File

@ -2,7 +2,6 @@
.CodeMirror { .CodeMirror {
/* Set height, width, borders, and global font properties here */ /* Set height, width, borders, and global font properties here */
font-family: monospace;
height: 300px; height: 300px;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
@ -29,7 +28,8 @@
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.CodeMirror-linenumbers {} .CodeMirror-linenumbers {
}
.CodeMirror-linenumber { .CodeMirror-linenumber {
padding: 0 3px 0 5px; padding: 0 3px 0 5px;
min-width: 20px; min-width: 20px;
@ -50,7 +50,7 @@
width: auto; width: auto;
border: 0; border: 0;
background: transparent; background: transparent;
background: rgba(0, 200, 0, .4); background: rgba(0, 200, 0, 0.4);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
} }
/* Kludge to turn off filter in ie9+, which also accepts rgba */ /* Kludge to turn off filter in ie9+, which also accepts rgba */
@ -58,45 +58,112 @@
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
} }
/* Can style cursor different in overwrite (non-insert) mode */ /* Can style cursor different in overwrite (non-insert) mode */
.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {} .CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {
}
/* DEFAULT THEME */ /* DEFAULT THEME */
.cm-s-default .cm-keyword {color: #708;} .cm-s-default .cm-keyword {
.cm-s-default .cm-atom {color: #219;} color: #708;
.cm-s-default .cm-number {color: #164;} }
.cm-s-default .cm-def {color: #00f;} .cm-s-default .cm-atom {
.cm-s-default .cm-variable {color: black;} color: #219;
.cm-s-default .cm-variable-2 {color: #05a;} }
.cm-s-default .cm-variable-3 {color: #085;} .cm-s-default .cm-number {
.cm-s-default .cm-property {color: black;} color: #164;
.cm-s-default .cm-operator {color: black;} }
.cm-s-default .cm-comment {color: #a50;} .cm-s-default .cm-def {
.cm-s-default .cm-string {color: #a11;} color: #00f;
.cm-s-default .cm-string-2 {color: #f50;} }
.cm-s-default .cm-meta {color: #555;} .cm-s-default .cm-variable {
.cm-s-default .cm-error {color: #f00;} color: black;
.cm-s-default .cm-qualifier {color: #555;} }
.cm-s-default .cm-builtin {color: #30a;} .cm-s-default .cm-variable-2 {
.cm-s-default .cm-bracket {color: #997;} color: #05a;
.cm-s-default .cm-tag {color: #170;} }
.cm-s-default .cm-attribute {color: #00c;} .cm-s-default .cm-variable-3 {
.cm-s-default .cm-header {color: blue;} color: #085;
.cm-s-default .cm-quote {color: #090;} }
.cm-s-default .cm-hr {color: #999;} .cm-s-default .cm-property {
.cm-s-default .cm-link {color: #00c;} color: black;
}
.cm-s-default .cm-operator {
color: black;
}
.cm-s-default .cm-comment {
color: #a50;
}
.cm-s-default .cm-string {
color: #a11;
}
.cm-s-default .cm-string-2 {
color: #f50;
}
.cm-s-default .cm-meta {
color: #555;
}
.cm-s-default .cm-error {
color: #f00;
}
.cm-s-default .cm-qualifier {
color: #555;
}
.cm-s-default .cm-builtin {
color: #30a;
}
.cm-s-default .cm-bracket {
color: #997;
}
.cm-s-default .cm-tag {
color: #170;
}
.cm-s-default .cm-attribute {
color: #00c;
}
.cm-s-default .cm-header {
color: blue;
}
.cm-s-default .cm-quote {
color: #090;
}
.cm-s-default .cm-hr {
color: #999;
}
.cm-s-default .cm-link {
color: #00c;
}
.cm-negative {color: #d44;} .cm-negative {
.cm-positive {color: #292;} color: #d44;
.cm-header, .cm-strong {font-weight: bold;} }
.cm-em {font-style: italic;} .cm-positive {
.cm-emstrong {font-style: italic; font-weight: bold;} color: #292;
.cm-link {text-decoration: underline;} }
.cm-header,
.cm-strong {
font-weight: bold;
}
.cm-em {
font-style: italic;
}
.cm-emstrong {
font-style: italic;
font-weight: bold;
}
.cm-link {
text-decoration: underline;
}
.cm-invalidchar {color: #f00;} .cm-invalidchar {
color: #f00;
}
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} div.CodeMirror span.CodeMirror-matchingbracket {
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} color: #0f0;
}
div.CodeMirror span.CodeMirror-nonmatchingbracket {
color: #f22;
}
/* STOP */ /* STOP */
@ -112,8 +179,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
.CodeMirror-scroll { .CodeMirror-scroll {
/* 30px is the magic margin used to hide the element's real scrollbars */ /* 30px is the magic margin used to hide the element's real scrollbars */
/* See overflow: hidden in .CodeMirror, and the paddings in .CodeMirror-sizer */ /* See overflow: hidden in .CodeMirror, and the paddings in .CodeMirror-sizer */
margin-bottom: -30px; margin-right: -30px; margin-bottom: -30px;
padding-bottom: 30px; padding-right: 30px; margin-right: -30px;
padding-bottom: 30px;
padding-right: 30px;
height: 100%; height: 100%;
outline: none; /* Prevent dragging from highlighting the element */ outline: none; /* Prevent dragging from highlighting the element */
position: relative; position: relative;
@ -125,28 +194,35 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
/* The fake, visible scrollbars. Used to force redraw during scrolling /* The fake, visible scrollbars. Used to force redraw during scrolling
before actuall scrolling happens, thus preventing shaking and before actuall scrolling happens, thus preventing shaking and
flickering artifacts. */ flickering artifacts. */
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler { .CodeMirror-vscrollbar,
.CodeMirror-hscrollbar,
.CodeMirror-scrollbar-filler {
position: absolute; position: absolute;
z-index: 6; z-index: 6;
display: none; display: none;
} }
.CodeMirror-vscrollbar { .CodeMirror-vscrollbar {
right: 0; top: 0; right: 0;
top: 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
} }
.CodeMirror-hscrollbar { .CodeMirror-hscrollbar {
bottom: 0; left: 0; bottom: 0;
left: 0;
overflow-y: hidden; overflow-y: hidden;
overflow-x: scroll; overflow-x: scroll;
} }
.CodeMirror-scrollbar-filler { .CodeMirror-scrollbar-filler {
right: 0; bottom: 0; right: 0;
bottom: 0;
z-index: 6; z-index: 6;
} }
.CodeMirror-gutters { .CodeMirror-gutters {
position: absolute; left: 0; top: 0; position: absolute;
left: 0;
top: 0;
height: 100%; height: 100%;
padding-bottom: 30px; padding-bottom: 30px;
z-index: 3; z-index: 3;
@ -155,8 +231,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
height: 100%; height: 100%;
display: inline-block; display: inline-block;
/* Hack to make IE7 behave */ /* Hack to make IE7 behave */
*zoom:1; *zoom: 1;
*display:inline; *display: inline;
} }
.CodeMirror-gutter-elt { .CodeMirror-gutter-elt {
position: absolute; position: absolute;
@ -169,7 +245,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
} }
.CodeMirror pre { .CodeMirror pre {
/* Reset some styles that the rest of the page might have set */ /* Reset some styles that the rest of the page might have set */
-moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; border-radius: 0; -moz-border-radius: 0;
-webkit-border-radius: 0;
-o-border-radius: 0;
border-radius: 0;
border-width: 0; border-width: 0;
background: transparent; background: transparent;
font-family: inherit; font-family: inherit;
@ -190,7 +269,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
} }
.CodeMirror-linebackground { .CodeMirror-linebackground {
position: absolute; position: absolute;
left: 0; right: 0; top: 0; bottom: 0; left: 0;
right: 0;
top: 0;
bottom: 0;
z-index: 0; z-index: 0;
} }
@ -210,11 +292,14 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
.CodeMirror-measure { .CodeMirror-measure {
position: absolute; position: absolute;
width: 100%; height: 0px; width: 100%;
height: 0px;
overflow: hidden; overflow: hidden;
visibility: hidden; visibility: hidden;
} }
.CodeMirror-measure pre { position: static; } .CodeMirror-measure pre {
position: static;
}
.CodeMirror div.CodeMirror-cursor { .CodeMirror div.CodeMirror-cursor {
position: absolute; position: absolute;
@ -226,16 +311,22 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
visibility: visible; visibility: visible;
} }
.CodeMirror-selected { background: #d9d9d9; } .CodeMirror-selected {
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } background: #d9d9d9;
}
.CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0;
}
.cm-searching { .cm-searching {
background: #ffa; background: #ffa;
background: rgba(255, 255, 0, .4); background: rgba(255, 255, 0, 0.4);
} }
/* IE7 hack to prevent it from returning funny offsetTops on the spans */ /* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; } .CodeMirror span {
*vertical-align: text-bottom;
}
@media print { @media print {
/* Hide the cursor when printing */ /* Hide the cursor when printing */

View File

@ -1621,7 +1621,6 @@ function paint_graph_status(
.attr("x", legend_width_x + 15) .attr("x", legend_width_x + 15)
.attr("y", legend_height_x - 20) .attr("y", legend_height_x - 20)
.attr("fill", "black") .attr("fill", "black")
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", "8pt") .style("font-size", "8pt")
.attr("class", "invert_filter") .attr("class", "invert_filter")
@ -1648,7 +1647,6 @@ function paint_graph_status(
.attr("x", legend_width_x + 15) .attr("x", legend_width_x + 15)
.attr("y", legend_height_x + 5) .attr("y", legend_height_x + 5)
.attr("fill", "black") .attr("fill", "black")
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", "8pt") .style("font-size", "8pt")
.attr("class", "invert_filter") .attr("class", "invert_filter")
@ -1673,7 +1671,6 @@ function paint_graph_status(
.attr("x", legend_width_x + 15) .attr("x", legend_width_x + 15)
.attr("y", legend_height_x + 30) .attr("y", legend_height_x + 30)
.attr("fill", "black") .attr("fill", "black")
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", "8pt") .style("font-size", "8pt")
.attr("class", "invert_filter") .attr("class", "invert_filter")
@ -1819,7 +1816,6 @@ function paint_graph_status(
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x) .attr("y", height_x)
.attr("fill", "black") .attr("fill", "black")
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", 14) .style("font-size", 14)
.style("fill", "red") .style("fill", "red")
@ -1835,7 +1831,6 @@ function paint_graph_status(
.attr("x", width_x) .attr("x", width_x)
.attr("y", height_x) .attr("y", height_x)
.attr("fill", "black") .attr("fill", "black")
.style("font-family", "arial")
.style("font-weight", "bold") .style("font-weight", "bold")
.style("font-size", 14) .style("font-size", 14)
.style("fill", "red") .style("fill", "red")

View File

@ -1,90 +1,387 @@
/* Clearlooks 2 */ /* Clearlooks 2 */
/* Reset */ /* Reset */
.clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block} .clearlooks2,
.clearlooks2 div,
.clearlooks2 span,
.clearlooks2 a {
vertical-align: baseline;
text-align: left;
position: absolute;
border: 0;
padding: 0;
margin: 0;
background: transparent;
font-size: 11px;
color: #000;
text-decoration: none;
font-weight: normal;
width: auto;
height: auto;
overflow: hidden;
display: block;
}
/* General */ /* General */
.clearlooks2 {position:absolute; direction:ltr} .clearlooks2 {
.clearlooks2 .mceWrapper {position:static} position: absolute;
.mceEventBlocker {position:fixed; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%} direction: ltr;
.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50)} }
.clearlooks2_modalBlocker {position:fixed; left:0; top:0; width:100%; height:100%; background:#FFF; opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60); display:none} .clearlooks2 .mceWrapper {
position: static;
}
.mceEventBlocker {
position: fixed;
left: 0;
top: 0;
background: url(img/horizontal.gif) no-repeat 0 -75px;
width: 100%;
height: 100%;
}
.clearlooks2 .mcePlaceHolder {
border: 1px solid #000;
background: #888;
top: 0;
left: 0;
opacity: 0.5;
-ms-filter: "alpha(opacity=50)";
filter: alpha(opacity=50);
}
.clearlooks2_modalBlocker {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: #fff;
opacity: 0.6;
-ms-filter: "alpha(opacity=60)";
filter: alpha(opacity=60);
display: none;
}
/* Top */ /* Top */
.clearlooks2 .mceTop, .clearlooks2 .mceTop div {top:0; width:100%; height:23px} .clearlooks2 .mceTop,
.clearlooks2 .mceTop .mceLeft {width:6px; background:url(img/corners.gif)} .clearlooks2 .mceTop div {
.clearlooks2 .mceTop .mceCenter {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)} top: 0;
.clearlooks2 .mceTop .mceRight {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0} width: 100%;
.clearlooks2 .mceTop span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold} height: 23px;
.clearlooks2 .mceFocus .mceTop .mceLeft {background:url(img/corners.gif) -6px 0} }
.clearlooks2 .mceFocus .mceTop .mceCenter {background:url(img/horizontal.gif) 0 -23px} .clearlooks2 .mceTop .mceLeft {
.clearlooks2 .mceFocus .mceTop .mceRight {background:url(img/corners.gif) -18px 0} width: 6px;
.clearlooks2 .mceFocus .mceTop span {color:#FFF} background: url(img/corners.gif);
}
.clearlooks2 .mceTop .mceCenter {
right: 6px;
width: 100%;
height: 23px;
background: url(img/horizontal.gif) 12px 0;
clip: rect(auto auto auto 12px);
}
.clearlooks2 .mceTop .mceRight {
right: 0;
width: 6px;
height: 23px;
background: url(img/corners.gif) -12px 0;
}
.clearlooks2 .mceTop span {
width: 100%;
text-align: center;
vertical-align: middle;
line-height: 23px;
font-weight: bold;
}
.clearlooks2 .mceFocus .mceTop .mceLeft {
background: url(img/corners.gif) -6px 0;
}
.clearlooks2 .mceFocus .mceTop .mceCenter {
background: url(img/horizontal.gif) 0 -23px;
}
.clearlooks2 .mceFocus .mceTop .mceRight {
background: url(img/corners.gif) -18px 0;
}
.clearlooks2 .mceFocus .mceTop span {
color: #fff;
}
/* Middle */ /* Middle */
.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0} .clearlooks2 .mceMiddle,
.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)} .clearlooks2 .mceMiddle div {
.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0} top: 0;
.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF} }
.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:url(img/vertical.gif)} .clearlooks2 .mceMiddle {
width: 100%;
height: 100%;
clip: rect(23px auto auto auto);
}
.clearlooks2 .mceMiddle .mceLeft {
left: 0;
width: 5px;
height: 100%;
background: url(img/vertical.gif) -5px 0;
}
.clearlooks2 .mceMiddle span {
top: 23px;
left: 5px;
width: 100%;
height: 100%;
background: #fff;
}
.clearlooks2 .mceMiddle .mceRight {
right: 0;
width: 5px;
height: 100%;
background: url(img/vertical.gif);
}
/* Bottom */ /* Bottom */
.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px} .clearlooks2 .mceBottom,
.clearlooks2 .mceBottom {left:0; bottom:0; width:100%} .clearlooks2 .mceBottom div {
.clearlooks2 .mceBottom div {top:0} height: 6px;
.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:url(img/corners.gif) -34px -6px} }
.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px} .clearlooks2 .mceBottom {
.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0} left: 0;
.clearlooks2 .mceBottom span {display:none} bottom: 0;
.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px} width: 100%;
.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0} }
.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px} .clearlooks2 .mceBottom div {
.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0} top: 0;
.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px} }
.clearlooks2 .mceBottom .mceLeft {
left: 0;
width: 5px;
background: url(img/corners.gif) -34px -6px;
}
.clearlooks2 .mceBottom .mceCenter {
left: 5px;
width: 100%;
background: url(img/horizontal.gif) 0 -46px;
}
.clearlooks2 .mceBottom .mceRight {
right: 0;
width: 5px;
background: url(img/corners.gif) -34px 0;
}
.clearlooks2 .mceBottom span {
display: none;
}
.clearlooks2 .mceStatusbar .mceBottom,
.clearlooks2 .mceStatusbar .mceBottom div {
height: 23px;
}
.clearlooks2 .mceStatusbar .mceBottom .mceLeft {
background: url(img/corners.gif) -29px 0;
}
.clearlooks2 .mceStatusbar .mceBottom .mceCenter {
background: url(img/horizontal.gif) 0 -52px;
}
.clearlooks2 .mceStatusbar .mceBottom .mceRight {
background: url(img/corners.gif) -24px 0;
}
.clearlooks2 .mceStatusbar .mceBottom span {
display: block;
left: 7px;
font-size: 11px;
line-height: 23px;
}
/* Actions */ /* Actions */
.clearlooks2 a {width:29px; height:16px; top:3px;} .clearlooks2 a {
.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0} width: 29px;
.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0} height: 16px;
.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0} top: 3px;
.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0} }
.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px} .clearlooks2 .mceClose {
.clearlooks2 .mceMovable .mceMove {display:block} right: 6px;
.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px} background: url(img/buttons.gif) -87px 0;
.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px} }
.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px} .clearlooks2 .mceMin {
.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px} display: none;
.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px} right: 68px;
.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px} background: url(img/buttons.gif) 0 0;
.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px} }
.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px} .clearlooks2 .mceMed {
.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px} display: none;
right: 37px;
background: url(img/buttons.gif) -29px 0;
}
.clearlooks2 .mceMax {
display: none;
right: 37px;
background: url(img/buttons.gif) -58px 0;
}
.clearlooks2 .mceMove {
display: none;
width: 100%;
cursor: move;
background: url(img/corners.gif) no-repeat -100px -100px;
}
.clearlooks2 .mceMovable .mceMove {
display: block;
}
.clearlooks2 .mceFocus .mceClose {
right: 6px;
background: url(img/buttons.gif) -87px -16px;
}
.clearlooks2 .mceFocus .mceMin {
right: 68px;
background: url(img/buttons.gif) 0 -16px;
}
.clearlooks2 .mceFocus .mceMed {
right: 37px;
background: url(img/buttons.gif) -29px -16px;
}
.clearlooks2 .mceFocus .mceMax {
right: 37px;
background: url(img/buttons.gif) -58px -16px;
}
.clearlooks2 .mceFocus .mceClose:hover {
right: 6px;
background: url(img/buttons.gif) -87px -32px;
}
.clearlooks2 .mceFocus .mceClose:hover {
right: 6px;
background: url(img/buttons.gif) -87px -32px;
}
.clearlooks2 .mceFocus .mceMin:hover {
right: 68px;
background: url(img/buttons.gif) 0 -32px;
}
.clearlooks2 .mceFocus .mceMed:hover {
right: 37px;
background: url(img/buttons.gif) -29px -32px;
}
.clearlooks2 .mceFocus .mceMax:hover {
right: 37px;
background: url(img/buttons.gif) -58px -32px;
}
/* Resize */ /* Resize */
.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px} .clearlooks2 .mceResize {
.clearlooks2 .mceResizable .mceResize {display:block} top: auto;
.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none} left: auto;
.clearlooks2 .mceMinimizable .mceMin {display:block} display: none;
.clearlooks2 .mceMaximizable .mceMax {display:block} width: 5px;
.clearlooks2 .mceMaximized .mceMed {display:block} height: 5px;
.clearlooks2 .mceMaximized .mceMax {display:none} background: url(img/horizontal.gif) no-repeat 0 -75px;
.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize} }
.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize} .clearlooks2 .mceResizable .mceResize {
.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize} display: block;
.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;} }
.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize} .clearlooks2 .mceResizable .mceMin,
.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize} .clearlooks2 .mceMax {
.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize} display: none;
.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize} }
.clearlooks2 .mceMinimizable .mceMin {
display: block;
}
.clearlooks2 .mceMaximizable .mceMax {
display: block;
}
.clearlooks2 .mceMaximized .mceMed {
display: block;
}
.clearlooks2 .mceMaximized .mceMax {
display: none;
}
.clearlooks2 a.mceResizeN {
top: 0;
left: 0;
width: 100%;
cursor: n-resize;
}
.clearlooks2 a.mceResizeNW {
top: 0;
left: 0;
cursor: nw-resize;
}
.clearlooks2 a.mceResizeNE {
top: 0;
right: 0;
cursor: ne-resize;
}
.clearlooks2 a.mceResizeW {
top: 0;
left: 0;
height: 100%;
cursor: w-resize;
}
.clearlooks2 a.mceResizeE {
top: 0;
right: 0;
height: 100%;
cursor: e-resize;
}
.clearlooks2 a.mceResizeS {
bottom: 0;
left: 0;
width: 100%;
cursor: s-resize;
}
.clearlooks2 a.mceResizeSW {
bottom: 0;
left: 0;
cursor: sw-resize;
}
.clearlooks2 a.mceResizeSE {
bottom: 0;
right: 0;
cursor: se-resize;
}
/* Alert/Confirm */ /* Alert/Confirm */
.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0} .clearlooks2 .mceButton {
.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px} font-weight: bold;
.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal} bottom: 10px;
.clearlooks2 a:hover {font-weight:bold;} width: 80px;
.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5} height: 30px;
.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px} background: url(img/button.gif);
.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)} line-height: 30px;
.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px} vertical-align: middle;
.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto} text-align: center;
.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} outline: 0;
}
.clearlooks2 .mceMiddle .mceIcon {
left: 15px;
top: 35px;
width: 32px;
height: 32px;
}
.clearlooks2 .mceAlert .mceMiddle span,
.clearlooks2 .mceConfirm .mceMiddle span {
background: transparent;
left: 60px;
top: 35px;
width: 320px;
height: 50px;
font-weight: bold;
overflow: auto;
white-space: normal;
}
.clearlooks2 a:hover {
font-weight: bold;
}
.clearlooks2 .mceAlert .mceMiddle,
.clearlooks2 .mceConfirm .mceMiddle {
background: #d6d7d5;
}
.clearlooks2 .mceAlert .mceOk {
left: 50%;
top: auto;
margin-left: -40px;
}
.clearlooks2 .mceAlert .mceIcon {
background: url(img/alert.gif);
}
.clearlooks2 .mceConfirm .mceOk {
left: 50%;
top: auto;
margin-left: -90px;
}
.clearlooks2 .mceConfirm .mceCancel {
left: 50%;
top: auto;
}
.clearlooks2 .mceConfirm .mceIcon {
background: url(img/confirm.gif);
}

View File

@ -1,13 +1,7 @@
tinyMCEPopup.requireLangPack(); tinyMCEPopup.requireLangPack();
var defaultFonts = "" + var defaultFonts = "" +
"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + "lato";
"Times New Roman, Times, serif=Times New Roman, Times, serif;" +
"Courier New, Courier, mono=Courier New, Courier, mono;" +
"Times New Roman, Times, serif=Times New Roman, Times, serif;" +
"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" +
"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" +
"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger"; var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%"; var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";
@ -30,7 +24,7 @@ var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-
function aggregateStyles(allStyles) { function aggregateStyles(allStyles) {
var mergedStyles = {}; var mergedStyles = {};
tinymce.each(allStyles, function(style) { tinymce.each(allStyles, function (style) {
if (style !== '') { if (style !== '') {
var parsedStyles = tinyMCEPopup.editor.dom.parseStyle(style); var parsedStyles = tinyMCEPopup.editor.dom.parseStyle(style);
for (var name in parsedStyles) { for (var name in parsedStyles) {
@ -40,7 +34,7 @@ function aggregateStyles(allStyles) {
} }
else if (name === 'text-decoration') { else if (name === 'text-decoration') {
if (mergedStyles[name].indexOf(parsedStyles[name]) === -1) { if (mergedStyles[name].indexOf(parsedStyles[name]) === -1) {
mergedStyles[name] = mergedStyles[name] +' '+ parsedStyles[name]; mergedStyles[name] = mergedStyles[name] + ' ' + parsedStyles[name];
} }
} }
} }
@ -63,15 +57,15 @@ function init(ed) {
applyActionIsInsert = ed.getParam("edit_css_style_insert_span", false); applyActionIsInsert = ed.getParam("edit_css_style_insert_span", false);
document.getElementById('toggle_insert_span').checked = applyActionIsInsert; document.getElementById('toggle_insert_span').checked = applyActionIsInsert;
h = getBrowserHTML('background_image_browser','background_image','image','advimage'); h = getBrowserHTML('background_image_browser', 'background_image', 'image', 'advimage');
document.getElementById("background_image_browser").innerHTML = h; document.getElementById("background_image_browser").innerHTML = h;
document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color'); document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick', 'text_color');
document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color'); document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick', 'background_color');
document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top'); document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick', 'border_color_top');
document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right'); document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick', 'border_color_right');
document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom'); document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick', 'border_color_bottom');
document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left'); document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick', 'border_color_left');
fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true); fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true); fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
@ -272,7 +266,7 @@ function setupFormData() {
f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value; f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
} }
// setupBox(f, ce, '', 'border', 'Color'); // setupBox(f, ce, '', 'border', 'Color');
} }
function getMeasurement(s) { function getMeasurement(s) {
@ -307,7 +301,7 @@ function setValue(f, n, v) {
} }
function setupBox(f, ce, fp, pr, sf, b) { function setupBox(f, ce, fp, pr, sf, b) {
if (typeof(b) == "undefined") if (typeof (b) == "undefined")
b = ['Top', 'Right', 'Bottom', 'Left']; b = ['Top', 'Right', 'Bottom', 'Left'];
if (isSame(ce, pr, sf, b)) { if (isSame(ce, pr, sf, b)) {
@ -359,10 +353,10 @@ function setupBox(f, ce, fp, pr, sf, b) {
function isSame(e, pr, sf, b) { function isSame(e, pr, sf, b) {
var a = [], i, x; var a = [], i, x;
if (typeof(b) == "undefined") if (typeof (b) == "undefined")
b = ['Top', 'Right', 'Bottom', 'Left']; b = ['Top', 'Right', 'Bottom', 'Left'];
if (typeof(sf) == "undefined" || sf == null) if (typeof (sf) == "undefined" || sf == null)
sf = ""; sf = "";
a[0] = e.style[pr + b[0] + sf]; a[0] = e.style[pr + b[0] + sf];
@ -370,11 +364,11 @@ function isSame(e, pr, sf, b) {
a[2] = e.style[pr + b[2] + sf]; a[2] = e.style[pr + b[2] + sf];
a[3] = e.style[pr + b[3] + sf]; a[3] = e.style[pr + b[3] + sf];
for (i=0; i<a.length; i++) { for (i = 0; i < a.length; i++) {
if (a[i] == null) if (a[i] == null)
return false; return false;
for (x=0; x<a.length; x++) { for (x = 0; x < a.length; x++) {
if (a[x] != a[i]) if (a[x] != a[i])
return false; return false;
} }
@ -386,11 +380,11 @@ function isSame(e, pr, sf, b) {
function hasEqualValues(a) { function hasEqualValues(a) {
var i, x; var i, x;
for (i=0; i<a.length; i++) { for (i = 0; i < a.length; i++) {
if (a[i] == null) if (a[i] == null)
return false; return false;
for (x=0; x<a.length; x++) { for (x = 0; x < a.length; x++) {
if (a[x] != a[i]) if (a[x] != a[i])
return false; return false;
} }
@ -400,7 +394,7 @@ function hasEqualValues(a) {
} }
function toggleApplyAction() { function toggleApplyAction() {
applyActionIsInsert = ! applyActionIsInsert; applyActionIsInsert = !applyActionIsInsert;
} }
function applyAction() { function applyAction() {
@ -608,8 +602,8 @@ function isNum(s) {
function showDisabledControls() { function showDisabledControls() {
var f = document.forms, i, a; var f = document.forms, i, a;
for (i=0; i<f.length; i++) { for (i = 0; i < f.length; i++) {
for (a=0; a<f[i].elements.length; a++) { for (a = 0; a < f[i].elements.length; a++) {
if (f[i].elements[a].disabled) if (f[i].elements[a].disabled)
tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled"); tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
else else
@ -622,13 +616,13 @@ function fillSelect(f, s, param, dval, sep, em) {
var i, ar, p, se; var i, ar, p, se;
f = document.forms[f]; f = document.forms[f];
sep = typeof(sep) == "undefined" ? ";" : sep; sep = typeof (sep) == "undefined" ? ";" : sep;
if (em) if (em)
addSelectValue(f, s, "", ""); addSelectValue(f, s, "", "");
ar = tinyMCEPopup.getParam(param, dval).split(sep); ar = tinyMCEPopup.getParam(param, dval).split(sep);
for (i=0; i<ar.length; i++) { for (i = 0; i < ar.length; i++) {
se = false; se = false;
if (ar[i].charAt(0) == '+') { if (ar[i].charAt(0) == '+') {
@ -693,12 +687,12 @@ function synch(fr, to) {
selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value); selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
} }
function updateTextDecorations(){ function updateTextDecorations() {
var el = document.forms[0].elements; var el = document.forms[0].elements;
var textDecorations = ["text_underline", "text_overline", "text_linethrough", "text_blink"]; var textDecorations = ["text_underline", "text_overline", "text_linethrough", "text_blink"];
var noneChecked = el["text_none"].checked; var noneChecked = el["text_none"].checked;
tinymce.each(textDecorations, function(id) { tinymce.each(textDecorations, function (id) {
el[id].disabled = noneChecked; el[id].disabled = noneChecked;
if (noneChecked) { if (noneChecked) {
el[id].checked = false; el[id].checked = false;

File diff suppressed because one or more lines are too long

View File

@ -1,50 +1,159 @@
body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} body,
body {background:#FFF;} td,
body.mceForceColors {background:#FFF; color:#000;} pre {
body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;} color: #000;
h1 {font-size: 2em} font-size: 10px;
h2 {font-size: 1.5em} margin: 8px;
h3 {font-size: 1.17em} }
h4 {font-size: 1em} body {
h5 {font-size: .83em} background: #fff;
h6 {font-size: .75em} }
.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} body.mceForceColors {
a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-modify:read-only; -moz-user-select:all; -moz-user-modify:read-only; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat center center} background: #fff;
span.mceItemNbsp {background: #DDD} color: #000;
td.mceSelected, th.mceSelected {background-color:#3399ff !important} }
img {border:0;} body.mceBrowserDefaults {
table, img, hr, .mceItemAnchor {cursor:default} background: transparent;
table td, table th {cursor:text} color: inherit;
ins {border-bottom:1px solid green; text-decoration: none; color:green} font-size: inherit;
del {color:red; text-decoration:line-through} }
cite {border-bottom:1px dashed blue} h1 {
acronym {border-bottom:1px dotted #CCC; cursor:help} font-size: 2em;
abbr {border-bottom:1px dashed #CCC; cursor:help} }
h2 {
font-size: 1.5em;
}
h3 {
font-size: 1.17em;
}
h4 {
font-size: 1em;
}
h5 {
font-size: 0.83em;
}
h6 {
font-size: 0.75em;
}
.mceItemTable,
.mceItemTable td,
.mceItemTable th,
.mceItemTable caption,
.mceItemVisualAid {
border: 1px dashed #bbb;
}
a.mceItemAnchor {
display: inline-block;
-webkit-user-select: all;
-webkit-user-modify: read-only;
-moz-user-select: all;
-moz-user-modify: read-only;
width: 11px !important;
height: 11px !important;
background: url(img/items.gif) no-repeat center center;
}
span.mceItemNbsp {
background: #ddd;
}
td.mceSelected,
th.mceSelected {
background-color: #3399ff !important;
}
img {
border: 0;
}
table,
img,
hr,
.mceItemAnchor {
cursor: default;
}
table td,
table th {
cursor: text;
}
ins {
border-bottom: 1px solid green;
text-decoration: none;
color: green;
}
del {
color: red;
text-decoration: line-through;
}
cite {
border-bottom: 1px dashed blue;
}
acronym {
border-bottom: 1px dotted #ccc;
cursor: help;
}
abbr {
border-bottom: 1px dashed #ccc;
cursor: help;
}
/* IE */ /* IE */
* html body { * html body {
scrollbar-3dlight-color:#F0F0EE; scrollbar-3dlight-color: #f0f0ee;
scrollbar-arrow-color:#676662; scrollbar-arrow-color: #676662;
scrollbar-base-color:#F0F0EE; scrollbar-base-color: #f0f0ee;
scrollbar-darkshadow-color:#DDD; scrollbar-darkshadow-color: #ddd;
scrollbar-face-color:#E0E0DD; scrollbar-face-color: #e0e0dd;
scrollbar-highlight-color:#F0F0EE; scrollbar-highlight-color: #f0f0ee;
scrollbar-shadow-color:#F0F0EE; scrollbar-shadow-color: #f0f0ee;
scrollbar-track-color:#F5F5F5; scrollbar-track-color: #f5f5f5;
} }
img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px} img:-moz-broken {
font[face=mceinline] {font-family:inherit !important} -moz-force-broken-image-icon: 1;
*[contentEditable]:focus {outline:0} width: 24px;
height: 24px;
}
.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc} *[contentEditable]:focus {
.mceItemShockWave {background-image:url(../../img/shockwave.gif)} outline: 0;
.mceItemFlash {background-image:url(../../img/flash.gif)} }
.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}
.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)} .mceItemMedia {
.mceItemRealMedia {background-image:url(../../img/realmedia.gif)} border: 1px dotted #cc0000;
.mceItemVideo {background-image:url(../../img/video.gif)} background-position: center;
.mceItemAudio {background-image:url(../../img/video.gif)} background-repeat: no-repeat;
.mceItemEmbeddedAudio {background-image:url(../../img/video.gif)} background-color: #ffffcc;
.mceItemIframe {background-image:url(../../img/iframe.gif)} }
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;} .mceItemShockWave {
background-image: url(../../img/shockwave.gif);
}
.mceItemFlash {
background-image: url(../../img/flash.gif);
}
.mceItemQuickTime {
background-image: url(../../img/quicktime.gif);
}
.mceItemWindowsMedia {
background-image: url(../../img/windowsmedia.gif);
}
.mceItemRealMedia {
background-image: url(../../img/realmedia.gif);
}
.mceItemVideo {
background-image: url(../../img/video.gif);
}
.mceItemAudio {
background-image: url(../../img/video.gif);
}
.mceItemEmbeddedAudio {
background-image: url(../../img/video.gif);
}
.mceItemIframe {
background-image: url(../../img/iframe.gif);
}
.mcePageBreak {
display: block;
border: 0;
width: 100%;
height: 12px;
border-top: 1px dotted #ccc;
margin-top: 15px;
background: #fff url(../../img/pagebreak.gif) no-repeat center top;
}

View File

@ -1,118 +1,383 @@
/* Generic */ /* Generic */
body { body {
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-size: 11px;
scrollbar-3dlight-color:#F0F0EE; scrollbar-3dlight-color: #f0f0ee;
scrollbar-arrow-color:#676662; scrollbar-arrow-color: #676662;
scrollbar-base-color:#F0F0EE; scrollbar-base-color: #f0f0ee;
scrollbar-darkshadow-color:#DDDDDD; scrollbar-darkshadow-color: #dddddd;
scrollbar-face-color:#E0E0DD; scrollbar-face-color: #e0e0dd;
scrollbar-highlight-color:#F0F0EE; scrollbar-highlight-color: #f0f0ee;
scrollbar-shadow-color:#F0F0EE; scrollbar-shadow-color: #f0f0ee;
scrollbar-track-color:#F5F5F5; scrollbar-track-color: #f5f5f5;
background:#F0F0EE; background: #f0f0ee;
padding:0; padding: 0;
margin:8px 8px 0 8px; margin: 8px 8px 0 8px;
} }
html {background:#F0F0EE;} html {
td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} background: #f0f0ee;
textarea {resize:none;outline:none;} }
a:link, a:visited {color:black;} td {
a:hover {color:#2B6FB6;} font-size: 10px;
.nowrap {white-space: nowrap} }
textarea {
resize: none;
outline: none;
}
a:link,
a:visited {
color: black;
}
a:hover {
color: #2b6fb6;
}
.nowrap {
white-space: nowrap;
}
/* Forms */ /* Forms */
fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;} fieldset {
legend {color:#2B6FB6; font-weight:bold;} margin: 0;
label.msg {display:none;} padding: 4px;
label.invalid {color:#EE0000; display:inline;} border: 1px solid #919b9c;
input.invalid {border:1px solid #EE0000;} font-size: 10px;
input {background:#FFF; border:1px solid #CCC;} }
input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} legend {
input, select, textarea {border:1px solid #808080;} color: #2b6fb6;
input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} font-weight: bold;
input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} }
.input_noborder {border:0;} label.msg {
display: none;
/* Buttons */ }
#insert, #cancel, input.button, .updateButton { label.invalid {
border:0; margin:0; padding:0; color: #ee0000;
font-weight:bold; display: inline;
width:94px; height:26px; }
background:url(img/buttons.png) 0 -26px; input.invalid {
cursor:pointer; border: 1px solid #ee0000;
padding-bottom:2px; }
float:left; input {
background: #fff;
border: 1px solid #ccc;
}
input,
select,
textarea {
font-size: 10px;
}
input,
select,
textarea {
border: 1px solid #808080;
}
input.radio {
border: 1px none #000000;
background: transparent;
vertical-align: middle;
}
input.checkbox {
border: 1px none #000000;
background: transparent;
vertical-align: middle;
}
.input_noborder {
border: 0;
} }
#insert {background:url(img/buttons.png) 0 -52px} /* Buttons */
#cancel {background:url(img/buttons.png) 0 0; float:right} #insert,
#cancel,
input.button,
.updateButton {
border: 0;
margin: 0;
padding: 0;
font-weight: bold;
width: 94px;
height: 26px;
background: url(img/buttons.png) 0 -26px;
cursor: pointer;
padding-bottom: 2px;
float: left;
}
#insert {
background: url(img/buttons.png) 0 -52px;
}
#cancel {
background: url(img/buttons.png) 0 0;
float: right;
}
/* Browse */ /* Browse */
a.pickcolor, a.browse {text-decoration:none} a.pickcolor,
a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;} a.browse {
.mceOldBoxModel a.browse span {width:22px; height:20px;} text-decoration: none;
a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} }
a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} a.browse span {
a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} display: block;
a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;} width: 20px;
.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} height: 18px;
a.pickcolor:hover span {background-color:#B2BBD0;} background: url(../../img/icons.gif) -860px 0;
a.pickcolor:hover span.disabled {} border: 1px solid #fff;
margin-left: 1px;
}
.mceOldBoxModel a.browse span {
width: 22px;
height: 20px;
}
a.browse:hover span {
border: 1px solid #0a246a;
background-color: #b2bbd0;
}
a.browse span.disabled {
border: 1px solid white;
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
a.browse:hover span.disabled {
border: 1px solid white;
background-color: transparent;
}
a.pickcolor span {
display: block;
width: 20px;
height: 16px;
background: url(../../img/icons.gif) -840px 0;
margin-left: 2px;
}
.mceOldBoxModel a.pickcolor span {
width: 21px;
height: 17px;
}
a.pickcolor:hover span {
background-color: #b2bbd0;
}
a.pickcolor:hover span.disabled {
}
/* Charmap */ /* Charmap */
table.charmap {border:1px solid #AAA; text-align:center} table.charmap {
td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} border: 1px solid #aaa;
#charmap a {display:block; color:#000; text-decoration:none; border:0} text-align: center;
#charmap a:hover {background:#CCC;color:#2B6FB6} }
#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} td.charmap,
#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} #charmap a {
width: 18px;
height: 18px;
color: #000;
border: 1px solid #aaa;
text-align: center;
font-size: 12px;
vertical-align: middle;
line-height: 18px;
}
#charmap a {
display: block;
color: #000;
text-decoration: none;
border: 0;
}
#charmap a:hover {
background: #ccc;
color: #2b6fb6;
}
#charmap #codeN {
font-size: 10px;
text-align: center;
}
#charmap #codeV {
font-size: 40px;
height: 80px;
border: 1px solid #aaa;
text-align: center;
}
/* Source */ /* Source */
.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} .wordWrapCode {
.mceActionPanel {margin-top:5px;} vertical-align: middle;
border: 1px none #000000;
background: transparent;
}
.mceActionPanel {
margin-top: 5px;
}
/* Tabs classes */ /* Tabs classes */
.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;} .tabs {
.tabs ul {margin:0; padding:0; list-style:none;} width: 100%;
.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} height: 18px;
.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;} line-height: normal;
.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;} background: url(img/tabs.gif) repeat-x 0 -72px;
.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;} }
.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} .tabs ul {
.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} margin: 0;
padding: 0;
list-style: none;
}
.tabs li {
float: left;
background: url(img/tabs.gif) no-repeat 0 0;
margin: 0 2px 0 0;
padding: 0 0 0 10px;
line-height: 17px;
height: 18px;
display: block;
}
.tabs li.current {
background: url(img/tabs.gif) no-repeat 0 -18px;
margin-right: 2px;
}
.tabs span {
float: left;
display: block;
background: url(img/tabs.gif) no-repeat right -36px;
padding: 0px 10px 0 0;
}
.tabs .current span {
background: url(img/tabs.gif) no-repeat right -54px;
}
.tabs a {
text-decoration: none;
font-size: 10px;
}
.tabs a:link,
.tabs a:visited,
.tabs a:hover {
color: black;
}
/* Panels */ /* Panels */
.panel_wrapper div.panel {display:none;} .panel_wrapper div.panel {
.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} display: none;
.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} }
.panel_wrapper div.current {
display: block;
width: 100%;
height: 300px;
overflow: visible;
}
.panel_wrapper {
border: 1px solid #919b9c;
border-top: 0px;
padding: 10px;
padding-top: 5px;
clear: both;
background: white;
}
/* Columns */ /* Columns */
.column {float:left;} .column {
.properties {width:100%;} float: left;
.properties .column1 {} }
.properties .column2 {text-align:left;} .properties {
width: 100%;
}
.properties .column1 {
}
.properties .column2 {
text-align: left;
}
/* Titles */ /* Titles */
h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} h1,
h3 {font-size:14px;} h2,
.title {font-size:12px; font-weight:bold; color:#2B6FB6;} h3,
h4 {
color: #2b6fb6;
margin: 0;
padding: 0;
padding-top: 5px;
}
h3 {
font-size: 14px;
}
.title {
font-size: 12px;
font-weight: bold;
color: #2b6fb6;
}
/* Dialog specific */ /* Dialog specific */
#link .panel_wrapper, #link div.current {height:125px;} #link .panel_wrapper,
#image .panel_wrapper, #image div.current {height:200px;} #link div.current {
#plugintable thead {font-weight:bold; background:#DDD;} height: 125px;
#plugintable, #about #plugintable td {border:1px solid #919B9C;} }
#plugintable {width:96%; margin-top:10px;} #image .panel_wrapper,
#pluginscontainer {height:290px; overflow:auto;} #image div.current {
#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px} height: 200px;
#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline} }
#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap} #plugintable thead {
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} font-weight: bold;
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} background: #ddd;
#colorpicker #light div {overflow:hidden;} }
#colorpicker .panel_wrapper div.current {height:175px;} #plugintable,
#colorpicker #namedcolors {width:150px;} #about #plugintable td {
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} border: 1px solid #919b9c;
#colorpicker #colornamecontainer {margin-top:5px;} }
#colorpicker #picker_panel fieldset {margin:auto;width:325px;} #plugintable {
width: 96%;
margin-top: 10px;
}
#pluginscontainer {
height: 290px;
overflow: auto;
}
#colorpicker #preview {
display: inline-block;
padding-left: 40px;
height: 14px;
border: 1px solid black;
margin-left: 5px;
margin-right: 5px;
}
#colorpicker #previewblock {
position: relative;
top: -3px;
padding-left: 5px;
padding-top: 0px;
display: inline;
}
#colorpicker #preview_wrapper {
text-align: center;
padding-top: 4px;
white-space: nowrap;
}
#colorpicker #colors {
float: left;
border: 1px solid gray;
cursor: crosshair;
}
#colorpicker #light {
border: 1px solid gray;
margin-left: 5px;
float: left;
width: 15px;
height: 150px;
cursor: crosshair;
}
#colorpicker #light div {
overflow: hidden;
}
#colorpicker .panel_wrapper div.current {
height: 175px;
}
#colorpicker #namedcolors {
width: 150px;
}
#colorpicker #namedcolors a {
display: block;
float: left;
width: 10px;
height: 10px;
margin: 1px 1px 0 0;
overflow: hidden;
}
#colorpicker #colornamecontainer {
margin-top: 5px;
}
#colorpicker #picker_panel fieldset {
margin: auto;
width: 325px;
}

View File

@ -106,7 +106,6 @@
} }
.defaultSkin .mceStatusbar { .defaultSkin .mceStatusbar {
background: #f0f0ee; background: #f0f0ee;
font-family: "MS Sans Serif", sans-serif, Verdana, Arial;
font-size: 9pt; font-size: 9pt;
line-height: 16px; line-height: 16px;
overflow: visible; overflow: visible;
@ -185,7 +184,6 @@
display: block; display: block;
font-size: 10px; font-size: 10px;
padding: 4px 6px 0 22px; padding: 4px 6px 0 22px;
font-family: Tahoma, Verdana, Arial, Helvetica;
} }
.defaultSkin .mceButtonDisabled .mceButtonLabel { .defaultSkin .mceButtonDisabled .mceButtonLabel {
color: #888; color: #888;
@ -212,7 +210,6 @@
border: 1px solid #ccc; border: 1px solid #ccc;
border-right: 0; border-right: 0;
background: #fff; background: #fff;
font-family: Tahoma, Verdana, Arial, Helvetica;
font-size: 11px; font-size: 11px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
@ -254,7 +251,6 @@
height: 22px; height: 22px;
} }
.defaultSkin select.mceNativeListBox { .defaultSkin select.mceNativeListBox {
font-family: "MS Sans Serif", sans-serif, Verdana, Arial;
font-size: 7pt; font-size: 7pt;
background: #f0f0ee; background: #f0f0ee;
border: 1px solid gray; border: 1px solid gray;
@ -338,7 +334,6 @@
width: 100%; width: 100%;
height: auto; height: auto;
text-align: center; text-align: center;
font-family: Tahoma, Verdana, Arial, Helvetica;
font-size: 11px; font-size: 11px;
line-height: 20px; line-height: 20px;
border: 1px solid #fff; border: 1px solid #fff;
@ -396,7 +391,6 @@
.defaultSkin .mceMenu .mceText { .defaultSkin .mceMenu .mceText {
position: relative; position: relative;
display: block; display: block;
font-family: Tahoma, Verdana, Arial, Helvetica;
color: #000; color: #000;
cursor: default; cursor: default;
margin: 0; margin: 0;
@ -407,9 +401,6 @@
.defaultSkin .mceMenu .mcePreview { .defaultSkin .mceMenu .mcePreview {
font-size: 11px; font-size: 11px;
} }
.defaultSkin .mceMenu pre.mceText {
font-family: Monospace;
}
.defaultSkin .mceMenu .mceIcon { .defaultSkin .mceMenu .mceIcon {
position: absolute; position: absolute;
top: 0; top: 0;
@ -494,9 +485,6 @@
.defaultSkin .mce_address span.mceText { .defaultSkin .mce_address span.mceText {
font-style: italic; font-style: italic;
} }
.defaultSkin .mce_pre span.mceText {
font-family: monospace;
}
.defaultSkin .mce_h1 span.mceText { .defaultSkin .mce_h1 span.mceText {
font-weight: bolder; font-weight: bolder;
font-size: 2em; font-size: 2em;

View File

@ -1,106 +1,366 @@
/* Generic */ /* Generic */
body { body {
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-size: 11px;
background:#F0F0EE; background: #f0f0ee;
color: black; color: black;
padding:0; padding: 0;
margin:8px 8px 0 8px; margin: 8px 8px 0 8px;
} }
html {background:#F0F0EE; color:#000;} html {
td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} background: #f0f0ee;
textarea {resize:none;outline:none;} color: #000;
a:link, a:visited {color:black;background-color:transparent;} }
a:hover {color:#2B6FB6;background-color:transparent;} td {
.nowrap {white-space: nowrap} font-size: 10px;
}
textarea {
resize: none;
outline: none;
}
a:link,
a:visited {
color: black;
background-color: transparent;
}
a:hover {
color: #2b6fb6;
background-color: transparent;
}
.nowrap {
white-space: nowrap;
}
/* Forms */ /* Forms */
fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;} fieldset {
legend {color:#2B6FB6; font-weight:bold;} margin: 0;
label.msg {display:none;} padding: 4px;
label.invalid {color:#EE0000; display:inline;background-color:transparent;} border: 1px solid #919b9c;
input.invalid {border:1px solid #EE0000;background-color:transparent;} font-size: 10px;
input {background:#FFF; border:1px solid #CCC;color:black;} }
input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} legend {
input, select, textarea {border:1px solid #808080;} color: #2b6fb6;
input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} font-weight: bold;
input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} }
.input_noborder {border:0;} label.msg {
display: none;
/* Buttons */ }
#insert, #cancel, input.button, .updateButton { label.invalid {
font-weight:bold; color: #ee0000;
width:94px; height:23px; display: inline;
cursor:pointer; background-color: transparent;
padding-bottom:2px; }
float:left; input.invalid {
border: 1px solid #ee0000;
background-color: transparent;
}
input {
background: #fff;
border: 1px solid #ccc;
color: black;
}
input,
select,
textarea {
font-size: 10px;
}
input,
select,
textarea {
border: 1px solid #808080;
}
input.radio {
border: 1px none #000000;
background: transparent;
vertical-align: middle;
}
input.checkbox {
border: 1px none #000000;
background: transparent;
vertical-align: middle;
}
.input_noborder {
border: 0;
} }
#cancel {float:right} /* Buttons */
#insert,
#cancel,
input.button,
.updateButton {
font-weight: bold;
width: 94px;
height: 23px;
cursor: pointer;
padding-bottom: 2px;
float: left;
}
#cancel {
float: right;
}
/* Browse */ /* Browse */
a.pickcolor, a.browse {text-decoration:none} a.pickcolor,
a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;} a.browse {
.mceOldBoxModel a.browse span {width:22px; height:20px;} text-decoration: none;
a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} }
a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} a.browse span {
a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} display: block;
a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;} width: 20px;
.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} height: 18px;
a.pickcolor:hover span {background-color:#B2BBD0;} background: url(../../img/icons.gif) -860px 0;
a.pickcolor:hover span.disabled {} border: 1px solid #fff;
margin-left: 1px;
}
.mceOldBoxModel a.browse span {
width: 22px;
height: 20px;
}
a.browse:hover span {
border: 1px solid #0a246a;
background-color: #b2bbd0;
}
a.browse span.disabled {
border: 1px solid white;
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
a.browse:hover span.disabled {
border: 1px solid white;
background-color: transparent;
}
a.pickcolor span {
display: block;
width: 20px;
height: 16px;
background: url(../../img/icons.gif) -840px 0;
margin-left: 2px;
}
.mceOldBoxModel a.pickcolor span {
width: 21px;
height: 17px;
}
a.pickcolor:hover span {
background-color: #b2bbd0;
}
a.pickcolor:hover span.disabled {
}
/* Charmap */ /* Charmap */
table.charmap {border:1px solid #AAA; text-align:center} table.charmap {
td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} border: 1px solid #aaa;
#charmap a {display:block; color:#000; text-decoration:none; border:0} text-align: center;
#charmap a:hover {background:#CCC;color:#2B6FB6} }
#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} td.charmap,
#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} #charmap a {
width: 18px;
height: 18px;
color: #000;
border: 1px solid #aaa;
text-align: center;
font-size: 12px;
vertical-align: middle;
line-height: 18px;
}
#charmap a {
display: block;
color: #000;
text-decoration: none;
border: 0;
}
#charmap a:hover {
background: #ccc;
color: #2b6fb6;
}
#charmap #codeN {
font-size: 10px;
text-align: center;
}
#charmap #codeV {
font-size: 40px;
height: 80px;
border: 1px solid #aaa;
text-align: center;
}
/* Source */ /* Source */
.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} .wordWrapCode {
.mceActionPanel {margin-top:5px;} vertical-align: middle;
border: 1px none #000000;
background: transparent;
}
.mceActionPanel {
margin-top: 5px;
}
/* Tabs classes */ /* Tabs classes */
.tabs {width:100%; height:18px; line-height:normal;} .tabs {
.tabs ul {margin:0; padding:0; list-style:none;} width: 100%;
.tabs li {float:left; border: 1px solid black; border-bottom:0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block; cursor:pointer;} height: 18px;
.tabs li.current {font-weight: bold; margin-right:2px;} line-height: normal;
.tabs span {float:left; display:block; padding:0px 10px 0 0;} }
.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} .tabs ul {
.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} margin: 0;
padding: 0;
list-style: none;
}
.tabs li {
float: left;
border: 1px solid black;
border-bottom: 0;
margin: 0 2px 0 0;
padding: 0 0 0 10px;
line-height: 17px;
height: 18px;
display: block;
cursor: pointer;
}
.tabs li.current {
font-weight: bold;
margin-right: 2px;
}
.tabs span {
float: left;
display: block;
padding: 0px 10px 0 0;
}
.tabs a {
text-decoration: none;
font-size: 10px;
}
.tabs a:link,
.tabs a:visited,
.tabs a:hover {
color: black;
}
/* Panels */ /* Panels */
.panel_wrapper div.panel {display:none;} .panel_wrapper div.panel {
.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} display: none;
.panel_wrapper {border:1px solid #919B9C; padding:10px; padding-top:5px; clear:both; background:white;} }
.panel_wrapper div.current {
display: block;
width: 100%;
height: 300px;
overflow: visible;
}
.panel_wrapper {
border: 1px solid #919b9c;
padding: 10px;
padding-top: 5px;
clear: both;
background: white;
}
/* Columns */ /* Columns */
.column {float:left;} .column {
.properties {width:100%;} float: left;
.properties .column1 {} }
.properties .column2 {text-align:left;} .properties {
width: 100%;
}
.properties .column1 {
}
.properties .column2 {
text-align: left;
}
/* Titles */ /* Titles */
h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} h1,
h3 {font-size:14px;} h2,
.title {font-size:12px; font-weight:bold; color:#2B6FB6;} h3,
h4 {
color: #2b6fb6;
margin: 0;
padding: 0;
padding-top: 5px;
}
h3 {
font-size: 14px;
}
.title {
font-size: 12px;
font-weight: bold;
color: #2b6fb6;
}
/* Dialog specific */ /* Dialog specific */
#link .panel_wrapper, #link div.current {height:125px;} #link .panel_wrapper,
#image .panel_wrapper, #image div.current {height:200px;} #link div.current {
#plugintable thead {font-weight:bold; background:#DDD;} height: 125px;
#plugintable, #about #plugintable td {border:1px solid #919B9C;} }
#plugintable {width:96%; margin-top:10px;} #image .panel_wrapper,
#pluginscontainer {height:290px; overflow:auto;} #image div.current {
#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px} height: 200px;
#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline} }
#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap} #plugintable thead {
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} font-weight: bold;
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} background: #ddd;
#colorpicker #light div {overflow:hidden;} }
#colorpicker .panel_wrapper div.current {height:175px;} #plugintable,
#colorpicker #namedcolors {width:150px;} #about #plugintable td {
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} border: 1px solid #919b9c;
#colorpicker #colornamecontainer {margin-top:5px;} }
#plugintable {
width: 96%;
margin-top: 10px;
}
#pluginscontainer {
height: 290px;
overflow: auto;
}
#colorpicker #preview {
display: inline-block;
padding-left: 40px;
height: 14px;
border: 1px solid black;
margin-left: 5px;
margin-right: 5px;
}
#colorpicker #previewblock {
position: relative;
top: -3px;
padding-left: 5px;
padding-top: 0px;
display: inline;
}
#colorpicker #preview_wrapper {
text-align: center;
padding-top: 4px;
white-space: nowrap;
}
#colorpicker #colors {
float: left;
border: 1px solid gray;
cursor: crosshair;
}
#colorpicker #light {
border: 1px solid gray;
margin-left: 5px;
float: left;
width: 15px;
height: 150px;
cursor: crosshair;
}
#colorpicker #light div {
overflow: hidden;
}
#colorpicker .panel_wrapper div.current {
height: 175px;
}
#colorpicker #namedcolors {
width: 150px;
}
#colorpicker #namedcolors a {
display: block;
float: left;
width: 10px;
height: 10px;
margin: 1px 1px 0 0;
overflow: hidden;
}
#colorpicker #colornamecontainer {
margin-top: 5px;
}

View File

@ -1,106 +1,439 @@
/* Reset */ /* Reset */
.highcontrastSkin table, .highcontrastSkin tbody, .highcontrastSkin a, .highcontrastSkin img, .highcontrastSkin tr, .highcontrastSkin div, .highcontrastSkin td, .highcontrastSkin iframe, .highcontrastSkin span, .highcontrastSkin *, .highcontrastSkin .mceText {border:0; margin:0; padding:0; vertical-align:baseline; border-collapse:separate;} .highcontrastSkin table,
.highcontrastSkin a:hover, .highcontrastSkin a:link, .highcontrastSkin a:visited, .highcontrastSkin a:active {text-decoration:none; font-weight:normal; cursor:default;} .highcontrastSkin tbody,
.highcontrastSkin table td {vertical-align:middle} .highcontrastSkin a,
.highcontrastSkin img,
.highcontrastSkin tr,
.highcontrastSkin div,
.highcontrastSkin td,
.highcontrastSkin iframe,
.highcontrastSkin span,
.highcontrastSkin *,
.highcontrastSkin .mceText {
border: 0;
margin: 0;
padding: 0;
vertical-align: baseline;
border-collapse: separate;
}
.highcontrastSkin a:hover,
.highcontrastSkin a:link,
.highcontrastSkin a:visited,
.highcontrastSkin a:active {
text-decoration: none;
font-weight: normal;
cursor: default;
}
.highcontrastSkin table td {
vertical-align: middle;
}
.highcontrastSkin .mceIconOnly {display: block !important;} .highcontrastSkin .mceIconOnly {
display: block !important;
}
/* External */ /* External */
.highcontrastSkin .mceExternalToolbar {position:absolute; border:1px solid; border-bottom:0; display:none; background-color: white;} .highcontrastSkin .mceExternalToolbar {
.highcontrastSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;} position: absolute;
.highcontrastSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px;} border: 1px solid;
border-bottom: 0;
display: none;
background-color: white;
}
.highcontrastSkin .mceExternalToolbar td.mceToolbar {
padding-right: 13px;
}
.highcontrastSkin .mceExternalClose {
position: absolute;
top: 3px;
right: 3px;
width: 7px;
height: 7px;
}
/* Layout */ /* Layout */
.highcontrastSkin table.mceLayout {border: 1px solid;} .highcontrastSkin table.mceLayout {
.highcontrastSkin .mceIframeContainer {border-top:1px solid; border-bottom:1px solid} border: 1px solid;
.highcontrastSkin .mceStatusbar a:hover {text-decoration:underline} }
.highcontrastSkin .mceStatusbar {display:block; line-height:1.5em; overflow:visible;} .highcontrastSkin .mceIframeContainer {
.highcontrastSkin .mceStatusbar div {float:left} border-top: 1px solid;
.highcontrastSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize; outline:0} border-bottom: 1px solid;
}
.highcontrastSkin .mceStatusbar a:hover {
text-decoration: underline;
}
.highcontrastSkin .mceStatusbar {
display: block;
line-height: 1.5em;
overflow: visible;
}
.highcontrastSkin .mceStatusbar div {
float: left;
}
.highcontrastSkin .mceStatusbar a.mceResize {
display: block;
float: right;
width: 20px;
height: 20px;
cursor: se-resize;
outline: 0;
}
.highcontrastSkin .mceToolbar td { display: inline-block; float: left;} .highcontrastSkin .mceToolbar td {
.highcontrastSkin .mceToolbar tr { display: block;} display: inline-block;
.highcontrastSkin .mceToolbar table { display: block; } float: left;
}
.highcontrastSkin .mceToolbar tr {
display: block;
}
.highcontrastSkin .mceToolbar table {
display: block;
}
/* Button */ /* Button */
.highcontrastSkin .mceButton { display:block; margin: 2px; padding: 5px 10px;border: 1px solid; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -ms-border-radius: 3px; height: 2em;} .highcontrastSkin .mceButton {
.highcontrastSkin .mceButton .mceVoiceLabel { height: 100%; vertical-align: center; line-height: 2em} display: block;
.highcontrastSkin .mceButtonDisabled .mceVoiceLabel { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);} margin: 2px;
.highcontrastSkin .mceButtonActive, .highcontrastSkin .mceButton:focus, .highcontrastSkin .mceButton:active { border: 5px solid; padding: 1px 6px;-webkit-focus-ring-color:none;outline:none;} padding: 5px 10px;
border: 1px solid;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-ms-border-radius: 3px;
height: 2em;
}
.highcontrastSkin .mceButton .mceVoiceLabel {
height: 100%;
vertical-align: center;
line-height: 2em;
}
.highcontrastSkin .mceButtonDisabled .mceVoiceLabel {
opacity: 0.6;
-ms-filter: "alpha(opacity=60)";
filter: alpha(opacity=60);
}
.highcontrastSkin .mceButtonActive,
.highcontrastSkin .mceButton:focus,
.highcontrastSkin .mceButton:active {
border: 5px solid;
padding: 1px 6px;
-webkit-focus-ring-color: none;
outline: none;
}
/* Separator */ /* Separator */
.highcontrastSkin .mceSeparator {display:block; width:16px; height:26px;} .highcontrastSkin .mceSeparator {
display: block;
width: 16px;
height: 26px;
}
/* ListBox */ /* ListBox */
.highcontrastSkin .mceListBox { display: block; margin:2px;-webkit-focus-ring-color:none;outline:none;} .highcontrastSkin .mceListBox {
.highcontrastSkin .mceListBox .mceText {padding: 5px 6px; line-height: 2em; width: 15ex; overflow: hidden;} display: block;
.highcontrastSkin .mceListBoxDisabled .mceText { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);} margin: 2px;
.highcontrastSkin .mceListBox a.mceText { padding: 5px 10px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;} -webkit-focus-ring-color: none;
.highcontrastSkin .mceListBox a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-left: 0; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;} outline: none;
.highcontrastSkin .mceListBox:focus a.mceText, .highcontrastSkin .mceListBox:active a.mceText { border-width: 5px; padding: 1px 10px 1px 6px;} }
.highcontrastSkin .mceListBox:focus a.mceOpen, .highcontrastSkin .mceListBox:active a.mceOpen { border-width: 5px; padding: 1px 0px 1px 4px;} .highcontrastSkin .mceListBox .mceText {
padding: 5px 6px;
line-height: 2em;
width: 15ex;
overflow: hidden;
}
.highcontrastSkin .mceListBoxDisabled .mceText {
opacity: 0.6;
-ms-filter: "alpha(opacity=60)";
filter: alpha(opacity=60);
}
.highcontrastSkin .mceListBox a.mceText {
padding: 5px 10px;
display: block;
height: 2em;
line-height: 2em;
border: 1px solid;
border-right: 0;
border-radius: 3px 0px 0px 3px;
-moz-border-radius: 3px 0px 0px 3px;
-webkit-border-radius: 3px 0px 0px 3px;
-ms-border-radius: 3px 0px 0px 3px;
}
.highcontrastSkin .mceListBox a.mceOpen {
padding: 5px 4px;
display: block;
height: 2em;
line-height: 2em;
border: 1px solid;
border-left: 0;
border-radius: 0px 3px 3px 0px;
-moz-border-radius: 0px 3px 3px 0px;
-webkit-border-radius: 0px 3px 3px 0px;
-ms-border-radius: 0px 3px 3px 0px;
}
.highcontrastSkin .mceListBox:focus a.mceText,
.highcontrastSkin .mceListBox:active a.mceText {
border-width: 5px;
padding: 1px 10px 1px 6px;
}
.highcontrastSkin .mceListBox:focus a.mceOpen,
.highcontrastSkin .mceListBox:active a.mceOpen {
border-width: 5px;
padding: 1px 0px 1px 4px;
}
.highcontrastSkin .mceListBoxMenu {overflow-y:auto} .highcontrastSkin .mceListBoxMenu {
overflow-y: auto;
}
/* SplitButton */ /* SplitButton */
.highcontrastSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} .highcontrastSkin .mceSplitButtonDisabled .mceAction {
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
.highcontrastSkin .mceSplitButton { border-collapse: collapse; margin: 2px; height: 2em; line-height: 2em;-webkit-focus-ring-color:none;outline:none;} .highcontrastSkin .mceSplitButton {
.highcontrastSkin .mceSplitButton td { display: table-cell; float: none; margin: 0; padding: 0; height: 2em;} border-collapse: collapse;
.highcontrastSkin .mceSplitButton tr { display: table-row; } margin: 2px;
.highcontrastSkin table.mceSplitButton { display: table; } height: 2em;
.highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;} line-height: 2em;
.highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;} -webkit-focus-ring-color: none;
.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; } outline: none;
.highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;} }
.highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;} .highcontrastSkin .mceSplitButton td {
display: table-cell;
float: none;
margin: 0;
padding: 0;
height: 2em;
}
.highcontrastSkin .mceSplitButton tr {
display: table-row;
}
.highcontrastSkin table.mceSplitButton {
display: table;
}
.highcontrastSkin .mceSplitButton a.mceAction {
padding: 5px 10px;
display: block;
height: 2em;
line-height: 2em;
overflow: hidden;
border: 1px solid;
border-right: 0;
border-radius: 3px 0px 0px 3px;
-moz-border-radius: 3px 0px 0px 3px;
-webkit-border-radius: 3px 0px 0px 3px;
-ms-border-radius: 3px 0px 0px 3px;
}
.highcontrastSkin .mceSplitButton a.mceOpen {
padding: 5px 4px;
display: block;
height: 2em;
line-height: 2em;
border: 1px solid;
border-radius: 0px 3px 3px 0px;
-moz-border-radius: 0px 3px 3px 0px;
-webkit-border-radius: 0px 3px 3px 0px;
-ms-border-radius: 0px 3px 3px 0px;
}
.highcontrastSkin .mceSplitButton .mceVoiceLabel {
height: 2em;
vertical-align: center;
line-height: 2em;
}
.highcontrastSkin .mceSplitButton:focus a.mceAction,
.highcontrastSkin .mceSplitButton:active a.mceAction {
border-width: 5px;
border-right-width: 1px;
padding: 1px 10px 1px 6px;
-webkit-focus-ring-color: none;
outline: none;
}
.highcontrastSkin .mceSplitButton:focus a.mceOpen,
.highcontrastSkin .mceSplitButton:active a.mceOpen {
border-width: 5px;
border-left-width: 1px;
padding: 1px 0px 1px 4px;
-webkit-focus-ring-color: none;
outline: none;
}
/* Menu */ /* Menu */
.highcontrastSkin .mceNoIcons span.mceIcon {width:0;} .highcontrastSkin .mceNoIcons span.mceIcon {
.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; direction:ltr} width: 0;
.highcontrastSkin .mceMenu table {background:white; color: black} }
.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px} .highcontrastSkin .mceMenu {
.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black} position: absolute;
.highcontrastSkin .mceMenu td {height:2em} left: 0;
.highcontrastSkin .mceMenu a {position:relative;padding:3px 0 4px 0; display: block;} top: 0;
.highcontrastSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px;} z-index: 1000;
.highcontrastSkin .mceMenu pre.mceText {font-family:Monospace} border: 1px solid;
.highcontrastSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:26px;} direction: ltr;
.highcontrastSkin td.mceMenuItemSeparator {border-top:1px solid; height:1px} }
.highcontrastSkin .mceMenuItemTitle a {border:0; border-bottom:1px solid} .highcontrastSkin .mceMenu table {
.highcontrastSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px} background: white;
.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {content: "\2713\A0";} color: black;
.highcontrastSkin .mceMenu span.mceMenuLine {display:none} }
.highcontrastSkin .mceMenuItemSub a .mceText:after {content: "\A0\25B8"} .highcontrastSkin .mceNoIcons a .mceText {
.highcontrastSkin .mceMenuItem td, .highcontrastSkin .mceMenuItem th {line-height: normal} padding-left: 10px;
}
.highcontrastSkin .mceMenu a,
.highcontrastSkin .mceMenu span,
.highcontrastSkin .mceMenu {
display: block;
background: white;
color: black;
}
.highcontrastSkin .mceMenu td {
height: 2em;
}
.highcontrastSkin .mceMenu a {
position: relative;
padding: 3px 0 4px 0;
display: block;
}
.highcontrastSkin .mceMenu .mceText {
position: relative;
display: block;
cursor: default;
margin: 0;
padding: 0 25px 0 25px;
}
.highcontrastSkin .mceMenu .mceIcon {
position: absolute;
top: 0;
left: 0;
width: 26px;
}
.highcontrastSkin td.mceMenuItemSeparator {
border-top: 1px solid;
height: 1px;
}
.highcontrastSkin .mceMenuItemTitle a {
border: 0;
border-bottom: 1px solid;
}
.highcontrastSkin .mceMenuItemTitle span.mceText {
font-weight: bold;
padding-left: 4px;
}
.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {
content: "\2713\A0";
}
.highcontrastSkin .mceMenu span.mceMenuLine {
display: none;
}
.highcontrastSkin .mceMenuItemSub a .mceText:after {
content: "\A0\25B8";
}
.highcontrastSkin .mceMenuItem td,
.highcontrastSkin .mceMenuItem th {
line-height: normal;
}
/* ColorSplitButton */ /* ColorSplitButton */
.highcontrastSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid; color: #000} .highcontrastSkin div.mceColorSplitMenu table {
.highcontrastSkin .mceColorSplitMenu td {padding:2px} background: #fff;
.highcontrastSkin .mceColorSplitMenu a {display:block; width:16px; height:16px; overflow:hidden; color:#000; margin: 0; padding: 0;} border: 1px solid;
.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px} color: #000;
.highcontrastSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF} }
.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid; background-color:#B6BDD2} .highcontrastSkin .mceColorSplitMenu td {
.highcontrastSkin a.mceMoreColors:hover {border:1px solid #0A246A; color: #000;} padding: 2px;
.highcontrastSkin .mceColorPreview {display:none;} }
.highcontrastSkin .mce_forecolor span.mceAction, .highcontrastSkin .mce_backcolor span.mceAction {height:17px;overflow:hidden} .highcontrastSkin .mceColorSplitMenu a {
display: block;
width: 16px;
height: 16px;
overflow: hidden;
color: #000;
margin: 0;
padding: 0;
}
.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {
padding: 1px 3px 1px 1px;
}
.highcontrastSkin .mceColorSplitMenu a.mceMoreColors {
width: 100%;
height: auto;
text-align: center;
font-size: 11px;
line-height: 20px;
border: 1px solid #fff;
}
.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {
border: 1px solid;
background-color: #b6bdd2;
}
.highcontrastSkin a.mceMoreColors:hover {
border: 1px solid #0a246a;
color: #000;
}
.highcontrastSkin .mceColorPreview {
display: none;
}
.highcontrastSkin .mce_forecolor span.mceAction,
.highcontrastSkin .mce_backcolor span.mceAction {
height: 17px;
overflow: hidden;
}
/* Progress,Resize */ /* Progress,Resize */
.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF} .highcontrastSkin .mceBlocker {
.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px} position: absolute;
left: 0;
top: 0;
z-index: 1000;
opacity: 0.5;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=50);
background: #fff;
}
.highcontrastSkin .mceProgress {
position: absolute;
left: 0;
top: 0;
z-index: 1001;
background: url(../default/img/progress.gif) no-repeat;
width: 32px;
height: 32px;
margin: -16px 0 0 -16px;
}
/* Rtl */ /* Rtl */
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0} .mceRtl .mceListBox .mceText {
.mceRtl .mceMenuItem .mceText {text-align: right} text-align: right;
padding: 0 4px 0 0;
}
.mceRtl .mceMenuItem .mceText {
text-align: right;
}
/* Formats */ /* Formats */
.highcontrastSkin .mce_p span.mceText {} .highcontrastSkin .mce_p span.mceText {
.highcontrastSkin .mce_address span.mceText {font-style:italic} }
.highcontrastSkin .mce_pre span.mceText {font-family:monospace} .highcontrastSkin .mce_h1 span.mceText {
.highcontrastSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em} font-weight: bolder;
.highcontrastSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em} font-size: 2em;
.highcontrastSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em} }
.highcontrastSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em} .highcontrastSkin .mce_h2 span.mceText {
.highcontrastSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em} font-weight: bolder;
.highcontrastSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em} font-size: 1.5em;
}
.highcontrastSkin .mce_h3 span.mceText {
font-weight: bolder;
font-size: 1.17em;
}
.highcontrastSkin .mce_h4 span.mceText {
font-weight: bolder;
font-size: 1em;
}
.highcontrastSkin .mce_h5 span.mceText {
font-weight: bolder;
font-size: 0.83em;
}
.highcontrastSkin .mce_h6 span.mceText {
font-weight: bolder;
font-size: 0.75em;
}

View File

@ -1,48 +1,147 @@
body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} body,
body {background:#FFF;} td,
body.mceForceColors {background:#FFF; color:#000;} pre {
h1 {font-size: 2em} color: #000;
h2 {font-size: 1.5em} font-size: 10px;
h3 {font-size: 1.17em} margin: 8px;
h4 {font-size: 1em} }
h5 {font-size: .83em} body {
h6 {font-size: .75em} background: #fff;
.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} }
a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !important; background:url(../default/img/items.gif) no-repeat 0 0;} body.mceForceColors {
span.mceItemNbsp {background: #DDD} background: #fff;
td.mceSelected, th.mceSelected {background-color:#3399ff !important} color: #000;
img {border:0;} }
table, img, hr, .mceItemAnchor {cursor:default} h1 {
table td, table th {cursor:text} font-size: 2em;
ins {border-bottom:1px solid green; text-decoration: none; color:green} }
del {color:red; text-decoration:line-through} h2 {
cite {border-bottom:1px dashed blue} font-size: 1.5em;
acronym {border-bottom:1px dotted #CCC; cursor:help} }
abbr {border-bottom:1px dashed #CCC; cursor:help} h3 {
font-size: 1.17em;
}
h4 {
font-size: 1em;
}
h5 {
font-size: 0.83em;
}
h6 {
font-size: 0.75em;
}
.mceItemTable,
.mceItemTable td,
.mceItemTable th,
.mceItemTable caption,
.mceItemVisualAid {
border: 1px dashed #bbb;
}
a.mceItemAnchor {
display: inline-block;
width: 11px !important;
height: 11px !important;
background: url(../default/img/items.gif) no-repeat 0 0;
}
span.mceItemNbsp {
background: #ddd;
}
td.mceSelected,
th.mceSelected {
background-color: #3399ff !important;
}
img {
border: 0;
}
table,
img,
hr,
.mceItemAnchor {
cursor: default;
}
table td,
table th {
cursor: text;
}
ins {
border-bottom: 1px solid green;
text-decoration: none;
color: green;
}
del {
color: red;
text-decoration: line-through;
}
cite {
border-bottom: 1px dashed blue;
}
acronym {
border-bottom: 1px dotted #ccc;
cursor: help;
}
abbr {
border-bottom: 1px dashed #ccc;
cursor: help;
}
/* IE */ /* IE */
* html body { * html body {
scrollbar-3dlight-color:#F0F0EE; scrollbar-3dlight-color: #f0f0ee;
scrollbar-arrow-color:#676662; scrollbar-arrow-color: #676662;
scrollbar-base-color:#F0F0EE; scrollbar-base-color: #f0f0ee;
scrollbar-darkshadow-color:#DDD; scrollbar-darkshadow-color: #ddd;
scrollbar-face-color:#E0E0DD; scrollbar-face-color: #e0e0dd;
scrollbar-highlight-color:#F0F0EE; scrollbar-highlight-color: #f0f0ee;
scrollbar-shadow-color:#F0F0EE; scrollbar-shadow-color: #f0f0ee;
scrollbar-track-color:#F5F5F5; scrollbar-track-color: #f5f5f5;
} }
img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px} img:-moz-broken {
font[face=mceinline] {font-family:inherit !important} -moz-force-broken-image-icon: 1;
*[contentEditable]:focus {outline:0} width: 24px;
height: 24px;
}
.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc} *[contentEditable]:focus {
.mceItemShockWave {background-image:url(../../img/shockwave.gif)} outline: 0;
.mceItemFlash {background-image:url(../../img/flash.gif)} }
.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}
.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)} .mceItemMedia {
.mceItemRealMedia {background-image:url(../../img/realmedia.gif)} border: 1px dotted #cc0000;
.mceItemVideo {background-image:url(../../img/video.gif)} background-position: center;
.mceItemAudio {background-image:url(../../img/video.gif)} background-repeat: no-repeat;
.mceItemIframe {background-image:url(../../img/iframe.gif)} background-color: #ffffcc;
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;} }
.mceItemShockWave {
background-image: url(../../img/shockwave.gif);
}
.mceItemFlash {
background-image: url(../../img/flash.gif);
}
.mceItemQuickTime {
background-image: url(../../img/quicktime.gif);
}
.mceItemWindowsMedia {
background-image: url(../../img/windowsmedia.gif);
}
.mceItemRealMedia {
background-image: url(../../img/realmedia.gif);
}
.mceItemVideo {
background-image: url(../../img/video.gif);
}
.mceItemAudio {
background-image: url(../../img/video.gif);
}
.mceItemIframe {
background-image: url(../../img/iframe.gif);
}
.mcePageBreak {
display: block;
border: 0;
width: 100%;
height: 12px;
border-top: 1px dotted #ccc;
margin-top: 15px;
background: #fff url(../../img/pagebreak.gif) no-repeat center top;
}

View File

@ -1,118 +1,383 @@
/* Generic */ /* Generic */
body { body {
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; font-size: 11px;
scrollbar-3dlight-color:#F0F0EE; scrollbar-3dlight-color: #f0f0ee;
scrollbar-arrow-color:#676662; scrollbar-arrow-color: #676662;
scrollbar-base-color:#F0F0EE; scrollbar-base-color: #f0f0ee;
scrollbar-darkshadow-color:#DDDDDD; scrollbar-darkshadow-color: #dddddd;
scrollbar-face-color:#E0E0DD; scrollbar-face-color: #e0e0dd;
scrollbar-highlight-color:#F0F0EE; scrollbar-highlight-color: #f0f0ee;
scrollbar-shadow-color:#F0F0EE; scrollbar-shadow-color: #f0f0ee;
scrollbar-track-color:#F5F5F5; scrollbar-track-color: #f5f5f5;
background:#F0F0EE; background: #f0f0ee;
padding:0; padding: 0;
margin:8px 8px 0 8px; margin: 8px 8px 0 8px;
} }
html {background:#F0F0EE;} html {
td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} background: #f0f0ee;
textarea {resize:none;outline:none;} }
a:link, a:visited {color:black;} td {
a:hover {color:#2B6FB6;} font-size: 10px;
.nowrap {white-space: nowrap} }
textarea {
resize: none;
outline: none;
}
a:link,
a:visited {
color: black;
}
a:hover {
color: #2b6fb6;
}
.nowrap {
white-space: nowrap;
}
/* Forms */ /* Forms */
fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;} fieldset {
legend {color:#2B6FB6; font-weight:bold;} margin: 0;
label.msg {display:none;} padding: 4px;
label.invalid {color:#EE0000; display:inline;} border: 1px solid #919b9c;
input.invalid {border:1px solid #EE0000;} font-size: 10px;
input {background:#FFF; border:1px solid #CCC;} }
input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} legend {
input, select, textarea {border:1px solid #808080;} color: #2b6fb6;
input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} font-weight: bold;
input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} }
.input_noborder {border:0;} label.msg {
display: none;
/* Buttons */ }
#insert, #cancel, input.button, .updateButton { label.invalid {
border:0; margin:0; padding:0; color: #ee0000;
font-weight:bold; display: inline;
width:94px; height:26px; }
background:url(../default/img/buttons.png) 0 -26px; input.invalid {
cursor:pointer; border: 1px solid #ee0000;
padding-bottom:2px; }
float:left; input {
background: #fff;
border: 1px solid #ccc;
}
input,
select,
textarea {
font-size: 10px;
}
input,
select,
textarea {
border: 1px solid #808080;
}
input.radio {
border: 1px none #000000;
background: transparent;
vertical-align: middle;
}
input.checkbox {
border: 1px none #000000;
background: transparent;
vertical-align: middle;
}
.input_noborder {
border: 0;
} }
#insert {background:url(../default/img/buttons.png) 0 -52px} /* Buttons */
#cancel {background:url(../default/img/buttons.png) 0 0; float:right} #insert,
#cancel,
input.button,
.updateButton {
border: 0;
margin: 0;
padding: 0;
font-weight: bold;
width: 94px;
height: 26px;
background: url(../default/img/buttons.png) 0 -26px;
cursor: pointer;
padding-bottom: 2px;
float: left;
}
#insert {
background: url(../default/img/buttons.png) 0 -52px;
}
#cancel {
background: url(../default/img/buttons.png) 0 0;
float: right;
}
/* Browse */ /* Browse */
a.pickcolor, a.browse {text-decoration:none} a.pickcolor,
a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;} a.browse {
.mceOldBoxModel a.browse span {width:22px; height:20px;} text-decoration: none;
a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} }
a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} a.browse span {
a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} display: block;
a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;} width: 20px;
.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} height: 18px;
a.pickcolor:hover span {background-color:#B2BBD0;} background: url(../../img/icons.gif) -860px 0;
a.pickcolor:hover span.disabled {} border: 1px solid #fff;
margin-left: 1px;
}
.mceOldBoxModel a.browse span {
width: 22px;
height: 20px;
}
a.browse:hover span {
border: 1px solid #0a246a;
background-color: #b2bbd0;
}
a.browse span.disabled {
border: 1px solid white;
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
a.browse:hover span.disabled {
border: 1px solid white;
background-color: transparent;
}
a.pickcolor span {
display: block;
width: 20px;
height: 16px;
background: url(../../img/icons.gif) -840px 0;
margin-left: 2px;
}
.mceOldBoxModel a.pickcolor span {
width: 21px;
height: 17px;
}
a.pickcolor:hover span {
background-color: #b2bbd0;
}
a.pickcolor:hover span.disabled {
}
/* Charmap */ /* Charmap */
table.charmap {border:1px solid #AAA; text-align:center} table.charmap {
td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} border: 1px solid #aaa;
#charmap a {display:block; color:#000; text-decoration:none; border:0} text-align: center;
#charmap a:hover {background:#CCC;color:#2B6FB6} }
#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} td.charmap,
#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} #charmap a {
width: 18px;
height: 18px;
color: #000;
border: 1px solid #aaa;
text-align: center;
font-size: 12px;
vertical-align: middle;
line-height: 18px;
}
#charmap a {
display: block;
color: #000;
text-decoration: none;
border: 0;
}
#charmap a:hover {
background: #ccc;
color: #2b6fb6;
}
#charmap #codeN {
font-size: 10px;
text-align: center;
}
#charmap #codeV {
font-size: 40px;
height: 80px;
border: 1px solid #aaa;
text-align: center;
}
/* Source */ /* Source */
.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} .wordWrapCode {
.mceActionPanel {margin-top:5px;} vertical-align: middle;
border: 1px none #000000;
background: transparent;
}
.mceActionPanel {
margin-top: 5px;
}
/* Tabs classes */ /* Tabs classes */
.tabs {width:100%; height:18px; line-height:normal; background:url(../default/img/tabs.gif) repeat-x 0 -72px;} .tabs {
.tabs ul {margin:0; padding:0; list-style:none;} width: 100%;
.tabs li {float:left; background:url(../default/img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} height: 18px;
.tabs li.current {background:url(../default/img/tabs.gif) no-repeat 0 -18px; margin-right:2px;} line-height: normal;
.tabs span {float:left; display:block; background:url(../default/img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;} background: url(../default/img/tabs.gif) repeat-x 0 -72px;
.tabs .current span {background:url(../default/img/tabs.gif) no-repeat right -54px;} }
.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} .tabs ul {
.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} margin: 0;
padding: 0;
list-style: none;
}
.tabs li {
float: left;
background: url(../default/img/tabs.gif) no-repeat 0 0;
margin: 0 2px 0 0;
padding: 0 0 0 10px;
line-height: 17px;
height: 18px;
display: block;
}
.tabs li.current {
background: url(../default/img/tabs.gif) no-repeat 0 -18px;
margin-right: 2px;
}
.tabs span {
float: left;
display: block;
background: url(../default/img/tabs.gif) no-repeat right -36px;
padding: 0px 10px 0 0;
}
.tabs .current span {
background: url(../default/img/tabs.gif) no-repeat right -54px;
}
.tabs a {
text-decoration: none;
font-size: 10px;
}
.tabs a:link,
.tabs a:visited,
.tabs a:hover {
color: black;
}
/* Panels */ /* Panels */
.panel_wrapper div.panel {display:none;} .panel_wrapper div.panel {
.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} display: none;
.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} }
.panel_wrapper div.current {
display: block;
width: 100%;
height: 300px;
overflow: visible;
}
.panel_wrapper {
border: 1px solid #919b9c;
border-top: 0px;
padding: 10px;
padding-top: 5px;
clear: both;
background: white;
}
/* Columns */ /* Columns */
.column {float:left;} .column {
.properties {width:100%;} float: left;
.properties .column1 {} }
.properties .column2 {text-align:left;} .properties {
width: 100%;
}
.properties .column1 {
}
.properties .column2 {
text-align: left;
}
/* Titles */ /* Titles */
h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} h1,
h3 {font-size:14px;} h2,
.title {font-size:12px; font-weight:bold; color:#2B6FB6;} h3,
h4 {
color: #2b6fb6;
margin: 0;
padding: 0;
padding-top: 5px;
}
h3 {
font-size: 14px;
}
.title {
font-size: 12px;
font-weight: bold;
color: #2b6fb6;
}
/* Dialog specific */ /* Dialog specific */
#link .panel_wrapper, #link div.current {height:125px;} #link .panel_wrapper,
#image .panel_wrapper, #image div.current {height:200px;} #link div.current {
#plugintable thead {font-weight:bold; background:#DDD;} height: 125px;
#plugintable, #about #plugintable td {border:1px solid #919B9C;} }
#plugintable {width:96%; margin-top:10px;} #image .panel_wrapper,
#pluginscontainer {height:290px; overflow:auto;} #image div.current {
#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px} height: 200px;
#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline} }
#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap} #plugintable thead {
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} font-weight: bold;
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} background: #ddd;
#colorpicker #light div {overflow:hidden;} }
#colorpicker .panel_wrapper div.current {height:175px;} #plugintable,
#colorpicker #namedcolors {width:150px;} #about #plugintable td {
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} border: 1px solid #919b9c;
#colorpicker #colornamecontainer {margin-top:5px;} }
#colorpicker #picker_panel fieldset {margin:auto;width:325px;} #plugintable {
width: 96%;
margin-top: 10px;
}
#pluginscontainer {
height: 290px;
overflow: auto;
}
#colorpicker #preview {
display: inline-block;
padding-left: 40px;
height: 14px;
border: 1px solid black;
margin-left: 5px;
margin-right: 5px;
}
#colorpicker #previewblock {
position: relative;
top: -3px;
padding-left: 5px;
padding-top: 0px;
display: inline;
}
#colorpicker #preview_wrapper {
text-align: center;
padding-top: 4px;
white-space: nowrap;
}
#colorpicker #colors {
float: left;
border: 1px solid gray;
cursor: crosshair;
}
#colorpicker #light {
border: 1px solid gray;
margin-left: 5px;
float: left;
width: 15px;
height: 150px;
cursor: crosshair;
}
#colorpicker #light div {
overflow: hidden;
}
#colorpicker .panel_wrapper div.current {
height: 175px;
}
#colorpicker #namedcolors {
width: 150px;
}
#colorpicker #namedcolors a {
display: block;
float: left;
width: 10px;
height: 10px;
margin: 1px 1px 0 0;
overflow: hidden;
}
#colorpicker #colornamecontainer {
margin-top: 5px;
}
#colorpicker #picker_panel fieldset {
margin: auto;
width: 325px;
}

View File

@ -1,222 +1,780 @@
/* Reset */ /* Reset */
.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left} .o2k7Skin table,
.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000} .o2k7Skin tbody,
.o2k7Skin table td {vertical-align:middle} .o2k7Skin a,
.o2k7Skin img,
.o2k7Skin tr,
.o2k7Skin div,
.o2k7Skin td,
.o2k7Skin iframe,
.o2k7Skin span,
.o2k7Skin *,
.o2k7Skin .mceText {
border: 0;
margin: 0;
padding: 0;
background: transparent;
white-space: nowrap;
text-decoration: none;
font-weight: normal;
cursor: default;
color: #000;
vertical-align: baseline;
width: auto;
border-collapse: separate;
text-align: left;
}
.o2k7Skin a:hover,
.o2k7Skin a:link,
.o2k7Skin a:visited,
.o2k7Skin a:active {
text-decoration: none;
font-weight: normal;
cursor: default;
color: #000;
}
.o2k7Skin table td {
vertical-align: middle;
}
/* Containers */ /* Containers */
.o2k7Skin table {background:transparent} .o2k7Skin table {
.o2k7Skin iframe {display:block;} background: transparent;
.o2k7Skin .mceToolbar {height:26px} }
.o2k7Skin iframe {
display: block;
}
.o2k7Skin .mceToolbar {
height: 26px;
}
/* External */ /* External */
.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none} .o2k7Skin .mceExternalToolbar {
.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;} position: absolute;
.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0} border: 1px solid #abc6dd;
border-bottom: 0;
display: none;
}
.o2k7Skin .mceExternalToolbar td.mceToolbar {
padding-right: 13px;
}
.o2k7Skin .mceExternalClose {
position: absolute;
top: 3px;
right: 3px;
width: 7px;
height: 7px;
background: url(../../img/icons.gif) -820px 0;
}
/* Layout */ /* Layout */
.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD} .o2k7Skin table.mceLayout {
.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD} border: 0;
.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD} border-left: 1px solid #abc6dd;
.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0} border-right: 1px solid #abc6dd;
.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD} }
.o2k7Skin td.mceToolbar{background:#E5EFFD} .o2k7Skin table.mceLayout tr.mceFirst td {
.o2k7Skin .mceStatusbar {background:#E5EFFD; display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px} border-top: 1px solid #abc6dd;
.o2k7Skin .mceStatusbar div {float:left; padding:2px} }
.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0} .o2k7Skin table.mceLayout tr.mceLast td {
.o2k7Skin .mceStatusbar a:hover {text-decoration:underline} border-bottom: 1px solid #abc6dd;
.o2k7Skin table.mceToolbar {margin-left:3px} }
.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; margin-left:3px;} .o2k7Skin table.mceToolbar,
.o2k7Skin .mceToolbar td.mceFirst span {margin:0} .o2k7Skin tr.mceFirst .mceToolbar tr td,
.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px} .o2k7Skin tr.mceLast .mceToolbar tr td {
.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none} border: 0;
.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px} margin: 0;
.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px} padding: 0;
.o2k7Skin td.mceCenter {text-align:center;} }
.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;} .o2k7Skin .mceIframeContainer {
.o2k7Skin td.mceRight table {margin:0 0 0 auto;} border-top: 1px solid #abc6dd;
border-bottom: 1px solid #abc6dd;
}
.o2k7Skin td.mceToolbar {
background: #e5effd;
}
.o2k7Skin .mceStatusbar {
background: #e5effd;
display: block;
font-size: 9pt;
line-height: 16px;
overflow: visible;
color: #000;
height: 20px;
}
.o2k7Skin .mceStatusbar div {
float: left;
padding: 2px;
}
.o2k7Skin .mceStatusbar a.mceResize {
display: block;
float: right;
background: url(../../img/icons.gif) -800px 0;
width: 20px;
height: 20px;
cursor: se-resize;
outline: 0;
}
.o2k7Skin .mceStatusbar a:hover {
text-decoration: underline;
}
.o2k7Skin table.mceToolbar {
margin-left: 3px;
}
.o2k7Skin .mceToolbar .mceToolbarStart span {
display: block;
background: url(img/button_bg.png) -22px 0;
width: 1px;
height: 22px;
margin-left: 3px;
}
.o2k7Skin .mceToolbar td.mceFirst span {
margin: 0;
}
.o2k7Skin .mceToolbar .mceToolbarEnd span {
display: block;
background: url(img/button_bg.png) -22px 0;
width: 1px;
height: 22px;
}
.o2k7Skin .mceToolbar .mceToolbarEndListBox span,
.o2k7Skin .mceToolbar .mceToolbarStartListBox span {
display: none;
}
.o2k7Skin span.mceIcon,
.o2k7Skin img.mceIcon {
display: block;
width: 20px;
height: 20px;
}
.o2k7Skin .mceIcon {
background: url(../../img/icons.gif) no-repeat 20px 20px;
}
.o2k7Skin td.mceCenter {
text-align: center;
}
.o2k7Skin td.mceCenter table {
margin: 0 auto;
text-align: left;
}
.o2k7Skin td.mceRight table {
margin: 0 0 0 auto;
}
/* Button */ /* Button */
.o2k7Skin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px} .o2k7Skin .mceButton {
.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px} display: block;
.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px} background: url(img/button_bg.png);
.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px} width: 22px;
.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px} height: 22px;
.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} }
.o2k7Skin .mceButtonLabeled {width:auto} .o2k7Skin a.mceButton span,
.o2k7Skin .mceButtonLabeled span.mceIcon {float:left} .o2k7Skin a.mceButton img {
.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica} margin-left: 1px;
.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888} }
.o2k7Skin .mceOldBoxModel a.mceButton span,
.o2k7Skin .mceOldBoxModel a.mceButton img {
margin: 0 0 0 1px;
}
.o2k7Skin a.mceButtonEnabled:hover {
background-color: #b2bbd0;
background-position: 0 -22px;
}
.o2k7Skin a.mceButtonActive,
.o2k7Skin a.mceButtonSelected {
background-position: 0 -44px;
}
.o2k7Skin .mceButtonDisabled .mceIcon {
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
.o2k7Skin .mceButtonLabeled {
width: auto;
}
.o2k7Skin .mceButtonLabeled span.mceIcon {
float: left;
}
.o2k7Skin span.mceButtonLabel {
display: block;
font-size: 10px;
padding: 4px 6px 0 22px;
}
.o2k7Skin .mceButtonDisabled .mceButtonLabel {
color: #888;
}
/* Separator */ /* Separator */
.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px} .o2k7Skin .mceSeparator {
display: block;
background: url(img/button_bg.png) -22px 0;
width: 5px;
height: 22px;
}
/* ListBox */ /* ListBox */
.o2k7Skin .mceListBox {padding-left: 3px} .o2k7Skin .mceListBox {
.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block} padding-left: 3px;
.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden} }
.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0} .o2k7Skin .mceListBox,
.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF} .o2k7Skin .mceListBox a {
.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px} display: block;
.o2k7Skin .mceListBoxDisabled .mceText {color:gray} }
.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden; margin-left:3px} .o2k7Skin .mceListBox .mceText {
.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px} padding-left: 4px;
.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;} text-align: left;
width: 70px;
border: 1px solid #b3c7e1;
border-right: 0;
background: #eaf2fb;
font-size: 11px;
height: 20px;
line-height: 20px;
overflow: hidden;
}
.o2k7Skin .mceListBox .mceOpen {
width: 14px;
height: 22px;
background: url(img/button_bg.png) -66px 0;
}
.o2k7Skin table.mceListBoxEnabled:hover .mceText,
.o2k7Skin .mceListBoxHover .mceText,
.o2k7Skin .mceListBoxSelected .mceText {
background: #fff;
}
.o2k7Skin table.mceListBoxEnabled:hover .mceOpen,
.o2k7Skin .mceListBoxHover .mceOpen,
.o2k7Skin .mceListBoxSelected .mceOpen {
background-position: -66px -22px;
}
.o2k7Skin .mceListBoxDisabled .mceText {
color: gray;
}
.o2k7Skin .mceListBoxMenu {
overflow: auto;
overflow-x: hidden;
margin-left: 3px;
}
.o2k7Skin .mceOldBoxModel .mceListBox .mceText {
height: 22px;
}
.o2k7Skin select.mceListBox {
font-size: 12px;
border: 1px solid #b3c7e1;
background: #fff;
}
/* SplitButton */ /* SplitButton */
.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px; direction:ltr} .o2k7Skin .mceSplitButton,
.o2k7Skin .mceSplitButton {background:url(img/button_bg.png)} .o2k7Skin .mceSplitButton a,
.o2k7Skin .mceSplitButton a.mceAction {width:22px} .o2k7Skin .mceSplitButton span {
.o2k7Skin .mceSplitButton span.mceAction {width:22px; background-image:url(../../img/icons.gif)} display: block;
.o2k7Skin .mceSplitButton a.mceOpen {width:10px; background:url(img/button_bg.png) -44px 0} height: 22px;
.o2k7Skin .mceSplitButton span.mceOpen {display:none} direction: ltr;
.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.png) 0 -22px} }
.o2k7Skin table.mceSplitButtonEnabled:hover a.mceOpen, .o2k7Skin .mceSplitButtonHover a.mceOpen, .o2k7Skin .mceSplitButtonSelected a.mceOpen {background-position:-44px -44px} .o2k7Skin .mceSplitButton {
.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} background: url(img/button_bg.png);
.o2k7Skin .mceSplitButtonActive {background-position:0 -44px} }
.o2k7Skin .mceSplitButton a.mceAction {
width: 22px;
}
.o2k7Skin .mceSplitButton span.mceAction {
width: 22px;
background-image: url(../../img/icons.gif);
}
.o2k7Skin .mceSplitButton a.mceOpen {
width: 10px;
background: url(img/button_bg.png) -44px 0;
}
.o2k7Skin .mceSplitButton span.mceOpen {
display: none;
}
.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction,
.o2k7Skin .mceSplitButtonHover a.mceAction,
.o2k7Skin .mceSplitButtonSelected {
background: url(img/button_bg.png) 0 -22px;
}
.o2k7Skin table.mceSplitButtonEnabled:hover a.mceOpen,
.o2k7Skin .mceSplitButtonHover a.mceOpen,
.o2k7Skin .mceSplitButtonSelected a.mceOpen {
background-position: -44px -44px;
}
.o2k7Skin .mceSplitButtonDisabled .mceAction {
opacity: 0.3;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=30);
}
.o2k7Skin .mceSplitButtonActive {
background-position: 0 -44px;
}
/* ColorSplitButton */ /* ColorSplitButton */
.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray} .o2k7Skin div.mceColorSplitMenu table {
.o2k7Skin .mceColorSplitMenu td {padding:2px} background: #fff;
.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080} border: 1px solid gray;
.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px} }
.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF} .o2k7Skin .mceColorSplitMenu td {
.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2} padding: 2px;
.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A} }
.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden} .o2k7Skin .mceColorSplitMenu a {
.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden} display: block;
width: 9px;
height: 9px;
overflow: hidden;
border: 1px solid #808080;
}
.o2k7Skin .mceColorSplitMenu td.mceMoreColors {
padding: 1px 3px 1px 1px;
}
.o2k7Skin .mceColorSplitMenu a.mceMoreColors {
width: 100%;
height: auto;
text-align: center;
font-size: 11px;
line-height: 20px;
border: 1px solid #fff;
}
.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {
border: 1px solid #0a246a;
background-color: #b6bdd2;
}
.o2k7Skin a.mceMoreColors:hover {
border: 1px solid #0a246a;
}
.o2k7Skin .mceColorPreview {
margin-left: 2px;
width: 16px;
height: 4px;
overflow: hidden;
background: #9a9b9a;
overflow: hidden;
}
.o2k7Skin .mce_forecolor span.mceAction,
.o2k7Skin .mce_backcolor span.mceAction {
height: 15px;
overflow: hidden;
}
/* Menu */ /* Menu */
.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD; direction:ltr} .o2k7Skin .mceMenu {
.o2k7Skin .mceNoIcons span.mceIcon {width:0;} position: absolute;
.o2k7Skin .mceNoIcons a .mceText {padding-left:10px} left: 0;
.o2k7Skin .mceMenu table {background:#FFF} top: 0;
.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block} z-index: 1000;
.o2k7Skin .mceMenu td {height:20px} border: 1px solid #abc6dd;
.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0} direction: ltr;
.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block} }
.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px} .o2k7Skin .mceNoIcons span.mceIcon {
.o2k7Skin .mceMenu pre.mceText {font-family:Monospace} width: 0;
.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;} }
.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3} .o2k7Skin .mceNoIcons a .mceText {
.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px} padding-left: 10px;
.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD} }
.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px} .o2k7Skin .mceMenu table {
.o2k7Skin .mceMenuItemDisabled .mceText {color:#888} background: #fff;
.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)} }
.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center} .o2k7Skin .mceMenu a,
.o2k7Skin .mceMenu span.mceMenuLine {display:none} .o2k7Skin .mceMenu span,
.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;} .o2k7Skin .mceMenu {
.o2k7Skin .mceMenuItem td, .o2k7Skin .mceMenuItem th {line-height: normal} display: block;
}
.o2k7Skin .mceMenu td {
height: 20px;
}
.o2k7Skin .mceMenu a {
position: relative;
padding: 3px 0 4px 0;
}
.o2k7Skin .mceMenu .mceText {
position: relative;
display: block;
color: #000;
cursor: default;
margin: 0;
padding: 0 25px 0 25px;
display: block;
}
.o2k7Skin .mceMenu span.mceText,
.o2k7Skin .mceMenu .mcePreview {
font-size: 11px;
}
.o2k7Skin .mceMenu .mceIcon {
position: absolute;
top: 0;
left: 0;
width: 22px;
}
.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover,
.o2k7Skin .mceMenu .mceMenuItemActive {
background-color: #dbecf3;
}
.o2k7Skin td.mceMenuItemSeparator {
background: #ddd;
height: 1px;
}
.o2k7Skin .mceMenuItemTitle a {
border: 0;
background: #e5effd;
border-bottom: 1px solid #abc6dd;
}
.o2k7Skin .mceMenuItemTitle span.mceText {
color: #000;
font-weight: bold;
padding-left: 4px;
}
.o2k7Skin .mceMenuItemDisabled .mceText {
color: #888;
}
.o2k7Skin .mceMenuItemSelected .mceIcon {
background: url(../default/img/menu_check.gif);
}
.o2k7Skin .mceNoIcons .mceMenuItemSelected a {
background: url(../default/img/menu_arrow.gif) no-repeat -6px center;
}
.o2k7Skin .mceMenu span.mceMenuLine {
display: none;
}
.o2k7Skin .mceMenuItemSub a {
background: url(../default/img/menu_arrow.gif) no-repeat top right;
}
.o2k7Skin .mceMenuItem td,
.o2k7Skin .mceMenuItem th {
line-height: normal;
}
/* Progress,Resize */ /* Progress,Resize */
.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF} .o2k7Skin .mceBlocker {
.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px} position: absolute;
left: 0;
top: 0;
z-index: 1000;
opacity: 0.5;
-ms-filter: "alpha(opacity=30)";
filter: alpha(opacity=50);
background: #fff;
}
.o2k7Skin .mceProgress {
position: absolute;
left: 0;
top: 0;
z-index: 1001;
background: url(../default/img/progress.gif) no-repeat;
width: 32px;
height: 32px;
margin: -16px 0 0 -16px;
}
/* Rtl */ /* Rtl */
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0} .mceRtl .mceListBox .mceText {
.mceRtl .mceMenuItem .mceText {text-align: right} text-align: right;
padding: 0 4px 0 0;
}
.mceRtl .mceMenuItem .mceText {
text-align: right;
}
/* Formats */ /* Formats */
.o2k7Skin .mce_formatPreview a {font-size:10px} .o2k7Skin .mce_formatPreview a {
.o2k7Skin .mce_p span.mceText {} font-size: 10px;
.o2k7Skin .mce_address span.mceText {font-style:italic} }
.o2k7Skin .mce_pre span.mceText {font-family:monospace} .o2k7Skin .mce_p span.mceText {
.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em} }
.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em} .o2k7Skin .mce_address span.mceText {
.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em} font-style: italic;
.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em} }
.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em} .o2k7Skin .mce_h1 span.mceText {
.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em} font-weight: bolder;
font-size: 2em;
}
.o2k7Skin .mce_h2 span.mceText {
font-weight: bolder;
font-size: 1.5em;
}
.o2k7Skin .mce_h3 span.mceText {
font-weight: bolder;
font-size: 1.17em;
}
.o2k7Skin .mce_h4 span.mceText {
font-weight: bolder;
font-size: 1em;
}
.o2k7Skin .mce_h5 span.mceText {
font-weight: bolder;
font-size: 0.83em;
}
.o2k7Skin .mce_h6 span.mceText {
font-weight: bolder;
font-size: 0.75em;
}
/* Theme */ /* Theme */
.o2k7Skin span.mce_bold {background-position:0 0} .o2k7Skin span.mce_bold {
.o2k7Skin span.mce_italic {background-position:-60px 0} background-position: 0 0;
.o2k7Skin span.mce_underline {background-position:-140px 0} }
.o2k7Skin span.mce_strikethrough {background-position:-120px 0} .o2k7Skin span.mce_italic {
.o2k7Skin span.mce_undo {background-position:-160px 0} background-position: -60px 0;
.o2k7Skin span.mce_redo {background-position:-100px 0} }
.o2k7Skin span.mce_cleanup {background-position:-40px 0} .o2k7Skin span.mce_underline {
.o2k7Skin span.mce_bullist {background-position:-20px 0} background-position: -140px 0;
.o2k7Skin span.mce_numlist {background-position:-80px 0} }
.o2k7Skin span.mce_justifyleft {background-position:-460px 0} .o2k7Skin span.mce_strikethrough {
.o2k7Skin span.mce_justifyright {background-position:-480px 0} background-position: -120px 0;
.o2k7Skin span.mce_justifycenter {background-position:-420px 0} }
.o2k7Skin span.mce_justifyfull {background-position:-440px 0} .o2k7Skin span.mce_undo {
.o2k7Skin span.mce_anchor {background-position:-200px 0} background-position: -160px 0;
.o2k7Skin span.mce_indent {background-position:-400px 0} }
.o2k7Skin span.mce_outdent {background-position:-540px 0} .o2k7Skin span.mce_redo {
.o2k7Skin span.mce_link {background-position:-500px 0} background-position: -100px 0;
.o2k7Skin span.mce_unlink {background-position:-640px 0} }
.o2k7Skin span.mce_sub {background-position:-600px 0} .o2k7Skin span.mce_cleanup {
.o2k7Skin span.mce_sup {background-position:-620px 0} background-position: -40px 0;
.o2k7Skin span.mce_removeformat {background-position:-580px 0} }
.o2k7Skin span.mce_newdocument {background-position:-520px 0} .o2k7Skin span.mce_bullist {
.o2k7Skin span.mce_image {background-position:-380px 0} background-position: -20px 0;
.o2k7Skin span.mce_help {background-position:-340px 0} }
.o2k7Skin span.mce_code {background-position:-260px 0} .o2k7Skin span.mce_numlist {
.o2k7Skin span.mce_hr {background-position:-360px 0} background-position: -80px 0;
.o2k7Skin span.mce_visualaid {background-position:-660px 0} }
.o2k7Skin span.mce_charmap {background-position:-240px 0} .o2k7Skin span.mce_justifyleft {
.o2k7Skin span.mce_paste {background-position:-560px 0} background-position: -460px 0;
.o2k7Skin span.mce_copy {background-position:-700px 0} }
.o2k7Skin span.mce_cut {background-position:-680px 0} .o2k7Skin span.mce_justifyright {
.o2k7Skin span.mce_blockquote {background-position:-220px 0} background-position: -480px 0;
.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0} }
.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0} .o2k7Skin span.mce_justifycenter {
.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0} background-position: -420px 0;
.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0} }
.o2k7Skin span.mce_justifyfull {
background-position: -440px 0;
}
.o2k7Skin span.mce_anchor {
background-position: -200px 0;
}
.o2k7Skin span.mce_indent {
background-position: -400px 0;
}
.o2k7Skin span.mce_outdent {
background-position: -540px 0;
}
.o2k7Skin span.mce_link {
background-position: -500px 0;
}
.o2k7Skin span.mce_unlink {
background-position: -640px 0;
}
.o2k7Skin span.mce_sub {
background-position: -600px 0;
}
.o2k7Skin span.mce_sup {
background-position: -620px 0;
}
.o2k7Skin span.mce_removeformat {
background-position: -580px 0;
}
.o2k7Skin span.mce_newdocument {
background-position: -520px 0;
}
.o2k7Skin span.mce_image {
background-position: -380px 0;
}
.o2k7Skin span.mce_help {
background-position: -340px 0;
}
.o2k7Skin span.mce_code {
background-position: -260px 0;
}
.o2k7Skin span.mce_hr {
background-position: -360px 0;
}
.o2k7Skin span.mce_visualaid {
background-position: -660px 0;
}
.o2k7Skin span.mce_charmap {
background-position: -240px 0;
}
.o2k7Skin span.mce_paste {
background-position: -560px 0;
}
.o2k7Skin span.mce_copy {
background-position: -700px 0;
}
.o2k7Skin span.mce_cut {
background-position: -680px 0;
}
.o2k7Skin span.mce_blockquote {
background-position: -220px 0;
}
.o2k7Skin .mce_forecolor span.mceAction {
background-position: -720px 0;
}
.o2k7Skin .mce_backcolor span.mceAction {
background-position: -760px 0;
}
.o2k7Skin span.mce_forecolorpicker {
background-position: -720px 0;
}
.o2k7Skin span.mce_backcolorpicker {
background-position: -760px 0;
}
/* Plugins */ /* Plugins */
.o2k7Skin span.mce_advhr {background-position:-0px -20px} .o2k7Skin span.mce_advhr {
.o2k7Skin span.mce_ltr {background-position:-20px -20px} background-position: -0px -20px;
.o2k7Skin span.mce_rtl {background-position:-40px -20px} }
.o2k7Skin span.mce_emotions {background-position:-60px -20px} .o2k7Skin span.mce_ltr {
.o2k7Skin span.mce_fullpage {background-position:-80px -20px} background-position: -20px -20px;
.o2k7Skin span.mce_fullscreen {background-position:-100px -20px} }
.o2k7Skin span.mce_iespell {background-position:-120px -20px} .o2k7Skin span.mce_rtl {
.o2k7Skin span.mce_insertdate {background-position:-140px -20px} background-position: -40px -20px;
.o2k7Skin span.mce_inserttime {background-position:-160px -20px} }
.o2k7Skin span.mce_absolute {background-position:-180px -20px} .o2k7Skin span.mce_emotions {
.o2k7Skin span.mce_backward {background-position:-200px -20px} background-position: -60px -20px;
.o2k7Skin span.mce_forward {background-position:-220px -20px} }
.o2k7Skin span.mce_insert_layer {background-position:-240px -20px} .o2k7Skin span.mce_fullpage {
.o2k7Skin span.mce_insertlayer {background-position:-260px -20px} background-position: -80px -20px;
.o2k7Skin span.mce_movebackward {background-position:-280px -20px} }
.o2k7Skin span.mce_moveforward {background-position:-300px -20px} .o2k7Skin span.mce_fullscreen {
.o2k7Skin span.mce_media {background-position:-320px -20px} background-position: -100px -20px;
.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px} }
.o2k7Skin span.mce_pastetext {background-position:-360px -20px} .o2k7Skin span.mce_iespell {
.o2k7Skin span.mce_pasteword {background-position:-380px -20px} background-position: -120px -20px;
.o2k7Skin span.mce_selectall {background-position:-400px -20px} }
.o2k7Skin span.mce_preview {background-position:-420px -20px} .o2k7Skin span.mce_insertdate {
.o2k7Skin span.mce_print {background-position:-440px -20px} background-position: -140px -20px;
.o2k7Skin span.mce_cancel {background-position:-460px -20px} }
.o2k7Skin span.mce_save {background-position:-480px -20px} .o2k7Skin span.mce_inserttime {
.o2k7Skin span.mce_replace {background-position:-500px -20px} background-position: -160px -20px;
.o2k7Skin span.mce_search {background-position:-520px -20px} }
.o2k7Skin span.mce_styleprops {background-position:-560px -20px} .o2k7Skin span.mce_absolute {
.o2k7Skin span.mce_table {background-position:-580px -20px} background-position: -180px -20px;
.o2k7Skin span.mce_cell_props {background-position:-600px -20px} }
.o2k7Skin span.mce_delete_table {background-position:-620px -20px} .o2k7Skin span.mce_backward {
.o2k7Skin span.mce_delete_col {background-position:-640px -20px} background-position: -200px -20px;
.o2k7Skin span.mce_delete_row {background-position:-660px -20px} }
.o2k7Skin span.mce_col_after {background-position:-680px -20px} .o2k7Skin span.mce_forward {
.o2k7Skin span.mce_col_before {background-position:-700px -20px} background-position: -220px -20px;
.o2k7Skin span.mce_row_after {background-position:-720px -20px} }
.o2k7Skin span.mce_row_before {background-position:-740px -20px} .o2k7Skin span.mce_insert_layer {
.o2k7Skin span.mce_merge_cells {background-position:-760px -20px} background-position: -240px -20px;
.o2k7Skin span.mce_table_props {background-position:-980px -20px} }
.o2k7Skin span.mce_row_props {background-position:-780px -20px} .o2k7Skin span.mce_insertlayer {
.o2k7Skin span.mce_split_cells {background-position:-800px -20px} background-position: -260px -20px;
.o2k7Skin span.mce_template {background-position:-820px -20px} }
.o2k7Skin span.mce_visualchars {background-position:-840px -20px} .o2k7Skin span.mce_movebackward {
.o2k7Skin span.mce_abbr {background-position:-860px -20px} background-position: -280px -20px;
.o2k7Skin span.mce_acronym {background-position:-880px -20px} }
.o2k7Skin span.mce_attribs {background-position:-900px -20px} .o2k7Skin span.mce_moveforward {
.o2k7Skin span.mce_cite {background-position:-920px -20px} background-position: -300px -20px;
.o2k7Skin span.mce_del {background-position:-940px -20px} }
.o2k7Skin span.mce_ins {background-position:-960px -20px} .o2k7Skin span.mce_media {
.o2k7Skin span.mce_pagebreak {background-position:0 -40px} background-position: -320px -20px;
.o2k7Skin span.mce_restoredraft {background-position:-20px -40px} }
.o2k7Skin span.mce_spellchecker {background-position:-540px -20px} .o2k7Skin span.mce_nonbreaking {
.o2k7Skin span.mce_visualblocks {background-position: -40px -40px} background-position: -340px -20px;
}
.o2k7Skin span.mce_pastetext {
background-position: -360px -20px;
}
.o2k7Skin span.mce_pasteword {
background-position: -380px -20px;
}
.o2k7Skin span.mce_selectall {
background-position: -400px -20px;
}
.o2k7Skin span.mce_preview {
background-position: -420px -20px;
}
.o2k7Skin span.mce_print {
background-position: -440px -20px;
}
.o2k7Skin span.mce_cancel {
background-position: -460px -20px;
}
.o2k7Skin span.mce_save {
background-position: -480px -20px;
}
.o2k7Skin span.mce_replace {
background-position: -500px -20px;
}
.o2k7Skin span.mce_search {
background-position: -520px -20px;
}
.o2k7Skin span.mce_styleprops {
background-position: -560px -20px;
}
.o2k7Skin span.mce_table {
background-position: -580px -20px;
}
.o2k7Skin span.mce_cell_props {
background-position: -600px -20px;
}
.o2k7Skin span.mce_delete_table {
background-position: -620px -20px;
}
.o2k7Skin span.mce_delete_col {
background-position: -640px -20px;
}
.o2k7Skin span.mce_delete_row {
background-position: -660px -20px;
}
.o2k7Skin span.mce_col_after {
background-position: -680px -20px;
}
.o2k7Skin span.mce_col_before {
background-position: -700px -20px;
}
.o2k7Skin span.mce_row_after {
background-position: -720px -20px;
}
.o2k7Skin span.mce_row_before {
background-position: -740px -20px;
}
.o2k7Skin span.mce_merge_cells {
background-position: -760px -20px;
}
.o2k7Skin span.mce_table_props {
background-position: -980px -20px;
}
.o2k7Skin span.mce_row_props {
background-position: -780px -20px;
}
.o2k7Skin span.mce_split_cells {
background-position: -800px -20px;
}
.o2k7Skin span.mce_template {
background-position: -820px -20px;
}
.o2k7Skin span.mce_visualchars {
background-position: -840px -20px;
}
.o2k7Skin span.mce_abbr {
background-position: -860px -20px;
}
.o2k7Skin span.mce_acronym {
background-position: -880px -20px;
}
.o2k7Skin span.mce_attribs {
background-position: -900px -20px;
}
.o2k7Skin span.mce_cite {
background-position: -920px -20px;
}
.o2k7Skin span.mce_del {
background-position: -940px -20px;
}
.o2k7Skin span.mce_ins {
background-position: -960px -20px;
}
.o2k7Skin span.mce_pagebreak {
background-position: 0 -40px;
}
.o2k7Skin span.mce_restoredraft {
background-position: -20px -40px;
}
.o2k7Skin span.mce_spellchecker {
background-position: -540px -20px;
}
.o2k7Skin span.mce_visualblocks {
background-position: -40px -40px;
}

View File

@ -1,25 +1,26 @@
body, td, pre { body,
font-family: Verdana, Arial, Helvetica, sans-serif; td,
pre {
font-size: 10px; font-size: 10px;
} }
body { body {
background-color: #FFFFFF; background-color: #ffffff;
} }
.mceVisualAid { .mceVisualAid {
border: 1px dashed #BBBBBB; border: 1px dashed #bbbbbb;
} }
/* MSIE specific */ /* MSIE specific */
* html body { * html body {
scrollbar-3dlight-color: #F0F0EE; scrollbar-3dlight-color: #f0f0ee;
scrollbar-arrow-color: #676662; scrollbar-arrow-color: #676662;
scrollbar-base-color: #F0F0EE; scrollbar-base-color: #f0f0ee;
scrollbar-darkshadow-color: #DDDDDD; scrollbar-darkshadow-color: #dddddd;
scrollbar-face-color: #E0E0DD; scrollbar-face-color: #e0e0dd;
scrollbar-highlight-color: #F0F0EE; scrollbar-highlight-color: #f0f0ee;
scrollbar-shadow-color: #F0F0EE; scrollbar-shadow-color: #f0f0ee;
scrollbar-track-color: #F5F5F5; scrollbar-track-color: #f5f5f5;
} }

View File

@ -1,17 +1,25 @@
body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} body,
td,
pre {
font-size: 10px;
}
body {background: #FFF;} body {
.mceVisualAid {border: 1px dashed #BBB;} background: #fff;
}
.mceVisualAid {
border: 1px dashed #bbb;
}
/* IE */ /* IE */
* html body { * html body {
scrollbar-3dlight-color: #F0F0EE; scrollbar-3dlight-color: #f0f0ee;
scrollbar-arrow-color: #676662; scrollbar-arrow-color: #676662;
scrollbar-base-color: #F0F0EE; scrollbar-base-color: #f0f0ee;
scrollbar-darkshadow-color: #DDDDDD; scrollbar-darkshadow-color: #dddddd;
scrollbar-face-color: #E0E0DD; scrollbar-face-color: #e0e0dd;
scrollbar-highlight-color: #F0F0EE; scrollbar-highlight-color: #f0f0ee;
scrollbar-shadow-color: #F0F0EE; scrollbar-shadow-color: #f0f0ee;
scrollbar-track-color: #F5F5F5; scrollbar-track-color: #f5f5f5;
} }

View File

@ -1,10 +1,9 @@
text.text-tooltip { text.text-tooltip {
font-family: "lato-bolder", "Open Sans", sans-serif; font-weight: 700;
font-weight: bold;
} }
div#bullets_modules span { div#bullets_modules span {
font-family: "lato-bolder", "Open Sans", sans-serif; font-weight: 700;
} }
table#agent_interface_info .noresizevc.graph { table#agent_interface_info .noresizevc.graph {
@ -16,7 +15,7 @@ div.agent_details_agent_alias {
} }
div.agent_details_agent_alias * { div.agent_details_agent_alias * {
font-family: "lato-bolder", "Open Sans", sans-serif; font-weight: 700;
} }
#module_list { #module_list {

View File

@ -62,7 +62,6 @@ ul.sample {
} }
span.rule-title { span.rule-title {
font-family: "lato-lighter", "Open Sans", sans-serif;
font-weight: normal; font-weight: normal;
font-size: 2em; font-size: 2em;
text-align: center; text-align: center;
@ -193,12 +192,10 @@ div#rules.show {
padding-right: 1em; padding-right: 1em;
margin: 0 0.5em 0.5em 0px; margin: 0 0.5em 0.5em 0px;
color: #fff; color: #fff;
font-family: "lato-lighter", "Open Sans", sans-serif;
font-weight: 600; font-weight: 600;
background-color: #333; background-color: #333;
word-break: break-all; word-break: break-all;
height: fit-content; height: fit-content;
min-height: 2.3em;
} }
.field.opacityElements { .field.opacityElements {
@ -282,7 +279,6 @@ div#rules.show {
background-color: #424242; background-color: #424242;
border: 0px; border: 0px;
color: #fff; color: #fff;
font-family: "lato-lighter", "Open Sans", sans-serif;
font-weight: 600; font-weight: 600;
} }
#rules select.click-list-elements.fields-elements-log { #rules select.click-list-elements.fields-elements-log {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More