Merge https://github.com/friendica/red into pending_merge

3 files changed, 10 insertions, 3 deletions

diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 9ccc171fe..6225c0980 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -55,6 +55,8 @@ function bookmarks_content(&$a) {
 
 	$o = profile_tabs($a,true,$channel['channel_address']);
 
+ 	$o .= '<div class="generic-content-wrapper">';
+
 	$o .= '<h3>' . t('My Bookmarks') . '</h3>';
 
 	$x = menu_list(local_user(),'',MENU_BOOKMARK);
@@ -78,7 +80,7 @@ function bookmarks_content(&$a) {
 		}
 	}
 
-
+	$o .= '</div>';
 
 	return $o;
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 063e714e7..cde768b1e 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -766,6 +766,9 @@ logger('extra_fields: ' . print_r($extra_fields,true));
 						: '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
 				));
 			}
+			
+			$o .= '</div>';
+			
 		}
 		return $o;
 	}
diff --git a/mod/webpages.php b/mod/webpages.php
index efaf3c4bf..341e75a0c 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -81,6 +81,8 @@ function webpages_content(&$a) {
 	require_once('include/conversation.php');
 	$o = profile_tabs($a,true);
 
+	$o .= '<div class="generic-content-wrapper">';
+
 	$o .= '<h2>' . t('Webpages') . '</h2>';
 
 	$x = array(
@@ -95,7 +97,7 @@ function webpages_content(&$a) {
 		'mimetype' => $mimetype,
 		'layout' => $layout,
 	);
-
+	
 	if($_REQUEST['title'])
 		$x['title'] = $_REQUEST['title'];
 	if($_REQUEST['body'])
@@ -105,7 +107,6 @@ function webpages_content(&$a) {
 
 	$o .= status_editor($a,$x);
 
-
 	// Get a list of webpages.  We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
 	//TODO - this should be replaced with pagelist_widget
 
@@ -142,5 +143,6 @@ function webpages_content(&$a) {
 
 ));
 
+	$o .= '</div>'; 
 
 }