From 6c1385f5a52b61a74626a099d2f62f4569730419 Mon Sep 17 00:00:00 2001
From: Sascha Volkenandt <sascha (at) akv-soft (dot) de>
Date: Fri, 25 May 2007 19:45:03 +0000
Subject: - added icon epgsearch - moved about_box to pageelems - fixed
 aboutbox without auth

---
 epgsearch.h          |  2 ++
 pages/menu.ecpp      | 28 ++--------------------------
 pages/pageelems.ecpp | 38 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/epgsearch.h b/epgsearch.h
index be8bf0c..3b23ef3 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -14,6 +14,8 @@ class SearchTimer;
 
 bool operator<( SearchTimer const& left, SearchTimer const& right );
 
+bool CheckEpgsearchVersion();
+
 class SearchTimer
 {
 public:
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index 16bd8a5..9002c04 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -46,8 +46,8 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 --- #>
 % if (LiveSetup().UseAuth()) {
 	| <a id="login" href="login.html?action=logout"><$ tr("Logout") $></a>
-	| <a<& tooltip.display domId=("aboutBox") &> href="#">?</a>
 % }
+	| <a<& tooltip.display domId=("aboutBox") &> href="#">?</a>
 </div>
 % if (!component.empty()) {
 <div class="pagemenu">
@@ -66,31 +66,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
  </div>
 </div>
 <div style="display:none;">
-	<div class="about_box" id="aboutBox">
-		<div class="station">
-			<div class="boxheader"><div><div><$ LIVESUMMARY $><& tooltip.close domId=("aboutBox") &></div></div></div>
-		</div>
-		<div class="about_content">
-		 	<div>
-				<div class="about_head"><div><div><$ tr("Authors") $></div></div></div>
-				<div class="about_left"><$ tr("Project leader:") $></div>
-				<div class="about_right">Thomas Keil</div>
-				<div class="about_left"><$ tr("Webserver:") $></div>
-				<div class="about_right">Sascha Volkenandt</div>
-				<div class="about_left"><$ tr("Content:") $></div>
-				<div class="about_right">Dieter Hametner</div>
-				<div class="about_left"><$ tr("Content:") $></div>
-				<div class="about_right">Christian Wieninger</div>
-				<div class="about_left"><$ tr("Graphics:") $></div>
-				<div class="about_right">Michi Brückner</div>
-				<div class="about_head"><div><div><$ tr("Information") $></div></div></div>
-				<div class="about_left"><$ tr("LIVE version:") $></div>
-				<div class="about_right"><$ LIVEVERSION $></div>
-				<div class="about_left"><$ tr("VDR version:") $></div>
-				<div class="about_right"><$ VDRVERSION $></div>
-			</div>
-		</div>
-	</div>
+	<& pageelems.about_tt_box &>
 </div>
 % }
 
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index e12f9dc..652af3b 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -2,9 +2,11 @@
 #include <string>
 #include <vdr/menu.h>
 #include <vdr/epg.h>
-#include "tools.h"
+#include "epgsearch.h"
 #include "i18n.h"
+#include "setup.h"
 #include "timers.h"
+#include "tools.h"
 
 using namespace std;
 using namespace vdrlive;
@@ -165,3 +167,37 @@ using namespace vdrlive;
 	</div>
 </%def>
 
+<%def about_tt_box>
+	<div class="about_box" id="aboutBox">
+		<div class="station">
+			<div class="boxheader"><div><div><$ LIVESUMMARY $><& tooltip.close domId=("aboutBox") &></div></div></div>
+		</div>
+		<div class="about_content">
+		 	<div>
+				<div class="about_head"><div><div><$ tr("Authors") $></div></div></div>
+				<div class="about_left"><$ tr("Project leader:") $></div>
+				<div class="about_right">Thomas Keil</div>
+				<div class="about_left"><$ tr("Webserver:") $></div>
+				<div class="about_right">Sascha Volkenandt</div>
+				<div class="about_left"><$ tr("Content:") $></div>
+				<div class="about_right">Dieter Hametner</div>
+				<div class="about_left"><$ tr("Content:") $></div>
+				<div class="about_right">Christian Wieninger</div>
+				<div class="about_left"><$ tr("Graphics:") $></div>
+				<div class="about_right">Michi Brückner</div>
+				<div class="about_head"><div><div><$ tr("Information") $></div></div></div>
+				<div class="about_left"><$ tr("LIVE version:") $></div>
+				<div class="about_right"><$ LIVEVERSION $></div>
+				<div class="about_left"><$ tr("VDR version:") $></div>
+				<div class="about_right"><$ VDRVERSION $></div>
+				<div class="about_left"><$ tr("Features:") $></div>
+				<div class="about_right">
+<{
+					bool hasEpgsearch = CheckEpgsearchVersion();
+}>
+					<img align="center" src="<$ hasEpgsearch ? "" : "in" $>active.png"/> EPGsearch (<a href="http://freenet-homepage.de/cwieninger/html/vdr-epg-search.html" target="_blank">Homepage</a>)<br/>
+				</div>
+			</div>
+		</div>
+	</div>
+</%def>
-- 
cgit v1.2.3