aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-25 18:19:58 -0700
committerfriendica <info@friendica.com>2012-03-25 18:19:58 -0700
commit7ab117fd31c31cba4880cfcc63fc940531850455 (patch)
tree454857dffcb346088f2260d789bd2057678c780e /view/theme
parent7ef1ed2d7045a381c032d2142413b3a14af0d8e3 (diff)
parente6b07d61cfa8c8b87e32ae36a93c554400f2e9e5 (diff)
downloadvolse-hubzilla-7ab117fd31c31cba4880cfcc63fc940531850455.tar.gz
volse-hubzilla-7ab117fd31c31cba4880cfcc63fc940531850455.tar.bz2
volse-hubzilla-7ab117fd31c31cba4880cfcc63fc940531850455.zip
Merge branch 'pull'
Diffstat (limited to 'view/theme')
-rwxr-xr-xview/theme/diabook-blue/theme.php8
-rwxr-xr-xview/theme/diabook/theme.php16
-rw-r--r--view/theme/dispy-dark/theme.php2
3 files changed, 17 insertions, 9 deletions
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 6149b12de..2c878e6f0 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -33,7 +33,7 @@ function diabook_community_info(){
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 ",
0,
- 12
+ 9
);
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
if(count($r)) {
@@ -61,7 +61,7 @@ function diabook_community_info(){
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri`
ORDER BY `T1`.`created` DESC
- LIMIT 0,10",
+ LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl()
);
@@ -109,7 +109,7 @@ function diabook_community_info(){
AND `user`.`blockwall`=0
AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC
- LIMIT 0, 12",
+ LIMIT 0, 9",
dbesc(t('Contact Photos')),
dbesc(t('Profile Photos'))
);
@@ -184,7 +184,7 @@ function diabook_community_info(){
//profile_side at networkpages
-if ($a->argv[0] === "network"){
+if ($a->argv[0] === "network" && local_user()){
// USER MENU
if(local_user()) {
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 29cc64c18..5b87e3142 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -36,7 +36,7 @@ function diabook_community_info(){
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 ",
0,
- 12
+ 9
);
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
if(count($r)) {
@@ -64,7 +64,7 @@ function diabook_community_info(){
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri`
ORDER BY `T1`.`created` DESC
- LIMIT 0,10",
+ LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl()
);
@@ -112,7 +112,7 @@ function diabook_community_info(){
AND `user`.`blockwall`=0
AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC
- LIMIT 0, 12",
+ LIMIT 0, 9",
dbesc(t('Contact Photos')),
dbesc(t('Profile Photos'))
);
@@ -189,7 +189,7 @@ function diabook_community_info(){
//profile_side at networkpages
-if ($a->argv[0] === "network"){
+if ($a->argv[0] === "network" && local_user()){
// USER MENU
if(local_user()) {
@@ -251,6 +251,14 @@ $a->page['htmlhead'] .= <<< EOT
$(function() {
$('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>
EOT;
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index cded68c48..9b6ea76bf 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -127,7 +127,7 @@ $(document).ready(function() {
</script>
EOT;
-function dispy_community_info() {
+function dispydark_community_info() {
$a = get_app();
$fostitJS = "javascript: (function() {