From 38668b88b8c1017e957a6ab2ffe258c8b56c1048 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 10 Jun 2004 02:58:55 +0000 Subject: [PATCH] * Made all the title boxes the same background color. The old scheme was cute but not professional looking. --- webcit/ChangeLog | 5 ++- webcit/calendar.c | 6 ++-- webcit/listsub.c | 2 +- webcit/messages.c | 10 +----- webcit/netconf.c | 10 +++--- webcit/paging.c | 2 +- webcit/roomops.c | 78 +++------------------------------------------ webcit/siteconfig.c | 2 +- webcit/summary.c | 7 ++-- webcit/useredit.c | 2 +- webcit/who.c | 6 ++-- 11 files changed, 29 insertions(+), 101 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 9c7d29830..22fb5e83a 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,8 @@ $Log$ +Revision 521.1 2004/06/10 02:58:55 ajc +* Made all the title boxes the same background color. The old scheme was + cute but not professional looking. + Revision 521.0 2004/06/06 19:53:25 ajc * THIS IS 5.21 @@ -1872,4 +1876,3 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/calendar.c b/webcit/calendar.c index 3e74dde71..01dd192b1 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -354,7 +354,7 @@ void respond_to_request(void) { output_headers(3); - wprintf("
" + wprintf("
" "Respond to meeting request" "

\n" ); @@ -409,7 +409,7 @@ void handle_rsvp(void) { output_headers(3); - wprintf("
" + wprintf("
" "" "Update your calendar with this RSVP" "

\n" @@ -537,7 +537,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { } output_headers(3); - wprintf("
" + wprintf("
" "Edit task" "

\n" ); diff --git a/webcit/listsub.c b/webcit/listsub.c index 118a0598c..0d79857af 100644 --- a/webcit/listsub.c +++ b/webcit/listsub.c @@ -49,7 +49,7 @@ void do_listsub(void) strcpy(subtype, bstr("subtype")); wprintf("
" - "
" + "
" "List subscribe/unsubscribe\n" "

\n" ); diff --git a/webcit/messages.c b/webcit/messages.c index c2aaa7173..9dfa0bb96 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -503,14 +503,6 @@ void read_message(long msgnum) { wprintf("		\n" "\n"); - /*** "Read" button is now superfluous - *** - ***wprintf("\n", msgnum); - ***/ - wprintf("
" - *** "Read" - *** "" "
"); + wprintf("
"); wprintf("Confirm move of message\n"); wprintf("
\n"); diff --git a/webcit/netconf.c b/webcit/netconf.c index 287a1a688..1ee398d00 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -77,7 +77,7 @@ void edit_node(void) { void display_add_node(void) { output_headers(3); - wprintf("
"); + wprintf("
"); wprintf("Add new node"); wprintf("
\n"); @@ -111,7 +111,7 @@ void display_edit_node(void) strcpy(node, bstr("node")); output_headers(3); - wprintf("
"); + wprintf("
"); wprintf("Edit node configuration for "); escputs(node); wprintf("\n"); @@ -161,7 +161,7 @@ void display_netconf(void) char node[SIZ]; output_headers(3); - wprintf("
"); + wprintf("
"); wprintf("Network configuration\n"); wprintf("
\n"); @@ -170,7 +170,7 @@ void display_netconf(void) wprintf("Add a new node
\n"); wprintf(""); - wprintf("
"); + wprintf("
"); wprintf("Currently configured nodes\n"); wprintf("
\n"); serv_puts("CONF getsys|application/x-citadel-ignet-config"); @@ -201,7 +201,7 @@ void display_confirm_delete_node(void) char node[SIZ]; output_headers(3); - wprintf("
"); + wprintf("
"); wprintf("Confirm delete\n"); wprintf("
\n"); diff --git a/webcit/paging.c b/webcit/paging.c index 6a3625d33..be11aad49 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -158,7 +158,7 @@ void page_popup(void) extract(pagefrom, &buf[4], 3); - wprintf("
"); + wprintf("
"); wprintf("Instant message from "); escputs(pagefrom); wprintf("
\n"); diff --git a/webcit/roomops.c b/webcit/roomops.c index 771650633..64c300655 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -215,63 +215,6 @@ void listrms(char *variety) } -/* - * list all rooms by floor (only should get called from knrooms() because - * that's where output_headers() is called from) - */ -void tabular_room_list(void) -{ - int a; - char buf[SIZ]; - - do_template("beginbox_nt"); - wprintf(""); - wprintf(""); - wprintf("\n"); - - for (a = 0; a < 128; ++a) - if (floorlist[a][0] != 0) { - - /* Floor name column */ - wprintf(""); - - /* Rooms with new messages column */ - wprintf("\n\n"); - } - wprintf("
FloorRooms with new messagesRooms with no new messages
"); - - serv_printf("OIMG _floorpic_|%d", a); - serv_gets(buf); - if (buf[0] == '2') { - serv_puts("CLOS"); - serv_gets(buf); - wprintf("\"%s\"", - a, &floorlist[a][0]); - } else { - escputs(&floorlist[a][0]); - } - - wprintf(""); - sprintf(buf, "LKRN %d", a); - listrms(buf); - wprintf(""); - - /* Rooms with old messages column */ - sprintf(buf, "LKRO %d", a); - listrms(buf); - wprintf("
\n"); - do_template("endbox"); - wDumpContent(1); -} - - - - - - - - - /* * list all forgotten rooms */ @@ -2172,7 +2115,7 @@ void knrooms() { } /* title bar */ - wprintf("
" + wprintf("
" "" ); if (!strcasecmp(listviewpref, "rooms")) { @@ -2188,7 +2131,7 @@ void knrooms() { /* offer the ability to switch views */ - wprintf("
\n" + wprintf("
\n" "\n"); + wprintf("
"); offer_start_page(); - wprintf("
\n"); + wprintf("
\n"); /* Display the room list in the user's preferred format */ - if (!strcasecmp(listviewpref, "table")) { - tabular_room_list(); - } - else { - list_all_rooms_by_floor(listviewpref); - } + list_all_rooms_by_floor(listviewpref); } diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index 4bd5ed86a..5d814bbbb 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -135,7 +135,7 @@ void display_siteconfig(void) serv_printf("CONF get"); serv_gets(buf); if (buf[0] != '1') { - wprintf("
"); + wprintf("
"); wprintf("Error\n"); wprintf("

\n"); wprintf("%s
\n", &buf[4]); diff --git a/webcit/summary.c b/webcit/summary.c index 68d21af03..142d6165a 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -221,16 +221,17 @@ void server_info_section(void) { void summary(void) { output_headers(7); - wprintf("" + wprintf("
" "
" "" "Summary page for "); escputs(WC->wc_username); wprintf("\n"); - offer_start_page(); wprintf(""); output_date(); - wprintf("
\n"); + wprintf("
"); + offer_start_page(); + wprintf("
\n"); /* * Now let's do three columns of crap. All portals and all groupware diff --git a/webcit/useredit.c b/webcit/useredit.c index 0ccf14e90..fd1a14a44 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -264,7 +264,7 @@ void display_edituser(char *supplied_username, int is_new) { } output_headers(3); /* No room banner on this screen */ - wprintf("
"); + wprintf("
"); wprintf("" "Edit user account: "); escputs(username); diff --git a/webcit/who.c b/webcit/who.c index e1f8b9baf..ec5267684 100644 --- a/webcit/who.c +++ b/webcit/who.c @@ -46,11 +46,11 @@ void whobbs(void) "\n" ); - wprintf("
"); + wprintf("
"); wprintf("\""); wprintf(" Users currently on "); escputs(serv_info.serv_humannode); - wprintf(""); + wprintf(""); offer_start_page(); wprintf("

\n"); @@ -197,7 +197,7 @@ void edit_me(void) output_headers(3); - wprintf("
"); + wprintf("
"); wprintf(""); wprintf("Edit your session display"); wprintf("
\n"); -- 2.30.2