From: <mas...@us...> - 2008-01-04 14:36:16
|
Revision: 54 http://mp-webinterface.svn.sourceforge.net/mp-webinterface/?rev=54&view=rev Author: maschine Date: 2008-01-04 06:35:55 -0800 (Fri, 04 Jan 2008) Log Message: ----------- Adding the search page (currently design only, no function behind it). Modified Paths: -------------- trunk/Version2/Web App/MPW/App_GlobalResources/Resource.de.resx trunk/Version2/Web App/MPW/App_GlobalResources/Resource.resx trunk/Version2/Web App/MPW/MPW.master trunk/Version2/Web App/MPW/css/mpw_style.css Added Paths: ----------- trunk/Version2/Web App/MPW/Search.aspx trunk/Version2/Web App/MPW/Search.aspx.cs Property Changed: ---------------- trunk/Version2/Web App/MPW/TVLogos/ trunk/Version2/Windows Apps/ Modified: trunk/Version2/Web App/MPW/App_GlobalResources/Resource.de.resx =================================================================== --- trunk/Version2/Web App/MPW/App_GlobalResources/Resource.de.resx 2007-11-20 21:45:20 UTC (rev 53) +++ trunk/Version2/Web App/MPW/App_GlobalResources/Resource.de.resx 2008-01-04 14:35:55 UTC (rev 54) @@ -120,6 +120,10 @@ <data name="ChannelGroup" xml:space="preserve"> <value>Programmgruppe</value> </data> + <data name="customtime" xml:space="preserve"> + <value>Zeit angeben</value> + <comment>Search by date options</comment> + </data> <data name="Daily" xml:space="preserve"> <value>Täglich</value> <comment>ScheduleType</comment> @@ -154,10 +158,18 @@ <value>Jetzt & Gleich</value> <comment>Navigation</comment> </data> + <data name="nowontv" xml:space="preserve"> + <value>Jetzt im TV</value> + <comment>Search by date options</comment> + </data> <data name="Once" xml:space="preserve"> <value>Einmalig</value> <comment>ScheduleType</comment> </data> + <data name="primetimeshows" xml:space="preserve"> + <value>Heute zur Primetime</value> + <comment>Search by date options</comment> + </data> <data name="Record" xml:space="preserve"> <value>Aufnehmen!</value> </data> @@ -185,6 +197,29 @@ <value>Suchen</value> <comment>Navigation</comment> </data> + <data name="searchbydate" xml:space="preserve"> + <value>nach Datum</value> + <comment>Search Type</comment> + </data> + <data name="searchbygenre" xml:space="preserve"> + <value>nach Genre</value> + <comment>Search Type</comment> + </data> + <data name="searchbytext" xml:space="preserve"> + <value>nach Text</value> + <comment>Search Type</comment> + </data> + <data name="searchindescription" xml:space="preserve"> + <value>Im Titel suchen</value> + <comment>Search by text options</comment> + </data> + <data name="searchintitle" xml:space="preserve"> + <value>In der Beschreibung suchen</value> + <comment>Search by text options</comment> + </data> + <data name="searchresults" xml:space="preserve"> + <value>Suchergebnisse</value> + </data> <data name="Update" xml:space="preserve"> <value>Aktualisieren</value> </data> Modified: trunk/Version2/Web App/MPW/App_GlobalResources/Resource.resx =================================================================== --- trunk/Version2/Web App/MPW/App_GlobalResources/Resource.resx 2007-11-20 21:45:20 UTC (rev 53) +++ trunk/Version2/Web App/MPW/App_GlobalResources/Resource.resx 2008-01-04 14:35:55 UTC (rev 54) @@ -120,6 +120,10 @@ <data name="ChannelGroup" xml:space="preserve"> <value>Programmgruppe</value> </data> + <data name="customtime" xml:space="preserve"> + <value>Custom time</value> + <comment>Search by date options</comment> + </data> <data name="Daily" xml:space="preserve"> <value>Daily</value> <comment>ScheduleType</comment> @@ -157,6 +161,10 @@ <value>Now & Next</value> <comment>Navigation</comment> </data> + <data name="nowontv" xml:space="preserve"> + <value>What's now on TV</value> + <comment>Search by date options</comment> + </data> <data name="Once" xml:space="preserve"> <value>Once</value> <comment>ScheduleType</comment> @@ -164,6 +172,10 @@ <data name="PageTitle" xml:space="preserve"> <value>MPW - The MediaPortal Webinterface</value> </data> + <data name="primetimeshows" xml:space="preserve"> + <value>Today's primetime shows</value> + <comment>Search by date options</comment> + </data> <data name="Record" xml:space="preserve"> <value>Record!</value> </data> @@ -191,6 +203,29 @@ <value>Search</value> <comment>Navigation</comment> </data> + <data name="searchbydate" xml:space="preserve"> + <value>by date</value> + <comment>Search Type</comment> + </data> + <data name="searchbygenre" xml:space="preserve"> + <value>by genre</value> + <comment>Search Type</comment> + </data> + <data name="searchbytext" xml:space="preserve"> + <value>by text</value> + <comment>Search Type</comment> + </data> + <data name="searchindescription" xml:space="preserve"> + <value>Search in title</value> + <comment>Search by text options</comment> + </data> + <data name="searchintitle" xml:space="preserve"> + <value>Search in description</value> + <comment>Search by text options</comment> + </data> + <data name="searchresults" xml:space="preserve"> + <value>Search results</value> + </data> <data name="Update" xml:space="preserve"> <value>Update</value> </data> Modified: trunk/Version2/Web App/MPW/MPW.master =================================================================== --- trunk/Version2/Web App/MPW/MPW.master 2007-11-20 21:45:20 UTC (rev 53) +++ trunk/Version2/Web App/MPW/MPW.master 2008-01-04 14:35:55 UTC (rev 54) @@ -36,22 +36,37 @@ <asp:HyperLink ID="LinkGuide" runat="server" Text="<%$ Resources:Resource, Guide %>" NavigateUrl="~/Default.aspx" CssClass="navilink"></asp:HyperLink> </td> + <td id="bar1"> + | + </td> <td id="nav_now" class="navcell"> <asp:HyperLink ID="LinkNowNext" runat="server" Text="<%$ Resources:Resource, NowNext %>" NavigateUrl="~/NowNext.aspx" CssClass="navilink"></asp:HyperLink> </td> + <td id="bar2"> + | + </td> <td id="nav_search" class="navcell"> <asp:HyperLink ID="LinkSearch" runat="server" Text="<%$ Resources:Resource, Search %>" - NavigateUrl="~/Default.aspx" CssClass="navilink"></asp:HyperLink> + NavigateUrl="~/Search.aspx" CssClass="navilink"></asp:HyperLink> </td> + <td id="bar3"> + | + </td> <td id="nav_sched" class="navcell"> <asp:HyperLink ID="LinkSchedules" runat="server" Text="<%$ Resources:Resource, Schedules %>" NavigateUrl="~/Schedules.aspx" CssClass="navilink"></asp:HyperLink> </td> + <td id="bar4"> + | + </td> <td id="nav_rec" class="navcell"> <asp:HyperLink ID="LinkRecordings" runat="server" Text="<%$ Resources:Resource, Recordings %>" NavigateUrl="~/Default.aspx" CssClass="navilink"></asp:HyperLink> </td> + <td id="bar5"> + | + </td> <td id="nav_live" class="navcell"> <asp:HyperLink ID="LinkLiveTV" runat="server" Text="<%$ Resources:Resource, LiveTV %>" NavigateUrl="~/Default.aspx" CssClass="navilink"></asp:HyperLink> Added: trunk/Version2/Web App/MPW/Search.aspx =================================================================== --- trunk/Version2/Web App/MPW/Search.aspx (rev 0) +++ trunk/Version2/Web App/MPW/Search.aspx 2008-01-04 14:35:55 UTC (rev 54) @@ -0,0 +1,55 @@ +<%@ Page Language="C#" MasterPageFile="~/MPW.master" AutoEventWireup="true" CodeFile="Search.aspx.cs" + Inherits="_Default" Title="Search" %> + +<asp:Content ID="Content_search" ContentPlaceHolderID="MPWContent" runat="Server"> + <h1> + <asp:Label ID="label_search" runat="server" Text="<%$ Resources:Resource, Search %>"></asp:Label></h1> + <div style="line-height: 25px; float: left; width: 250px;"> + <strong> + <asp:Label ID="label_searchbydate" runat="server" Text="<%$ Resources:Resource, searchbydate %>"></asp:Label></strong> + <br /> + <asp:RadioButton ID="radio_searchbydate1" runat="server" Checked="True" /> + <asp:Label ID="label_searchbydate1" runat="server" Text="<%$ Resources:Resource, primetimeshows %>"></asp:Label> + <br /> + <asp:RadioButton ID="radio_searchbydate2" runat="server" /> + <asp:Label ID="label_searchbydate2" runat="server" Text="<%$ Resources:Resource, nowontv %>"></asp:Label> + <br /> + <asp:RadioButton ID="radio_searchbydate3" runat="server" /> + <asp:Label ID="label_searchbydate3" runat="server" Text="<%$ Resources:Resource, customtime %>"></asp:Label> + <br /> + <asp:Button ID="button_searchbydate" runat="server" Text="<%$ Resources:Resource, Search %>" /> + </div> + <div style="line-height: 25px; float: left; width: 250px;"> + <strong> + <asp:Label ID="label_searchtext" runat="server" Text="<%$ Resources:Resource, searchbytext %>"></asp:Label></strong> + <br /> + <asp:CheckBox ID="check_searchintitle" runat="server" Checked="True" /> + <asp:Label ID="label_searchintitle" runat="server" Text="<%$ Resources:Resource, searchintitle %>">"></asp:Label> + <br /> + <asp:CheckBox ID="check_searchindescription" runat="server" Checked="True" /> + <asp:Label ID="label_searchindescription" runat="server" Text="<%$ Resources:Resource, searchindescription %>">"></asp:Label> + <br /> + <asp:TextBox ID="field_searchtext" runat="server"></asp:TextBox> + <br /> + <asp:Button ID="button_searchtext" runat="server" Text="<%$ Resources:Resource, Search %>" /> + </div> + <div style="line-height: 25px; float: left; width: 250px;"> + <strong> + <asp:Label ID="label_searchbygenre" runat="server" Text="<%$ Resources:Resource, searchbygenre %>"></asp:Label></strong> + <br /> + <asp:DropDownList ID="dropdown_searchbygenre" runat="server"> + </asp:DropDownList> + <br /> + <asp:Button ID="button_searchbygenre" runat="server" Text="<%$ Resources:Resource, Search %>" /> + </div> + <div style="clear: both;"></div> + <h1> + <asp:Label ID="label_searchresults" runat="server" Text="<%$ Resources:Resource, searchresults %>"></asp:Label></h1> + <asp:UpdatePanel ID="GuideUpdatePanel" runat="server" UpdateMode="Conditional"> + <contenttemplate> + 123 + </contenttemplate> + <triggers> + </triggers> + </asp:UpdatePanel> +</asp:Content> Added: trunk/Version2/Web App/MPW/Search.aspx.cs =================================================================== --- trunk/Version2/Web App/MPW/Search.aspx.cs (rev 0) +++ trunk/Version2/Web App/MPW/Search.aspx.cs 2008-01-04 14:35:55 UTC (rev 54) @@ -0,0 +1,22 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +using MPW; +using TvDatabase; + +public partial class _Default : System.Web.UI.Page +{ + + protected void Page_Load(object sender, EventArgs e) + { + + } +} Property changes on: trunk/Version2/Web App/MPW/TVLogos ___________________________________________________________________ Name: svn:ignore + *.png *.PNG Modified: trunk/Version2/Web App/MPW/css/mpw_style.css =================================================================== --- trunk/Version2/Web App/MPW/css/mpw_style.css 2007-11-20 21:45:20 UTC (rev 53) +++ trunk/Version2/Web App/MPW/css/mpw_style.css 2008-01-04 14:35:55 UTC (rev 54) @@ -103,10 +103,10 @@ td.navcell { - width: 159px; height: 31px; text-align: center; - background-image: url(../Images/button_unselected.png); + padding-left: 7px; + padding-right: 7px; } table.grouptable @@ -206,7 +206,7 @@ a.navilink { - font-size: 11px; + font-size: 15px; text-decoration: none; color: #000000; } @@ -214,7 +214,7 @@ a.navilink:hover { color: Red; - text-decoration: blink; + text-decoration: underline overline; } a.navilink:visited @@ -234,6 +234,7 @@ left: 300px; z-index: 2; } + input.deleteschedule { margin-left: 10px; @@ -246,7 +247,6 @@ width:90%; } - td.guidecell { overflow:hidden; Property changes on: trunk/Version2/Windows Apps ___________________________________________________________________ Name: svn:ignore + MPW.suo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |