9 files changed, 76 insertions, 20 deletions
diff --git a/view/nav.tpl b/view/nav.tpl
index cf1c2a227..b6caa2c23 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -43,6 +43,7 @@
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="/notifications/network">See all notifications</a></li>
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
diff --git a/view/notifications.tpl b/view/notifications.tpl
new file mode 100644
index 000000000..8656ea9d1
--- /dev/null
+++ b/view/notifications.tpl
@@ -0,0 +1,13 @@
+
+<h1>Notifications</h1>
+
+<p id="notification-listing-desc">
+	<a href="/notifications/network" class="button tabs {{if $activetab==network}}active{{endif}}">Network</a>
+	<a href="/notifications/home" class="button tabs {{if $activetab==home}}active{{endif}}">Home</a>
+	<a href="/notifications/intros" class="button tabs {{if $activetab==intros}}active{{endif}}">Introductions</a>
+	<a href="/message" class="button tabs">Messages</a>
+</p>
+
+<div class="notif-network-wrapper">
+	$notif_content
+</div>
diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl
new file mode 100644
index 000000000..96327b2d8
--- /dev/null
+++ b/view/notifications_comments_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl
new file mode 100644
index 000000000..96327b2d8
--- /dev/null
+++ b/view/notifications_dislikes_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/notifications_friends_item.tpl b/view/notifications_friends_item.tpl
new file mode 100644
index 000000000..96327b2d8
--- /dev/null
+++ b/view/notifications_friends_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/notifications_likes_item.tpl b/view/notifications_likes_item.tpl
new file mode 100644
index 000000000..96327b2d8
--- /dev/null
+++ b/view/notifications_likes_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl
new file mode 100644
index 000000000..f398f1210
--- /dev/null
+++ b/view/notifications_network_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="{$item_link}"><img src="{$item_image}" class="notif-image">{$item_text} <span class="notif-when">{$item_when}</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index baf5f7d30..3fbd73e31 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -9,6 +9,7 @@
 		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
 		{{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
 		<ul id="nav-notifications-menu" class="menu-popup">
+			<li id="nav-notifications-see-all"><a href="/notifications/network">See all notifications</a></li>
 			<li class="empty">$emptynotifications</li>
 		</ul>
 	</div>
@@ -54,5 +55,5 @@
 </nav>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<a href="{0}"><li>{2} <span class="notif-when">{3}</span></li></a>
+	<li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 5e31a2c8a..fd7482ba3 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -25,7 +25,7 @@ body {
 	font-family: freesans,helvetica,arial,clean,sans-serif;
 	font-size: 15px;
 	color: #626262;
-	width: 100%;
+	width: 100%;	
 }
 
 img {  border: 0 none; max-width: 550px; }
@@ -113,10 +113,13 @@ input[type=submit]:active {
 ::-moz-selection { background:#fdf795; color: #000; /* Firefox */ }
 
 section {
-	margin: 20px 11% 0px 11%;
+	float: left;
+	margin-left: 8%;
+	padding-top: 50px;
+	width: 50%;	
+	margin: 20px 0px 30px 10%;
 	font-size: 0.9em;
 	line-height: 1.2em;
-	padding-right: 230px;
 }
 
 .lframe {
@@ -256,9 +259,11 @@ section {
 /* ======= */
 
 nav {
+	z-index: 10000;
 	height: 50px;
 	display: block;
-	position: relative;
+	position: fixed;
+	width: 100%;
 	padding: 0px 10%;
 	color: #efefef;
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
@@ -273,7 +278,7 @@ nav a:hover { text-decoration: none;	color: #eeeeec; border:0px;}
 nav #banner {
 	display: block;
 	position: absolute;
-	margin-left: 20px;
+	margin-left: 10px;
 	margin-top: 5px;
 	padding-bottom:5px;	
 }
@@ -288,7 +293,7 @@ nav #user-menu {
     display: block;	
 	width: 250px;
     float: right;
-	margin-right:15px;
+	margin-right:20%;
     margin-top: 10px;
 	padding: 5px;
     position: relative;
@@ -361,7 +366,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 #notifications {
 	height: 32px;
 	position: absolute;
-	top:10px; left: 40%;
+	top:10px; left: 35%;
 }
 .nav-ajax-update {
 	width: 44px;
@@ -431,10 +436,11 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 /* ================= */
 
 aside {
-    position: absolute;
-    right: 11%;
-	width: 260px;
-	margin-top: auto;
+	float: right;
+    margin-right: 10%;
+	/*width: 21%;*/
+	width: 250px;
+	margin-top: 50px;
     font-size: 0.8em;
 	font-style: bold;
 }
@@ -475,16 +481,15 @@ aside a{
 
 aside h4 { font-size: 1.3em; }
 
-aside #viewcontacts {
+.allcontact-link {
+	color: #626262;
 	text-align: center;
 	font-weight: bold;
 	font-variant:small-caps;
 	font-size: 1.1em;
-	padding-top: 5px;
 }
-
-#viewcontacts a {
-	color: #898989;
+.allcontact-link a {
+	padding-bottom: 10px;
 }
 
 #profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
@@ -841,7 +846,7 @@ profile-jot-banner-wrapper {
 /* ========= */
 
 .wall-item-outside-wrapper {
-	max-width: 83%;
+	max-width: 93%;
 	border-bottom: 1px solid #dedede;
 	margin-top: 20px;
 	padding-right: 10px;
@@ -2341,6 +2346,7 @@ margin-left: 0px;
 	padding: 20px;
 	padding-top: 10px;
 	margin: 0 0px;
+	margin-bottom: 10px;
 	background-color: #fff;
 	-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 	-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
@@ -3030,7 +3036,7 @@ ul.menu-popup {
 #nav-notifications-menu {
 	width: 320px;
 	max-height: 400px;
-	overflow-y: scroll;
+	overflow-y: scroll;overflow-style:scrollbar;
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
 	background:-moz-linear-gradient( center top, #797979 5%, #898988 100% );
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
@@ -3049,7 +3055,7 @@ ul.menu-popup {
 #nav-notifications-menu img { float: left; margin-right: 5px; }
 #nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
 #nav-notifications-menu li {
-	padding: 7px 10px 7px 10px;
+	padding: 7px 0px 7px 10px;
 	word-wrap:normal;
 	border-bottom: 1px solid #626262;
 }
@@ -3060,3 +3066,23 @@ ul.menu-popup {
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
 	background-color:#b20202;
 }
+
+.notif-item a {
+	vertical-align: middle;
+	color: #626262;
+	padding-bottom: 7px;
+}
+
+.notif-item a:hover {
+	color: #b20202;
+}
+
+.notif-image {
+	width: 32px;
+	height: 32px;
+	padding: 7px 7px 0px 0px;
+}
+
+#jGrowl {
+	z-index: 20000;
+}
+\ No newline at end of file