From dd273283900409da66ecc4e9ae5a188d5c2db605 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 23:15:39 -0700 Subject: [PATCH 01/10] perform basic validation --- boot.php | 9 ++++++--- include/gprobe.php | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index e1687030d..ed083d617 100644 --- a/boot.php +++ b/boot.php @@ -1520,9 +1520,12 @@ function get_my_url() { } function zrl_init(&$a) { - proc_run('php','include/gprobe.php',bin2hex(get_my_url())); - $arr = array('zrl' => get_my_url(), 'url' => $a->cmd); - call_hooks('zrl_init',$arr); + $tmp_str = get_my_url(); + if(validate_url($tmp_str)) { + proc_run('php','include/gprobe.php',bin2hex($tmp_str)); + $arr = array('zrl' => $tmp_str, 'url' => $a->cmd); + call_hooks('zrl_init',$arr); + } } function zrl($s,$force = false) { diff --git a/include/gprobe.php b/include/gprobe.php index 5ca42729a..b4edbe4db 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -33,6 +33,9 @@ function gprobe_run($argv, $argc){ $url = hex2bin($argv[1]); + if(! validate_url($url)) + return; + $r = q("select * from gcontact where nurl = '%s' limit 1", dbesc(normalise_link($url)) ); From 1b1f56f55625f26d7bc2a5079d385d1c319e2d9a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 23:16:58 -0700 Subject: [PATCH 02/10] only validate once --- include/gprobe.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/gprobe.php b/include/gprobe.php index b4edbe4db..5ca42729a 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -33,9 +33,6 @@ function gprobe_run($argv, $argc){ $url = hex2bin($argv[1]); - if(! validate_url($url)) - return; - $r = q("select * from gcontact where nurl = '%s' limit 1", dbesc(normalise_link($url)) ); From a42a475e100af70a9a7b95edc061f1a13e216dcf Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 00:44:37 -0700 Subject: [PATCH 03/10] shuffle results of remote_common_friends widget --- include/contact_widgets.php | 15 +++++++++++---- include/socgraph.php | 18 ++++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index cfe27c5c9..e0fe4271a 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -146,11 +146,18 @@ function common_friends_visitor_widget($profile_uid) { $cid = local_user(); else { if(get_my_url()) { - $r = q("select id from gcontact where nurl = '%s' limit 1", + $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", dbesc(normalise_link(get_my_url())) ); if(count($r)) - $zcid = $r[0]['id']; + $cid = $r[0]['id']; + else { + $r = q("select id from gcontact where nurl = '%s' limit 1", + dbesc(normalise_link(get_my_url())) + ); + if(count($r)) + $zcid = $r[0]['id']; + } } } @@ -167,9 +174,9 @@ function common_friends_visitor_widget($profile_uid) { return; if($cid) - $r = common_friends($profile_uid,$cid,5); + $r = common_friends($profile_uid,$cid,5,true); else - $r = common_friends_zcid($profile_uid,$zcid); + $r = common_friends_zcid($profile_uid,$zcid,5,true); return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t), diff --git a/include/socgraph.php b/include/socgraph.php index a08d58074..35d754cad 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -182,13 +182,18 @@ function count_common_friends($uid,$cid) { } -function common_friends($uid,$cid,$limit=9999) { +function common_friends($uid,$cid,$limit=9999,$shuffle = false) { + + if($shuffle) + $sql_extra = " order by rand() "; + else + $sql_extra = " order by `gcontact`.`name` asc "; $r = q("SELECT `gcontact`.* FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` where `glink`.`cid` = %d and `glink`.`uid` = %d and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) - order by `gcontact`.`name` asc limit 0, %d", + sql_extra limit 0, %d", intval($cid), intval($uid), intval($uid), @@ -217,13 +222,18 @@ function count_common_friends_zcid($uid,$zcid) { } -function common_friends_zcid($uid,$zcid,$limit = 6) { +function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) { + + if($shuffle) + $sql_extra = " order by rand() "; + else + $sql_extra = " order by `gcontact`.`name` asc "; $r = q("SELECT `gcontact`.* FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` where `glink`.`zcid` = %d and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) - order by `gcontact`.`name` asc limit 0, %d", + $sql_extra limit 0, %d", intval($zcid), intval($uid), intval($limit) From 35dc4202a253c9e0c43f4bcb7484758114ad18df Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 00:58:28 -0700 Subject: [PATCH 04/10] how did that happen? --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index e0fe4271a..c6f3168fe 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -169,7 +169,7 @@ function common_friends_visitor_widget($profile_uid) { if($cid) $t = count_common_friends($profile_uid,$cid); else - $t = count_common_friends($profile_uid,$cid); + $t = count_common_friends_zcid($profile_uid,$zcid); if(! $t) return; From 06d6ab481280d786c40b0741ebd0b787addee40d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 01:07:23 -0700 Subject: [PATCH 05/10] delineate the new profile changes from the rest of the text --- mod/profiles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/profiles.php b/mod/profiles.php index 3a52c8fa5..4de9057dc 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -328,7 +328,7 @@ function profile_activity($changed, $value) { $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; if($t == 1 && strlen($value)) { - $message = sprintf( t('%1$s changed %2$s to %3$s'), $A, $changes, $value); + $message = sprintf( t('%1$s changed %2$s to "%3$s"'), $A, $changes, $value); $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof); } else From dc31b93941c2412ad3d61bf7d67d25a3a4153af3 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 01:45:57 -0700 Subject: [PATCH 06/10] provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. --- boot.php | 2 +- database.sql | 4 +++- update.php | 11 ++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index ed083d617..f357487b9 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1329' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1142 ); +define ( 'DB_UPDATE_VERSION', 1143 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index dc586bc2b..cf086796a 100644 --- a/database.sql +++ b/database.sql @@ -1027,6 +1027,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `account_expired` tinyint(1) NOT NULL DEFAULT '0', `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `service_class` char(32) NOT NULL, `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, @@ -1042,7 +1043,8 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `verified` (`verified`), KEY `unkmail` (`unkmail`), KEY `cntunkmail` (`cntunkmail`), - KEY `account_removed` (`account_removed`) + KEY `account_removed` (`account_removed`), + KEY `service_class` (`service_class`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/update.php b/update.php index cce942f27..e363aa942 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Wed, 2 May 2012 02:18:54 -0700 Subject: [PATCH 07/10] missing param --- include/contact_widgets.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index c6f3168fe..bf3a86958 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -147,7 +147,8 @@ function common_friends_visitor_widget($profile_uid) { else { if(get_my_url()) { $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", - dbesc(normalise_link(get_my_url())) + dbesc(normalise_link(get_my_url())), + intval($profile_uid) ); if(count($r)) $cid = $r[0]['id']; From 6a9cd8cd4bb8fd592a00f345c9d1b4ed95497316 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 2 May 2012 12:40:51 +0200 Subject: [PATCH 08/10] diabook-theme: fix footer/impressum --- view/theme/diabook/theme.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 07fef7d7c..f9be99759 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -436,7 +436,9 @@ function scrolltop(){ $(window).scroll(function () { - + var footer_top = $(document).height() - 30; + $("div#footerbox").css("top", footer_top); + var scrollInfo = $(window).scrollTop(); if (scrollInfo <= "900"){ From 67471bb534a1d40df58e6bbaa4d1a2eb7869933d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 2 May 2012 14:33:04 +0200 Subject: [PATCH 09/10] diabook-theme: tryied to improve performance a bit --- view/theme/diabook/bottom.tpl | 101 ++++++ view/theme/diabook/theme.php | 648 ++++++++++++++-------------------- 2 files changed, 371 insertions(+), 378 deletions(-) create mode 100644 view/theme/diabook/bottom.tpl diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl new file mode 100644 index 000000000..8eb71b7dd --- /dev/null +++ b/view/theme/diabook/bottom.tpl @@ -0,0 +1,101 @@ + + diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index f9be99759..de003b27d 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,20 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.024) + * Version: (Version: 1.025) * Author: */ +$a = get_app(); +$a->theme_info = array( + 'family' => 'diabook', + 'version' => '1.025' +); +function diabook_init(&$a) { + //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.024)"; +$diabook_version = "Diabook (Version: 1.025)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -34,16 +41,259 @@ if ($color=="green") $color_path = "/diabook-green/"; if ($color=="dark") $color_path = "/diabook-dark/"; -/** - * prints last community activity - */ + //profile_side at networkpages + if ($a->argv[0] === "network" && local_user()){ + + // USER MENU + if(local_user()) { + + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); + + $userinfo = array( + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), + 'name' => $a->user['username'], + ); + $ps = array('usermenu'=>array()); + $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); + $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); + $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); + $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); + $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); + $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); + $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Community Pages'), "", ""); + + $tpl = get_markup_template('profile_side.tpl'); + + $a->page['aside'] = replace_macros($tpl, array( + '$userinfo' => $userinfo, + '$ps' => $ps, + )).$a->page['aside']; + + } + + $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; + + if($ccCookie != "9") { + // COMMUNITY + diabook_community_info(); + + // CUSTOM CSS + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";} + } + } + + //right_aside at profile pages + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ + if($ccCookie != "9") { + // COMMUNITY + diabook_community_info(); + + // CUSTOM CSS + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";} + + } + } + + //js scripts + //load jquery.cookie.js + $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; + $a->page['htmlhead'] .= sprintf('', $cookieJS); + + //load jquery.ae.image.resize.js + $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; + $a->page['htmlhead'] .= sprintf('', $imageresizeJS); + + //load jquery.twitter.search.js + $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; + $a->page['htmlhead'] .= sprintf('', $twitterJS); + + $a->page['htmlhead'] .= ' + '; + //check if community_home-plugin is activated and change css + $nametocheck = "communityhome"; + $r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck)); + if(count($r) == "1") { + + $a->page['htmlhead'] .= ' + '; + } + //comment-edit-wrapper on photo_view + if ($a->argv[0].$a->argv[2] === "photos"."image"){ + $a->page['htmlhead'] .= ' + '; + } + //restore right hand col at settingspage + if($a->argv[0] === "settings" && local_user()) { + $a->page['htmlhead'] .= ' + ';} + + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ + $a->page['htmlhead'] .= ' + '; + + if($ccCookie != "9") { + $a->page['htmlhead'] .= ' + ';} + } + //end js scripts + + // custom css + if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); + + //footer + $tpl = get_markup_template('footer.tpl'); + $a->page['footer'] .= replace_macros($tpl, array()); + + // + js_in_foot(); +} + + + function diabook_community_info() { $a = get_app(); - - // comunity_profiles $aside['$comunity_profilest_title'] = t('Community Profiles'); $aside['$comunity_profiles_items'] = array(); @@ -193,7 +443,7 @@ function diabook_community_info(){ $aside['$nv'] = $nv; }; - //Community Page + //Community_Pages at right_aside if(local_user()) { $page = '

'.t("Community Pages").'

@@ -223,404 +473,46 @@ function diabook_community_info(){ } $page .= ''; //if (sizeof($contacts) > 0) - $aside['$page'] = $page; } //END Community Page //helpers $helpers = array(); $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); - $aside['$helpers'] = $helpers; //end helpers //connectable services $con_services = array(); $con_services['title'] = Array("", t('Connect Services'), "", ""); - $aside['$con_services'] = $con_services; //end connectable services - - //get_baseurl $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; - + //print right_aside $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); $a->page['right_aside'] = replace_macros($tpl, $aside); - - - -} + } - -//profile_side at networkpages -if ($a->argv[0] === "network" && local_user()){ - - // USER MENU - if(local_user()) { - - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); - - $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), - 'name' => $a->user['username'], - ); - $ps = array('usermenu'=>array()); - $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); - $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); - $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); - $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); - $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Community Pages'), "", ""); - - $tpl = get_markup_template('profile_side.tpl'); - - $a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); - - } - - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - - if($ccCookie != "9") { - // COMMUNITY - diabook_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";} - } -} + function js_in_foot() { + /** @purpose insert stuff in bottom of page + */ + $a = get_app(); + $baseurl = $a->get_baseurl($ssl_state); + $bottom['$baseurl'] = $baseurl; + $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); + $a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom); + } -//right_aside at profile pages -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "9") { - // COMMUNITY - diabook_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";} - - } -} -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); -//footer -$tpl = get_markup_template('footer.tpl'); -$a->page['footer'] .= replace_macros($tpl, array()); -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//load jquery.twitter.search.js -$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; -$a->page['htmlhead'] .= sprintf('', $twitterJS); - -//js scripts - -//check if community_home-plugin is activated and change css -$nametocheck = "communityhome"; -$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck)); -if(count($r) == "1") { - -$a->page['htmlhead'] .= ' -'; -} - -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; -} - -$a->page['htmlhead'] .= ' - -'; -$a->page['htmlhead'] .= ' -'; -$a->page['htmlhead'] .= ' - '; - -if($a->argv[0] === "settings" && local_user()) { -$a->page['htmlhead'] .= ' -';} - - - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "9") { -$a->page['htmlhead'] .= ' -';}} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file From 6875f54647cbbdb66e6d570cbf357a8b83644fad Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 2 May 2012 16:27:01 +0200 Subject: [PATCH 10/10] diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box --- view/theme/diabook/comment_item.tpl | 14 ++--- view/theme/diabook/communityhome.tpl | 4 +- .../theme/diabook/js/jquery.twitter.search.js | 2 +- view/theme/diabook/theme.php | 55 +++++++++++++------ 4 files changed, 47 insertions(+), 28 deletions(-) diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index e10b86845..fc3594fdc 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -13,13 +13,13 @@
{{ if $qcomment }}