Merge pull request #1627 from rabuzarus/section-title

move html of h2 headings to section_title.tpl

include/profile_advanced.php

@@ -4,7 +4,9 @@ function advanced_profile(&$a) {
 
 	$o = '';
 
-	$o .= '<h2>' . t('Profile') . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => t('Profile')
+	));
 
 	if($a->profile['name']) {
 
@@ -81,13 +83,13 @@ function advanced_profile(&$a) {
 		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
 		
 		if ($a->profile['uid'] == local_user())
-      $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+			$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
 		
-        return replace_macros($tpl, array(
+		return replace_macros($tpl, array(
-          '$title' => t('Profile'),
+			'$title' => t('Profile'),
-          '$profile' => $profile
+			'$profile' => $profile
-        ));
+		));
-    }
+	}
 
 	return '';
 }

mod/allfriends.php

@@ -21,19 +21,21 @@ function allfriends_content(&$a) {
 	);
 
 	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
-                '$name' => $c[0]['name'],
+		'$name'  => $c[0]['name'],
-                '$photo' => $c[0]['photo'],
+		'$photo' => $c[0]['photo'],
-                'url' => z_root() . '/contacts/' . $cid
+		'url'    => z_root() . '/contacts/' . $cid
-                ));
+	));
 
-        if(! x($a->page,'aside'))
+	if(! x($a->page,'aside'))
-                $a->page['aside'] = '';
+		$a->page['aside'] = '';
-        $a->page['aside'] .= $vcard_widget;
+	$a->page['aside'] .= $vcard_widget;
 
 	if(! count($c))
 		return;
 
-	$o .= '<h2>' . sprintf( t('Friends of %s'), $c[0]['name']) . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => sprintf( t('Friends of %s'), $c[0]['name'])
+	));
 
 
 	$r = all_friends(local_user(),$cid);

mod/common.php

@@ -29,19 +29,21 @@ function common_content(&$a) {
 	}	
 
 	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
-                '$name' => $c[0]['name'],
+		'$name' => $c[0]['name'],
-                '$photo' => $c[0]['photo'],
+		'$photo' => $c[0]['photo'],
-                'url' => z_root() . '/contacts/' . $cid
+		'url' => z_root() . '/contacts/' . $cid
-                ));
+	));
 
-        if(! x($a->page,'aside'))
+	if(! x($a->page,'aside'))
-                $a->page['aside'] = '';
+		$a->page['aside'] = '';
-        $a->page['aside'] .= $vcard_widget;
+	$a->page['aside'] .= $vcard_widget;
 
 	if(! count($c))
 		return;
 
-	$o .= '<h2>' . t('Common Friends') . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => t('Common Friends')
+	));
 
 
 	if(! $cid) {

mod/content.php

@@ -131,7 +131,9 @@ function content_content(&$a, $update = 0) {
 		}
 
 		$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) ";
-		$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
+		$o = replace_macros(get_markup_template("section_title.tpl"),array(
+			'$title' => sprintf( t('Group: %s'), $r[0]['name'])
+		)) . $o;
 	}
 	elseif($cid) {
 

mod/dirfind.php

@@ -23,8 +23,10 @@ function dirfind_content(&$a) {
 	
 	$o = '';
 
-	$o .= '<h2>' . t('People Search') . ' - ' . $search . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-	
+		'$title' => sprintf( t('People Search - %s'), $search)
+	));
+
 	if($search) {
 
 		$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');

mod/editpost.php

@@ -36,12 +36,14 @@ function editpost_content(&$a) {
 		$plaintext = false;
 
 
-	$o .= '<h2>' . t('Edit post') . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => t('Edit post')
+	));
 
 	$tpl = get_markup_template('jot-header.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
-		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']

mod/match.php

@@ -9,7 +9,9 @@ function match_content(&$a) {
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-	$o .= '<h2>' . t('Profile Match') . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => t('Profile Match')
+	));
 
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())

mod/network.php

@@ -55,19 +55,19 @@ function network_init(&$a) {
 				'',		//all
 				'',		//postord
 				'',		//conv
-				'/new',	//new
+				'/new',		//new
 				'',		//starred
 				'',		//bookmarked
 				'',		//spam
 			);
 			$tab_args = array(
 				'f=&order=comment',	//all
-				'f=&order=post',		//postord
+				'f=&order=post',	//postord
-				'f=&conv=1',			//conv
+				'f=&conv=1',		//conv
-				'',					//new
+				'',			//new
-				'f=&star=1',			//starred
+				'f=&star=1',		//starred
-				'f=&bmark=1',			//bookmarked
+				'f=&bmark=1',		//bookmarked
-				'f=&spam=1',			//spam
+				'f=&spam=1',		//spam
 			);
 
 			$k = array_search('active', $last_sel_tabs);
@@ -139,7 +139,9 @@ function network_init(&$a) {
 
 	// search terms header
 	if(x($_GET,'search')) {
-		$a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
+		$a->page['content'] .= replace_macros(get_markup_template("section_title.tpl"),array(
+			'$title' => sprintf( t('Search Results For: %s'), $search)
+		));
 	}
 
 	$a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network',true,$group_id) : '');
@@ -179,11 +181,11 @@ function saved_searches($search) {
 	if(count($r)) {
 		foreach($r as $rr) {
 			$saved[] = array(
-				'id'            => $rr['id'],
+				'id'		=> $rr['id'],
-				'term'			=> $rr['term'],
+				'term'		=> $rr['term'],
 				'encodedterm' 	=> urlencode($rr['term']),
-				'delete'		=> t('Remove term'),
+				'delete'	=> t('Remove term'),
-				'selected'		=> ($search==$rr['term']),
+				'selected'	=> ($search==$rr['term']),
 			);
 		}
 	}
@@ -191,10 +193,10 @@ function saved_searches($search) {
 
 	$tpl = get_markup_template("saved_searches_aside.tpl");
 	$o = replace_macros($tpl, array(
-		'$title'	 => t('Saved Searches'),
+		'$title'	=> t('Saved Searches'),
-		'$add'		 => t('add'),
+		'$add'		=> t('add'),
-		'$searchbox' => search($search,'netsearch-box',$srchurl,true),
+		'$searchbox'	=> search($search,'netsearch-box',$srchurl,true),
-		'$saved' 	 => $saved,
+		'$saved' 	=> $saved,
 	));
 
 	return $o;
@@ -479,10 +481,12 @@ function network_content(&$a, $update = 0) {
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) && 
-			'default_perms' => get_acl_permissions($a->user),
+					((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || 
-			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
+					(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'bang' => (($group || $cid || $nets) ? '!' : ''),
+			'default_perms'	=> get_acl_permissions($a->user),
+			'acl'	=> populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
+			'bang'	=> (($group || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
 			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
@@ -537,25 +541,39 @@ function network_content(&$a, $update = 0) {
 				$contact_str_self = ",".$self[0]["id"];
 		}
 		else {
-				$contact_str = ' 0 ';
+			$contact_str = ' 0 ';
-				info( t('Group is empty'));
+			info( t('Group is empty'));
 		}
 
 		//$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE (`contact-id` IN ($contact_str) OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 ORDER BY `created` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` ";
 
 		$sql_extra3 .= " AND `contact-id` IN ($contact_str$contact_str_self) ";
-		$sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str)  OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 AND parent = $sql_table.$sql_parent) ";
+		$sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str) 
-		$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
+				OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 
-	} elseif($cid) {
+				AND parent = $sql_table.$sql_parent) ";
+
+		$o = replace_macros(get_markup_template("section_title.tpl"),array(
+			'$title' => sprintf( t('Group: %s'), $r[0]['name'])
+		)) . $o;
+
+	}
+	elseif($cid) {
 
 		$r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d
 				AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
 			intval($cid)
 		);
 		if(count($r)) {
-			$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 ORDER BY `item`.`received` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` ";
+			$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` 
+					    WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 
+					    ORDER BY `item`.`received` DESC) AS `temp1` 
+					    ON $sql_table.$sql_parent = `temp1`.`parent` ";
 			$sql_extra = "";
-			$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
+
+			$o = replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => sprintf( t('Contact: %s'), $r[0]['name'])
+			)) . $o;
+
 			if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
 				notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
 			}

mod/search.php

@@ -15,11 +15,11 @@ function search_saved_searches() {
 		$saved = array();
 		foreach($r as $rr) {
 			$saved[] = array(
-				'id'            => $rr['id'],
+				'id'		=> $rr['id'],
-				'term'			=> $rr['term'],
+				'term'		=> $rr['term'],
-				'encodedterm' 	=> urlencode($rr['term']),
+				'encodedterm'	=> urlencode($rr['term']),
-				'delete'		=> t('Remove term'),
+				'delete'	=> t('Remove term'),
-				'selected'		=> ($search==$rr['term']),
+				'selected'	=> ($search==$rr['term']),
 			);
 		}
 
@@ -27,10 +27,10 @@ function search_saved_searches() {
 		$tpl = get_markup_template("saved_searches_aside.tpl");
 
 		$o .= replace_macros($tpl, array(
-			'$title'	 => t('Saved Searches'),
+			'$title'	=> t('Saved Searches'),
-			'$add'		 => '',
+			'$add'		=> '',
-			'$searchbox' => '',
+			'$searchbox'	=> '',
-			'$saved' 	 => $saved,
+			'$saved' 	=> $saved,
 		));
 	}
 
@@ -177,9 +177,13 @@ function search_content(&$a) {
 
 
 	if($tag)
-		$o .= '<h2>' . sprintf( t('Items tagged with: %s'), $search) . '</h2>';
+		$title = sprintf( t('Items tagged with: %s'), $search);
 	else
-		$o .= '<h2>' . sprintf( t('Search results for: %s'), $search) . '</h2>';
+		$title = sprintf( t('Search results for: %s'), $search);
+
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => $title
+	));
 
 	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
 	$o .= conversation($a,$r,'search',false);

mod/suggest.php

@@ -65,7 +65,9 @@ function suggest_content(&$a) {
 	$a->page['aside'] .= findpeople_widget();
 
 
-	$o .= '<h2>' . t('Friend Suggestions') . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => t('Friend Suggestions')
+	));
 
 
 	$r = suggestion_query(local_user());

view/templates/section_title.tpl

@@ -0,0 +1,4 @@
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+	<div class="clear"></div>
+</div>