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. --- i18n-generated.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ pages/recordings.ecpp | 20 +++++++++++---- po/ca_ES.po | 6 +++++ po/cs_CZ.po | 6 +++++ po/da_DK.po | 6 +++++ po/de_DE.po | 6 +++++ po/el_GR.po | 6 +++++ po/es_ES.po | 6 +++++ po/et_EE.po | 6 +++++ po/fi_FI.po | 6 +++++ po/fr_FR.po | 6 +++++ po/hr_HR.po | 6 +++++ po/hu_HU.po | 6 +++++ po/it_IT.po | 6 +++++ po/lt_LT.po | 6 +++++ po/nl_NL.po | 6 +++++ po/nn_NO.po | 6 +++++ po/pl_PL.po | 6 +++++ po/pt_PT.po | 6 +++++ po/ro_RO.po | 6 +++++ po/ru_RU.po | 6 +++++ po/sl_SI.po | 6 +++++ po/sv_SE.po | 6 +++++ po/tr_TR.po | 6 +++++ 24 files changed, 217 insertions(+), 5 deletions(-) diff --git a/i18n-generated.h b/i18n-generated.h index e1c4503..01b7a70 100644 --- a/i18n-generated.h +++ b/i18n-generated.h @@ -8197,6 +8197,76 @@ const tI18nPhrase Phrases[] = { #if VDRVERSNUM >= 10342 "", #endif +#if VDRVERSNUM >= 10502 + "", +#endif + }, + { "Filter:", + "Filter:", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", +#if VDRVERSNUM >= 10302 + "", +#endif +#if VDRVERSNUM >= 10307 + "", +#endif +#if VDRVERSNUM >= 10313 + "", +#endif +#if VDRVERSNUM >= 10316 + "", +#endif +#if VDRVERSNUM >= 10342 + "", +#endif +#if VDRVERSNUM >= 10502 + "", +#endif + }, + { "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).", + "Suche in Aufname-Titel und Untertitel nach dem angegebenen Wort und zeige nur die zutreffenden an. Es sind auch Perl kompatible Reguläre Ausdrücke (PCRE) erlaubt.", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", +#if VDRVERSNUM >= 10302 + "", +#endif +#if VDRVERSNUM >= 10307 + "", +#endif +#if VDRVERSNUM >= 10313 + "", +#endif +#if VDRVERSNUM >= 10316 + "", +#endif +#if VDRVERSNUM >= 10342 + "", +#endif #if VDRVERSNUM >= 10502 "", #endif 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> } diff --git a/po/ca_ES.po b/po/ca_ES.po index 2a0b2ef..bcfd4e1 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -724,6 +724,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 492fbbf..e9ab3af 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 1876339..4ca315b 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 1a98f89..6254db2 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -725,6 +725,12 @@ msgstr "Sortiere nach Name" msgid "Sort by date" msgstr "Sortiere nach Datum" +msgid "Filter:" +msgstr "Filter:" + +msgid "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)." +msgstr "Suche in Aufname-Titel und Untertitel nach dem angegebenen Wort und zeige nur die zutreffenden an. Es sind auch Perl kompatible Reguläre Ausdrücke (PCRE) erlaubt." + msgid "Delete this recording from hard disc!" msgstr "Diese Aufnahme von der Festplatte löschen!" diff --git a/po/el_GR.po b/po/el_GR.po index c43fc38..7388e84 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 50b2d58..a7053ed 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index 0982133..3e9418d 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 5419323..7ce354a 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -722,6 +722,12 @@ msgstr "Järjestä nimen mukaan" msgid "Sort by date" msgstr "Järjestä päivämäärän mukaan" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "Poista tallenne kovalevyltä!" diff --git a/po/fr_FR.po b/po/fr_FR.po index 2f3db04..d28362d 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -744,6 +744,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/hr_HR.po b/po/hr_HR.po index 2e08441..d52811c 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 26d5af3..4bfebd8 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index d2e5b5f..0994646 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -729,6 +729,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "Elimina questa registrazione dal disco fisso!" diff --git a/po/lt_LT.po b/po/lt_LT.po index 79e2b77..8eb0b31 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -724,6 +724,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "IÅ¡trinti šį įraÅ¡Ä… iÅ¡ disko!" diff --git a/po/nl_NL.po b/po/nl_NL.po index 341b8e9..8bccbdb 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -739,6 +739,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index b37bbbd..f2c397b 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 9dc316b..a4b6f8c 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 500f2a3..9551c5a 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index a53bd2c..f4928e7 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 691016f..e74b1a6 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -722,6 +722,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 058f642..c99d9d1 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 353bae0..523f9a8 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 1c9d723..fc3df00 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -723,6 +723,12 @@ msgstr "" msgid "Sort by date" msgstr "" +msgid "Filter:" +msgstr "" + +msgid "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)." +msgstr "" + msgid "Delete this recording from hard disc!" msgstr "" -- cgit v1.2.3