- moved the header for profile permissions out of the scrolling div

- tweaks to the testbubble theme's nav

3 files changed, 30 insertions, 10 deletions

diff --git a/mod/profperm.php b/mod/profperm.php
index 33479cad1..8d09c429c 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -109,9 +109,11 @@ function profperm_content(&$a) {
 	$o .= '<div id="prof-update-wrapper">';
 	if($change) 
 		$o = '';
-
-	$o .= '<div id="prof-members">';
+	
+	$o .= '<div id="prof-members-title">';
 	$o .= '<h3>' . t('Visible To') . '</h3>';
+	$o .= '</div>';
+	$o .= '<div id="prof-members">';
 
 	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 
@@ -123,9 +125,12 @@ function profperm_content(&$a) {
 	}
 	$o .= '</div><div id="prof-members-end"></div>';
 	$o .= '<hr id="prof-separator" />';
-	$o .= '<div id="prof-all-contacts">';
 
-		$o .= '<h3>' . t("All Contacts \x28with secure profile access\x29") . '</h3>';
+	$o .= '<div id="prof-all-contcts-title">';
+	$o .= '<h3>' . t("All Contacts \x28with secure profile access\x29") . '</h3>';
+	$o .= '</div>';
+	$o .= '<div id="prof-all-contacts">';
+		
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 
 			AND `network` = 'dfrn' ORDER BY `name` ASC",
 			intval(local_user())
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index 38d2dfac6..80bcfbeb1 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -6,7 +6,7 @@
 	<div id="notifications">
 		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
 		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-		{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
+		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
 		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
 	</div>
 
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index a468296fb..03f50762b 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -377,7 +377,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 }
 #net-update { background-position: 0px 0px; }
 #mail-update { background-position: 0px -40px; }
-#notify-update { background-position: 0px -84px; }
+#intro-update { background-position: 0px -84px; }
 #home-update { background-position: 0px -126px; }
 
 #lang-select-icon {
@@ -848,7 +848,12 @@ profile-jot-banner-wrapper {
 }
 
 .wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; max-width: 100%; }
+.wall-item-content-wrapper {
+	position: relative;
+	max-width: 100%;
+	word-wrap: break-word;
+}
+
 .wall-item-photo-menu { display: none;}
 .wall-item-photo-menu-button {
 	display:none;
@@ -1192,7 +1197,8 @@ div[id$="wrapper"] br { clear: left; }
 
 #profile-listing-new-link-wrapper {
 	float: left;
-	display: inline;
+	display: inline-block;
+	clear: right;
 	width: 130px;
 	margin-left:5px;
 	margin-top: 20px;
@@ -2022,7 +2028,7 @@ margin-left: 0px;
 	border-radius:5px;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
-	font-size: 1.2em;
+	font-size: 1em;
 	text-align: center;	
 }
 
@@ -2181,7 +2187,12 @@ margin-left: 0px;
 
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px}
+.profile-listing {
+	float: left;
+	clear: left;
+	display: inline;
+	margin: 20px 20px 0px 0px;
+}
 
 #profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
 
@@ -2245,6 +2256,10 @@ margin-left: 0px;
 
 #group-edit-desc { margin: 10px 0xp; }
 #group-new-text {font-size: 1.1em;}
+#prof-members-title,#prof-all-contcts-title {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
 #group-members,
 #prof-members {
 	width: 83%;