diff options
| -rw-r--r-- | live/themes/orange-blue/css/theme.css | 9 | ||||
| -rw-r--r-- | pages/content.ecpp | 11 | ||||
| -rw-r--r-- | tntconfig.cpp | 5 |
3 files changed, 11 insertions, 14 deletions
diff --git a/live/themes/orange-blue/css/theme.css b/live/themes/orange-blue/css/theme.css index ea36b43..697642a 100644 --- a/live/themes/orange-blue/css/theme.css +++ b/live/themes/orange-blue/css/theme.css @@ -22,18 +22,9 @@ select { } a { - text-decoration: none; color: #F5EE74; } -a:hover { - text-decoration: underline; -} - -a:active { - text-decoration: underline; -} - /* ###################### # Tooltip style for hints ###################### diff --git a/pages/content.ecpp b/pages/content.ecpp index ec6f5b8..5f1780a 100644 --- a/pages/content.ecpp +++ b/pages/content.ecpp @@ -24,14 +24,17 @@ reply.setContentType(mime); // dsyslog("vdrlive::content::mimetype(%s)", mime.c_str()); // FileCache::ptr_type f = LiveFileCache().get("/tmp/live/" + request.getPathInfo()); -string path(request.getPathInfo()); +string const path(request.getPathInfo()); FileCache::ptr_type f; -if (path.find(LiveSetup().GetEpgImageDir()) != 0) - f = LiveFileCache().get(Plugin::GetConfigDirectory() + "/" + path); -else +string const epgImgPath(LiveSetup().GetEpgImageDir()); +if (!epgImgPath.empty() && path.find(epgImgPath) != string::npos) { f = LiveFileCache().get(path); +} +else { + f = LiveFileCache().get(Plugin::GetConfigDirectory() + "/" + path); +} if (f.get() == 0) { return DECLINED; diff --git a/tntconfig.cpp b/tntconfig.cpp index 286ada7..fc4217b 100644 --- a/tntconfig.cpp +++ b/tntconfig.cpp @@ -50,7 +50,10 @@ void TntConfig::WriteConfig() file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) $2@" << endl; // Epg images - file << "MapUrl ^/epgimages/(.*)\\.(.+) content@ " << LiveSetup().GetEpgImageDir() << "/$1.$2 image/$2" << endl; + string const epgImgPath(LiveSetup().GetEpgImageDir()); + if (!epgImgPath.empty()) { + file << "MapUrl ^/epgimages/(.*)\\.(.+) content@ " << epgImgPath << "/$1.$2 image/$2" << endl; + } // select additional (not build in) javascript. file << "MapUrl ^/js([^.]*/)(.*\\.js) content@ js$1$2 text/javascript" << endl; |