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.

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 27b9751661bca1fade43264a8109d6e02e506052..460d26af4c551218cbe2c1436a5dbf1c011ca075 100644 (file)
--- 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 14a4d0d791dcf46acf78aabe2b5983ab068fab72..c55fbb63b252d6fd87fdf87b58aee83e11c0ecc9 100644 (file)
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -1,46 +1,4 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-<div class="banner" id="room_banner">
-<h1><?%("COND:PREF", 1, "roomlistview", "rooms", _("Room list"), "")><?%("COND:PREF", 1, "roomlistview", "folders", _("Folder list"), "")><?%("COND:PREF", 1, "roomlistview", "table", _("Room list"), "")></h1>
-</div>
-<?=("loggedinas")>
-<!-- offer the ability to switch views-->
-<div id="actiondiv">
-<ul class="room_actions">
-<li class="start_page">
-<?OFFERSTARTPAGE>
-</li>
-
- <li><form name="roomlistomatic">
-       <select name="newview" size="1" 
-OnChange="location.href=roomlistomatic.newview.options[selectedIndex].value">
-
-<option <?%("COND:PREF", 1, "roomlistview", "rooms", "SELECTED", "")> value="knrooms?view=rooms?template=knrooms?SortBy=byfloorroom?SortOrder=1"><?_("View as room list")></option>
-<option <?%("COND:PREF", 1, "roomlistview", "folders", "SELECTED", "")> value="knrooms?view=folders?template=knrooms?SortBy=byfloorroom?SortOrder=1"><?_("View as folder list")></option>
-<?%("COND:PREF", 1, "roomlistview", "table", "SELECTED", "")>
-</select>
-
-</form></li>
-</ul></div></div>
-
-<??("COND:PREF", 2, "roomlistview", "folders")>
 <div id="content" class="service">
 <table BORDER=0 WIDTH=96%% CELLPADDING=5>
 <?ITERATE("LKRA", ="knrooms_rooms")>
 </table>
-<??("X", 2)>
-
-<?!("COND:PREF", 3, "roomlistview", "folders")>
-<div id="content" class="service">
-<div class="box">
- <div class="boxlabel"><?_("Room Listing")></div>
-  <div class="boxcontent">
-   <div id="roomlist_knrooms"></div>
-  </div>
-</div>
-<?!("X", 3)>
-<script type="text/javascript">
-FillRooms(KNRoomsRoomList);
-</script>
-<?=("trailing")>

diff --git a/webcit/static/t/knrooms_rooms.html b/webcit/static/t/knrooms_rooms.html
index ceb7486c11421c7a17400781fe10de658040e79b..7c3978627c9c92128e8908f5bcf98d14a7174cd1 100644 (file)
--- a/webcit/static/t/knrooms_rooms.html
+++ b/webcit/static/t/knrooms_rooms.html
@@ -1,5 +1,18 @@
-<?!("COND:ITERATE:FIRSTN", 1)><tr><td valign=top><?=("beginbox_1")><?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")><?!("X", 1)>
-<?!("COND:ITERATE:ISGROUPCHANGE", 2)><?=("endbox")><br><?!("COND:ITERATE:ISGROUPCHANGE", 3, 2)></td><td valign=top> <?!("X", 3)><?=("beginbox_1")><?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")><?!("X", 2)>
+<?!("COND:ITERATE:FIRSTN", 1)>
+       <tr><td valign=top><?=("beginbox_1")>
+       <?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")>
+<?!("X", 1)>
+<?!("COND:ITERATE:ISGROUPCHANGE", 2)>
+       <?=("endbox")><br>
+       <?!("COND:ITERATE:ISGROUPCHANGE", 3, 2)>
+               </td><td valign=top>
+       <?!("X", 3)>
+       <?=("beginbox_1")>
+       <?ROOM:INFO:FLOOR:NAME><?=("beginbox_2")>
+<?!("X", 2)>
 &nbsp;<a href="dotgoto?room=<?ROOM:INFO:NAME("U")>"><span class="<?%("COND:ROOM:FLAG:UA", 4, #"UA_HASNEWMSGS", 0, "roomlist_new", "roomlist_old")>">
-<?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME></span></a><?%("COND:ROOM:INFO:IS_INBOX", 5, 0, 0, _"(INBOX)", "")><br>
-<?!("COND:ITERATE:LASTN", 2)><?=("endbox")></td></tr><??("X", 3)>
+<?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME></span></a>
+<?%("COND:ROOM:INFO:IS_INBOX", 5, 0, 0, _"(INBOX)", "")><br>
+<?!("COND:ITERATE:LASTN", 2)>
+       <?=("endbox")></td></tr>
+<??("X", 2)>