From 0417d4ffa3bc4e81a77d4481c465f4adee015583 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 9 Apr 2020 18:10:45 -0400 Subject: [PATCH] More web interface improvements. --- pappl/client-webif.c | 7 +- pappl/printer-webif.c | 32 ++- pappl/resource-private.h | 480 +-------------------------------------- pappl/style.css | 8 +- 4 files changed, 43 insertions(+), 484 deletions(-) diff --git a/pappl/client-webif.c b/pappl/client-webif.c index 4fa8f2bc..d5098536 100644 --- a/pappl/client-webif.c +++ b/pappl/client-webif.c @@ -271,7 +271,12 @@ papplClientHTMLHeader( for (r = (_pappl_resource_t *)cupsArrayFirst(system->resources); r; r = (_pappl_resource_t *)cupsArrayNext(system->resources)) { if (r->label) - papplClientHTMLPrintf(client, " %s\n", r->path, r->label); + { + if (strcmp(client->uri, r->path)) + papplClientHTMLPrintf(client, " %s\n", r->path, r->label); + else + papplClientHTMLPrintf(client, " %s\n", r->label); + } } pthread_rwlock_unlock(&system->rwlock); diff --git a/pappl/printer-webif.c b/pappl/printer-webif.c index 707a5214..13beef62 100644 --- a/pappl/printer-webif.c +++ b/pappl/printer-webif.c @@ -327,17 +327,35 @@ printer_header(pappl_client_t *client, // I - Client if (printer->system->options & PAPPL_SOPTIONS_MULTI_QUEUE) { + int i; // Looping var + char path[1024]; // Printer path + static const char * const pages[][2] = + { // Printer pages + { "/", "Home" }, + { "/config", "Configuration" }, + { "/media", "Media" }, + { "/printing", "Printing Defaults" }, + { "/supplies", "Supplies" } + }; + papplClientHTMLPrintf(client, "
\n" "
\n" "
\n" - " %s\n" - " Configuration\n" - " Media\n" - " Printing Defaults\n", printer->uriname, printer->uriname, printer->name, printer->uriname, printer->uriname, printer->uriname); - if (papplPrinterGetSupplies(printer, 0, NULL)) - papplClientHTMLPrintf(client, - " Supplies\n", printer->uriname); + " \n", printer->uriname, printer->uriname); + + for (i = 0; i < (int)(sizeof(pages) / sizeof(pages[0])); i ++) + { + if (!strcmp(pages[i][0], "/supplies") && papplPrinterGetSupplies(printer, 0, NULL) == 0) + continue; + + snprintf(path, sizeof(path), "%s%s", printer->uriname, pages[i][0]); + if (strcmp(path, client->uri)) + papplClientHTMLPrintf(client, " %s\n", path, pages[i][1]); + else + papplClientHTMLPrintf(client, " %s\n", pages[i][1]); + } + papplClientHTMLPuts(client, "
\n" "
\n" diff --git a/pappl/resource-private.h b/pappl/resource-private.h index 0a544e54..c70d5bc0 100644 --- a/pappl/resource-private.h +++ b/pappl/resource-private.h @@ -1,475 +1,3 @@ -/* apple-touch-icon.png */ -static unsigned char apple_touch_icon_png[] = { -137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82, -0,0,0,160,0,0,0,160,8,6,0,0,0,139,207,103, -45,0,0,4,25,105,67,67,80,107,67,71,67,111,108,111, -114,83,112,97,99,101,71,101,110,101,114,105,99,82,71,66, -0,0,56,141,141,85,93,104,28,85,20,62,187,115,103,35, -36,206,83,108,52,133,116,168,63,13,37,13,147,86,52,161, -180,186,127,221,221,54,110,150,73,54,218,34,232,100,246,238, -206,152,201,206,56,51,187,253,161,79,69,80,124,49,234,155, -20,196,191,183,128,32,40,245,15,219,62,180,47,149,10,37, -218,212,32,40,62,180,248,131,80,232,139,166,235,153,59,51, -153,105,186,177,222,101,238,124,243,157,239,158,123,238,185,103, -239,5,232,185,170,88,150,145,20,1,22,154,174,45,23,50, -226,115,135,143,136,61,43,144,132,135,160,23,6,161,87,81, -29,43,93,169,76,2,54,79,11,119,181,91,223,67,194,123, -95,217,213,221,254,159,173,183,70,29,21,32,113,31,98,179, -230,168,11,136,143,1,240,167,85,203,118,1,122,250,145,31, -63,234,90,30,246,98,232,183,49,64,196,47,122,184,225,99, -215,195,115,62,126,141,105,102,228,44,226,211,136,5,85,83, -106,136,151,16,143,204,197,248,70,12,251,49,176,214,95,160, -77,106,235,170,232,229,162,98,155,117,221,160,177,112,239,97, -254,159,109,193,104,133,243,109,195,167,207,153,159,62,132,239, -97,92,251,43,53,37,231,225,81,196,75,170,146,159,70,252, -8,226,107,109,125,182,28,224,219,150,155,145,17,63,6,144, -220,222,154,175,166,17,239,68,92,172,219,7,170,190,159,164, -173,181,138,33,126,231,132,54,243,44,226,45,136,207,55,231, -202,83,193,216,171,170,147,197,156,193,118,196,183,53,90,242, -242,59,4,192,137,186,91,154,241,199,114,251,109,83,158,242, -231,229,234,53,154,203,123,121,68,252,250,188,121,72,246,125, -114,159,57,237,233,124,232,243,132,150,45,7,252,165,151,148, -131,21,196,131,136,127,161,70,65,246,231,226,254,177,220,74, -16,3,25,106,26,229,73,127,46,146,163,14,91,47,227,93, -109,166,232,207,75,12,23,55,212,31,75,22,235,250,129,82, -160,255,68,179,139,114,128,175,89,6,171,81,140,141,79,218, -45,185,234,235,249,81,197,206,23,124,159,124,133,54,171,129, -127,190,13,179,9,5,40,152,48,135,189,10,77,88,3,17, -100,40,64,6,223,22,216,104,169,131,14,6,50,20,173,20, -25,138,95,161,102,23,27,231,192,60,242,58,180,153,205,193, -190,194,148,254,200,200,95,131,249,184,206,180,42,100,135,62, -130,22,178,26,252,142,172,22,211,101,241,171,133,92,99,19, -63,126,44,55,2,63,38,25,32,18,217,131,207,94,50,73, -246,145,113,50,1,34,121,138,60,77,246,147,28,178,19,100, -239,250,216,74,108,69,94,60,55,214,253,188,140,51,82,166, -155,69,221,57,180,187,160,96,255,51,42,76,92,83,215,172, -44,14,182,134,35,203,41,251,5,93,189,252,198,95,177,92, -233,44,55,81,182,226,25,157,186,87,206,249,95,249,235,252, -50,246,43,252,106,164,224,127,228,87,241,183,114,199,90,204, -187,178,76,195,236,108,88,115,119,85,26,109,6,227,22,240, -209,153,197,137,197,29,243,113,241,228,87,15,70,126,150,201, -153,231,175,244,93,60,89,111,46,14,70,172,151,5,250,106, -249,86,25,78,141,68,172,244,131,244,135,180,44,189,39,125, -40,253,198,189,205,125,202,125,205,125,206,125,193,93,2,145, -59,203,157,227,190,225,46,112,31,115,95,198,246,106,243,26, -90,223,123,22,121,24,183,103,233,150,107,172,74,33,35,108, -21,30,22,114,194,54,225,81,97,50,242,39,12,8,99,66, -81,216,129,150,173,235,251,22,159,47,158,61,29,14,99,31, -230,167,251,92,190,46,86,1,137,251,177,2,244,77,254,85, -85,84,233,112,148,41,29,86,111,77,56,190,65,19,140,36, -67,100,140,148,54,84,247,184,87,243,161,34,149,79,229,82, -105,16,83,59,83,19,169,177,212,65,15,135,179,166,118,160, -109,2,251,252,29,213,169,110,178,82,234,210,99,222,125,2, -89,211,58,110,235,13,205,21,119,75,210,147,98,26,175,54, -42,150,154,234,232,136,168,24,134,200,76,142,104,83,135,218, -109,90,27,5,239,222,244,143,244,155,50,187,15,19,91,46, -71,156,251,12,192,190,63,241,236,251,46,226,142,180,0,150, -28,128,129,199,35,110,24,207,202,7,222,5,56,243,132,218, -178,219,193,29,145,72,124,11,224,212,247,236,246,191,250,50, -120,126,253,212,233,220,196,115,172,231,45,128,181,55,59,157, -191,223,239,116,214,62,64,255,171,0,103,141,127,1,160,159, -124,85,3,92,11,239,0,0,0,56,101,88,73,102,77,77, -0,42,0,0,0,8,0,1,135,105,0,4,0,0,0,1, -0,0,0,26,0,0,0,0,0,2,160,2,0,4,0,0, -0,1,0,0,0,160,160,3,0,4,0,0,0,1,0,0, -0,160,0,0,0,0,132,36,59,179,0,0,3,101,105,84, -88,116,88,77,76,58,99,111,109,46,97,100,111,98,101,46, -120,109,112,0,0,0,0,0,60,120,58,120,109,112,109,101, -116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98, -101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109, -112,116,107,61,34,88,77,80,32,67,111,114,101,32,53,46, -52,46,48,34,62,10,32,32,32,60,114,100,102,58,82,68, -70,32,120,109,108,110,115,58,114,100,102,61,34,104,116,116, -112,58,47,47,119,119,119,46,119,51,46,111,114,103,47,49, -57,57,57,47,48,50,47,50,50,45,114,100,102,45,115,121, -110,116,97,120,45,110,115,35,34,62,10,32,32,32,32,32, -32,60,114,100,102,58,68,101,115,99,114,105,112,116,105,111, -110,32,114,100,102,58,97,98,111,117,116,61,34,34,10,32, -32,32,32,32,32,32,32,32,32,32,32,120,109,108,110,115, -58,100,99,61,34,104,116,116,112,58,47,47,112,117,114,108, -46,111,114,103,47,100,99,47,101,108,101,109,101,110,116,115, -47,49,46,49,47,34,10,32,32,32,32,32,32,32,32,32, -32,32,32,120,109,108,110,115,58,73,112,116,99,52,120,109, -112,69,120,116,61,34,104,116,116,112,58,47,47,105,112,116, -99,46,111,114,103,47,115,116,100,47,73,112,116,99,52,120, -109,112,69,120,116,47,50,48,48,56,45,48,50,45,50,57, -47,34,10,32,32,32,32,32,32,32,32,32,32,32,32,120, -109,108,110,115,58,112,104,111,116,111,115,104,111,112,61,34, -104,116,116,112,58,47,47,110,115,46,97,100,111,98,101,46, -99,111,109,47,112,104,111,116,111,115,104,111,112,47,49,46, -48,47,34,62,10,32,32,32,32,32,32,32,32,32,60,100, -99,58,99,114,101,97,116,111,114,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,60,114,100,102,58,83,101,113,62, -10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,114,100,102,58,108,105,62,77,105,99,104,97,101,108,32, -83,119,101,101,116,60,47,114,100,102,58,108,105,62,10,32, -32,32,32,32,32,32,32,32,32,32,32,60,47,114,100,102, -58,83,101,113,62,10,32,32,32,32,32,32,32,32,32,60, -47,100,99,58,99,114,101,97,116,111,114,62,10,32,32,32, -32,32,32,32,32,32,60,100,99,58,114,105,103,104,116,115, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,114, -100,102,58,65,108,116,62,10,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,114,100,102,58,108,105,32,120, -109,108,58,108,97,110,103,61,34,120,45,100,101,102,97,117, -108,116,34,62,67,111,112,121,114,105,103,104,116,32,50,48, -50,48,32,77,105,99,104,97,101,108,32,83,119,101,101,116, -60,47,114,100,102,58,108,105,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,60,47,114,100,102,58,65,108,116,62, -10,32,32,32,32,32,32,32,32,32,60,47,100,99,58,114, -105,103,104,116,115,62,10,32,32,32,32,32,32,32,32,32, -60,73,112,116,99,52,120,109,112,69,120,116,58,72,101,97, -100,108,105,110,101,62,78,101,119,32,73,109,97,103,101,60, -47,73,112,116,99,52,120,109,112,69,120,116,58,72,101,97, -100,108,105,110,101,62,10,32,32,32,32,32,32,32,32,32, -60,112,104,111,116,111,115,104,111,112,58,72,101,97,100,108, -105,110,101,62,78,101,119,32,73,109,97,103,101,60,47,112, -104,111,116,111,115,104,111,112,58,72,101,97,100,108,105,110, -101,62,10,32,32,32,32,32,32,60,47,114,100,102,58,68, -101,115,99,114,105,112,116,105,111,110,62,10,32,32,32,60, -47,114,100,102,58,82,68,70,62,10,60,47,120,58,120,109, -112,109,101,116,97,62,10,251,176,238,142,0,0,21,37,73, -68,65,84,120,218,237,157,121,112,20,117,22,199,39,51,9, -9,217,202,33,152,13,18,195,178,68,33,108,12,16,195,149, -4,8,247,21,80,14,5,150,37,96,64,8,10,34,1,4, -1,81,16,68,69,60,65,133,242,0,239,11,193,171,202,42, -47,220,253,99,65,113,193,210,178,208,170,117,215,3,161,180, -144,5,193,37,130,210,251,190,189,239,55,213,51,211,147,244, -204,244,76,122,102,94,87,189,74,79,79,207,235,233,121,159, -188,223,239,247,222,251,253,218,229,146,77,54,217,100,147,77, -54,217,100,147,77,54,123,182,20,22,55,139,71,36,97,68, -217,84,217,216,25,91,159,62,125,242,7,12,24,48,181,95, -191,126,143,87,85,85,29,160,191,63,210,235,211,213,213,213, -231,6,14,28,168,137,196,151,192,110,176,31,236,8,123,146, -108,167,253,218,146,146,146,14,100,238,12,146,86,36,105,6, -40,91,4,70,15,125,201,201,244,229,246,244,239,223,255,52, -190,120,65,65,129,150,155,155,171,165,167,167,107,30,143,71, -163,115,194,22,232,139,228,243,162,47,50,125,176,31,236,8, -123,194,174,208,7,59,147,189,247,86,84,84,76,167,115,114, -73,50,73,210,73,82,99,10,34,253,135,252,153,254,35,14, -151,151,151,255,148,151,151,167,185,221,110,49,112,18,232,131, -157,97,111,216,29,246,39,16,103,209,123,109,72,178,216,51, -166,69,21,196,202,202,202,63,208,133,247,246,238,221,251,100, -78,78,142,24,56,137,245,193,254,224,128,60,226,135,69,69, -69,229,116,172,45,131,104,244,136,246,109,228,126,107,72,78, -20,22,22,158,21,131,136,62,37,224,1,92,148,149,149,213, -210,235,246,36,231,113,211,108,159,55,164,190,94,61,145,254, -115,118,118,182,24,68,244,5,8,184,0,31,228,17,151,210, -235,142,36,121,6,111,232,137,8,66,192,71,109,253,169,140, -140,12,49,136,232,11,42,224,3,156,244,234,213,107,57,189, -190,152,164,29,73,118,68,16,162,217,5,217,205,193,39,6, -17,125,10,66,240,82,90,90,90,79,175,139,185,73,206,9, -11,66,12,56,208,182,55,213,236,138,65,68,159,89,115,12, -110,242,243,243,199,208,235,174,12,161,242,132,214,7,38,24, -237,6,27,112,216,125,195,173,197,192,9,165,15,220,144,39, -220,71,251,85,236,9,219,113,159,48,205,18,132,136,243,97, -136,29,173,47,8,224,6,185,82,180,213,41,30,109,119,74, -154,246,115,74,171,132,53,200,89,119,186,163,36,86,191,31, -248,233,214,173,27,250,131,125,185,79,152,199,163,227,212,230, -154,98,15,130,140,254,113,190,72,190,160,17,184,247,9,184, -255,16,112,248,187,134,94,15,166,227,102,63,76,34,1,232, -148,239,23,75,0,193,15,113,116,132,246,71,147,244,228,209, -241,121,205,54,197,72,175,33,210,29,201,23,244,247,112,254, -192,181,182,240,195,8,128,241,13,32,4,28,81,254,120,21, -237,15,38,41,229,254,160,106,138,205,189,32,114,187,72,183, -132,218,135,107,232,94,102,25,56,151,0,152,20,0,130,35, -26,204,126,68,251,227,48,174,37,185,136,51,38,25,166,94, -16,85,45,72,56,35,231,23,74,31,14,192,29,200,61,223, -50,112,45,1,224,144,1,3,4,192,24,3,8,142,192,83, -86,86,22,114,198,195,73,186,147,20,176,23,76,53,107,126, -167,82,12,231,68,115,229,58,255,245,100,232,192,109,239,216, -137,60,95,15,109,68,255,254,17,149,255,224,135,177,179,156, -104,24,193,54,167,188,167,182,177,115,177,246,106,251,66,237, -96,214,121,218,241,180,76,29,194,88,151,54,57,109,16,210, -18,229,93,212,12,175,37,188,198,147,84,144,20,113,1,67, -186,89,243,187,13,165,55,177,246,88,145,232,163,194,52,173, -39,121,221,57,46,183,182,37,37,85,219,71,30,249,4,121, -100,252,221,74,175,235,233,120,47,122,127,88,11,122,64,43, -158,39,17,61,32,4,60,209,136,120,39,237,79,37,25,66, -82,194,97,153,204,128,74,102,20,31,162,254,203,169,0,90, -129,13,239,183,114,96,24,38,89,1,4,79,212,15,252,148, -246,235,72,16,156,70,229,76,33,55,195,190,0,162,2,22, -69,136,78,0,16,30,43,92,216,92,2,160,99,0,4,79, -196,213,49,218,71,122,110,34,15,70,138,56,36,227,179,185, -81,134,109,165,146,57,26,0,42,216,182,50,108,39,83,91, -135,13,91,75,25,56,93,0,52,173,172,6,87,180,63,143, -100,10,201,64,206,142,156,31,0,32,230,2,132,226,177,40, -196,173,125,76,144,156,38,207,116,198,97,157,109,43,210,72, -223,251,75,146,205,4,121,135,8,13,66,1,46,237,123,210, -181,145,34,1,151,210,62,116,66,183,211,238,217,174,251,13, -69,152,171,5,36,168,25,28,70,114,9,73,126,64,6,36, -148,102,101,49,121,165,95,232,102,222,33,0,171,233,216,208, -8,58,249,102,158,109,112,117,181,214,137,254,174,34,131,126, -71,215,65,120,199,110,143,64,129,168,176,175,225,175,15,221, -132,77,36,47,144,0,108,132,164,58,241,53,156,226,161,237, -188,223,48,190,75,3,201,12,146,145,28,142,185,32,34,0, -1,31,154,76,117,108,67,151,174,218,49,10,207,216,241,95, -10,61,208,167,116,87,210,15,133,31,172,67,20,155,224,80, -175,97,212,215,133,62,123,152,62,75,195,59,93,199,192,48, -254,89,98,221,71,141,228,126,195,252,46,139,120,32,130,212, -92,15,206,138,132,15,32,60,159,241,24,226,108,83,250,244, -181,37,110,4,61,208,103,212,143,255,90,52,29,209,236,195, -132,114,13,163,190,29,244,153,6,215,255,63,11,29,241,146, -169,9,247,126,195,252,46,139,73,102,146,212,144,148,113,64, -58,124,0,171,77,142,217,29,192,53,234,71,211,241,165,73, -213,140,157,6,9,229,26,74,95,95,242,36,248,12,186,17, -255,162,191,157,226,40,85,24,206,253,70,8,224,44,14,197, -92,26,49,128,169,49,6,16,253,151,198,40,3,24,202,53, -148,190,247,168,37,168,165,174,8,245,168,181,51,244,217,204, -56,2,48,156,251,117,12,128,174,24,3,24,171,48,66,40, -185,219,209,4,222,1,2,144,202,58,244,209,111,75,132,57, -226,33,87,157,80,0,58,165,104,115,16,141,210,1,223,104, -246,126,223,59,48,228,98,231,253,10,128,14,243,128,235,139, -255,164,55,191,46,246,126,226,1,5,192,152,25,4,3,142, -239,90,103,233,3,16,229,253,242,91,40,211,144,180,0,186, -19,112,16,98,213,32,8,185,236,206,187,192,199,251,185,4, -192,216,2,232,31,110,136,118,28,48,22,97,24,43,6,201, -225,96,115,109,239,62,62,222,79,0,140,49,128,254,1,215, -104,102,66,98,21,136,182,98,144,117,244,61,144,118,131,62, -163,247,19,0,99,12,32,188,64,165,33,229,20,205,31,48, -22,169,56,43,6,65,236,243,8,125,143,43,104,228,59,190, -178,210,199,251,9,128,49,6,112,48,67,177,138,147,238,40, -30,176,243,7,140,69,49,66,56,6,169,230,188,239,223,219, -254,222,199,251,9,128,54,1,24,202,28,142,73,125,43,180, -157,5,29,244,17,97,163,221,165,82,240,178,164,23,250,113, -157,88,206,225,104,238,156,5,61,202,180,163,173,126,167,123, -193,104,206,109,113,202,253,218,33,81,15,195,36,219,52,202, -113,149,85,142,40,248,148,56,160,204,227,21,0,5,64,1, -80,0,20,0,5,64,1,80,0,20,0,5,64,1,80,0, -20,0,5,64,1,80,0,20,0,5,64,1,80,0,20,0, -5,64,1,80,0,20,0,5,64,1,80,0,20,0,5,64, -1,208,14,0,19,89,34,1,176,37,166,61,70,10,96,140, -126,43,241,128,45,225,1,227,1,192,104,123,124,1,80,0, -20,0,5,64,1,80,0,20,0,157,15,160,147,230,17,196, -219,28,9,179,207,58,253,183,178,251,126,101,78,136,120,64, -105,130,5,64,1,80,0,20,0,5,64,1,80,0,140,10, -128,88,165,202,157,128,0,70,186,100,173,217,239,226,100,0, -35,189,223,22,3,240,75,147,197,184,19,1,192,72,23,237, -54,251,93,156,12,96,164,247,219,98,0,154,61,142,32,17, -0,140,244,177,5,102,191,139,147,1,140,244,126,91,12,192, -14,188,70,94,172,86,199,138,133,62,59,30,220,98,246,187, -56,21,64,59,238,183,197,0,132,68,123,117,172,120,125,116, -149,255,239,226,36,0,237,190,223,22,5,80,253,199,171,135, -242,53,38,249,195,10,131,253,46,82,186,22,69,0,19,49, -12,35,250,226,160,32,85,12,34,250,4,64,209,39,0,138, -65,68,159,0,40,250,4,64,49,136,232,19,0,69,159,0, -40,6,17,125,2,160,232,139,111,0,69,68,28,255,156,16, -241,8,162,79,154,96,209,39,0,138,65,68,159,0,40,250, -4,64,87,28,175,152,101,167,65,202,203,203,181,21,43,86, -104,171,87,175,78,120,193,125,226,126,29,5,96,188,253,7, -219,13,32,140,50,114,228,200,164,24,213,226,62,113,191,2, -160,131,0,132,103,72,166,208,10,238,87,0,20,0,5,64, -1,80,0,20,0,29,10,224,224,193,131,181,43,175,188,210, -71,198,141,27,23,212,168,195,134,13,211,166,79,159,238,149, -154,154,154,128,115,70,141,26,21,160,19,199,194,189,182,241, -188,49,99,198,8,128,137,4,224,148,41,83,52,179,237,228, -201,147,218,155,111,190,169,77,152,48,193,231,252,187,238,186, -203,231,188,87,95,125,53,64,231,150,45,91,76,117,30,57, -114,68,123,232,161,135,180,65,131,6,133,116,109,227,121,95, -124,241,133,0,152,12,0,170,237,224,193,131,218,144,33,67, -188,231,31,56,112,192,231,253,227,199,143,251,188,223,20,128, -106,123,228,145,71,66,186,182,241,188,175,191,254,90,0,76, -84,0,225,121,30,126,248,97,109,239,222,189,62,32,92,115, -205,53,250,185,87,92,113,133,246,219,111,191,5,128,114,227, -141,55,6,5,16,192,62,253,244,211,58,56,106,251,225,135, -31,66,186,182,0,152,36,0,26,141,123,232,208,33,239,241, -149,43,87,234,199,208,124,170,109,255,254,253,222,253,119,222, -121,39,40,128,79,60,241,132,126,236,170,171,174,242,30,107, -108,108,212,251,117,86,175,29,183,0,38,194,4,108,59,39, -166,91,5,16,29,253,83,167,78,121,143,175,93,187,86,63, -142,254,151,218,230,204,153,163,123,45,108,167,79,159,246,9, -112,155,1,184,102,205,26,239,177,95,127,253,85,31,204,88, -189,118,92,2,40,75,115,132,14,224,217,179,103,245,38,243, -204,153,51,222,99,231,206,157,211,71,159,181,181,181,62,131, -9,124,246,173,183,222,242,30,91,183,110,157,41,128,135,15, -31,214,190,250,234,43,159,102,245,179,207,62,11,233,218,113, -7,160,44,78,100,223,32,228,201,39,159,212,207,219,190,125, -187,15,4,208,245,254,251,239,123,143,237,217,179,199,210,32, -228,151,95,126,241,246,41,173,94,59,238,0,148,229,217,194, -247,128,240,110,159,127,254,185,246,238,187,239,106,139,22,45, -242,158,247,237,183,223,54,9,11,154,213,203,46,187,204,20, -64,244,233,224,221,118,236,216,161,77,154,52,41,228,107,199, -29,128,178,64,101,228,131,16,163,160,191,103,101,187,247,222, -123,131,246,1,205,196,42,88,142,2,208,234,243,33,226,81, -154,187,47,244,99,27,35,120,110,70,184,0,190,248,226,139, -222,115,62,248,224,3,237,186,235,174,243,202,75,47,189,228, -125,239,147,79,62,137,58,128,232,23,62,255,252,243,62,226, -31,6,106,234,126,227,242,57,33,177,88,244,220,106,200,37, -146,245,252,194,1,16,89,139,163,71,143,122,207,185,237,182, -219,124,222,55,14,78,0,199,228,201,147,163,10,160,217,6, -8,29,213,4,11,128,214,1,68,191,13,253,183,96,16,76, -155,54,205,167,159,55,118,236,216,128,115,190,249,230,27,159, -209,176,49,93,183,121,243,230,160,96,53,119,109,179,243,204, -182,71,31,125,84,0,140,87,0,165,26,70,0,20,0,5, -64,1,80,0,20,0,5,64,1,80,0,20,0,5,64,1, -80,0,20,0,5,64,1,48,102,0,162,4,106,217,178,101, -218,210,165,75,181,171,175,190,218,244,156,121,243,230,249,228, -113,5,64,1,208,54,0,145,205,120,246,217,103,117,8,81, -245,130,64,178,255,57,0,115,252,248,241,65,141,189,117,235, -86,1,80,0,12,31,64,84,59,99,31,94,14,249,93,204, -98,195,220,13,164,210,30,120,224,1,189,160,180,174,174,78, -155,61,123,182,14,27,206,121,238,185,231,180,25,51,102,104, -55,223,124,179,94,21,253,248,227,143,235,19,137,48,91,14, -251,40,197,7,184,254,186,4,64,1,48,0,64,212,222,205, -159,63,95,135,235,150,91,110,209,167,91,238,222,189,91,7, -76,205,134,67,85,12,154,98,192,135,138,102,192,136,84,219, -208,161,67,181,151,95,126,217,171,239,169,167,158,210,231,143, -0,198,23,94,120,33,64,151,0,40,0,6,0,8,128,224, -201,224,189,80,128,0,104,80,191,103,156,142,169,0,84,77, -52,154,100,52,217,70,0,135,15,31,174,195,6,111,7,121, -230,153,103,244,92,174,81,151,0,40,0,6,109,130,149,0, -64,244,11,205,0,92,191,126,189,15,128,152,58,249,218,107, -175,121,207,133,215,51,206,39,246,215,37,0,10,128,1,0, -62,248,224,131,62,199,70,143,30,237,3,205,134,13,27,116, -0,175,189,246,90,47,128,88,197,0,0,170,25,115,240,118, -232,67,214,215,215,235,253,67,148,73,109,219,182,45,64,151, -0,40,0,70,69,208,252,54,245,90,0,20,0,37,16,45, -0,10,128,113,13,160,213,57,33,118,222,136,221,250,34,185, -198,89,155,231,132,36,58,128,50,39,68,60,160,52,193,2, -160,53,0,49,97,252,242,203,47,15,107,61,102,140,162,17, -156,86,235,200,132,42,209,200,53,11,128,113,4,32,70,172, -111,191,253,182,55,196,18,138,168,56,31,2,210,13,13,13, -150,63,119,247,221,119,123,23,156,108,46,215,44,0,38,56, -128,88,137,96,227,198,141,218,174,93,187,244,149,171,112,12, -249,91,164,230,112,236,214,91,111,245,46,50,132,105,151,88, -152,242,190,251,238,211,225,83,0,34,231,139,247,112,30,50, -42,152,173,182,115,231,78,221,179,34,214,136,249,197,200,152, -192,75,2,56,172,45,131,180,29,98,139,42,215,140,107,99, -65,34,100,78,238,191,255,126,61,214,8,189,136,55,34,206, -136,227,55,220,112,131,0,152,104,0,162,112,0,77,32,160, -2,16,56,134,156,239,245,215,95,175,55,173,120,31,243,115, -145,17,185,231,158,123,244,116,221,29,119,220,161,79,10,87, -0,26,51,30,56,31,208,169,37,118,161,99,196,136,17,250, -95,149,53,193,57,106,154,167,202,180,32,191,140,160,54,178, -43,40,15,195,53,160,247,189,247,222,211,179,43,104,238,205, -86,101,21,0,227,24,64,76,38,71,254,22,41,180,55,222, -120,195,59,207,22,0,170,62,33,38,164,195,243,0,20,64, -137,99,128,5,125,63,127,0,209,156,67,143,241,26,115,231, -206,213,30,123,236,49,93,212,122,130,102,0,162,11,160,60, -28,188,159,42,102,192,119,81,186,0,160,90,230,87,0,76, -0,0,239,188,243,78,109,201,146,37,186,81,225,173,208,228, -2,60,24,29,105,53,156,131,242,42,76,82,7,40,183,223, -126,187,126,12,85,51,55,221,116,147,169,7,52,194,11,65, -211,139,10,25,20,38,192,155,225,24,42,112,38,78,156,232, -3,32,188,30,60,44,142,193,19,99,223,63,151,44,0,38, -16,128,0,14,77,34,154,71,163,225,80,25,3,104,0,18, -254,162,142,15,70,7,40,175,188,242,138,222,23,67,191,12, -94,74,229,122,141,57,95,140,106,225,189,144,15,70,31,16, -30,20,125,64,136,106,66,209,124,67,255,130,5,11,188,185, -102,52,209,128,29,215,132,126,120,103,255,92,50,174,47,0, -38,65,28,16,112,160,57,53,46,66,174,60,149,255,194,228, -193,196,120,30,224,50,123,236,131,25,76,24,81,203,40,88, -0,12,40,40,80,0,74,32,90,0,140,58,128,102,15,151, -1,144,42,76,35,0,10,128,146,138,75,22,0,157,242,108, -224,104,78,203,84,130,142,191,19,31,191,218,212,82,111,226, -1,99,180,228,111,180,42,162,81,193,140,108,8,4,43,211, -59,13,64,132,98,144,9,105,81,0,171,171,171,207,57,201, -99,65,14,241,115,60,218,198,0,64,60,182,161,209,230,53, -162,131,205,9,65,26,14,49,56,132,67,144,86,51,166,209, -84,74,14,105,58,164,218,176,143,52,30,246,55,109,218,228, -93,84,18,169,52,124,14,225,22,44,231,139,152,33,222,131, -94,60,76,26,251,56,7,25,22,228,144,1,24,66,48,106, -246,156,241,59,192,75,227,125,140,152,177,22,181,149,156,179, -85,0,153,171,230,1,28,48,96,192,105,143,199,211,172,194, -127,147,145,254,73,178,129,86,149,191,48,202,30,11,250,113, -157,131,116,189,182,81,6,48,26,139,148,43,0,49,226,85, -143,187,71,108,15,175,17,104,86,161,18,255,52,26,70,195, -40,38,0,16,152,247,129,96,54,246,49,19,14,77,56,86, -74,133,55,69,24,6,49,67,64,133,204,7,194,43,208,1, -143,139,193,204,235,175,191,174,15,118,0,25,254,226,179,106, -201,93,227,119,80,30,16,215,68,204,208,46,15,8,158,192, -149,37,0,251,245,235,247,99,122,122,243,77,208,199,41,105, -218,223,72,140,199,150,252,177,147,118,204,147,97,139,215,131, -158,13,93,186,250,232,7,124,171,92,158,168,2,24,141,199, -52,40,0,1,7,2,198,16,4,126,97,124,85,169,98,150, -70,3,128,8,54,171,170,22,21,154,129,119,154,57,115,166, -14,11,188,159,154,154,137,44,10,2,200,11,23,46,212,63, -139,99,8,64,195,139,226,179,198,73,81,56,15,48,26,191, -131,154,91,140,44,138,202,158,216,1,32,120,34,174,142,89, -2,176,170,170,234,64,110,110,110,179,74,143,144,151,128,180, -49,28,171,33,227,77,233,211,215,150,254,8,244,28,79,203, -12,184,238,136,16,158,100,228,148,7,213,4,107,130,141,49, -64,179,52,154,49,30,8,0,213,154,50,10,64,120,68,227, -179,62,212,123,200,130,224,253,85,171,86,233,251,72,189,161, -8,2,94,18,30,209,56,31,217,248,29,112,28,153,21,252, -131,192,123,90,9,132,91,1,16,60,85,86,86,126,202,0, -206,36,169,33,41,11,6,224,246,130,130,2,75,125,64,60, -214,42,199,120,33,54,138,157,37,244,1,55,19,135,143,234, -10,54,45,19,222,75,25,223,44,141,166,82,103,10,192,89, -179,102,121,251,119,0,12,192,162,63,135,230,20,159,193,40, -22,253,64,60,7,88,61,128,26,30,77,205,31,70,17,2, -114,208,128,75,121,86,227,119,128,87,134,151,86,185,107,43, -205,176,21,0,193,83,239,222,189,119,209,254,34,146,58,146, -209,36,61,72,218,155,53,193,181,165,165,165,39,156,60,135, -195,206,1,14,158,9,242,93,235,44,109,103,65,7,109,82, -223,138,152,206,145,48,75,153,133,251,57,43,121,91,255,180, -93,44,231,132,20,23,23,111,36,190,26,72,102,144,140,36, -233,78,114,129,63,128,238,146,146,146,14,253,251,247,63,237, -118,187,67,14,85,92,230,114,71,221,3,226,26,78,126,242, -146,4,162,253,90,24,226,8,60,101,102,102,174,164,215,11, -72,106,73,134,145,92,66,146,31,0,32,73,6,53,195,123, -243,242,242,154,84,140,208,200,133,126,199,246,165,102,68,181, -15,232,33,249,171,43,77,0,140,35,0,193,81,69,69,197, -63,104,127,25,201,60,146,41,36,3,73,138,73,206,247,7, -48,133,164,21,125,96,122,121,121,249,79,205,61,172,112,131, -223,195,10,49,106,141,230,40,120,67,8,35,84,1,208,25, -0,130,163,206,157,59,163,249,189,129,164,158,100,34,73,37, -73,17,201,121,102,0,166,146,228,82,95,240,112,78,78,78, -80,197,8,137,28,76,192,56,96,164,250,16,252,53,62,88, -58,145,5,247,137,251,13,246,251,128,31,226,232,8,237,175, -228,254,95,29,135,96,202,73,10,73,178,92,38,27,181,116, -174,76,242,130,179,104,228,114,178,41,3,180,101,79,120,40, -202,79,75,143,101,38,36,82,125,244,31,175,27,69,5,156, -19,89,112,159,184,223,96,191,15,248,161,193,199,221,220,252, -206,39,153,74,50,132,164,132,164,29,56,51,3,16,253,192, -116,146,54,212,23,252,176,176,176,240,172,147,12,44,250,226, -67,31,184,161,216,223,126,246,126,136,255,205,38,25,79,82, -193,205,111,27,230,204,21,172,25,206,42,42,42,42,167,17, -204,137,236,236,108,49,136,232,179,172,15,188,48,55,183,24, -188,223,95,72,134,115,248,165,128,155,223,84,87,144,77,31, -13,147,180,45,43,43,171,37,79,248,115,70,70,134,24,68, -244,53,123,14,56,1,47,157,58,117,186,147,94,47,231,190, -31,210,111,227,120,240,113,17,184,98,190,220,193,0,132,23, -76,99,74,219,83,91,190,148,250,132,167,154,131,80,12,146, -220,250,192,7,56,161,88,242,102,122,189,130,100,9,201,92, -146,201,36,131,73,74,57,251,145,197,124,165,184,154,216,84, -95,16,67,229,142,189,122,245,90,14,178,155,106,142,197,32, -201,171,15,92,128,15,134,111,37,135,93,16,247,155,70,50, -138,164,39,56,98,158,210,155,242,126,254,125,65,140,84,242, -72,46,166,20,93,61,218,246,96,3,19,49,72,114,234,3, -15,224,130,155,221,21,12,31,250,125,211,57,236,210,23,252, -48,71,153,204,85,138,203,194,230,54,52,197,24,54,23,231, -231,231,143,33,210,247,97,136,237,31,39,20,131,36,151,62, -216,31,28,96,180,203,3,142,229,220,236,206,99,248,198,146, -84,113,214,163,157,161,233,117,187,66,216,84,83,156,205,237, -119,87,40,237,214,173,219,114,4,25,17,233,70,186,5,57, -63,49,112,226,235,131,157,97,111,216,29,246,167,56,223,61, -220,228,46,227,1,199,92,110,118,199,48,124,93,153,155,108, -171,77,175,89,83,236,225,15,231,176,178,98,118,171,163,168, -205,95,69,255,1,31,33,225,140,42,26,148,222,160,254,11, -69,136,86,42,171,197,192,206,213,7,251,193,142,176,39,236, -10,251,194,206,200,237,114,122,77,129,183,152,155,220,89,60, -224,24,201,124,20,51,47,57,204,143,199,106,211,219,20,132, -217,236,78,47,230,142,37,70,55,227,178,178,178,102,17,140, -107,201,37,239,68,241,33,42,96,81,134,141,185,0,201,148, -27,77,20,129,221,96,63,216,17,246,68,61,31,74,170,184, -170,101,25,247,243,26,24,188,217,28,231,27,199,60,244,100, -62,218,25,60,95,216,240,153,65,152,197,29,202,142,60,180, -174,228,32,227,120,78,183,212,113,226,121,30,151,224,44,228, -98,196,197,34,113,43,139,216,142,11,216,174,245,108,231,169, -108,247,225,204,65,41,115,145,199,156,216,2,159,17,66,53, -48,201,228,33,117,123,14,46,118,231,52,203,16,46,185,158, -192,165,55,211,184,8,177,142,93,180,72,124,74,29,219,113, -26,219,117,2,219,121,8,219,189,59,115,208,158,185,200,52, -12,56,108,129,207,127,96,146,106,240,134,109,57,189,82,196, -137,230,114,254,111,64,221,215,80,238,19,140,230,47,60,70, -36,238,164,134,237,55,146,237,57,144,237,91,206,246,46,98, -251,183,53,120,189,212,112,6,28,225,122,195,12,190,112,27, -174,114,45,228,47,213,133,191,96,119,158,3,112,169,72,220, -74,15,182,99,9,219,181,136,237,156,207,118,207,98,14,66, -242,122,255,3,143,135,181,99,121,236,51,203,0,0,0,0, -73,69,78,68,174,66,96,130, - -}; /* icon-sm.png */ static unsigned char icon_sm_png[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82, @@ -2775,10 +2303,14 @@ static const char * const style_css = ".header a.btn:active, .header2 a.btn:active {\n" " color: #fff;\n" "}\n" -".header a.btn {\n" +".header span.active, .header2 span.active {\n" +" color: #fff;\n" +" white-space: nowrap;\n" +"}\n" +".header a.btn, .header span.active {\n" " padding: 0px 30px 0px 0px;\n" "}\n" -".header2 a.btn {\n" +".header2 a.btn, .header2 span.active {\n" " padding: 0px 20px 0px 0px;\n" "}\n" "div.nav img {\n" diff --git a/pappl/style.css b/pappl/style.css index d6ea942e..bf28df27 100644 --- a/pappl/style.css +++ b/pappl/style.css @@ -43,10 +43,14 @@ div.nav { .header a.btn:active, .header2 a.btn:active { color: #fff; } -.header a.btn { +.header span.active, .header2 span.active { + color: #fff; + white-space: nowrap; +} +.header a.btn, .header span.active { padding: 0px 30px 0px 0px; } -.header2 a.btn { +.header2 a.btn, .header2 span.active { padding: 0px 20px 0px 0px; } div.nav img {