From 4d5d1e8eeafdc1cff455d9da9c5ba05ed03d2a5e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 28 Feb 2011 23:36:51 -0500 Subject: [PATCH] Known rooms page now uses the auto-generated room banner. Also removed the folder view. This will be redone as a better in-iconbar version later. --- webcit/roomops.c | 46 ++++++++++++++---------------- webcit/static/t/knrooms.html | 42 --------------------------- webcit/static/t/knrooms_rooms.html | 21 +++++++++++--- 3 files changed, 38 insertions(+), 71 deletions(-) diff --git a/webcit/roomops.c b/webcit/roomops.c index 27b975166..460d26af4 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -1,11 +1,26 @@ /* * Lots of different room-related operations. + * + * Copyright (c) 1996-2011 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" #include "webserver.h" - ConstStr QRFlagList[] = { {HKEY(strof(QR_PERMANENT))}, {HKEY(strof(QR_INUSE))}, @@ -1111,31 +1126,14 @@ void netedit(void) { http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0); } -/** - * \brief Do either a known rooms list or a folders list, depending on the - * user's preference +/* + * Known rooms list (box style) */ void knrooms(void) { - StrBuf *ListView = NULL; - - /** Determine whether the user is trying to change views */ - if (havebstr("view")) { - ListView = NewStrBufDup(SBSTR("view")); - set_preference("roomlistview", ListView, 1); - } - /** Sanitize the input so its safe */ - if ((get_preference("roomlistview", &ListView) == 0)|| - ( - (strcasecmp(ChrPtr(ListView), "folders") != 0) && - (strcasecmp(ChrPtr(ListView), "rooms") != 0) - ) - ) - { - ListView = NewStrBufPlain(HKEY("rooms")); - set_preference("roomlistview", ListView, 0); - } - url_do_template(); + output_headers(1, 1, 1, 0, 0, 0); + do_template("knrooms", NULL); + wDumpContent(1); } @@ -1400,5 +1398,3 @@ SessionDestroyModule_ROOMOPS _FlushRoomList (sess); } - -/*@}*/ diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html index 14a4d0d79..c55fbb63b 100644 --- a/webcit/static/t/knrooms.html +++ b/webcit/static/t/knrooms.html @@ -1,46 +1,4 @@ - - - - -
- - - -
-
-
-
-
-
-
- - - diff --git a/webcit/static/t/knrooms_rooms.html b/webcit/static/t/knrooms_rooms.html index ceb7486c1..7c3978627 100644 --- a/webcit/static/t/knrooms_rooms.html +++ b/webcit/static/t/knrooms_rooms.html @@ -1,5 +1,18 @@ - -
+ + + + + +
+ + + + + +  ">"> -
- + +
+ + + -- 2.30.2