From: Art Cancro <ajc@citadel.org>
Date: Wed, 9 Mar 2005 04:08:30 +0000 (+0000)
Subject: * Delete room is now confirmed through a JavaScript popup instead of
X-Git-Tag: v7.86~4979
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=e59227c757409a66fa7840957bbba0008e95b176;p=citadel.git

* 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.
---

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 <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* 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("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/vcalendar.gif\">");
+			"SRC=\"/static/tasks.gif\">");
 		}
 		if (ib_displayas != IB_PICONLY) {
 			wprintf("Tasks");
@@ -478,7 +478,7 @@ void display_customize_iconbar(void) {
 		"<INPUT TYPE=\"checkbox\" NAME=\"ib_tasks\" VALUE=\"yes\" %s>"
 		"</TD><TD>"
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-		"SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
+		"SRC=\"/static/tasks.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
 		"<B>Tasks</B><br />"
 		"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("<UL>"
-			"<LI><A HREF=\"/confirm_delete_room\">\n"
+			"<LI><A HREF=\"/delete_room\" "
+			"onClick=\"return confirm('Are you sure you want to delete this room?');\">\n"
 			"Delete this room</A>\n"
 			"<LI><A HREF=\"/display_editroompic\">\n"
 			"Set or change the graphic for this room's banner</A>\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("<div id=\"banner\">\n");
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-	wprintf("<SPAN CLASS=\"titlebar\">Confirm deletion of room</SPAN>\n");
-	wprintf("</TD></TR></TABLE>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
-
-	wprintf("<CENTER>");
-	wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
-
-	wprintf("Are you sure you want to delete <FONT SIZE=+1>");
-	escputs(WC->wc_roomname);
-	wprintf("</FONT>?<br />\n");
-
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-
-	wprintf("</FORM></CENTER>\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 000000000..62dbe5772
Binary files /dev/null and b/webcit/static/tasks.gif differ
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")) {