diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml index 99b2348a..39ce5412 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml @@ -18,231 +18,274 @@ - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index e444dcfc..c083222b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -54,52 +54,6 @@ namespace CampusAppWP8.Pages { this.InitializeComponent(); - ApplicationBarMenuItem menuItem1 = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem; - ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem; - ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem; - ApplicationBarMenuItem menuItem4 = ApplicationBar.MenuItems[3] as ApplicationBarMenuItem; - ApplicationBarMenuItem menuItem5 = ApplicationBar.MenuItems[4] as ApplicationBarMenuItem; - ApplicationBarMenuItem menuItem6 = ApplicationBar.MenuItems[5] as ApplicationBarMenuItem; - - if (menuItem1 != null) - { - menuItem1.Text = AppResources.Setting_UserProfilAppBarTitle; - } - - if (menuItem2 != null) - { - menuItem2.Text = AppResources.Setting_ApplAppBarTitle; - } - - if (menuItem3 != null) - { - menuItem3.Text = AppResources.App_ScanQR; - } - - if (menuItem4 != null) - { - menuItem4.Text = AppResources.App_ScanNfc; - } - - if (menuItem5 != null) - { - menuItem5.Text = AppResources.Setting_ImpressumTitle; - } - else - { - /* - ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1); - ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1); - */ - ApplicationBar.MenuItems.Remove(menuItem3); - ApplicationBar.MenuItems.Remove(menuItem4); - } - - if (menuItem6 != null) - { - menuItem6.Text = AppResources.TimeTableApp_Title; - } - TimeTable.TimeTable.InitFeed(); @@ -184,24 +138,24 @@ namespace CampusAppWP8.Pages //this.ContentPanel.Margin = new Thickness(12, 0, 12, 12); //this.AppTitle.Margin = new Thickness(12, 17, 0, 28); - if (!this.Row0.Children.Contains(this.MailAppButton) - && !this.Row1.Children.Contains(this.OpenHoursAppButton) - && !this.Row2.Children.Contains(this.LinkAppButton)) - { - return; - } + /* if (!this.Row0.Children.Contains(this.MailAppButton) + && !this.Row1.Children.Contains(this.OpenHoursAppButton) + && !this.Row2.Children.Contains(this.LinkAppButton)) + { + return; + } - this.Row0.Children.Remove(this.MailAppButton); - this.Row3.Children.Add(this.MailAppButton); - this.MailAppButton.SetValue(Grid.ColumnProperty, 0); + this.Row0.Children.Remove(this.MailAppButton); + this.Row3.Children.Add(this.MailAppButton); + this.MailAppButton.SetValue(Grid.ColumnProperty, 0); - this.Row1.Children.Remove(this.OpenHoursAppButton); - this.Row3.Children.Add(this.OpenHoursAppButton); - this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 1); + this.Row1.Children.Remove(this.OpenHoursAppButton); + this.Row3.Children.Add(this.OpenHoursAppButton); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 1); - this.Row2.Children.Remove(this.LinkAppButton); - this.Row3.Children.Add(this.LinkAppButton); - this.LinkAppButton.SetValue(Grid.ColumnProperty, 2); + this.Row2.Children.Remove(this.LinkAppButton); + this.Row3.Children.Add(this.LinkAppButton); + this.LinkAppButton.SetValue(Grid.ColumnProperty, 2); */ } /// Raises the orientation changed event. @@ -217,7 +171,7 @@ namespace CampusAppWP8.Pages //this.ContentPanel.Margin = new Thickness(76, -24, 24, 0); // LandscapeRight //this.ContentPanel.Margin = new Thickness(24, -24, 76, 0); // LandscapeLeft //this.AppTitle.Margin = new Thickness(12, 17, 0, 28); - +/* if (!this.Row3.Children.Contains(this.MailAppButton) && !this.Row3.Children.Contains(this.OpenHoursAppButton) && !this.Row3.Children.Contains(this.LinkAppButton)) @@ -235,7 +189,7 @@ namespace CampusAppWP8.Pages this.Row3.Children.Remove(this.LinkAppButton); this.Row2.Children.Add(this.LinkAppButton); - this.LinkAppButton.SetValue(Grid.ColumnProperty, 3); + this.LinkAppButton.SetValue(Grid.ColumnProperty, 3);*/ } /// Method Navigate to diff --git a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml index 1aec455a..a65e6405 100644 --- a/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml +++ b/CampusAppWP8/CampusAppWP8/Styles/StartPageStyles.xaml @@ -16,8 +16,8 @@ - - + +