summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--css/styles.css30
-rw-r--r--pages/Makefile2
-rw-r--r--pages/whats_on.ecpp5
-rw-r--r--tntconfig.cpp2
4 files changed, 37 insertions, 2 deletions
diff --git a/css/styles.css b/css/styles.css
index 2c528e8..78a2b02 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -309,6 +309,21 @@ button.red {
padding-bottom: 3px;
}
+button.blue {
+ width: 100px;
+ height: 20px;
+ background-color: inherit;
+ background-image: url(button_blue.png);
+ background-repeat: no-repeat;
+ color: #FFFFFF;
+ font-size: 11px;
+ border: 0px;
+ vertical-align: middle;
+ text-align: center;
+ cursor: pointer;
+ padding-bottom: 3px;
+}
+
table td.buttonpanel {
text-align: right;
}
@@ -743,3 +758,18 @@ table.searchresults td.border {
margin: 0;
width: 1px;
}
+
+/*
+ ##############################
+ # Login
+ ##############################
+*/
+
+table.login {
+ margin: 0 auto;;
+}
+
+table.login tr td {
+ padding: 3px 5px;
+ vertical-align: right;
+}
diff --git a/pages/Makefile b/pages/Makefile
index 65bd658..3d8c541 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -20,7 +20,7 @@ OBJS = menu.o channels.o recordings.o schedule.o \
keypress.o remote.o channels_widget.o edit_timer.o \
error.o pageelems.o tooltip.o play_recording.o \
searchtimers.o infobox.o edit_searchtimer.o \
- searchresults.o
+ searchresults.o login.o
### Default rules:
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index e24aca5..daf09d4 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -15,8 +15,13 @@ using namespace vdrlive;
<%args>
type = "now";
</%args>
+<%session scope="global">
+bool logged_in(false);
+</%session>
<%include>page_init.eh</%include>
<{
+if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
+
cSchedulesLock schedulesLock;
const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
diff --git a/tntconfig.cpp b/tntconfig.cpp
index f304fce..596ff6e 100644
--- a/tntconfig.cpp
+++ b/tntconfig.cpp
@@ -34,7 +34,7 @@ void TntConfig::WriteConfig()
}
// XXX modularize
- file << "MapUrl ^/$ whats_on@" << endl;
+ file << "MapUrl ^/$ login@" << endl;
file << "MapUrl /([^.]+)(\\..+)? $1@" << endl;
file << "PropertyFile " << m_propertiesPath << endl;