From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 9 Aug 2010 21:13:39 +0000 (+0000)
Subject: * fix ROOM:INFO:PRINT_NAME
X-Git-Tag: v8.01~943
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9bebe8a4ce2d41e7730759ddc9fedd35d36625b8

* fix ROOM:INFO:PRINT_NAME
* add the_mgt's templatizations to roombanner.html
---

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index c692236f0..f4edff91b 100644
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -527,6 +527,14 @@ void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP)
 {
 	folder *Folder = (folder *)CTX;
 
+	if (Folder == NULL)
+	{
+		wcsession *WCC = WC;
+
+		if (WCC == NULL)
+			return;
+		Folder = &WCC->CurRoom;
+	}
 	StrBufAppendTemplate(Target, TP, Folder->name, 0);
 }
 void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) 
@@ -838,7 +846,7 @@ InitModule_ROOMLIST
 
 	RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);/// TODO!
+	RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_NONE);
 	RegisterNamespace("ROOM:INFO:BASENAME", 0, 1, tmplput_ROOM_BASENAME, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:LEVELNTIMES", 1, 2, tmplput_ROOM_LEVEL_N_TIMES, NULL, CTX_ROOMS);
 
diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 7bcee6b6b..c7963fec1 100644
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -2,22 +2,27 @@
 <div class="banner" id="room_banner">
 	<table border=0><tr>
 		<td><?=("room_view_picture")></td>
+
 		<td>
-			<h1 id="rmname"><?ROOMNAME></h1>
-			<?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")>
-				<h2><?BSTR("page")></h2>
-			<?!("X", 7)>
-			<??("COND:ROOM:TYPE_IS", 8, #"VIEW_WIKI")>
-				<p id="nummsgs"><?NUMMSGS></p>
+			<h1 id="rmname"><?ROOM:INFO:PRINT_NAME("X")></h1>
+			<?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")><h2><?BSTR("page")></h2><?!("X", 7)>
+			<??("COND:ROOM:TYPE_IS", 8, #"VIEW_WIKI")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p>
+				<?!("COND:THISROOM:FLAG:QR", 9, #"QR_DIRECTORY")><?!("COND:THISROOM:FLAG:QR", 10, #"QR_VISDIR")>
+						<p id="numfiles"><a href="do_template?template=files"><?THISROOM:FILES:N> <?THISROOM:FILES:STR></a></p>
+				<?!("X", 10)><?!("X", 9)>
 			<?!("X", 8)>
 		</td>
 		<td><?=("readinfo")></td>
 		<td id="actiondiv">
 			<ul class="room_actions">
-				<li class="start_page"><?START></li>
+				<li class="start_page"><?OFFERSTARTPAGE></li>
 				<li class="search" id="searchomatic"><?=("searchomatic")></li>
 				<li class="view"><?=("viewomatic")></li>
-				<??("COND:SUBST", 1, "WCVIEW", "1")><li class="hidden" id="selectpage"><?_("Select page: ")> <select id="summpage"><option> </option></select></li><??("X",1)>
+				<??("COND:SUBST", 1, "WCVIEW", "1")>
+					<li class="hidden" id="selectpage">
+						<?_("Select page: ")> <select id="summpage"><option> </option></select>
+					</li>
+				<??("X",1)>
 			</ul>
 		</td>
 	</tr></table>