From 7bc55f6527106ec9528cceff68919edf1560b131 Mon Sep 17 00:00:00 2001
From: Christian Fiedler <fiedlchr@tu-cottbus.de>
Date: Mon, 7 Oct 2013 17:13:29 +0200
Subject: [PATCH 01/11] DefaultHeader

---
 CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj |  7 ++
 .../Pages/News/NewsIndexPage.xaml             |  4 ++
 .../Utility/Lui/Header/DefaultHeader.xaml     | 12 ++++
 .../Utility/Lui/Header/DefaultHeader.xaml.cs  | 66 +++++++++++++++++++
 4 files changed, 89 insertions(+)
 create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml
 create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml.cs

diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 79c3aa26..f2216b62 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -157,6 +157,9 @@
     <Compile Include="Utility\AppUriMapper.cs" />
     <Compile Include="Utility\BackgroundTasks.cs" />
     <Compile Include="Utility\Lui\Button\AddPersonButton.cs" />
+    <Compile Include="Utility\Lui\Header\DefaultHeader.xaml.cs">
+      <DependentUpon>DefaultHeader.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Utility\Lui\Tiles\TileCreator.cs" />
     <Compile Include="Utility\NDEF\NDEFMessage.cs" />
     <Compile Include="Utility\NDEF\NDEFRecord.cs" />
@@ -401,6 +404,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Utility\Lui\Header\DefaultHeader.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\psd\holo_optionsbuttons.psd" />
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
index 1376bfb3..c2efe61e 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
@@ -7,6 +7,7 @@
     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}"
@@ -23,10 +24,13 @@
 
         <ProgressBar x:Name="progressBar" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed" IsIndeterminate="True"/>
         <!-- Title and headline -->
+        <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}"/>
+        <!--
         <StackPanel Grid.Row="0" Margin="12,17,0,28">
             <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
             <TextBlock Text="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
         </StackPanel>
+        -->
         <!-- Content -->
         <ListBox x:Name="NewsList" Grid.Row="1">
             <ListBox.ItemContainerStyle>
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml
new file mode 100644
index 00000000..44b69bbf
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml
@@ -0,0 +1,12 @@
+<UserControl
+    x:Class="CampusAppWP8.Utility.Lui.Header.DefaultHeader"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+
+    <StackPanel Margin="12,17,0,28">
+        <TextBlock Text="{Binding Path=AppTitle}" Style="{StaticResource PhoneTextNormalStyle}"/>
+        <TextBlock Text="{Binding Path=HeaderName}" Margin="9,0,0,0" Style="{StaticResource PhoneTextTitle2Style}"/>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml.cs
new file mode 100644
index 00000000..640579cb
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/DefaultHeader.xaml.cs
@@ -0,0 +1,66 @@
+//-----------------------------------------------------------------------------
+// <copyright file="DefaultHeader.xaml.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>fiedlchr</author>
+// <sience>07.10.2013</sience>
+//-----------------------------------------------------------------------------
+namespace CampusAppWP8.Utility.Lui.Header
+{
+    using System.Windows;
+    using System.Windows.Controls;
+    using CampusAppWP8.Resources;
+
+    /// <summary>
+    /// Default Header Template.
+    /// </summary>
+    public partial class DefaultHeader : UserControl
+    {
+        /// <summary>AppTitle property object.</summary>
+        public static readonly DependencyProperty AppTitleProperty = DependencyProperty.Register("AppTitle", typeof(string), typeof(DefaultHeader), new PropertyMetadata(null));
+        
+        /// <summary>HeaderName property object.</summary>
+        public static readonly DependencyProperty HeaderNameProperty = DependencyProperty.Register("HeaderName", typeof(string), typeof(DefaultHeader), new PropertyMetadata(null));
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultHeader" /> class.
+        /// </summary>
+        public DefaultHeader()
+        {
+            this.InitializeComponent();
+            this.AppTitle = AppResources.ApplicationTitle;
+        }
+
+        /// <summary>
+        /// Gets or sets the AppTitle property.
+        /// </summary>
+        public string AppTitle
+        {
+            get
+            {
+                return (string)this.GetValue(AppTitleProperty);
+            }
+
+            set
+            {
+                this.SetValue(AppTitleProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the HeaderName property.
+        /// </summary>
+        public string HeaderName
+        {
+            get
+            {
+                return (string)this.GetValue(HeaderNameProperty);
+            }
+
+            set
+            {
+                this.SetValue(HeaderNameProperty, value);
+            }
+        }
+    }
+}
\ No newline at end of file

From 4264e1fcd3657022dd8a718d93d47484c877650f Mon Sep 17 00:00:00 2001
From: Christian Fiedler <fiedlchr@tu-cottbus.de>
Date: Mon, 7 Oct 2013 19:00:41 +0200
Subject: [PATCH 02/11] nearly done

---
 .../Pages/Events/EventIndexPage.xaml          | 14 ++++++++++++-
 .../Pages/Events/EventIndexPage.xaml.cs       | 20 +++++++++++++++++++
 .../CampusAppWP8/Pages/Events/EventPage.xaml  |  6 +++---
 .../Pages/Events/EventPage.xaml.cs            |  2 +-
 .../Pages/News/NewsIndexPage.xaml             | 10 +++++++++-
 .../Pages/News/NewsIndexPage.xaml.cs          | 20 +++++++++++++++++++
 .../CampusAppWP8/Pages/News/NewsPage.xaml     |  6 +++---
 .../CampusAppWP8/Pages/News/NewsPage.xaml.cs  | 18 +++++++++++++++++
 8 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml
index 0aac8c25..059d98f6 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml
@@ -7,6 +7,7 @@
     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}"
@@ -23,10 +24,13 @@
 
         <ProgressBar x:Name="progressBar" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed" IsIndeterminate="True"/>
         <!-- Title and headline -->
+        <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.EventApp_Title, Source={StaticResource LocalizedStrings}}" />
+        <!--
         <StackPanel Grid.Row="0" Margin="12,17,0,28">
             <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
             <TextBlock Text="{Binding Path=LocalizedResources.EventApp_Title, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
         </StackPanel>
+        -->
         <!-- Content -->
         <ListBox x:Name="EventList" Grid.Row="1">
             <ListBox.ItemContainerStyle>
@@ -39,7 +43,15 @@
                 <DataTemplate>
                     <Border BorderBrush="{StaticResource PhoneContrastBackgroundBrush}" Style="{StaticResource ListButtonBorder}">
                         <lui:NavigateButton Name="EventItem" QuerryStringValue="{Binding Index}" Url="{Binding Path=Constants.PathEvent_EventPage, Source={StaticResource Const}}" QuerryStringName="{Binding Path=Constants.ParamPivotIndex, Source={StaticResource Const}}" Style="{StaticResource ListButtonNoneBorder}" HorizontalContentAlignment="Left">
-                            <TextBlock TextWrapping="Wrap" Text="{Binding Title}"/>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                
+                                <TextBlock Grid.Column="0" TextWrapping="NoWrap" Text="{Binding ShortDate}" Margin="-8,0,10,0"/>
+                                <TextBlock Grid.Column="1" TextWrapping="Wrap" Text="{Binding Title}"/>
+                            </Grid>
                         </lui:NavigateButton>
                     </Border>
                 </DataTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
index 73f8b349..b9ec7697 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
@@ -125,6 +125,26 @@ namespace CampusAppWP8.Pages.Events
             base.OnNavigatedFrom(e);
         }
 
+        /// <summary>
+        /// Methods overrides the  OnOrientationChanged-Method.
+        /// </summary>
+        /// <param name="e">orientation changed event args.</param>
+        protected override void OnOrientationChanged(OrientationChangedEventArgs e)
+        {
+            if (e.Orientation == PageOrientation.Landscape
+                || e.Orientation == PageOrientation.LandscapeLeft
+                || e.Orientation == PageOrientation.LandscapeRight)
+            {
+                ApplicationBar.Mode = ApplicationBarMode.Default;
+            }
+            else
+            {
+                ApplicationBar.Mode = ApplicationBarMode.Minimized;
+            }
+
+            base.OnOrientationChanged(e);
+        }
+
         #endregion
 
         #region private
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
index fbc0b384..b8d10f80 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
@@ -34,13 +34,13 @@
 
                         <Grid x:Name="EventTextGrid" Grid.Row="0">
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="100" />
+                                <RowDefinition Height="Auto" MaxHeight="300"/>
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
 
-                            <TextBlock x:Name="EventHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
+                            <TextBlock x:Name="EventHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource PhoneTextTitle2Style}"/>
                             <ScrollViewer x:Name="EventTextScroll" Grid.Row="1">
-                                <TextBlock x:Name="EventText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
+                                <TextBlock x:Name="EventText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource PhoneTextNormalStyle}" />
                             </ScrollViewer>
                         </Grid>
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs
index c2b20c99..e13fbe5c 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs
@@ -21,7 +21,7 @@ namespace CampusAppWP8.Pages.Events
     using CampusAppWPortalLib8.Model.RSS;
 
     /// <summary>
-    /// EventPage, where every event fees has his own PivotItem.
+    /// EventPage, where every event feed has his own PivotItem.
     /// </summary>
     public partial class EventPage : PhoneApplicationPage
     {
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
index c2efe61e..dad5a881 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
@@ -43,7 +43,15 @@
                 <DataTemplate>
                     <Border BorderBrush="{StaticResource PhoneContrastBackgroundBrush}" Style="{StaticResource ListButtonBorder}">
                         <lui:NavigateButton Name="NewsItem" QuerryStringValue="{Binding Index}" Url="{Binding Path=Constants.PathNews_NewsPage, Source={StaticResource Const}}" QuerryStringName="{Binding Path=Constants.ParamPivotIndex, Source={StaticResource Const}}" Style="{StaticResource ListButtonNoneBorder}" HorizontalContentAlignment="Left">
-                            <TextBlock TextWrapping="Wrap" Text="{Binding Title}" />
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock Grid.Column="0" TextWrapping="NoWrap" Text="{Binding ShortDate}" Margin="-8, 0, 10, 0"/>
+                                <TextBlock Grid.Column="1" TextWrapping="Wrap" Text="{Binding Title}" />
+                            </Grid>
                         </lui:NavigateButton>
                     </Border>
                 </DataTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
index 69814293..06b0ca9a 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
@@ -125,6 +125,26 @@ namespace CampusAppWP8.Pages.News
 
         #region private
 
+        /// <summary>
+        /// Methods overrides the OnOrientationChanged-Method.
+        /// </summary>
+        /// <param name="e">orientation changed event args.</param>
+        protected override void OnOrientationChanged(OrientationChangedEventArgs e)
+        {
+            if (e.Orientation == PageOrientation.LandscapeRight
+                || e.Orientation == PageOrientation.LandscapeLeft
+                || e.Orientation == PageOrientation.Landscape)
+            {
+                ApplicationBar.Mode = ApplicationBarMode.Default;
+            }
+            else
+            {
+                ApplicationBar.Mode = ApplicationBarMode.Minimized;
+            }
+
+            base.OnOrientationChanged(e);
+        }
+
         /// <summary>
         /// Is called after the RSS feeds are loaded into the newsFeed model. 
         /// If there was no feed information set to the UI, the feed list 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
index 85e6faf4..281eaf5d 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
@@ -33,13 +33,13 @@
 
                         <Grid x:Name="NewsTextGrid" Grid.Row="0">
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="100" />
+                                <RowDefinition Height="Auto" MaxHeight="300"/>
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
 
-                            <TextBlock x:Name="NewsHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
+                            <TextBlock x:Name="NewsHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Top" HorizontalAlignment="Left" Style="{StaticResource PhoneTextTitle2Style}"/>
                             <ScrollViewer Grid.Row="1">
-                                <TextBlock x:Name="NewsText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
+                                <TextBlock x:Name="NewsText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource PhoneTextNormalStyle}" />
                             </ScrollViewer>
                         </Grid>
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
index 1c5556d2..b0242c94 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
@@ -150,6 +150,24 @@ namespace CampusAppWP8.Pages.News
             }
         }
 
+        /*
+        protected override void OnOrientationChanged(OrientationChangedEventArgs e)
+        {
+            if (e.Orientation == PageOrientation.Landscape
+                || e.Orientation == PageOrientation.LandscapeLeft
+                || e.Orientation == PageOrientation.LandscapeRight)
+            {
+                ApplicationBar.Mode = ApplicationBarMode.Default;
+            }
+            else
+            {
+                ApplicationBar.Mode = ApplicationBarMode.Minimized;
+            }
+            
+            base.OnOrientationChanged(e);
+        }
+        */
+
         /// <summary>
         /// Called when the index of the selected PivotItem is changed.
         /// Set the text Grid to visible and the WebBrowser to collapsed.

From 577b2fd061af59ae6a3f43d8a134e6a1397a6f69 Mon Sep 17 00:00:00 2001
From: Christian Fiedler <fiedlchr@tu-cottbus.de>
Date: Mon, 7 Oct 2013 19:01:31 +0200
Subject: [PATCH 03/11] nearly done

---
 .../CampusAppWPortalLib8/Model/RSS/RSSModel.cs       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/RSS/RSSModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/RSS/RSSModel.cs
index 22f79ca1..32b6afb7 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/RSS/RSSModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/RSS/RSSModel.cs
@@ -135,6 +135,18 @@ namespace CampusAppWPortalLib8.Model.RSS
             }
         }
 
+        /// <summary>
+        /// Gets the date of the timestamp as string.
+        /// example: 25.06.
+        /// </summary>
+        public string ShortDate
+        {
+            get
+            {
+                return string.Format("{0:dd.MM.}", this.timestamp);
+            }
+        }
+
         /// <summary>
         /// Gets the time of the timestamp as string.
         /// example: 12:56.

From 92097cf881a591e6d4e208a3cc793768e6dfee45 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 11:17:06 +0200
Subject: [PATCH 04/11] add header to userprofil

---
 .../CampusAppWP8/Pages/Setting/UserProfil.xaml         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
index 421e235e..69874c2e 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.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,12 +23,11 @@
         </Grid.RowDefinitions>
 
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
-        <ProgressBar Name="ProgressBar" Grid.Row="1"  Visibility="Collapsed" IsIndeterminate="True"/>
-
-        <StackPanel Grid.Row="0"  Margin="12,17,0,28">
-            <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
-            <TextBlock Text="{Binding Path=LocalizedResources.Setting_User, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextTitle2Style}"/>
+        <StackPanel  Grid.Row="0">
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.Setting_User, Source={StaticResource LocalizedStrings}}"/>
+            <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
         </StackPanel>
+
         <ScrollViewer Grid.Row="1">
             <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
             <Grid x:Name="ContentPanel"  Margin="12,0,12,0">

From 0f3bbc3cf6cbc8f9de074a27af3db9feb8975d77 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 12:09:25 +0200
Subject: [PATCH 05/11] fix personpage

---
 .../Model/Person/PersonListWp8Model.cs        | 21 +++++++++++++++
 .../CampusAppWP8/Pages/Person/PersonPage.xaml | 19 +++++++-------
 .../Pages/Person/PersonPage.xaml.cs           | 16 +++++++++++-
 .../Model/Person/PersonListModel.cs           | 26 +++----------------
 4 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs
index 474f3fea..4a95dcb9 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs
@@ -10,6 +10,7 @@ namespace CampusAppWP8.Model.Person
 {
     using System.Xml.Serialization;
     using CampusAppWPortalLib8.Model.Person;
+    using System.Collections.Generic;
 
     /// <summary>Person list model.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
@@ -25,5 +26,25 @@ namespace CampusAppWP8.Model.Person
             IPersonModel<IPersonFunctionModel> tmpPerson = base.GetPerson(id);
             return tmpPerson as PersonWp8Model;
         }
+
+
+        /// <summary>Removes the non function person.</summary>
+        /// <remarks>Stubbfel, 05.09.2013.</remarks>
+        public override void RemoveNonFunctionPerson()
+        {
+            List<PersonWp8Model> removeList = new List<PersonWp8Model>();
+            foreach (PersonWp8Model tmpPerson in this.Persons)
+            {
+                if (tmpPerson.Functions.Count < 1)
+                {
+                    removeList.Add(tmpPerson);
+                }
+            }
+
+            foreach (PersonWp8Model removePerson in removeList)
+            {
+                this.Persons.Remove(removePerson);
+            }
+        }
     }
 }
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
index bfc4d4ca..7564bfa0 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
@@ -7,6 +7,7 @@
     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}"
@@ -21,12 +22,10 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <ProgressBar Name="ProgressBar" Grid.Row="1"  Visibility="Collapsed" IsIndeterminate="True"/>
-
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
-        <StackPanel Grid.Row="0" Margin="12,17,0,28">
-            <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
-            <TextBlock Text="{Binding Path=LocalizedResources.PersonApp_Header, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle2Style}"/>
+        <StackPanel  Grid.Row="0">
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.PersonApp_Header, Source={StaticResource LocalizedStrings}}"/>
+            <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
         </StackPanel>
 
         <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
@@ -46,7 +45,7 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
-                <TextBox Name="SearchName" AcceptsReturn="False" Grid.Column="0" InputScope="PersonalSurname"/>
+                <TextBox Name="SearchName" AcceptsReturn="False" KeyDown="SearchName_KeyDown" Grid.Column="0" InputScope="PersonalSurname" VerticalAlignment="Center" />
                 <Button Grid.Column="1" Click="SendRequest">
                     <Image Source="{Binding Path=ThemelizedIcon.Search, Source={StaticResource ThemelizedIcons}}" Width="50"/>
                 </Button>
@@ -105,10 +104,10 @@
                                                     </StackPanel>
                                                     <TextBlock Text="{Binding Building}" Grid.Row="2" Grid.Column="1" TextWrapping="Wrap"/>
 
-                                                    <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-                                                        <lui:EmailButton EmailAddress="{Binding Mail}" Height="100" />
-                                                        <lui:PhoneButton Number="{Binding Tel1}" Height="100" />
-                                                        <lui:AddPersonButton Height="100" Click="Button_Click" PersonId="{Binding PersonID}"  FunctionIndex="{Binding FunctionIndex}" />
+                                                    <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" Margin="0,0,0,0">
+                                                        <lui:EmailButton EmailAddress="{Binding Mail}" Height="100" Margin="0,0,0,0" />
+                                                        <lui:PhoneButton Number="{Binding Tel1}" Height="100" Margin="0,0,0,0"/>
+                                                        <lui:AddPersonButton Height="100" Click="Button_Click" PersonId="{Binding PersonID}"  FunctionIndex="{Binding FunctionIndex}"  Margin="0,0,0,0"/>
                                                     </StackPanel>
                                                 </Grid>
                                             </Border>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs
index ac47c1e4..6681f537 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs
@@ -8,8 +8,8 @@
 
 namespace CampusAppWP8.Pages.Person
 {
-    using System.Collections.Generic;
     using System.Windows;
+    using System.Windows.Input;
     using CampusAppWP8.Api.Person;
     using CampusAppWP8.Model.Person;
     using CampusAppWP8.Resources;
@@ -18,6 +18,7 @@ namespace CampusAppWP8.Pages.Person
     using CampusAppWPortalLib8.Model.Utility;
     using Microsoft.Phone.Controls;
     using Microsoft.Phone.Tasks;
+    using System.Collections.Generic;
 
     /// <summary>Person page.</summary>
     /// <remarks>Stubbfel, 09.09.2013.</remarks>
@@ -97,6 +98,10 @@ namespace CampusAppWP8.Pages.Person
         {
             this.api.Model.RemoveNonFunctionAndSetIdsPerson();
             this.ResultBox.ItemsSource = this.api.Model.Persons;
+            if (this.api.Model == null || this.api.Model.Persons == null || this.api.Model.Persons.Count < 1)
+            {
+                MessageBoxes.ShowMainModelInfoMessageBox(AppResources.MsgBox_NoResult);
+            }
         }
 
         /// <summary>Event handler. Called by Button for click events.</summary>
@@ -138,6 +143,15 @@ namespace CampusAppWP8.Pages.Person
             saveContactTask.Show();
         }
 
+        private void SearchName_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                this.SendRequest(sender,e);
+            }
+        }
+
         #endregion
+
     }
 }
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs
index d79729a8..ade93416 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs
@@ -16,7 +16,7 @@ namespace CampusAppWPortalLib8.Model.Person
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
     /// <typeparam name="T">personModel template</typeparam>
     [XmlRoot("Uebersicht")]
-    public class PersonListModel<T>
+    public abstract class PersonListModel<T>
     {
         #region Property
 
@@ -76,28 +76,8 @@ namespace CampusAppWPortalLib8.Model.Person
 
         /// <summary>Removes the non function person.</summary>
         /// <remarks>Stubbfel, 05.09.2013.</remarks>
-        public void RemoveNonFunctionPerson()
-        {
-            List<T> removeList = new List<T>();
-            foreach (T item in this.Persons)
-            {
-                IPersonModel<IPersonFunctionModel> tmpPerson = item as IPersonModel<IPersonFunctionModel>;
-                if (tmpPerson == null)
-                {
-                    continue;
-                }
-
-                if (tmpPerson.Functions.Count < 1)
-                {
-                    removeList.Add(item);
-                }
-            }
-
-            foreach (T removePerson in removeList)
-            {
-                this.Persons.Remove(removePerson);
-            }
-        }
+        public abstract void RemoveNonFunctionPerson();
+        
 
         #endregion
     }

From f9c2f95ea5838dca28e93e5f7a54a4765f608538 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 12:50:04 +0200
Subject: [PATCH 06/11] finish 230

---
 .../CampusAppWP8/Pages/Exams/Exams.xaml       | 31 ++++++++++++++-----
 .../CampusAppWP8/Pages/Exams/Exams.xaml.cs    |  3 ++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
index b46de0a3..66530d29 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
@@ -7,6 +7,7 @@
     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}"
@@ -16,9 +17,23 @@
 
     <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
-        <ProgressBar Name="ProgressBar"  Visibility="Collapsed" IsIndeterminate="True"/>
-        <phone:Pivot Name="ExamPivot" Title="{Binding Path=LocalizedResources.ExaminationApp_Header, Source={StaticResource LocalizedStrings}}">
-            <phone:PivotItem Header="{Binding Path=LocalizedResources.Degree_Bachelor, Source={StaticResource LocalizedStrings}}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <StackPanel  Grid.Row="0" Margin="0,0,0,0">
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.ExaminationApp_Header, Source={StaticResource LocalizedStrings}}" Margin="0,0,0,0"/>
+            <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+        </StackPanel>
+        <phone:Pivot Name="ExamPivot" Grid.Row="1">
+            <phone:Pivot.HeaderTemplate>
+            <DataTemplate>
+                <Grid Margin="0,-36,0,0">
+                    <TextBlock Text="{Binding}"/>
+                </Grid>
+            </DataTemplate>
+            </phone:Pivot.HeaderTemplate>
+            <phone:PivotItem Name="BachelorItem">
                 <ListBox x:Name="BachelorPanel"  ItemsSource="{Binding Value}">
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
@@ -30,14 +45,14 @@
                         <DataTemplate>
                             <StackPanel>
                                 <Button Tag="{Binding Link}" Style="{StaticResource ListButtonStyle}" Click="Button_Click">
-                                    <TextBlock Text="{Binding Caption}" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{Binding Caption}" TextWrapping="Wrap" TextAlignment="Center"/>
                                 </Button>
                             </StackPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
                 </ListBox>
             </phone:PivotItem>
-            <phone:PivotItem Header="{Binding Path=LocalizedResources.Degree_Master, Source={StaticResource LocalizedStrings}}">
+            <phone:PivotItem  Name="MasterItem">
                 <ListBox x:Name="MasterPanel"  ItemsSource="{Binding Value}">
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
@@ -49,14 +64,14 @@
                         <DataTemplate>
                             <StackPanel>
                                 <Button Tag="{Binding Link}" Style="{StaticResource ListButtonStyle}" Click="Button_Click">
-                                    <TextBlock Text="{Binding Caption}" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{Binding Caption}" TextWrapping="Wrap" TextAlignment="Center"/>
                                 </Button>
                             </StackPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
                 </ListBox>
             </phone:PivotItem>
-            <phone:PivotItem Header="{Binding Path=LocalizedResources.Degree_Diploma, Source={StaticResource LocalizedStrings}}">
+            <phone:PivotItem Name="DiplomItem">
                 <ListBox x:Name="DiplomaPanel"  ItemsSource="{Binding Value}">
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
@@ -68,7 +83,7 @@
                         <DataTemplate>
                             <StackPanel>
                                 <Button Tag="{Binding Link}" Style="{StaticResource ListButtonStyle}" Click="Button_Click">
-                                    <TextBlock Text="{Binding Caption}" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{Binding Caption}" TextWrapping="Wrap" TextAlignment="Center"/>
                                 </Button>
                             </StackPanel>
                         </DataTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs
index d530836b..f0a6a0e6 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs
@@ -38,6 +38,9 @@ namespace CampusAppWP8.Pages.Exams
         public Exams()
         {
             this.InitializeComponent();
+            this.BachelorItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Bachelor;
+            this.MasterItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Master;
+            this.DiplomItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Diploma;
             this.InitializeFeed();
         }
 

From bb73622aa1d8c180670061aa20b98199807f5ff9 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 13:46:41 +0200
Subject: [PATCH 07/11] finish #228

---
 .../CampusAppWP8/Pages/Links/LinkPage.xaml    | 22 ++++++++++++++++---
 .../CampusAppWP8/Pages/Links/LinkPage.xaml.cs | 18 +++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
index 0057ec4c..8bc60007 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
@@ -7,19 +7,35 @@
     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"
     mc:Ignorable="d"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     SupportedOrientations="PortraitOrLandscape"  Orientation="Portrait"
+    OrientationChanged="PhoneApplicationPage_OrientationChanged"
     shell:SystemTray.IsVisible="True">
 
     <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
-        <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <StackPanel  Grid.Row="0" Margin="0,0,0,0">
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LinkApp_Title, Source={StaticResource LocalizedStrings}}" Margin="0,0,0,0"/>
+            <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+        </StackPanel>
         <!--Pivotsteuerelement-->
-        <phone:Pivot Title="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}">
+        <phone:Pivot Grid.Row="1">
             <!--Pivotelement eins-->
+            <phone:Pivot.HeaderTemplate>
+                <DataTemplate>
+                    <Grid Margin="0,-36,0,0">
+                        <TextBlock Text="{Binding}"/>
+                    </Grid>
+                </DataTemplate>
+            </phone:Pivot.HeaderTemplate>
             <phone:PivotItem Header="{Binding Path=LocalizedResources.LinkApp_CommonLinks, Source={StaticResource LocalizedStrings}}">
                 <ListBox x:Name="CommonLinkPanel">
                     <ListBox.ItemContainerStyle>
@@ -50,7 +66,7 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <StackPanel>
-                                <lui:LinkButton  Style="{StaticResource ListButtonStyle}" Content="{Binding Title}" Url="{Binding Link}"/>
+                                <lui:LinkButton  Style="{StaticResource ListButtonStyle}" Content="{Binding Title}" Url="{Binding Link}" HorizontalContentAlignment="Center"/>
                             </StackPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
index 5aaeedc8..85bf3ac4 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
@@ -208,6 +208,24 @@ namespace CampusAppWP8.Pages.Links
                 this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed;
             } 
         }
+
+        /// <summary>
+        /// Method handle OrientationPage
+        /// </summary>
+        /// <param name="sender">Caller of the function</param>
+        /// <param name="e">some EventArgs</param>
+        private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
+        {
+            if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight)
+            {
+                ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default;
+            }
+            else
+            {
+                ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized;
+            }
+        }
+
         #endregion
 
         #endregion

From e628993a17c6ded8d5608f07bc00915eeaa8647c Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 15:18:01 +0200
Subject: [PATCH 08/11] finish #226

---
 .../CampusAppWP8/Pages/Exams/Exams.xaml       |  4 +--
 .../CampusAppWP8/Pages/Links/LinkPage.xaml    |  4 +--
 .../CampusAppWP8/Pages/Mensa/MensaPage.xaml   | 26 ++++++++++++-------
 .../Pages/Mensa/MensaPage.xaml.cs             | 21 ++++++++++++++-
 .../CampusAppWP8/Pages/Person/PersonPage.xaml |  2 +-
 .../Pages/Setting/UserProfil.xaml             |  2 +-
 .../Resources/AppResources.Designer.cs        |  9 +++++++
 .../CampusAppWP8/Resources/AppResources.resx  |  3 +++
 .../Model/Mensa/MealModel.cs                  |  4 +--
 .../Model/Mensa/MenuWeekModel.cs              | 23 ++++++++++++++++
 .../Resources/AppResources.Designer.cs        | 13 ++++++++--
 .../Resources/AppResources.resx               |  7 +++--
 12 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
index 66530d29..cdc12571 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
@@ -21,9 +21,9 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <StackPanel  Grid.Row="0" Margin="0,0,0,0">
-            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.ExaminationApp_Header, Source={StaticResource LocalizedStrings}}" Margin="0,0,0,0"/>
+        <StackPanel  Grid.Row="0">
             <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.ExaminationApp_Header, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
         <phone:Pivot Name="ExamPivot" Grid.Row="1">
             <phone:Pivot.HeaderTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
index 8bc60007..abb8ac14 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
@@ -22,9 +22,9 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <StackPanel  Grid.Row="0" Margin="0,0,0,0">
-            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LinkApp_Title, Source={StaticResource LocalizedStrings}}" Margin="0,0,0,0"/>
+        <StackPanel  Grid.Row="0">
             <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LinkApp_Title, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
         <!--Pivotsteuerelement-->
         <phone:Pivot Grid.Row="1">
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
index 2cbda005..3472e14e 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
@@ -7,20 +7,30 @@
     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"
     mc:Ignorable="d"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
+    OrientationChanged="PhoneApplicationPage_OrientationChanged"
     shell:SystemTray.IsVisible="True">
     <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
-        <ProgressBar Name="ProgressBar"  Visibility="Collapsed" IsIndeterminate="True"/>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <StackPanel  Grid.Row="0">
+            <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+            <header:DefaultHeader Name="Header" HeaderName="{Binding Path=LocalizedResources.LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}"/>
+        </StackPanel>
+  
         <!--Pivotsteuerelement-->
-        <phone:Pivot Name="MensaPivot" Title="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}">
+        <phone:Pivot Grid.Row="1" Name="MensaPivot">
             <phone:Pivot.HeaderTemplate>
                 <DataTemplate>
-                    <StackPanel>
+                    <StackPanel Margin="0,-36,0,0">
                         <TextBlock Text="{Binding Day}" />
                         <TextBlock Text="{Binding Date}" FontSize="34" Margin="6,0,0,0"/>
                     </StackPanel>
@@ -28,7 +38,7 @@
             </phone:Pivot.HeaderTemplate>
             <phone:Pivot.ItemTemplate>
                 <DataTemplate>
-                    <ScrollViewer>
+                    <ScrollViewer Margin="12,0,0,0">
                         <ItemsControl x:Name="MenuPanel" ItemsSource="{Binding Meals}" ScrollViewer.VerticalScrollBarVisibility="Auto">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
@@ -38,12 +48,12 @@
                                                 <ColumnDefinition Width="auto"></ColumnDefinition>
                                                 <ColumnDefinition Width="*"></ColumnDefinition>
                                             </Grid.ColumnDefinitions>
-                                            <StackPanel>
-                                                <StackPanel Orientation="Horizontal" Grid.Column="0" Margin="0,0,0,12" Width="100">
+                                            <StackPanel HorizontalAlignment="Left">
+                                                <StackPanel Orientation="Horizontal" Grid.Column="0" Margin="0,0,0,12"  MinWidth="100">
                                                     <TextBlock Text="{Binding MealName}" FontWeight="Bold"/>
                                                     <TextBlock Text=" : "/>
                                                 </StackPanel>
-                                                <Image Source="{Binding IconUrl}" Width="100" Margin="-25,-25,-25,-21"></Image>
+                                                <Image HorizontalAlignment="Left" Source="{Binding IconUrl}" Width="100" Margin="-12,-25,0,-21"></Image>
                                             </StackPanel>
                                             <TextBlock Text="{Binding MealDesc}" TextWrapping="Wrap" Grid.Column="1"/>
                                         </Grid>
@@ -51,12 +61,10 @@
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
-
                     </ScrollViewer>
                 </DataTemplate>
             </phone:Pivot.ItemTemplate>
         </phone:Pivot>
-        <!-- <Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" /> -->
     </Grid>
     <phone:PhoneApplicationPage.ApplicationBar>
         <shell:ApplicationBar IsVisible="True" IsMenuEnabled="True" Mode="Minimized" >
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
index d13c3525..f061b5af 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -230,8 +230,10 @@ namespace CampusAppWP8.Pages.Mensa
         /// </summary>
         private void SetupMensaPivot()
         {
-            this.MensaPivot.Title = AppResources.MensaApp_Title + " (" + this.feed.Title + ")";
+            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;
         }
@@ -358,6 +360,23 @@ namespace CampusAppWP8.Pages.Mensa
             this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN);
         }
 
+        /// <summary>
+        /// Method handle OrientationPage
+        /// </summary>
+        /// <param name="sender">Caller of the function</param>
+        /// <param name="e">some EventArgs</param>
+        private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
+        {
+            if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight)
+            {
+                ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default;
+            }
+            else
+            {
+                ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized;
+            }
+        }
+
         #endregion
 
         #endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
index 7564bfa0..9f99be66 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
@@ -24,8 +24,8 @@
 
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
         <StackPanel  Grid.Row="0">
-            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.PersonApp_Header, Source={StaticResource LocalizedStrings}}"/>
             <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.PersonApp_Header, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
 
         <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
index 69874c2e..2a392a27 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
@@ -24,8 +24,8 @@
 
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
         <StackPanel  Grid.Row="0">
-            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.Setting_User, Source={StaticResource LocalizedStrings}}"/>
             <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.Setting_User, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
 
         <ScrollViewer Grid.Row="1">
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 3a118d49..895d0ace 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -456,6 +456,15 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Die Mensa ist heute geschlossen ähnelt.
+        /// </summary>
+        public static string MensaApp_CloseMensa {
+            get {
+                return ResourceManager.GetString("MensaApp_CloseMensa", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die 84 ähnelt.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index bdac3a8f..6a10e787 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -437,4 +437,7 @@
   <data name="PlaceLabel_Type" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="MensaApp_CloseMensa" xml:space="preserve">
+    <value>Die Mensa ist heute geschlossen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
index 51d6c551..80a239f1 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
@@ -101,7 +101,7 @@ namespace CampusAppWPortalLib8.Model.Mensa
 
             set
             {
-                if (value > -1 && value < 8)
+                if (value > -2 && value < 8)
                 {
                     this.mealId = value;
                     this.CreateMealName();
@@ -187,7 +187,7 @@ namespace CampusAppWPortalLib8.Model.Mensa
                     this.mealName = AppResources.MensaApp_Action;
                     break;
                 default:
-                    this.mealName = string.Empty;
+                    this.mealName = AppResources.MensaApp_NoFood;
                     break;
             }
         }
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs
index 0af57379..35338718 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs
@@ -77,6 +77,29 @@ namespace CampusAppWPortalLib8.Model.Mensa
             return monday;
         }
 
+        /// <summary>
+        /// Method determine holidays (Days with no meals) and add a pseudo meal
+        /// </summary>
+        /// <param name="text">text of the pseudo meal</param>
+        public void SetHolidayCaption(string text)
+        {
+            MealModel holiday = new MealModel();
+            holiday.MealDesc = text;
+            holiday.MealId= -1;
+
+            foreach (MenuModel menu in this.Menus)
+            {
+                if (menu.Meals == null || menu.Meals.Count < 1)
+                {
+                    if (menu.Meals == null)
+                    {
+                        menu.Meals = new ObservableCollection<MealModel>();
+                    }
+                    menu.Meals.Add(holiday);
+                }
+            }
+        }
+
         #endregion
     }
 }
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
index fe2e04e7..0da18b19 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
@@ -62,7 +62,7 @@ namespace CampusAppWPortalLib8.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Cottbus Campus ähnelt.
         /// </summary>
         public static string Campus_CBMain {
             get {
@@ -89,7 +89,7 @@ namespace CampusAppWPortalLib8.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Senftenberg Campus ähnelt.
         /// </summary>
         public static string Campus_SFBMain {
             get {
@@ -196,6 +196,15 @@ namespace CampusAppWPortalLib8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Kein Essen ähnelt.
+        /// </summary>
+        public static string MensaApp_NoFood {
+            get {
+                return ResourceManager.GetString("MensaApp_NoFood", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Suppe ähnelt.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
index 51ef3544..cf4cd79d 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Campus_CBMain" xml:space="preserve">
-    <value>Cottbus Hauptcampus</value>
+    <value>Cottbus Campus</value>
   </data>
   <data name="Campus_CBNorth" xml:space="preserve">
     <value>Cottbus Nordcampus</value>
@@ -127,7 +127,7 @@
     <value>Cottbus Südcampus</value>
   </data>
   <data name="Campus_SFBMain" xml:space="preserve">
-    <value>Senftenberg Hauptcampus</value>
+    <value>Senftenberg Campus</value>
   </data>
   <data name="Degree_Bachelor" xml:space="preserve">
     <value>Bachelor</value>
@@ -162,6 +162,9 @@
   <data name="MensaApp_Dinner5" xml:space="preserve">
     <value>Essen 5</value>
   </data>
+  <data name="MensaApp_NoFood" xml:space="preserve">
+    <value>Kein Essen</value>
+  </data>
   <data name="MensaApp_Soup" xml:space="preserve">
     <value>Suppe</value>
   </data>

From 8010781f51cbf8b087a7531c22ede970d3803fdf Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 15:50:53 +0200
Subject: [PATCH 09/11] finish #224

---
 .../Model/Lecture/LectureWp8Activity.cs       | 22 +++++++++++++++++++
 .../OpeninghoursInstitutionWp8Model.cs        |  6 ++---
 .../Pages/Lecture/LecturePage.xaml            | 15 +++++--------
 .../Pages/Lecture/ResultDetailPage.xaml       | 17 ++++++++------
 .../Pages/Lecture/ResultPage.xaml             |  8 +++----
 .../Pages/Mensa/MensaPage.xaml.cs             |  1 -
 6 files changed, 45 insertions(+), 24 deletions(-)

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;
 
     /// <summary>
     /// Model for a Activity
@@ -34,6 +36,26 @@ namespace CampusAppWP8.Model.Lecture
                 return this.iconUrl;
             }
         }
+
+        /// <summary>
+        /// Gets or sets the topic of the Lecture
+        /// </summary>
+        [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;
-    
+
     /// <summary>
     ///  Model for menu
     /// </summary>
     public class OpeninghoursInstitutionWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursInstitutionModel
     {
-        #region Property       
+        #region Property
 
         /// <summary>
         /// 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 @@
         </Grid.RowDefinitions>
 
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
-        <ProgressBar Name="ProgressBar" Grid.Row="1"  Visibility="Collapsed" IsIndeterminate="True"/>
-
-        <StackPanel Grid.Row="0"  Margin="12,17,0,28">
-            <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
-            <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextTitle2Style}"/>
-
+        <StackPanel  Grid.Row="0">
+            <ProgressBar Name="ProgressBar" Visibility="Collapsed" IsIndeterminate="True"/>
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
 
-
         <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
-        <ScrollViewer Grid.Row="1" Margin="12,0,12,0">
+        <ScrollViewer Grid.Row="1" Margin="24,0,12,0">
             <Grid x:Name="ContentPanel">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
@@ -160,7 +157,7 @@
                     </StackPanel>
                 </Border>
                 <Border BorderBrush="{StaticResource PhoneBorderBrush}" BorderThickness="0,2,0,0"  Grid.Row="5">
-                    <Button Name="SearchButton" Click="SendRequest">
+                    <Button Name="SearchButton" Click="SendRequest" HorizontalAlignment="Center">
                         <Image  Name="SearchButtonImg" Source="{Binding Path=ThemelizedIcon.Search, Source={StaticResource ThemelizedIcons}}" Width="60" />
                     </Button>
                 </Border>
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 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
-        <StackPanel Grid.Row="0" Margin="12,17,0,28">
-            <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
-            <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_DetailsHeader, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextTitle2Style}"/>
+        <StackPanel  Grid.Row="0">
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LectureApp_DetailsHeader, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
 
         <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
-        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
+        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="24,0,12,0">
             <ScrollViewer>
                 <StackPanel>
                     <Border BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,0,0,0" Padding="0,12,0,12">
@@ -57,7 +57,10 @@
                     <Border BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
                         <StackPanel>
                             <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Department, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextGroupHeaderStyle}" Margin="0,0,0,0"/>
-                            <TextBlock Text="{Binding Department}" TextWrapping="Wrap"/>
+                            <lui:NavigateButton Url="" QuerryStringName="" QuerryStringValue="">
+                                <TextBlock Text="{Binding Department}" TextWrapping="Wrap"/>
+                            </lui:NavigateButton>
+
                         </StackPanel>
                     </Border>
                     <Border BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
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 @@
         </Grid.RowDefinitions>
 
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
-        <StackPanel Grid.Row="0" Margin="12,17,0,28">
-            <TextBlock Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>
-            <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextTitle2Style}" />
+        <StackPanel  Grid.Row="0">
+            <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
         <ListBox x:Name="ResultList" Grid.Row="1">
             <ListBox.ItemContainerStyle>
@@ -52,7 +52,7 @@
                                             <TextBlock Text="{Binding Type}" TextAlignment="Left" HorizontalAlignment="Left" />
                                             <TextBlock Text=" : "/>
                                         </StackPanel>
-                                        <Image Source="{Binding IconUrl}" Width="50" />
+                                        <Image Source="{Binding IconUrl}" Width="50" HorizontalAlignment="Left"/>
                                     </StackPanel>
                                     <TextBlock Text="{Binding Title}" TextWrapping="Wrap" Grid.Column="1" Grid.Row="0"/>
                                 </Grid>
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;

From 50c1c3246647c77a0f8f37da327a00117eac86f0 Mon Sep 17 00:00:00 2001
From: Christian Fiedler <fiedlchr@tu-cottbus.de>
Date: Tue, 8 Oct 2013 15:51:16 +0200
Subject: [PATCH 10/11] #222 done

---
 .../DepartmentFavoritePage.xaml.cs            |  2 +-
 .../Departments/DepartmentIndexPage.xaml.cs   | 36 ++++----
 .../Departments/DepartmentInfoPage.xaml.cs    | 83 +++++++++++++++++--
 .../Pages/Departments/DepartmentPage.xaml.cs  |  2 +-
 .../Resources/AppResources.Designer.cs        | 18 ++++
 .../CampusAppWP8/Resources/AppResources.resx  |  6 ++
 .../CampusAppWP8/Resources/Constants.resx     |  3 +
 .../Resources/Constants1.Designer.cs          |  9 ++
 CampusAppWP8/IconCreator/IconCreator.pyproj   |  1 +
 9 files changed, 139 insertions(+), 21 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs
index f45eb0cb..e79b9981 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs
@@ -180,7 +180,7 @@ namespace CampusAppWP8.Pages.Departments
             FrameworkElement infoBtn = sender as FrameworkElement;
             string chairName = ((this.lastClickedBtn as Button).Content as TextBlock).Text.ToString();
 
-            NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentInfoPage + "?url=" + infoBtn.Tag.ToString() + "&name=" + chairName, UriKind.Relative));
+            NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentInfoPage + "?" + Constants.ParamUrl + "=" + infoBtn.Tag.ToString() + "&" + Constants.ParamName + "=" + chairName, UriKind.Relative));
         }
 
         #endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
index cfdf92f8..e06cd045 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
@@ -47,16 +47,7 @@ namespace CampusAppWP8.Pages.Departments
             this.progressBar.Visibility = Visibility.Visible;
 
             //// init feed objects
-            if (DepartmentIndexPage.feed == null)
-            {
-                DepartmentIndexPage.feed = new DepartmentFeed(false);
-            }
-
-            DepartmentIndexPage.feed.OnLoaded += new DepartmentFeed.OnIO(this.SetupFacultyList);
-            DepartmentIndexPage.feed.OnFailedWeb += new DepartmentFeed.OnFailed(this.FeedIsFailedWeb);
-            DepartmentIndexPage.feed.OnFailedFile += new DepartmentFeed.OnFailed(this.FeedIsFailedFile);
-
-            DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus<CampusAppWPortalLib8.Model.Departments.DepartmentModel>());
+            DepartmentIndexPage.InitFeed(this.SetupFacultyList, this.FeedIsFailedWeb, this.FeedIsFailedFile);
 
             if (DepartmentIndexPage.favorite == null)
             {
@@ -83,10 +74,7 @@ namespace CampusAppWP8.Pages.Departments
 
             set
             {
-                if (value != DepartmentIndexPage.feed)
-                {
-                    DepartmentIndexPage.feed = value;
-                }
+                DepartmentIndexPage.feed = value;
             }
         }
 
@@ -179,6 +167,26 @@ namespace CampusAppWP8.Pages.Departments
         {
         }
 
+        /// <summary>
+        /// Initialize the feed objects and load the data.
+        /// </summary>
+        public static void InitFeed(DepartmentFeed.OnIO onLoaded = null, DepartmentFeed.OnIO failedWeb = null, DepartmentFeed.OnIO failedFile = null)
+        {
+            if (DepartmentIndexPage.feed == null)
+            {
+                DepartmentIndexPage.feed = new DepartmentFeed(false);
+            }
+
+            if(onLoaded != null)
+                DepartmentIndexPage.feed.OnLoaded += new DepartmentFeed.OnIO(onLoaded);
+            if(failedWeb != null)
+                DepartmentIndexPage.feed.OnFailedWeb += new DepartmentFeed.OnFailed(failedWeb);
+            if(failedFile != null)
+                DepartmentIndexPage.feed.OnFailedFile += new DepartmentFeed.OnFailed(failedFile);
+
+            DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus<CampusAppWPortalLib8.Model.Departments.DepartmentModel>());
+        }
+
         /// <summary>
         /// Setup the faculty list.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs
index f9c98b98..d1ce5ab0 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs
@@ -8,14 +8,23 @@
 namespace CampusAppWP8.Pages.Departments
 {
     using System;
+    using System.Windows;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
     using System.Windows.Navigation;
     using Microsoft.Phone.Controls;
+    using CampusAppWP8.Resources;
+    using CampusAppWPortalLib8.Model.Departments;
 
     /// <summary>
     /// Info page of a chair.
     /// </summary>
     public partial class DepartmentInfoPage : PhoneApplicationPage
     {
+        private bool feedLoadedFlag = false;
+
+        private string chairName = string.Empty;
+
         #region Constructor
 
         /// <summary>
@@ -41,15 +50,32 @@ namespace CampusAppWP8.Pages.Departments
         {
             base.OnNavigatedTo(e);
 
-            string url = string.Empty;
-            string chairName = string.Empty;
+            this.feedLoadedFlag = false;
 
-            if (NavigationContext.QueryString.TryGetValue("url", out url)
-            && NavigationContext.QueryString.TryGetValue("name", out chairName))
+            string url = string.Empty;
+            
+            if(NavigationContext.QueryString.TryGetValue(Constants.ParamName, out this.chairName))
+            {
+                this.PageHeadline.Text = this.chairName;
+            }
+
+            if (NavigationContext.QueryString.TryGetValue(Constants.ParamUrl, out url))
             {
-                this.PageHeadline.Text = chairName;
                 this.WebBrowser.Navigate(new Uri(url, UriKind.Absolute));
             }
+            else
+            {
+                CampusAppWP8.Feed.Departments.DepartmentFeed temp = DepartmentIndexPage.Feed;
+
+                if (temp != null)
+                {
+                    this.OnFeedReady();
+                }
+                else
+                {
+                    DepartmentIndexPage.InitFeed(this.OnFeedReady);
+                }
+            }
         }
 
         #endregion
@@ -64,6 +90,53 @@ namespace CampusAppWP8.Pages.Departments
         private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
         {
         }
+        
+        /// <summary>
+        /// On feed ready.
+        /// </summary>
+        private void OnFeedReady()
+        {
+            if (this.feedLoadedFlag == false)
+            {
+                this.feedLoadedFlag = true;
+                DepartmentIndexPage.Feed.OnLoaded -= this.OnFeedReady;
+
+                ChairModel chair = null;
+                ObservableCollection<FacultyModel> tempModelList = DepartmentIndexPage.GetFeed().Model.Faculties;
+
+                foreach (CampusAppWPortalLib8.Model.Departments.FacultyModel model in tempModelList)
+                {
+                    if (chair == null)
+                    {
+                        chair = model.GetChairModel(this.chairName);
+                    }
+                }
+
+                if (chair != null)
+                {
+                    this.WebBrowser.Navigate(new Uri(chair.Url, UriKind.Absolute));
+                }
+                else
+                {
+                    MessageBoxResult res = MessageBox.Show(AppResources.DepartmentNotFound + " " + AppResources.DepartmentForwarding, string.Empty, MessageBoxButton.OKCancel);
+
+                    switch (res)
+                    {
+                        case MessageBoxResult.OK:
+                            {
+                                NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentIndexPage, UriKind.Relative));
+                            }
+                            break;
+                        case MessageBoxResult.Cancel:
+                            {
+                                NavigationService.GoBack();
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+
 
         #endregion
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs
index 1dd9291d..e4e34bbb 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs
@@ -205,7 +205,7 @@ namespace CampusAppWP8.Pages.Departments
             FrameworkElement infoBtn = sender as FrameworkElement;
             string chairName = ((this.lastClickedBtn as Button).Content as TextBlock).Text.ToString();
                         
-            NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentInfoPage + "?url=" + infoBtn.Tag.ToString() + "&name=" + chairName, UriKind.Relative));
+            NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentInfoPage + "?" + Constants.ParamUrl + "=" + infoBtn.Tag.ToString() + "&" + Constants.ParamName + "=" + chairName, UriKind.Relative));
         }
 
         #endregion
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 3a118d49..bc40e0d3 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -195,6 +195,24 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Möchten Sie Weiter zur Lehstuhlübersicht? ähnelt.
+        /// </summary>
+        public static string DepartmentForwarding {
+            get {
+                return ResourceManager.GetString("DepartmentForwarding", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Der angegebene Lehrstuhl konnte nicht gefunden werden. ähnelt.
+        /// </summary>
+        public static string DepartmentNotFound {
+            get {
+                return ResourceManager.GetString("DepartmentNotFound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Events ähnelt.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index bdac3a8f..f8209b30 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -437,4 +437,10 @@
   <data name="PlaceLabel_Type" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="DepartmentForwarding" xml:space="preserve">
+    <value>Möchten Sie Weiter zur Lehstuhlübersicht?</value>
+  </data>
+  <data name="DepartmentNotFound" xml:space="preserve">
+    <value>Der angegebene Lehrstuhl konnte nicht gefunden werden.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index 241f3e53..1f01edf8 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -555,4 +555,7 @@
   <data name="DeploymentNumber" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="ParamName" xml:space="preserve">
+    <value>name</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
index e07539c5..31810529 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
@@ -672,6 +672,15 @@ namespace CampusAppWP8.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die name ähnelt.
+        /// </summary>
+        public static string ParamName {
+            get {
+                return ResourceManager.GetString("ParamName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Uebersicht ähnelt.
         /// </summary>
diff --git a/CampusAppWP8/IconCreator/IconCreator.pyproj b/CampusAppWP8/IconCreator/IconCreator.pyproj
index c25a7b01..3cb39346 100644
--- a/CampusAppWP8/IconCreator/IconCreator.pyproj
+++ b/CampusAppWP8/IconCreator/IconCreator.pyproj
@@ -179,6 +179,7 @@
     <Content Include="srcImages\listicons\lecture.svg" />
     <Content Include="srcImages\listicons\practise.svg" />
     <Content Include="srcImages\listicons\seminar.svg" />
+    <Content Include="srcImages\listicons\speaker.svg" />
     <Content Include="srcImages\optionbuttons\add.svg" />
     <Content Include="srcImages\optionbuttons\add_contact.svg" />
     <Content Include="srcImages\optionbuttons\add_small.svg" />

From d19aae4ff0a476714e4aa418498f9bc7b7d7b44c Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 8 Oct 2013 16:10:39 +0200
Subject: [PATCH 11/11] fixes

---
 CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml | 3 ++-
 CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml       | 4 ++--
 CampusAppWP8/CampusAppWP8/Resources/AppResources.resx         | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml
index 410a5179..c6a55cfc 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml
@@ -57,7 +57,8 @@
                     <Border BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
                         <StackPanel>
                             <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Department, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextGroupHeaderStyle}" Margin="0,0,0,0"/>
-                            <lui:NavigateButton Url="" QuerryStringName="" QuerryStringValue="">
+
+                            <lui:NavigateButton Url="{Binding Path=Constants.PathDepartment_DepartmentInfoPage, Source={StaticResource Const}}" QuerryStringName="{Binding Path=Constants.ParamName, Source={StaticResource Const}}" QuerryStringValue="{Binding Department}">
                                 <TextBlock Text="{Binding Department}" TextWrapping="Wrap"/>
                             </lui:NavigateButton>
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
index bebe0019..10256218 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
@@ -27,7 +27,7 @@
         <StackPanel  Grid.Row="0">
             <header:DefaultHeader HeaderName="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
-        <ListBox x:Name="ResultList" Grid.Row="1">
+        <ListBox x:Name="ResultList" Grid.Row="1" >
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -36,7 +36,7 @@
             </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <Border BorderBrush="{StaticResource PhoneContrastBackgroundBrush}" Style="{StaticResource ListButtonBorder}">
+                    <Border BorderBrush="{StaticResource PhoneContrastBackgroundBrush}" Style="{StaticResource ListButtonBorder}" Margin="12,0,0,0">
                         <StackPanel>
                             <lui:ToggleButton ToggleContentTag="{Binding Path=Constants.ToggleContent, Source={StaticResource Const}}" Style="{StaticResource ListButtonNoneBorder}" HorizontalContentAlignment="Left" >
                                 <Grid HorizontalAlignment="Left">
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index fa4d1fbc..15345313 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -439,6 +439,7 @@
   </data>
   <data name="MensaApp_CloseMensa" xml:space="preserve">
     <value>Die Mensa ist heute geschlossen</value>
+    </data>
   <data name="DepartmentForwarding" xml:space="preserve">
     <value>Möchten Sie Weiter zur Lehstuhlübersicht?</value>
   </data>