From 28b010f7b934f1ad7ed9af1eb7ab35d50a9277cd Mon Sep 17 00:00:00 2001 From: prozacx Date: Tue, 23 Feb 2010 06:09:21 +0000 Subject: [PATCH] Renamed GetWebNavTitle() to GetWebMenuTitle() to keep in line with the name of the Menu.tmpl file git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1787 726aef4b-f618-498e-8847-2d620e286838 --- Modules.h | 2 +- WebModules.cpp | 4 ++-- modules/notes.cpp | 2 +- modules/webadmin.cpp | 2 +- modules/webchat.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules.h b/Modules.h index a47d1945..65889d39 100644 --- a/Modules.h +++ b/Modules.h @@ -275,7 +275,7 @@ public: // For handling web traffic virtual bool WebRequiresLogin() { return true; } virtual bool WebRequiresAdmin() { return false; } - virtual CString GetWebNavTitle() { return ""; } + virtual CString GetWebMenuTitle() { return ""; } virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl); virtual void AddSubPage(TWebSubPage spSubPage) { m_vSubPages.push_back(spSubPage); } virtual void ClearSubPages() { m_vSubPages.clear(); } diff --git a/WebModules.cpp b/WebModules.cpp index 3f5f54e9..a13749f7 100644 --- a/WebModules.cpp +++ b/WebModules.cpp @@ -260,7 +260,7 @@ void CWebSock::SetVars() { } bool CWebSock::AddModLoop(const CString& sLoopName, CModule& Module) { - CString sTitle(Module.GetWebNavTitle()); + CString sTitle(Module.GetWebMenuTitle()); DEBUG("=== === === === === [" + Module.GetModName() + "] [" + CString(IsLoggedIn()) + "]"); @@ -341,7 +341,7 @@ bool CWebSock::PrintTemplate(const CString& sPageName, CString& sPageRet, CModul m_Template["ModName"] = pModule->GetModName(); if (m_Template.find("Title") == m_Template.end()) { - m_Template["Title"] = pModule->GetWebNavTitle(); + m_Template["Title"] = pModule->GetWebMenuTitle(); } } diff --git a/modules/notes.cpp b/modules/notes.cpp index b9532be3..045297de 100644 --- a/modules/notes.cpp +++ b/modules/notes.cpp @@ -31,7 +31,7 @@ public: virtual bool WebRequiresLogin() { return true; } virtual bool WebRequiresAdmin() { return false; } - virtual CString GetWebNavTitle() { return "Notes"; } + virtual CString GetWebMenuTitle() { return "Notes"; } virtual void OnClientLogin() { ListNotes(true); diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index 21beedbd..a7f59223 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -220,7 +220,7 @@ public: virtual bool WebRequiresLogin() { return true; } virtual bool WebRequiresAdmin() { return false; } - virtual CString GetWebNavTitle() { return "webadmin"; } + virtual CString GetWebMenuTitle() { return "webadmin"; } virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl) { std::cerr << "=============================== webadmin sPageName=[" << sPageName << "]" << std::endl; diff --git a/modules/webchat.cpp b/modules/webchat.cpp index 2dcbdf4d..538c9aea 100644 --- a/modules/webchat.cpp +++ b/modules/webchat.cpp @@ -31,7 +31,7 @@ public: virtual bool WebRequiresLogin() { return true; } virtual bool WebRequiresAdmin() { return false; } - virtual CString GetWebNavTitle() { return "webchat"; } + virtual CString GetWebMenuTitle() { return "webchat"; } virtual VWebSubPages& GetSubPages() { ClearSubPages();