diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs index d68c2c0e..a0a3eb0e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs @@ -8,7 +8,9 @@ namespace CampusAppWP8.Model.Lecture { using CampusAppWP8.Resources; + using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model.Lecture; + using System.Xml.Serialization; /// /// Model for a Activity @@ -34,6 +36,26 @@ namespace CampusAppWP8.Model.Lecture return this.iconUrl; } } + + /// + /// Gets or sets the topic of the Lecture + /// + [XmlElement("lehrinhalt")] + public new string Topic + { + get + { + return base.Topic; + } + + set + { + if (value != this.Topic) + { + base.Topic = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } #endregion #region Methods diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs index 077ee869..7c4cfb96 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs @@ -11,13 +11,13 @@ namespace CampusAppWP8.Model.Openinghours using System.Globalization; using System.Windows; using System.Xml.Serialization; - + /// /// Model for menu /// public class OpeninghoursInstitutionWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursInstitutionModel { - #region Property + #region Property /// /// Gets the visibility state of the monday TextBlock. @@ -152,5 +152,5 @@ namespace CampusAppWP8.Model.Openinghours } #endregion - } + } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml index c8dbc61b..2ea28fca 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml @@ -7,6 +7,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" + xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" @@ -22,17 +23,13 @@ - - - - - - + + + - - + @@ -160,7 +157,7 @@ - diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml index bc3d090b..410a5179 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml @@ -6,10 +6,12 @@ xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button" + xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" - SupportedOrientations="Portrait" Orientation="Portrait" + SupportedOrientations="PortraitOrLandscape" Orientation="Portrait" mc:Ignorable="d" shell:SystemTray.IsVisible="True"> @@ -20,14 +22,12 @@ - - - - + + - + @@ -57,7 +57,10 @@ - + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml index 0575f070..bebe0019 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml @@ -8,6 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button" + xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" @@ -23,9 +24,8 @@ - - - + + @@ -52,7 +52,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index f061b5af..4a97aaf3 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -232,7 +232,6 @@ namespace CampusAppWP8.Pages.Mensa { this.Header.HeaderName = AppResources.MensaApp_Title + ": " + this.feed.Title; this.CreatesMealIcons(); - this.feed.Model.Menus[2].Meals = null; this.feed.Model.SetHolidayCaption(AppResources.MensaApp_CloseMensa); this.MensaPivot.ItemsSource = this.feed.Model.Menus; this.MensaPivot.SelectedIndex = this.selectedIndex;