keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-03-25 18:19:58 -07:00
commit 7ab117fd31
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
view/theme/diabook-blue/theme.php
View file

@ -33,7 +33,7 @@ function diabook_community_info(){
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
0, 0,
12 9
); );
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
if(count($r)) { if(count($r)) {
@ -61,7 +61,7 @@ function diabook_community_info(){
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri` GROUP BY `uri`
ORDER BY `T1`.`created` DESC ORDER BY `T1`.`created` DESC
LIMIT 0,10", LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl() $a->get_baseurl(),$a->get_baseurl()
); );
@ -109,7 +109,7 @@ function diabook_community_info(){
AND `user`.`blockwall`=0 AND `user`.`blockwall`=0
AND `user`.`hidewall`=0 AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC ORDER BY `photo`.`edited` DESC
LIMIT 0, 12", LIMIT 0, 9",
dbesc(t('Contact Photos')), dbesc(t('Contact Photos')),
dbesc(t('Profile Photos')) dbesc(t('Profile Photos'))
); );
@ -184,7 +184,7 @@ function diabook_community_info(){
//profile_side at networkpages //profile_side at networkpages
if ($a->argv[0] === "network"){ if ($a->argv[0] === "network" && local_user()){
// USER MENU // USER MENU
if(local_user()) { if(local_user()) {

16
view/theme/diabook/theme.php
View file

@ -36,7 +36,7 @@ function diabook_community_info(){
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
0, 0,
12 9
); );
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
if(count($r)) { if(count($r)) {
@ -64,7 +64,7 @@ function diabook_community_info(){
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri` GROUP BY `uri`
ORDER BY `T1`.`created` DESC ORDER BY `T1`.`created` DESC
LIMIT 0,10", LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl() $a->get_baseurl(),$a->get_baseurl()
); );
@ -112,7 +112,7 @@ function diabook_community_info(){
AND `user`.`blockwall`=0 AND `user`.`blockwall`=0
AND `user`.`hidewall`=0 AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC ORDER BY `photo`.`edited` DESC
LIMIT 0, 12", LIMIT 0, 9",
dbesc(t('Contact Photos')), dbesc(t('Contact Photos')),
dbesc(t('Profile Photos')) dbesc(t('Profile Photos'))
); );
@ -189,7 +189,7 @@ function diabook_community_info(){
//profile_side at networkpages //profile_side at networkpages
if ($a->argv[0] === "network"){ if ($a->argv[0] === "network" && local_user()){
// USER MENU // USER MENU
if(local_user()) { if(local_user()) {
@ -251,6 +251,14 @@ $a->page['htmlhead'] .= <<< EOT
$(function() { $(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class $('a.lightbox').fancybox(); // Select all links with lightbox class
}); });
$(document).ready(function ()
$('iframe').each(function()
var url = $(this).attr("src");
$(this).attr("src",url+"?wmode=transparent");
);
);
</script> </script>
EOT; EOT;

2
view/theme/dispy-dark/theme.php
View file

@ -127,7 +127,7 @@ $(document).ready(function() {
</script> </script>
EOT; EOT;
function dispy_community_info() { function dispydark_community_info() {
$a = get_app(); $a = get_app();
$fostitJS = "javascript: (function() { $fostitJS = "javascript: (function() {