From: Wilfried Göesgens Date: Tue, 10 Aug 2010 20:02:58 +0000 (+0000) Subject: * default-select the Current-view, not the default view X-Git-Tag: v8.01~937 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=a532dec235fa570e8504f9c8e7f009f989c2d15f * default-select the Current-view, not the default view --- diff --git a/webcit/roomops.c b/webcit/roomops.c index d63bfdd96..9fe1dcc27 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -1016,6 +1016,18 @@ int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP) return CheckThis == WCC->CurRoom.defview; } +int ConditionalThisRoomCurrView(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + long CheckThis; + + if (WCC == NULL) + return 0; + + CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0); + return CheckThis == WCC->CurRoom.view; +} + int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -3521,6 +3533,7 @@ InitModule_ROOMOPS RegisterNamespace("THISROOM:INFOTEXT", 1, 2, tmplput_CurrentRoomInfoText, NULL, CTX_NONE); RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE); RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE); + RegisterConditional(HKEY("COND:THISROOM:CURR_VIEW"), 0, ConditionalThisRoomCurrView, CTX_NONE); RegisterConditional(HKEY("COND:THISROOM:HAVE_PIC"), 0, ConditionalThisRoomXHavePic, CTX_NONE); RegisterConditional(HKEY("COND:THISROOM:HAVE_INFOTEXT"), 0, ConditionalThisRoomXHaveInfoText, CTX_NONE); RegisterNamespace("THISROOM:FILES:N", 0, 1, tmplput_CurrentRoomXNFiles, NULL, CTX_NONE); diff --git a/webcit/static/t/viewomatic.html b/webcit/static/t/viewomatic.html index f67ece539..3f6ce255f 100644 --- a/webcit/static/t/viewomatic.html +++ b/webcit/static/t/viewomatic.html @@ -5,25 +5,25 @@