pantsblazing: Web Color Picker

From: Art Cancro Date: Thu, 15 May 2003 03:36:02 +0000 (+0000) Subject: * look and feel overhaul -- almost done! X-Git-Tag: v7.86~5901 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2781973f43a71bd9c31fb8223ff607702a3613bd * look and feel overhaul -- almost done! --- diff --git a/webcit/ChangeLog b/webcit/ChangeLog index feea5d259..10d1e7f17 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,7 @@ $Log$ +Revision 410.27 2003/05/15 03:35:59 ajc +* look and feel overhaul -- almost done! + Revision 410.26 2003/05/14 03:46:35 ajc * More background cleanup @@ -1385,3 +1388,4 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix + diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 94dc465f9..94ba0833d 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -145,7 +145,7 @@ void calendar_month_view(int year, int month, int day) { /* Outer table (to get the background color) */ wprintf("

\n"); + "bgcolor=#204B78>

\n"); wprintf("" "

" @@ -180,7 +180,7 @@ void calendar_month_view(int year, int month, int day) { /* Inner table (the real one) */ wprintf(""); + "bgcolor=#204B78>"); for (i=0; i<7; ++i) { wprintf("", days[i]); } @@ -324,16 +324,16 @@ void calendar_day_view(int year, int month, int day) { /* Outer table (to get the background color) */ wprintf("

%s

\n"); + "bgcolor=#204B78>

\n"); /* Inner table (the real one) */ wprintf("\n"); + "bgcolor=#204B78>\n"); /* Innermost table (contains hours etc.) */ wprintf("

" "\n"); + "bgcolor=#204B78>\n"); /* Display events before 8:00 (hour=-1 is all-day events) */ wprintf("" diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index 47ca39e2d..8b34b4666 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -176,8 +176,6 @@ void display_main_menu(void) wprintf("

\n"); wprintf("Configure networking with other systems\n"); - wprintf("

\n"); - wprintf("Reconfigure color scheme\n"); } wprintf("\n"); do_template("endbox"); @@ -195,11 +193,10 @@ void display_main_menu(void) */ void display_generic(void) { - output_headers(1); + output_headers(3); - wprintf("

"); - wprintf("Enter a server command\n"); - wprintf("

\n"); + svprintf("BOXTITLE", WCS_STRING, "Enter a server command"); + do_template("beginbox"); wprintf(""); wprintf("This screen allows you to enter Citadel server commands which are\n"); @@ -220,6 +217,7 @@ void display_generic(void) wprintf("
\n"); wprintf("\n"); + do_template("endbox"); wDumpContent(1); } @@ -235,14 +233,13 @@ void do_generic(void) return; } - output_headers(1); + output_headers(3); serv_printf("%s", bstr("g_cmd")); serv_gets(buf); - wprintf("

"); - wprintf("Server command results\n"); - wprintf("

\n"); + svprintf("BOXTITLE", WCS_STRING, "Server command results"); + do_template("beginbox"); wprintf("

Command:

"); escputs(bstr("g_cmd")); @@ -280,6 +277,7 @@ void do_generic(void) wprintf(""); wprintf("Enter another command \n"); wprintf("Return to menu\n"); + do_template("endbox"); wDumpContent(1); } diff --git a/webcit/roomops.c b/webcit/roomops.c index e3886724d..7031fd6da 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -277,13 +277,16 @@ void tabular_room_list(void) */ void zapped_list(void) { - output_headers(1); - wprintf(""); - wprintf("Zapped (forgotten) rooms\n"); - wprintf(" \n"); + output_headers(3); + + svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms"); + do_template("beginbox"); + listrms("LZRM -1"); + wprintf(" \n"); wprintf("Click on any room to un-zap it and goto that room.\n"); + do_template("endbox"); wDumpContent(1); } @@ -1324,11 +1327,9 @@ void display_whok(void) strcpy(username, bstr("username")); output_headers(1); - - wprintf(""); - wprintf("Access control list for "); - escputs(WC->wc_roomname); - wprintf("\n"); + stresc(buf, WC->wc_roomname, 1); + svprintf("BOXTITLE", WCS_STRING, "Access control list for %s", buf); + do_template("beginbox"); if(!strcmp(bstr("sc"), "Kick")) { sprintf(buf, "KICK %s", username); @@ -1392,6 +1393,7 @@ void display_whok(void) "\n"); wprintf("

\n"); + do_template("endbox"); wDumpContent(1); } @@ -1412,11 +1414,9 @@ void display_entroom(void) display_error(&buf[4]); return; } - output_headers(1); - - wprintf("

"); - wprintf("Enter (create) a new room\n"); - wprintf("

\n"); + output_headers(3); + svprintf("BOXTITLE", WCS_STRING, "Create a new room"); + do_template("beginbox"); wprintf("

\n"); @@ -1437,6 +1437,9 @@ void display_entroom(void) wprintf("

Private - invitation only\n"); + + wprintf("

Personal (mailbox for you only)\n"); wprintf("\n"); wprintf("

Resides on floor: "); @@ -1463,6 +1466,7 @@ void display_entroom(void) if (buf[0] == '1') { fmout(NULL); } + do_template("endbox"); wDumpContent(1); } @@ -1496,6 +1500,8 @@ void entroom(void) er_num_type = 2; if (!strcmp(er_type, "invonly")) er_num_type = 3; + if (!strcmp(er_type, "personal")) + er_num_type = 4; sprintf(buf, "CRE8 1|%s|%d|%s|%d", er_name, er_num_type, er_password, er_floor); @@ -1515,11 +1521,10 @@ void entroom(void) void display_private(char *rname, int req_pass) { - output_headers(1); + output_headers(3); - wprintf("

"); - wprintf("Goto a private room\n"); - wprintf("

\n"); + svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room"); + do_template("beginbox"); wprintf("\n"); wprintf("If you know the name of a hidden (guess-name) or\n"); @@ -1540,11 +1545,12 @@ void display_private(char *rname, int req_pass) wprintf("Enter room password:

"); wprintf("\n"); } - wprintf("

\n"); + wprintf("

\n"); wprintf(""); wprintf(""); wprintf("\n"); + do_template("endbox"); wDumpContent(1); } @@ -2109,7 +2115,7 @@ void knrooms() { wprintf("

\n"); offer_start_page(); - wprintf("

\n"); + wprintf("

\n"); /* Display the room list in the user's preferred format */ if (!strcasecmp(listviewpref, "table")) { diff --git a/webcit/static/colorpicker.html b/webcit/static/colorpicker.html deleted file mode 100644 index 5d8cca149..000000000 --- a/webcit/static/colorpicker.html +++ /dev/null @@ -1,577 +0,0 @@ -pantsblazing: Web Color Picker - - - - - - - - - - - - -

- - - - - - - - - - - - - -

- - - - -

Web Color Picker

- - - - - -

Preview

- - - - - -

- - - - -

Text

Blah blah blah blah blah blah blah. Blah blah blah blah blah blah blah. Blah blah blah blah. Blah blah blah blah blah blah blah.

Unvisited Link

Active Link

Visited Link

- -

- - - - - -

Choose Element

- - - - - - - - - - - - - - -

- - - - -

- -
- - - - -

- - - - -

#FFFFFF

- Background -

- - - - -

- -
- - - - -

- - - - -

#FFFFFF

- Text -

- - - - -

- -
- - - - -

- - - - -

#FF0000

- Link -

- - - - -

- -
- - - - -

- - - - -

#FF0000

- Active Link -

- - - - -

- -
- - - - -

- - - - -

#9900CC

- Visited Link -

- -

- - - - - - - -

Copy Tags

- BODY
- - -

- - CSS
- -

- - - -

- - - - - -

Choose Color

- - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

- -
- -

diff --git a/webcit/static/login.html b/webcit/static/login.html index 6e0c33852..e8ba086ce 100644 --- a/webcit/static/login.html +++ b/webcit/static/login.html @@ -1,5 +1,5 @@ - + @@ -35,5 +35,5 @@

- + diff --git a/webcit/who.c b/webcit/who.c index 983a635ef..e1f8b9baf 100644 --- a/webcit/who.c +++ b/webcit/who.c @@ -35,6 +35,7 @@ void whobbs(void) realroom[SIZ], realhost[SIZ]; time_t last_activity; time_t now; + int bg = 0; output_headers(7); @@ -47,15 +48,16 @@ void whobbs(void) wprintf("

"); wprintf(" $\"$ "); - wprintf("Users currently on "); + wprintf(" Users currently on "); escputs(serv_info.serv_humannode); wprintf("

"); offer_start_page(); - wprintf("

\n"); + wprintf("
\n"); - do_template("beginbox"); - wprintf("\n\n"); - wprintf("\n"); + do_template("beginbox_nt"); + wprintf("" + "

Session ID

\n\n"); + wprintf("\n"); wprintf("\n"); wprintf(""); wprintf("\n\n"); @@ -81,7 +83,13 @@ void whobbs(void) extract(realhost, buf, 10); last_activity = extract_long(buf, 5); - wprintf("\n\t", + (bg ? "DDDDDD" : "FFFFFF") + ); + + + wprintf("\n\t"); /* (link to page this user) */ - wprintf("" " "); + wprintf(""); + + /* (idle flag) */ + wprintf("\n\t\n\t

Session ID				User Name	Room	From host
%d", sess); + bg = 1 - bg; + wprintf("
%d	", sess); if ((WC->is_aide) && (sess != serv_info.serv_pid)) { wprintf(" (edit)"); } - wprintf("	"); + wprintf("	"); + if ((now - last_activity) > 900L) { + wprintf(" " + ""); + } + wprintf("	"); + /* username (link to user bio/photo page) / @@ -112,13 +132,6 @@ void whobbs(void) escputs(user); wprintf(""); - if ((now - last_activity) > 900L) { - wprintf(" " - ""); - } - / room */ wprintf("	"); escputs(room);