diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml index 41b7eb21..b0abbe4c 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml @@ -6,6 +6,7 @@ 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:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" @@ -20,12 +21,8 @@ - - - - - - + + @@ -39,8 +36,8 @@ - diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs index e79b9981..b94a4a7f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs @@ -66,7 +66,7 @@ namespace CampusAppWP8.Pages.Departments protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - this.progressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) { @@ -95,7 +95,7 @@ namespace CampusAppWP8.Pages.Departments this.isSourceSet = true; } - this.progressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml index b1f6f8b6..d8cd2952 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.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}" @@ -18,16 +19,12 @@ - + - - - - - - + + @@ -38,7 +35,7 @@ - diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs index e4e34bbb..b3189a4e 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs @@ -66,7 +66,7 @@ namespace CampusAppWP8.Pages.Departments protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - this.progressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) { @@ -113,7 +113,7 @@ namespace CampusAppWP8.Pages.Departments } } - this.progressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml index 059d98f6..f680cfc0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml @@ -22,9 +22,8 @@ - - - + + - +