From 8c2ce5db35af168ca198a965a4756b33a5b274ef Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Wed, 27 Nov 2013 12:12:44 +0100
Subject: [PATCH] refactor impressum

---
 .../Pages/Setting/AppSettingPage.xaml         |  2 +-
 .../CampusAppWP8/Pages/Setting/Impressum.xaml | 54 ++++++++++++++++---
 .../CampusAppWP8/Pages/StartPage.xaml         | 25 +++------
 .../CampusAppWP8/Pages/StartPage.xaml.cs      |  8 +--
 .../Resources/AppResources.Designer.cs        |  2 +-
 .../CampusAppWP8/Resources/AppResources.resx  |  2 +-
 .../CampusAppWP8/Styles/StartPageStyles.xaml  |  4 +-
 7 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
index 8cf1bb9d..91ccc82c 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
@@ -26,7 +26,7 @@
 
         <!--TitlePanel enthält den Namen der Anwendung und den Seitentitel-->
         <StackPanel  Grid.Row="0">
-            <header:DefaultHeader Name="DefHeader" HeaderName="{Binding Path=LocalizedResources.Setting_General, Source={StaticResource LocalizedStrings}}"/>
+            <header:DefaultHeader x:Name="DefHeader" HeaderName="{Binding Path=LocalizedResources.Setting_General, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
         <phone:Pivot Grid.Row="1" Name="GeneralSettingPivot">
             <phone:Pivot.HeaderTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml
index cba5a15d..ad1ea792 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/Impressum.xaml
@@ -29,10 +29,13 @@
 
         <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
         <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
+            <ScrollViewer>
             <StackPanel Margin="12">
-                <TextBlock>Name: BTU Campus-App</TextBlock>
-                <TextBlock>Version: 1.0</TextBlock>
-                <TextBlock>Kontakt:</TextBlock>
+                <TextBlock Style="{StaticResource PhoneTextGroupHeaderStyle}">Name</TextBlock>
+                <TextBlock Style="{StaticResource PhoneTextTitle2Style}" Margin="24,0,0,12">BTU CampusApp</TextBlock>
+                <TextBlock Style="{StaticResource PhoneTextGroupHeaderStyle}">Version</TextBlock>
+                <TextBlock Style="{StaticResource PhoneTextTitle2Style}" Margin="24,0,0,12">1.1</TextBlock>
+                <TextBlock Style="{StaticResource PhoneTextGroupHeaderStyle}">Kontakt:</TextBlock>
                 <Grid Margin="12,0,0,0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
@@ -43,19 +46,56 @@
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">Email:</TextBlock>
+                    <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource PhoneTextTitle2Style}">Email:</TextBlock>
                     <lui:EmailButton Grid.Row="0" Grid.Column="1" EmailAddress="campusapp@tu-cottbus.de" Height="100" />
 
 
-                    <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Website:</TextBlock>
+                    <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource PhoneTextTitle2Style}">Website:</TextBlock>
                     <lui:LinkButton Grid.Row="1" Grid.Column="1" Url="http://www.tu-cottbus.de/btu/de/service/redaktionssystem/?beitrag_id=80012374" Height="100"/>
 
 
-                    <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Facebook:</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource PhoneTextTitle2Style}">Facebook:</TextBlock>
                     <lui:LinkButton Grid.Row="2" Grid.Column="1" Url="https://www.facebook.com/btucampusapp" Height="100"/>
 
                 </Grid>
-            </StackPanel>
+                    <TextBlock Style="{StaticResource PhoneTextGroupHeaderStyle}">Versionshinweise</TextBlock>
+                    <TextBlock Style="{StaticResource PhoneTextTitle2Style}" Margin="24,0,0,12">Version 1.1:</TextBlock>
+                    <TextBlock TextWrapping="Wrap" Margin="36,0,0,0">
+                        - neue Funktionen:<LineBreak/>
+                            - Stundenplan<LineBreak/>
+                            - Wahl der Akzentfarbe<LineBreak/>
+                        - Änderungen<LineBreak/>
+                            - Überarbeitetes Layout der Startseite<LineBreak/>
+                            - Überarbeitetes Einstellungsmenu<LineBreak/>
+                            - Überarbeitet Raumübersicht<LineBreak/>
+                    </TextBlock>
+                    <TextBlock Style="{StaticResource PhoneTextTitle2Style}" Margin="24,0,0,12">Version 1.0.0.1:</TextBlock>
+                    <TextBlock TextWrapping="Wrap" Margin="36,0,0,0">
+                        - Bugfixes:<LineBreak/>
+                            - Beseitigung eines Fehler beim starten der App<LineBreak/>
+                    </TextBlock>
+                    <TextBlock Style="{StaticResource PhoneTextTitle2Style}" Margin="24,0,0,12">Version 1.0:</TextBlock>
+                    <TextBlock TextWrapping="Wrap"  Margin="36,0,0,0">
+                        Initaler Release <LineBreak/>
+                        Funktionsübersicht:<LineBreak/>
+                        - Vorlesungsverzeichnis (Vorlesungen, Übungen, Prüfungen etc.)<LineBreak/>
+                        - Mensaplan<LineBreak/>
+                        - Lehrstuhlübersicht<LineBreak/>
+                        - Fachschaftenübersicht<LineBreak/>
+                        - Prüfungsordnung<LineBreak/>
+                        - Personsuche (Mitarbeiter)<LineBreak/>
+                        - BTU Webmail<LineBreak/>
+                        - Öffnungszeiten<LineBreak/>
+                        - Verzeichnis mit nützlichen Links<LineBreak/>
+                        - News und Events rund um den Campus<LineBreak/>
+                            - mit Text-to-Speech−Funktion<LineBreak/>
+                        - Campusplan :<LineBreak/>
+                            - Gebäudesuchfunktion<LineBreak/>
+                            - Lokalisierung mittles GPS oder BTU-Tag (QR-Codes, NFC-Tags)<LineBreak/>
+                            - Ebenenpläne für das IKMZ und MZG<LineBreak/>
+                    </TextBlock>
+                </StackPanel>
+            </ScrollViewer>
         </Grid>
     </Grid>
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
index 4e3573d2..67902576 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
@@ -1,4 +1,4 @@
-<page:PortraitLandscapePage
+<phone:PhoneApplicationPage 
     x:Class="CampusAppWP8.Pages.StartPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,11 +8,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button"
     xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit"
-    xmlns:page="clr-namespace:CampusAppWP8.Utility.Lui.Page"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
-    SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
+    SupportedOrientations="Portrait" Orientation="Portrait"
     mc:Ignorable="d"
     shell:SystemTray.IsVisible="True">
 
@@ -27,8 +26,7 @@
 
             <!--Panoramaelement eins-->
                 <phone:PanoramaItem Name="Item1">
-                <ScrollViewer Name="scoller1"  Margin="12 -24 12 0">
-                    <StackPanel>
+                    <StackPanel  Margin="12 -24 12 0">
                         <lui:NavigateButton Name="TimeTableAppButton" Style="{StaticResource StartPageButtonLong}" Grid.Column="0" Url="{Binding Path=Constants.PathTimeTable_Day, Source={StaticResource Const}}">
                             <StackPanel Style="{StaticResource StartPageStackPanelStyleLong}">
                                 <StackPanel Background="{StaticResource PhoneAccentBrush}" Margin="0 0 12 0">
@@ -121,14 +119,12 @@
                             </toolkit:ContextMenuService.ContextMenu>
                         </lui:NavigateButton>
                     </StackPanel>
-                </ScrollViewer>
             </phone:PanoramaItem>
 
             <!--Panoramaelement zwei-->
             <phone:PanoramaItem Orientation="Horizontal"
                                 Name="Item2">
-                <ScrollViewer Name="scoller2" Margin="12 -24 12 0">
-                    <StackPanel>
+                    <StackPanel Margin="12 -24 12 0">
                         <Grid Name="Row0">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
@@ -237,7 +233,7 @@
                             <lui:NavigateButton Name="OpenHoursAppButton" Url="{Binding Path=Constants.PathOpeninghours_OpeninghoursPage, Source={StaticResource Const}}" Grid.Column="1" Style="{StaticResource StartPageButton}">
                                 <StackPanel Style="{StaticResource StartPageStackPanelStyle}">
                                     <Image Source="{Binding Path=ThemelizedIcon.Openhours, Source={StaticResource ThemelizedIcons}}" Style="{StaticResource StartPageButtonImg}"/>
-                                    <TextBlock Name="OpenHoursAppButtonText"  Text="{Binding Path=LocalizedResources.OpenHoursApp_Title, Source={StaticResource LocalizedStrings}}" Style="{StaticResource StartPageButtonText}"/>
+                                    <TextBlock Name="OpenHoursAppButtonText"  Text="{Binding Path=LocalizedResources.OpenHoursApp_Title2, Source={StaticResource LocalizedStrings}}" Style="{StaticResource StartPageButtonText}"/>
                                 </StackPanel>
                                 <toolkit:ContextMenuService.ContextMenu>
                                     <toolkit:ContextMenu>
@@ -273,7 +269,6 @@
                             </lui:NavigateButton>
                         </Grid>
                     </StackPanel>
-                </ScrollViewer>
             </phone:PanoramaItem>
 
             <!--Panoramaelement drei
@@ -305,7 +300,6 @@
             </phone:PanoramaItem>-->
 
                 <phone:PanoramaItem Header="Einstellungen" Name="Item3">
-                <ScrollViewer Name="scoller3">
                     <StackPanel Background="{StaticResource PhoneSemitransparentBrush}" VerticalAlignment="Top">
                         <lui:NavigateButton Url="{Binding Path=Constants.PathSetting_User, Source={StaticResource Const}}" BorderThickness="0" HorizontalContentAlignment="Left">
                             <TextBlock Text="{Binding Path=LocalizedResources.Setting_UserInfo, Source={StaticResource LocalizedStrings}}" HorizontalAlignment="Left" Style="{StaticResource PhoneTextTitle2Style}" />
@@ -313,18 +307,15 @@
                         <lui:NavigateButton Url="{Binding Path=Constants.PathSetting_App, Source={StaticResource Const}}" BorderThickness="0" HorizontalContentAlignment="Left">
                             <TextBlock Text="{Binding Path=LocalizedResources.Setting_General, Source={StaticResource LocalizedStrings}}" HorizontalAlignment="Left" Style="{StaticResource PhoneTextTitle2Style}" />
                         </lui:NavigateButton>
-                        <lui:NavigateButton Url="{Binding Path=Constants.PathSetting_App, Source={StaticResource Const}}" BorderThickness="0" HorizontalContentAlignment="Left">
+                       <!-- <lui:NavigateButton Url="{Binding Path=Constants.PathSetting_App, Source={StaticResource Const}}" BorderThickness="0" HorizontalContentAlignment="Left">
                             <TextBlock Text="{Binding Path=LocalizedResources.Setting_Other, Source={StaticResource LocalizedStrings}}" HorizontalAlignment="Left" Style="{StaticResource PhoneTextTitle2Style}" />
-                        </lui:NavigateButton>
+                        </lui:NavigateButton> -->
                         <lui:NavigateButton Url="{Binding Path=Constants.PathSetting_Impressum, Source={StaticResource Const}}" BorderThickness="0" HorizontalContentAlignment="Left">
                             <TextBlock Text="{Binding Path=LocalizedResources.Setting_ImpressumTitle, Source={StaticResource LocalizedStrings}}" HorizontalAlignment="Left" Style="{StaticResource PhoneTextTitle2Style}" />
                         </lui:NavigateButton>
                     </StackPanel>
-                </ScrollViewer>
             </phone:PanoramaItem>
 
         </phone:Panorama>
     </Grid>
-
-
-</page:PortraitLandscapePage>
\ No newline at end of file
+</phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
index ed3ee63b..a125d5cd 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
@@ -12,27 +12,23 @@ namespace CampusAppWP8.Pages
     using System.Runtime.InteropServices.WindowsRuntime;
     using System.Threading;
     using System.Windows;
-    using System.Windows.Controls;
     using System.Windows.Navigation;
     using CampusAppWP8.Feed.Utility;
     using CampusAppWP8.File.Places;
     using CampusAppWP8.Model.Setting;
-    using CampusAppWP8.Pages.TimeTable;
     using CampusAppWP8.Resources;
     using CampusAppWP8.Utility;
     using CampusAppWP8.Utility.Lui.MessageBoxes;
     using CampusAppWP8.Utility.Lui.Page;
     using CampusAppWP8.Utility.Lui.Tiles;
     using CampusAppWP8.Utility.NDEF;
-    using Microsoft.Phone.Controls;
-    using Microsoft.Phone.Shell;
     using Windows.Networking.Proximity;
-    using System.Windows.Media;
+    using Microsoft.Phone.Controls;
 
     /// <summary> Class for the StartPage. </summary>
     /// <remarks> Stubbfel, 15.10.2013. </remarks>
     /// <seealso cref="T:Microsoft.Phone.Controls.PhoneApplicationPage"/>
-    public partial class StartPage : PortraitLandscapePage
+    public partial class StartPage : PhoneApplicationPage
     {
         #region Member
 
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index f339bccb..55e6f33d 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -1303,7 +1303,7 @@ namespace CampusAppWP8.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Über BTU Campus-App ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Über BTU CampusApp ähnelt.
         /// </summary>
         public static string Setting_ImpressumTitle {
             get {
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index eb852176..f3d9f5fd 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -570,7 +570,7 @@
     <value>BTU-Tag-Standardfunktion</value>
   </data>
   <data name="Setting_ImpressumTitle" xml:space="preserve">
-    <value>Über BTU Campus-App</value>
+    <value>Über BTU CampusApp</value>
   </data>
   <data name="BTUTag_WrongTag" xml:space="preserve">
     <value>Der eingescannte Tag ist kein BTU-Tag</value>
diff --git a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml
index c6db84ac..73e98eca 100644
--- a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml
+++ b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml
@@ -22,8 +22,8 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="Width" Value="200"/>
-        <Setter Property="Height" Value="200"/>
+        <Setter Property="Width" Value="193"/>
+        <Setter Property="Height" Value="193"/>
         <Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
     </Style>
     <Style x:Key="StartPageButtonLong" TargetType="Button">