stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release/r#74' into develop

Browse Source
This commit is contained in:
stubbfel
2013-07-03 13:45:05 +02:00
parent 5e5074a534 7056650095
commit 7e65f09ca8
5 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
View File

@@ -14,7 +14,7 @@
<Capability Name="ID_CAP_PHONEDIALER" />
</Capabilities>
<Tasks>
<DefaultTask Name="_default" NavigationPage="pages/StudentCouncil/StudentCouncilPage.xaml" />
<DefaultTask Name="_default" NavigationPage="pages/StartPage.xaml" />
</Tasks>
<Tokens>
<PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">

9
CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs generated
View File

@@ -276,6 +276,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die /Pages/StudentCouncil/StudentCouncilPage.xaml ähnelt.
/// </summary>
internal static string PathStudentCouncil_StudentCouncilPage {
get {
return ResourceManager.GetString("PathStudentCouncil_StudentCouncilPage", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die http://www.zv.tu-cottbus.de/LSFveranst/LSF4 ähnelt.
/// </summary>

3
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
View File

@@ -210,4 +210,7 @@
<data name="UrlStudentCouncil_StudentCouncils" xml:space="preserve">
<value>http://www.tu-cottbus.de/campusapp-data/getdata.php?db=studentcouncils&amp;app=2&amp;appversion=1</value>
</data>
<data name="PathStudentCouncil_StudentCouncilPage" xml:space="preserve">
<value>/Pages/StudentCouncil/StudentCouncilPage.xaml</value>
</data>
</root>

2
CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
View File

@@ -115,7 +115,7 @@
</StackPanel>
</Button>
<Button Name="OSAAppButton" Grid.Row="3" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0" IsEnabled="False">
<Button Name="OSAAppButton" Grid.Row="3" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0" Click="OpenStudentCouncilApp">
<StackPanel Height="auto" Margin="-12,-12,-12,-12">
<Image Source="{Binding Path=ThemelizedIcon.StudentCouncil, Source={StaticResource ThemelizedIcons}}" Height="100" Visibility="Visible"/>
<TextBlock Text="{Binding Path=LocalizedResources.OSAApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />

11
CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
View File

@@ -141,5 +141,16 @@ namespace CampusAppWP8.Pages
Uri url = new Uri(Constants.PathLinks_LinkPage, UriKind.Relative);
NavigationService.Navigate(url);
}
/// <summary>
/// Opens the StudentCouncilpage.
/// </summary>
/// <param name="sender">link button</param>
/// <param name="e">event args</param>
private void OpenStudentCouncilApp(object sender, RoutedEventArgs e)
{
Uri url = new Uri(Constants.PathStudentCouncil_StudentCouncilPage, UriKind.Relative);
NavigationService.Navigate(url);
}
}
}