From e59227c757409a66fa7840957bbba0008e95b176 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 9 Mar 2005 04:08:30 +0000 Subject: [PATCH] * Delete room is now confirmed through a JavaScript popup instead of a transition page * New icon for "Tasks." In order to keep it consistent with the rest of the icons, it is ugly. * Modified page popup style slightly. --- webcit/ChangeLog | 8 ++++++- webcit/iconbar.c | 4 ++-- webcit/roomops.c | 49 ++-------------------------------------- webcit/static/head.html | 3 +-- webcit/static/tasks.gif | Bin 0 -> 2937 bytes webcit/webcit.c | 2 -- 6 files changed, 12 insertions(+), 54 deletions(-) create mode 100644 webcit/static/tasks.gif diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 90383bbf2..37bf3fed7 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,11 @@ $Log$ +Revision 603.11 2005/03/09 04:08:30 ajc +* Delete room is now confirmed through a JavaScript popup instead of + a transition page +* New icon for "Tasks." In order to keep it consistent with the rest of + the icons, it is ugly. +* Modified page popup style slightly. + Revision 603.10 2005/03/08 04:59:31 ajc * More attractive display of vCards (hide unknown fields) * Added "title" and "organization" to vCard display/edit @@ -2474,4 +2481,3 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 4940f7710..373370389 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -192,7 +192,7 @@ void do_iconbar(void) { ); if (ib_displayas != IB_TEXTONLY) { wprintf(""); + "SRC=\"/static/tasks.gif\">"); } if (ib_displayas != IB_PICONLY) { wprintf("Tasks"); @@ -478,7 +478,7 @@ void display_customize_iconbar(void) { "" "" "\" \"" + "SRC=\"/static/tasks.gif\" ALT=\" \">" "" "Tasks
" "A shortcut to your personal task list." diff --git a/webcit/roomops.c b/webcit/roomops.c index 8840d127f..3d40fb3ec 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -947,7 +947,8 @@ void display_editroom(void) if (!strcmp(tab, "admin")) { wprintf("
    " - "
  • \n" + "
  • \n" "Delete this room\n" "
  • \n" "Set or change the graphic for this room's banner\n" @@ -2048,59 +2049,13 @@ void zap(void) - -/* - * Confirm deletion of the current room - */ -void confirm_delete_room(void) -{ - char buf[SIZ]; - - serv_puts("KILL 0"); - serv_gets(buf); - if (buf[0] != '2') { - strcpy(WC->ImportantMessage, &buf[4]); - display_main_menu(); - return; - } - output_headers(1, 1, 2, 0, 0, 0, 0); - wprintf("
    \n"); - wprintf("
    "); - wprintf("Confirm deletion of room\n"); - wprintf("
    \n"); - wprintf("
    \n
    \n"); - - wprintf("
    "); - wprintf("
    \n"); - - wprintf("Are you sure you want to delete "); - escputs(WC->wc_roomname); - wprintf("?
    \n"); - - wprintf(""); - wprintf(""); - - wprintf("
    \n"); - wDumpContent(1); -} - - /* * Delete the current room */ void delete_room(void) { char buf[SIZ]; - char sc[SIZ]; - strcpy(sc, bstr("sc")); - - if (strcasecmp(sc, "Delete")) { - strcpy(WC->ImportantMessage, - "Cancelled. This room was not deleted."); - display_main_menu(); - return; - } serv_puts("KILL 1"); serv_gets(buf); if (buf[0] != '2') { diff --git a/webcit/static/head.html b/webcit/static/head.html index d544708fd..3b1f1286c 100644 --- a/webcit/static/head.html +++ b/webcit/static/head.html @@ -67,8 +67,7 @@ body { #page_popup { position:absolute; - width=600px; - height=400px; + top:100px; left:100px; background-color: #880000; z-index: 2; } diff --git a/webcit/static/tasks.gif b/webcit/static/tasks.gif new file mode 100644 index 0000000000000000000000000000000000000000..62dbe5772569e4c2f9c473702ef9bae378d153c2 GIT binary patch literal 2937 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 E15B|BOaK4? literal 0 HcmV?d00001 diff --git a/webcit/webcit.c b/webcit/webcit.c index 38639d2f5..9264b6309 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -1231,8 +1231,6 @@ void session_loop(struct httprequest *req) save_edit("Your bio", "EBIO", 0); } else if (!strcasecmp(action, "confirm_move_msg")) { confirm_move_msg(); - } else if (!strcasecmp(action, "confirm_delete_room")) { - confirm_delete_room(); } else if (!strcasecmp(action, "delete_room")) { delete_room(); } else if (!strcasecmp(action, "validate")) { -- 2.39.2