diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
index a84c2441..7ff46edf 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
@@ -31,17 +31,27 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs
index 0103c535..2520c3b7 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs
@@ -11,6 +11,7 @@ namespace CampusAppWP8.Pages.Events
using System;
using System.Linq;
using System.Windows;
+ using System.Windows.Controls;
using System.Windows.Navigation;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Tasks;
@@ -98,9 +99,37 @@ namespace CampusAppWP8.Pages.Events
FrameworkElement fe = sender as FrameworkElement;
// Open the webbrowser
- WebBrowserTask webBrowserTask = new WebBrowserTask();
- webBrowserTask.Uri = new Uri(fe.Tag.ToString(), UriKind.Absolute);
- webBrowserTask.Show();
+ Grid grfe = fe.Parent as Grid;
+ FrameworkElement eventTextGrid = null;
+ FrameworkElement eventWeb = null;
+
+ foreach (FrameworkElement tempElem in grfe.Children)
+ {
+ if (tempElem.Name == "EventTextGrid")
+ {
+ eventTextGrid = tempElem;
+ }
+ else if (tempElem.Name == "WebBrowser")
+ {
+ eventWeb = tempElem;
+ }
+ }
+
+ if ((eventTextGrid != null)
+ && (eventWeb != null))
+ {
+ if (eventTextGrid.Visibility == Visibility.Visible)
+ {
+ eventTextGrid.Visibility = Visibility.Collapsed;
+ eventWeb.Visibility = Visibility.Visible;
+ (eventWeb as WebBrowser).Navigate(new Uri(fe.Tag.ToString(), UriKind.Absolute));
+ }
+ else
+ {
+ eventWeb.Visibility = Visibility.Collapsed;
+ eventTextGrid.Visibility = Visibility.Visible;
+ }
+ }
}
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
index dd9cb0a4..5fe92308 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
@@ -31,17 +31,26 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
index 228678d3..6b13789f 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
@@ -11,6 +11,7 @@ namespace CampusAppWP8.Pages.News
using System;
using System.Linq;
using System.Windows;
+ using System.Windows.Controls;
using System.Windows.Navigation;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Tasks;
@@ -99,9 +100,37 @@ namespace CampusAppWP8.Pages.News
FrameworkElement fe = sender as FrameworkElement;
// Open the webbrowser
- WebBrowserTask webBrowserTask = new WebBrowserTask();
- webBrowserTask.Uri = new Uri(fe.Tag.ToString(), UriKind.Absolute);
- webBrowserTask.Show();
+ Grid grfe = fe.Parent as Grid;
+ FrameworkElement newsTextGrid = null;
+ FrameworkElement newsWeb = null;
+
+ foreach (FrameworkElement tempElem in grfe.Children)
+ {
+ if (tempElem.Name == "NewsTextGrid")
+ {
+ newsTextGrid = tempElem;
+ }
+ else if (tempElem.Name == "WebBrowser")
+ {
+ newsWeb = tempElem;
+ }
+ }
+
+ if ((newsTextGrid != null)
+ && (newsWeb != null))
+ {
+ if (newsTextGrid.Visibility == Visibility.Visible)
+ {
+ newsTextGrid.Visibility = Visibility.Collapsed;
+ newsWeb.Visibility = Visibility.Visible;
+ (newsWeb as WebBrowser).Navigate(new Uri(fe.Tag.ToString(), UriKind.Absolute));
+ }
+ else
+ {
+ newsWeb.Visibility = Visibility.Collapsed;
+ newsTextGrid.Visibility = Visibility.Visible;
+ }
+ }
}
}
}