Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
More web interface improvements.
  • Loading branch information
michaelrsweet committed Apr 9, 2020
1 parent 023bab9 commit 0417d4f
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 484 deletions.
7 changes: 6 additions & 1 deletion pappl/client-webif.c
Expand Up @@ -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, " <a class=\"btn\" href=\"%s\">%s</a>\n", r->path, r->label);
{
if (strcmp(client->uri, r->path))
papplClientHTMLPrintf(client, " <a class=\"btn\" href=\"%s\">%s</a>\n", r->path, r->label);
else
papplClientHTMLPrintf(client, " <span class=\"active\">%s</span>\n", r->label);
}
}

pthread_rwlock_unlock(&system->rwlock);
Expand Down
32 changes: 25 additions & 7 deletions pappl/printer-webif.c
Expand Up @@ -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,
" <div class=\"header2\">\n"
" <div class=\"row\">\n"
" <div class=\"col-12 nav\">\n"
" <a class=\"btn\" href=\"%s/\"><img src=\"%s/icon-sm.png\"> %s</a>\n"
" <a class=\"btn\" href=\"%s/config\">Configuration</a>\n"
" <a class=\"btn\" href=\"%s/media\">Media</a>\n"
" <a class=\"btn\" href=\"%s/defaults\">Printing Defaults</a>\n", printer->uriname, printer->uriname, printer->name, printer->uriname, printer->uriname, printer->uriname);
if (papplPrinterGetSupplies(printer, 0, NULL))
papplClientHTMLPrintf(client,
" <a class=\"btn\" href=\"%s/supplies\">Supplies</a>\n", printer->uriname);
" <a class=\"btn\" href=\"%s/\"><img src=\"%s/icon-sm.png\"></a>\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, " <a class=\"btn\" href=\"%s\">%s</a>\n", path, pages[i][1]);
else
papplClientHTMLPrintf(client, " <span class=\"active\">%s</span>\n", pages[i][1]);
}

papplClientHTMLPuts(client,
" </div>\n"
" </div>\n"
Expand Down

0 comments on commit 0417d4f

Please sign in to comment.