From 556b5fa554b200b1c85321e52bce2e5471d83e27 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Wed, 6 Jun 2007 15:44:57 +0000 Subject: - Use GetConfigDir instead of USRDIR define. - Unification of table markup (still needs some tweaking). - Adaption of styles.css to new table CSS classes. --- Makefile | 7 +- css/styles.css | 247 ++++++++++++++++++++++++++++++++----------- doc/ChangeLog | 16 +++ pages/content.ecpp | 2 +- pages/edit_searchtimer.ecpp | 157 ++++++++++++--------------- pages/edit_timer.ecpp | 75 +++++-------- pages/schedule.ecpp | 44 +++----- pages/searchepg.ecpp | 50 ++++----- pages/searchresults.ecpp | 39 +++---- pages/searchtimers.ecpp | 41 ++++--- pages/setup.ecpp | 54 ++++------ pages/timers.ecpp | 46 ++++---- pages/whats_on.ecpp | 55 +++++----- themes/redwine/css/theme.css | 6 +- 14 files changed, 441 insertions(+), 398 deletions(-) diff --git a/Makefile b/Makefile index b26662b..eea0727 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.41 2007/06/01 19:57:29 lordjaxom Exp $ +# $Id: Makefile,v 1.42 2007/06/06 15:44:57 tadi Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -33,7 +33,6 @@ LIBS += $(shell tntnet-config --libs) VDRDIR ?= ../../.. LIBDIR ?= ../../lib TMPDIR ?= /tmp -USRDIR ?= /usr/share/vdr-plugin-$(PLUGIN) ### Allow user defined options to overwrite defaults: @@ -52,7 +51,7 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR)/include -Ihttpd -DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DUSRDIR='"$(USRDIR)"' +DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' export DEFINES LIBS += httpd/libhttpd.a @@ -63,7 +62,7 @@ SUBDIRS = httpd pages css images javascript PLUGINOBJS = $(PLUGIN).o thread.o tntconfig.o setup.o i18n.o timers.o \ tools.o recordings.o tasks.o status.o epg_events.o epgsearch.o \ - grab.o md5.o filecache.o livefeatures.o + grab.o md5.o filecache.o livefeatures.o WEBLIBS = pages/libpages.a css/libcss.a images/libimages.a \ javascript/libjavascript.a diff --git a/css/styles.css b/css/styles.css index 2f89a67..0c23636 100644 --- a/css/styles.css +++ b/css/styles.css @@ -39,15 +39,51 @@ img { border: 0; } -/* ###################### +/* ######################### # global style properties - ###################### + ######################### */ .bold { font-weight: bold; } +/* ============================== + = Dotted Frame + ============================== +*/ + +.dotted { + border: 1px dotted #bbbbbb; + padding: 3px; + margin: 2px; + float: left; + background-color: #f3f3f3; +} + + +.title { + font-weight: bold; +} + +.short { + font-weight: normal; +} + +.more { + font-weight: bold; + cursor: pointer; +} + +.withmargin { + margin: 5px; +} + +.nomargin { + margin: 0px; +} + + /* ###################### # Tooltip style for hints ###################### @@ -160,8 +196,6 @@ div.menu form { } div.inhalt { - height: 200px; - width: 100% overflow: auto; padding: 10px; } @@ -190,11 +224,16 @@ div.pagemenu a { font-weight: bold; } +div.pagemenu a:hover { + text-decoration: underline; +} + div.pagemenu a.active { text-decoration: none; color: blue; font-weight: bold; } + div.pagemenu span { text-decoration: none; color: black; @@ -292,6 +331,7 @@ div#infobox div.st_controls div#infobox_channel_buttons { ####################### */ +/* NOT USED div.head_box_l { background-image: url(bg_header_l.png); background-position: top left; @@ -300,14 +340,18 @@ div.head_box_l { margin-bottom: 2ex; padding: 0; } +*/ +/* NOT USED div.head_box_m { background-image: url(bg_header_h.png); background-repeat: repeat-x; margin: 3px; padding: 0; } +*/ +/* NOT USED div.head_box_r { background-image: url(bg_header_r.png); background-position: top right; @@ -316,7 +360,9 @@ div.head_box_r { padding: 0; padding-left: 0.5em; } +*/ +/* NOT USED: table.head_box_text { color: #ffffff; font-weight: bold; @@ -324,7 +370,9 @@ table.head_box_text { margin: 0; height: 30px; } +*/ +/* NOT USED: button.smallbutton { width: 51px; height: 17px; @@ -338,6 +386,7 @@ button.smallbutton { text-align: center; cursor: pointer; } +*/ button.green { width: 100px; @@ -388,6 +437,32 @@ table td.buttonpanel { text-align: right; } +table td.toprow { +} + +table th.toprow { +} + +table td.bottomrow { + border-bottom: 1px solid black; +} + +table td.leftcol { + border-left: 1px solid black; +} + +table td.rightcol { + border-right: 1px solid black; +} + +table td.topaligned { + vertical-align: top; +} + +table td.padded { + padding: 3px 7px 3px 3px; +} + /* ################ # Event ################ @@ -426,7 +501,6 @@ div.station div div div { margin-left: 3px; padding-left: 5px; padding-top: 2px; - color: white; font-weight: bold; } @@ -498,6 +572,7 @@ div.info { div.progress { overflow: hidden; padding-right: 4px; + margin: 0px; } div.progress div { @@ -505,22 +580,6 @@ div.progress div { padding: 0px; } -div.title { - font-weight: bold; - margin: 5px; -} - -div.short { - font-weight: normal; - margin: 5px; -} - -div.more { - margin: 5px; - font-weight: bold; - cursor: pointer; -} - div.__progress { overflow: hidden; width: 100px; @@ -535,11 +594,72 @@ div.__progress div.__elapsed { } +/* ################################## + # table listing + # (this is used in listing tables) + ################################## +*/ + +table.listing { + padding: 0px; + margin: 0px; +} + +table.listing tr td { + background: url(bg_line.png) bottom repeat-x; + border-bottom: 1px solid #C0C1DA; +} + +table.listing tr td.action { + padding-left: 3px; + padding-right: 5px; +} + +table.listing tr td.leftcol { + padding-left: 7px; + padding-right: 5px; +} + +table.listing tr td.current { + color: blue; +} + +table.listing tr.head td { + color: white; + font-weight: bold; + margin: 0px; + padding: 0px; + border-bottom: 1px solid black; +} + +table.listing tr.description td { + font-weight: bold; + background: #E9EFFF; +} + +table.listing tr.spacer td { + height: 10px; + background: transparent; + border-top: 1px solid black; + border-bottom: 0px; +} + +table.listing a { + text-decoration: none; + color: black; + font-weight: bold; +} + +table.listing a:hover { + text-decoration: underline; +} + + /* ############# # Timers ############# */ - +/* NOT USED table.timers { padding: 0; margin: 0; @@ -577,6 +697,10 @@ table.timers a { font-weight: bold; } +table.timers a:hover { + text-decoration: underline; +} +*/ /* ############################## @@ -584,6 +708,7 @@ table.timers a { ############################## */ +/* NOT USED: table.schedule { margin: 10px 0 0 0 ; padding: 0; @@ -620,6 +745,7 @@ table.schedule div.more { font-weight: bold; cursor: pointer; } +*/ /* ############################## @@ -628,12 +754,13 @@ table.schedule div.more { */ div.boxheader { - margin: 0; - padding: 0; + margin: 0px; + padding: 0px; background: url(bg_box_l.png) top left no-repeat; } div.boxheader div { + margin: 0px; background: url(bg_box_r.png) top right no-repeat; } @@ -734,21 +861,6 @@ div.screenshot { margin-right: 20px; } -/* - ############################## - # Dotted Frame - ############################## -*/ - -div.dotted { - border: 1px dotted #bbbbbb; - padding: 3px; - margin: 2px; - float: left; - background-color: #f3f3f3; -} - - /* ############################## # Error widget @@ -782,42 +894,42 @@ table.error td.border { /* ############################## - # Edit Tables + # Formular Tables + # (are used in forms to group input elements) ############################## */ +/* 'formular' replaces 'edit' */ -table.edit { +table.formular { margin-top: 10px; } -table.edit tr td.head { - background: white; - color: white; - font-weight: bold; - margin: 0; - padding: 0; - border:none; -} - -table.edit tr td { +table.formular tr td { vertical-align: top; - padding: 6px 7px 6px 3px; vertical-align: middle; background: url(bg_line.png) bottom repeat-x; border-bottom: 1px solid #C0C1DA; } -table.edit tr td.label { - font-weight: bold; - vertical-align: top; +table.formular tr td.leftcol { + padding-left: 2px; } -table.edit tr.active { - background: #DEE6EE; +table.formular tr td.rightcol { + padding-right: 7px; +} + +table.formular tr td.label { + font-weight: bold; + vertical-align: top; } -table.edit td.blank { - background: none; +table.formular tr.head td { + background: white; + color: white; + font-weight: bold; + margin: 0; + padding: 0; border: none; } @@ -827,18 +939,16 @@ table.dependent { } table.dependent tr td { - background: none; + background: transparent; vertical-align: middle; } table.dependent tr td.title { - background: none; + background: transparent; vertical-align: top; } - div.dependent { - background-color: #DEE6EE; margin-top: 10px; padding: 6px 7px 6px 3px; } @@ -849,6 +959,7 @@ div.dependent { ############################## */ +/* NOT USED: table.searchresults { margin: 10px 0 0 0; padding: 0; @@ -893,6 +1004,12 @@ table.searchresults a { color: black; font-weight: bold; } + +table.searchresults a:hover { + text-decoration: underline; +} +*/ + /* ############################## # Login @@ -923,6 +1040,10 @@ div.about_box a { font-weight: bold; } +div.about_box a:hover { + text-decoration: underline; +} + div#aboutBox_tip { width: 45%; } diff --git a/doc/ChangeLog b/doc/ChangeLog index 12bd5a5..97ea096 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,19 @@ +2007-06-06 Dieter Hametner + + Use GetConfigDir instead of USRDIR define. + + * pages/*.ecpp: begin of unification of table markup. + Still needs some tweaking but the general framework + is in place. + * styles.css: Removed different table styles. + Added two general table styles: + - listing: for tables showing listings like + search results or schedules. + - formular: for tables used in input forms to + layout the input elements. + Added some general use styles, like 'bold', 'more', + 'withmargin', 'nomargin', 'short', 'title', 'dotted' + 2007-06-03 Dieter Hametner Added CSS based themeing support. For details please read diff --git a/pages/content.ecpp b/pages/content.ecpp index 8f3cbbb..1438790 100644 --- a/pages/content.ecpp +++ b/pages/content.ecpp @@ -26,7 +26,7 @@ reply.setContentType(mime); // FileCache::ptr_type f = LiveFileCache().get("/tmp/live/" + request.getPathInfo()); string path(request.getPathInfo()); -FileCache::ptr_type f = LiveFileCache().get(USRDIR "/" + path); +FileCache::ptr_type f = LiveFileCache().get(Plugin::GetConfigDirectory() + "/" + path); if (f.get() == 0) { return DECLINED; } diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp index 5d6fa9d..12fb250 100644 --- a/pages/edit_searchtimer.ecpp +++ b/pages/edit_searchtimer.ecpp @@ -457,24 +457,21 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
- - - +
<$ editsearchtimer ? tr("Edit search timer") : tr("New search timer") $>
+ + - - - - + + - - - + - - - - - + + - - - + - % if (extEPGInfos.size() > 0) { - - - +
<$ editsearchtimer ? tr("Edit search timer") : tr("New search timer") $>
<$ tr("Search term") $>:
<$ tr("Search term") $>:
<$ tr("Search mode" ) $>: +
<$ tr("Search mode" ) $>:
<$ tr("Match case") $>: id="matchcase"/>
<$ tr("Match case") $>:
 id="matchcase"/>
<$ tr("Search in") $>: +
<$ tr("Search in") $>:
/> @@ -519,26 +512,22 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
<$ tr("Use extended EPG info" ) $>: +
<$ tr("Use extended EPG info" ) $>:
 onclick="changeduseextepginfo(this)" id="useextepginfo"/>