From f8f3eb89ec42bb027b43da6705596b60e368cd14 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbe@iit.tu-cottbus.de>
Date: Tue, 15 Oct 2013 15:00:29 +0200
Subject: [PATCH] add scrollviewer to setting and rename menutiems

---
 .../CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml | 94 +++++++++----------
 .../Pages/Setting/AppSettingPage.xaml         | 79 ++++++++--------
 .../Resources/AppResources.Designer.cs        |  4 +-
 .../CampusAppWP8/Resources/AppResources.resx  |  4 +-
 4 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml
index 8d373b3c..edfc8c84 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml
@@ -27,57 +27,57 @@
         <StackPanel  Grid.Row="0">
             <header:DefaultHeader Name="DefHeader" HeaderName="{Binding Path=LocalizedResources.BTUTag_Title, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
+        <ScrollViewer Grid.Row="1" >
+            <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
+            <Grid x:Name="ContentPanel" Margin="24,0,12,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0">
+                    <TextBlock Text="{Binding Path=LocalizedResources.BTUTag_Text, Source={StaticResource LocalizedStrings}}" TextWrapping="Wrap" />
+                    <TextBlock Margin="0,12,0,0">Weitere Informationen zu:</TextBlock>
+                    <Grid Margin="12,0,0,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto"/>
+                            <ColumnDefinition Width="auto" />
+                        </Grid.ColumnDefinitions>
 
-        <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
-        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0">
-                <TextBlock Text="{Binding Path=LocalizedResources.BTUTag_Text, Source={StaticResource LocalizedStrings}}" TextWrapping="Wrap" />
-                <TextBlock Margin="0,12,0,0">Weitere Informationen zu:</TextBlock>
-                <Grid Margin="12,0,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="auto" />
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">NFC:</TextBlock>
-                    <lui:LinkButton Grid.Row="0" Grid.Column="1" Url="http://www.windowsphone.com/de-de/how-to/wp8/basics/tap-to-share-photos-websites-and-more" Height="100" Width="100" />
+                        <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">NFC:</TextBlock>
+                        <lui:LinkButton Grid.Row="0" Grid.Column="1" Url="http://www.windowsphone.com/de-de/how-to/wp8/basics/tap-to-share-photos-websites-and-more" Height="100" Width="100" />
 
 
-                    <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">QR-Codes:</TextBlock>
-                    <lui:LinkButton Grid.Row="1" Grid.Column="1" Url="http://www.windowsphone.com/de-de/how-to/wp8/web/scan-codes-tags-and-text" Height="100" Width="100" />
-                </Grid>
-            </StackPanel>
-            <Border Grid.Row="1" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
-                <StackPanel >
-                    <TextBlock Text="{Binding Path=LocalizedResources.Setting_TagHandler, Source={StaticResource LocalizedStrings}}"/>
-                    <toolkit:ListPicker Name="TagHandler" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderTag, Source={StaticResource LocalizedStrings}}" >
-                        <toolkit:ListPicker.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel>
-                                    <TextBlock Text="{Binding Text}"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </toolkit:ListPicker.ItemTemplate>
-                        <toolkit:ListPicker.FullModeItemTemplate>
-                            <DataTemplate>
-                                <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
-                                    <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
-                                </Border>
-                            </DataTemplate>
-                        </toolkit:ListPicker.FullModeItemTemplate>
-                    </toolkit:ListPicker>
+                        <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">QR-Codes:</TextBlock>
+                        <lui:LinkButton Grid.Row="1" Grid.Column="1" Url="http://www.windowsphone.com/de-de/how-to/wp8/web/scan-codes-tags-and-text" Height="100" Width="100" />
+                    </Grid>
                 </StackPanel>
-            </Border>
-        </Grid>
-
+                <Border Grid.Row="1" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
+                    <StackPanel >
+                        <TextBlock Text="{Binding Path=LocalizedResources.Setting_TagHandler, Source={StaticResource LocalizedStrings}}"/>
+                        <toolkit:ListPicker Name="TagHandler" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderTag, Source={StaticResource LocalizedStrings}}" >
+                            <toolkit:ListPicker.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel>
+                                        <TextBlock Text="{Binding Text}"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </toolkit:ListPicker.ItemTemplate>
+                            <toolkit:ListPicker.FullModeItemTemplate>
+                                <DataTemplate>
+                                    <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
+                                        <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
+                                    </Border>
+                                </DataTemplate>
+                            </toolkit:ListPicker.FullModeItemTemplate>
+                        </toolkit:ListPicker>
+                    </StackPanel>
+                </Border>
+            </Grid>
+        </ScrollViewer>
     </Grid>
 
 </phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
index 86a74b13..67797334 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
@@ -27,45 +27,46 @@
         <StackPanel  Grid.Row="0">
             <header:DefaultHeader Name="DefHeader" HeaderName="{Binding Path=LocalizedResources.Setting_App, Source={StaticResource LocalizedStrings}}"/>
         </StackPanel>
-
-        <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
-        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0">
-                <toolkit:ToggleSwitch Name="GeoWatchToggle" Content="{Binding Path=LocalizedResources.Setting_AppGeoWatch, Source={StaticResource LocalizedStrings}}"></toolkit:ToggleSwitch>
-            </StackPanel>
-            <StackPanel Grid.Row="1">
-                <toolkit:ToggleSwitch Name="OnlyWiFiToggle" Content="{Binding Path=LocalizedResources.Setting_AppOnlyWifi, Source={StaticResource LocalizedStrings}}"></toolkit:ToggleSwitch>
-            </StackPanel>
-            <StackPanel Grid.Row="2">
-                <lui:NavigateButton  Content="{Binding Path=LocalizedResources.BTUTag_Title, Source={StaticResource LocalizedStrings}}" Url="{Binding Path=Constants.PathBTUTag_Info, Source={StaticResource Const}}" />
-            </StackPanel>
-            <StackPanel Grid.Row="3" Margin="12,0,0,0">
-                <TextBlock Text="{Binding Path=LocalizedResources.Setting_TagHandler, Source={StaticResource LocalizedStrings}}"/>
-                <toolkit:ListPicker Name="TagHandler" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderTag, Source={StaticResource LocalizedStrings}}" >
-                    <toolkit:ListPicker.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel>
-                                <TextBlock Text="{Binding Text}"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </toolkit:ListPicker.ItemTemplate>
-                    <toolkit:ListPicker.FullModeItemTemplate>
-                        <DataTemplate>
-                            <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
-                                <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
-                            </Border>
-                        </DataTemplate>
-                    </toolkit:ListPicker.FullModeItemTemplate>
-                </toolkit:ListPicker>
-            </StackPanel>
-        </Grid>
+        <ScrollViewer  Grid.Row="1">
+            <!--ContentPanel - zusätzliche Inhalte hier platzieren-->
+            <Grid x:Name="ContentPanel" Margin="12,0,12,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0">
+                    <toolkit:ToggleSwitch Name="GeoWatchToggle" Content="{Binding Path=LocalizedResources.Setting_AppGeoWatch, Source={StaticResource LocalizedStrings}}"></toolkit:ToggleSwitch>
+                </StackPanel>
+                <StackPanel Grid.Row="1">
+                    <toolkit:ToggleSwitch Name="OnlyWiFiToggle" Content="{Binding Path=LocalizedResources.Setting_AppOnlyWifi, Source={StaticResource LocalizedStrings}}"></toolkit:ToggleSwitch>
+                </StackPanel>
+                <StackPanel Grid.Row="2">
+                    <lui:NavigateButton  Content="{Binding Path=LocalizedResources.BTUTag_Title, Source={StaticResource LocalizedStrings}}" Url="{Binding Path=Constants.PathBTUTag_Info, Source={StaticResource Const}}" />
+                </StackPanel>
+                <StackPanel Grid.Row="3" >
+                    <TextBlock Margin="12,0,0,0" Text="{Binding Path=LocalizedResources.Setting_TagHandler, Source={StaticResource LocalizedStrings}}"/>
+                    <toolkit:ListPicker Name="TagHandler" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderTag, Source={StaticResource LocalizedStrings}}" >
+                        <toolkit:ListPicker.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock Text="{Binding Text}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </toolkit:ListPicker.ItemTemplate>
+                        <toolkit:ListPicker.FullModeItemTemplate>
+                            <DataTemplate>
+                                <Border BorderBrush="{StaticResource PhoneAccentBrush}" BorderThickness="12,0,0,0" Margin="0,0,0,6">
+                                    <TextBlock Text="{Binding Text}"  Style="{StaticResource PhoneTextGroupHeaderStyle}" TextWrapping="Wrap"/>
+                                </Border>
+                            </DataTemplate>
+                        </toolkit:ListPicker.FullModeItemTemplate>
+                    </toolkit:ListPicker>
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
     </Grid>
 
 </phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index cc37727e..3d7817f5 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -952,7 +952,7 @@ namespace CampusAppWP8.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Appeinstellungen ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die App-Einstellungen ähnelt.
         /// </summary>
         public static string Setting_ApplAppBarTitle {
             get {
@@ -970,7 +970,7 @@ namespace CampusAppWP8.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die App-Info ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Über BTU Campus-App ähnelt.
         /// </summary>
         public static string Setting_ImpressumTitle {
             get {
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index 37979585..68c68c5d 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -333,7 +333,7 @@
     <value>Ortung</value>
   </data>
   <data name="Setting_ApplAppBarTitle" xml:space="preserve">
-    <value>Appeinstellungen</value>
+    <value>App-Einstellungen</value>
   </data>
   <data name="MsgBox_ErrorCampusLoc" xml:space="preserve">
     <value>Der aktuelle Campus konnte nicht ermittelt werden. Es wird der im Profil festgelegten Campus verwendet.</value>
@@ -486,6 +486,6 @@
     <value>BTU-Tag-StandardFunktion</value>
   </data>
   <data name="Setting_ImpressumTitle" xml:space="preserve">
-    <value>App-Info</value>
+    <value>Über BTU Campus-App</value>
   </data>
 </root>
\ No newline at end of file