* Moved "edit floor label pic" to the floor editing screen

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 12e1ae655d28c263ce26cc61c155196b3dff456d..136104f536ccd4e789e9a6e50fefb312ca6fc034 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 323.55  2002/08/05 16:07:30  ajc
+* Moved "edit floor label pic" to the floor editing screen
+
 Revision 323.54  2002/08/05 15:53:00  ajc
 * Commands to add, change, delete floors
 
@@ -887,3 +890,4 @@ 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/floors.c b/webcit/floors.c
index ebcafcaef81e8998a1f65d9e4c59476a929447fc..1b9d36d41cb0431f77e67bce9e083d3a667520d3 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -74,11 +74,17 @@ void display_floorconfig(char *prepend_html)
                extract(floorname, buf, 1);
                refcount = extract_int(buf, 2);
 
-               wprintf("<TR><TD>%d", floornum);
+               wprintf("<TR><TD><TABLE border=0><TR><TD>%d", floornum);
                if (refcount == 0) {
-                       wprintf(" <A HREF=\"/delete_floor?floornum=%d\">"
-                               "(delete floor)</A>");
+                       wprintf("</TD><TD>"
+                               "<A HREF=\"/delete_floor?floornum=%d\">"
+                               "<FONT SIZE=-1>(delete floor)</A>"
+                               "</FONT><BR><FONT SIZE=-1>"
+                               "<A HREF=\"/display_editfloorpic&"
+                               "which_floor=%d\">(edit graphic)</A>",
+                               floornum, floornum);
                }
+               wprintf("</TD></TR></TABLE>");
                wprintf("</TD>");
 
                wprintf("<TD>"

diff --git a/webcit/graphics.c b/webcit/graphics.c
index d565654f9fc64dbdc17712cfee7bbe20682d921f..f2f6a7ddb54619a422aecbdd8be770fa4c6fc76c 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -96,26 +96,3 @@ void do_graphics_upload(char *upl_cmd)
                return;
        }
 }
-
-
-
-void select_floor_to_edit_pic(void)
-{
-       int a;
-
-       output_headers(3);
-
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Select floor to edit label graphic</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       load_floorlist();
-       for (a = 0; a < 128; ++a)
-               if (strlen(floorlist[a]) > 0) {
-                       wprintf("<A HREF=\"/display_editfloorpic&which_floor=%d\">", a);
-                       escputs(floorlist[a]);
-                       wprintf("</A>\n");
-               }
-       wDumpContent(1);
-}

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 805506d068bd6edb2061eee2d291b4559cceaf38..f357e469ffde14edf6447bce5581bb4c50939887 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -180,9 +180,6 @@ void display_main_menu(void)
                        wprintf("<LI><A HREF=\"/display_floorconfig\">\n");
                        wprintf("Add, change, or delete floors</A>\n");
 
-                       wprintf("<LI><A HREF=\"/select_floor_to_edit_pic\">\n");
-                       wprintf("Set or change a floor label graphic</A>\n");
-
                        wprintf("<LI><A HREF=\"/display_netconf\">\n");
                        wprintf("Configure networking with other systems</A>\n");
                }

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 5bf13354ef4ff34c50d206a9fe98071e3a6a06b1..6a20cf870b571cf0879c0a4b98113b6c42d7667f 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1053,8 +1053,6 @@ void session_loop(struct httprequest *req)
                                        "/editroompic");
        } else if (!strcasecmp(action, "editroompic")) {
                do_graphics_upload("UIMG 1|_roompic_");
-       } else if (!strcasecmp(action, "select_floor_to_edit_pic")) {
-               select_floor_to_edit_pic();
        } else if (!strcasecmp(action, "delete_floor")) {
                delete_floor();
        } else if (!strcasecmp(action, "rename_floor")) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 9797ed593bf413224ca591a86de0ffd2f2c10e4b..2d64e9262c441869c88cf899af5dd172e1e69c9f 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -253,7 +253,6 @@ void serv_write(char *buf, int nbytes);
 void serv_puts(char *string);
 void serv_printf(const char *format,...);
 void load_floorlist(void);
-void select_floor_to_edit_pic(void);
 void display_reg(int);
 void register_user(void);
 void display_changepw(void);