From cc286c602ffbaed4f8e6d92e50138600c142b69f Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 20 Feb 2011 01:07:02 +0100 Subject: Moved recordings filter input box into the actions area of the recordings page. This ensures a consistent look and feel like on other pages in LIVE. --- pages/recordings.ecpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'pages') diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 48455dd..88678c1 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -35,6 +35,7 @@ using namespace std; <%request scope="page"> string currentSort; string deleteResult; + string currentFilter; <%include>page_init.eh <%cpp> @@ -48,6 +49,7 @@ if (!sort.empty()) { currentSort = (currentSort == "nameasc") ? "namedesc" : "nameasc"; LiveSetup().SetLastSortingMode(currentSort); } +currentFilter = filter; pageTitle = tr("Recordings"); @@ -79,6 +81,13 @@ diskinfo = cString::sprintf("%s %d%% - %2d:%02d %s", trVDR("Disk"), Percent, H <& pageelems.stylesheets &> <& pageelems.ajax_js &> + <& pageelems.logo &> @@ -105,12 +114,11 @@ if (!deleteResult.empty()) {
    -<& recordings.recordings_item filter=(filter) &> +<& recordings.recordings_item filter=(currentFilter) &>
-
<%cpp> @@ -211,10 +219,12 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) { <%def sort_options> <%cpp> { -<$ tr("Sort by name") $> +" alt="" /><$ tr("Sort by name") $> +| +" alt="" /><$ tr("Sort by date") $> | -<$ tr("Sort by date") $> -
+<$ tr("Filter:") $>  + <& tooltip.help text=(tr("Look in recordings titles and subtitles for the given string and display only the matching ones. You may also use perl compatible regular expressions (PCRE).")) &> <%cpp> } -- cgit v1.2.3