From 83846aaac46b506b0f20a4d459f50673059ad447 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Tue, 9 Jan 2007 19:35:25 +0000 Subject: made logo xhtml conform. Use one logo-component defined in pageelems --- pages/edit_timer.ecpp | 4 ++-- pages/error.ecpp | 2 +- pages/pageelems.ecpp | 3 +++ pages/recordings.ecpp | 8 ++++---- pages/remote.ecpp | 4 ++-- pages/schedule.ecpp | 2 +- pages/timers.ecpp | 2 +- pages/whats_on.ecpp | 8 +++----- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index df26c6b..5772f9f 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -93,8 +93,8 @@ using namespace vdrlive;
- VDR Live! -<& menu > + <& pageelems.logo &> + <& menu >
diff --git a/pages/error.ecpp b/pages/error.ecpp index 2ca1333..24c971c 100644 --- a/pages/error.ecpp +++ b/pages/error.ecpp @@ -15,7 +15,7 @@
- VDR Live! + <& pageelems.logo &> <& menu >
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 1ab95da..3b04303 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -1,6 +1,9 @@ <%def doc_type> +<%def logo> + + <%def header_box> <%args> content[]; diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 8b0c068..d8672d4 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -27,17 +27,17 @@ RecordingsTree recordingsTree;
- VDR Live! -<& menu &> + <& pageelems.logo &> + <& menu &>
-<& pageelems.header_box content=(tr("Recordings")) &> + <& pageelems.header_box content=(tr("Recordings")) &> % if (Recordings.Count() == 0) { Keine Aufnahmen vorhanden % } else {
-<& recordings.recordings_item &> + <& recordings.recordings_item &>
% }
diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 460d859..0926052 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -106,8 +106,8 @@ using namespace vdrlive;
- VDR Live! -<& menu > + <& pageelems.logo &> + <& menu >
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 416842c..b8be6ad 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -48,7 +48,7 @@ cChannel* Channel;
- VDR Live! + <& pageelems.logo &> <& menu >
diff --git a/pages/timers.ecpp b/pages/timers.ecpp index e43ba7e..97adafa 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -21,7 +21,7 @@ using namespace vdrlive;
- VDR Live! + <& pageelems.logo &> <& menu >
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 2c66a02..25586a4 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -40,14 +40,12 @@ if (type == "now") {
- -<& menu > + <& pageelems.logo &> + <& menu >
-
-<& pageelems.header_box content=(head) &> - + <& pageelems.header_box content=(head) &> <{ ReadLock channelsLock( Channels ); if (channelsLock) { -- cgit v1.2.3