Merge pull request #1627 from rabuzarus/section-title

move html of h2 headings to section_title.tpl
This commit is contained in:
Michael Vogel 2015-05-31 09:52:46 +02:00
commit 2550e02399
11 changed files with 110 additions and 68 deletions

View file

@ -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']) {

View file

@ -33,7 +33,9 @@ function allfriends_content(&$a) {
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);

View file

@ -41,7 +41,9 @@ function common_content(&$a) {
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) {

View file

@ -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) {

View file

@ -23,7 +23,9 @@ 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) {

View file

@ -36,7 +36,9 @@ 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(

View file

@ -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())

View file

@ -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) : '');
@ -479,7 +481,9 @@ 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) &&
((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
'default_perms' => get_acl_permissions($a->user),
'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
'bang' => (($group || $cid || $nets) ? '!' : ''),
@ -544,18 +548,32 @@ function network_content(&$a, $update = 0) {
//$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) ";
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
} elseif($cid) {
$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) ";
$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);
}

View file

@ -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);

View file

@ -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 file

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