diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/diabook/theme.php | 14 | ||||
| -rw-r--r-- | view/theme/dispy/dark/style.css | 2 | ||||
| -rw-r--r-- | view/theme/dispy/light/style.css | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/css/style.css | 5 |
4 files changed, 12 insertions, 11 deletions
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 5c316e8ec..69bf51aa2 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -566,7 +566,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } break; default: - if ($rr['resource-id']){ + if ($rr['resource_id']){ $post_type = t('photo'); $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); $rr['plink'] = $m[1]; @@ -584,11 +584,11 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if($close_lastphotos != "1") { $aside['$photos_title'] = t('Last photos'); $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` + $r = q("SELECT `photo`.`id`, `photo`.`resource_id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM + (SELECT `resource_id`, MAX(`scale`) as maxscale FROM `photo` WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, + AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource_id`) AS `t1` + INNER JOIN `photo` ON `photo`.`resource_id`=`t1`.`resource_id` AND `photo`.`scale` = `t1`.`maxscale`, `user` WHERE `user`.`uid` = `photo`.`uid` AND `user`.`blockwall`=0 @@ -601,8 +601,8 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if(count($r)) { $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); foreach($r as $rr) { - $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; + $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource_id']; + $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] .'.jpg'; $entry = replace_macros($tpl,array( '$id' => $rr['id'], diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 18236ade5..75aaa456b 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -518,7 +518,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .type-text{background-position:-60px 0px;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} -footer{display:block;clear:both;} +footer{display:block;clear:both;text-align:center;} #sectionfooter{margin:1em 0 1em 0;} #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;} diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 57e317485..6f4c6e37f 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -518,7 +518,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .type-text{background-position:-60px 0px;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} -footer{display:block;clear:both;} +footer{display:block;clear:both;text-align:center;} #sectionfooter{margin:1em 0 1em 0;} #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;} diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css index f2edad499..5c41e0b4b 100644 --- a/view/theme/duepuntozero/css/style.css +++ b/view/theme/duepuntozero/css/style.css @@ -241,8 +241,9 @@ nav #nav-link-wrapper .nav-link { /* footer */ footer { - display: none; - + text-align: right; + padding-bottom: 1em; + padding-right: 3em; } .birthday-today, .event-today { |